From 2d7e511bb816f9c332101da8d8796e88736c0e1a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2015 19:50:55 +0200
Subject: [PATCH 0001/2006] add table tblDocumentCheckOuts

---
 install/create_tables-innodb.sql        | 17 +++++++++++++++++
 install/create_tables-sqlite3.sql       | 15 +++++++++++++++
 install/update-5.0.0/update-sqlite3.sql |  9 +++++++++
 install/update-5.0.0/update.sql         | 11 +++++++++++
 4 files changed, 52 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index ab22a47b3..c6cbd0cf4 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -330,6 +330,23 @@ CREATE TABLE `tblDocumentLocks` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblDocumentCheckOuts`
+-- 
+
+CREATE TABLE `tblDocumentCheckOuts` (
+  `document` int(11) NOT NULL default '0',
+  `version` smallint(5) unsigned NOT NULL default '0',
+  `userID` int(11) NOT NULL default '0',
+  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `filename` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`document`),
+  CONSTRAINT `tblDocumentCheckOuts_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblDocumentCheckOuts_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table `tblDocumentReviewers`
 -- 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 1f60be6fa..82c6c2682 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -286,6 +286,21 @@ CREATE TABLE `tblDocumentLocks` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblDocumentCheckOuts`
+-- 
+
+CREATE TABLE `tblDocumentCheckOuts` (
+  `document` INTEGER REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`)
+  `version` INTEGER unsigned NOT NULL default '0',
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `filename` varchar(255) NOT NULL default '',
+  UNIQUE (`document`)
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table `tblDocumentReviewLog`
 -- 
diff --git a/install/update-5.0.0/update-sqlite3.sql b/install/update-5.0.0/update-sqlite3.sql
index ffa9e0d4a..30b913496 100644
--- a/install/update-5.0.0/update-sqlite3.sql
+++ b/install/update-5.0.0/update-sqlite3.sql
@@ -2,6 +2,15 @@ BEGIN;
 
 ALTER TABLE tblUsers ADD COLUMN `homefolder` INTEGER DEFAULT 0;
 
+CREATE TABLE `tblDocumentCheckOuts` (
+  `document` INTEGER REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`)
+  `version` INTEGER unsigned NOT NULL default '0',
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `filename` varchar(255) NOT NULL default '',
+  UNIQUE (`document`)
+) ;
+
 UPDATE tblVersion set major=5, minor=0, subminor=0;
 
 COMMIT;
diff --git a/install/update-5.0.0/update.sql b/install/update-5.0.0/update.sql
index a9347320e..b6fd612c6 100644
--- a/install/update-5.0.0/update.sql
+++ b/install/update-5.0.0/update.sql
@@ -2,6 +2,17 @@ START TRANSACTION;
 
 ALTER TABLE tblUsers ADD COLUMN `homefolder` INTEGER DEFAULT 0;
 
+CREATE TABLE `tblDocumentCheckOuts` (
+  `document` int(11) NOT NULL default '0',
+  `version` smallint(5) unsigned NOT NULL default '0',
+  `userID` int(11) NOT NULL default '0',
+  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `filename` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`document`),
+  CONSTRAINT `tblDocumentCheckOuts_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblDocumentCheckOuts_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 UPDATE tblVersion set major=5, minor=0, subminor=0;
 
 COMMIT;

From 7bc0b8947f9753f65e3a8b62854fd0c64ea9e9e5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2015 20:05:34 +0200
Subject: [PATCH 0002/2006] add sql statements to setOwner() for moving locks
 and checkouts

still commented out, but the idea is, that the user of a lock and checkout
of a document should also be changed if the document owner changes
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index db6f696e4..441d3c870 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -397,9 +397,31 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function setOwner($newOwner) { /* {{{ */
 		$db = $this->_dms->getDB();
 
+		$oldOwner = self::getOwner();
+
+		$db->startTransaction();
 		$queryStr = "UPDATE tblDocuments set owner = " . $newOwner->getID() . " WHERE id = " . $this->_id;
-		if (!$db->getResult($queryStr))
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
 			return false;
+		}
+
+		/* FIXME: Update also all locks and checkouts done by the previous owner */
+		/*
+		$queryStr = "UPDATE tblDocumentLocks set userID = " . $newOwner->getID() . " WHERE document = " . $this->_id . " AND userID = " . $oldOwner->getID();
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		$queryStr = "UPDATE tblDocumentCheckOuts set userID = " . $newOwner->getID() . " WHERE document = " . $this->_id . " AND userID = " . $oldOwner->getID();
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+		 */
+
+		$db->commitTransaction();
 
 		$this->_ownerID = $newOwner->getID();
 		$this->_owner = $newOwner;

From 3dae5ec57afa8e06f6436e4360a4f51647c3a42c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2015 20:08:06 +0200
Subject: [PATCH 0003/2006] add all methods to handle document checkout and
 checkin

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 208 ++++++++++++++++++++++++
 1 file changed, 208 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 441d3c870..5ea52bdbd 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -645,6 +645,209 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_lockingUser;
 	} /* }}} */
 
+	/**
+	 * Check if document is checked out
+	 *
+	 * @return boolean true if checked out otherwise false
+	 */
+	function isCheckedOut() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "SELECT * FROM tblDocumentCheckOuts WHERE document = " . (int) $this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if ((is_bool($resArr) && $resArr==false) || (count($resArr)==0)) {
+			// Could not find a check out for the selected document.
+			return false;
+		} else {
+			// A check out has been identified for this document.
+			return true;
+		}
+	} /* }}} */
+
+	/**
+	 * Get checkout info for document
+	 *
+	 * @return boolean true if locked otherwise false
+	 */
+	function getCheckOutInfo() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "SELECT * FROM tblDocumentCheckOuts WHERE document = " . (int) $this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if ((is_bool($resArr) && $resArr==false) || (count($resArr)==0)) {
+			// Could not find a check out for the selected document.
+			return false;
+		} else {
+			// A check out has been identified for this document.
+			return $resArr[0];
+		}
+	} /* }}} */
+
+
+	/**
+	 * Check out document
+	 *
+	 * Creates a check out record for the document and copies the latest
+	 * version of the document into the given checkout dir.
+	 *
+	 * @param object $user object of user doing the checkout
+	 * @param string $checkoutdir directory where the file will be placed
+	 * @return object object of class SeedDMS_Core_DocumentCheckOut
+	 */
+	function checkOut($user, $checkoutdir) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(self::isCheckedOut())
+			return false;
+
+		/* Check if checkout dir is writable */
+		if(!file_exists($checkoutdir)) {
+			return false;
+		}
+
+		$db->startTransaction();
+
+		$lc = self::getLatestContent();
+
+		$filename = $checkoutdir."/".$lc->getOriginalFileName();
+		$queryStr = "INSERT INTO tblDocumentCheckOuts (document, version, userID, date, filename) VALUES (".$this->_id.", ".$lc->getVersion().", ".$user->getID().", CURRENT_TIMESTAMP, ".$db->qstr($filename).")";
+		if (!$db->getResult($queryStr))
+			return false;
+
+		/* Try to copy the file */
+		$err = SeedDMS_Core_File::copyFile($this->_dms->contentDir . $this->getDir() . $lc->getFileName(), $filename);
+		if (!$err) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
+	/**
+	 * Check in document
+	 *
+	 * Τhis function is similar to SeedDMS_Core_Document::addContent()
+	 * but reads the content from the file was previously checked out.
+	 * Internal this method calls
+	 * SeedDMS_Core_Document::addContent() but takes over the original
+	 * filename, filetype and mimetype from the checked out version.
+	 * No matter in which state the current checked out file is, the
+	 * document will be checked back in afterwards.
+	 *
+	 * @param string $comment
+	 * @param object $user
+	 * @param array $reviewers
+	 * @param array $approvers
+	 * @param integer $version
+	 * @param array $attributes
+	 * @param object $workflow
+	 * @return boolean|object false in case of error, true if no error occurs but
+	 * the document remains unchanged (because the checked out file has not
+	 * changed or it has disappeared and couldnt't be checked in), or
+	 * an instance of class SeedDMS_Core_AddContentResultSet if the document
+	 * was updated.
+	 */
+	function checkIn($comment, $user, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$info = self::getCheckOutInfo();
+		$lc = self::getLatestContent();
+
+		/* If file doesn't exist anymore, then just remove the record from the db */
+		if(!file_exists($info['filename'])) {
+			$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
+			$db->getResult($queryStr);
+			return true;
+		}
+
+		/* Check if version of checked out file is equal to current version */
+		if($lc->getVersion() != $info['version']) {
+			return true;
+		}
+
+		if($user->getID() != $info['userID']) {
+			return true;
+		}
+
+		$content = true;
+		/* Do not create a new version if the file was unchanged */
+		$checksum = SeedDMS_Core_File::checksum($info['filename']);
+		if($checksum != $lc->getChecksum()) {
+			$content = $this->addContent($comment, $user, $info['filename'], $lc->getOriginalFileName(), $lc->getFileType(), $lc->getMimeType(), $reviewers, $approvers, $version, $attributes, $workflow);
+			if($content && !$this->_dms->forceRename)
+				SeedDMS_Core_File::removeFile($info['filename']);
+		}
+
+		$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
+		$db->getResult($queryStr);
+
+		return $content;
+
+	} /* }}} */
+
+	/**
+	 * Cancel check out of document
+	 *
+	 * This function will cancel a check out in progress by removing
+	 * the check out record from the database and removing the file
+	 * from the check out folder.
+	 *
+	 * @return boolean true if cancelation was successful
+	 */
+	function cancelCheckOut() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$info = self::getCheckOutInfo();
+		if($info) {
+			SeedDMS_Core_File::removeFile($info['filename']);
+
+			$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
+			$db->getResult($queryStr);
+		}
+
+		return true;
+
+	} /* }}} */
+
+	/**
+	 * Return the check out status of the document
+	 *
+	 * This method returns the checkout status of a previosly checked out
+	 * document.
+	 *
+	 * @return int 1=The checked out file doesn't exists anymore,
+	 * 2=The checked out version doesn't exists anymore
+	 * 3=The checked out file has not been modified yet
+	 * 4=new check out record in database found
+	 * 0=The checked out file is modified and check in will create a new version
+	 */
+	function checkOutStatus() { /* {{{ */
+		$info = self::getCheckOutInfo();
+		if(!$info)
+			return 4;
+
+		$lc = self::getLatestContent();
+
+		/* If file doesn't exist anymore, then just remove the record from the db */
+		if(!file_exists($info['filename'])) {
+			return 1;
+		}
+
+		/* Check if version of checked out file is equal to current version */
+		if($lc->getVersion() != $info['version']) {
+			return 2;
+		}
+
+		$checksum = SeedDMS_Core_File::checksum($info['filename']);
+		if($checksum == $lc->getChecksum()) {
+			return 3;
+		}
+
+		return 0;
+	} /* }}} */
+
 	function getSequence() { return $this->_sequence; }
 
 	function setSequence($seq) { /* {{{ */
@@ -1845,6 +2048,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$db->rollbackTransaction();
 			return false;
 		}
+		$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = " . $this->_id;
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
 		$queryStr = "DELETE FROM tblDocumentFiles WHERE document = " . $this->_id;
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();

From a796c85e0194089ce333576c35cc3aa857ac3ae3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2015 20:09:20 +0200
Subject: [PATCH 0004/2006] add validation of attributes

---
 op/op.UpdateDocument.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index d8e6b47c4..9e0bb2c22 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -196,6 +196,28 @@ if ($_FILES['userfile']['error'] == 0) {
 		foreach($attributes as $attrdefid=>$attribute) {
 			$attrdef = $dms->getAttributeDefinition($attrdefid);
 			if($attribute) {
+				if(!$attrdef->validate($attribute)) {
+					switch($attrdef->getValidationError()) {
+					case 5:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_malformed_email", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
+						break;
+					case 4:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_malformed_url", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
+						break;
+					case 3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_no_regex_match", array("attrname"=>$attrdef->getName(), "value"=>$attribute, "regex"=>$attrdef->getRegex())));
+						break;
+					case 2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
+						break;
+					case 1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
+						break;
+					default:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+					}
+				}
+				/*
 				if($attrdef->getRegex()) {
 					if(!preg_match($attrdef->getRegex(), $attribute)) {
 						UI::exitError(getMLText("document_title", array("documentname" => $folder->getName())),getMLText("attr_no_regex_match"));
@@ -209,6 +231,7 @@ if ($_FILES['userfile']['error'] == 0) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
 					}
 				}
+				 */
 			}
 		}
 	} else {

From dc08f8df1bffd5bbcabaa11d50cafae1e6a42b59 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2015 20:10:36 +0200
Subject: [PATCH 0005/2006] add configuration of checkout dir

---
 inc/inc.ClassSettings.php          | 4 ++++
 views/bootstrap/class.Settings.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index d348864ae..5c3698d5b 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -83,6 +83,8 @@ class Settings { /* {{{ */
 	var $_luceneDir = null;
 	// Where the drop folders are located
 	var $_dropFolderDir = null;
+	// Where the checked out files are located
+	var $_checkOutDir = null;
 	// Where the stop word file is located
 	var $_stopWordsFile = null;
 	// enable/disable lucene fulltext search
@@ -368,6 +370,7 @@ class Settings { /* {{{ */
 		$this->_stagingDir = strval($tab["stagingDir"]);
 		$this->_luceneDir = strval($tab["luceneDir"]);
 		$this->_dropFolderDir = strval($tab["dropFolderDir"]);
+		$this->_checkOutDir = strval($tab["checkOutDir"]);
 		$this->_logFileEnable = Settings::boolVal($tab["logFileEnable"]);
 		$this->_logFileRotation = strval($tab["logFileRotation"]);
 		$this->_enableLargeFileUpload = Settings::boolVal($tab["enableLargeFileUpload"]);
@@ -650,6 +653,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "stagingDir", $this->_stagingDir);
     $this->setXMLAttributValue($node, "luceneDir", $this->_luceneDir);
     $this->setXMLAttributValue($node, "dropFolderDir", $this->_dropFolderDir);
+    $this->setXMLAttributValue($node, "checkOutDir", $this->_checkOutDir);
     $this->setXMLAttributValue($node, "logFileEnable", $this->_logFileEnable);
     $this->setXMLAttributValue($node, "logFileRotation", $this->_logFileRotation);
     $this->setXMLAttributValue($node, "enableLargeFileUpload", $this->_enableLargeFileUpload);
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 2cebabed5..843900812 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -290,6 +290,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_dropFolderDir");?>:</td>
         <td><input type="text" name="dropFolderDir" value="<?php echo $settings->_dropFolderDir ?>" size="100" /></td>
       </tr>
+      <tr title="<?php printMLText("settings_checkOutDir_desc");?>">
+        <td><?php printMLText("settings_checkOutDir");?>:</td>
+        <td><input type="text" name="checkOutDir" value="<?php echo $settings->_checkOutDir ?>" size="100" /></td>
+      </tr>
       <tr title="<?php printMLText("settings_logFileEnable_desc");?>">
         <td><?php printMLText("settings_logFileEnable");?>:</td>
         <td><input name="logFileEnable" type="checkbox" <?php if ($settings->_logFileEnable) echo "checked" ?> /></td>

From bcb34f1e5147b7e4ee33a54cd6b8930faaf2f05c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2015 20:11:09 +0200
Subject: [PATCH 0006/2006] set parameter checkoutdir in view

---
 inc/inc.ClassUI.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 2b125b616..23443aff8 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -98,6 +98,7 @@ class UI extends UI_Default {
 			$view->setParam('enableclipboard', $settings->_enableClipboard);
 			$view->setParam('workflowmode', $settings->_workflowMode);
 			$view->setParam('partitionsize', $settings->_partitionSize);
+			$view->setParam('checkoutdir', $settings->_checkOutDir);
 			$view->setParam('showmissingtranslations', $settings->_showMissingTranslations);
 			return $view;
 		}

From 696b5f09962f52ffbf65679f2cefbe64d4dc0552 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2015 20:11:51 +0200
Subject: [PATCH 0007/2006] add checkout item to document menu

---
 views/bootstrap/class.Bootstrap.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 03c2db371..32ce9b0d6 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -447,6 +447,13 @@ $(document).ready(function () {
 			if (!$document->isLocked()) {
 				echo "<li id=\"first\"><a href=\"../out/out.UpdateDocument". $docid ."\">".getMLText("update_document")."</a></li>";
 				echo "<li><a href=\"../op/op.LockDocument". $docid ."\">".getMLText("lock_document")."</a></li>";
+				if($document->isCheckedOut())
+					echo "<li><a href=\"../out/out.CheckInDocument". $docid ."\">".getMLText("checkin_document")."</a></li>";
+				else {
+					if($this->params['checkoutdir']) {
+						echo "<li><a href=\"../op/op.CheckOutDocument". $docid ."\">".getMLText("checkout_document")."</a></li>";
+					}
+				}
 				echo "<li><a href=\"../out/out.EditDocument". $docid ."\">".getMLText("edit_document_props")."</a></li>";
 				echo "<li><a href=\"../out/out.MoveDocument". $docid ."\">".getMLText("move_document")."</a></li>";
 			}
@@ -455,6 +462,13 @@ $(document).ready(function () {
 				if (($lockingUser->getID() == $this->params['user']->getID()) || ($document->getAccessMode($this->params['user']) == M_ALL)) {
 					echo "<li id=\"first\"><a href=\"../out/out.UpdateDocument". $docid ."\">".getMLText("update_document")."</a></li>";
 					echo "<li><a href=\"../op/op.UnlockDocument". $docid ."\">".getMLText("unlock_document")."</a></li>";
+					if($document->isCheckedOut())
+						echo "<li><a href=\"../out/out.CheckInDocument". $docid ."\">".getMLText("checkin_document")."</a></li>";
+					else {
+						if($this->params['checkoutdir']) {
+							echo "<li><a href=\"../op/op.CheckOutDocument". $docid ."\">".getMLText("checkout_document")."</a></li>";
+						}
+					}
 					echo "<li><a href=\"../out/out.EditDocument". $docid ."\">".getMLText("edit_document_props")."</a></li>";
 					echo "<li><a href=\"../out/out.MoveDocument". $docid ."\">".getMLText("move_document")."</a></li>";
 				}

From e00f440717e56eff1fbdc50158d5f8a11c8e4faa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2015 20:12:29 +0200
Subject: [PATCH 0008/2006] set checkout dir

---
 op/op.Settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index 809a2d9ab..3d512eabd 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -95,6 +95,7 @@ if ($action == "saveSettings")
   $settings->_luceneDir = $_POST["luceneDir"];
   $settings->_extraPath = $_POST["extraPath"];
   $settings->_dropFolderDir = $_POST["dropFolderDir"];
+  $settings->_checkOutDir = $_POST["checkOutDir"];
   $settings->_logFileEnable = getBoolValue("logFileEnable");
   $settings->_logFileRotation = $_POST["logFileRotation"];
   $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload");

From 90cbbe7d3ca7915024f702dab3a869001cd51bbb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2015 20:13:00 +0200
Subject: [PATCH 0009/2006] some new phrases

---
 languages/ar_EG/lang.inc | 15 +++++++++++++--
 languages/bg_BG/lang.inc | 11 +++++++++++
 languages/ca_ES/lang.inc | 15 +++++++++++++--
 languages/cs_CZ/lang.inc | 15 +++++++++++++--
 languages/de_DE/lang.inc | 15 +++++++++++++--
 languages/en_GB/lang.inc | 15 +++++++++++++--
 languages/es_ES/lang.inc | 15 +++++++++++++--
 languages/fr_FR/lang.inc | 15 +++++++++++++--
 languages/hu_HU/lang.inc | 15 +++++++++++++--
 languages/it_IT/lang.inc | 15 +++++++++++++--
 languages/nl_NL/lang.inc | 15 +++++++++++++--
 languages/pl_PL/lang.inc | 15 +++++++++++++--
 languages/pt_BR/lang.inc | 15 +++++++++++++--
 languages/ro_RO/lang.inc | 15 +++++++++++++--
 languages/ru_RU/lang.inc | 15 +++++++++++++--
 languages/sk_SK/lang.inc | 15 +++++++++++++--
 languages/sv_SE/lang.inc | 15 +++++++++++++--
 languages/tr_TR/lang.inc | 15 +++++++++++++--
 languages/zh_CN/lang.inc | 15 +++++++++++++--
 languages/zh_TW/lang.inc | 15 +++++++++++++--
 20 files changed, 258 insertions(+), 38 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 3a4c19b77..8a6f26a92 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1243)
+//    Translators: Admin (1244)
 
 $text = array(
 'accept' => 'وافق',
@@ -93,7 +93,7 @@ URL: [url]',
 'approval_status' => 'حالة الموافقة',
 'approval_submit_email' => '',
 'approval_submit_email_body' => '',
-'approval_submit_email_subject' => 'تم ارسال الموافقة',
+'approval_submit_email_subject' => '[sitename]: [name] - تم ارسال الموافقة',
 'approval_summary' => 'ملخص الموافقة',
 'approval_update_failed' => 'خطأ في تحديث حالة الموافقة. فشل التحديث.',
 'approvers' => 'الموافقون',
@@ -185,6 +185,12 @@ URL: [url]',
 'chart_docsperuser_title' => '',
 'chart_selection' => '',
 'chart_sizeperuser_title' => '',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'من فضلك اختر تعريف السمة',
 'choose_category' => 'من فضلك اختر',
 'choose_group' => 'اختر المجموعة',
@@ -247,6 +253,7 @@ URL: [url]',
 'documents_to_approve' => 'مستندات في انتظار الموافقة',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
+'document_already_checkedout' => '',
 'document_already_locked' => 'هذا المستند محمي ضد التعديل',
 'document_comment_changed_email' => 'تم تعديل التعليق',
 'document_comment_changed_email_body' => 'تم تعديل التعليق
@@ -278,6 +285,7 @@ Parent folder: [folder_path]
 المستخدم: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - تم تحريك المستند',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'تم اعادة تسمية المستند',
 'document_renamed_email_body' => 'تم اعادة تسمية المستند
 المستند: [name]
@@ -813,6 +821,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'العرض الافتراضي للتقويم',
 'settings_calendarDefaultView_desc' => 'العرض الافتراضي للتقويم',
 'settings_cannot_disable' => '',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'مجلد المحتوى',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
@@ -1054,6 +1064,7 @@ URL: [url]',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => 'تم قفل المستند',
 'splash_document_unlocked' => 'تم الغاء قفل المستند',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 20b7e65ed..9a08615d9 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -170,6 +170,12 @@ $text = array(
 'chart_docsperuser_title' => '',
 'chart_selection' => '',
 'chart_sizeperuser_title' => '',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Изберете attribute definition',
 'choose_category' => 'Изберете',
 'choose_group' => 'Изберете група',
@@ -232,6 +238,7 @@ $text = array(
 'documents_to_approve' => 'Документи, чакащи Вашето утвърждаване',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Документът е вече блокиран',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
@@ -249,6 +256,7 @@ $text = array(
 'document_moved_email' => 'Документът е преместен',
 'document_moved_email_body' => '',
 'document_moved_email_subject' => '',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Документът е преименуван',
 'document_renamed_email_body' => '',
 'document_renamed_email_subject' => '',
@@ -678,6 +686,8 @@ $text = array(
 'settings_calendarDefaultView' => 'Вид на календара по-подразбиране',
 'settings_calendarDefaultView_desc' => 'Вид на календара по-подразбиране',
 'settings_cannot_disable' => 'Невозможно е да се изтрие ENABLE_INSTALL_TOOL',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Папка със данните',
 'settings_contentDir_desc' => 'Къде да съхранява качените файлове (най-добре изберете папка, недостъпна за уеб-сървъра)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -919,6 +929,7 @@ $text = array(
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => '',
 'splash_document_unlocked' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 1407298c4..e59e42745 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (654)
+//    Translators: Admin (655)
 
 $text = array(
 'accept' => 'Acceptar',
@@ -89,7 +89,7 @@ URL: [url]',
 'approval_status' => 'Estat d\'aprovació',
 'approval_submit_email' => '',
 'approval_submit_email_body' => '',
-'approval_submit_email_subject' => 'Aprovació enviada',
+'approval_submit_email_subject' => '[sitename]: [name] - Aprovació enviada',
 'approval_summary' => 'Resum d\'aprovació',
 'approval_update_failed' => 'Error actualitzant l\'estat d\'aprovació. Actualització fallada.',
 'approvers' => 'Aprovadors',
@@ -175,6 +175,12 @@ URL: [url]',
 'chart_docsperuser_title' => '',
 'chart_selection' => '',
 'chart_sizeperuser_title' => '',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => '',
 'choose_category' => '--Elegir categoria--',
 'choose_group' => '--Seleccionar grup--',
@@ -237,6 +243,7 @@ URL: [url]',
 'documents_to_approve' => 'Documents en espera d\'aprovació d\'usuaris',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Aquest document ja està bloquejat',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
@@ -254,6 +261,7 @@ URL: [url]',
 'document_moved_email' => 'Document reubicat',
 'document_moved_email_body' => '',
 'document_moved_email_subject' => '',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Document reanomenat',
 'document_renamed_email_body' => '',
 'document_renamed_email_subject' => '',
@@ -683,6 +691,8 @@ URL: [url]',
 'settings_calendarDefaultView' => '',
 'settings_calendarDefaultView_desc' => '',
 'settings_cannot_disable' => '',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
@@ -924,6 +934,7 @@ URL: [url]',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => '',
 'splash_document_unlocked' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index b6c9b9423..1e9c6e603 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (679), kreml (455)
+//    Translators: Admin (680), kreml (455)
 
 $text = array(
 'accept' => 'Přijmout',
@@ -100,7 +100,7 @@ Stav: [status]
 Komentář: [comment]
 Uživatel: [username]
 URL: [url]',
-'approval_submit_email_subject' => 'Předložit ke schválení',
+'approval_submit_email_subject' => '[sitename]: [name] - Předložit ke schválení',
 'approval_summary' => 'Souhrn schválení',
 'approval_update_failed' => 'Chyba při aktualizaci stavu schválení. Aktualizace selhala.',
 'approvers' => 'Schvalovatelé',
@@ -192,6 +192,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Dokumenty dle uživatele',
 'chart_selection' => 'Vyberte graf',
 'chart_sizeperuser_title' => 'Diskový prostor dle uživatele',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Zvolte definici atributů',
 'choose_category' => '--Vyberte prosím--',
 'choose_group' => '--Vyberte skupinu--',
@@ -254,6 +260,7 @@ URL: [url]',
 'documents_to_approve' => 'Dokumenty čekající na schválení uživatele',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamčený',
 'document_comment_changed_email' => 'Změna komentáře',
 'document_comment_changed_email_body' => 'Změna komentáře
@@ -285,6 +292,7 @@ Nová složka: [new_folder_path]
 Uživatel: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Dokument přesunut',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Dokument přejmenován',
 'document_renamed_email_body' => 'Dokument přejmenován
 Dokument: [name]
@@ -822,6 +830,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Výchozí zobrazení kalendáře',
 'settings_calendarDefaultView_desc' => 'Výchozí zobrazení kalendáře',
 'settings_cannot_disable' => 'Soubor ENABLE_INSTALL_TOOL nejde vymazat',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Obsah adresáře',
 'settings_contentDir_desc' => 'Místo, kde jsou nahrané soubory uloženy (nejlepší zvolit adresář, který není přístupný přes váš web-server)',
 'settings_contentOffsetDir' => '',
@@ -1063,6 +1073,7 @@ URL: [url]',
 'splash_add_user' => 'Přidán nový uživatel',
 'splash_cleared_clipboard' => 'Schránka vymazána',
 'splash_document_added' => 'Dokument přidán',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Dokument uložen',
 'splash_document_locked' => 'Dokument zamčen',
 'splash_document_unlocked' => 'Dokument odemčen',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index ae9f6dd37..a6c199735 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1971), dgrutsch (18)
+//    Translators: Admin (1983), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -105,7 +105,7 @@ Status: [status]
 Kommentar: [comment]
 Benutzer: [username]
 URL: [url]',
-'approval_submit_email_subject' => 'Freigabe erteilen',
+'approval_submit_email_subject' => '[sitename]: [name] - Freigabe erteilen',
 'approval_summary' => 'Übersicht Freigaben',
 'approval_update_failed' => 'Störung bei der Aktualisierung des Berechtigungsstatus. Aktualisierung gescheitert',
 'approvers' => 'Freigebender',
@@ -197,6 +197,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Dokumente pro Benutzer',
 'chart_selection' => 'Diagrammauswahl',
 'chart_sizeperuser_title' => 'Speicherplatz pro Benutzer',
+'checkedout_file_has_different_version' => 'Die ausgecheckte Version ist nicht identisch mit der aktuellen Version. Das Einchecken wird das Dokument nicht aktualisieren.',
+'checkedout_file_has_disappeared' => 'Die Datei des ausgecheckten Dokuments ist nicht mehr vorhanden. Das Einchecken wird keine neue Version erzeugen.',
+'checkedout_file_is_unchanged' => 'Die Datei des ausgecheckten Dokuments ist noch unverändert. Das Einchecken wird keine neue Version anlegen.',
+'checkin_document' => 'Einchecken',
+'checkout_document' => 'Auschecken',
+'checkout_is_disabled' => 'Auschecken von Dokumenten ist in der Konfiguration ausgeschaltet.',
 'choose_attrdef' => '--Attributdefinition wählen--',
 'choose_category' => '--Kategorie wählen--',
 'choose_group' => '--Gruppe wählen--',
@@ -259,6 +265,7 @@ URL: [url]',
 'documents_to_approve' => 'Freigabe erforderlich',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
+'document_already_checkedout' => 'Dieses Dokument ist bereits ausgecheckt',
 'document_already_locked' => 'Dieses Dokument ist bereits gesperrt',
 'document_comment_changed_email' => 'Kommentar geändert',
 'document_comment_changed_email_body' => 'Kommentar geändert
@@ -290,6 +297,7 @@ Neuer Ordner: [new_folder_path]
 Benutzer: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Dokument verschoben',
+'document_not_checkedout' => 'Dokument ist nicht ausgecheckt.',
 'document_renamed_email' => 'Dokument umbenannt',
 'document_renamed_email_body' => 'Dokument umbenannt
 Dokument: [name]
@@ -842,6 +850,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Kalender Standardansicht',
 'settings_calendarDefaultView_desc' => 'Voreingestellte Ansicht des Kalenders',
 'settings_cannot_disable' => 'Datei ENABLE_INSTALL_TOOL konnte nicht gelöscht werden.',
+'settings_checkOutDir' => 'Verzeichnis für ausgecheckte Dokumente',
+'settings_checkOutDir_desc' => 'Dies ist das Verzeichnis, in das Dokumenteninhalte bei einem Check out kopiert werden. Wenn dieses Verzeichnis für die Benutzer erreichbar ist, können die Dateien editiert und dann wieder eingecheckt werden.',
 'settings_contentDir' => 'Content-Verzeichnis',
 'settings_contentDir_desc' => 'Verzeichnis, in dem die Dokumente gespeichert werden. Sie sollten ein Verzeichnis wählen, das nicht durch den Web-Server erreichbar ist.',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -1083,6 +1093,7 @@ URL: [url]',
 'splash_add_user' => 'Neuen Benutzer hinzugefügt',
 'splash_cleared_clipboard' => 'Zwischenablage geleert',
 'splash_document_added' => 'Dokument hinzugefügt',
+'splash_document_checkedout' => 'Dokument ausgecheckt',
 'splash_document_edited' => 'Dokument gespeichert',
 'splash_document_locked' => 'Dokument gesperrt',
 'splash_document_unlocked' => 'Dokumentensperre aufgehoben',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 2d08b1cdb..226220d95 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1097), dgrutsch (3), netixw (14)
+//    Translators: Admin (1109), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -105,7 +105,7 @@ Status: [status]
 Comment: [comment]
 User: [username]
 URL: [url]',
-'approval_submit_email_subject' => 'Submitted approval',
+'approval_submit_email_subject' => '[sitename]: [name] - Submitted approval',
 'approval_summary' => 'Approval Summary',
 'approval_update_failed' => 'Error updating approval status. Update failed.',
 'approvers' => 'Approvers',
@@ -197,6 +197,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documents per user',
 'chart_selection' => 'Select chart',
 'chart_sizeperuser_title' => 'Diskspace per user',
+'checkedout_file_has_different_version' => 'The checked out version is not identical to the current version. Check in will not update the document.',
+'checkedout_file_has_disappeared' => 'The file of the checked out document has disappeared. Check in will not create a new version.',
+'checkedout_file_is_unchanged' => 'The file of the checked out document is still unchanged. Check in will not create a new version.',
+'checkin_document' => 'Check In',
+'checkout_document' => 'Check out',
+'checkout_is_disabled' => 'Check out of documents is disabled in the configuration.',
 'choose_attrdef' => 'Please choose attribute definition',
 'choose_category' => 'Please choose',
 'choose_group' => 'Choose group',
@@ -259,6 +265,7 @@ URL: [url]',
 'documents_to_approve' => 'Documents awaiting your approval',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
+'document_already_checkedout' => 'This document is already checked out',
 'document_already_locked' => 'This document is aleady locked',
 'document_comment_changed_email' => 'Comment changed',
 'document_comment_changed_email_body' => 'Comment changed
@@ -290,6 +297,7 @@ New folder: [new_folder_path]
 User: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Document moved',
+'document_not_checkedout' => 'Document is not checked out.',
 'document_renamed_email' => 'Document renamed',
 'document_renamed_email_body' => 'Document name changed
 Document: [name]
@@ -849,6 +857,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Calendar Default View',
 'settings_calendarDefaultView_desc' => 'Calendar default view',
 'settings_cannot_disable' => 'File ENABLE_INSTALL_TOOL could not deleted',
+'settings_checkOutDir' => 'Directory for checked out documents',
+'settings_checkOutDir_desc' => 'This is the directory where the latest content of a document is copied if the document is checked out. If you make this directory accessible for users, they can edit the file and check it back in when finished.',
 'settings_contentDir' => 'Content directory',
 'settings_contentDir_desc' => 'Where the uploaded files are stored (best to choose a directory that is not accessible through your web-server)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -1090,6 +1100,7 @@ URL: [url]',
 'splash_add_user' => 'New user added',
 'splash_cleared_clipboard' => 'Clipboard cleared',
 'splash_document_added' => 'Document added',
+'splash_document_checkedout' => 'Document checked out',
 'splash_document_edited' => 'Document saved',
 'splash_document_locked' => 'Document locked',
 'splash_document_unlocked' => 'Document unlocked',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 450dc14c4..262221432 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (935), angel (123), francisco (2), jaimem (14)
+//    Translators: Admin (936), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -100,7 +100,7 @@ Estado: [status]
 Comentarios: [comment]
 Usuario: [username]
 URL: [url]',
-'approval_submit_email_subject' => 'Aprobación enviada',
+'approval_submit_email_subject' => '[sitename]: [name] - Aprobación enviada',
 'approval_summary' => 'Resumen de aprobación',
 'approval_update_failed' => 'Error actualizando el estado de aprobación. Actualización fallida.',
 'approvers' => 'Aprobadores',
@@ -192,6 +192,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documentos por usuario',
 'chart_selection' => 'Seleccione un gráfico',
 'chart_sizeperuser_title' => 'Espacio de almacenamiento por usuario',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Por favor, seleccione definición de atributo',
 'choose_category' => 'Seleccione categoría',
 'choose_group' => 'Seleccione grupo',
@@ -254,6 +260,7 @@ URL: [url]',
 'documents_to_approve' => 'Documentos en espera de aprobación de usuarios',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento ya está bloqueado',
 'document_comment_changed_email' => 'Comentario modificado',
 'document_comment_changed_email_body' => 'Comentario modificado
@@ -285,6 +292,7 @@ Nueva carpeta: [new_folder_path]
 Usuario: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Documento movido',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Documento renombrado',
 'document_renamed_email_body' => 'Documento renombrado
 Documento: [name]
@@ -828,6 +836,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Vista por defecto de calendario',
 'settings_calendarDefaultView_desc' => 'Vista por defecto descripción de calendario',
 'settings_cannot_disable' => 'No es posible eliminar el archivo ENABLE_INSTALL_TOOL',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Carpeta de contenidos',
 'settings_contentDir_desc' => 'Donde se almacenan los archivos subidos (es preferible seleccionar una carpeta que no sea accesible a través del servidor web)',
 'settings_contentOffsetDir' => 'Carpeta de contenidos de desplazamiento',
@@ -1069,6 +1079,7 @@ URL: [url]',
 'splash_add_user' => 'Nuevo usuario agregado',
 'splash_cleared_clipboard' => 'Portapapeles limpiado',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Documento guardado',
 'splash_document_locked' => 'Documento bloqueado',
 'splash_document_unlocked' => 'Documento desbloqueado',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 9373f146c..c9814dceb 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (963), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (964), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -100,7 +100,7 @@ Statut : [status]
 Commentaire : [comment]
 Utilisateur : [username]
 URL : [url]',
-'approval_submit_email_subject' => 'Approbation soumise',
+'approval_submit_email_subject' => '[sitename]: [name] - Approbation soumise',
 'approval_summary' => 'Sommaire d\'approbation',
 'approval_update_failed' => 'Erreur de la mise à jour du statut d\'approbation. Echec de la mise à jour.',
 'approvers' => 'Approbateurs',
@@ -192,6 +192,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documents par utilisateur',
 'chart_selection' => 'Sélectionnez un graphique',
 'chart_sizeperuser_title' => 'Volume par utilisateur',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Choisissez une définition d\'attribut',
 'choose_category' => 'SVP choisir',
 'choose_group' => 'Choisir un groupe',
@@ -254,6 +260,7 @@ URL: [url]',
 'documents_to_approve' => 'Documents en attente d\'approbation',
 'documents_to_review' => 'Documents en attente de correction',
 'documents_user_requiring_attention' => 'Documents à surveiller',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Ce document est déjà verrouillé',
 'document_comment_changed_email' => 'Commentaire modifié',
 'document_comment_changed_email_body' => 'Commentaire modifié
@@ -285,6 +292,7 @@ Nouveau dossier: [new_folder_path]
 Utilisateur: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Document déplacé',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Document renommé',
 'document_renamed_email_body' => 'Document renommé
 Document: [name]
@@ -804,6 +812,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Vue par défaut de l\'agenda',
 'settings_calendarDefaultView_desc' => 'Vue par défaut de l\'agenda',
 'settings_cannot_disable' => 'Le fichier ENABLE_INSTALL_TOOL ne peut pas être supprimé',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Contenu du répertoire',
 'settings_contentDir_desc' => 'Endroit ou les fichiers téléchargés sont stockés (il est préférable de choisir un répertoire qui n\'est pas accessible par votre serveur web)',
 'settings_contentOffsetDir' => 'Content Offset Directory',
@@ -1045,6 +1055,7 @@ URL: [url]',
 'splash_add_user' => 'Nouvel utilisateur ajouté',
 'splash_cleared_clipboard' => 'Presse-papier vidé',
 'splash_document_added' => 'Document ajouté',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Document sauvegardé',
 'splash_document_locked' => 'Document vérouillé',
 'splash_document_unlocked' => 'Document déverrouillé',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index dca750eea..f5a47e5c8 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (547), ribaz (1019)
+//    Translators: Admin (548), ribaz (1019)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -100,7 +100,7 @@ Szülő mappa: [folder_path]
 Megjegyzés: [comment]
 Felhasználó: [username]
 URL: [url]',
-'approval_submit_email_subject' => 'Beküldött jóváhagyás',
+'approval_submit_email_subject' => '[sitename]: [name] - Beküldött jóváhagyás',
 'approval_summary' => 'Jóváhagyási összesítő',
 'approval_update_failed' => 'Hiba történt a jóváhagyási állapot frissítése során. Frissítés sikertelen.',
 'approvers' => 'Jóváhagyók',
@@ -192,6 +192,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Dokumentumok felhasználónként',
 'chart_selection' => 'Diagram választása',
 'chart_sizeperuser_title' => 'Lemezterület felhasználónként',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Kérem válasszon jellemző meghatározást',
 'choose_category' => 'Kérjük válasszon',
 'choose_group' => 'Válasszon csoportot',
@@ -254,6 +260,7 @@ URL: [url]',
 'documents_to_approve' => 'Jóváhagyására váró dokumentumok',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Ez a dokumentum már zárolt',
 'document_comment_changed_email' => 'Megjegyzés módosult',
 'document_comment_changed_email_body' => 'Megjegyzés módosult
@@ -285,6 +292,7 @@ Régi mappa: [old_folder_path]
 Felhasználó: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Dokumentum átmozgatva',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Dokumentum átnevezve',
 'document_renamed_email_body' => 'Dokumentum átnevezve
 Dokumentum: [name]
@@ -827,6 +835,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Naptár alapértelmezett nézet',
 'settings_calendarDefaultView_desc' => 'Naptár alapértelmezett nézet',
 'settings_cannot_disable' => 'ENABLE_INSTALL_TOOL állomány nem került törlésre',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Tartalom könyvtár',
 'settings_contentDir_desc' => 'Feltöltött állományok tárolási helye (olyan könyvtárat érdemes választani, amelyhez nem lehet a webszerveren keresztül hozzáférni)',
 'settings_contentOffsetDir' => 'Tartalom eltérési könyvtár',
@@ -1068,6 +1078,7 @@ URL: [url]',
 'splash_add_user' => 'Új felhasználó hozzáadva',
 'splash_cleared_clipboard' => 'Vágólap törölve',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Dokumentum elmentve',
 'splash_document_locked' => 'Dokumentum zárolva',
 'splash_document_unlocked' => 'Dokumentum zárolás feloldva',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index cdda37458..15aca9237 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1360), s.pnt (26)
+//    Translators: Admin (1361), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -105,7 +105,7 @@ Stato: [status]
 Commenti: [comment]
 Utente: [username]
 URL: [url]',
-'approval_submit_email_subject' => 'Approvazione sottoposta',
+'approval_submit_email_subject' => '[sitename]: [name] - Approvazione sottoposta',
 'approval_summary' => 'Dettaglio approvazioni',
 'approval_update_failed' => 'Errore nel modificare lo stato di approvazione. Aggiornamento fallito.',
 'approvers' => 'Approvatori',
@@ -197,6 +197,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documenti per utente',
 'chart_selection' => 'Seleziona grafico',
 'chart_sizeperuser_title' => 'Spazio su disco per utente',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Seleziona l\'Attributo',
 'choose_category' => 'Seleziona',
 'choose_group' => 'Seleziona il gruppo',
@@ -259,6 +265,7 @@ URL: [url]',
 'documents_to_approve' => 'Documenti in attesa della tua approvazione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Questo documento è già bloccato',
 'document_comment_changed_email' => 'Commento modificato',
 'document_comment_changed_email_body' => 'Commento modificato
@@ -290,6 +297,7 @@ Nuova cartella: [new_folder_path]
 Utente: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Documento spostato',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Documento rinominato',
 'document_renamed_email_body' => 'Documento rinominato
 Documento: [name]
@@ -850,6 +858,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Vista di default del calendario',
 'settings_calendarDefaultView_desc' => 'Vista di default del calendario',
 'settings_cannot_disable' => 'Il file ENABLE_INSTALL_TOOL non può essere cancellato',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Cartella contenitore',
 'settings_contentDir_desc' => 'Cartella in cui vengono conservati i files caricati, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_contentOffsetDir' => 'Cartella Offset',
@@ -1091,6 +1101,7 @@ URL: [url]',
 'splash_add_user' => 'Utente aggiunto',
 'splash_cleared_clipboard' => 'Appunti cancellati',
 'splash_document_added' => 'Documento aggiunto',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Documento modificato',
 'splash_document_locked' => 'Documento bloccato',
 'splash_document_unlocked' => 'Documento sbloccato',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 111412847..43c738fce 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (693), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (694), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 'accept' => 'Accept',
@@ -93,7 +93,7 @@ URL: [url]',
 'approval_status' => 'Goedkeuring Status',
 'approval_submit_email' => '',
 'approval_submit_email_body' => '',
-'approval_submit_email_subject' => 'Uitgevoerde [Goedkeuring]',
+'approval_submit_email_subject' => '[sitename]: [name] - Uitgevoerde [Goedkeuring]',
 'approval_summary' => 'Goedkeuring Samenvatting',
 'approval_update_failed' => 'Fout bij bijwerken Goedkeuring status. Bijwerken mislukt.',
 'approvers' => 'Autoriseerders',
@@ -185,6 +185,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documenten per gebruiker',
 'chart_selection' => 'Kies grafiek',
 'chart_sizeperuser_title' => 'Schijfruimte per gebruiker',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Selecteer een kenmerk definitie',
 'choose_category' => 'Selecteer a.u.b.',
 'choose_group' => 'Selecteer Groep',
@@ -247,6 +253,7 @@ URL: [url]',
 'documents_to_approve' => 'Documenten die wachten op uw goedkeuring',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Dit document is al geblokkeerd',
 'document_comment_changed_email' => 'Commentaar gewijzigd',
 'document_comment_changed_email_body' => 'Commentaar gewijzigd
@@ -278,6 +285,7 @@ Nieuwe map: [new_folder_path]
 Gebruiker: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Document verplaatst',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Document hernoemd',
 'document_renamed_email_body' => 'Document hernoemd
 Document: [name]
@@ -819,6 +827,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Kalender Standaard overzicht',
 'settings_calendarDefaultView_desc' => 'Kalender standaard overzicht',
 'settings_cannot_disable' => 'Bestand ENABLE_INSTALL_TOOL kon niet verwijderd worden',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Inhoud map',
 'settings_contentDir_desc' => 'Waar de verzonden bestande opgeslagen worden (Kan het beste een map zijn die niet benaderbaar is voor de webserver.)',
 'settings_contentOffsetDir' => 'Inhouds Basis Map',
@@ -1060,6 +1070,7 @@ URL: [url]',
 'splash_add_user' => 'Nieuwe gebruiker toegevoegd',
 'splash_cleared_clipboard' => 'Klembord leeg gemaakt',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Document opgeslagen',
 'splash_document_locked' => 'Document vergrendeld',
 'splash_document_unlocked' => 'Document ontgrendeld',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 85500c9cb..86e7641a9 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (706), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (707), netixw (84), romi (93), uGn (112)
 
 $text = array(
 'accept' => 'Akceptuj',
@@ -93,7 +93,7 @@ URL: [url]',
 'approval_status' => 'Status akceptacji',
 'approval_submit_email' => '',
 'approval_submit_email_body' => '',
-'approval_submit_email_subject' => 'Prośba o akceptację',
+'approval_submit_email_subject' => '[sitename]: [name] - Prośba o akceptację',
 'approval_summary' => 'Podsumowanie akceptacji',
 'approval_update_failed' => 'Błąd aktualizacji statusu akceptacji. Aktualizacja nie powiodła się.',
 'approvers' => 'Osoby akceptujące',
@@ -185,6 +185,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Dokumenty na użytkownika',
 'chart_selection' => 'Wybierz wykres',
 'chart_sizeperuser_title' => 'Zajętość dysku na użytkownika',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Proszę wybrać definicję atrybutu',
 'choose_category' => 'Proszę wybrać',
 'choose_group' => 'Wybierz grupę',
@@ -247,6 +253,7 @@ URL: [url]',
 'documents_to_approve' => 'Dokumenty oczekujące na Twoje zatwierdzenie',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Ten dokument jest już zablokowany',
 'document_comment_changed_email' => 'Zmiana komentarza',
 'document_comment_changed_email_body' => 'Zmodyfikowano komentarz
@@ -278,6 +285,7 @@ Nowy folder: [new_folder_path]
 Użytkownik: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Przeniesienie dokumentu',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Nazwa dokumenty zmieniona',
 'document_renamed_email_body' => 'Nazwa dokumentu uległa zmianie
 Dokument: [name]
@@ -807,6 +815,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Domyślny widok kalendarza',
 'settings_calendarDefaultView_desc' => 'Domyślny widok kalendarza',
 'settings_cannot_disable' => 'Plik ENABLE_INSTALL_TOOL nie może zostać usunięty',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Katalog treści',
 'settings_contentDir_desc' => 'Miejsce, gdzie będą przechowywane wczytane pliki (najlepien wybrać katalog, który nie jest dostępny dla serwera http)',
 'settings_contentOffsetDir' => 'Offset katalogu treści',
@@ -1048,6 +1058,7 @@ URL: [url]',
 'splash_add_user' => 'Dodano nowego użytkownika',
 'splash_cleared_clipboard' => 'Wyczyszczono schowek',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Dokument został zapisany',
 'splash_document_locked' => 'Dokument zablokowany',
 'splash_document_unlocked' => 'Odblokowano dokument',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 7628364b6..9ba71a1b1 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (877), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (878), flaviove (627), lfcristofoli (352)
 
 $text = array(
 'accept' => 'Aceitar',
@@ -100,7 +100,7 @@ Estado: [status]
 Comentário: [comment]
 Usuário: [username]
 URL: [url]',
-'approval_submit_email_subject' => 'Aprovação submetida',
+'approval_submit_email_subject' => '[sitename]: [name] - Aprovação submetida',
 'approval_summary' => 'Approval Summary',
 'approval_update_failed' => 'Error updating approval status. Update failed.',
 'approvers' => 'Approvers',
@@ -192,6 +192,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documentos por usuário',
 'chart_selection' => 'Selecione gráfico',
 'chart_sizeperuser_title' => 'Espaço em disco por usuário',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Por favor escolha a definição de atributo',
 'choose_category' => '--Por favor escolha--',
 'choose_group' => '--Escolher grupo--',
@@ -254,6 +260,7 @@ URL: [url]',
 'documents_to_approve' => 'Documents Awaiting User\'s Approval',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento já está travado',
 'document_comment_changed_email' => 'Comentário modificado',
 'document_comment_changed_email_body' => 'Comentário modificado
@@ -285,6 +292,7 @@ Nova pasta: [new_folder_path]
 Usuário: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Documento movido',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Documento renomeado',
 'document_renamed_email_body' => 'Documento renomeado
 Documento: [name]
@@ -825,6 +833,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Visualização Calendário Padrão',
 'settings_calendarDefaultView_desc' => 'Visualização calendário padrão',
 'settings_cannot_disable' => 'Arquivo ENABLE_INSTALL_TOOL não pode ser eliminado',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Diretório de conteúdo',
 'settings_contentDir_desc' => 'Onde arquivos enviados são armazenados (melhor escolher um diretório que não é acessível através de seu web-server)',
 'settings_contentOffsetDir' => 'Pasta de Compensação de Conteúdo',
@@ -1066,6 +1076,7 @@ URL: [url]',
 'splash_add_user' => 'Novo usuário adicionado',
 'splash_cleared_clipboard' => 'Área de transferência limpada',
 'splash_document_added' => 'Documento inserido',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Documento salvo',
 'splash_document_locked' => 'Documento bloqueado',
 'splash_document_unlocked' => 'Documento desbloqueado',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index bb3a63e0f..eca9a0fe8 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1002), balan (6)
+//    Translators: Admin (1003), balan (6)
 
 $text = array(
 'accept' => 'Accept',
@@ -100,7 +100,7 @@ Status: [status]
 Comentariu: [comment]
 Utilizator: [username]
 URL: [url]',
-'approval_submit_email_subject' => 'Aprobare trimisă',
+'approval_submit_email_subject' => '[sitename]: [name] - Aprobare trimisă',
 'approval_summary' => 'Sumar aprobare',
 'approval_update_failed' => 'Eroare actualizare status aprobare. Actualizarea nu a reușit.',
 'approvers' => 'Aprobatori',
@@ -192,6 +192,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documente per utilizator',
 'chart_selection' => 'Selectați grafic',
 'chart_sizeperuser_title' => 'Spațiu pe disc per utilizator',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Vă rugăm să alegeți definiția atributului',
 'choose_category' => 'Vă rugăm să alegeți',
 'choose_group' => 'Alege grup',
@@ -254,6 +260,7 @@ URL: [url]',
 'documents_to_approve' => 'Documente care așteaptă aprobarea dumneavoastră',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Acest document este deja blocat',
 'document_comment_changed_email' => 'Comentariu schimbat',
 'document_comment_changed_email_body' => 'Comentariu schimbat
@@ -285,6 +292,7 @@ Folder nou: [new_folder_path]
 Utilizator: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Document mutat',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Document redenumit',
 'document_renamed_email_body' => 'Nume document schimbat
 Document: [name]
@@ -828,6 +836,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Vizualizare implicită Calendar',
 'settings_calendarDefaultView_desc' => 'Vizualizare implicită Calendar',
 'settings_cannot_disable' => 'Fișierul ENABLE_INSTALL_TOOL nu a putut fi șters',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Director conținut',
 'settings_contentDir_desc' => 'Unde sunt stocate  fișierele încărcate (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_contentOffsetDir' => 'Conținut Director Offset',
@@ -1069,6 +1079,7 @@ URL: [url]',
 'splash_add_user' => 'Utilizator nou adăugat',
 'splash_cleared_clipboard' => 'Clipboard golit',
 'splash_document_added' => 'Document adăugat',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Document salvat',
 'splash_document_locked' => 'Document blocat',
 'splash_document_unlocked' => 'Document deblocat',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index fedabbdf6..328d01b5f 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1249)
+//    Translators: Admin (1250)
 
 $text = array(
 'accept' => 'Принять',
@@ -93,7 +93,7 @@ URL: [url]',
 'approval_status' => 'Статус утверждения',
 'approval_submit_email' => '',
 'approval_submit_email_body' => '',
-'approval_submit_email_subject' => 'Утверждено',
+'approval_submit_email_subject' => '[sitename]: [name] - Утверждено',
 'approval_summary' => 'Сводка по утверждению',
 'approval_update_failed' => 'Произошла ошибка при изменении статуса утверждения',
 'approvers' => 'Утверждающие',
@@ -185,6 +185,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Документы на пользователя',
 'chart_selection' => '',
 'chart_sizeperuser_title' => '',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Выберите атрибут',
 'choose_category' => 'Выберите категорию',
 'choose_group' => 'Выберите группу',
@@ -247,6 +253,7 @@ URL: [url]',
 'documents_to_approve' => 'Документы, ожидающие вашего утверждения',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Документ уже заблокирован',
 'document_comment_changed_email' => 'Изменён комментарий',
 'document_comment_changed_email_body' => 'Изменён комментарий
@@ -278,6 +285,7 @@ URL: [url]',
 Пользователь: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: перемещён документ «[name]»',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Документ переименован',
 'document_renamed_email_body' => 'Переименован документ
 Документ: [name]
@@ -818,6 +826,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Вид календаря по умолчанию',
 'settings_calendarDefaultView_desc' => 'Вид календаря по умолчанию.',
 'settings_cannot_disable' => 'Невозможно удалить ENABLE_INSTALL_TOOL',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Каталог содержимого',
 'settings_contentDir_desc' => 'Куда сохраняются загруженные файлы (лучше выбрать каталог недоступный веб-серверу).',
 'settings_contentOffsetDir' => 'Базовый начальный каталог',
@@ -1059,6 +1069,7 @@ URL: [url]',
 'splash_add_user' => 'Добавлен новый пользователь',
 'splash_cleared_clipboard' => 'Буфер обмена очищен',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Документ сохранён',
 'splash_document_locked' => 'Документ заблокирован',
 'splash_document_unlocked' => 'Документ разблокирован',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 708ddc74f..155b1e7d1 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (457)
+//    Translators: Admin (458)
 
 $text = array(
 'accept' => 'Prijať',
@@ -84,7 +84,7 @@ $text = array(
 'approval_status' => 'Stav schválenia',
 'approval_submit_email' => '',
 'approval_submit_email_body' => '',
-'approval_submit_email_subject' => 'Poslane schvalenie',
+'approval_submit_email_subject' => '[sitename]: [name] - Poslane schvalenie',
 'approval_summary' => 'Zhrnutie schválenia',
 'approval_update_failed' => 'Chyba pri aktualizácii stavu schválenia. Aktualizácia zlyhala.',
 'approvers' => 'Schvaľovatelia',
@@ -170,6 +170,12 @@ $text = array(
 'chart_docsperuser_title' => '',
 'chart_selection' => '',
 'chart_sizeperuser_title' => '',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => '',
 'choose_category' => '--Vyberte prosím--',
 'choose_group' => '--Vyberte skupinu--',
@@ -232,6 +238,7 @@ $text = array(
 'documents_to_approve' => 'Dokumenty čakajúce na schválenie používateľa',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamknutý',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
@@ -249,6 +256,7 @@ $text = array(
 'document_moved_email' => 'Dokument presunuty',
 'document_moved_email_body' => '',
 'document_moved_email_subject' => '',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Dokument premenovany',
 'document_renamed_email_body' => '',
 'document_renamed_email_subject' => '',
@@ -678,6 +686,8 @@ $text = array(
 'settings_calendarDefaultView' => '',
 'settings_calendarDefaultView_desc' => '',
 'settings_cannot_disable' => '',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '',
@@ -919,6 +929,7 @@ $text = array(
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => 'Dokument uzamknutý',
 'splash_document_unlocked' => 'Dokument odomknutý',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 543d4600d..1f0bbc19a 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1085), tmichelfelder (106)
+//    Translators: Admin (1086), tmichelfelder (106)
 
 $text = array(
 'accept' => 'Godkänn',
@@ -93,7 +93,7 @@ URL: [url]',
 'approval_status' => 'Status för godkännande',
 'approval_submit_email' => '',
 'approval_submit_email_body' => '',
-'approval_submit_email_subject' => 'Skicka godkännande',
+'approval_submit_email_subject' => '[sitename]: [name] - Skicka godkännande',
 'approval_summary' => 'Sammanfattning av godkännande',
 'approval_update_failed' => 'Fel vid uppdatering av godkännande-status. Status uppdaterades inte.',
 'approvers' => 'Godkänna',
@@ -185,6 +185,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Dokumenter per användare',
 'chart_selection' => 'Välj diagram',
 'chart_sizeperuser_title' => 'Diskutrymme per användare',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Välj attributdefinition',
 'choose_category' => 'Välj',
 'choose_group' => 'Välj grupp',
@@ -247,6 +253,7 @@ URL: [url]',
 'documents_to_approve' => 'Dokument som du behöver godkänna',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Detta dokument är redan låst',
 'document_comment_changed_email' => 'Kommentar ändrat',
 'document_comment_changed_email_body' => 'Kommentar ändrat
@@ -278,6 +285,7 @@ Ny katalog: [new_folder_path]
 Användare: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Dokument har flyttats',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Dokument har bytt namn',
 'document_renamed_email_body' => 'Dokument har bytt namn
 Dokument: [name]
@@ -813,6 +821,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Standardvy kalender',
 'settings_calendarDefaultView_desc' => 'Standardvy kalender',
 'settings_cannot_disable' => 'Filen ENABLE_INSTALL_TOOL kunde inte tas bort',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'Mapp för innehållet',
 'settings_contentDir_desc' => 'Mappen där alla uppladdade filer kommer att sparas. (Det bästa är att välja en mapp som inte är tillgänglig från webbservern)',
 'settings_contentOffsetDir' => 'Innehåll offset-mapp',
@@ -1054,6 +1064,7 @@ URL: [url]',
 'splash_add_user' => 'Ny användare tillagt',
 'splash_cleared_clipboard' => 'Urklipp rensat',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Dokument sparad',
 'splash_document_locked' => 'Dokument låst',
 'splash_document_unlocked' => 'Dokument upplåst',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index a1dbacb35..c31bfaa56 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1002), aydin (83)
+//    Translators: Admin (1003), aydin (83)
 
 $text = array(
 'accept' => 'Kabul',
@@ -99,7 +99,7 @@ Durum: [status]
 Açıklama: [comment]
 Kullanıcı: [username]
 URL: [url]',
-'approval_submit_email_subject' => 'Onay isteği gönder',
+'approval_submit_email_subject' => '[sitename]: [name] - Onay isteği gönder',
 'approval_summary' => 'Onay Özeti',
 'approval_update_failed' => 'Onay durumu güncellenirken hata oluştu. Güncelleme başarısız.',
 'approvers' => 'Onaylayan',
@@ -191,6 +191,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Kullanıcıya göre dokümanlar',
 'chart_selection' => 'Grafik seç',
 'chart_sizeperuser_title' => 'Kullanıcıya göre disk kullanımı',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => 'Lütfen nitelik tanımını seçiniz',
 'choose_category' => 'Lütfen seçiniz',
 'choose_group' => 'Grup seçiniz',
@@ -253,6 +259,7 @@ URL: [url]',
 'documents_to_approve' => 'Onayınızı bekleyen dokümanlar',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
+'document_already_checkedout' => '',
 'document_already_locked' => 'Bu doküman zaten kilitli',
 'document_comment_changed_email' => 'Açıklama değişti',
 'document_comment_changed_email_body' => 'Açıklama değişti
@@ -284,6 +291,7 @@ Klasörün yeni yeri: [new_folder_path]
 Kullanıcı: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Doküman taşındı',
+'document_not_checkedout' => '',
 'document_renamed_email' => 'Dokümanın adı değiştirildi',
 'document_renamed_email_body' => 'Dokümanın adı değiştirildi
 Doküman: [name]
@@ -829,6 +837,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Varsayılan Takvim Görünümü',
 'settings_calendarDefaultView_desc' => 'Varsayılan takvim görünümü',
 'settings_cannot_disable' => 'ENABLE_INSTALL_TOOL dosyası silinemedi',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => 'İçerik dizini',
 'settings_contentDir_desc' => 'Yüklenecek dosyaların depolanacağı yer (web üzerinden erişilemeyen bir yer tercih etmeniz önerilir.)',
 'settings_contentOffsetDir' => 'İçerik Ofset Klasörü',
@@ -1070,6 +1080,7 @@ URL: [url]',
 'splash_add_user' => 'Yeni kullanıcı eklendi',
 'splash_cleared_clipboard' => 'Pano temizlendi',
 'splash_document_added' => 'Doküman eklendi',
+'splash_document_checkedout' => '',
 'splash_document_edited' => 'Doküman kaydedildi',
 'splash_document_locked' => 'Doküman kilitlendi',
 'splash_document_unlocked' => 'Doküman kiliti açıldı',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 8993ad6dd..03cc477e2 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (551), fengjohn (5)
+//    Translators: Admin (552), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -88,7 +88,7 @@ URL: [url]',
 'approval_status' => '审核状态',
 'approval_submit_email' => '',
 'approval_submit_email_body' => '',
-'approval_submit_email_subject' => '提交审核',
+'approval_submit_email_subject' => '[sitename]: [name] - 提交审核',
 'approval_summary' => '审核汇总',
 'approval_update_failed' => '错误:更新审核状态.更新失败.',
 'approvers' => '审核人',
@@ -174,6 +174,12 @@ URL: [url]',
 'chart_docsperuser_title' => '',
 'chart_selection' => '',
 'chart_sizeperuser_title' => '',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => '请选择属性',
 'choose_category' => '请选择',
 'choose_group' => '选择组别',
@@ -238,6 +244,7 @@ URL: [url]',
 'documents_to_approve' => '待您审核的文档',
 'documents_to_review' => '待您校对的文档',
 'documents_user_requiring_attention' => '需您关注的文档',
+'document_already_checkedout' => '',
 'document_already_locked' => '该文档已被锁定',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
@@ -255,6 +262,7 @@ URL: [url]',
 'document_moved_email' => '文档已被移动',
 'document_moved_email_body' => '',
 'document_moved_email_subject' => '',
+'document_not_checkedout' => '',
 'document_renamed_email' => '文档已被重命名',
 'document_renamed_email_body' => '',
 'document_renamed_email_subject' => '',
@@ -684,6 +692,8 @@ URL: [url]',
 'settings_calendarDefaultView' => '',
 'settings_calendarDefaultView_desc' => '',
 'settings_cannot_disable' => '',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '内容偏移目录',
@@ -925,6 +935,7 @@ URL: [url]',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => '文档已被锁定',
 'splash_document_unlocked' => '已解锁的文档',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 03512c2d1..808d71cc7 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2335)
+//    Translators: Admin (2336)
 
 $text = array(
 'accept' => '接受',
@@ -88,7 +88,7 @@ URL: [url]',
 'approval_status' => '審核狀態',
 'approval_submit_email' => '',
 'approval_submit_email_body' => '',
-'approval_submit_email_subject' => '提交審核',
+'approval_submit_email_subject' => '[sitename]: [name] - 提交審核',
 'approval_summary' => '審核匯總',
 'approval_update_failed' => '錯誤:更新審核狀態.更新失敗.',
 'approvers' => '審核人',
@@ -174,6 +174,12 @@ URL: [url]',
 'chart_docsperuser_title' => '',
 'chart_selection' => '',
 'chart_sizeperuser_title' => '',
+'checkedout_file_has_different_version' => '',
+'checkedout_file_has_disappeared' => '',
+'checkedout_file_is_unchanged' => '',
+'checkin_document' => '',
+'checkout_document' => '',
+'checkout_is_disabled' => '',
 'choose_attrdef' => '請選擇屬性',
 'choose_category' => '請選擇',
 'choose_group' => '選擇組別',
@@ -236,6 +242,7 @@ URL: [url]',
 'documents_to_approve' => '待您審核的文檔',
 'documents_to_review' => '待您校對的文檔',
 'documents_user_requiring_attention' => '需您關注的文檔',
+'document_already_checkedout' => '',
 'document_already_locked' => '該文檔已被鎖定',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
@@ -253,6 +260,7 @@ URL: [url]',
 'document_moved_email' => '文檔已被移動',
 'document_moved_email_body' => '',
 'document_moved_email_subject' => '',
+'document_not_checkedout' => '',
 'document_renamed_email' => '文檔已被重命名',
 'document_renamed_email_body' => '',
 'document_renamed_email_subject' => '',
@@ -682,6 +690,8 @@ URL: [url]',
 'settings_calendarDefaultView' => '',
 'settings_calendarDefaultView_desc' => '',
 'settings_cannot_disable' => '',
+'settings_checkOutDir' => '',
+'settings_checkOutDir_desc' => '',
 'settings_contentDir' => '',
 'settings_contentDir_desc' => '',
 'settings_contentOffsetDir' => '內容偏移目錄',
@@ -923,6 +933,7 @@ URL: [url]',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
 'splash_document_added' => '',
+'splash_document_checkedout' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => '文檔已被鎖定',
 'splash_document_unlocked' => '已解鎖的文檔',

From 4e5bf5912f8fedd494520d08cf46971e32025d15 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 13:40:10 +0200
Subject: [PATCH 0010/2006] set proper msg when approver was deleted or already
 assigned

---
 op/op.SetReviewersApprovers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php
index 94cf11a7f..c905ab87c 100644
--- a/op/op.SetReviewersApprovers.php
+++ b/op/op.SetReviewersApprovers.php
@@ -462,7 +462,7 @@ foreach ($pGrpApp as $p) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 						break;
 					case -3:
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("reviewer_already_assigned"));
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approver_already_assigned"));
 						break;
 					case -4:
 						// email error
@@ -519,7 +519,7 @@ if (count($approvalIndex["g"]) > 0) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 						break;
 					case -3:
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("reviewer_already_removed"));
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approver_already_removed"));
 						break;
 					case -4:
 						// email error

From 0e1571c6c83e1cec71062b65aa71f42843a80a73 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 13:41:35 +0200
Subject: [PATCH 0011/2006] check if version modification is allowed

---
 out/out.SetReviewersApprovers.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/out/out.SetReviewersApprovers.php b/out/out.SetReviewersApprovers.php
index d0e3b9dac..598be7a16 100644
--- a/out/out.SetReviewersApprovers.php
+++ b/out/out.SetReviewersApprovers.php
@@ -50,9 +50,14 @@ if (!is_object($content)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
 
-// control for document state
+if(!$this->settings->_enableVersionModification) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_version_modification"));
+}
+
+// control for document state. Must correspond to check in
+// SeedDMS_AccessOperation::maySetReviewersApprovers()
 $overallStatus = $content->getStatus();
-if ($overallStatus["status"]==S_REJECTED || $overallStatus["status"]==S_OBSOLETE ) {
+if ($overallStatus["status"]!=S_DRAFT_REV && $overallStatus["status"]!=S_DRAFT_APP) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("cannot_assign_invalid_state"));
 }
 

From 03bfa5f972a0fb8dccc09a40748ca641f50d2bfe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 13:42:38 +0200
Subject: [PATCH 0012/2006] get read access list for document not folder

---
 views/bootstrap/class.SetReviewersApprovers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.SetReviewersApprovers.php b/views/bootstrap/class.SetReviewersApprovers.php
index b76375241..3661829f8 100644
--- a/views/bootstrap/class.SetReviewersApprovers.php
+++ b/views/bootstrap/class.SetReviewersApprovers.php
@@ -51,7 +51,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("change_assignments"));
 
 		// Retrieve a list of all users and groups that have review / approve privileges.
-		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
+		$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 
 		// Retrieve list of currently assigned reviewers and approvers, along with
 		// their latest status.

From 8824aa46240346f5724c20f3bbd3de966da46351 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 13:43:40 +0200
Subject: [PATCH 0013/2006] add administration of recipients of documents

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 328 ++++++++++++++++++++++++
 SeedDMS_Core/Core/inc.ClassUser.php     |  85 +++++-
 2 files changed, 412 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 5ea52bdbd..e943944fa 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2805,6 +2805,55 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_approvalStatus;
 	} /* }}} */
 
+	/**
+	 * Get the current receipt status of the document content
+	 * The receipt status is a list of receipts
+	 *
+	 * @return array list of receipts
+	 */
+	function getReceiptStatus() { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		if (!is_numeric($limit)) return false;
+
+		// Retrieve the current status of each assigned reviewer for the content
+		// represented by this object.
+		// FIXME: caching was turned off to make list of review log in ViewDocument
+		// possible
+		if (1 || !isset($this->_receiptStatus)) {
+			/* First get a list of all receipts for this document content */
+			$queryStr=
+				"SELECT receiptID FROM tblDocumentRecipients WHERE `version`='".$this->_version
+				."' AND `documentID` = '". $this->_document->getID() ."' ";
+			$recs = $db->getResultArray($queryStr);
+			if (is_bool($recs) && !$recs)
+				return false;
+			$this->_reviewStatus = array();
+			if($recs) {
+				foreach($recs as $rec) {
+					$queryStr=
+						"SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`receiptLogID`, ".
+						"`tblDocumentReceiptLog`.`date`, ".
+						"`tblDocumentReceiptLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` AS `groupName` ".
+						"FROM `tblDocumentReviewers` ".
+						"LEFT JOIN `tblDocumentReceiptLog` USING (`reviewID`) ".
+						"LEFT JOIN `tblUsers` on `tblUsers`.`id` = `tblDocumentRecipients`.`required`".
+						"LEFT JOIN `tblGroups` on `tblGroups`.`id` = `tblDocumentRecipients`.`required`".
+						"WHERE `tblDocumentRecipients`.`reviewID` = '". $rec['reviewID'] ."' ".
+						"ORDER BY `tblDocumentReceiptLog`.`receiptLogID` DESC";
+
+					$res = $db->getResultArray($queryStr);
+					if (is_bool($res) && !$res) {
+						unset($this->_receiptStatus);
+						return false;
+					}
+					$this->_receiptStatus = array_merge($this->_receiptStatus, $res);
+				}
+			}
+		}
+		return $this->_receiptStatus;
+	} /* }}} */
+
 	function addIndReviewer($user, $requestUser, $listadmin=false) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
@@ -3253,6 +3302,222 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return 0;
  } /* }}} */
 
+	function addIndRecipient($user, $requestUser, $listadmin=false) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$userID = $user->getID();
+
+		// Get the list of users and groups with read access to this document.
+		if($this->_document->getAccessMode($user) < M_READ) {
+			return -2;
+		}
+
+		// Check to see if the user has already been added to the receipt list.
+		$receiptStatus = $user->getReviewStatus($this->_document->getID(), $this->_version);
+		if (is_bool($receiptStatus) && !$receiptStatus) {
+			return -1;
+		}
+		$indstatus = false;
+		if (count($receiptStatus["indstatus"]) > 0) {
+			$indstatus = array_pop($receiptStatus["indstatus"]);
+			if($indstatus["status"]!=-2) {
+				// User is already on the list of recipients; return an error.
+				return -3;
+			}
+		}
+
+		// Add the user into the recipients database.
+		if (!$indstatus || ($indstatus && $indstatus["status"]!=-2)) {
+			$queryStr = "INSERT INTO `tblDocumentRecipients` (`documentID`, `version`, `type`, `required`) ".
+				"VALUES ('". $this->_document->getID() ."', '". $this->_version ."', '0', '". $userID ."')";
+			$res = $db->getResult($queryStr);
+			if (is_bool($res) && !$res) {
+				return -1;
+			}
+			$receiptID = $db->getInsertID();
+		}
+		else {
+			$receiptID = isset($indstatus["receiptID"]) ? $ $indstatus["receiptID"] : NULL;
+		}
+
+		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+			"VALUES ('". $receiptID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+		$res = $db->getResult($queryStr);
+		if (is_bool($res) && !$res) {
+			return -1;
+		}
+
+		// Add recipient to event notification table.
+		//$this->_document->addNotify($userID, true);
+
+		return 0;
+	} /* }}} */
+
+	function addGrpRecipient($group, $requestUser) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$groupID = $group->getID();
+
+		// Get the list of users and groups with read access to this document.
+		if (!isset($this->_readAccessList)) {
+			// TODO: error checking.
+			$this->_readAccessList = $this->_document->getReadAccessList();
+		}
+		$approved = false;
+		foreach ($this->_readAccessList["groups"] as $appGroup) {
+			if ($groupID == $appGroup->getID()) {
+				$approved = true;
+				break;
+			}
+		}
+		if (!$approved) {
+			return -2;
+		}
+
+		// Check to see if the group has already been added to the review list.
+		$receiptStatus = $group->getReceiptStatus($this->_document->getID(), $this->_version);
+		if (is_bool($receiptStatus) && !$receiptStatus) {
+			return -1;
+		}
+		if (count($receiptStatus) > 0 && $receiptStatus[0]["status"]!=-2) {
+			// Group is already on the list of recipients; return an error.
+			return -3;
+		}
+
+		// Add the group into the recipients database.
+		if (!isset($receiptStatus[0]["status"]) || (isset($receiptStatus[0]["status"]) && $receiptStatus[0]["status"]!=-2)) {
+			$queryStr = "INSERT INTO `tblDocumentRecipients` (`documentID`, `version`, `type`, `required`) ".
+				"VALUES ('". $this->_document->getID() ."', '". $this->_version ."', '1', '". $groupID ."')";
+			$res = $db->getResult($queryStr);
+			if (is_bool($res) && !$res) {
+				return -1;
+			}
+			$receiptID = $db->getInsertID();
+		}
+		else {
+			$receiptID = isset($receiptStatus[0]["receiptID"])?$receiptStatus[0]["receiptID"]:NULL;
+		}
+
+		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+			"VALUES ('". $receiptID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+		$res = $db->getResult($queryStr);
+		if (is_bool($res) && !$res) {
+			return -1;
+		}
+
+		// Add reviewer to event notification table.
+		//$this->_document->addNotify($groupID, false);
+
+		return 0;
+	} /* }}} */
+
+	/**
+	 * Add a receipt to the document content
+	 *
+	 * This method will add an entry to the table tblDocumentReceiptLog.
+	 * It will first check if the user is ment to receipt the document version.
+	 * It not the return value is -3.
+	 * Next it will check if the users has been removed from the list of
+	 * recipients. In that case -4 will be returned.
+	 * If the given receipt has been set by the user before, it cannot
+	 * be set again and 0 will be returned. Іf the review could be succesfully
+	 * added, the review log id will be returned.
+	 *
+	 * @see SeedDMS_Core_DocumentContent::setApprovalByInd()
+	 * @param object $user user doing the receipt
+	 * @param object $requestUser user asking for the receipt, this is mostly
+	 * @param integer $status the status of the receipt, possible values are
+	 *        0=unprocessed (maybe used to reset a status)
+	 *        1=received,
+	 *       -2=user is deleted (use {link
+	 *       SeedDMS_Core_DocumentContent::delIndRecipient} instead)
+	 * the user currently logged in.
+	 * @return integer new receipt log id
+	 */
+	function setReceiptByInd($user, $requestUser, $status, $comment) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		// Check to see if the user can be removed from the review list.
+		$receiptStatus = $user->getReceiptStatus($this->_document->getID(), $this->_version);
+		if (is_bool($receiptStatus) && !$receiptStatus) {
+			return -1;
+		}
+		if (count($receiptStatus["indstatus"])==0) {
+			// User is not assigned to receipt this document. No action required.
+			// Return an error.
+			return -3;
+		}
+		$indstatus = array_pop($receiptStatus["indstatus"]);
+		if ($indstatus["status"]==-2) {
+			// User has been deleted from recipients
+			return -4;
+		}
+		// Check if the status is really different from the current status
+		if ($indstatus["status"] == $status)
+			return 0;
+
+		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`,
+  	  `comment`, `date`, `userID`) ".
+			"VALUES ('". $indstatus["receiptID"] ."', '".
+			(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '".
+			$requestUser->getID() ."')";
+		$res=$db->getResult($queryStr);
+		if (is_bool($res) && !$res)
+			return -1;
+		else {
+			$receiptLogID = $db->getInsertID();
+			return $receiptLogID;
+		}
+ } /* }}} */
+
+	/**
+	 * Add a receipt to the document content
+	 *
+	 * This method is similar to
+	 * {@see SeedDMS_Core_DocumentContent::setReceiptByInd()} but adds a receipt
+	 * for a group instead of a user.
+	 *
+	 * @param object $group group doing the receipt
+	 * @param object $requestUser user asking for the receipt, this is mostly
+	 * the user currently logged in.
+	 * @return integer new receipt log id
+	 */
+	function setReceiptByGrp($group, $requestUser, $status, $comment) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		// Check to see if the user can be removed from the recipient list.
+		$receiptStatus = $group->getReceiptStatus($this->_document->getID(), $this->_version);
+		if (is_bool($receiptStatus) && !$receiptStatus) {
+			return -1;
+		}
+		if (count($receiptStatus)==0) {
+			// User is not assigned to receipt this document. No action required.
+			// Return an error.
+			return -3;
+		}
+		if ($receiptStatus[0]["status"]==-2) {
+			// Group has been deleted from recipients
+			return -4;
+		}
+
+		// Check if the status is really different from the current status
+		if ($receiptStatus[0]["status"] == $status)
+			return 0;
+
+		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`recipientsID`, `status`,
+  	  `comment`, `date`, `userID`) ".
+			"VALUES ('". $receiptStatus[0]["recipientsID"] ."', '".
+			(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '".
+			$requestUser->getID() ."')";
+		$res=$db->getResult($queryStr);
+		if (is_bool($res) && !$res)
+			return -1;
+		else {
+			$receiptLogID = $db->getInsertID();
+			return $receiptLogID;
+		}
+ } /* }}} */
+
 	function delIndReviewer($user, $requestUser) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
@@ -3379,6 +3644,69 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return 0;
 	} /* }}} */
 
+	function delIndRecipient($user, $requestUser) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$userID = $user->getID();
+
+		// Check to see if the user can be removed from the recipient list.
+		$receiptStatus = $user->getReceiptStatus($this->_document->getID(), $this->_version);
+		if (is_bool($receiptStatus) && !$receiptStatus) {
+			return -1;
+		}
+		if (count($receiptStatus["indstatus"])==0) {
+			// User is not assigned to receipt this document. No action required.
+			// Return an error.
+			return -3;
+		}
+		$indstatus = array_pop($receiptStatus["indstatus"]);
+		if ($indstatus["status"]!=0) {
+			// User has already submitted a receipt or has already been deleted;
+			// return an error.
+			return -3;
+		}
+
+		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+			"VALUES ('". $indstatus["receiptID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+		$res = $db->getResult($queryStr);
+		if (is_bool($res) && !$res) {
+			return -1;
+		}
+
+		return 0;
+	} /* }}} */
+
+	function delGrpRecipient($group, $requestUser) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$groupID = $group->getID();
+
+		// Check to see if the user can be removed from the recipient list.
+		$receiptStatus = $group->getReceiptStatus($this->_document->getID(), $this->_version);
+		if (is_bool($receiptStatus) && !$receiptStatus) {
+			return -1;
+		}
+		if (count($receiptStatus)==0) {
+			// User is not assigned to receipt this document. No action required.
+			// Return an error.
+			return -3;
+		}
+		if ($receiptStatus[0]["status"]!=0) {
+			// User has already submitted a receipt or has already been deleted;
+			// return an error.
+			return -3;
+		}
+
+		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+			"VALUES ('". $receiptStatus[0]["receiptID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+		$res = $db->getResult($queryStr);
+		if (is_bool($res) && !$res) {
+			return -1;
+		}
+
+		return 0;
+	} /* }}} */
+
 	/**
 	 * Set state of workflow assigned to the document content
 	 *
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 4db133639..f3e32e07d 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -885,7 +885,7 @@ class SeedDMS_Core_User {
 	 * Get a list of reviews
 	 * This function returns a list of all reviews seperated by individual
 	 * and group reviews. If the document id
-	 * is passed, then only this document will be checked for approvals. The
+	 * is passed, then only this document will be checked for reviews. The
 	 * same is true for the version of a document which limits the list
 	 * further.
 	 *
@@ -1088,6 +1088,89 @@ class SeedDMS_Core_User {
 		return $status;
 	} /* }}} */
 
+	/**
+	 * Get a list of receipts
+	 * This function returns a list of all receipts seperated by individual
+	 * and group receipts. If the document id
+	 * is passed, then only this document will be checked for receipts. The
+	 * same is true for the version of a document which limits the list
+	 * further.
+	 *
+	 * For a detaile description of the result array see
+	 * {link SeedDMS_Core_User::getApprovalStatus} which does the same for
+	 * approvals.
+	 *
+	 * @param int $documentID optional document id for which to retrieve the
+	 *        receipt
+	 * @param int $version optional version of the document
+	 * @return array list of all receipts
+	 */
+	function getReceiptStatus($documentID=null, $version=null) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+/*
+		if (!$db->createTemporaryTable("ttreviewid")) {
+			return false;
+		}
+*/
+		$status = array("indstatus"=>array(), "grpstatus"=>array());
+
+		// See if the user is assigned as an individual recipient.
+		$queryStr = "SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`status`, ".
+			"`tblDocumentReceiptLog`.`comment`, `tblDocumentReceiptLog`.`date`, ".
+			"`tblDocumentReceiptLog`.`userID` ".
+			"FROM `tblDocumentRecipients` ".
+			"LEFT JOIN `tblDocumentReceiptLog` USING (`recipientID`) ".
+			"WHERE `tblDocumentRecipients`.`type`='0' ".
+			($documentID==null ? "" : "AND `tblDocumentRecipients`.`documentID` = '". (int) $documentID ."' ").
+			($version==null ? "" : "AND `tblDocumentRecipients`.`version` = '". (int) $version ."' ").
+			"AND `tblDocumentRecipients`.`required`='". $this->_id ."' ".
+			"ORDER BY `tblDocumentReceiptLog`.`reviewLogID` DESC";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr === false)
+			return false;
+		if (count($resArr)>0) {
+			foreach ($resArr as $res) {
+				if(isset($status["indstatus"][$res['documentID']])) {
+					if($status["indstatus"][$res['documentID']]['date'] < $res['date']) {
+						$status["indstatus"][$res['documentID']] = $res;
+					}
+				} else {
+					$status["indstatus"][$res['documentID']] = $res;
+				}
+			}
+		}
+
+		// See if the user is the member of a group that has been assigned to
+		// receipt the document version.
+		$queryStr = "SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`status`, ".
+			"`tblDocumentReceiptLog`.`comment`, `tblDocumentReceiptLog`.`date`, ".
+			"`tblDocumentReceiptLog`.`userID` ".
+			"FROM `tblDocumentRecipients` ".
+			"LEFT JOIN `tblDocumentReceiptLog` USING (`reviewID`) ".
+			"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentRecipients`.`required` ".
+			"WHERE `tblDocumentRecipients`.`type`='1' ".
+			($documentID==null ? "" : "AND `tblDocumentRecipients`.`documentID` = '". (int) $documentID ."' ").
+			($version==null ? "" : "AND `tblDocumentRecipients`.`version` = '". (int) $version ."' ").
+			"AND `tblGroupMembers`.`userID`='". $this->_id ."' ".
+			"ORDER BY `tblDocumentReceiptLog`.`reviewLogID` DESC";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr === false)
+			return false;
+		if (count($resArr)>0) {
+			foreach ($resArr as $res) {
+				if(isset($status["grpstatus"][$res['documentID']])) {
+					if($status["grpstatus"][$res['documentID']]['date'] < $res['date']) {
+						$status["grpstatus"][$res['documentID']] = $res;
+					}
+				} else {
+					$status["grpstatus"][$res['documentID']] = $res;
+				}
+			}
+		}
+		return $status;
+	} /* }}} */
+
 	/**
 	 * Get a list of documents with a workflow
 	 *

From ff9b3486c555a09dec222309fee5ada2e74d4cdb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 13:44:13 +0200
Subject: [PATCH 0014/2006] add maySetRecipients()

---
 inc/inc.ClassAccessOperation.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index c2064796c..643aaf13f 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -105,6 +105,26 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if recipients may be edited
+	 *
+	 * This check can only be done for documents. Setting the document
+	 * recipients is only allowed if version modification is turned on
+	 * in the settings.  The
+	 * admin may even set reviewers/approvers if is disallowed in the
+	 * settings.
+	 */
+	function maySetRecipients() { /* {{{ */
+		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
+			$latestContent = $this->obj->getLatestContent();
+			$status = $latestContent->getStatus();
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin())) {
+				return true;
+			}
+		}
+		return false;
+	} /* }}} */
+
 	/**
 	 * Check if workflow may be edited
 	 *

From 387f67dad4bfa073ce90673946f00ab5f90eaaa1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 13:44:45 +0200
Subject: [PATCH 0015/2006] enable/disable Acknowledge and Revision workflow

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

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 5c3698d5b..47dc69165 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -136,6 +136,10 @@ class Settings { /* {{{ */
 	var $_versioningFileName = "versioning_info.txt";
 	// the mode of workflow
 	var $_workflowMode = "traditional";
+	// enable/disable acknowledge workflow
+	var $_enableAcknowledgeWorkflow = true;
+	// enable/disable revision workflow
+	var $_enableRevisionWorkflow = true;
 	// enable/disable log system
 	var $_logFileEnable = true;
 	// the log file rotation
@@ -491,6 +495,8 @@ class Settings { /* {{{ */
 		$this->_presetExpirationDate = strval($tab["presetExpirationDate"]);
 		$this->_versioningFileName = strval($tab["versioningFileName"]);
 		$this->_workflowMode = strval($tab["workflowMode"]);
+		$this->_enableAcknowledgeWorkflow = strval($tab["enableAcknowledgeWorkflow"]);
+		$this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]);
 		$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
 		$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
 		$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
@@ -763,6 +769,8 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
     $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);
     $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
+    $this->setXMLAttributValue($node, "enableAcknowledgeWorkflow", $this->_enableAcknowledgeWorkflow);
+    $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
     $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
     $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 3d512eabd..b3c544db6 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -147,6 +147,8 @@ if ($action == "saveSettings")
   $settings->_versioningFileName = $_POST["versioningFileName"];
   $settings->_presetExpirationDate = $_POST["presetExpirationDate"];
   $settings->_workflowMode = $_POST["workflowMode"];
+  $settings->_enableAcknowledgeWorkflow = $_POST["enableAcknowledgeWorkflow"];
+  $settings->_enableRevisionWorkflow = $_POST["enableRevisionWorkflow"];
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
   $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 843900812..914e57d38 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -488,6 +488,14 @@ if(!is_writeable($settings->_configFilePath)) {
 					</select>
 				</td>
       </tr>
+      <tr title="<?php printMLText("settings_enableAcknowledgeWorkflow_desc");?>">
+        <td><?php printMLText("settings_enableAcknowledgeWorkflow");?>:</td>
+        <td><input name="enableAcknowledgeWorkflow" type="checkbox" <?php if ($settings->_enableAcknowledgeWorkflow) echo "checked" ?> /></td>
+      </tr>
+      <tr title="<?php printMLText("settings_enableRevisionWorkflow_desc");?>">
+        <td><?php printMLText("settings_enableRevisionWorkflow");?>:</td>
+        <td><input name="enableRevisionWorkflow" type="checkbox" <?php if ($settings->_enableRevisionWorkflow) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_versioningFileName_desc");?>">
         <td><?php printMLText("settings_versioningFileName");?>:</td>
         <td><input type="text" name="versioningFileName" value="<?php echo $settings->_versioningFileName ?>" /></td>

From 274c020148c28964938b491b4881fdec8b71622c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 13:46:26 +0200
Subject: [PATCH 0016/2006] add table for acknowledge workflow

---
 install/create_tables-innodb.sql  | 34 +++++++++++++++++++++++++++++++
 install/create_tables-sqlite3.sql | 30 +++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index c6cbd0cf4..078b44eb9 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -382,6 +382,40 @@ CREATE TABLE `tblDocumentReviewLog` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblDocumentRecipients`
+-- 
+
+CREATE TABLE `tblDocumentRecipients` (
+  `receiptID` int(11) NOT NULL auto_increment,
+  `documentID` int(11) NOT NULL default '0',
+  `version` smallint(5) unsigned NOT NULL default '0',
+  `type` tinyint(4) NOT NULL default '0',
+  `required` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`receiptID`),
+  UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
+  CONSTRAINT `tblDocumentRecipients_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblDocumentReceiptLog`
+-- 
+
+CREATE TABLE `tblDocumentReceiptLog` (
+  `receiptLogID` int(11) NOT NULL auto_increment,
+  `receiptID` int(11) NOT NULL default '0',
+  `status` tinyint(4) NOT NULL default '0',
+  `comment` text NOT NULL,
+  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `userID` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`receiptLogID`),
+  CONSTRAINT `tblDocumentReceiptLog_recipient` FOREIGN KEY (`receiptID`) REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
+  CONSTRAINT `tblDocumentReceiptLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
 -- 
 -- Table structure for table `tblDocumentStatus`
 -- 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 82c6c2682..0d562d5b6 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -331,6 +331,36 @@ CREATE TABLE `tblDocumentReviewers` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblDocumentReceiptLog`
+-- 
+
+CREATE TABLE `tblDocumentReceiptLog` (
+  `receiptLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `receiptID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
+  `status` INTEGER NOT NULL default 0,
+  `comment` TEXT NOT NULL,
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblDocumentRecipients`
+-- 
+
+CREATE TABLE `tblDocumentRecipients` (
+  `receiptID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `type` INTEGER NOT NULL default '0',
+  `required` INTEGER NOT NULL default '0',
+  UNIQUE (`documentID`,`version`,`type`,`required`)
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table `tblDocumentStatus`
 -- 

From 4bd0e3efe0466ce30ddf0a9a34f0615b2f78411a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 13:46:59 +0200
Subject: [PATCH 0017/2006] show link to out/out.SetRecipients.php if allowed

---
 views/bootstrap/class.ViewDocument.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 3312fa035..0b755cbf4 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -427,6 +427,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($accessop->mayOverwriteStatus()) {
 			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
 		}
+		if($accessop->maySetRecipients()) {
+			print "<li><a href='../out/out.SetRecipients.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_recipients")."</a></li>";
+		}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
 			if($accessop->maySetReviewersApprovers()) {

From a3b6ed8fb347d0e0088051da72e1958cc398ee33 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 18:32:11 +0200
Subject: [PATCH 0018/2006] add method getReceiptStatus

---
 SeedDMS_Core/Core/inc.ClassGroup.php | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 31019cb49..5fb5f30c2 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -377,5 +377,38 @@ class SeedDMS_Core_Group {
 
 		return $status;
 	} /* }}} */
+
+	function getReceiptStatus($documentID=null, $version=null) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$status = array();
+
+		// See if the group is assigned as a recipient.
+		$queryStr = "SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`status`, ".
+			"`tblDocumentReceiptLog`.`comment`, `tblDocumentReceiptLog`.`date`, ".
+			"`tblDocumentReceiptLog`.`userID` ".
+			"FROM `tblDocumentRecipients` ".
+			"LEFT JOIN `tblDocumentReceiptLog` USING (`receiptID`) ".
+			"WHERE `tblDocumentRecipients`.`type`='1' ".
+			($documentID==null ? "" : "AND `tblDocumentRecipients`.`documentID` = '". (int) $documentID ."' ").
+			($version==null ? "" : "AND `tblDocumentRecipients`.`version` = '". (int) $version ."' ").
+			"AND `tblDocumentRecipients`.`required`='". $this->_id ."' ";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr)>0) {
+			foreach ($resArr as $res) {
+				if(isset($status["status"][$res['documentID']])) {
+					if($status["status"][$res['documentID']]['date'] < $res['date']) {
+						$status["status"][$res['documentID']] = $res;
+					}
+				} else {
+					$status["status"][$res['documentID']] = $res;
+				}
+			}
+		}
+		return $status;
+	} /* }}} */
+
 }
 ?>

From ca9715c3bc16a17b94d1f7f83d554eb1c6b8f611 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 18:32:56 +0200
Subject: [PATCH 0019/2006] various error fixes in sql statements for
 ReceiptLog

---
 SeedDMS_Core/Core/inc.ClassUser.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index f3e32e07d..30c79e0c4 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -1120,12 +1120,12 @@ class SeedDMS_Core_User {
 			"`tblDocumentReceiptLog`.`comment`, `tblDocumentReceiptLog`.`date`, ".
 			"`tblDocumentReceiptLog`.`userID` ".
 			"FROM `tblDocumentRecipients` ".
-			"LEFT JOIN `tblDocumentReceiptLog` USING (`recipientID`) ".
+			"LEFT JOIN `tblDocumentReceiptLog` USING (`receiptID`) ".
 			"WHERE `tblDocumentRecipients`.`type`='0' ".
 			($documentID==null ? "" : "AND `tblDocumentRecipients`.`documentID` = '". (int) $documentID ."' ").
 			($version==null ? "" : "AND `tblDocumentRecipients`.`version` = '". (int) $version ."' ").
 			"AND `tblDocumentRecipients`.`required`='". $this->_id ."' ".
-			"ORDER BY `tblDocumentReceiptLog`.`reviewLogID` DESC";
+			"ORDER BY `tblDocumentReceiptLog`.`receiptLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return false;
@@ -1147,13 +1147,13 @@ class SeedDMS_Core_User {
 			"`tblDocumentReceiptLog`.`comment`, `tblDocumentReceiptLog`.`date`, ".
 			"`tblDocumentReceiptLog`.`userID` ".
 			"FROM `tblDocumentRecipients` ".
-			"LEFT JOIN `tblDocumentReceiptLog` USING (`reviewID`) ".
+			"LEFT JOIN `tblDocumentReceiptLog` USING (`receiptID`) ".
 			"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentRecipients`.`required` ".
 			"WHERE `tblDocumentRecipients`.`type`='1' ".
 			($documentID==null ? "" : "AND `tblDocumentRecipients`.`documentID` = '". (int) $documentID ."' ").
 			($version==null ? "" : "AND `tblDocumentRecipients`.`version` = '". (int) $version ."' ").
 			"AND `tblGroupMembers`.`userID`='". $this->_id ."' ".
-			"ORDER BY `tblDocumentReceiptLog`.`reviewLogID` DESC";
+			"ORDER BY `tblDocumentReceiptLog`.`receiptLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return false;

From 68be1ad42e825fc4f5121dc7925bab86d9ccb1e1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2015 18:33:42 +0200
Subject: [PATCH 0020/2006] fix lots of error for managing receiveLog

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 48 +++++++++++++------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index e943944fa..ffb71ce03 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2811,7 +2811,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * @return array list of receipts
 	 */
-	function getReceiptStatus() { /* {{{ */
+	function getReceiptStatus($limit=1) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		if (!is_numeric($limit)) return false;
@@ -2828,19 +2828,21 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
 				return false;
-			$this->_reviewStatus = array();
+			$this->_receiptStatus = array();
 			if($recs) {
 				foreach($recs as $rec) {
 					$queryStr=
 						"SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`receiptLogID`, ".
+						"`tblDocumentReceiptLog`.`status`, ".
+						"`tblDocumentReceiptLog`.`comment`, ".
 						"`tblDocumentReceiptLog`.`date`, ".
 						"`tblDocumentReceiptLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` AS `groupName` ".
-						"FROM `tblDocumentReviewers` ".
-						"LEFT JOIN `tblDocumentReceiptLog` USING (`reviewID`) ".
-						"LEFT JOIN `tblUsers` on `tblUsers`.`id` = `tblDocumentRecipients`.`required`".
-						"LEFT JOIN `tblGroups` on `tblGroups`.`id` = `tblDocumentRecipients`.`required`".
-						"WHERE `tblDocumentRecipients`.`reviewID` = '". $rec['reviewID'] ."' ".
-						"ORDER BY `tblDocumentReceiptLog`.`receiptLogID` DESC";
+						"FROM `tblDocumentRecipients` ".
+						"LEFT JOIN `tblDocumentReceiptLog` USING (`receiptID`) ".
+						"LEFT JOIN `tblUsers` on `tblUsers`.`id` = `tblDocumentRecipients`.`required` ".
+						"LEFT JOIN `tblGroups` on `tblGroups`.`id` = `tblDocumentRecipients`.`required` ".
+						"WHERE `tblDocumentRecipients`.`receiptID` = '". $rec['receiptID'] ."' ".
+						"ORDER BY `tblDocumentReceiptLog`.`receiptLogID` DESC LIMIT ".(int) $limit;
 
 					$res = $db->getResultArray($queryStr);
 					if (is_bool($res) && !$res) {
@@ -2904,7 +2906,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$reviewID = $db->getInsertID();
 		}
 		else {
-			$reviewID = isset($indstatus["reviewID"]) ? $ $indstatus["reviewID"] : NULL;
+			$reviewID = isset($indstatus["reviewID"]) ? $indstatus["reviewID"] : NULL;
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
@@ -3313,7 +3315,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		// Check to see if the user has already been added to the receipt list.
-		$receiptStatus = $user->getReviewStatus($this->_document->getID(), $this->_version);
+		$receiptStatus = $user->getReceiptStatus($this->_document->getID(), $this->_version);
 		if (is_bool($receiptStatus) && !$receiptStatus) {
 			return -1;
 		}
@@ -3337,7 +3339,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$receiptID = $db->getInsertID();
 		}
 		else {
-			$receiptID = isset($indstatus["receiptID"]) ? $ $indstatus["receiptID"] : NULL;
+			$receiptID = isset($indstatus["receiptID"]) ? $indstatus["receiptID"] : NULL;
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
@@ -3379,13 +3381,17 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($receiptStatus) && !$receiptStatus) {
 			return -1;
 		}
-		if (count($receiptStatus) > 0 && $receiptStatus[0]["status"]!=-2) {
-			// Group is already on the list of recipients; return an error.
-			return -3;
+		$status = false;
+		if (count($receiptStatus["status"]) > 0) {
+			$status = array_pop($receiptStatus["status"]);
+			if($status["status"]!=-2) {
+				// User is already on the list of recipients; return an error.
+				return -3;
+			}
 		}
 
 		// Add the group into the recipients database.
-		if (!isset($receiptStatus[0]["status"]) || (isset($receiptStatus[0]["status"]) && $receiptStatus[0]["status"]!=-2)) {
+		if (!$status || ($status && $status["status"]!=-2)) {
 			$queryStr = "INSERT INTO `tblDocumentRecipients` (`documentID`, `version`, `type`, `required`) ".
 				"VALUES ('". $this->_document->getID() ."', '". $this->_version ."', '1', '". $groupID ."')";
 			$res = $db->getResult($queryStr);
@@ -3395,7 +3401,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$receiptID = $db->getInsertID();
 		}
 		else {
-			$receiptID = isset($receiptStatus[0]["receiptID"])?$receiptStatus[0]["receiptID"]:NULL;
+			$receiptID = isset($status["receiptID"]) ? $status["receiptID"] : NULL;
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
@@ -3405,9 +3411,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return -1;
 		}
 
-		// Add reviewer to event notification table.
-		//$this->_document->addNotify($groupID, false);
-
 		return 0;
 	} /* }}} */
 
@@ -3686,19 +3689,20 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($receiptStatus) && !$receiptStatus) {
 			return -1;
 		}
-		if (count($receiptStatus)==0) {
+		if (count($receiptStatus["status"])==0) {
 			// User is not assigned to receipt this document. No action required.
 			// Return an error.
 			return -3;
 		}
-		if ($receiptStatus[0]["status"]!=0) {
+		$status = array_pop($receiptStatus["status"]);
+		if ($tatus["status"]!=0) {
 			// User has already submitted a receipt or has already been deleted;
 			// return an error.
 			return -3;
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $receiptStatus[0]["receiptID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+			"VALUES ('". $status["receiptID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;

From a590fec96733e50be8205b8a1fe5bd30441155ff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 10:31:36 +0200
Subject: [PATCH 0021/2006] add revision workflow

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 339 +++++++++++++++++++++++-
 SeedDMS_Core/Core/inc.ClassGroup.php    |  54 ++++
 SeedDMS_Core/Core/inc.ClassUser.php     | 144 +++++++---
 3 files changed, 491 insertions(+), 46 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index ffb71ce03..bab3e8197 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -30,7 +30,7 @@ define("S_DRAFT_APP", 1);
 /*
  * Document is released. A document is in release state either when
  * it needs no review or approval after uploaded or has been reviewed
- * and/or approved..
+ * and/or approved.
  */
 define("S_RELEASED",  2);
 
@@ -40,6 +40,12 @@ define("S_RELEASED",  2);
  */
 define("S_IN_WORKFLOW",  3);
 
+/*
+ * Document is in a revision workflow. A revision workflow is started
+ * some time after the document has been released.
+ */
+define("S_IN_REVISION",  4);
+
 /*
  * Document was rejected. A document is in rejected state when
  * the review failed or approval was not given.
@@ -2856,6 +2862,57 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_receiptStatus;
 	} /* }}} */
 
+	/**
+	 * Get the current revision status of the document content
+	 * The revision status is a list of revisions
+	 *
+	 * @return array list of revisions
+	 */
+	function getRevisionStatus($limit=1) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		if (!is_numeric($limit)) return false;
+
+		// Retrieve the current status of each assigned reviewer for the content
+		// represented by this object.
+		// FIXME: caching was turned off to make list of review log in ViewDocument
+		// possible
+		if (1 || !isset($this->_revisionStatus)) {
+			/* First get a list of all revisions for this document content */
+			$queryStr=
+				"SELECT revisionID FROM tblDocumentRevisers WHERE `version`='".$this->_version
+				."' AND `documentID` = '". $this->_document->getID() ."' ";
+			$recs = $db->getResultArray($queryStr);
+			if (is_bool($recs) && !$recs)
+				return false;
+			$this->_revisionStatus = array();
+			if($recs) {
+				foreach($recs as $rec) {
+					$queryStr=
+						"SELECT `tblDocumentRevisers`.*, `tblDocumentRevisionLog`.`revisionLogID`, ".
+						"`tblDocumentRevisionLog`.`status`, ".
+						"`tblDocumentRevisionLog`.`comment`, ".
+						"`tblDocumentRevisionLog`.`date`, ".
+						"`tblDocumentRevisionLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` AS `groupName` ".
+						"FROM `tblDocumentRevisers` ".
+						"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
+						"LEFT JOIN `tblUsers` on `tblUsers`.`id` = `tblDocumentRevisers`.`required` ".
+						"LEFT JOIN `tblGroups` on `tblGroups`.`id` = `tblDocumentRevisers`.`required` ".
+						"WHERE `tblDocumentRevisers`.`revisionID` = '". $rec['revisionID'] ."' ".
+						"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC LIMIT ".(int) $limit;
+
+					$res = $db->getResultArray($queryStr);
+					if (is_bool($res) && !$res) {
+						unset($this->_revisionStatus);
+						return false;
+					}
+					$this->_revisionStatus = array_merge($this->_revisionStatus, $res);
+				}
+			}
+		}
+		return $this->_revisionStatus;
+	} /* }}} */
+
 	function addIndReviewer($user, $requestUser, $listadmin=false) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
@@ -3414,6 +3471,113 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return 0;
 	} /* }}} */
 
+	function addIndReviser($user, $requestUser, $listadmin=false) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$userID = $user->getID();
+
+		// Get the list of users and groups with read access to this document.
+		if($this->_document->getAccessMode($user) < M_READ) {
+			return -2;
+		}
+
+		// Check to see if the user has already been added to the reviser list.
+		$revisionStatus = $user->getRevisionStatus($this->_document->getID(), $this->_version);
+		if (is_bool($revisionStatus) && !$revisionStatus) {
+			return -1;
+		}
+		$indstatus = false;
+		if (count($revisionStatus["indstatus"]) > 0) {
+			$indstatus = array_pop($revisionStatus["indstatus"]);
+			if($indstatus["status"]!=-2) {
+				// User is already on the list of recipients; return an error.
+				return -3;
+			}
+		}
+
+		// Add the user into the revisers database.
+		if (!$indstatus || ($indstatus && $indstatus["status"]!=-2)) {
+			$queryStr = "INSERT INTO `tblDocumentRevisers` (`documentID`, `version`, `type`, `required`) ".
+				"VALUES ('". $this->_document->getID() ."', '". $this->_version ."', '0', '". $userID ."')";
+			$res = $db->getResult($queryStr);
+			if (is_bool($res) && !$res) {
+				return -1;
+			}
+			$revisionID = $db->getInsertID();
+		}
+		else {
+			$revisionID = isset($indstatus["revisionID"]) ? $indstatus["revisionID"] : NULL;
+		}
+
+		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+			"VALUES ('". $revisionID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+		$res = $db->getResult($queryStr);
+		if (is_bool($res) && !$res) {
+			return -1;
+		}
+
+		return 0;
+	} /* }}} */
+
+	function addGrpReviser($group, $requestUser) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$groupID = $group->getID();
+
+		// Get the list of users and groups with read access to this document.
+		if (!isset($this->_readAccessList)) {
+			// TODO: error checking.
+			$this->_readAccessList = $this->_document->getReadAccessList();
+		}
+		$approved = false;
+		foreach ($this->_readAccessList["groups"] as $appGroup) {
+			if ($groupID == $appGroup->getID()) {
+				$approved = true;
+				break;
+			}
+		}
+		if (!$approved) {
+			return -2;
+		}
+
+		// Check to see if the group has already been added to the review list.
+		$revisionStatus = $group->getRevisionStatus($this->_document->getID(), $this->_version);
+		if (is_bool($revisionStatus) && !$revisionStatus) {
+			return -1;
+		}
+		$status = false;
+		if (count($revisionStatus["status"]) > 0) {
+			$status = array_pop($revisionStatus["status"]);
+			if($status["status"]!=-2) {
+				// User is already on the list of recipients; return an error.
+				return -3;
+			}
+		}
+
+		// Add the group into the recipients database.
+		if (!$status || ($status && $status["status"]!=-2)) {
+			$queryStr = "INSERT INTO `tblDocumentRevisers` (`documentID`, `version`, `type`, `required`) ".
+				"VALUES ('". $this->_document->getID() ."', '". $this->_version ."', '1', '". $groupID ."')";
+			$res = $db->getResult($queryStr);
+			if (is_bool($res) && !$res) {
+				return -1;
+			}
+			$revisionID = $db->getInsertID();
+		}
+		else {
+			$revisionID = isset($status["revisionID"]) ? $status["revisionID"] : NULL;
+		}
+
+		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+			"VALUES ('". $revisionID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+		$res = $db->getResult($queryStr);
+		if (is_bool($res) && !$res) {
+			return -1;
+		}
+
+		return 0;
+	} /* }}} */
+
 	/**
 	 * Add a receipt to the document content
 	 *
@@ -3521,6 +3685,113 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
  } /* }}} */
 
+	/**
+	 * Add a revision to the document content
+	 *
+	 * This method will add an entry to the table tblDocumentRevisionLog.
+	 * It will first check if the user is ment to revision the document version.
+	 * It not the return value is -3.
+	 * Next it will check if the users has been removed from the list of
+	 * recipients. In that case -4 will be returned.
+	 * If the given revision has been set by the user before, it cannot
+	 * be set again and 0 will be returned. Іf the review could be succesfully
+	 * added, the review log id will be returned.
+	 *
+	 * @see SeedDMS_Core_DocumentContent::setApprovalByInd()
+	 * @param object $user user doing the revision
+	 * @param object $requestUser user asking for the revision, this is mostly
+	 * @param integer $status the status of the revision, possible values are
+	 *        0=unprocessed (maybe used to reset a status)
+	 *        1=received,
+	 *       -2=user is deleted (use {link
+	 *       SeedDMS_Core_DocumentContent::delIndRecipient} instead)
+	 * the user currently logged in.
+	 * @return integer new revision log id
+	 */
+	function setRevisionByInd($user, $requestUser, $status, $comment) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		// Check to see if the user can be removed from the review list.
+		$revisionStatus = $user->getRevisionStatus($this->_document->getID(), $this->_version);
+		if (is_bool($revisionStatus) && !$revisionStatus) {
+			return -1;
+		}
+		if (count($revisionStatus["indstatus"])==0) {
+			// User is not assigned to revision this document. No action required.
+			// Return an error.
+			return -3;
+		}
+		$indstatus = array_pop($revisionStatus["indstatus"]);
+		if ($indstatus["status"]==-2) {
+			// User has been deleted from recipients
+			return -4;
+		}
+		// Check if the status is really different from the current status
+		if ($indstatus["status"] == $status)
+			return 0;
+
+		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
+  	  `comment`, `date`, `userID`) ".
+			"VALUES ('". $indstatus["revisionID"] ."', '".
+			(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '".
+			$requestUser->getID() ."')";
+		$res=$db->getResult($queryStr);
+		if (is_bool($res) && !$res)
+			return -1;
+		else {
+			$revisionLogID = $db->getInsertID();
+			return $revisionLogID;
+		}
+ } /* }}} */
+
+	/**
+	 * Add a revision to the document content
+	 *
+	 * This method is similar to
+	 * {@see SeedDMS_Core_DocumentContent::setRevisionByInd()} but adds a revision
+	 * for a group instead of a user.
+	 *
+	 * @param object $group group doing the revision
+	 * @param object $requestUser user asking for the revision, this is mostly
+	 * the user currently logged in.
+	 * @return integer new revision log id
+	 */
+	function setRevisionByGrp($group, $requestUser, $status, $comment) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		// Check to see if the user can be removed from the recipient list.
+		$revisionStatus = $group->getRevisionStatus($this->_document->getID(), $this->_version);
+		if (is_bool($revisionStatus) && !$revisionStatus) {
+			return -1;
+		}
+		if (count($revisionStatus)==0) {
+			// User is not assigned to revision this document. No action required.
+			// Return an error.
+			return -3;
+		}
+		if ($revisionStatus[0]["status"]==-2) {
+			// Group has been deleted from recipients
+			return -4;
+		}
+
+		// Check if the status is really different from the current status
+		if ($revisionStatus[0]["status"] == $status)
+			return 0;
+
+		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`recipientsID`, `status`,
+  	  `comment`, `date`, `userID`) ".
+			"VALUES ('". $revisionStatus[0]["recipientsID"] ."', '".
+			(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '".
+			$requestUser->getID() ."')";
+		$res=$db->getResult($queryStr);
+		if (is_bool($res) && !$res)
+			return -1;
+		else {
+			$revisionLogID = $db->getInsertID();
+			return $revisionLogID;
+		}
+ } /* }}} */
+
 	function delIndReviewer($user, $requestUser) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
@@ -3653,7 +3924,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$userID = $user->getID();
 
 		// Check to see if the user can be removed from the recipient list.
-		$receiptStatus = $user->getReceiptStatus($this->_document->getID(), $this->_version);
+		$revisionStatus = $user->getReceiptStatus($this->_document->getID(), $this->_version);
 		if (is_bool($receiptStatus) && !$receiptStatus) {
 			return -1;
 		}
@@ -3711,6 +3982,70 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return 0;
 	} /* }}} */
 
+	function delIndReviser($user, $requestUser) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$userID = $user->getID();
+
+		// Check to see if the user can be removed from the reviser list.
+		$revisionStatus = $user->getRevisionStatus($this->_document->getID(), $this->_version);
+		if (is_bool($revisionStatus) && !$revisionStatus) {
+			return -1;
+		}
+		if (count($revisionStatus["indstatus"])==0) {
+			// User is not assigned to revision this document. No action required.
+			// Return an error.
+			return -3;
+		}
+		$indstatus = array_pop($revisionStatus["indstatus"]);
+		if ($indstatus["status"]!=0) {
+			// User has already submitted a revision or has already been deleted;
+			// return an error.
+			return -3;
+		}
+
+		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+			"VALUES ('". $indstatus["revisionID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+		$res = $db->getResult($queryStr);
+		if (is_bool($res) && !$res) {
+			return -1;
+		}
+
+		return 0;
+	} /* }}} */
+
+	function delGrpReviser($group, $requestUser) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$groupID = $group->getID();
+
+		// Check to see if the user can be removed from the reviser list.
+		$revisionStatus = $group->getRevisionStatus($this->_document->getID(), $this->_version);
+		if (is_bool($revisionStatus) && !$revisionStatus) {
+			return -1;
+		}
+		if (count($revisionStatus["status"])==0) {
+			// User is not assigned to revision this document. No action required.
+			// Return an error.
+			return -3;
+		}
+		$status = array_pop($revisionStatus["status"]);
+		if ($tatus["status"]!=0) {
+			// User has already submitted a revision or has already been deleted;
+			// return an error.
+			return -3;
+		}
+
+		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+			"VALUES ('". $status["revisionID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+		$res = $db->getResult($queryStr);
+		if (is_bool($res) && !$res) {
+			return -1;
+		}
+
+		return 0;
+	} /* }}} */
+
 	/**
 	 * Set state of workflow assigned to the document content
 	 *
diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 5fb5f30c2..c389cebd4 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -310,6 +310,28 @@ class SeedDMS_Core_Group {
 			}
 		}
 
+		$receiptStatus = $this->getReceiptStatus();
+		foreach ($receiptStatus as $r) {
+			$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+				"VALUES ('". $r["receiptID"] ."', '-2', 'Recipients group removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+			$res=$db->getResult($queryStr);
+			if(!$res) {
+				$db->rollbackTransaction();
+				return false;
+			}
+		}
+
+		$revisionStatus = $this->getRevisionStatus();
+		foreach ($revisionStatus as $r) {
+			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+				"VALUES ('". $r["revisionID"] ."', '-2', 'Revisers group removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+			$res=$db->getResult($queryStr);
+			if(!$res) {
+				$db->rollbackTransaction();
+				return false;
+			}
+		}
+
 		$db->commitTransaction();
 
 		return true;
@@ -410,5 +432,37 @@ class SeedDMS_Core_Group {
 		return $status;
 	} /* }}} */
 
+	function getRevisionStatus($documentID=null, $version=null) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$status = array();
+
+		// See if the group is assigned as a reviser.
+		$queryStr = "SELECT `tblDocumentRevisers`.*, `tblDocumentRevisionLog`.`status`, ".
+			"`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ".
+			"`tblDocumentRevisionLog`.`userID` ".
+			"FROM `tblDocumentRevisers` ".
+			"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
+			"WHERE `tblDocumentRevisers`.`type`='1' ".
+			($documentID==null ? "" : "AND `tblDocumentRevisers`.`documentID` = '". (int) $documentID ."' ").
+			($version==null ? "" : "AND `tblDocumentRevisers`.`version` = '". (int) $version ."' ").
+			"AND `tblDocumentRevisers`.`required`='". $this->_id ."' ";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr)>0) {
+			foreach ($resArr as $res) {
+				if(isset($status["status"][$res['documentID']])) {
+					if($status["status"][$res['documentID']]['date'] < $res['date']) {
+						$status["status"][$res['documentID']] = $res;
+					}
+				} else {
+					$status["status"][$res['documentID']] = $res;
+				}
+			}
+		}
+		return $status;
+	} /* }}} */
+
 }
 ?>
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 30c79e0c4..f45372494 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -686,6 +686,28 @@ class SeedDMS_Core_User {
 			}
 		}
 
+		$receiptStatus = $this->getReceiptStatus();
+		foreach ($receiptStatus["indstatus"] as $ri) {
+			$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+				"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+			$res=$db->getResult($queryStr);
+			if(!$res) {
+				$db->rollbackTransaction();
+				return false;
+			}
+		}
+
+		$revisionStatus = $this->getRevisionStatus();
+		foreach ($revisionStatus["indstatus"] as $ri) {
+			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+				"VALUES ('". $ri["revisionID"] ."', '-2', 'Reviser removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+			$res=$db->getResult($queryStr);
+			if(!$res) {
+				$db->rollbackTransaction();
+				return false;
+			}
+		}
+
 		$db->commitTransaction();
 		return true;
 	} /* }}} */
@@ -901,11 +923,6 @@ class SeedDMS_Core_User {
 	function getReviewStatus($documentID=null, $version=null) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-/*
-		if (!$db->createTemporaryTable("ttreviewid")) {
-			return false;
-		}
-*/
 		$status = array("indstatus"=>array(), "grpstatus"=>array());
 
 		// See if the user is assigned as an individual reviewer.
@@ -995,27 +1012,7 @@ class SeedDMS_Core_User {
 	function getApprovalStatus($documentID=null, $version=null) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-/*
-		if (!$db->createTemporaryTable("ttapproveid")) {
-			return false;
-		}
-*/
 		$status = array("indstatus"=>array(), "grpstatus"=>array());
-
-		// See if the user is assigned as an individual approver.
-		/*
-		$queryStr = "SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`status`, ".
-			"`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ".
-			"`tblDocumentApproveLog`.`userID` ".
-			"FROM `tblDocumentApprovers` ".
-			"LEFT JOIN `tblDocumentApproveLog` USING (`approveID`) ".
-			"LEFT JOIN `ttapproveid` on `ttapproveid`.`maxLogID` = `tblDocumentApproveLog`.`approveLogID` ".
-			"WHERE `ttapproveid`.`maxLogID`=`tblDocumentApproveLog`.`approveLogID` ".
-			($documentID==null ? "" : "AND `tblDocumentApprovers`.`documentID` = '". $documentID ."' ").
-			($version==null ? "" : "AND `tblDocumentApprovers`.`version` = '". $version ."' ").
-			"AND `tblDocumentApprovers`.`type`='0' ".
-			"AND `tblDocumentApprovers`.`required`='". $this->_id ."' ";
-*/
 		$queryStr =
    "SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`status`, ".
 			"`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ".
@@ -1045,20 +1042,6 @@ class SeedDMS_Core_User {
 
 		// See if the user is the member of a group that has been assigned to
 		// approve the document version.
-		/*
-		$queryStr = "SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`status`, ".
-			"`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ".
-			"`tblDocumentApproveLog`.`userID` ".
-			"FROM `tblDocumentApprovers` ".
-			"LEFT JOIN `tblDocumentApproveLog` USING (`approveID`) ".
-			"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentApprovers`.`required` ".
-			"LEFT JOIN `ttapproveid` on `ttapproveid`.`maxLogID` = `tblDocumentApproveLog`.`approveLogID` ".
-			"WHERE `ttapproveid`.`maxLogID`=`tblDocumentApproveLog`.`approveLogID` ".
-			($documentID==null ? "" : "AND `tblDocumentApprovers`.`documentID` = '". $documentID ."' ").
-			($version==null ? "" : "AND `tblDocumentApprovers`.`version` = '". $version ."' ").
-			"AND `tblDocumentApprovers`.`type`='1' ".
-			"AND `tblGroupMembers`.`userID`='". $this->_id ."'";
-			*/
 		$queryStr =
 			"SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`status`, ".
 			"`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ".
@@ -1108,11 +1091,6 @@ class SeedDMS_Core_User {
 	function getReceiptStatus($documentID=null, $version=null) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-/*
-		if (!$db->createTemporaryTable("ttreviewid")) {
-			return false;
-		}
-*/
 		$status = array("indstatus"=>array(), "grpstatus"=>array());
 
 		// See if the user is assigned as an individual recipient.
@@ -1171,6 +1149,84 @@ class SeedDMS_Core_User {
 		return $status;
 	} /* }}} */
 
+	/**
+	 * Get a list of revisions
+	 * This function returns a list of all revisions seperated by individual
+	 * and group revisions. If the document id
+	 * is passed, then only this document will be checked for revisions. The
+	 * same is true for the version of a document which limits the list
+	 * further.
+	 *
+	 * For a detaile description of the result array see
+	 * {link SeedDMS_Core_User::getApprovalStatus} which does the same for
+	 * approvals.
+	 *
+	 * @param int $documentID optional document id for which to retrieve the
+	 *        revisions
+	 * @param int $version optional version of the document
+	 * @return array list of all revisions
+	 */
+	function getRevisionStatus($documentID=null, $version=null) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$status = array("indstatus"=>array(), "grpstatus"=>array());
+
+		// See if the user is assigned as an individual reviser.
+		$queryStr = "SELECT `tblDocumentRevisers`.*, `tblDocumentRevisionLog`.`status`, ".
+			"`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ".
+			"`tblDocumentRevisionLog`.`userID` ".
+			"FROM `tblDocumentRevisers` ".
+			"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
+			"WHERE `tblDocumentRevisers`.`type`='0' ".
+			($documentID==null ? "" : "AND `tblDocumentRevisers`.`documentID` = '". (int) $documentID ."' ").
+			($version==null ? "" : "AND `tblDocumentRevisers`.`version` = '". (int) $version ."' ").
+			"AND `tblDocumentRevisers`.`required`='". $this->_id ."' ".
+			"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr === false)
+			return false;
+		if (count($resArr)>0) {
+			foreach ($resArr as $res) {
+				if(isset($status["indstatus"][$res['documentID']])) {
+					if($status["indstatus"][$res['documentID']]['date'] < $res['date']) {
+						$status["indstatus"][$res['documentID']] = $res;
+					}
+				} else {
+					$status["indstatus"][$res['documentID']] = $res;
+				}
+			}
+		}
+
+		// See if the user is the member of a group that has been assigned to
+		// revision the document version.
+		$queryStr = "SELECT `tblDocumentRevisers`.*, `tblDocumentRevisionLog`.`status`, ".
+			"`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ".
+			"`tblDocumentRevisionLog`.`userID` ".
+			"FROM `tblDocumentRevisers` ".
+			"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
+			"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentRevisers`.`required` ".
+			"WHERE `tblDocumentRevisers`.`type`='1' ".
+			($documentID==null ? "" : "AND `tblDocumentRevisers`.`documentID` = '". (int) $documentID ."' ").
+			($version==null ? "" : "AND `tblDocumentRevisers`.`version` = '". (int) $version ."' ").
+			"AND `tblGroupMembers`.`userID`='". $this->_id ."' ".
+			"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr === false)
+			return false;
+		if (count($resArr)>0) {
+			foreach ($resArr as $res) {
+				if(isset($status["grpstatus"][$res['documentID']])) {
+					if($status["grpstatus"][$res['documentID']]['date'] < $res['date']) {
+						$status["grpstatus"][$res['documentID']] = $res;
+					}
+				} else {
+					$status["grpstatus"][$res['documentID']] = $res;
+				}
+			}
+		}
+		return $status;
+	} /* }}} */
+
 	/**
 	 * Get a list of documents with a workflow
 	 *

From ebdfc45b69c80fc72944ba8ea7f76f42a352a5b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 10:31:56 +0200
Subject: [PATCH 0022/2006] add tables for revision workflow

---
 install/create_tables-innodb.sql  | 36 +++++++++++++++++++++++++++++++
 install/create_tables-sqlite3.sql | 30 ++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 078b44eb9..9202b712a 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -415,6 +415,42 @@ CREATE TABLE `tblDocumentReceiptLog` (
   CONSTRAINT `tblDocumentReceiptLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblDocumentRevisers`
+-- 
+
+CREATE TABLE `tblDocumentRevisers` (
+  `revisionID` int(11) NOT NULL auto_increment,
+  `documentID` int(11) NOT NULL default '0',
+  `version` smallint(5) unsigned NOT NULL default '0',
+  `type` tinyint(4) NOT NULL default '0',
+  `required` int(11) NOT NULL default '0',
+  `startdate` datetime default NULL,
+  PRIMARY KEY  (`revisionID`),
+  UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
+  CONSTRAINT `tblDocumentRevisers_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblDocumentRevisionLog`
+-- 
+
+CREATE TABLE `tblDocumentRevisionLog` (
+  `revisionLogID` int(11) NOT NULL auto_increment,
+  `revisionID` int(11) NOT NULL default '0',
+  `status` tinyint(4) NOT NULL default '0',
+  `comment` text NOT NULL,
+  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `userID` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`revisionLogID`),
+  CONSTRAINT `tblDocumentRevisionLog_revision` FOREIGN KEY (`revisionID`) REFERENCES `tblDocumentRevisers` (`revisionID`) ON DELETE CASCADE,
+  CONSTRAINT `tblDocumentRevisionLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 -- --------------------------------------------------------
 -- 
 -- Table structure for table `tblDocumentStatus`
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 0d562d5b6..3d5b700fc 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -361,6 +361,36 @@ CREATE TABLE `tblDocumentRecipients` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblDocumentRevisionLog`
+-- 
+
+CREATE TABLE `tblDocumentRevisionLog` (
+  `revisionLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `revisionID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRevisers` (`revisionID`) ON DELETE CASCADE,
+  `status` INTEGER NOT NULL default 0,
+  `comment` TEXT NOT NULL,
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblDocumentRevisers`
+-- 
+
+CREATE TABLE `tblDocumentRevisers` (
+  `revisionID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `type` INTEGER NOT NULL default '0',
+  `required` INTEGER NOT NULL default '0',
+  UNIQUE (`documentID`,`version`,`type`,`required`)
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table `tblDocumentStatus`
 -- 

From 040839714d9ba9acbd26574b310a539aad177985 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 10:32:25 +0200
Subject: [PATCH 0023/2006] init datepicker for #revisionstartdate

---
 styles/bootstrap/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 8557f28b7..7c595de3d 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -15,7 +15,7 @@ $(document).ready( function() {
 
 	$('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });
 
-	$('#expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate')
+	$('#expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate, #revisionstartdate')
 		.datepicker()
 		.on('changeDate', function(ev){
 			$(ev.currentTarget).datepicker('hide');

From 0addaf56d357ae5519380cabeb691ccdc148ed16 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 10:33:49 +0200
Subject: [PATCH 0024/2006] add missing files for revision workflow and
 document reception

---
 op/op.SetRecipients.php                 | 308 ++++++++++++++++++++++++
 op/op.SetRevisers.php                   | 308 ++++++++++++++++++++++++
 out/out.SetRecipients.php               |  71 ++++++
 out/out.SetRevisers.php                 |  71 ++++++
 views/bootstrap/class.SetRecipients.php | 132 ++++++++++
 views/bootstrap/class.SetRevisers.php   | 138 +++++++++++
 6 files changed, 1028 insertions(+)
 create mode 100644 op/op.SetRecipients.php
 create mode 100644 op/op.SetRevisers.php
 create mode 100644 out/out.SetRecipients.php
 create mode 100644 out/out.SetRevisers.php
 create mode 100644 views/bootstrap/class.SetRecipients.php
 create mode 100644 views/bootstrap/class.SetRevisers.php

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
new file mode 100644
index 000000000..6bd7c4e61
--- /dev/null
+++ b/op/op.SetRecipients.php
@@ -0,0 +1,308 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.ClassEmail.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$documentid = $_POST["documentid"];
+$document = $dms->getDocument($documentid);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_ALL) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
+if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+$version = $_POST["version"];
+$content = $document->getContentByVersion($version);
+
+if (!is_object($content)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+$folder = $document->getFolder();
+
+// Retrieve a list of all users and groups that have read rights.
+// Afterwards, reorganize them in two arrays with its key being the
+// userid or groupid
+$docAccess = $document->getReadAccessList();
+$accessIndex = array("i"=>array(), "g"=>array());
+foreach ($docAccess["users"] as $i=>$da) {
+	$accessIndex["i"][$da->getID()] = $da;
+}
+foreach ($docAccess["groups"] as $i=>$da) {
+	$accessIndex["g"][$da->getID()] = $da;
+}
+
+// Retrieve list of currently assigned recipients, along with
+// their latest status.
+$receiptStatus = $content->getReceiptStatus();
+// Index the receipt results for easy cross-reference with the Approvers List.
+$receiptIndex = array("i"=>array(), "g"=>array());
+foreach ($receiptStatus as $i=>$rs) {
+	if ($rs["status"]!=-2) {
+		if ($rs["type"]==0) {
+			$receiptIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
+		}
+		else if ($rs["type"]==1) {
+			$receiptIndex["g"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
+		}
+	}
+}
+
+// Get the list of proposed recipients, stripping out any duplicates.
+$pIndRev = (isset($_POST["indRecipients"]) ? array_values(array_unique($_POST["indRecipients"])) : array());
+$pGrpRev = (isset($_POST["grpRecipients"]) ? array_values(array_unique($_POST["grpRecipients"])) : array());
+foreach ($pIndRev as $p) {
+	if (is_numeric($p)) {
+		if (isset($accessIndex["i"][$p])) {
+			// Proposed recipient is on the list of possible recipients.
+			if (!isset($receiptIndex["i"][$p])) {
+				// Proposed recipient is not a current recipient, so add as a new
+				// recipient.
+				$res = $content->addIndRecipient($accessIndex["i"][$p], $user);
+				$unm = $accessIndex["i"][$p]->getFullName();
+				$uml = $accessIndex["i"][$p]->getEmail();
+				
+				switch ($res) {
+					case 0:
+						// Send an email notification to the new recipient.
+						if($settings->_enableNotificationAppRev) {
+							if ($notifier) {
+								$subject = "receipt_request_email_subject";
+								$message = "receipt_request_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = $content->_version;
+								$params['comment'] = $content->getComment();
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+								
+								$notifier->toIndividual($user, $accessIndex["i"][$p], $subject, $message, $params);
+							}
+						}
+						break;
+					case -1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
+						break;
+					case -2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+						break;
+					case -3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_assigned"));
+						break;
+					case -4:
+						// email error
+						break;
+				}
+			}
+			else {
+				// Proposed recipient is already in the list of recipients.
+				// Remove recipient from the index of possible recipients. If there are
+				// any recipients left over in the list of possible recipients, they
+				// will be removed from the receipt process for this document revision.
+				unset($receiptIndex["i"][$p]);
+			}
+		}
+	}
+}
+if (count($receiptIndex["i"]) > 0) {
+	foreach ($receiptIndex["i"] as $rx=>$rv) {
+		if ($rv["status"] == 0) {
+			// User is to be removed from the recipients list.
+			if (!isset($accessIndex["i"][$rx])) {
+				// User does not have any receipt privileges for this document
+				// revision or does not exist.
+				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('". $receiptStatus[$rv["idx"]]["receiptID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
+				$res = $db->getResult($queryStr);
+			}
+			else {
+				$res = $content->delIndRecipient($accessIndex["i"][$rx], $user);
+				$unm = $accessIndex["i"][$rx]->getFullName();
+				$uml = $accessIndex["i"][$rx]->getEmail();
+				switch ($res) {
+					case 0:
+						// Send an email notification to the recipients.
+						if($settings->_enableNotificationAppRev) {
+							if ($notifier) {
+								$subject = "receipt_deletion_email_subject";
+								$message = "receipt_deletion_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = $content->_version;
+								$params['comment'] = $content->getComment();
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+								
+								$notifier->toIndividual($user, $accessIndex["i"][$rx], $subject, $message, $params);
+							}
+						}
+						break;
+					case -1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
+						break;
+					case -2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+						break;
+					case -3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_removed"));
+						break;
+					case -4:
+						// email error
+						break;
+				}
+			}
+		}
+	}
+}
+foreach ($pGrpRev as $p) {
+	if (is_numeric($p)) {
+		if (isset($accessIndex["g"][$p])) {
+			// Proposed recipient is on the list of possible recipients.
+			if (!isset($receiptIndex["g"][$p])) {
+				// Proposed recipient is not a current recipient, so add as a new
+				// recipient.
+				$res = $content->addGrpRecipient($accessIndex["g"][$p], $user);
+				$gnm = $accessIndex["g"][$p]->getName();
+				switch ($res) {
+					case 0:
+						// Send an email notification to the new recipient.
+						if($settings->_enableNotificationAppRev) {
+							if ($notifier) {
+								$subject = "receipt_request_email_subject";
+								$message = "receipt_request_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = $content->_version;
+								$params['comment'] = $content->getComment();
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+							
+								$notifier->toGroup($user, $accessIndex["g"][$p], $subject, $message, $params);
+							}
+						}
+						break;
+					case -1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
+						break;
+					case -2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+						break;
+					case -3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_assigned"));
+						break;
+					case -4:
+						// email error
+						break;
+				}
+			}
+			else {
+				// Remove recipient from the index of possible recipients.
+				unset($receiptIndex["g"][$p]);
+			}
+		}
+	}
+}
+if (count($receiptIndex["g"]) > 0) {
+	foreach ($receiptIndex["g"] as $rx=>$rv) {
+		if ($rv["status"] == 0) {
+			// Group is to be removed from the recipientist.
+			if (!isset($accessIndex["g"][$rx])) {
+				// Group does not have any receipt privileges for this document
+				// revision or does not exist.
+				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('". $receiptStatus[$rv["idx"]]["receiptID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
+				$res = $db->getResult($queryStr);
+			}
+			else {
+				$res = $content->delGrpRecipient($accessIndex["g"][$rx], $user);
+				$gnm = $accessIndex["g"][$rx]->getName();
+				switch ($res) {
+					case 0:
+						// Send an email notification to the recipients group.
+						if($settings->_enableNotificationAppRev) {
+							if ($notifier) {
+								$subject = "receipt_deletion_email_subject";
+								$message = "receipt_deletion_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = $content->_version;
+								$params['comment'] = $content->getComment();
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+							
+								$notifier->toGroup($user, $accessIndex["g"][$rx], $subject, $message, $params);
+							}
+						}
+						break;
+					case -1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
+						break;
+					case -2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+						break;
+					case -3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_removed"));
+						break;
+					case -4:
+						// email error
+						break;
+				}
+			}
+		}
+	}
+}
+
+add_log_line("?documentid=".$documentid);
+header("Location:../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version);
+
+?>
diff --git a/op/op.SetRevisers.php b/op/op.SetRevisers.php
new file mode 100644
index 000000000..28fdac5ef
--- /dev/null
+++ b/op/op.SetRevisers.php
@@ -0,0 +1,308 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.ClassEmail.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$documentid = $_POST["documentid"];
+$document = $dms->getDocument($documentid);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_ALL) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
+if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+$version = $_POST["version"];
+$content = $document->getContentByVersion($version);
+
+if (!is_object($content)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+$folder = $document->getFolder();
+
+// Retrieve a list of all users and groups that have read rights.
+// Afterwards, reorganize them in two arrays with its key being the
+// userid or groupid
+$docAccess = $document->getReadAccessList();
+$accessIndex = array("i"=>array(), "g"=>array());
+foreach ($docAccess["users"] as $i=>$da) {
+	$accessIndex["i"][$da->getID()] = $da;
+}
+foreach ($docAccess["groups"] as $i=>$da) {
+	$accessIndex["g"][$da->getID()] = $da;
+}
+
+// Retrieve list of currently assigned recipients, along with
+// their latest status.
+$revisionStatus = $content->getRevisionStatus();
+// Index the revision results for easy cross-reference with the Approvers List.
+$revisionIndex = array("i"=>array(), "g"=>array());
+foreach ($revisionStatus as $i=>$rs) {
+	if ($rs["status"]!=-2) {
+		if ($rs["type"]==0) {
+			$revisionIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
+		}
+		else if ($rs["type"]==1) {
+			$revisionIndex["g"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
+		}
+	}
+}
+
+// Get the list of proposed recipients, stripping out any duplicates.
+$pIndRev = (isset($_POST["indRevisers"]) ? array_values(array_unique($_POST["indRevisers"])) : array());
+$pGrpRev = (isset($_POST["grpRevisers"]) ? array_values(array_unique($_POST["grpRevisers"])) : array());
+foreach ($pIndRev as $p) {
+	if (is_numeric($p)) {
+		if (isset($accessIndex["i"][$p])) {
+			// Proposed recipient is on the list of possible recipients.
+			if (!isset($revisionIndex["i"][$p])) {
+				// Proposed recipient is not a current recipient, so add as a new
+				// recipient.
+				$res = $content->addIndReviser($accessIndex["i"][$p], $user);
+				$unm = $accessIndex["i"][$p]->getFullName();
+				$uml = $accessIndex["i"][$p]->getEmail();
+				
+				switch ($res) {
+					case 0:
+						// Send an email notification to the new recipient.
+						if($settings->_enableNotificationAppRev) {
+							if ($notifier) {
+								$subject = "revision_request_email_subject";
+								$message = "revision_request_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = $content->_version;
+								$params['comment'] = $content->getComment();
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+								
+								$notifier->toIndividual($user, $accessIndex["i"][$p], $subject, $message, $params);
+							}
+						}
+						break;
+					case -1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
+						break;
+					case -2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+						break;
+					case -3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_assigned"));
+						break;
+					case -4:
+						// email error
+						break;
+				}
+			}
+			else {
+				// Proposed recipient is already in the list of recipients.
+				// Remove recipient from the index of possible recipients. If there are
+				// any recipients left over in the list of possible recipients, they
+				// will be removed from the revision process for this document revision.
+				unset($revisionIndex["i"][$p]);
+			}
+		}
+	}
+}
+if (count($revisionIndex["i"]) > 0) {
+	foreach ($revisionIndex["i"] as $rx=>$rv) {
+		if ($rv["status"] == 0) {
+			// User is to be removed from the recipients list.
+			if (!isset($accessIndex["i"][$rx])) {
+				// User does not have any revision privileges for this document
+				// revision or does not exist.
+				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('". $revisionStatus[$rv["idx"]]["revisionID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
+				$res = $db->getResult($queryStr);
+			}
+			else {
+				$res = $content->delIndReviser($accessIndex["i"][$rx], $user);
+				$unm = $accessIndex["i"][$rx]->getFullName();
+				$uml = $accessIndex["i"][$rx]->getEmail();
+				switch ($res) {
+					case 0:
+						// Send an email notification to the recipients.
+						if($settings->_enableNotificationAppRev) {
+							if ($notifier) {
+								$subject = "revision_deletion_email_subject";
+								$message = "revision_deletion_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = $content->_version;
+								$params['comment'] = $content->getComment();
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+								
+								$notifier->toIndividual($user, $accessIndex["i"][$rx], $subject, $message, $params);
+							}
+						}
+						break;
+					case -1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
+						break;
+					case -2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+						break;
+					case -3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_removed"));
+						break;
+					case -4:
+						// email error
+						break;
+				}
+			}
+		}
+	}
+}
+foreach ($pGrpRev as $p) {
+	if (is_numeric($p)) {
+		if (isset($accessIndex["g"][$p])) {
+			// Proposed recipient is on the list of possible recipients.
+			if (!isset($revisionIndex["g"][$p])) {
+				// Proposed recipient is not a current recipient, so add as a new
+				// recipient.
+				$res = $content->addGrpReviser($accessIndex["g"][$p], $user);
+				$gnm = $accessIndex["g"][$p]->getName();
+				switch ($res) {
+					case 0:
+						// Send an email notification to the new recipient.
+						if($settings->_enableNotificationAppRev) {
+							if ($notifier) {
+								$subject = "revision_request_email_subject";
+								$message = "revision_request_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = $content->_version;
+								$params['comment'] = $content->getComment();
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+							
+								$notifier->toGroup($user, $accessIndex["g"][$p], $subject, $message, $params);
+							}
+						}
+						break;
+					case -1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
+						break;
+					case -2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+						break;
+					case -3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_assigned"));
+						break;
+					case -4:
+						// email error
+						break;
+				}
+			}
+			else {
+				// Remove recipient from the index of possible recipients.
+				unset($revisionIndex["g"][$p]);
+			}
+		}
+	}
+}
+if (count($revisionIndex["g"]) > 0) {
+	foreach ($revisionIndex["g"] as $rx=>$rv) {
+		if ($rv["status"] == 0) {
+			// Group is to be removed from the recipientist.
+			if (!isset($accessIndex["g"][$rx])) {
+				// Group does not have any revision privileges for this document
+				// revision or does not exist.
+				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('". $revisionStatus[$rv["idx"]]["revisionID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
+				$res = $db->getResult($queryStr);
+			}
+			else {
+				$res = $content->delGrpReviser($accessIndex["g"][$rx], $user);
+				$gnm = $accessIndex["g"][$rx]->getName();
+				switch ($res) {
+					case 0:
+						// Send an email notification to the recipients group.
+						if($settings->_enableNotificationAppRev) {
+							if ($notifier) {
+								$subject = "revision_deletion_email_subject";
+								$message = "revision_deletion_email_body";
+								$params = array();
+								$params['name'] = $document->getName();
+								$params['folder_path'] = $folder->getFolderPathPlain();
+								$params['version'] = $content->_version;
+								$params['comment'] = $content->getComment();
+								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['sitename'] = $settings->_siteName;
+								$params['http_root'] = $settings->_httpRoot;
+							
+								$notifier->toGroup($user, $accessIndex["g"][$rx], $subject, $message, $params);
+							}
+						}
+						break;
+					case -1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("internal_error"));
+						break;
+					case -2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+						break;
+					case -3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_removed"));
+						break;
+					case -4:
+						// email error
+						break;
+				}
+			}
+		}
+	}
+}
+
+add_log_line("?documentid=".$documentid);
+header("Location:../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version);
+
+?>
diff --git a/out/out.SetRecipients.php b/out/out.SetRecipients.php
new file mode 100644
index 000000000..92610de23
--- /dev/null
+++ b/out/out.SetRecipients.php
@@ -0,0 +1,71 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+$document = $dms->getDocument($_GET["documentid"]);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_ALL) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"]<1)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+
+$content = $document->getContentByVersion($_GET["version"]);
+if (!is_object($content)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+
+if(!$settings->_enableVersionModification) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_version_modification"));
+}
+
+$folder = $document->getFolder();
+
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp));
+if($view) {
+	$view->setParam('accessobject', $accessop);
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/out/out.SetRevisers.php b/out/out.SetRevisers.php
new file mode 100644
index 000000000..977f10998
--- /dev/null
+++ b/out/out.SetRevisers.php
@@ -0,0 +1,71 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+$document = $dms->getDocument($_GET["documentid"]);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_ALL) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"]<1)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+
+$content = $document->getContentByVersion($_GET["version"]);
+if (!is_object($content)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+
+if(!$settings->_enableVersionModification) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_version_modification"));
+}
+
+$folder = $document->getFolder();
+
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
+if($view) {
+	$view->setParam('accessobject', $accessop);
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
new file mode 100644
index 000000000..b6ceb6843
--- /dev/null
+++ b/views/bootstrap/class.SetRecipients.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Implementation of SetRecipients view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2015 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for SetRecipients view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2015 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$document = $this->params['document'];
+		$content = $this->params['version'];
+
+		$overallStatus = $content->getStatus();
+
+		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
+		$this->globalNavigation($folder);
+		$this->contentStart();
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
+		$this->contentHeading(getMLText("change_assignments"));
+
+		// Retrieve a list of all users and groups that have receipt privileges.
+		$docAccess = $document->getReadAccessList();
+
+		// Retrieve list of currently assigned recipients, along with
+		// their latest status.
+		$receiptStatus = $content->getReceiptStatus();
+
+		// Index the receipt results for easy cross-reference with the recipient list.
+		$receiptIndex = array("i"=>array(), "g"=>array());
+		foreach ($receiptStatus as $i=>$rs) {
+			if ($rs["type"]==0) {
+				$receiptIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
+			} elseif ($rs["type"]==1) {
+				$receiptIndex["g"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
+			}
+		}
+?>
+
+<?php $this->contentContainerStart(); ?>
+
+<form action="../op/op.SetRecipients.php" method="post" name="form1">
+
+<?php $this->contentSubHeading(getMLText("update_recipients"));?>
+
+  <div class="cbSelectTitle"><?php printMLText("individuals")?>:</div>
+  <select class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+
+		foreach ($docAccess["users"] as $usr) {
+			if (isset($receiptIndex["i"][$usr->getID()])) {
+
+				switch ($receiptIndex["i"][$usr->getID()]["status"]) {
+					case 0:
+						print "<option value='". $usr->getID() ."' selected='selected'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						break;
+					case -2:
+						print "<option value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						break;
+					default:
+						print "<option value='". $usr->getID() ."' disabled='disabled'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						break;
+				}
+			} else {
+				print "<option value='". $usr->getID() ."'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+			}
+		}
+?>
+  </select>
+
+  <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
+  <select class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+<?php
+		foreach ($docAccess["groups"] as $group) {
+			if (isset($receiptIndex["g"][$group->getID()])) {
+				switch ($receiptIndex["g"][$group->getID()]["status"]) {
+					case 0:
+						print "<option value='". $group->getID() ."' selected='selected'>".htmlspecialchars($group->getName())."</option>";
+						break;
+					case -2:
+						print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+						break;
+					default:
+						print "<option id='recGrp".$group->getID()."' type='checkbox' name='grpRecipients[]' value='". $group->getID() ."' disabled='disabled'>".htmlspecialchars($group->getName())."</option>";
+						break;
+				}
+			} else {
+				print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+			}
+		}
+?>
+  </select>
+
+<p>
+<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+<input type="submit" class="btn" value="<?php printMLText("update");?>">
+</p>
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>
diff --git a/views/bootstrap/class.SetRevisers.php b/views/bootstrap/class.SetRevisers.php
new file mode 100644
index 000000000..54e53b978
--- /dev/null
+++ b/views/bootstrap/class.SetRevisers.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Implementation of SetRevisers view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2015 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for SetRevisers view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2015 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_SetRevisers extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$document = $this->params['document'];
+		$content = $this->params['version'];
+
+		$overallStatus = $content->getStatus();
+
+		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
+		$this->globalNavigation($folder);
+		$this->contentStart();
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
+		$this->contentHeading(getMLText("change_assignments"));
+
+		// Retrieve a list of all users and groups that have revision privileges.
+		$docAccess = $document->getReadAccessList();
+
+		// Retrieve list of currently assigned revisers, along with
+		// their latest status.
+		$revisionStatus = $content->getRevisionStatus();
+		$startdate = '2015-05-23';
+
+		// Index the revision results for easy cross-reference with the reviser list.
+		$revisionIndex = array("i"=>array(), "g"=>array());
+		foreach ($revisionStatus as $i=>$rs) {
+			if ($rs["type"]==0) {
+				$revisionIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
+			} elseif ($rs["type"]==1) {
+				$revisionIndex["g"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
+			}
+		}
+?>
+
+<?php $this->contentContainerStart(); ?>
+
+<form action="../op/op.SetRevisers.php" method="post" name="form1">
+
+<?php $this->contentSubHeading(getMLText("update_revisers"));?>
+
+  <span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+    <input class="span4" size="16" name="startdate" type="text" value="<?php if($startdate) echo $startdate; else echo date('d-m-Y'); ?>">
+    <span class="add-on"><i class="icon-calendar"></i></span>
+  </span>
+
+  <div class="cbSelectTitle"><?php printMLText("individuals")?>:</div>
+  <select class="chzn-select span9" name="indRevisers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_revisers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+
+		foreach ($docAccess["users"] as $usr) {
+			if (isset($revisionIndex["i"][$usr->getID()])) {
+
+				switch ($revisionIndex["i"][$usr->getID()]["status"]) {
+					case 0:
+						print "<option value='". $usr->getID() ."' selected='selected'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						break;
+					case -2:
+						print "<option value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						break;
+					default:
+						print "<option value='". $usr->getID() ."' disabled='disabled'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						break;
+				}
+			} else {
+				print "<option value='". $usr->getID() ."'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+			}
+		}
+?>
+  </select>
+
+  <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
+  <select class="chzn-select span9" name="grpRevisers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_revisers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+<?php
+		foreach ($docAccess["groups"] as $group) {
+			if (isset($revisionIndex["g"][$group->getID()])) {
+				switch ($revisionIndex["g"][$group->getID()]["status"]) {
+					case 0:
+						print "<option value='". $group->getID() ."' selected='selected'>".htmlspecialchars($group->getName())."</option>";
+						break;
+					case -2:
+						print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+						break;
+					default:
+						print "<option id='recGrp".$group->getID()."' type='checkbox' name='grpRevisers[]' value='". $group->getID() ."' disabled='disabled'>".htmlspecialchars($group->getName())."</option>";
+						break;
+				}
+			} else {
+				print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+			}
+		}
+?>
+  </select>
+
+<p>
+<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+<input type="submit" class="btn" value="<?php printMLText("update");?>">
+</p>
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From df75ae5c8ca5db4eaf79ad5361ffc02db28d7cfd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 11:41:39 +0200
Subject: [PATCH 0025/2006] add method maySetReviser

---
 inc/inc.ClassAccessOperation.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 643aaf13f..9c3ed17fd 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -111,7 +111,7 @@ class SeedDMS_AccessOperation {
 	 * This check can only be done for documents. Setting the document
 	 * recipients is only allowed if version modification is turned on
 	 * in the settings.  The
-	 * admin may even set reviewers/approvers if is disallowed in the
+	 * admin may even set recipients if is disallowed in the
 	 * settings.
 	 */
 	function maySetRecipients() { /* {{{ */
@@ -125,6 +125,26 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if revisers may be edited
+	 *
+	 * This check can only be done for documents. Setting the document
+	 * revisers is only allowed if version modification is turned on
+	 * in the settings.  The
+	 * admin may even set revisers if is disallowed in the
+	 * settings.
+	 */
+	function maySetRevisers() { /* {{{ */
+		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
+			$latestContent = $this->obj->getLatestContent();
+			$status = $latestContent->getStatus();
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_EXPIRED)) {
+				return true;
+			}
+		}
+		return false;
+	} /* }}} */
+
 	/**
 	 * Check if workflow may be edited
 	 *

From 2d3277a7eaa6f2eeecc1c41f957de12f4ce64ece Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 11:42:20 +0200
Subject: [PATCH 0026/2006] add link to out/out.SetRevisers.php

---
 views/bootstrap/class.ViewDocument.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 0b755cbf4..97310764a 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -430,6 +430,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($accessop->maySetRecipients()) {
 			print "<li><a href='../out/out.SetRecipients.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_recipients")."</a></li>";
 		}
+		if($accessop->maySetRevisers()) {
+			print "<li><a href='../out/out.SetRevisers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_revisers")."</a></li>";
+		}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
 			if($accessop->maySetReviewersApprovers()) {

From 69e56a5087a5cf7d8288223dcd8537824481daa0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 13:38:02 +0200
Subject: [PATCH 0027/2006] various small updates

---
 languages/ar_EG/lang.inc |  8 ++++++++
 languages/bg_BG/lang.inc |  8 ++++++++
 languages/ca_ES/lang.inc |  8 ++++++++
 languages/cs_CZ/lang.inc |  8 ++++++++
 languages/de_DE/lang.inc | 14 +++++++++++---
 languages/en_GB/lang.inc | 18 +++++++++++++-----
 languages/es_ES/lang.inc |  8 ++++++++
 languages/fr_FR/lang.inc |  8 ++++++++
 languages/hu_HU/lang.inc |  8 ++++++++
 languages/it_IT/lang.inc |  8 ++++++++
 languages/nl_NL/lang.inc |  8 ++++++++
 languages/pl_PL/lang.inc |  8 ++++++++
 languages/pt_BR/lang.inc |  8 ++++++++
 languages/ro_RO/lang.inc |  8 ++++++++
 languages/ru_RU/lang.inc |  8 ++++++++
 languages/sk_SK/lang.inc |  8 ++++++++
 languages/sv_SE/lang.inc |  8 ++++++++
 languages/tr_TR/lang.inc |  8 ++++++++
 languages/zh_CN/lang.inc |  8 ++++++++
 languages/zh_TW/lang.inc |  8 ++++++++
 20 files changed, 168 insertions(+), 8 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 8a6f26a92..f048c2368 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -97,6 +97,8 @@ URL: [url]',
 'approval_summary' => 'ملخص الموافقة',
 'approval_update_failed' => 'خطأ في تحديث حالة الموافقة. فشل التحديث.',
 'approvers' => 'الموافقون',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'ابريل',
 'archive_creation' => 'انشاء ارشيف',
 'archive_creation_warning' => 'من خلال العملية التالية يمكنك انشاء ارشيف يحتوي على كل ملفات النظام. بعد انشاء الارشيف سيتم حفظه في ملف البيانات على السيرفر.<br>تحذير: الارشيف الذي تم انشاؤه ليكون مقروء بواسطة المستخدم لن يكون نافعا كملف نسخ احتياطي للسيرفر',
@@ -175,6 +177,8 @@ URL: [url]',
 'change_assignments' => 'تغيير التخصيصات',
 'change_password' => 'تغيير كلمة السر',
 'change_password_message' => 'تم تغيير كلمة السر.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'تغيير الحالة',
 'charts' => 'ﺝﺩﺍﻮﻟ',
 'chart_docsaccumulated_title' => '',
@@ -681,7 +685,9 @@ URL: [url]',
 المستخدم: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - تم ازالة المرفقات',
+'removed_recipient' => '',
 'removed_reviewer' => 'تم ازالته من قائمة المراجعة',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'تم ازالة مسار العمل من اصدار المستند
 مستند: [name]
 اصدار: [version]
@@ -731,6 +737,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - تم تقديم المراجعة',
 'review_summary' => 'ملخص المراجعة',
 'review_update_failed' => 'خطأ في تحديث حالة المراجعة. التحديث فشل.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'اعادة بدء مسار العمل',
 'rewind_workflow_email_body' => 'اعادة بدء مسار العمل
 المستند: [name]
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 9a08615d9..3db36c588 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -88,6 +88,8 @@ $text = array(
 'approval_summary' => 'Инфо за утвърждаване',
 'approval_update_failed' => 'Стана грешка при промяната на статуса на утвърждаването',
 'approvers' => 'Утвърждаващи',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Април',
 'archive_creation' => 'Създаване архив',
 'archive_creation_warning' => 'Тази операция ще създаде архив, съдържащ всички папки. След създаването архивът ще бъде съхранен в папката с данни на сървъра.<br>ВНИМАНИЕ: Архивът създаден като понятен за  човек, ще бъде непригоден за бекъп!',
@@ -160,6 +162,8 @@ $text = array(
 'change_assignments' => 'Промени предназначението',
 'change_password' => 'Промени паролата',
 'change_password_message' => 'Паролата променена',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Промени статусът',
 'charts' => '',
 'chart_docsaccumulated_title' => '',
@@ -579,7 +583,9 @@ $text = array(
 'removed_file_email' => 'Изтрий приложение',
 'removed_file_email_body' => '',
 'removed_file_email_subject' => '',
+'removed_recipient' => '',
 'removed_reviewer' => 'изтрит от списъка с рецензиращи',
+'removed_reviser' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -609,6 +615,8 @@ $text = array(
 'review_submit_email_subject' => '',
 'review_summary' => 'Сводка по рецензиите',
 'review_update_failed' => 'грешка при обновяване статуса на рецензията',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Превърти процес',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index e59e42745..c0d37ebde 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -93,6 +93,8 @@ URL: [url]',
 'approval_summary' => 'Resum d\'aprovació',
 'approval_update_failed' => 'Error actualitzant l\'estat d\'aprovació. Actualització fallada.',
 'approvers' => 'Aprovadors',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Abril',
 'archive_creation' => 'Creació d\'arxiu',
 'archive_creation_warning' => 'Amb aquesta operació pot crear un arxiu que contingui els fitxers de les carpetes del DMS complet. Després de crear-lo, l\'arxiu es guardarà a la carpeta de dades del servidor. <br>ATENCIÓ: un fitxer creat com llegible per humans no es podrà usar com a còpia de seguretat del servidor.',
@@ -165,6 +167,8 @@ URL: [url]',
 'change_assignments' => 'Canviar assignacions',
 'change_password' => '',
 'change_password_message' => '',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Canviar estat',
 'charts' => '',
 'chart_docsaccumulated_title' => '',
@@ -584,7 +588,9 @@ URL: [url]',
 'removed_file_email' => 'Adjunts eliminats',
 'removed_file_email_body' => '',
 'removed_file_email_subject' => '',
+'removed_recipient' => '',
 'removed_reviewer' => 'Ha estat eliminat de la llista de revisors',
+'removed_reviser' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -614,6 +620,8 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => 'Resum de revisió',
 'review_update_failed' => 'Error actualitzant l\'estat de la revisió. L\'actualizació ha fallat.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => '',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 1e9c6e603..4728bcf8b 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -104,6 +104,8 @@ URL: [url]',
 'approval_summary' => 'Souhrn schválení',
 'approval_update_failed' => 'Chyba při aktualizaci stavu schválení. Aktualizace selhala.',
 'approvers' => 'Schvalovatelé',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Duben',
 'archive_creation' => 'Archivování',
 'archive_creation_warning' => 'Pomocí této operace můžete vytvořit archiv obsahující soubory z celé složky DMS. Po jeho vytvoøení bude archiv ulžen v datové složce serveru. POZOR: archiv bude vytvořen jako běžně čitelný, nelze jej použít jako záložní server.',
@@ -182,6 +184,8 @@ URL: [url]',
 'change_assignments' => 'Změnit přiřazení',
 'change_password' => 'Změnit heslo',
 'change_password_message' => 'Vaše heslo bylo změněno.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Změna stavu',
 'charts' => 'Grafy',
 'chart_docsaccumulated_title' => 'Počet dokumentů',
@@ -692,7 +696,9 @@ Dokument: [document]
 Uživatel: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Odstraněná příloha',
+'removed_recipient' => '',
 'removed_reviewer' => 'byl odstraněn ze seznamu kontrolorů.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Odstraněn pracovní postup z verze dokumentu: [name]
 Verze: [version]
 Praconí postup: [workflow]
@@ -740,6 +746,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Odesláno přezkoumání',
 'review_summary' => 'Souhrn kontroly',
 'review_update_failed' => 'Chyba při aktualizaci stavu kontroly. Aktualizace selhala.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Nové spuštění pracovního postupu',
 'rewind_workflow_email_body' => 'Pracovní postup byl spuštěn znovu
 Dokument: [name]
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index a6c199735..507e049ee 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1983), dgrutsch (18)
+//    Translators: Admin (1991), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -109,6 +109,8 @@ URL: [url]',
 'approval_summary' => 'Übersicht Freigaben',
 'approval_update_failed' => 'Störung bei der Aktualisierung des Berechtigungsstatus. Aktualisierung gescheitert',
 'approvers' => 'Freigebender',
+'approver_already_assigned' => 'Freigeber bereits zugewiesen',
+'approver_already_removed' => 'Freigeber wurde bereits aus dem Freigabevorgang         entfernt oder hat die Freigabe bereits abgeschlossen',
 'april' => 'April',
 'archive_creation' => 'Archiv erzeugen',
 'archive_creation_warning' => 'Mit dieser Operation können Sie ein Archiv mit allen Dokumenten des DMS erzeugen. Nach der Erstellung wird das Archiv im Datenordner Ihres Servers gespeichert.<br />Warnung: ein menschenlesbares Archiv ist als Server-Backup unbrauchbar.',
@@ -187,6 +189,8 @@ URL: [url]',
 'change_assignments' => 'Zuweisungen ändern',
 'change_password' => 'Passwort ändern',
 'change_password_message' => 'Ihr Passwort wurde geändert.',
+'change_recipients' => 'Empfänger ändern',
+'change_revisers' => 'Wiedervorlage ändern',
 'change_status' => 'Status ändern',
 'charts' => 'Diagramme',
 'chart_docsaccumulated_title' => 'Anzahl Dokumente',
@@ -198,8 +202,8 @@ URL: [url]',
 'chart_selection' => 'Diagrammauswahl',
 'chart_sizeperuser_title' => 'Speicherplatz pro Benutzer',
 'checkedout_file_has_different_version' => 'Die ausgecheckte Version ist nicht identisch mit der aktuellen Version. Das Einchecken wird das Dokument nicht aktualisieren.',
-'checkedout_file_has_disappeared' => 'Die Datei des ausgecheckten Dokuments ist nicht mehr vorhanden. Das Einchecken wird keine neue Version erzeugen.',
-'checkedout_file_is_unchanged' => 'Die Datei des ausgecheckten Dokuments ist noch unverändert. Das Einchecken wird keine neue Version anlegen.',
+'checkedout_file_has_disappeared' => 'Die Datei des ausgecheckten Dokuments ist nicht mehr vorhanden. Das Einchecken wird keine neue Version erzeugen, setzt aber den Checkout-Status zurück..',
+'checkedout_file_is_unchanged' => 'Die Datei des ausgecheckten Dokuments ist noch unverändert. Das Einchecken wird keine neue Version anlegen, setzt aber den Checkout-Status zurück.',
 'checkin_document' => 'Einchecken',
 'checkout_document' => 'Auschecken',
 'checkout_is_disabled' => 'Auschecken von Dokumenten ist in der Konfiguration ausgeschaltet.',
@@ -700,7 +704,9 @@ Dokument: [document]
 Benutzer: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Anhang gelöscht',
+'removed_recipient' => 'ist von der Empfängerliste entfernt worden',
 'removed_reviewer' => 'ist von der Prüfer-Liste entfernt worden.',
+'removed_reviser' => 'ist von der Liste der Wiederholungsprüfer entfernt worden.',
 'removed_workflow_email_body' => 'Workflow von Dokumentenversion entfernt
 Dokument: [name]
 Version: [version]
@@ -760,6 +766,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Prüfung ausgeführt',
 'review_summary' => 'Übersicht Prüfungen',
 'review_update_failed' => 'Störung bei Aktualisierung des Prüfstatus. Aktualisierung gescheitert.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Zurück zum Anfangszustand',
 'rewind_workflow_email_body' => 'Workflow wurde zurückgestellt
 Dokument: [name]
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 226220d95..263344b9a 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1109), dgrutsch (3), netixw (14)
+//    Translators: Admin (1123), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -109,6 +109,8 @@ URL: [url]',
 'approval_summary' => 'Approval Summary',
 'approval_update_failed' => 'Error updating approval status. Update failed.',
 'approvers' => 'Approvers',
+'approver_already_assigned' => 'User is already assigned as an approver.',
+'approver_already_removed' => 'Approver has already been removed from appproval process or  has already submitted an approval.',
 'april' => 'April',
 'archive_creation' => 'Archive creation',
 'archive_creation_warning' => 'With this operation you can create archive containing the files of entire DMS folders. After the creation the archive will be saved in the data folder of your server.<br>WARNING: an archive created as human readable will be unusable as server backup.',
@@ -187,6 +189,8 @@ URL: [url]',
 'change_assignments' => 'Change Assignments',
 'change_password' => 'Change password',
 'change_password_message' => 'Your password has been changed.',
+'change_recipients' => 'Change recipients',
+'change_revisers' => 'Change resubmission',
 'change_status' => 'Change Status',
 'charts' => 'Charts',
 'chart_docsaccumulated_title' => 'Number of documents',
@@ -198,8 +202,8 @@ URL: [url]',
 'chart_selection' => 'Select chart',
 'chart_sizeperuser_title' => 'Diskspace per user',
 'checkedout_file_has_different_version' => 'The checked out version is not identical to the current version. Check in will not update the document.',
-'checkedout_file_has_disappeared' => 'The file of the checked out document has disappeared. Check in will not create a new version.',
-'checkedout_file_is_unchanged' => 'The file of the checked out document is still unchanged. Check in will not create a new version.',
+'checkedout_file_has_disappeared' => 'The file of the checked out document has disappeared. Check in will not create a new version, but clears the checkout status..',
+'checkedout_file_is_unchanged' => 'The file of the checked out document is still unchanged. Check in will not create a new version but clears the checkout status.',
 'checkin_document' => 'Check In',
 'checkout_document' => 'Check out',
 'checkout_is_disabled' => 'Check out of documents is disabled in the configuration.',
@@ -700,7 +704,9 @@ Document: [document]
 User: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Removed attachment',
+'removed_recipient' => 'has been removed from the list of recipients.',
 'removed_reviewer' => 'has been removed from the list of reviewers.',
+'removed_reviser' => 'has been removed from the list of resubmitter.',
 'removed_workflow_email_body' => 'Removed workflow from document version
 Document: [name]
 Version: [version]
@@ -734,8 +740,8 @@ URL: [url]',
 'return_from_subworkflow_email_subject' => '[sitename]: [name] - Return from subworkflow',
 'reverse_links' => 'Documents, which have a link to the current document',
 'reviewers' => 'Reviewers',
-'reviewer_already_assigned' => 'is already assigned as a reviewer',
-'reviewer_already_removed' => 'has already been removed from review process or has already submitted a review',
+'reviewer_already_assigned' => 'User is already assigned as a reviewer',
+'reviewer_already_removed' => 'Reviewer has already been removed from review process or has already submitted a review',
 'review_deletion_email' => 'Review request deleted',
 'review_deletion_email_body' => 'Review request deleted
 Dokument: [name]
@@ -767,6 +773,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Submitted review',
 'review_summary' => 'Review Summary',
 'review_update_failed' => 'Error updating review status. Update failed.',
+'reviser_already_assigned' => 'User is already assigned as an resubmitter.',
+'reviser_already_removed' => 'Resubmitter has already been removed from revision process or has already revised the document.',
 'rewind_workflow' => 'Rewind workflow',
 'rewind_workflow_email_body' => 'Workflow was rewinded
 Document: [name]
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 262221432..690599645 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -104,6 +104,8 @@ URL: [url]',
 'approval_summary' => 'Resumen de aprobación',
 'approval_update_failed' => 'Error actualizando el estado de aprobación. Actualización fallida.',
 'approvers' => 'Aprobadores',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Abril',
 'archive_creation' => 'Creación de archivo',
 'archive_creation_warning' => 'Con esta operación usted puede crear un archivo que contenga los ficheros de las carpetas del DMS completo. Después de crearlo el archivo se guardará en la carpeta de datos de su servidor.<br>CUIDADO: un fichero creado como legible por humanos no podrá usarse como copia de seguridad del servidor.',
@@ -182,6 +184,8 @@ URL: [url]',
 'change_assignments' => 'cambiar asignaciones',
 'change_password' => 'cambiar contraseña',
 'change_password_message' => 'Su contraseña se ha modificado.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'cambiar estado',
 'charts' => 'Gráficos',
 'chart_docsaccumulated_title' => 'Cantidad de documentos',
@@ -696,7 +700,9 @@ Documento: [document]
 Usuario: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Eliminar adjunto',
+'removed_recipient' => '',
 'removed_reviewer' => 'Ha sido eliminado de la lista de revisores.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Eliminar flujo de trabajo de la versión del documento
 Documento: [name]
 Versión: [version]
@@ -746,6 +752,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revisión enviada',
 'review_summary' => 'Resumen de revisión',
 'review_update_failed' => 'Error actualizando el estado de la revisión. La actualización ha fallado.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Retroceso del flujo de trabajo',
 'rewind_workflow_email_body' => 'Flujo de trabajo fue retrocedido
 Documento: [name]
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index c9814dceb..6d7c26ebf 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -104,6 +104,8 @@ URL : [url]',
 'approval_summary' => 'Sommaire d\'approbation',
 'approval_update_failed' => 'Erreur de la mise à jour du statut d\'approbation. Echec de la mise à jour.',
 'approvers' => 'Approbateurs',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Avril',
 'archive_creation' => 'Création d\'archive',
 'archive_creation_warning' => 'Avec cette fonction, vous pouvez créer une archive contenant les fichiers de tous les dossiers DMS. Après la création, l\'archive sera sauvegardée dans le dossier de données de votre serveur.<br> AVERTISSEMENT: Une archive créée ainsi sera inutilisable en tant que sauvegarde du serveur.',
@@ -182,6 +184,8 @@ URL: [url]',
 'change_assignments' => 'Changer d\'affectations',
 'change_password' => 'Changer de mot de passe',
 'change_password_message' => 'Votre mot de passe a été changé.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Modifier le statut',
 'charts' => 'Graphiques',
 'chart_docsaccumulated_title' => 'Nombre de documents',
@@ -693,7 +697,9 @@ Document: [document]
 Utilisateur: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Attachement supprimé',
+'removed_recipient' => '',
 'removed_reviewer' => 'a été retiré de la liste des correcteurs.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Workflow du document supprimé: [name]
 Version: [version]
 Workflow: [workflow]
@@ -735,6 +741,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Correction soumise',
 'review_summary' => 'Sommaire de correction',
 'review_update_failed' => 'Erreur lors de la mise à jour de la correction. Echec de la mise à jour.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Remonter le workflow',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '[sitename]: [name] - Le workflow a été réinitialisé',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index f5a47e5c8..f88695659 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -104,6 +104,8 @@ URL: [url]',
 'approval_summary' => 'Jóváhagyási összesítő',
 'approval_update_failed' => 'Hiba történt a jóváhagyási állapot frissítése során. Frissítés sikertelen.',
 'approvers' => 'Jóváhagyók',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Április',
 'archive_creation' => 'Archívum létrehozása',
 'archive_creation_warning' => 'Ezzel a művelettel archívumot hozhat létre, amely tartalmazza az összes DMS mappában található állományokat. A létrehozás követően az archívum a kiszolgáló adat mappájába lesz mentve.<br>FIGYELEM: az archívum értelmezhető formában kerül tárolásra és nem használható kiszolgáló mentésként.',
@@ -182,6 +184,8 @@ URL: [url]',
 'change_assignments' => 'Hozzárendelések módosítása',
 'change_password' => 'Jelszó módosítása',
 'change_password_message' => 'Jelszava módosításra került.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Állapot módosítása',
 'charts' => 'Diagramok',
 'chart_docsaccumulated_title' => 'Dokumentumok száma',
@@ -696,7 +700,9 @@ Dokumentum: [document]
 Felhasználó: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Eltávolított melléklet',
+'removed_recipient' => '',
 'removed_reviewer' => 'eltávolításra került a felülvizsgálók listájáról.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Dokumentum változatból eltávolított munkafolyamat
 Dokumentum: [name]
 Verzió: [version]
@@ -746,6 +752,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Beküldött felülvizsgálat',
 'review_summary' => 'Felülvizsgálat összefoglaló',
 'review_update_failed' => 'Hiba a felülvizsgálat állapot frissítése során. Frissítés sikertelen.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Munkafolyamat visszajátszás',
 'rewind_workflow_email_body' => 'Munkafolyamat visszajátszva
 Dokumentum: [name]
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 15aca9237..ce3e008a4 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -109,6 +109,8 @@ URL: [url]',
 'approval_summary' => 'Dettaglio approvazioni',
 'approval_update_failed' => 'Errore nel modificare lo stato di approvazione. Aggiornamento fallito.',
 'approvers' => 'Approvatori',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Aprile',
 'archive_creation' => 'Creazione archivi',
 'archive_creation_warning' => 'Con questa operazione è possibile creare archivi contenenti i file di intere cartelle del DMS. Dopo la creazione l\'archivio viene salvato nella cartella dati del server.<br>Attenzione: un archivio creato per uso esterno non è utilizzabile come backup del server.',
@@ -187,6 +189,8 @@ URL: [url]',
 'change_assignments' => 'Modifica le Assegnazioni',
 'change_password' => 'Cambia la password',
 'change_password_message' => 'La password è stata cambiata',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Modifica lo Stato',
 'charts' => 'Grafici',
 'chart_docsaccumulated_title' => 'Numero di documenti',
@@ -701,7 +705,9 @@ Documento: [document]
 Utente: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Allegato rimosso',
+'removed_recipient' => '',
 'removed_reviewer' => 'é stato rimosso dalla lista dei revisori.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Flusso di lavoro rimosso dalla versione del documento
 Documento: [name]
 Versione: [version]
@@ -768,6 +774,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Sottoposta revisione',
 'review_summary' => 'Dettaglio revisioni',
 'review_update_failed' => 'Errore nella variazione dello stato di revisione. Aggiornamento fallito.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Inverti il flusso di lavoro',
 'rewind_workflow_email_body' => 'Il flusso di lavoro è stato invertito
 Document: [name]
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 43c738fce..fc453a2b0 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -97,6 +97,8 @@ URL: [url]',
 'approval_summary' => 'Goedkeuring Samenvatting',
 'approval_update_failed' => 'Fout bij bijwerken Goedkeuring status. Bijwerken mislukt.',
 'approvers' => 'Autoriseerders',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'april',
 'archive_creation' => 'Archief aanmaken',
 'archive_creation_warning' => 'Met deze handeling maakt U een Archief aan van alle bestanden in het DMS. Na het aanmaken van het Archief, wordt deze opgeslagen in de data-map van uw server.<br>Waarschuwing: een leesbaar Archief kan niet worden gebruikt voor server back-up doeleinde.',
@@ -175,6 +177,8 @@ URL: [url]',
 'change_assignments' => 'Wijzig taken/toewijzingen',
 'change_password' => 'Wijzig wachtwoord',
 'change_password_message' => 'Wachtwoord is gewijzigd.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Wijzig Status',
 'charts' => 'Grafieken',
 'chart_docsaccumulated_title' => 'Aantal documenten',
@@ -689,7 +693,9 @@ Document: [document]
 Gebruiker: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Bijlage verwijderd',
+'removed_recipient' => '',
 'removed_reviewer' => 'is verwijderd uit de lijst van [Controleurs].',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Workflow verwijderd van document versiedocument: [name]
 Versie: [version]
 Workflow: [workflow]
@@ -737,6 +743,8 @@ URL: [url',
 'review_submit_email_subject' => '[sitename]: [name] - Beoordeling toegevoegd',
 'review_summary' => '[Controle] Samenvatting',
 'review_update_failed' => 'Foutmelding: fout bij bijwerken [Controle] Status. Bijwerken mislukt.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Terugzetten workflow',
 'rewind_workflow_email_body' => 'Workflow is teruggezet
 Document: [name]
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 86e7641a9..56ae936c1 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -97,6 +97,8 @@ URL: [url]',
 'approval_summary' => 'Podsumowanie akceptacji',
 'approval_update_failed' => 'Błąd aktualizacji statusu akceptacji. Aktualizacja nie powiodła się.',
 'approvers' => 'Osoby akceptujące',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Kwiecień',
 'archive_creation' => 'Tworzenie archiwum',
 'archive_creation_warning' => 'Ta operacja utworzy archiwum zawierające pliki z całego repozytorium. Po utworzeniu archiwum będzie zapisane w folderze na serwerze.<br>UWAGA: archiwum utworzone jako czytelne dla ludzi będzie bezużyteczne jako kopia serwera.',
@@ -175,6 +177,8 @@ URL: [url]',
 'change_assignments' => 'Zmiana przypisania',
 'change_password' => 'Zmiana hasła',
 'change_password_message' => 'Twoje hasło zostało zmienione.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Zmień status',
 'charts' => 'Wykresy',
 'chart_docsaccumulated_title' => 'Liczba dokumentów',
@@ -689,7 +693,9 @@ Dokument: [document]
 Użytkownik: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Usunięty załącznik',
+'removed_recipient' => '',
 'removed_reviewer' => 'został usunięty z listy recenzentów.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Usunięcie procesu z wersji dokumentu
 Dokument: [name]
 Wersja: [version]
@@ -725,6 +731,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Napisano recenzję',
 'review_summary' => 'Podsumowanie opiniowania',
 'review_update_failed' => 'Błąd podczas aktualizowania statusu recenzji. Aktualizacja nie powiodła się.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Przewiń proces',
 'rewind_workflow_email_body' => 'Przewinięcie procesu
 Dokument: [name]
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 9ba71a1b1..545828da6 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -104,6 +104,8 @@ URL: [url]',
 'approval_summary' => 'Approval Summary',
 'approval_update_failed' => 'Error updating approval status. Update failed.',
 'approvers' => 'Approvers',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'April',
 'archive_creation' => 'Archive creation',
 'archive_creation_warning' => 'With this operation you can create achive containing the files of entire DMS folders. After the creation the archive will be saved in the data folder of your server.<br>WARNING: an archive created as human readable will be unusable as server backup.',
@@ -182,6 +184,8 @@ URL: [url]',
 'change_assignments' => 'Change Assignments',
 'change_password' => 'Modificar senha',
 'change_password_message' => 'Sua senha foi modificada.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Mudar status',
 'charts' => 'Gráficos',
 'chart_docsaccumulated_title' => 'Número de documentos',
@@ -694,7 +698,9 @@ Documento: [document]
 Usuário: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Anexo removido',
+'removed_recipient' => '',
 'removed_reviewer' => 'has been removed from the list of reviewers.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Removido do fluxo de trabalho de documentos version
 Document: [name]
 Versão: [version]
@@ -743,6 +749,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revisão submetida',
 'review_summary' => 'Review Summary',
 'review_update_failed' => 'Error updating review status. Update failed.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Fluxo de trabalho revisto',
 'rewind_workflow_email_body' => 'Fluxo de processo foi revisto
 Documento: [name]
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index eca9a0fe8..1479fec89 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -104,6 +104,8 @@ URL: [url]',
 'approval_summary' => 'Sumar aprobare',
 'approval_update_failed' => 'Eroare actualizare status aprobare. Actualizarea nu a reușit.',
 'approvers' => 'Aprobatori',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Aprilie',
 'archive_creation' => 'Creare arhiva',
 'archive_creation_warning' => 'Cu această operațiune puteți crea o arhiva care sa conțina fișierele din toate folderele DMS. După creare, arhiva va fi salvata în folderul de date din serverul dumneavoastră. <br> AVERTISMENT:. O arhivă creată ca lizibilă pentru om nu va putea fi utilizata ca server de backup.',
@@ -182,6 +184,8 @@ URL: [url]',
 'change_assignments' => 'Schimbă alocările',
 'change_password' => 'Schimbă parola',
 'change_password_message' => 'Parola dumneavoastra a fost schimbată.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Schimbă status',
 'charts' => 'Grafice',
 'chart_docsaccumulated_title' => 'Numărul de documente',
@@ -696,7 +700,9 @@ Document: [document]
 Utilizator: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Atașament eliminat',
+'removed_recipient' => '',
 'removed_reviewer' => 'a fost eliminat din lista de revizuitori.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Workflow eliminat din versiunea documentului
 Document: [name]
 Versiune: [version]
@@ -746,6 +752,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revizuire trimisă',
 'review_summary' => 'Sumar revizuire',
 'review_update_failed' => 'Eroare actualizarea status revizuire. Actualizarea a eșuat.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Derulare workflow',
 'rewind_workflow_email_body' => 'Workflow derulat
 Document: [name]
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 328d01b5f..01e7f18a2 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -97,6 +97,8 @@ URL: [url]',
 'approval_summary' => 'Сводка по утверждению',
 'approval_update_failed' => 'Произошла ошибка при изменении статуса утверждения',
 'approvers' => 'Утверждающие',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Апрель',
 'archive_creation' => 'Создать архив',
 'archive_creation_warning' => 'Эта операция создаст архив, содержащий все каталоги. После создания архив будет сохранен в каталоге данных сервера.<br><b>Внимание:</b> архив созданный как понятный человеку, будет непригоден в качестве резервной копии для восстановления!',
@@ -175,6 +177,8 @@ URL: [url]',
 'change_assignments' => 'Изменить назначения',
 'change_password' => 'Изменить пароль',
 'change_password_message' => 'Пароль изменён',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Изменить статус',
 'charts' => 'Диаграммы',
 'chart_docsaccumulated_title' => 'Количество документов',
@@ -686,7 +690,9 @@ URL: [url]',
 Пользователь: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: удалено приложение к «[document]»',
+'removed_recipient' => '',
 'removed_reviewer' => 'удалён из списка рецензирующих',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Удалён процесс из версии документа
 Документ: [name]
 Версия: [version]
@@ -736,6 +742,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: отправлена рецензия на «[name]»',
 'review_summary' => 'Сводка по рецензии',
 'review_update_failed' => 'Ошибка обновления статуса рецензии',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Начать процесс с начала',
 'rewind_workflow_email_body' => 'Процесс был начат с начала
 Документ: [name]
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 155b1e7d1..f0598df3a 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -88,6 +88,8 @@ $text = array(
 'approval_summary' => 'Zhrnutie schválenia',
 'approval_update_failed' => 'Chyba pri aktualizácii stavu schválenia. Aktualizácia zlyhala.',
 'approvers' => 'Schvaľovatelia',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Apríl',
 'archive_creation' => 'Vytvorenie archívu',
 'archive_creation_warning' => 'Touto akciou môžete vytvoriť archív obsahujúci celú DMS zložku. Po vytvorení bude každý súbor uložený do dátovej zložky súborov na vašom serveri.<br>UPOZORNENIE: uživateľsky prístupný archív nie je možné použiť ako zálohu servera.',
@@ -160,6 +162,8 @@ $text = array(
 'change_assignments' => 'Zmeniť úlohy',
 'change_password' => '',
 'change_password_message' => '',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Zmeniť stav',
 'charts' => '',
 'chart_docsaccumulated_title' => '',
@@ -579,7 +583,9 @@ $text = array(
 'removed_file_email' => 'Odstranena priloha',
 'removed_file_email_body' => '',
 'removed_file_email_subject' => '',
+'removed_recipient' => '',
 'removed_reviewer' => 'bol odstránený zo zoznamu kontrolórov.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -609,6 +615,8 @@ $text = array(
 'review_submit_email_subject' => '',
 'review_summary' => 'Zhrnutie kontroly',
 'review_update_failed' => 'Chyba pri aktualizácii stavu kontroly. Aktualizácia zlyhala.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => '',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 1f0bbc19a..a0bfc3d1b 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -97,6 +97,8 @@ URL: [url]',
 'approval_summary' => 'Sammanfattning av godkännande',
 'approval_update_failed' => 'Fel vid uppdatering av godkännande-status. Status uppdaterades inte.',
 'approvers' => 'Godkänna',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'april',
 'archive_creation' => 'Skapa arkiv',
 'archive_creation_warning' => 'Med denna funktion kan du skapa ett arkiv som innehåller filer från hela DMS-kataloger. När arkivet har skapats, kommer det att sparas i data-mappen på din server.<br>OBS! Skapas ett arkiv som är läsbart för användare, kan det inte användas för att återställa systemet.',
@@ -175,6 +177,8 @@ URL: [url]',
 'change_assignments' => 'Ändra uppdrag',
 'change_password' => 'Ändra lösenord',
 'change_password_message' => 'Ditt lösenord har ändrats.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Ändra status',
 'charts' => 'Diagram',
 'chart_docsaccumulated_title' => 'Antal dokument',
@@ -681,7 +685,9 @@ Dokument: [document]
 Användare: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Borttagen bilaga',
+'removed_recipient' => '',
 'removed_reviewer' => 'har tagits bort från listan med personer som ska granska dokumentet.',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Arbetsflöde borttagen från dokument version
 Dokument: [name]
 Version: [version]
@@ -731,6 +737,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Skickat granskning',
 'review_summary' => 'Sammanfattning av granskningen',
 'review_update_failed' => 'Fel vid uppdatering av granskningsstatus. Kunde inte uppdatera.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'Återställ arbetsflödet',
 'rewind_workflow_email_body' => 'Återställ arbetsflödet
 Dokument: [name]
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index c31bfaa56..256db5800 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -103,6 +103,8 @@ URL: [url]',
 'approval_summary' => 'Onay Özeti',
 'approval_update_failed' => 'Onay durumu güncellenirken hata oluştu. Güncelleme başarısız.',
 'approvers' => 'Onaylayan',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => 'Nisan',
 'archive_creation' => 'Arşiv oluşturma',
 'archive_creation_warning' => 'Bu işlemle tüm DYS içeriğindeki dosyaların arşivini oluşturabilirsiniz. Arşiv oluşturulduktan sonra sunucudaki data klasörüne kaydedilecektir.<br>DİKKAT: Okunabilir olarak oluşturulan arşiv, sunucu yedeği olarak kullanılamaz.',
@@ -181,6 +183,8 @@ URL: [url]',
 'change_assignments' => 'Atamaları Değiştir',
 'change_password' => 'Parola degiştir',
 'change_password_message' => 'Parolanız değişti.',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => 'Değişme Durumu',
 'charts' => 'Grafikler',
 'chart_docsaccumulated_title' => 'Doküman sayısı',
@@ -697,7 +701,9 @@ Doküman: [document]
 Kullanıcı: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Ek silindi',
+'removed_recipient' => '',
 'removed_reviewer' => 'kontrol edenler listesinden çıkarıldı',
+'removed_reviser' => '',
 'removed_workflow_email_body' => 'Doküman versiyonundan iş akışı silindi
 Doküman: [name]
 Versiyon: [version]
@@ -747,6 +753,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Kontrol gönderildi',
 'review_summary' => 'Kontrol Özeti',
 'review_update_failed' => 'Kontrol güncelleme durumu hatalı. Güncelleme başarısız.',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => 'İş akışını geri al',
 'rewind_workflow_email_body' => 'İş akışı geri alındı
 Doküman: [name]
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 03cc477e2..ab445b1c6 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -92,6 +92,8 @@ URL: [url]',
 'approval_summary' => '审核汇总',
 'approval_update_failed' => '错误:更新审核状态.更新失败.',
 'approvers' => '审核人',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => '四 月',
 'archive_creation' => '创建存档',
 'archive_creation_warning' => '通过此操作您可以创建一个包含这个DMS(文档管理系统)的数据文件夹。之后，所有文档都将保存到您服务器的数据文件夹中.<br>警告:如果所创建文档名为非数字的，那么将在服务器备份中不可用',
@@ -164,6 +166,8 @@ URL: [url]',
 'change_assignments' => '分配变更',
 'change_password' => '',
 'change_password_message' => '',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => '变更状态',
 'charts' => '图表',
 'chart_docsaccumulated_title' => '',
@@ -585,7 +589,9 @@ URL: [url]',
 'removed_file_email' => '删除附件',
 'removed_file_email_body' => '',
 'removed_file_email_subject' => '',
+'removed_recipient' => '',
 'removed_reviewer' => '已经从校对人名单中删除',
+'removed_reviser' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -615,6 +621,8 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => '校对汇总',
 'review_update_failed' => '错误 更新校对状态.更新失败',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => '',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 808d71cc7..ae1d1cf6f 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -92,6 +92,8 @@ URL: [url]',
 'approval_summary' => '審核匯總',
 'approval_update_failed' => '錯誤:更新審核狀態.更新失敗.',
 'approvers' => '審核人',
+'approver_already_assigned' => '',
+'approver_already_removed' => '',
 'april' => '四 月',
 'archive_creation' => '創建存檔',
 'archive_creation_warning' => '通過此操作您可以創建一個包含這個DMS(文檔管理系統)的資料檔案夾。之後，所有文檔都將保存到您伺服器的資料檔案夾中.<br>警告:如果所創建文檔名為非數字的，那麼將在伺服器備份中不可用',
@@ -164,6 +166,8 @@ URL: [url]',
 'change_assignments' => '分配變更',
 'change_password' => '變更密碼',
 'change_password_message' => '變更密碼提示',
+'change_recipients' => '',
+'change_revisers' => '',
 'change_status' => '變更狀態',
 'charts' => '圖表',
 'chart_docsaccumulated_title' => '',
@@ -583,7 +587,9 @@ URL: [url]',
 'removed_file_email' => '刪除附件',
 'removed_file_email_body' => '',
 'removed_file_email_subject' => '',
+'removed_recipient' => '',
 'removed_reviewer' => '已經從校對人名單中刪除',
+'removed_reviser' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -613,6 +619,8 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => '校對匯總',
 'review_update_failed' => '錯誤 更新校對狀態.更新失敗',
+'reviser_already_assigned' => '',
+'reviser_already_removed' => '',
 'rewind_workflow' => '',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',

From 4a413cf72bf30640a205281d64e734fdf20d16d4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 13:41:44 +0200
Subject: [PATCH 0028/2006] add some more missing phrases

---
 languages/ar_EG/lang.inc | 2 ++
 languages/bg_BG/lang.inc | 2 ++
 languages/ca_ES/lang.inc | 2 ++
 languages/cs_CZ/lang.inc | 4 +++-
 languages/de_DE/lang.inc | 4 +++-
 languages/en_GB/lang.inc | 4 +++-
 languages/es_ES/lang.inc | 2 ++
 languages/fr_FR/lang.inc | 2 ++
 languages/hu_HU/lang.inc | 2 ++
 languages/it_IT/lang.inc | 2 ++
 languages/nl_NL/lang.inc | 2 ++
 languages/pl_PL/lang.inc | 2 ++
 languages/pt_BR/lang.inc | 2 ++
 languages/ro_RO/lang.inc | 2 ++
 languages/ru_RU/lang.inc | 2 ++
 languages/sk_SK/lang.inc | 2 ++
 languages/sv_SE/lang.inc | 2 ++
 languages/tr_TR/lang.inc | 2 ++
 languages/zh_CN/lang.inc | 2 ++
 languages/zh_TW/lang.inc | 2 ++
 20 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index f048c2368..3d3c8f04f 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -1169,7 +1169,9 @@ URL: [url]',
 'update_fulltext_index' => 'تحديث فهرس النص الكامل',
 'update_info' => 'تحديث المعلومات',
 'update_locked_msg' => 'هذا المستند محمي من التعديل.',
+'update_recipients' => '',
 'update_reviewers' => 'تحيث قائمة المراجعين',
+'update_reviser' => '',
 'uploaded_by' => 'تم الرفع بواسطة',
 'uploading_failed' => 'عملية رفع واحد من ملفاتك فشلت . من فضلك قم بالتأكد من اقصى ملف يمكن تحميله',
 'uploading_maxsize' => 'الملف المرفوع يتخطى حجم الملف القياسي المسموح',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 3db36c588..8ffe466aa 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -1025,7 +1025,9 @@ $text = array(
 'update_fulltext_index' => 'Обнови пълнотекстовия индекс',
 'update_info' => 'Обнови информацията',
 'update_locked_msg' => 'Този документ е блокиран',
+'update_recipients' => '',
 'update_reviewers' => 'Обнови списъка с рецензиращи',
+'update_reviser' => '',
 'uploaded_by' => 'Качен от',
 'uploading_failed' => 'Качването не стана. Свържете се с админа',
 'uploading_maxsize' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index c0d37ebde..a60dfe775 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -1030,7 +1030,9 @@ URL: [url]',
 'update_fulltext_index' => 'Update fulltext index',
 'update_info' => 'Actualitzar informació',
 'update_locked_msg' => 'Aquest document està bloquejat.',
+'update_recipients' => '',
 'update_reviewers' => 'Actualitzar llista de revisors',
+'update_reviser' => '',
 'uploaded_by' => 'Enviat per',
 'uploading_failed' => 'Enviament (Upload) fallat. Si us plau, contacteu amb l\'administrador.',
 'uploading_maxsize' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 4728bcf8b..dffe8ab68 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (680), kreml (455)
+//    Translators: Admin (681), kreml (455)
 
 $text = array(
 'accept' => 'Přijmout',
@@ -1178,7 +1178,9 @@ URL: [url]',
 'update_fulltext_index' => 'Aktualizovat fulltext index',
 'update_info' => 'Aktualizovat informace',
 'update_locked_msg' => 'Tento dokument je zamčený.',
+'update_recipients' => 'Update list of recipients',
 'update_reviewers' => 'Aktualizovat seznam kontrolorů',
+'update_reviser' => '',
 'uploaded_by' => 'Nahrál',
 'uploading_failed' => 'Nahrání selhalo. Prosím, kontaktujte správce.',
 'uploading_maxsize' => 'Nahrávaný soubor je větší než maximální velikost pro upload.',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 507e049ee..5dc93c997 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1991), dgrutsch (18)
+//    Translators: Admin (1993), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -1198,7 +1198,9 @@ URL: [url]',
 'update_fulltext_index' => 'Aktualisiere Volltextindex',
 'update_info' => 'Informationen zur Aktualisierung',
 'update_locked_msg' => 'Dieses Dokument wurde gesperrt<p>Die Sperrung wurde von <a href="mailto:[email]">[username]</a> eingerichtet.<br>',
+'update_recipients' => 'Liste der Empfänger aktualisieren',
 'update_reviewers' => 'Liste der Prüfer aktualisieren',
+'update_reviser' => 'Liste der Wiederholungsprüfer ändern',
 'uploaded_by' => 'Hochgeladen durch',
 'uploading_failed' => 'Das Hochladen einer Datei ist fehlgeschlagen. Bitte überprüfen Sie die maximale Dateigröße für Uploads.',
 'uploading_maxsize' => 'Die Datei überschreitet die maximale Dateigröße für Uploads.',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 263344b9a..41cd832f7 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1123), dgrutsch (3), netixw (14)
+//    Translators: Admin (1124), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -1205,7 +1205,9 @@ URL: [url]',
 'update_fulltext_index' => 'Update fulltext index',
 'update_info' => 'Update Information',
 'update_locked_msg' => 'This document is locked.',
+'update_recipients' => '',
 'update_reviewers' => 'Update List of Reviewers',
+'update_reviser' => 'Update list of resubmitters',
 'uploaded_by' => 'Uploaded by',
 'uploading_failed' => 'Uploading one of your files failed. Please check your maximum upload file size.',
 'uploading_maxsize' => 'The uploaded file exceeds the maximum upload file size.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 690599645..9ed02af6d 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -1184,7 +1184,9 @@ URL: [url]',
 'update_fulltext_index' => 'Actualizar índice de texto completo',
 'update_info' => 'Actualizar información',
 'update_locked_msg' => 'Este documento está bloqueado.',
+'update_recipients' => '',
 'update_reviewers' => 'Actualizar lista de revisores',
+'update_reviser' => '',
 'uploaded_by' => 'Enviado por',
 'uploading_failed' => 'Envío (Upload) fallido. Por favor contacte con el Administrador.',
 'uploading_maxsize' => 'El archivo subido supera el tamaño máximo de upload',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 6d7c26ebf..5b55d235a 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1151,7 +1151,9 @@ URL: [url]',
 'update_fulltext_index' => 'Mettre à jour l\'index de recherche plein texte',
 'update_info' => 'Informations de mise à jour',
 'update_locked_msg' => 'Ce document est verrouillé.',
+'update_recipients' => '',
 'update_reviewers' => 'Mise à jour de la liste de correcteurs',
+'update_reviser' => '',
 'uploaded_by' => 'Déposé par',
 'uploading_failed' => 'Dépose du document échoué. SVP Contactez le responsable.',
 'uploading_maxsize' => 'La taille du fichier téléchargé excède la taille maximale accepté',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index f88695659..f71d4a445 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -1183,7 +1183,9 @@ URL: [url]',
 'update_fulltext_index' => 'Teljes szöveg index frissítése',
 'update_info' => 'Információ frissítése',
 'update_locked_msg' => 'Ez a dokumentum zárolt.',
+'update_recipients' => '',
 'update_reviewers' => 'Felülvizsgálók listájának frissítése',
+'update_reviser' => '',
 'uploaded_by' => 'Feltöltötte',
 'uploading_failed' => 'Állományai egyikének feltöltése sikertelen. Kérjük ellenőrizze a legnagyobb feltölthető állomány méretet.',
 'uploading_maxsize' => 'A feltöltött fájl nagyobb, mint a megengedezz maximális méret',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index ce3e008a4..628f8734d 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -1206,7 +1206,9 @@ URL: [url]',
 'update_fulltext_index' => 'Aggiorna indice fulltext',
 'update_info' => 'Aggiorna informazioni',
 'update_locked_msg' => 'Questo documento è bloccato.',
+'update_recipients' => '',
 'update_reviewers' => 'Aggiorna lista revisori',
+'update_reviser' => '',
 'uploaded_by' => 'Caricato da',
 'uploading_failed' => 'Upload fallito. Controllare la dimensione massima caricabile consentita.',
 'uploading_maxsize' => 'Il file caricato supera la dimensione massima consentita.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index fc453a2b0..9341240cf 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -1175,7 +1175,9 @@ URL: [url]',
 'update_fulltext_index' => 'Bijwerken volledige tekst index',
 'update_info' => 'Bijwerken informatie',
 'update_locked_msg' => 'Dit document is geblokkeerd.',
+'update_recipients' => '',
 'update_reviewers' => 'Bijwerken lijst van [Controleurs]',
+'update_reviser' => '',
 'uploaded_by' => 'Ge-upload door',
 'uploading_failed' => 'Upload mislukt. Neem contact op met de [Beheerder].',
 'uploading_maxsize' => 'Het geuploade bestand overschrijdt de maximum grootte.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 56ae936c1..20b56220a 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -1163,7 +1163,9 @@ URL: [url]',
 'update_fulltext_index' => 'Aktualizuj indeks pełnotekstowy',
 'update_info' => 'Aktualizuj informacje',
 'update_locked_msg' => 'Ten dokument jest zablokowany.',
+'update_recipients' => '',
 'update_reviewers' => 'Aktualizuj listę recenzentów',
+'update_reviser' => '',
 'uploaded_by' => 'Przesłane przez',
 'uploading_failed' => 'Przesyłanie nie powiodło się. Skontaktuj się z administratorem.',
 'uploading_maxsize' => 'Rozmiar pliku większy niż dopuszczalny',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 545828da6..206a57dfb 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -1181,7 +1181,9 @@ URL: [url]',
 'update_fulltext_index' => 'Índice de atualização de texto completo',
 'update_info' => 'Update Information',
 'update_locked_msg' => 'Este documento está travado.',
+'update_recipients' => '',
 'update_reviewers' => 'Update List of Reviewers',
+'update_reviser' => '',
 'uploaded_by' => 'Inserido por',
 'uploading_failed' => 'Inserção falhou. Por favor contacte o administrador',
 'uploading_maxsize' => 'O arquivo excede o tamanho máximo permitido para upload.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 1479fec89..4f9607987 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -1184,7 +1184,9 @@ URL: [url]',
 'update_fulltext_index' => 'Actualizare index pe tot textul (fulltext index)',
 'update_info' => 'Informații actualizare',
 'update_locked_msg' => 'Acest document este blocat.',
+'update_recipients' => '',
 'update_reviewers' => 'Actualizare Listă de revizuitori',
+'update_reviser' => '',
 'uploaded_by' => 'Adaugate de',
 'uploading_failed' => 'Încărcarea unuia dintre fișierele a eșuat. Vă rugăm să verificați dimensiunea maximă de încărcare fișiere.',
 'uploading_maxsize' => 'Fișierul încărcat depășește dimensiunea maximă de încărcare fișiere.',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 01e7f18a2..73250705c 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -1174,7 +1174,9 @@ URL: [url]',
 'update_fulltext_index' => 'Обновить полнотекстовый индекс',
 'update_info' => 'Обновить информацию',
 'update_locked_msg' => 'Этот документ заблокирован',
+'update_recipients' => '',
 'update_reviewers' => 'Обновить список рецензирующих',
+'update_reviser' => '',
 'uploaded_by' => 'Загрузил(а)',
 'uploading_failed' => 'Загрузка не удалась. Свяжитесь с администратором.',
 'uploading_maxsize' => 'Размер загруженного файла превышает максимально возможный',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index f0598df3a..958a12be3 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -1025,7 +1025,9 @@ $text = array(
 'update_fulltext_index' => '',
 'update_info' => 'Aktualizovať informácie',
 'update_locked_msg' => 'Tento dokument je zamknutý.',
+'update_recipients' => '',
 'update_reviewers' => 'Aktualizovať zoznam kontrolórov',
+'update_reviser' => '',
 'uploaded_by' => 'Nahral',
 'uploading_failed' => 'Nahranie zlyhalo. Prosám, kontaktujte správcu.',
 'uploading_maxsize' => 'Uploadovaný súbor prekročil maximálnu povolenú velkosť.',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index a0bfc3d1b..91e3ae41f 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -1169,7 +1169,9 @@ URL: [url]',
 'update_fulltext_index' => 'Uppdatera fulltext-index',
 'update_info' => 'Uppdatera information',
 'update_locked_msg' => 'Dokumentet är låst.',
+'update_recipients' => '',
 'update_reviewers' => 'Uppdatera listan med personer som granskar',
+'update_reviser' => '',
 'uploaded_by' => 'Uppladdat av',
 'uploading_failed' => 'Fel vid uppladdningen. Kontakta administratören.',
 'uploading_maxsize' => 'Uppladdade filen översteg maxgränsen för storleken på filstorlek',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 256db5800..3c6997b7e 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -1185,7 +1185,9 @@ URL: [url]',
 'update_fulltext_index' => 'Tam metin indeksini güncelle',
 'update_info' => 'Bilgileri Güncelle',
 'update_locked_msg' => 'Bu doküman kilitli.',
+'update_recipients' => '',
 'update_reviewers' => 'Kontrol edenlerin listesini güncelle',
+'update_reviser' => '',
 'uploaded_by' => 'Yükleyen',
 'uploading_failed' => 'Dosyalardan biri yüklenirken başarısız oldu. Maksimum yükleme boyutunuzu kontrol ediniz.',
 'uploading_maxsize' => 'Yüklenen dosya maksimum yükleme boyutundan fazla.',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index ab445b1c6..a72d39300 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -1031,7 +1031,9 @@ URL: [url]',
 'update_fulltext_index' => '更新全文索引',
 'update_info' => '更新信息',
 'update_locked_msg' => '该文档被锁定',
+'update_recipients' => '',
 'update_reviewers' => '更新校对人名单',
+'update_reviser' => '',
 'uploaded_by' => '上传者',
 'uploading_failed' => '文件太大无法上传！请处理后重新上传。',
 'uploading_maxsize' => '最大上传限制',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index ae1d1cf6f..5e0a5857d 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -1029,7 +1029,9 @@ URL: [url]',
 'update_fulltext_index' => '更新全文索引',
 'update_info' => '更新資訊',
 'update_locked_msg' => '該文檔被鎖定',
+'update_recipients' => '',
 'update_reviewers' => '更新校對人名單',
+'update_reviser' => '',
 'uploaded_by' => '上傳者',
 'uploading_failed' => '文件太大無法上傳！請處理後重新上傳。',
 'uploading_maxsize' => '最大上傳限制',

From 9c645663861cb55c1924c3bda006fc9bea4eda75 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 13:46:12 +0200
Subject: [PATCH 0029/2006] even more phrases

---
 languages/ar_EG/lang.inc | 4 ++++
 languages/bg_BG/lang.inc | 4 ++++
 languages/ca_ES/lang.inc | 4 ++++
 languages/cs_CZ/lang.inc | 4 ++++
 languages/de_DE/lang.inc | 6 +++++-
 languages/en_GB/lang.inc | 6 +++++-
 languages/es_ES/lang.inc | 4 ++++
 languages/fr_FR/lang.inc | 4 ++++
 languages/hu_HU/lang.inc | 4 ++++
 languages/it_IT/lang.inc | 4 ++++
 languages/nl_NL/lang.inc | 4 ++++
 languages/pl_PL/lang.inc | 4 ++++
 languages/pt_BR/lang.inc | 4 ++++
 languages/ro_RO/lang.inc | 4 ++++
 languages/ru_RU/lang.inc | 4 ++++
 languages/sk_SK/lang.inc | 4 ++++
 languages/sv_SE/lang.inc | 4 ++++
 languages/tr_TR/lang.inc | 4 ++++
 languages/zh_CN/lang.inc | 4 ++++
 languages/zh_TW/lang.inc | 4 ++++
 20 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 3d3c8f04f..8ad876c12 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -800,10 +800,14 @@ URL: [url]',
 'select_groups' => 'اضغط لاختيار مجموعة',
 'select_grp_approvers' => 'اضغط لاختيار مجموعة الموافقون',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'اضغط لاختيار مجموعة المراجعون',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'اضغط لاختيار موافق فردي',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'اضغط لاختيار مراجع فردي',
+'select_ind_revisers' => '',
 'select_one' => 'اختر واحد',
 'select_users' => 'اضغط لاختيار المستخدم',
 'select_workflow' => 'اختر مسار العمل',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 8ffe466aa..70ad79d56 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -665,10 +665,14 @@ $text = array(
 'select_groups' => 'Кликни да избереш групи',
 'select_grp_approvers' => 'Кликни да избереш група утвърждаващи',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Кликни да избереш група рецензенти',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Кликни да избереш утвърждаващ',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Кликни да избереш рецензент',
+'select_ind_revisers' => '',
 'select_one' => 'Избери един',
 'select_users' => 'Кликни да избереш потребители',
 'select_workflow' => 'Избери процес',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index a60dfe775..803a146af 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -670,10 +670,14 @@ URL: [url]',
 'select_groups' => '',
 'select_grp_approvers' => '',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
+'select_grp_revisers' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
+'select_ind_revisers' => '',
 'select_one' => 'Seleccionar un',
 'select_users' => '',
 'select_workflow' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index dffe8ab68..2fcfe5bea 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -809,10 +809,14 @@ URL: [url]',
 'select_groups' => 'Kliknutím vyberte skupiny',
 'select_grp_approvers' => 'Kliknutím vyberte skupinu schvalovatele',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kliknutím vyberte skupinu posuzovatele',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Kliknutím vyberte jednotlivého schvalovatele',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Klepnutím vyberte jednotlivého posuzovatele',
+'select_ind_revisers' => '',
 'select_one' => 'Vyberte jeden',
 'select_users' => 'Kliknutím vyberte uživatele',
 'select_workflow' => 'Vyberte postup práce',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 5dc93c997..55de1d55a 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1993), dgrutsch (18)
+//    Translators: Admin (1994), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -829,10 +829,14 @@ URL: [url]',
 'select_groups' => 'Klicken zur Auswahl einer Gruppe',
 'select_grp_approvers' => 'Klicken zur Auswahl einer Freigabegruppe',
 'select_grp_notification' => 'Klicken zur Auswahl einer Beobachtergruppe',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Klicken zur Auswahl einer Prüfgruppe',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Klicken zur Auswahl eines Freigebers',
 'select_ind_notification' => 'Klicken zur Auswahl eines Beobachters',
+'select_ind_recipients' => 'Click to select individual recipients',
 'select_ind_reviewers' => 'Klicken zur Auswahl eines Prüfers',
+'select_ind_revisers' => '',
 'select_one' => 'Bitte wählen',
 'select_users' => 'Klicken zur Auswahl eines Benutzers',
 'select_workflow' => 'Workflow auswählen',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 41cd832f7..b1e91f583 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1124), dgrutsch (3), netixw (14)
+//    Translators: Admin (1127), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -836,10 +836,14 @@ URL: [url]',
 'select_groups' => 'Click to select groups',
 'select_grp_approvers' => 'Click to select group approver',
 'select_grp_notification' => 'Click to select group notification',
+'select_grp_recipients' => 'Click to select group of recipients',
 'select_grp_reviewers' => 'Click to select group reviewer',
+'select_grp_revisers' => 'Click to select group of resubmitters',
 'select_ind_approvers' => 'Click to select individual approver',
 'select_ind_notification' => 'Click to select individual notification',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Click to select individual reviewer',
+'select_ind_revisers' => 'Click to select individual resubmitters',
 'select_one' => 'Select one',
 'select_users' => 'Click to select users',
 'select_workflow' => 'Select workflow',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 9ed02af6d..1ad2f47de 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -815,10 +815,14 @@ URL: [url]',
 'select_groups' => 'Haga Click para seleccionar grupos',
 'select_grp_approvers' => 'Haga Click para seleccionar grupo de aprobadores',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Haga Click para seleccionar grupo de revisores',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Haga Click para seleccionar aprobador individual',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Haga Click para seleccionar revisor individual',
+'select_ind_revisers' => '',
 'select_one' => 'Seleccionar uno',
 'select_users' => 'Haga Click para seleccionar usuarios',
 'select_workflow' => 'Selecionar Flujo de Trabajo',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 5b55d235a..84d912bed 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -791,10 +791,14 @@ URL: [url]',
 'select_groups' => 'Cliquer pour choisir un groupe',
 'select_grp_approvers' => 'Cliquer pour choisir un groupe d\'approbateur',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Cliquer pour choisir un groupe de correcteur',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Cliquer pour choisir un approbateur individuel',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Cliquer pour choisir un correcteur individuel',
+'select_ind_revisers' => '',
 'select_one' => 'Selectionner',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_workflow' => 'Choisir un workflow',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index f71d4a445..3e6c8b6da 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -814,10 +814,14 @@ URL: [url]',
 'select_groups' => 'Kattintson a csoportok kijelöléséhez',
 'select_grp_approvers' => 'Kattintson a csoport jóváhagyó kijelöléséhez',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kattintson a csoport felülvizsgáló kijelöléséhez',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Kattintson az önálló jóváhagyó kijelöléséhez',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Kattintson az önálló felülvizsgáló kijelöléséhez',
+'select_ind_revisers' => '',
 'select_one' => 'Vßlasszon egyet',
 'select_users' => 'Kattintson a felhasználó kiválasztásához',
 'select_workflow' => 'Munkafolyamat választás',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 628f8734d..135ac6b6f 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -837,10 +837,14 @@ URL: [url]',
 'select_groups' => 'Clicca per selezionare i gruppi',
 'select_grp_approvers' => 'Seleziona gruppo approvatore',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Seleziona gruppo revisore',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Seleziona approvatore',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Seleziona revisore',
+'select_ind_revisers' => '',
 'select_one' => 'Seleziona uno',
 'select_users' => 'Clicca per selezionare gli utenti',
 'select_workflow' => 'Seleziona il flusso di lavoro',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 9341240cf..b7733bf8c 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -806,10 +806,14 @@ URL: [url]',
 'select_groups' => 'Klik om groep te selecteren',
 'select_grp_approvers' => 'Klik om groep beoordelaar te selecteren',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Klik om groep beoordelaar te selecteren',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Klik om individuele beoordelaar te selecteren',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Klik om individuele beoordelaar te selecteren',
+'select_ind_revisers' => '',
 'select_one' => 'Selecteer een',
 'select_users' => 'Klik om gebruikers te selecteren',
 'select_workflow' => 'Selecteer workflow',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 20b56220a..4e7e8cc1e 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -794,10 +794,14 @@ URL: [url]',
 'select_groups' => 'Kliknij by wybrać grupy',
 'select_grp_approvers' => 'Kliknij by wybrać grupę zatwierdzającą',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kliknij by wybrać grupę recenzentów',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Kliknij by wybrać zatwierdzającego',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Kliknij by wybrać recenzenta',
+'select_ind_revisers' => '',
 'select_one' => 'Wybierz',
 'select_users' => 'Kliknij by wybrać użytkowników',
 'select_workflow' => 'Wybierz proces',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 206a57dfb..7376cad3e 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -812,10 +812,14 @@ URL: [url]',
 'select_groups' => 'Clique para selecionar os grupos',
 'select_grp_approvers' => 'Clique para selecionar o grupo aprovador',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Clique para selecionar o grupo revisor',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Clique para selecionar aprovador indivídual',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Clique para selecionar revisor individual',
+'select_ind_revisers' => '',
 'select_one' => 'Selecione um',
 'select_users' => 'Clique para selecionar os usuários',
 'select_workflow' => 'Selecione o fluxo de trabalho',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 4f9607987..411582758 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -815,10 +815,14 @@ URL: [url]',
 'select_groups' => 'Click pentru a selecta grupuri',
 'select_grp_approvers' => 'Click pentru a selecta grupul de aprobatori',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Click pentru a selecta grupul de revizuitori',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Click pentru a selecta un aprobator individual',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Click pentru a selecta un revizuitor individual',
+'select_ind_revisers' => '',
 'select_one' => 'Selectați unul',
 'select_users' => 'Click pentru a selecta utilizatori',
 'select_workflow' => 'Selectați workflow',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 73250705c..1d1ad2104 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -805,10 +805,14 @@ URL: [url]',
 'select_groups' => 'Выберите группы',
 'select_grp_approvers' => 'Выберите утверждающую группу',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Выберите рецензирующую группу',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Выберите индивидуального утверждающего',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Выберите индивидуального рецензента',
+'select_ind_revisers' => '',
 'select_one' => 'Выберите',
 'select_users' => 'Выберите пользователей',
 'select_workflow' => 'Выберите процесс',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 958a12be3..9a4449963 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -665,10 +665,14 @@ $text = array(
 'select_groups' => '',
 'select_grp_approvers' => '',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
+'select_grp_revisers' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
+'select_ind_revisers' => '',
 'select_one' => 'Vyberte jeden',
 'select_users' => '',
 'select_workflow' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 91e3ae41f..4ff21500d 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -800,10 +800,14 @@ URL: [url]',
 'select_groups' => 'Välj grupper',
 'select_grp_approvers' => 'Välj en grupp som ska godkänna',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Välj en grupp som ska granska',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Välj en person som ska godkänna',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Välj en person som ska granska',
+'select_ind_revisers' => '',
 'select_one' => 'Välj',
 'select_users' => 'Välj användare',
 'select_workflow' => 'Välj arbetsflöde',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 3c6997b7e..cca409e17 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -816,10 +816,14 @@ URL: [url]',
 'select_groups' => 'Grup seçmek için tıklayın',
 'select_grp_approvers' => 'Grup onaylayıcı seçmek için tıklayın',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Grup kontrol edeni seçmek için tıklayın',
+'select_grp_revisers' => '',
 'select_ind_approvers' => 'Bireysel onaylanı seçmek için tıklayın',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Biresysel kontrol edeni seçmek için tıklayın',
+'select_ind_revisers' => '',
 'select_one' => 'Birini seçiniz',
 'select_users' => 'Kullanıcı seçmek için tıklayın',
 'select_workflow' => 'İş akışı seç',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index a72d39300..c4a5357e8 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -671,10 +671,14 @@ URL: [url]',
 'select_groups' => '点击选择组',
 'select_grp_approvers' => '',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
+'select_grp_revisers' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
+'select_ind_revisers' => '',
 'select_one' => '选择一个',
 'select_users' => '点击选择用户',
 'select_workflow' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 5e0a5857d..1781a955f 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -669,10 +669,14 @@ URL: [url]',
 'select_groups' => '點擊選擇組',
 'select_grp_approvers' => '',
 'select_grp_notification' => '',
+'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
+'select_grp_revisers' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
+'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
+'select_ind_revisers' => '',
 'select_one' => '選擇一個',
 'select_users' => '點擊選擇用戶',
 'select_workflow' => '',

From 1ab9fdb229aae85b317ed0f4d6b6f98212ccf76b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 14:57:07 +0200
Subject: [PATCH 0030/2006] add field startdate to talbe tblDocumentRevisers

---
 install/create_tables-sqlite3.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 3d5b700fc..099bad86f 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -386,6 +386,7 @@ CREATE TABLE `tblDocumentRevisers` (
   `version` INTEGER unsigned NOT NULL default '0',
   `type` INTEGER NOT NULL default '0',
   `required` INTEGER NOT NULL default '0',
+  `startdate` TEXT default NULL,
   UNIQUE (`documentID`,`version`,`type`,`required`)
 ) ;
 

From 5702708643d97e6d44cb5579b4f341de01a3b56b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 14:57:36 +0200
Subject: [PATCH 0031/2006] add link to out/out.ReceiptSummary.php in
 MyDocuments menu

---
 views/bootstrap/class.Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 32ce9b0d6..5f7e0b616 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -526,6 +526,7 @@ $(document).ready(function () {
 		} else {
 			echo "<li><a href=\"../out/out.WorkflowSummary.php\">".getMLText("workflow_summary")."</a></li>\n";
 		}
+		echo "<li><a href=\"../out/out.ReceiptSummary.php\">".getMLText("receipt_summary")."</a></li>\n";
 		echo "</ul>\n";
 		echo "</div>\n";
 		return;

From 12b0eadc66b2f8635140a57f1d3eeded0aabe47e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 17:19:53 +0200
Subject: [PATCH 0032/2006] use classnames in SeedDMS_Core_DMS when
 instanciating users

---
 SeedDMS_Core/Core/inc.ClassGroup.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index c389cebd4..693424e1f 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -151,8 +151,9 @@ class SeedDMS_Core_Group {
 
 			$this->_users = array();
 
+			$classname = $this->_dms->getClassname('user');
 			foreach ($resArr as $row) {
-				$user = new SeedDMS_Core_User($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']);
+				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']);
 				array_push($this->_users, $user);
 			}
 		}
@@ -171,8 +172,9 @@ class SeedDMS_Core_Group {
 
 		$managers = array();
 
+		$classname = $this->_dms->getClassname('user');
 		foreach ($resArr as $row) {
-			$user = new SeedDMS_Core_User($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']);
+			$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']);
 			array_push($managers, $user);
 		}
 		return $managers;

From d7d4ab63901a32f82b40eb927cae9f071cd105cb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 17:20:57 +0200
Subject: [PATCH 0033/2006] use classnames in SeedDMS_Core_DMS when
 instanciating, new method getDocumentCheckOuts()

---
 SeedDMS_Core/Core/inc.ClassUser.php | 39 +++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index f45372494..f5bb4ebd9 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -770,8 +770,9 @@ class SeedDMS_Core_User {
 				return false;
 
 			$this->_groups = array();
+			$classname = $this->_dms->getClassname('group');
 			foreach ($resArr as $row) {
-				$group = new SeedDMS_Core_Group($row["id"], $row["name"], $row["comment"]);
+				$group = new $classname($row["id"], $row["name"], $row["comment"]);
 				$group->setDMS($this->_dms);
 				array_push($this->_groups, $group);
 			}
@@ -866,8 +867,9 @@ class SeedDMS_Core_User {
 			return false;
 
 		$documents = array();
+		$classname = $this->_dms->getClassname('document');
 		foreach ($resArr as $row) {
-			$document = new SeedDMS_Core_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], $row["lockUser"], $row["keywords"], $row["sequence"]);
+			$document = new $classname($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], $row["lockUser"], $row["keywords"], $row["sequence"]);
 			$document->setDMS($this->_dms);
 			$documents[] = $document;
 		}
@@ -876,8 +878,6 @@ class SeedDMS_Core_User {
 
 	/**
 	 * Returns all documents locked by a given user
-	 * FIXME: Not full implemented. Do not use, because it still requires the
-	 * temporary tables!
 	 *
 	 * @param object $user
 	 * @return array list of documents
@@ -895,8 +895,37 @@ class SeedDMS_Core_User {
 			return false;
 
 		$documents = array();
+		$classname = $this->_dms->getClassname('document');
 		foreach ($resArr as $row) {
-			$document = new SeedDMS_Core_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], $row["lockUser"], $row["keywords"], $row["sequence"]);
+			$document = new $classname($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], $row["lockUser"], $row["keywords"], $row["sequence"]);
+			$document->setDMS($this->_dms);
+			$documents[] = $document;
+		}
+		return $documents;
+	} /* }}} */
+
+	/**
+	 * Returns all documents check out by a given user
+	 *
+	 * @param object $user
+	 * @return array list of documents
+	 */
+	function getDocumentsCheckOut() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "SELECT `tblDocuments`.* ".
+			"FROM `tblDocumentCheckOuts` LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentCheckOuts`.`document` ".
+			"WHERE `tblDocumentCheckOuts`.`userID` = '".$this->_id."' ".
+			"ORDER BY `id` ASC";
+
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+
+		$documents = array();
+		$classname = $this->_dms->getClassname('document');
+		foreach ($resArr as $row) {
+			$document = new $classname($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], $row["lockUser"], $row["keywords"], $row["sequence"]);
 			$document->setDMS($this->_dms);
 			$documents[] = $document;
 		}

From 4f3c6ed0904985a223e893a2009b5a4c24b488ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 17:21:57 +0200
Subject: [PATCH 0034/2006] add checkbox for creating checkout dir if it
 doesn't exists

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

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 47dc69165..15cb6060d 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -85,6 +85,8 @@ class Settings { /* {{{ */
 	var $_dropFolderDir = null;
 	// Where the checked out files are located
 	var $_checkOutDir = null;
+	// Create checkout dir if it doesn't exists
+	var $_createCheckOutDir = false;
 	// Where the stop word file is located
 	var $_stopWordsFile = null;
 	// enable/disable lucene fulltext search
@@ -375,6 +377,7 @@ class Settings { /* {{{ */
 		$this->_luceneDir = strval($tab["luceneDir"]);
 		$this->_dropFolderDir = strval($tab["dropFolderDir"]);
 		$this->_checkOutDir = strval($tab["checkOutDir"]);
+		$this->_createCheckOutDir = Settings::boolVal($tab["createCheckOutDir"]);
 		$this->_logFileEnable = Settings::boolVal($tab["logFileEnable"]);
 		$this->_logFileRotation = strval($tab["logFileRotation"]);
 		$this->_enableLargeFileUpload = Settings::boolVal($tab["enableLargeFileUpload"]);
@@ -660,6 +663,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "luceneDir", $this->_luceneDir);
     $this->setXMLAttributValue($node, "dropFolderDir", $this->_dropFolderDir);
     $this->setXMLAttributValue($node, "checkOutDir", $this->_checkOutDir);
+    $this->setXMLAttributValue($node, "createCheckOutDir", $this->_createCheckOutDir);
     $this->setXMLAttributValue($node, "logFileEnable", $this->_logFileEnable);
     $this->setXMLAttributValue($node, "logFileRotation", $this->_logFileRotation);
     $this->setXMLAttributValue($node, "enableLargeFileUpload", $this->_enableLargeFileUpload);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index b3c544db6..6c7d3724c 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -96,6 +96,7 @@ if ($action == "saveSettings")
   $settings->_extraPath = $_POST["extraPath"];
   $settings->_dropFolderDir = $_POST["dropFolderDir"];
   $settings->_checkOutDir = $_POST["checkOutDir"];
+  $settings->_createCheckOutDir = getBoolValue("createCheckOutDir");
   $settings->_logFileEnable = getBoolValue("logFileEnable");
   $settings->_logFileRotation = $_POST["logFileRotation"];
   $settings->_enableLargeFileUpload = getBoolValue("enableLargeFileUpload");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 914e57d38..64c3df226 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -55,7 +55,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 
   <form action="../op/op.Settings.php" method="post" enctype="multipart/form-data" name="form0" >
   <input type="hidden" name="action" value="saveSettings" />
-	<input type="hidden" id="currenttab" name="currenttab" value="<?php echo (isset($_POST['currenttab']) ? $_POST['currenttab'] : 'site' ); ?>" />
+	<input type="hidden" id="currenttab" name="currenttab" value="<?php echo $currenttab ? $currenttab : 'site'; ?>" />
 <?php
 if(!is_writeable($settings->_configFilePath)) {
 	print "<div class=\"alert alert-warning\">";
@@ -294,6 +294,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_checkOutDir");?>:</td>
         <td><input type="text" name="checkOutDir" value="<?php echo $settings->_checkOutDir ?>" size="100" /></td>
       </tr>
+      <tr title="<?php printMLText("settings_createCheckOutDir_desc");?>">
+        <td><?php printMLText("settings_createCheckOutDir");?>:</td>
+        <td><input type="checkbox" name="createCheckOutDir" <?php if($settings->_createCheckOutDir) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_logFileEnable_desc");?>">
         <td><?php printMLText("settings_logFileEnable");?>:</td>
         <td><input name="logFileEnable" type="checkbox" <?php if ($settings->_logFileEnable) echo "checked" ?> /></td>

From 87b3c37cb0299dcfe7baa446afdc4d23fdb785cd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 17:22:30 +0200
Subject: [PATCH 0035/2006] use $_REQUEST instead of $_GET when getting
 currenttab

---
 out/out.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Settings.php b/out/out.Settings.php
index b4c8b2514..459ddf509 100644
--- a/out/out.Settings.php
+++ b/out/out.Settings.php
@@ -33,7 +33,7 @@ if(!trim($settings->_encryptionKey))
 	$settings->_encryptionKey = md5(uniqid());
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings, 'currenttab'=>(isset($_GET['currenttab']) ? $_GET['currenttab'] : '')));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings, 'currenttab'=>(isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '')));
 if($view) {
 	$view->show();
 	exit;

From 08e768fc5220caa95114806470d7a97a2bb652a9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 17:23:54 +0200
Subject: [PATCH 0036/2006] =?UTF-8?q?add=20missing=20files=20for=20documen?=
 =?UTF-8?q?t=20check=20out/=D1=96n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 op/op.CheckInDocument.php                 | 299 ++++++++++++
 op/op.CheckOutDocument.php                |  66 +++
 out/out.CheckInDocument.php               |  73 +++
 views/bootstrap/class.CheckInDocument.php | 544 ++++++++++++++++++++++
 views/bootstrap/class.CheckOutSummary.php | 144 ++++++
 5 files changed, 1126 insertions(+)
 create mode 100644 op/op.CheckInDocument.php
 create mode 100644 op/op.CheckOutDocument.php
 create mode 100644 out/out.CheckInDocument.php
 create mode 100644 views/bootstrap/class.CheckInDocument.php
 create mode 100644 views/bootstrap/class.CheckOutSummary.php

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
new file mode 100644
index 000000000..4ce8bb7b7
--- /dev/null
+++ b/op/op.CheckInDocument.php
@@ -0,0 +1,299 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.ClassEmail.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$documentid = $_POST["documentid"];
+$document = $dms->getDocument($documentid);
+$folder = $document->getFolder();
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_READWRITE) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+if($settings->_quota > 0) {
+	$remain = checkQuota($user);
+	if ($remain < 0) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("quota_exceeded", array('bytes'=>SeedDMS_Core_File::format_filesize(abs($remain)))));
+	}
+}
+
+if ($document->isLocked()) {
+	$lockingUser = $document->getLockingUser();
+	if (($lockingUser->getID() != $user->getID()) && ($document->getAccessMode($user) != M_ALL)) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_update_cause_locked"));
+	}
+	else $document->setLocked(false);
+}
+
+if(isset($_POST["comment"]))
+	$comment  = $_POST["comment"];
+else
+	$comment = "";
+
+
+	// Get the list of reviewers and approvers for this document.
+	$reviewers = array();
+	$approvers = array();
+	$reviewers["i"] = array();
+	$reviewers["g"] = array();
+	$approvers["i"] = array();
+	$approvers["g"] = array();
+	$workflow = null;
+
+	if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
+		if($settings->_workflowMode == 'traditional') {
+			// Retrieve the list of individual reviewers from the form.
+			$reviewers["i"] = array();
+			if (isset($_POST["indReviewers"])) {
+				foreach ($_POST["indReviewers"] as $ind) {
+					$reviewers["i"][] = $ind;
+				}
+			}
+			// Retrieve the list of reviewer groups from the form.
+			$reviewers["g"] = array();
+			if (isset($_POST["grpReviewers"])) {
+				foreach ($_POST["grpReviewers"] as $grp) {
+					$reviewers["g"][] = $grp;
+				}
+			}
+		}
+
+		// Retrieve the list of individual approvers from the form.
+		$approvers["i"] = array();
+		if (isset($_POST["indApprovers"])) {
+			foreach ($_POST["indApprovers"] as $ind) {
+				$approvers["i"][] = $ind;
+			}
+		}
+		// Retrieve the list of approver groups from the form.
+		$approvers["g"] = array();
+		if (isset($_POST["grpApprovers"])) {
+			foreach ($_POST["grpApprovers"] as $grp) {
+				$approvers["g"][] = $grp;
+			}
+		}
+
+		// add mandatory reviewers/approvers
+		$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
+		if($settings->_workflowMode == 'traditional') {
+			$res=$user->getMandatoryReviewers();
+			foreach ($res as $r){
+
+				if ($r['reviewerUserID']!=0){
+					foreach ($docAccess["users"] as $usr)
+						if ($usr->getID()==$r['reviewerUserID']){
+							$reviewers["i"][] = $r['reviewerUserID'];
+							break;
+						}
+				}
+				else if ($r['reviewerGroupID']!=0){
+					foreach ($docAccess["groups"] as $grp)
+						if ($grp->getID()==$r['reviewerGroupID']){
+							$reviewers["g"][] = $r['reviewerGroupID'];
+							break;
+						}
+				}
+			}
+		}
+		$res=$user->getMandatoryApprovers();
+		foreach ($res as $r){
+
+			if ($r['approverUserID']!=0){
+				foreach ($docAccess["users"] as $usr)
+					if ($usr->getID()==$r['approverUserID']){
+						$approvers["i"][] = $r['approverUserID'];
+						break;
+					}
+			}
+			else if ($r['approverGroupID']!=0){
+				foreach ($docAccess["groups"] as $grp)
+					if ($grp->getID()==$r['approverGroupID']){
+						$approvers["g"][] = $r['approverGroupID'];
+						break;
+					}
+			}
+		}
+	} elseif($settings->_workflowMode == 'advanced') {
+		if(!$workflow = $user->getMandatoryWorkflow()) {
+			if(isset($_POST["workflow"]))
+				$workflow = $dms->getWorkflow($_POST["workflow"]);
+			else
+				$workflow = null;
+		}
+	}
+
+	if(isset($_POST["attributes"]) && $_POST["attributes"]) {
+		$attributes = $_POST["attributes"];
+		foreach($attributes as $attrdefid=>$attribute) {
+			$attrdef = $dms->getAttributeDefinition($attrdefid);
+			if($attribute) {
+				if(!$attrdef->validate($attribute)) {
+					switch($attrdef->getValidationError()) {
+					case 5:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_malformed_email", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
+						break;
+					case 4:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_malformed_url", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
+						break;
+					case 3:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_no_regex_match", array("attrname"=>$attrdef->getName(), "value"=>$attribute, "regex"=>$attrdef->getRegex())));
+						break;
+					case 2:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
+						break;
+					case 1:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
+						break;
+					default:
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+					}
+				}
+				/*
+				if($attrdef->getRegex()) {
+					if(!preg_match($attrdef->getRegex(), $attribute)) {
+						UI::exitError(getMLText("document_title", array("documentname" => $folder->getName())),getMLText("attr_no_regex_match"));
+					}
+				}
+				if(is_array($attribute)) {
+					if($attrdef->getMinValues() > count($attribute)) {
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
+					}
+					if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
+					}
+				}
+				 */
+			}
+		}
+	} else {
+		$attributes = array();
+	}
+
+	$contentResult=$document->checkIn($comment, $user, $reviewers, $approvers, $version=0, $attributes, $workflow);
+	if (is_bool($contentResult) && !$contentResult) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+	} elseif (is_bool($contentResult) && $contentResult) {
+	} else {
+		// Send notification to subscribers.
+		if ($notifier){
+			$notifyList = $document->getNotifyList();
+			$folder = $document->getFolder();
+
+			$subject = "document_updated_email_subject";
+			$message = "document_updated_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['comment'] = $document->getComment();
+			$params['version_comment'] = $contentResult->getContent()->getComment();
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID()) 
+				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
+
+			if($workflow && $settings->_enableNotificationWorkflow) {
+				$subject = "request_workflow_action_email_subject";
+				$message = "request_workflow_action_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['version'] = $contentResult->getContent()->getVersion();
+				$params['workflow'] = $workflow->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['current_state'] = $workflow->getInitState()->getName();
+				$params['username'] = $user->getFullName();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+
+				foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
+					foreach($ntransition->getUsers() as $tuser) {
+						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
+					}
+					foreach($ntransition->getGroups() as $tuser) {
+						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+					}
+				}
+			}
+		}
+
+		$expires = false;
+		if (!isset($_POST['expires']) || $_POST["expires"] != "false") {
+			if($_POST["expdate"]) {
+				$tmp = explode('-', $_POST["expdate"]);
+				$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
+			} else {
+				$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
+			}
+		}
+
+		if ($expires) {
+			if($document->setExpires($expires)) {
+				if($notifier) {
+					$notifyList = $document->getNotifyList();
+					$folder = $document->getFolder();
+
+					// Send notification to subscribers.
+					$subject = "expiry_changed_email_subject";
+					$message = "expiry_changed_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['username'] = $user->getFullName();
+					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+					$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+					foreach ($notifyList["groups"] as $grp) {
+						$notifier->toGroup($user, $grp, $subject, $message, $params);
+					}
+				}
+			} else {
+				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+			}
+		}
+	}
+
+add_log_line("?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+
+?>
+
diff --git a/op/op.CheckOutDocument.php b/op/op.CheckOutDocument.php
new file mode 100644
index 000000000..0004ed832
--- /dev/null
+++ b/op/op.CheckOutDocument.php
@@ -0,0 +1,66 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$documentid = $_GET["documentid"];
+$document = $dms->getDocument($documentid);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if(!$settings->_checkOutDir) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("checkout_is_disabled"));
+}
+
+if ($document->getAccessMode($user) < M_READWRITE) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
+if ($document->isLocked()) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("document_already_locked"));
+}
+
+if ($document->isCheckedOut()) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("document_already_checkedout"));
+}
+
+if (!$document->checkOut($user, sprintf($settings->_checkOutDir.'/', preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin())))) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+}
+
+$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_document_checkedout')));
+
+add_log_line();
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+
+?>
+
diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
new file mode 100644
index 000000000..418d7a1d7
--- /dev/null
+++ b/out/out.CheckInDocument.php
@@ -0,0 +1,73 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 2015 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+$document = $dms->getDocument($_GET["documentid"]);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_READWRITE) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+if($document->isLocked()) {
+	$lockingUser = $document->getLockingUser();
+	if (($lockingUser->getID() != $user->getID()) && ($document->getAccessMode($user) != M_ALL)) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName()))));
+	}
+}
+
+if(!$document->isCheckedOut()) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("document_not_checkedout"));
+}
+
+if($settings->_quota > 0) {
+	$remain = checkQuota($user);
+	if ($remain < 0) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("quota_exceeded", array('bytes'=>SeedDMS_Core_File::format_filesize(abs($remain)))));
+	}
+}
+
+$folder = $document->getFolder();
+
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate));
+if($view) {
+	$view->setParam('accessobject', $accessop);
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
new file mode 100644
index 000000000..761bf0a3b
--- /dev/null
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -0,0 +1,544 @@
+<?php
+/**
+ * Implementation of CheckInDocument view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2015 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for Document view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2015 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_CheckInDocument extends SeedDMS_Bootstrap_Style {
+
+	function __takeOverButton($name, $users) { /* {{{ */
+?>
+	<span id="<?php echo $name; ?>_btn" style="cursor: pointer;" title="<?php printMLText("takeOver".$name); ?>"><i class="icon-arrow-left"></i></span>
+<script>
+$(document).ready( function() {
+	$('#<?php echo $name; ?>_btn').click(function(ev){
+		ev.preventDefault();
+<?php
+		foreach($users as $_id) {
+			echo "$(\"#".$name." option[value='".$_id."']\").attr(\"selected\", \"selected\");\n";
+		}
+?>
+		$("#<?php echo $name; ?>").trigger("chosen:updated");
+	});
+});
+</script>
+<?php
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$document = $this->params['document'];
+		$strictformcheck = $this->params['strictformcheck'];
+		$enablelargefileupload = $this->params['enablelargefileupload'];
+		$enableadminrevapp = $this->params['enableadminrevapp'];
+		$enableownerrevapp = $this->params['enableownerrevapp'];
+		$enableselfrevapp = $this->params['enableselfrevapp'];
+		$dropfolderdir = $this->params['dropfolderdir'];
+		$workflowmode = $this->params['workflowmode'];
+		$presetexpiration = $this->params['presetexpiration'];
+		$documentid = $document->getId();
+
+		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
+		$this->globalNavigation($folder);
+		$this->contentStart();
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
+		$this->contentHeading(getMLText("checkin_document"));
+?>
+
+<script language="JavaScript">
+function checkForm()
+{
+	msg = new Array();
+<?php if($dropfolderdir) { ?>
+	if (document.form1.userfile.value == "" && document.form1.dropfolderfileform1.value == "") msg.push("<?php printMLText("js_no_file");?>");
+<?php } else { ?>
+	if (document.form1.userfile.value == "") msg.push("<?php printMLText("js_no_file");?>");
+<?php } ?>
+<?php
+	if ($strictformcheck) {
+	?>
+	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+<?php
+	}
+?>
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+</script>
+
+<?php
+		if ($document->isLocked()) {
+
+			$lockingUser = $document->getLockingUser();
+
+			print "<div class=\"alert alert-warning\">";
+			
+			printMLText("update_locked_msg", array("username" => htmlspecialchars($lockingUser->getFullName()), "email" => $lockingUser->getEmail()));
+			
+			if ($lockingUser->getID() == $user->getID())
+				printMLText("unlock_cause_locking_user");
+			else if ($document->getAccessMode($user) == M_ALL)
+				printMLText("unlock_cause_access_mode_all");
+			else
+			{
+				printMLText("no_update_cause_locked");
+				print "</div>";
+				$this->htmlEndPage();
+				exit;
+			}
+
+			print "</div>";
+		}
+
+		if ($checkoutstatus = $document->checkOutStatus()) {
+			switch($checkoutstatus) {
+			case 1:
+				print "<div class=\"alert alert-warning\">";
+				printMLText("checkedout_file_has_disappeared");
+				print "</div>";
+				break;
+			case 2:
+				print "<div class=\"alert alert-warning\">";
+				printMLText("checkedout_file_has_different_version");
+				print "</div>";
+				break;
+			case 3:
+				print "<div class=\"alert alert-warning\">";
+				printMLText("checkedout_file_is_unchanged");
+				print "</div>";
+				break;
+			}
+		}
+
+		$latestContent = $document->getLatestContent();
+		$reviewStatus = $latestContent->getReviewStatus();
+		$approvalStatus = $latestContent->getApprovalStatus();
+		if($workflowmode == 'advanced') {
+			if($status = $latestContent->getStatus()) {
+				if($status["status"] == S_IN_WORKFLOW) {
+					$this->warningMsg("The current version of this document is in a workflow. This will be interrupted and cannot be completed if you upload a new version.");
+				}
+			}
+		}
+
+		$this->contentContainerStart();
+?>
+
+<form action="../op/op.CheckInDocument.php" method="post" name="form1" onsubmit="return checkForm();">
+	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
+	<table class="table-condensed">
+	
+		<tr>
+			<td><?php printMLText("comment");?>:</td>
+			<td class="standardText">
+				<textarea name="comment" rows="4" cols="80"></textarea>
+			</td>
+		</tr>
+<?php
+			if($presetexpiration) {
+				if(!($expts = strtotime($presetexpiration)))
+					$expts = time();
+			} else {
+				$expts = time();
+			}
+?>
+		<tr>
+			<td><?php printMLText("expires");?>:</td>
+			<td class="standardText">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y', $expts); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y', $expts); ?>">
+          <span class="add-on"><i class="icon-calendar"></i></span>
+        </span><br />
+        <label class="checkbox inline">
+				  <input type="checkbox" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
+        </label>
+			</td>
+		</tr>
+<?php
+	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
+	if($attrdefs) {
+		foreach($attrdefs as $attrdef) {
+?>
+    <tr>
+	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
+	    <td><?php $this->printAttributeEditField($attrdef, '') ?></td>
+    </tr>
+<?php
+		}
+	}
+	if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+		// Retrieve a list of all users and groups that have review / approve
+		// privileges.
+		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
+		if($workflowmode != 'traditional_only_approval') {
+?>
+		<tr>
+			<td colspan="2">
+				<?php $this->contentSubHeading(getMLText("assign_reviewers")); ?>
+      </td>
+    </tr>
+    <tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
+      </td>
+			<td>
+        <select id="IndReviewer" class="chzn-select span9" name="indReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+				$res=$user->getMandatoryReviewers();
+				foreach ($docAccess["users"] as $usr) {
+					if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
+					$mandatory=false;
+					foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
+
+					if ($mandatory) print "<option disabled=\"disabled\" value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
+					else print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
+				}
+?>
+				</select>
+<?php
+				$tmp = array();
+				foreach($reviewStatus as $r) {
+					$mandatory=false;
+					if($r['type'] == 0 && $res) {
+						foreach ($res as $rr)
+							if ($rr['reviewerUserID']==$r['required']) {
+								$mandatory=true;
+							}
+						if(!$mandatory)
+							$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->__takeOverButton("IndReviewer", $tmp);
+				}
+				/* List all mandatory reviewers */
+				if($res) {
+					$tmp = array();
+					foreach ($res as $r) {
+						if($r['reviewerUserID'] > 0) {
+							$u = $dms->getUser($r['reviewerUserID']);
+							$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
+						}
+					}
+					if($tmp) {
+						echo '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> ';
+						echo implode(', ', $tmp);
+						echo "</div>\n";
+					}
+				}
+				/* Check for mandatory reviewer without access */
+				foreach($res as $r) {
+					if($r['reviewerUserID']) {
+						$hasAccess = false;
+						foreach ($docAccess["users"] as $usr) {
+							if ($r['reviewerUserID']==$usr->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessUser = $dms->getUser($r['reviewerUserID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewer_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+						}
+					}
+				}
+?>
+      </td>
+    </tr>
+    <tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
+      </td>
+      <td>
+        <select id="GrpReviewer" class="chzn-select span9" name="grpReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+<?php
+				$tmp = array();
+				foreach($reviewStatus as $r) {
+					$mandatory=false;
+					if($r['type'] == 1 && $res) {
+						foreach ($res as $rr)
+							if ($rr['reviewerGroupID']==$r['required']) {
+								$mandatory=true;
+							}
+						if(!$mandatory)
+							$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->__takeOverButton("GrpReviewer", $tmp);
+				}
+				foreach ($docAccess["groups"] as $grp) {
+				
+					$mandatory=false;
+					foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $mandatory=true;	
+
+					if ($mandatory) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+					else print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+				}
+?>
+			</select>
+<?php
+				/* List all mandatory groups of reviewers */
+				if($res) {
+					$tmp = array();
+					foreach ($res as $r) {
+						if($r['reviewerGroupID'] > 0) {
+							$u = $dms->getGroup($r['reviewerGroupID']);
+							$tmp[] =  htmlspecialchars($u->getName());
+						}
+					}
+					if($tmp) {
+						echo '<div class="mandatories"><span>'.getMLText('mandatory_reviewergroups').':</span> ';
+						echo implode(', ', $tmp);
+						echo "</div>\n";
+					}
+				}
+
+				/* Check for mandatory reviewer group without access */
+				foreach($res as $r) {
+					if ($r['reviewerGroupID']) {
+						$hasAccess = false;
+						foreach ($docAccess["groups"] as $grp) {
+							if ($r['reviewerGroupID']==$grp->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessGroup = $dms->getGroup($r['reviewerGroupID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+						}
+					}
+				}
+?>
+      </td>
+		</tr>
+<?php } ?>
+    <tr>
+			<td colspan=2>
+				<?php $this->contentSubHeading(getMLText("assign_approvers")); ?>	
+      </td>
+    </tr>
+    <tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
+      </td>
+      <td>
+        <select id="IndApprover" class="chzn-select span9" name="indApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+				$res=$user->getMandatoryApprovers();
+				foreach ($docAccess["users"] as $usr) {
+					if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
+
+					$mandatory=false;
+					foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
+					
+					if ($mandatory) print "<option value=\"". $usr->getID() ."\" disabled='disabled'>". htmlspecialchars($usr->getFullName())."</option>";
+					else print "<option value=\"". $usr->getID() ."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
+				}
+?>
+        </select>
+<?php
+				$tmp = array();
+				foreach($approvalStatus as $r) {
+					$mandatory=false;
+					if($r['type'] == 0 && $res) {
+						foreach ($res as $rr)
+							if ($rr['approverUserID']==$r['required']) {
+								$mandatory=true;
+							}
+						if(!$mandatory)
+							$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->__takeOverButton("IndApprover", $tmp);
+				}
+				/* List all mandatory approvers */
+				if($res) {
+					$tmp = array();
+					foreach ($res as $r) {
+						if($r['approverUserID'] > 0) {
+							$u = $dms->getUser($r['approverUserID']);
+							$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
+						}
+					}
+					if($tmp) {
+						echo '<div class="mandatories"><span>'.getMLText('mandatory_approvers').':</span> ';
+						echo implode(', ', $tmp);
+						echo "</div>\n";
+					}
+				}
+
+				/* Check for mandatory approvers without access */
+				foreach($res as $r) {
+					if($r['approverUserID']) {
+						$hasAccess = false;
+						foreach ($docAccess["users"] as $usr) {
+							if ($r['approverUserID']==$usr->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessUser = $dms->getUser($r['approverUserID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approver_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+						}
+					}
+				}
+?>
+      </td>
+    </tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
+      </td>
+      <td>
+        <select id="GrpApprover" class="chzn-select span9" name="grpApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+<?php
+				foreach ($docAccess["groups"] as $grp) {
+				
+					$mandatory=false;
+					foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $mandatory=true;	
+
+					if ($mandatory) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+					else print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
+
+				}
+?>
+        </select>
+<?php
+				$tmp = array();
+				foreach($approvalStatus as $r) {
+					$mandatory=false;
+					if($r['type'] == 1 && $res) {
+						foreach ($res as $rr)
+							if ($rr['approverGroupID']==$r['required']) {
+								$mandatory=true;
+							}
+						if(!$mandatory)
+							$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->__takeOverButton("GrpApprover", $tmp);
+				}
+				/* List all mandatory groups of approvers */
+				if($res) {
+					$tmp = array();
+					foreach ($res as $r) {
+						if($r['approverGroupID'] > 0) {
+							$u = $dms->getGroup($r['approverGroupID']);
+							$tmp[] =  htmlspecialchars($u->getName());
+						}
+					}
+					if($tmp) {
+						echo '<div class="mandatories"><span>'.getMLText('mandatory_approvergroups').':</span> ';
+						echo implode(', ', $tmp);
+						echo "</div>\n";
+					}
+				}
+
+				/* Check for mandatory approver groups without access */
+				foreach($res as $r) {
+					if ($r['approverGroupID']) {
+						$hasAccess = false;
+						foreach ($docAccess["groups"] as $grp) {
+							if ($r['approverGroupID']==$grp->getID())
+								$hasAccess = true;
+						}
+						if(!$hasAccess) {
+							$noAccessGroup = $dms->getGroup($r['approverGroupID']);
+							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approvergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+						}
+					}
+				}
+?>
+			</td>
+			</tr>
+		<tr>
+			<td colspan="2"><div class="alert"><?php printMLText("add_doc_reviewer_approver_warning")?></div></td>
+		</tr>
+<?php
+	} else {
+?>
+		<tr>	
+      <td>
+			<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div>
+      </td>
+      <td>
+<?php
+				$mandatoryworkflow = $user->getMandatoryWorkflow();
+				if($mandatoryworkflow) {
+?>
+				<?php echo $mandatoryworkflow->getName(); ?>
+				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflow->getID(); ?>">
+<?php
+				} else {
+?>
+        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
+<?php
+					$workflows=$dms->getAllWorkflows();
+					print "<option value=\"\">"."</option>";
+					foreach ($workflows as $workflow) {
+						print "<option value=\"".$workflow->getID()."\"";
+						if($mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID())
+							echo " selected=\"selected\"";
+						print ">". htmlspecialchars($workflow->getName())."</option>";
+					}
+?>
+        </select>
+<?php
+				}
+?>
+      </td>
+    </tr>
+		<tr>	
+      <td colspan="2">
+			<?php $this->warningMsg(getMLText("add_doc_workflow_warning")); ?>
+      </td>
+		</tr>	
+<?php
+	}
+?>
+		<tr>
+			<td></td>
+			<td><input type="submit" class="btn" value="<?php printMLText("update_document")?>"></td>
+		</tr>
+	</table>
+</form>
+
+<?php
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>
diff --git a/views/bootstrap/class.CheckOutSummary.php b/views/bootstrap/class.CheckOutSummary.php
new file mode 100644
index 000000000..372f8af4b
--- /dev/null
+++ b/views/bootstrap/class.CheckOutSummary.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Implementation of CheckOutSummary view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for CheckOutSummary view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$this->htmlStartPage(getMLText("my_documents"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_documents"), "my_documents");
+
+		$this->contentHeading(getMLText("checkout_summary"));
+		$this->contentContainerStart();
+
+		// Get document list for the current user.
+		$receiptStatus = $user->getReceiptStatus();
+
+		// reverse order
+		$receiptStatus["indstatus"]=array_reverse($receiptStatus["indstatus"],true);
+		$receiptStatus["grpstatus"]=array_reverse($receiptStatus["grpstatus"],true);
+
+		$printheader=true;
+		$iRev = array();
+		foreach ($receiptStatus["indstatus"] as $st) {
+			$document = $dms->getDocument($st['documentID']);
+			if($document)
+				$version = $document->getContentByVersion($st['version']);
+			$owner = $document->getOwner();
+			$moduser = $dms->getUser($st['required']);
+
+			if ($document && $version) {
+			
+				if ($printheader){
+					print "<table class=\"table-condensed\">";
+					print "<thead>\n<tr>\n";
+					print "<th>".getMLText("name")."</th>\n";
+					print "<th>".getMLText("owner")."</th>\n";
+					print "<th>".getMLText("status")."</th>\n";
+					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("last_update")."</th>\n";
+					print "<th>".getMLText("expires")."</th>\n";
+					print "</tr>\n</thead>\n<tbody>\n";
+					$printheader=false;
+				}
+			
+				print "<tr>\n";
+				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
+				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
+				print "<td>".getOverallStatusText($st["status"])."</td>";
+				print "<td>".$st["version"]."</td>";
+				print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
+				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+				print "</tr>\n";
+			}
+			if ($st["status"]!=-2) {
+				$iRev[] = $st["documentID"];
+			}
+		}
+		if (!$printheader) {
+			echo "</tbody>\n</table>";
+		} else {
+			printMLText("no_docs_to_receipt");
+		}
+
+		$this->contentContainerEnd();
+		$this->contentHeading(getMLText("group_receipt_summary"));
+		$this->contentContainerStart();
+
+		$printheader=true;
+		foreach ($receiptStatus["grpstatus"] as $st) {
+			$document = $dms->getDocument($st['documentID']);
+			if($document)
+				$version = $document->getContentByVersion($st['version']);
+			$owner = $document->getOwner();
+			$modgroup = $dms->getGroup($st['required']);
+
+			if (!in_array($st["documentID"], $iRev) && $document && $version) {
+			
+				if ($printheader){
+					print "<table class=\"folderView\">";
+					print "<thead>\n<tr>\n";
+					print "<th>".getMLText("name")."</th>\n";
+					print "<th>".getMLText("owner")."</th>\n";
+					print "<th>".getMLText("status")."</th>\n";
+					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("last_update")."</th>\n";
+					print "<th>".getMLText("expires")."</th>\n";
+					print "</tr>\n</thead>\n<tbody>\n";
+					$printheader=false;
+				}		
+			
+				print "<tr>\n";
+				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
+				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
+				print "<td>".getOverallStatusText($st["status"])."</td>";
+				print "<td>".$st["version"]."</td>";
+				print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
+				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+				print "</tr>\n";
+			}
+		}
+		if (!$printheader) {
+			echo "</tbody>\n</table>";
+		}else{
+			printMLText("empty_notify_list");
+		}
+
+
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From 61294336b506e5dabc358bba4ea3cf826fcf30f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Apr 2015 17:24:58 +0200
Subject: [PATCH 0037/2006] add missing files for listing of documents need to
 be watch at

---
 out/out.ReceiptSummary.php               |  41 +++++++
 views/bootstrap/class.ReceiptSummary.php | 146 +++++++++++++++++++++++
 2 files changed, 187 insertions(+)
 create mode 100644 out/out.ReceiptSummary.php
 create mode 100644 views/bootstrap/class.ReceiptSummary.php

diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php
new file mode 100644
index 000000000..0a7bd144f
--- /dev/null
+++ b/out/out.ReceiptSummary.php
@@ -0,0 +1,41 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2011-2013 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if ($user->isGuest()) {
+	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
+}
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+if($view) {
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
new file mode 100644
index 000000000..2576ff3ea
--- /dev/null
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Implementation of ReceiptSummary view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for ReceiptSummary view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$this->htmlStartPage(getMLText("my_documents"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_documents"), "my_documents");
+
+		$this->contentHeading(getMLText("receipt_summary"));
+		$this->contentContainerStart();
+
+		// TODO: verificare scadenza
+
+		// Get document list for the current user.
+		$receiptStatus = $user->getReceiptStatus();
+
+		// reverse order
+		$receiptStatus["indstatus"]=array_reverse($receiptStatus["indstatus"],true);
+		$receiptStatus["grpstatus"]=array_reverse($receiptStatus["grpstatus"],true);
+
+		$printheader=true;
+		$iRev = array();
+		foreach ($receiptStatus["indstatus"] as $st) {
+			$document = $dms->getDocument($st['documentID']);
+			if($document)
+				$version = $document->getContentByVersion($st['version']);
+			$owner = $document->getOwner();
+			$moduser = $dms->getUser($st['required']);
+
+			if ($document && $version) {
+			
+				if ($printheader){
+					print "<table class=\"table-condensed\">";
+					print "<thead>\n<tr>\n";
+					print "<th>".getMLText("name")."</th>\n";
+					print "<th>".getMLText("owner")."</th>\n";
+					print "<th>".getMLText("status")."</th>\n";
+					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("last_update")."</th>\n";
+					print "<th>".getMLText("expires")."</th>\n";
+					print "</tr>\n</thead>\n<tbody>\n";
+					$printheader=false;
+				}
+			
+				print "<tr>\n";
+				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
+				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
+				print "<td>".getOverallStatusText($st["status"])."</td>";
+				print "<td>".$st["version"]."</td>";
+				print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
+				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+				print "</tr>\n";
+			}
+			if ($st["status"]!=-2) {
+				$iRev[] = $st["documentID"];
+			}
+		}
+		if (!$printheader) {
+			echo "</tbody>\n</table>";
+		} else {
+			printMLText("no_docs_to_receipt");
+		}
+
+		$this->contentContainerEnd();
+		$this->contentHeading(getMLText("group_receipt_summary"));
+		$this->contentContainerStart();
+
+		$printheader=true;
+		foreach ($receiptStatus["grpstatus"] as $st) {
+			$document = $dms->getDocument($st['documentID']);
+			if($document)
+				$version = $document->getContentByVersion($st['version']);
+			$owner = $document->getOwner();
+			$modgroup = $dms->getGroup($st['required']);
+
+			if (!in_array($st["documentID"], $iRev) && $document && $version) {
+			
+				if ($printheader){
+					print "<table class=\"folderView\">";
+					print "<thead>\n<tr>\n";
+					print "<th>".getMLText("name")."</th>\n";
+					print "<th>".getMLText("owner")."</th>\n";
+					print "<th>".getMLText("status")."</th>\n";
+					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("last_update")."</th>\n";
+					print "<th>".getMLText("expires")."</th>\n";
+					print "</tr>\n</thead>\n<tbody>\n";
+					$printheader=false;
+				}		
+			
+				print "<tr>\n";
+				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
+				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
+				print "<td>".getOverallStatusText($st["status"])."</td>";
+				print "<td>".$st["version"]."</td>";
+				print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
+				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+				print "</tr>\n";
+			}
+		}
+		if (!$printheader) {
+			echo "</tbody>\n</table>";
+		}else{
+			printMLText("empty_notify_list");
+		}
+
+
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From 107f96e921971e9487e08cda15d97e51e82a2133 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 11:24:42 +0200
Subject: [PATCH 0038/2006] add method getDocumentList()

it returns a list of database records with all the information
currently needed on the MyDocuments page.
---
 SeedDMS_Core/Core/inc.ClassDMS.php | 145 ++++++++++++++++++++++++++++-
 1 file changed, 143 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 0dfb4925f..cbf7462d4 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -514,8 +514,6 @@ class SeedDMS_Core_DMS {
 
 	/**
 	 * Returns all documents locked by a given user
-	 * FIXME: Not full implemented. Do not use, because it still requires the
-	 * temporary tables!
 	 *
 	 * @param object $user
 	 * @return array list of documents
@@ -582,6 +580,149 @@ class SeedDMS_Core_DMS {
 		return $version;
 	} /* }}} */
 
+	/**
+	 * Returns all documents with a predefined search criteria
+	 *
+	 * The records return have the following elements
+	 *
+	 * From Table tblDocuments
+	 * [id] => id of document
+	 * [name] => name of document
+	 * [comment] => comment of document
+	 * [date] => timestamp of creation date of document
+	 * [expires] => timestamp of expiration date of document
+	 * [owner] => user id of owner
+	 * [folder] => id of parent folder
+	 * [folderList] => column separated list of folder ids, e.g. :1:41:
+	 * [inheritAccess] => 1 if access is inherited
+	 * [defaultAccess] => default access mode
+	 * [locked] => always -1 (TODO: is this field still used?)
+	 * [keywords] => keywords of document
+	 * [sequence] => sequence of document
+	 *
+	 * From Table tblDocumentLocks
+	 * [lockUser] => id of user locking the document
+	 *
+	 * From Table tblDocumentStatusLog
+	 * [version] => latest version of document
+	 * [statusID] => id of latest status log
+	 * [documentID] => id of document
+	 * [status] => current status of document
+	 * [statusComment] => comment of current status
+	 * [statusDate] => datetime when the status was entered, e.g. 2014-04-17 21:35:51
+	 * [userID] => id of user who has initiated the status change
+	 *
+	 * From Table tblUsers
+	 * [ownerName] => name of owner of document
+	 * [statusName] => name of user who has initiated the status change
+	 *
+	 * @param string $listtype type of document list, can be 'AppRevByMe',
+	 * 'AppRevOwner', 'LockedByMe', 'MyDocs'
+	 * @param object $param1 user
+	 * @param string $param2 sort list if listtype='MyDocs'
+	 * @return array list of documents
+	 */
+	function getDocumentList($listtype, $param1=null, $param2='') { /* {{{ */
+		/* The following query will get all documents and lots of additional
+		 * information. It requires the two temporary tables ttcontentid and
+		 * ttstatid.
+		 */
+		if (!$this->db->createTemporaryTable("ttstatid") || !$this->db->createTemporaryTable("ttcontentid")) {
+			return false;
+		}
+		$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
+			"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
+			"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
+			"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
+			"FROM `tblDocumentContent` ".
+			"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
+			"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
+			"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
+			"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
+			"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
+			"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
+			"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
+			"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
+			"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
+			"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ";
+
+		switch($listtype) {
+		case 'AppRevByMe': // Documents I have to review/approve
+			$user = $param1;
+			// Get document list for the current user.
+			$reviewStatus = $user->getReviewStatus();
+			$approvalStatus = $user->getApprovalStatus();
+			
+			// Create a comma separated list of all the documentIDs whose information is
+			// required.
+			$dList = array();
+			foreach ($reviewStatus["indstatus"] as $st) {
+				if (!in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			foreach ($reviewStatus["grpstatus"] as $st) {
+				if (!in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			foreach ($approvalStatus["indstatus"] as $st) {
+				if (!in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			foreach ($approvalStatus["grpstatus"] as $st) {
+				if (!in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			$docCSV = "";
+			foreach ($dList as $d) {
+				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
+			}
+			
+			if (strlen($docCSV)>0) {
+				$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.", ".S_EXPIRED.") ".
+							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
+							"ORDER BY `statusDate` DESC";
+			} else {
+				$queryStr = '';
+			}
+			break;
+		case 'AppRevOwner': // Documents waiting for review/approval I'm owning
+			$user = $param1;
+			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ".
+				"ORDER BY `statusDate` DESC";
+			break;
+		case 'LockedByMe': // Documents locked by me
+			$user = $param1;
+			$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ".
+				"ORDER BY `statusDate` DESC";
+			break;
+		case 'MyDocs': // Documents owned by me
+			$user = $param1;
+			$orderby = $param2;
+			$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."' ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			break;
+		}
+
+		if($queryStr) {
+			$resArr = $this->db->getResultArray($queryStr);
+			if (is_bool($resArr) && !$resArr) {
+				return false;
+			}
+		} else {
+			return array();
+		}
+
+		return $resArr;
+	} /* }}} */
+
 	function makeTimeStamp($hour, $min, $sec, $year, $month, $day) { /* {{{ */
 		$thirtyone = array (1, 3, 5, 7, 8, 10, 12);
 		$thirty = array (4, 6, 9, 11);

From 1afd3102abdafdc780b81085d54927b7ae486fbc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 11:26:00 +0200
Subject: [PATCH 0039/2006] fix parameter definition in comment

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index bab3e8197..13b77d967 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -673,7 +673,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Get checkout info for document
 	 *
-	 * @return boolean true if locked otherwise false
+	 * @return array/boolean record from table tblDocumentCheckOuts or false
+	 * in case of an error.
 	 */
 	function getCheckOutInfo() { /* {{{ */
 		$db = $this->_dms->getDB();

From 505763e0be8f3fe7012e99c377f0efb453b55225 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 11:26:25 +0200
Subject: [PATCH 0040/2006] use new SeedDMS_Core_DMS::getDocumentList() method

---
 views/bootstrap/class.MyDocuments.php | 175 +++++---------------------
 1 file changed, 29 insertions(+), 146 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 3b05e95fa..fa1a810d0 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -58,75 +58,29 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 			}
 
 			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+				
 				// Get document list for the current user.
 				$reviewStatus = $user->getReviewStatus();
 				$approvalStatus = $user->getApprovalStatus();
-				
-				// Create a comma separated list of all the documentIDs whose information is
-				// required.
-				$dList = array();
-				foreach ($reviewStatus["indstatus"] as $st) {
-					if (!in_array($st["documentID"], $dList)) {
-						$dList[] = $st["documentID"];
-					}
-				}
-				foreach ($reviewStatus["grpstatus"] as $st) {
-					if (!in_array($st["documentID"], $dList)) {
-						$dList[] = $st["documentID"];
-					}
-				}
-				foreach ($approvalStatus["indstatus"] as $st) {
-					if (!in_array($st["documentID"], $dList)) {
-						$dList[] = $st["documentID"];
-					}
-				}
-				foreach ($approvalStatus["grpstatus"] as $st) {
-					if (!in_array($st["documentID"], $dList)) {
-						$dList[] = $st["documentID"];
-					}
-				}
-				$docCSV = "";
-				foreach ($dList as $d) {
-					$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
-				}
-				
-				if (strlen($docCSV)>0) {
-					// Get the document information.
-					$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-						"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-						"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-						"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-						"FROM `tblDocumentContent` ".
-						"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-						"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-						"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-						"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-						"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-						"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-						"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-						"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-						"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-						"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-						"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.", ".S_EXPIRED.") ".
-						"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
-						"ORDER BY `statusDate` DESC";
 
-					$resArr = $db->getResultArray($queryStr);
-					if (is_bool($resArr) && !$resArr) {
-						$this->contentHeading(getMLText("warning"));
-						$this->contentContainer(getMLText("internal_error_exit"));
-						$this->htmlEndPage();
-						exit;
-					}
-					
-					// Create an array to hold all of these results, and index the array by
-					// document id. This makes it easier to retrieve document ID information
-					// later on and saves us having to repeatedly poll the database every time
-					// new document information is required.
+				$resArr = $dms->getDocumentList('AppRevByMe', $user);
+				if (is_bool($resArr) && !$resArr) {
+					$this->contentHeading(getMLText("warning"));
+					$this->contentContainer(getMLText("internal_error_exit"));
+					$this->htmlEndPage();
+					exit;
+				}
+				if($resArr) {
+					/* Create an array to hold all of these results, and index the array 
+					 * by document id. This makes it easier to retrieve document ID
+					 * information later on and saves us having to repeatedly poll the
+					 * database every time
+					 * new document information is required.
+					 */
 					$docIdx = array();
 					foreach ($resArr as $res) {
 						
-						// verify expiry
+						/* verify expiry */
 						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
 							if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
 								$res["status"]=S_EXPIRED;
@@ -136,7 +90,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						$docIdx[$res["id"]][$res["version"]] = $res;
 					}
 
-					// List the documents where a review has been requested.
+					// List the documents for which a review has been requested.
 					if($workflowmode == 'traditional') {
 						$this->contentHeading(getMLText("documents_to_review"));
 						$this->contentContainerStart();
@@ -225,7 +179,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						$this->contentContainerEnd();
 					}
 
-					// List the documents where an approval has been requested.
+					// List the documents for which an approval has been requested.
 					$this->contentHeading(getMLText("documents_to_approve"));
 					$this->contentContainerStart();
 					$printheader=true;
@@ -320,31 +274,13 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					$this->contentContainerEnd();
 				}
 
-				// Get list of documents owned by current user that are pending review or
-				// pending approval.
-				$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-					"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-					"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-					"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-					"FROM `tblDocumentContent` ".
-					"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-					"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-					"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-					"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-					"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-					"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-					"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-					"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-					"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-					"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-					"AND `tblDocuments`.`owner` = '".$user->getID()."' ".
-					"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ".
-					"ORDER BY `statusDate` DESC";
-
-				$resArr = $db->getResultArray($queryStr);
+				/* Get list of documents owned by current user that are
+				 * pending review or pending approval.
+				 */
+				$resArr = $dms->getDocumentList('AppRevOwner', $user);
 				if (is_bool($resArr) && !$resArr) {
 					$this->contentHeading(getMLText("warning"));
-					$this->contentContainer("Internal error. Unable to complete request. Exiting.");
+					$this->contentContainer(getMLText("internal_error_exit"));
 					$this->htmlEndPage();
 					exit;
 				}
@@ -398,29 +334,11 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				$this->contentContainerEnd();
 			}
 			
-			// Get list of documents locked by current user 
-			$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-				"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-				"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-				"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-				"FROM `tblDocumentContent` ".
-				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-				"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-				"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-				"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-				"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-				"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-				"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-				"AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ".
-				"ORDER BY `statusDate` DESC";
-
-			$resArr = $db->getResultArray($queryStr);
+			/* Get list of documents locked by current user */
+			$resArr = $dms->getDocumentList('LockedByMe', $user);
 			if (is_bool($resArr) && !$resArr) {
 				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer("Internal error. Unable to complete request. Exiting.");
+				$this->contentContainer(getMLText("internal_error_exit"));
 				$this->htmlEndPage();
 				exit;
 			}
@@ -476,50 +394,15 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 		}
 		else {
 
-			// Get list of documents owned by current user
-			if (!$db->createTemporaryTable("ttstatid")) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-
-			if (!$db->createTemporaryTable("ttcontentid")) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-			$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-				"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-				"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-				"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-				"FROM `tblDocumentContent` ".
-				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-				"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-				"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-				"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-				"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-				"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-				"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-				"AND `tblDocuments`.`owner` = '".$user->getID()."' ";
-				
-			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
-			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
-			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
-			else $queryStr .= "ORDER BY `name`";
-
-			$resArr = $db->getResultArray($queryStr);
+			/* Get list of documents owned by current user */
+			$resArr = $dms->getDocumentList('MyDocs', $user, $orderby);
 			if (is_bool($resArr) && !$resArr) {
 				$this->contentHeading(getMLText("warning"));
 				$this->contentContainer(getMLText("internal_error_exit"));
 				$this->htmlEndPage();
 				exit;
 			}
-			
+
 			$this->contentHeading(getMLText("all_documents"));
 			$this->contentContainerStart();
 

From 8b065cf7aca044d9d7457117f401cd759e86b169 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 11:48:01 +0200
Subject: [PATCH 0041/2006] propperly clean checked out file in possible cases

previously the checked out file was not remove from the checkout area
if it was unchanged and checked in
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 13b77d967..cae9a69cb 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -783,15 +783,22 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$checksum = SeedDMS_Core_File::checksum($info['filename']);
 		if($checksum != $lc->getChecksum()) {
 			$content = $this->addContent($comment, $user, $info['filename'], $lc->getOriginalFileName(), $lc->getFileType(), $lc->getMimeType(), $reviewers, $approvers, $version, $attributes, $workflow);
-			if($content && !$this->_dms->forceRename)
-				SeedDMS_Core_File::removeFile($info['filename']);
+			if($content) {
+				if(!$this->_dms->forceRename) {
+					SeedDMS_Core_File::removeFile($info['filename']);
+				}
+				$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
+				$db->getResult($queryStr);
+				return $content;
+			} else {
+				return false;
+			}
+		} else {
+			SeedDMS_Core_File::removeFile($info['filename']);
+			$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
+			$db->getResult($queryStr);
+			return true;
 		}
-
-		$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
-		$db->getResult($queryStr);
-
-		return $content;
-
 	} /* }}} */
 
 	/**

From c0ba8a6711daf22e077cff9e210efef8f322c5f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 11:49:05 +0200
Subject: [PATCH 0042/2006] create checkout dir if required and allowed in the
 settings

---
 op/op.CheckOutDocument.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/op/op.CheckOutDocument.php b/op/op.CheckOutDocument.php
index 0004ed832..aa1f73e25 100644
--- a/op/op.CheckOutDocument.php
+++ b/op/op.CheckOutDocument.php
@@ -53,7 +53,15 @@ if ($document->isCheckedOut()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("document_already_checkedout"));
 }
 
-if (!$document->checkOut($user, sprintf($settings->_checkOutDir.'/', preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin())))) {
+$checkoutpath = sprintf($settings->_checkOutDir.'/', preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
+if(!file_exists($checkoutpath) && $settings->_createCheckOutDir) {
+	SeedDMS_Core_File::makeDir($checkoutpath);
+}
+if(!file_exists($checkoutpath)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("checkoutpath_does_not_exist"));
+}
+
+if (!$document->checkOut($user, $checkoutpath)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 }
 

From 4b6eeba319835b0255d0730a506ca105061e9c62 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 16:43:19 +0200
Subject: [PATCH 0043/2006] add list of documents checked out by me in
 getDocumentList()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index cbf7462d4..bb56c8491 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -709,6 +709,26 @@ class SeedDMS_Core_DMS {
 			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
 			else $queryStr .= "ORDER BY `name`";
 			break;
+		case 'CheckedOutByMe': // Documents I have checked out
+			$user = $param1;
+
+			$qs = 'SELECT document FROM tblDocumentCheckOuts WHERE userID='.$user->getID();
+			$ra = $this->db->getResultArray($qs);
+			if (is_bool($ra) && !$ra) {
+				return false;
+			}
+			$docs = array();
+			foreach($ra as $d) {
+				$docs[] = $d['document'];
+			}
+			
+			if ($docs) {
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ".
+							"ORDER BY `statusDate` DESC";
+			} else {
+				$queryStr = '';
+			}
+			break;
 		}
 
 		if($queryStr) {

From 0bac3deabbcb14a4b5e05b7017902cbd8cc96407 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 16:44:16 +0200
Subject: [PATCH 0044/2006] show message and hide form if document cannot be
 checked in

---
 views/bootstrap/class.CheckInDocument.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 761bf0a3b..daba7eb15 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -144,6 +144,9 @@ function checkForm()
 				break;
 			}
 		}
+		$checkoutinfo = $document->getCheckOutInfo();
+
+		if($checkoutstatus == 0) {
 
 		$latestContent = $document->getLatestContent();
 		$reviewStatus = $latestContent->getReviewStatus();
@@ -531,13 +534,20 @@ function checkForm()
 ?>
 		<tr>
 			<td></td>
-			<td><input type="submit" class="btn" value="<?php printMLText("update_document")?>"></td>
+			<td><input type="submit" class="btn" value="<?php printMLText("checkin_document")?>"></td>
 		</tr>
 	</table>
 </form>
 
 <?php
 		$this->contentContainerEnd();
+		} else {
+?>
+<form action="../op/op.CheckInDocument.php" method="post" name="form1" onsubmit="return checkForm();">
+	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
+	<input type="submit" class="btn" value="<?php printMLText("reset_checkout"); ?>">
+<?php
+		}
 		$this->htmlEndPage();
 	} /* }}} */
 }

From 5952d497114861eab35121001ec1f790736bdcbf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 16:44:55 +0200
Subject: [PATCH 0045/2006] add list of documents check out by me

---
 views/bootstrap/class.MyDocuments.php | 61 ++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index fa1a810d0..da1b19ed4 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -388,9 +388,66 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				
 			}
 			else printMLText("no_docs_locked");
-			
+
 			$this->contentContainerEnd();
-			
+
+			/* Get list of documents checked out by current user */
+			$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
+			if (is_bool($resArr) && !$resArr) {
+				$this->contentHeading(getMLText("warning"));
+				$this->contentContainer(getMLText("internal_error_exit"));
+				$this->htmlEndPage();
+				exit;
+			}
+
+			$this->contentHeading(getMLText("documents_checked_out_by_you"));
+			$this->contentContainerStart();
+			if (count($resArr)>0) {
+
+				print "<table class=\"table table-condensed\">";
+				print "<thead>\n<tr>\n";
+				print "<th></th>";
+				print "<th>".getMLText("name")."</th>\n";
+				print "<th>".getMLText("status")."</th>\n";
+				print "<th>".getMLText("version")."</th>\n";
+				print "<th>".getMLText("last_update")."</th>\n";
+				print "<th>".getMLText("expires")."</th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["documentID"]);
+				
+					// verify expiry
+					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
+							$res["status"]=S_EXPIRED;
+						}
+					}
+				
+					print "<tr>\n";
+					$latestContent = $document->getLatestContent();
+					$previewer->createPreview($latestContent);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+					if($previewer->hasPreview($latestContent)) {
+						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					} else {
+						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					}
+					print "</a></td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+					print "<td>".getOverallStatusText($res["status"])."</td>";
+					print "<td>".$res["version"]."</td>";
+					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+					print "</tr>\n";
+				}		
+				print "</tbody></table>";	
+				
+			}
+			else printMLText("no_docs_checked_out");
+
+			$this->contentContainerEnd();
+
 		}
 		else {
 

From 91f7d8dfc3b55dd806a376c58b9a013455d2075f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 16:45:19 +0200
Subject: [PATCH 0046/2006] show warning if document is checked out

---
 views/bootstrap/class.UpdateDocument.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 479d64c84..1e1adbb93 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -145,6 +145,12 @@ function checkForm()
 			$msg .= "<p>".sprintf(getMLText('link_alt_updatedocument'), "out.AddMultiDocument.php?folderid=".$folder->getID()."&showtree=".showtree())."</p>";
 		}
 		$this->warningMsg($msg);
+
+		if ($document->isCheckedOut()) {
+			$msg = getMLText('document_is_checked_out');
+			$this->warningMsg($msg);
+		}
+
 		$this->contentContainerStart();
 ?>
 

From 0b57325c042361c9b527ef3af33d1eea257cd0bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Apr 2015 17:12:08 +0200
Subject: [PATCH 0047/2006] fix take over of approvers/reviewers from previous
 version

---
 views/bootstrap/class.UpdateDocument.php | 90 ++++++++++++++----------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 1e1adbb93..7969eb664 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -242,14 +242,18 @@ function checkForm()
 <?php
 				$tmp = array();
 				foreach($reviewStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 0 && $res) {
-						foreach ($res as $rr)
-							if ($rr['reviewerUserID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
+					if($r['type'] == 0) {
+					 	if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['reviewerUserID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
 							$tmp[] = $r['required'];
+						}
 					}
 				}
 				if($tmp) {
@@ -291,24 +295,9 @@ function checkForm()
       <td>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
       </td>
-      <td>
+			<td>
         <select id="GrpReviewer" class="chzn-select span9" name="grpReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
-				$tmp = array();
-				foreach($reviewStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 1 && $res) {
-						foreach ($res as $rr)
-							if ($rr['reviewerGroupID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
-							$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->__takeOverButton("GrpReviewer", $tmp);
-				}
 				foreach ($docAccess["groups"] as $grp) {
 				
 					$mandatory=false;
@@ -320,6 +309,25 @@ function checkForm()
 ?>
 			</select>
 <?php
+				$tmp = array();
+				foreach($reviewStatus as $r) {
+					if($r['type'] == 1) {
+						if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['reviewerGroupID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
+							$tmp[] = $r['required'];
+						}
+					}
+				}
+				if($tmp) {
+					$this->__takeOverButton("GrpReviewer", $tmp);
+				}
 				/* List all mandatory groups of reviewers */
 				if($res) {
 					$tmp = array();
@@ -381,14 +389,18 @@ function checkForm()
 <?php
 				$tmp = array();
 				foreach($approvalStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 0 && $res) {
-						foreach ($res as $rr)
-							if ($rr['approverUserID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
+					if($r['type'] == 0) {
+						if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['approverUserID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
 							$tmp[] = $r['required'];
+						}
 					}
 				}
 				if($tmp) {
@@ -447,14 +459,18 @@ function checkForm()
 <?php
 				$tmp = array();
 				foreach($approvalStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 1 && $res) {
-						foreach ($res as $rr)
-							if ($rr['approverGroupID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
+					if($r['type'] == 1) {
+						if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['approverGroupID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
 							$tmp[] = $r['required'];
+						}
 					}
 				}
 				if($tmp) {

From 3d3025c2cdec876a5f2c2743b17c4b260f96a9ad Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 25 Apr 2015 20:49:13 +0200
Subject: [PATCH 0048/2006] no need to create temp table ttstatid anymore

---
 views/bootstrap/class.MyDocuments.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index da1b19ed4..ebe6fb90d 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -50,13 +50,6 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 
 		if ($showInProcess){
 
-			if (!$db->createTemporaryTable("ttstatid") || !$db->createTemporaryTable("ttcontentid")) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-
 			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 				
 				// Get document list for the current user.

From 654d8ac75a665fee7d2a82ecfd66b95fc15fd6f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 25 Apr 2015 20:49:47 +0200
Subject: [PATCH 0049/2006] add parameter $version to documentListRow()

in order to show a specific version
---
 views/bootstrap/class.Bootstrap.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5f7e0b616..d875e5c92 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1482,7 +1482,7 @@ $('#delete-folder-btn-".$folderid."').popover({
 	 * @param object $previewer
 	 * @param boolean $skipcont set to true if embrasing tr shall be skipped
 	 */
-	function documentListRow($document, $previewer, $skipcont=false) { /* {{{ */
+	function documentListRow($document, $previewer, $skipcont=false, $version=0) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$showtree = $this->params['showtree'];
@@ -1500,7 +1500,12 @@ $('#delete-folder-btn-".$folderid."').popover({
 		if(!$skipcont)
 			$content .= "<tr id=\"table-row-document-".$docID."\">";
 
-		if($latestContent = $document->getLatestContent()) {
+		if($version)
+			$latestContent = $document->getContentByVersion($version);
+		else
+			$latestContent = $document->getLatestContent();
+
+		if($latestContent) {
 			$previewer->createPreview($latestContent);
 			$version = $latestContent->getVersion();
 			$status = $latestContent->getStatus();

From d04786884beddf6b8f6b650a54303205c3764fba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Apr 2015 08:16:50 +0200
Subject: [PATCH 0050/2006] add tables for tranmittals

---
 install/create_tables-innodb.sql  | 35 +++++++++++++++++++++++++++++++
 install/create_tables-sqlite3.sql | 30 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 9202b712a..c88ae3310 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -779,6 +779,41 @@ CREATE TABLE tblWorkflowMandatoryWorkflow (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for transmittal
+-- 
+
+CREATE TABLE `tblTransmittals` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` text NOT NULL,
+  `comment` text NOT NULL,
+  `userID` int(11) NOT NULL default '0',
+  `date` datetime,
+  `public` tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  CONSTRAINT `tblTransmittals_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for transmittal item
+-- 
+
+CREATE TABLE `tblTransmittalItems` (
+  `id` int(11) NOT NULL auto_increment,
+	`transmittal` int(11) NOT NULL DEFAULT '0',
+  `document` int(11) default NULL,
+  `version` smallint(5) unsigned NOT NULL default '0',
+  `date` datetime,
+  PRIMARY KEY  (`id`),
+  UNIQUE (document, version),
+  CONSTRAINT `tblTransmittalItems_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblTransmittalItem_transmittal` FOREIGN KEY (`transmittal`) REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for version
 -- 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 099bad86f..def876660 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -675,6 +675,36 @@ CREATE TABLE tblWorkflowMandatoryWorkflow (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for transmittal
+-- 
+
+CREATE TABLE tblTransmittals (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` text NOT NULL,
+  `comment` text NOT NULL,
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `public` INTEGER NOT NULL default '0'
+);
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for transmittal item
+-- 
+
+CREATE TABLE `tblTransmittalItems` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+	`transmittal` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE,
+  `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  UNIQUE (document, version)
+);
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for version
 -- 

From 7338ddaadd7684909ad501d8426bff2a6fad9610 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Apr 2015 08:17:27 +0200
Subject: [PATCH 0051/2006] fix typo in comment

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 80068749c..33efafce2 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -28,7 +28,7 @@ class SeedDMS_Core_DatabaseAccess {
 	public $_debug;
 
 	/**
-	 * @var string name of database driver (mysql or sqlite3)
+	 * @var string name of database driver (mysql or sqlite)
 	 */
 	protected $_driver;
 

From 01b55843d241447ac94a71256b73c0995527d1cf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Apr 2015 08:24:26 +0200
Subject: [PATCH 0052/2006] add class for handling transmittals

---
 SeedDMS_Core/Core/inc.ClassDMS.php         |  56 ++++
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 333 +++++++++++++++++++++
 2 files changed, 389 insertions(+)
 create mode 100644 SeedDMS_Core/Core/inc.ClassTransmittal.php

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index bb56c8491..b6bbb7d58 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -293,6 +293,8 @@ class SeedDMS_Core_DMS {
 		$this->classnames['documentcontent'] = 'SeedDMS_Core_DocumentContent';
 		$this->classnames['user'] = 'SeedDMS_Core_User';
 		$this->classnames['group'] = 'SeedDMS_Core_Group';
+		$this->classnames['transmittal'] = 'SeedDMS_Core_Transmittal';
+		$this->classnames['transmittalitem'] = 'SeedDMS_Core_TransmittalItem';
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
 			$this->version = '4.3.17';
@@ -1482,6 +1484,60 @@ class SeedDMS_Core_DMS {
 		return $this->getGroup($this->db->getInsertID());
 	} /* }}} */
 
+	/**
+	 * Get a transmittal by its id
+	 *
+	 * @param integer $id id of transmittal
+	 * @return object/boolean transmittal or false if no group was found
+	 */
+	function getTransmittal($id) { /* {{{ */
+		$classname = $this->classnames['transmittal'];
+		return $classname::getInstance($id, $this, '');
+	} /* }}} */
+
+	/**
+	 * Get a transmittal by its name
+	 *
+	 * @param string $name name of transmittal
+	 * @return object/boolean transmittal or false if no group was found
+	 */
+	function getTransmittalByName($name) { /* {{{ */
+		$classname = $this->classnames['transmittal'];
+		return $classname::getInstance($name, $this, 'name');
+	} /* }}} */
+
+	/**
+	 * Return list of all transmittals
+	 *
+	 * @return array of instances of {@link SeedDMS_Core_Transmittal} or false
+	 */
+	function getAllTransmittals($user=null, $orderby = '') { /* {{{ */
+		$classname = $this->classnames['transmittal'];
+		return $classname::getAllInstances($user, $orderby, $this);
+	} /* }}} */
+
+	/**
+	 * Create a new transmittal
+	 *
+	 * @param string $name name of group
+	 * @param string $comment comment of group
+	 * @param object $user user this transmittal belongs to
+	 * @return object/boolean instance of {@link SeedDMS_Core_Transmittal} or
+	 *         false in case of an error.
+	 */
+	function addTransmittal($name, $comment, $user) { /* {{{ */
+		if (is_object($this->getTransmittalByName($name))) {
+			return false;
+		}
+
+		$queryStr = "INSERT INTO tblTransmittals (name, comment, userID) VALUES (".$this->db->qstr($name).", ".$this->db->qstr($comment).", ".$user->getID().")";
+		echo $queryStr;
+		if (!$this->db->getResult($queryStr))
+			return false;
+
+		return $this->getTransmittal($this->db->getInsertID());
+	} /* }}} */
+
 	function getKeywordCategory($id) { /* {{{ */
 		if (!is_numeric($id))
 			return false;
diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
new file mode 100644
index 000000000..aeba37d7a
--- /dev/null
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -0,0 +1,333 @@
+<?php
+/**
+ * Implementation of the transmittal object in the document management system
+ *
+ * @category   DMS
+ * @package    SeedDMS_Core
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe,
+ *             2010 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class to represent a transmittal in the document management system
+ *
+ * @category   DMS
+ * @package    SeedDMS_Core
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe,
+ *             2010 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Core_Transmittal {
+	/**
+	 * @var integer id of transmittal
+	 *
+	 * @access protected
+	 */
+	var $_id;
+
+	/**
+	 * @var string name of transmittal
+	 *
+	 * @access protected
+	 */
+	var $_name;
+
+	/**
+	 * @var string comment of transmittal
+	 *
+	 * @access protected
+	 */
+	var $_comment;
+
+	/**
+	 * @var boolean true if transmittal is public
+	 *
+	 * @access protected
+	 */
+	var $_isPublic;
+
+	/**
+	 * @var object user this transmittal belongs to
+	 *
+	 * @access protected
+	 */
+	var $_user;
+
+	/**
+	 * @var object date of creation
+	 *
+	 * @access protected
+	 */
+	var $_date;
+
+	/**
+	 * @var object items
+	 *
+	 * @access protected
+	 */
+	var $_items;
+
+	/**
+	 * @var object reference to the dms instance this user belongs to
+	 *
+	 * @access protected
+	 */
+	var $_dms;
+
+	function SeedDMS_Core_Transmittal($id, $user, $name, $comment, $isPublic=0, $date='0000-00-00 00:00:00') {
+		$this->_id = $id;
+		$this->_name = $name;
+		$this->_comment = $comment;
+		$this->_user = $user;
+		$this->_isPublic = $isPublic;
+		$this->_date = $date;
+		$this->_items = array();
+		$this->_dms = null;
+	}
+
+	/**
+	 * Get an instance of a transmittal object
+	 *
+	 * @param string|integer $id id or name of transmittal, depending
+	 * on the 3rd parameter.
+	 * @param object $dms instance of dms
+	 * @param string $by search by [id|name]. If this
+	 * parameter is left empty, the user will be search by its Id.
+	 * @return object instance of class SeedDMS_Core_Transmittal
+	 */
+	public static function getInstance($id, $dms, $by='') { /* {{{ */
+		$db = $dms->getDB();
+
+		switch($by) {
+		case 'name':
+			$queryStr = "SELECT * FROM `tblTransmittals` WHERE `name` = ".$db->qstr($id);
+			break;
+		default:
+			$queryStr = "SELECT * FROM `tblTransmittals` WHERE id = " . (int) $id;
+		}
+
+		$resArr = $db->getResultArray($queryStr);
+
+		if (is_bool($resArr) && $resArr == false) return false;
+		if (count($resArr) != 1) return false;
+
+		$resArr = $resArr[0];
+
+		$uclassname = $dms->getClassname('user');
+		$user = $uclassname::getInstance($resArr['userID'], $dms);
+		$transmittal = new self($resArr["id"], $user, $resArr["name"], $resArr["comment"], $resArr["public"], $resArr["date"]);
+		$transmittal->setDMS($dms);
+		return $transmittal;
+	} /* }}} */
+
+	/**
+	 * Get all instances of a transmittal object
+	 *
+	 * @param string|integer $id id or name of transmittal, depending
+	 * on the 3rd parameter.
+	 * @param object $dms instance of dms
+	 * @param string $by search by [id|name]. If this
+	 * parameter is left empty, the user will be search by its Id.
+	 * @return object instance of class SeedDMS_Core_Transmittal
+	 */
+	public static function getAllInstances($user, $orderby, $dms) { /* {{{ */
+		$db = $dms->getDB();
+
+		$queryStr = "SELECT * FROM `tblTransmittals`";
+		if($user)
+			$queryStr .= " WHERE userID = " . $user->getID();
+
+		$resArr = $db->getResultArray($queryStr);
+
+		if (is_bool($resArr) && $resArr == false) return false;
+
+		$uclassname = $dms->getClassname('user');
+		$transmittals = array();
+		foreach ($resArr as $res) {
+			$user = $uclassname::getInstance($res['userID'], $dms);
+			$transmittal = new self($res["id"], $user, $res["name"], $res["comment"], $res["public"], $res["date"]);
+			$transmittal->setDMS($dms);
+			$transmittals[] = $transmittal;
+		}
+		return $transmittals;
+	} /* }}} */
+
+	function setDMS($dms) {
+		$this->_dms = $dms;
+	}
+
+	function getID() { return $this->_id; }
+
+	function getName() { return $this->_name; }
+
+	function setName($newName) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "UPDATE tblTransmittals SET name =".$db->qstr($newName)." WHERE id = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_name = $newName;
+		return true;
+	} /* }}} */
+
+	function getComment() { return $this->_comment; }
+
+	function setComment($newComment) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "UPDATE tblTransmittals SET comment =".$db->qstr($newComment)." WHERE id = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_comment = $newComment;
+		return true;
+	} /* }}} */
+
+	function getItems() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if (!$this->_items) {
+			$queryStr = "SELECT `tblTransmittalItems`.* FROM `tblTransmittalItems` ".
+				"LEFT JOIN `tblDocuments` ON `tblTransmittalItems`.`document`=`tblDocuments`.`id` ".
+				"WHERE `tblTransmittalItems`.`transmittal` = '". $this->_id ."'";
+			$resArr = $db->getResultArray($queryStr);
+			if (is_bool($resArr) && $resArr == false)
+				return false;
+
+			$this->_users = array();
+
+			$classname = $this->_dms->getClassname('transmittalitem');
+			foreach ($resArr as $row) {
+				$document = $this->_dms->getDocument($row['document']);
+				$content = $document->getContentByVersion($row['version']);
+				$item = new $classname($row["id"], $this, $content, $row["date"]);
+				array_push($this->_items, $item);
+			}
+		}
+		return $this->_items;
+	} /* }}} */
+
+	/**
+	 * Add an item to the transmittal
+	 *
+	 * @param object $item instance of SeedDMS_Core_DocumentContent
+	 * @return boolean true if item could be added, otherwise false
+	 */
+	function addContent($item) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(get_class($item) != $this->_dms->getClassname('documentcontent'))
+			return false;
+
+		$document = $item->getDocument();
+		$queryStr = "INSERT INTO `tblTransmittalItems` (`transmittal`, `document`, `version`, `date`) ".
+			"VALUES ('". $this->_id ."', $document->getID(), $item->getVersion(), CURRENT_TIMESTAMP)";
+		$res=$db->getResult($queryStr);
+		if(!$res) {
+			return false;
+		}
+		$itemID = $db->getInsertID();
+
+		return SeedDMS_Core_TransmittalItem::getInstance($itemID);
+	} /* }}} */
+}
+
+/**
+ * Class to represent a transmittal in the document management system
+ *
+ * @category   DMS
+ * @package    SeedDMS_Core
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe,
+ *             2010 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Core_TransmittalItem {
+	/**
+	 * @var integer id of transmittal item
+	 *
+	 * @access protected
+	 */
+	var $_id;
+
+	/**
+	 * @var object document content
+	 *
+	 * @access protected
+	 */
+	var $_content;
+
+	/**
+	 * @var object transmittal
+	 *
+	 * @access protected
+	 */
+	var $_transmittal;
+
+	/**
+	 * @var object date of creation
+	 *
+	 * @access protected
+	 */
+	var $_date;
+
+	function SeedDMS_Core_TransmittalItem($id, $transmittal, $content, $date='0000-00-00 00:00:00') {
+		$this->_id = $id;
+		$this->_transmittal = $transmittal;
+		$this->_content = $content;
+		$this->_date = $date;
+		$this->_dms = null;
+	}
+
+	public static function getInstance($id, $dms) { /* {{{ */
+		$db = $dms->getDB();
+
+		$queryStr = "SELECT * FROM tblTransmittalItems WHERE id = " . (int) $id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr) != 1)
+			return false;
+		$resArr = $resArr[0];
+
+		$transmittal = SeedDMS_Core_Transmittal::getInstance($resArr['transmittal'], $dms);
+		$dclassname = $dms->getClassname('document');
+		$document = $dclassname::getInstance($resArr['document'], $dms);
+		$content = $document->getVersion($resArr['version']);
+
+		$item = new self($resArr["id"], $transmittal, $content, $resArr["date"]);
+		$item->setDMS($dms);
+		return $item;
+	} /* }}} */
+
+	function setDMS($dms) {
+		$this->_dms = $dms;
+	}
+
+	function getID() { return $this->_id; }
+
+	function getContent() { return $this->_content; }
+
+	function getDate() { return $this->_date; }
+
+	function remove() { /* {{{ */
+		$db = $this->_dms->getDB();
+		$transmittal = $this->_transmittal;
+
+		$queryStr = "DELETE FROM tblTransmittalItems WHERE id = " . $this->_id;
+		if (!$db->getResult($queryStr)) {
+			return false;
+		}
+
+		return true;
+	} /* }}} */
+}
+?>

From 962e0f8523613225bc75ab634d3a8135dfca164d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Apr 2015 08:24:59 +0200
Subject: [PATCH 0053/2006] include Core/inc.ClassTransmittal.php

---
 SeedDMS_Core/Core.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/SeedDMS_Core/Core.php b/SeedDMS_Core/Core.php
index 667a8554c..0f7b956ea 100644
--- a/SeedDMS_Core/Core.php
+++ b/SeedDMS_Core/Core.php
@@ -91,4 +91,9 @@ require_once('Core/inc.AccessUtils.php');
  */
 require_once('Core/inc.FileUtils.php');
 
+/**
+ * @uses SeedDMS_Transmittal
+ */
+require_once('Core/inc.ClassTransmittal.php');
+
 ?>

From 877f937413bb151b4bb445008657c09522625047 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Apr 2015 08:26:51 +0200
Subject: [PATCH 0054/2006] return value of hook will be passed on even if not
 a string

---
 inc/inc.ClassViewCommon.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index dd46b6043..199bc8f94 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -81,17 +81,23 @@ class SeedDMS_View_Common {
 							$tmpret = $hookObj->$hook($this);
 							if(is_string($tmpret))
 								$ret .= $tmpret;
+							else
+								$ret = $tmpret;
 							break;
 						case 2:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1));
 							if(is_string($tmpret))
 								$ret .= $tmpret;
+							else
+								$ret = $tmpret;
 							break;
 						case 3:
 						default:
 							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2));
 							if(is_string($tmpret))
 								$ret .= $tmpret;
+							else
+								$ret = $tmpret;
 					}
 				}
 			}

From 4e682ecbe20778ce10160cd20de58ec07ee9bee7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Apr 2015 08:27:19 +0200
Subject: [PATCH 0055/2006] add more hooks for showing/editing attributes

---
 views/bootstrap/class.AddDocument.php    | 16 +++++++++++++
 views/bootstrap/class.EditDocument.php   |  8 +++++++
 views/bootstrap/class.EditFolder.php     |  9 ++++++++
 views/bootstrap/class.UpdateDocument.php |  9 ++++++++
 views/bootstrap/class.ViewDocument.php   | 29 ++++++++++++++++++++----
 views/bootstrap/class.ViewFolder.php     | 13 +++++++++--
 6 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 75154a09c..3cd74b1b7 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -149,12 +149,20 @@ $(document).ready(function() {
 			$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_all));
 			if($attrdefs) {
 				foreach($attrdefs as $attrdef) {
+					$arr = $this->callHook('editDocumentAttribute', null, $attrdef);
+					if(is_array($arr)) {
+						echo "<tr>";
+						echo "<td>".$arr[0].":</td>";
+						echo "<td>".$arr[1]."</td>";
+						echo "</tr>";
+					} else {
 ?>
 		<tr>
 			<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
 			<td><?php $this->printAttributeEditField($attrdef, '') ?></td>
 		</tr>
 <?php
+					}
 				}
 			}
 			if($presetexpiration) {
@@ -216,12 +224,20 @@ $(document).ready(function() {
 			$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
 			if($attrdefs) {
 				foreach($attrdefs as $attrdef) {
+					$arr = $this->callHook('editDocumentAttribute', null, $attrdef);
+					if(is_array($arr)) {
+						echo "<tr>";
+						echo "<td>".$arr[0].":</td>";
+						echo "<td>".$arr[1]."</td>";
+						echo "</tr>";
+					} else {
 ?>
 		<tr>
 			<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
 			<td><?php $this->printAttributeEditField($attrdef, '', 'attributes_version') ?></td>
 		</tr>
 <?php
+					}
 				}
 			}
 		if($workflowmode == 'advanced') {
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index d6acecd53..fda416cd2 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -143,12 +143,20 @@ function checkForm()
 		}
 		if($attrdefs) {
 			foreach($attrdefs as $attrdef) {
+				$arr = $this->callHook('editDocumentAttribute', $document, $attrdef);
+				if(is_array($arr)) {
+					echo "<tr>";
+					echo "<td>".$arr[0].":</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				} else {
 ?>
 		<tr>
 			<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
 			<td><?php $this->printAttributeEditField($attrdef, $document->getAttribute($attrdef)) ?></td>
 		</tr>
 <?php
+				}
 			}
 		}
 ?>
diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php
index 8d5d6a865..9a8d61f84 100644
--- a/views/bootstrap/class.EditFolder.php
+++ b/views/bootstrap/class.EditFolder.php
@@ -98,12 +98,21 @@ function checkForm() {
 
 		if($attrdefs) {
 			foreach($attrdefs as $attrdef) {
+				$arr = $this->callHook('folderEditAttribute', $folder, $attrdef);
+				if(is_array($arr)) {
+					echo $txt;
+					echo "<tr>";
+					echo "<td>".$arr[0]."</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				} else {
 ?>
 <tr>
 	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
 	<td><?php $this->printAttributeEditField($attrdef, $folder->getAttribute($attrdef)) ?></td>
 </tr>
 <?php
+				}
 			}
 		}
 ?>
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 7969eb664..5b27a2fb5 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -202,12 +202,21 @@ function checkForm()
 	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
 	if($attrdefs) {
 		foreach($attrdefs as $attrdef) {
+			$arr = $this->callHook('editDocumentContentAttribute', null, $attrdef);
+			if(is_array($arr)) {
+				echo $txt;
+				echo "<tr>";
+				echo "<td>".$arr[0].":</td>";
+				echo "<td>".$arr[1]."</td>";
+				echo "</tr>";
+			} else {
 ?>
     <tr>
 	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
 	    <td><?php $this->printAttributeEditField($attrdef, '') ?></td>
     </tr>
 <?php
+			}
 		}
 	}
 	if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 97310764a..8c03290a7 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -286,7 +286,16 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$attributes = $document->getAttributes();
 		if($attributes) {
 			foreach($attributes as $attribute) {
-				$this->printAttribute($attribute);
+				$arr = $this->callHook('showDocumentAttribute', $document, $attribute);
+				if(is_array($arr)) {
+					echo $txt;
+					echo "<tr>";
+					echo "<td>".$arr[0].":</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				} else {
+					$this->printAttribute($attribute);
+				}
 			}
 		}
 ?>
@@ -393,8 +402,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$attributes = $latestContent->getAttributes();
 		if($attributes) {
 			foreach($attributes as $attribute) {
-				$attrdef = $attribute->getAttributeDefinition();
-				print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
+				$arr = $this->callHook('showDocumentContentAttribute', $latestcontent, $attribute);
+				if(is_array($arr)) {
+					print "<li>".$arr[0].": ".$arr[1]."</li>\n";
+				} else {
+					$attrdef = $attribute->getAttributeDefinition();
+					print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
+				}
 			}
 		}
 		print "</ul>\n";
@@ -998,8 +1012,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$attributes = $version->getAttributes();
 				if($attributes) {
 					foreach($attributes as $attribute) {
-						$attrdef = $attribute->getAttributeDefinition();
-						print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
+						$arr = $this->callHook('showDocumentContentAttribute', $version, $attribute);
+						if(is_array($arr)) {
+							print "<li>".$arr[0].": ".$arr[1]."</li>\n";
+						} else {
+							$attrdef = $attribute->getAttributeDefinition();
+							print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
+						}
 					}
 				}
 				print "</ul>\n";
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 263ac8c62..feed7f3bd 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -199,13 +199,22 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			$attributes = $folder->getAttributes();
 			if($attributes) {
 				foreach($attributes as $attribute) {
-					$attrdef = $attribute->getAttributeDefinition();
+					$arr = $this->callHook('showFolderAttribute', $folder, $attribute);
+					if(is_array($arr)) {
+						echo $txt;
+						echo "<tr>";
+						echo "<td>".$arr[0].":</td>";
+						echo "<td>".$arr[1].":</td>";
+						echo "</tr>";
+					} else {
+						$attrdef = $attribute->getAttributeDefinition();
 			?>
 					<tr>
 					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
 					<td><?php echo htmlspecialchars(implode(', ', $attribute->getValueAsArray())); ?></td>
 					</tr>
-			<?php
+<?php
+					}
 				}
 			}
 			echo "</table>\n";

From 304e54f0094e289505c5bb51bc0dcec30117d8a3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Apr 2015 21:21:07 +0200
Subject: [PATCH 0056/2006] list only users in select box which are not hidden

---
 views/bootstrap/class.Search.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index b16d5e87e..49d41af5a 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -134,9 +134,9 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 <option value="-1"></option>
 <?php
 		foreach ($allUsers as $userObj) {
-			if ($userObj->isGuest())
+			if ($userObj->isGuest() || ($userObj->isHidden() && $userObj->getID() != $user->getID() && !$user->isAdmin()))
 				continue;
-			print "<option value=\"".$userObj->getID()."\" ".(($owner && $userObj->getID() == $owner->getID()) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "\n";
+			print "<option value=\"".$userObj->getID()."\" ".(($owner && $userObj->getID() == $owner->getID()) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "</option>\n";
 		}
 ?>
 </select>
@@ -363,13 +363,13 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 <tr>
 <td><?php printMLText("owner");?>:</td>
 <td>
-<select class="chzn-select-deselect" name="ownerid">
+<select class="chzn-select-deselect" name="ownerid" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <option value="-1"></option>
 <?php
 			foreach ($allUsers as $userObj) {
-				if ($userObj->isGuest())
+				if ($userObj->isGuest() || ($userObj->isHidden() && $userObj->getID() != $user->getID() && !$user->isAdmin()))
 					continue;
-				print "<option value=\"".$userObj->getID()."\" ".(($owner && $userObj->getID() == $owner->getID()) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "\n";
+				print "<option value=\"".$userObj->getID()."\" ".(($owner && $userObj->getID() == $owner->getID()) ? "selected" : "").">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "</option>\n";
 			}
 ?>
 </select>

From c3d9efc6913f42df7291d99a4fb1395424359de5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Apr 2015 21:28:55 +0200
Subject: [PATCH 0057/2006] fix calculated used disk space in percent

---
 views/bootstrap/class.UserList.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 7406b2d21..91c3a8e2c 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -76,8 +76,11 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			echo "<td>";
 			echo SeedDMS_Core_File::format_filesize($currUser->getUsedDiskSpace());
 			if($quota) {
-				if($user->getQuota() > $currUser->getUsedDiskSpace()) {
-					$used = (int) ($currUser->getUsedDiskSpace()/$currUser->getQuota()*100.0+0.5);
+				$qt = $currUser->getQuota();
+				if($qt == 0)
+					$qt = $quota;
+				if($qt > $currUser->getUsedDiskSpace()) {
+					$used = (int) ($currUser->getUsedDiskSpace()/$qt*100.0+0.5);
 					$free = 100-$used;
 				} else {
 					$free = 0;

From 2d5827a1b96856e96800c96d33d06cc1c4920c51 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Apr 2015 21:31:19 +0200
Subject: [PATCH 0058/2006] add notes for 4.3.17

Conflicts:
	CHANGELOG
---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index f833f9c67..d83f0fe06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,10 @@
   a document or a new version (previously mails were only send when a
   transition was triggered)
 - clean workflow log when deleting a document version.
+- programms for indexing are actually used (Bug #137)
+- fix take over of reviewers/approvers from previos version
+- fix calculation of quota in user list
+- do not show hidden users in select box of search form
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.16

From 2a1ce40a9cc78f123eaf3080dba65efe8dbc5971 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Apr 2015 12:18:01 +0200
Subject: [PATCH 0059/2006] add functions getReceiptStatusText() and
 printReceiptStatusText()

---
 inc/inc.Language.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index d1f51ab14..e1c84374a 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -162,6 +162,35 @@ function getReviewStatusText($status, $date=0) { /* {{{ */
 	}
 } /* }}} */
 
+function printReceiptStatusText($status, $date=0) { /* {{{ */
+	print getReceiptStatusText($status, $date);
+} /* }}} */
+
+function getReceiptStatusText($status, $date=0) { /* {{{ */
+	if (is_null($status)) {
+		return getMLText("status_unknown");
+	}
+	else {
+		switch ($status) {
+			case -2:
+				return getMLText("status_recipient_removed");
+				break;
+			case -1:
+				return getMLText("status_recipient_rejected").($date !=0 ? " ".$date : "");
+				break;
+			case 0:
+				return getMLText("status_not_receipted");
+				break;
+			case 1:
+				return getMLText("status_receipted").($date !=0 ? " ".$date : "");
+				break;
+			default:
+				return getMLText("status_unknown");
+				break;
+		}
+	}
+} /* }}} */
+
 function printApprovalStatusText($status, $date=0) { /* {{{ */
 	if (is_null($status)) {
 		print getMLText("status_unknown");

From b4e8c39158bc19a643f4bd4b34e705566c080394 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Apr 2015 12:18:35 +0200
Subject: [PATCH 0060/2006] add tab for document reception

---
 views/bootstrap/class.ViewDocument.php | 82 ++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8c03290a7..b356b735e 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -177,6 +177,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$status = $latestContent->getStatus();
 		$reviewStatus = $latestContent->getReviewStatus();
 		$approvalStatus = $latestContent->getApprovalStatus();
+		$receiptStatus = $latestContent->getReceiptStatus();
 ?>
 
 <div class="row-fluid">
@@ -326,6 +327,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 				}
 			}
+			if(is_array($receiptStatus) && count($receiptStatus)>0) {
+?>
+		  <li><a data-target="#recipients" data-toggle="tab"><?php echo getMLText('recipients'); ?></a></li>
+<?php
+			}
 ?>
 		  <li><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
 		  <li><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
@@ -956,6 +962,82 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 			}
 		}
+		if(is_array($receiptStatus) && count($receiptStatus)>0) {
+?>
+		  <div class="tab-pane" id="recipients">
+<?php
+			$this->contentContainerStart();
+			print "<table class=\"table-condensed\">\n";
+
+			print "<tr><td colspan=5>\n";
+			$this->contentSubHeading(getMLText("recipients"));
+			print "</tr>";
+
+			print "<tr>\n";
+			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
+			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";
+			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
+			print "<td width='15%'><b>".getMLText("status")."</b></td>\n";
+			print "<td width='20%'></td>\n";
+			print "</tr>\n";
+
+			foreach ($receiptStatus as $r) {
+				$required = null;
+				$is_recipient = false;
+				switch ($r["type"]) {
+					case 0: // Reviewer is an individual.
+						$required = $dms->getUser($r["required"]);
+						if (!is_object($required)) {
+							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
+						}
+						else {
+							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+						}
+						if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+							$is_recipient = true;
+						break;
+					case 1: // Reviewer is a group.
+						$required = $dms->getGroup($r["required"]);
+						if (!is_object($required)) {
+							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
+						}
+						else {
+							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
+							if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+								$is_recipient = true;
+						}
+						break;
+				}
+				print "<tr>\n";
+				print "<td>".$reqName."</td>\n";
+				print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+				/* $updateUser is the user who has done the receipt */
+				$updateUser = $dms->getUser($r["userID"]);
+				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
+				print "<td>".htmlspecialchars($r["comment"])."</td>\n";
+				print "<td>".getReceiptStatusText($r["status"])."</td>\n";
+				print "<td><ul class=\"unstyled\">";
+
+				if($accessop->mayReview()) {
+					if ($is_recipient && $r["status"]==0) {
+						print "<li><a href=\"../out/out.ReceiptDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("add_receipt")."</a></li>";
+					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
+						print "<li><a href=\"../out/out.ReceiptDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("edit")."</a></li>";
+					}
+				}
+
+				print "</ul></td>\n";	
+				print "</td>\n</tr>\n";
+			}
+?>
+		</table>
+<?php
+
+			$this->contentContainerEnd();
+?>
+		  </div>
+<?php
+		}
 		if (count($versions)>1) {
 ?>
 		  <div class="tab-pane" id="previous">

From 31ebf1807f4eec59bb8b23622e322c0ac7157799 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Apr 2015 14:29:25 +0200
Subject: [PATCH 0061/2006] various new phrases

---
 languages/ar_EG/lang.inc | 20 ++++++++++++++++----
 languages/bg_BG/lang.inc | 12 ++++++++++++
 languages/ca_ES/lang.inc | 12 ++++++++++++
 languages/cs_CZ/lang.inc | 12 ++++++++++++
 languages/de_DE/lang.inc | 18 +++++++++++++++---
 languages/en_GB/lang.inc | 18 +++++++++++++++---
 languages/es_ES/lang.inc | 12 ++++++++++++
 languages/fr_FR/lang.inc | 16 ++++++++++++++--
 languages/hu_HU/lang.inc | 20 ++++++++++++++++----
 languages/it_IT/lang.inc | 12 ++++++++++++
 languages/nl_NL/lang.inc | 12 ++++++++++++
 languages/pl_PL/lang.inc | 12 ++++++++++++
 languages/pt_BR/lang.inc | 12 ++++++++++++
 languages/ro_RO/lang.inc | 12 ++++++++++++
 languages/ru_RU/lang.inc | 12 ++++++++++++
 languages/sk_SK/lang.inc | 12 ++++++++++++
 languages/sv_SE/lang.inc | 20 ++++++++++++++++----
 languages/tr_TR/lang.inc | 12 ++++++++++++
 languages/zh_CN/lang.inc | 12 ++++++++++++
 languages/zh_TW/lang.inc | 12 ++++++++++++
 20 files changed, 260 insertions(+), 20 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 8ad876c12..877236b8e 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1244)
+//    Translators: Admin (1247)
 
 $text = array(
 'accept' => 'وافق',
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'إضافة عضو',
 'add_multiple_documents' => 'إضافة مستندات عديدة',
 'add_multiple_files' => 'إضافة مستندات عديدة - سيتم استخدام اسم الملف كاسم المستند',
+'add_receipt' => '',
 'add_review' => 'بدأ المراجعة',
 'add_subfolder' => 'إضافة مجلد فرعي',
 'add_to_clipboard' => 'اضف الى لوحة القصاصات',
@@ -154,7 +155,7 @@ URL: [url]',
 'backup_remove' => 'ازالة ملف النسخ الاحتياطي',
 'backup_tools' => 'أدوات النسخ الاحتياطي',
 'between' => 'بين',
-'bg_BG' => '',
+'bg_BG' => 'ﺐﻠﻏﺍﺮﻳﺓ',
 'browse' => 'ﺖﺼﻔﺣ',
 'calendar' => 'النتيجة',
 'calendar_week' => '',
@@ -251,6 +252,7 @@ URL: [url]',
 'discspace' => '',
 'document' => 'المستند',
 'documents' => 'المستندات',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'مستندات رهن المعالجة',
 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك',
 'documents_only' => 'مستندات فقط',
@@ -278,6 +280,7 @@ Parent folder: [folder_path]
 'document_duplicate_name' => 'اسم المستند متكرر',
 'document_has_no_workflow' => 'المستند لايحتوى مسار عمل',
 'document_infos' => 'معلومات المستند',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'هذا المستند غير محمي ضد التعديل',
 'document_link_by' => 'مربوط بواسطة',
 'document_link_public' => 'عام',
@@ -347,6 +350,7 @@ URL: [url]',
 'edit_folder_notify' => 'تعديل قائمة التنبيهات',
 'edit_folder_props' => 'تعديل مجلد',
 'edit_group' => 'تعديل مجموعة',
+'edit_transmittal_props' => '',
 'edit_user' => 'تعديل المستخدم',
 'edit_user_details' => 'تعديل بيانات المستخدم',
 'email' => 'بريد الكتروني',
@@ -556,6 +560,7 @@ URL: [url]',
 'move_folder' => 'تحريك مجلد',
 'my_account' => 'حسابي',
 'my_documents' => 'مستنداتي',
+'my_transmittals' => '',
 'name' => 'اسم',
 'needs_workflow_action' => 'هذا المستند يتطلب انتباهك . من فضلك تفقد زر مسار العمل',
 'never' => '',
@@ -675,6 +680,7 @@ URL: [url]',
 'quota_exceeded' => 'لقد قمت بتعدي المساحة المخصصة لك بمقدار [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'اقصى مساحة للقرص الصلب تم تعديها بمقدار [bytes]. من فضلك قم بمسح بعض المستندات او اصدارات سابقة منها',
+'recipients' => '',
 'refresh' => 'اعادة تحميل',
 'rejected' => 'مرفوض',
 'released' => 'منشور',
@@ -701,6 +707,7 @@ URL: [url]',
 'repairing_objects' => 'تحضير المستندات والمجلدات.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'صفحة النتائج',
 'return_from_subworkflow' => 'العودة من مسار العمل الفرعي',
 'return_from_subworkflow_email_body' => 'عودة من مسار عمل فرعي
@@ -757,6 +764,7 @@ URL: [url]',
 'rm_folder' => 'ازالة المجلد',
 'rm_from_clipboard' => 'ازالة من لوحة القصاصات',
 'rm_group' => 'ازالة هذه المجموعة',
+'rm_transmittal' => '',
 'rm_user' => 'ازالة هذا المستخدم',
 'rm_version' => 'ازالة اصدار',
 'rm_workflow' => 'ازالة مسار عمل',
@@ -767,7 +775,7 @@ URL: [url]',
 'role_admin' => 'مدير النظام',
 'role_guest' => 'ضيف',
 'role_user' => 'مستخدم',
-'ro_RO' => '',
+'ro_RO' => 'ﺭﻮﻣﺎﻨﻳﺓ',
 'run_subworkflow' => 'تشغيل مسار عمل فرعي',
 'run_subworkflow_email_body' => 'مسار العمل الفرعي بدأ
 المستند: [name]
@@ -1105,7 +1113,9 @@ URL: [url]',
 'status_approved' => 'تمت الموافقة',
 'status_approver_removed' => 'تم ازالة موافق من العملية',
 'status_not_approved' => 'لم تتم الموافقة بعد',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'لم تتم مراجعته بعد',
+'status_recipient_removed' => '',
 'status_reviewed' => 'تمت المراجعة',
 'status_reviewer_rejected' => 'مسودة مرفوضة',
 'status_reviewer_removed' => 'تم ازالة مراجع من العملية',
@@ -1146,8 +1156,10 @@ Parent folder: [folder_path]
 المستخدم: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - تم تحريك انتقال مسار العمل',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'مسار العمل',
-'tr_TR' => '',
+'tr_TR' => 'ﺕﺮﻜﻳﺓ',
 'tuesday' => 'الثلاثاء',
 'tuesday_abbr' => 'ث',
 'type_to_search' => 'اكتب لتبحث',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 70ad79d56..49fbe2f9c 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -55,6 +55,7 @@ $text = array(
 'add_member' => 'Добави член',
 'add_multiple_documents' => 'Добави няколко документа',
 'add_multiple_files' => 'Добави няколко файла (името на файла ще бъде използвано като име на документа)',
+'add_receipt' => '',
 'add_review' => 'Рецензирай',
 'add_subfolder' => 'Добави подпапка',
 'add_to_clipboard' => 'Добави към clipboard',
@@ -236,6 +237,7 @@ $text = array(
 'discspace' => '',
 'document' => 'Документ',
 'documents' => 'Документи',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Документи в процес на работа',
 'documents_locked_by_you' => 'Документи, блокирани от Вас',
 'documents_only' => 'Само документи',
@@ -254,6 +256,7 @@ $text = array(
 'document_duplicate_name' => 'Дублирано име на документ',
 'document_has_no_workflow' => 'Документът няма процес',
 'document_infos' => 'Информация за документа',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Документът не е блокиран',
 'document_link_by' => 'Свързан',
 'document_link_public' => 'Публичен',
@@ -302,6 +305,7 @@ $text = array(
 'edit_folder_notify' => 'Списък с уведомявания за папка',
 'edit_folder_props' => 'Редактирай папка',
 'edit_group' => 'Редактирай група',
+'edit_transmittal_props' => '',
 'edit_user' => 'Редактирай потребител',
 'edit_user_details' => 'Редактирай данните на потребителя',
 'email' => 'Email',
@@ -487,6 +491,7 @@ $text = array(
 'move_folder' => 'Премести папка',
 'my_account' => 'Моя акаунт',
 'my_documents' => 'Моите документи',
+'my_transmittals' => '',
 'name' => 'Име',
 'needs_workflow_action' => '',
 'never' => '',
@@ -576,6 +581,7 @@ $text = array(
 'quota_exceeded' => 'Вашата дискова квота е превишена с [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'Вашето max. използуване на диска е превишена с [bytes]. Please remove documents or previous versions.',
+'recipients' => '',
 'refresh' => 'Обнови',
 'rejected' => 'Отказан',
 'released' => 'Утвърден',
@@ -593,6 +599,7 @@ $text = array(
 'repairing_objects' => 'Поправка на папки и документи',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Страница с резултати',
 'return_from_subworkflow' => 'Връщане от под-процес',
 'return_from_subworkflow_email_body' => '',
@@ -629,6 +636,7 @@ $text = array(
 'rm_folder' => 'Премахни папка',
 'rm_from_clipboard' => 'Премахни от clipboard буфера',
 'rm_group' => 'Премахни тази група',
+'rm_transmittal' => '',
 'rm_user' => 'Премахни тоз потребител',
 'rm_version' => 'Премахни версия',
 'rm_workflow' => 'Премахни процес',
@@ -970,7 +978,9 @@ $text = array(
 'status_approved' => 'Утвърден',
 'status_approver_removed' => 'Утвърждаващия премахнат от процеса',
 'status_not_approved' => 'Не утвърден',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Не рецензиран',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Рецензиран',
 'status_reviewer_rejected' => 'Чернова отказана',
 'status_reviewer_removed' => 'Рецензиращия премахнат от процеса',
@@ -1002,6 +1012,8 @@ $text = array(
 'transition_triggered_email' => 'Забелязана промяна на процес',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Процес',
 'tr_TR' => '',
 'tuesday' => 'вторник',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 803a146af..7e19e30e7 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -55,6 +55,7 @@ $text = array(
 'add_member' => 'Afegir membre',
 'add_multiple_documents' => 'Add multiple documents',
 'add_multiple_files' => 'Afegir múltiples fitxers (s\'utilitzarà el nom de fitxer com a nom del document)',
+'add_receipt' => '',
 'add_review' => 'Enviar revisiót',
 'add_subfolder' => 'Afegir subdirectori',
 'add_to_clipboard' => '',
@@ -241,6 +242,7 @@ URL: [url]',
 'discspace' => '',
 'document' => 'Document',
 'documents' => 'Documents',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documents en procés',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
 'documents_only' => '',
@@ -259,6 +261,7 @@ URL: [url]',
 'document_duplicate_name' => '',
 'document_has_no_workflow' => '',
 'document_infos' => 'Informacions',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Aquest document no està bloquejat',
 'document_link_by' => 'Vinculat per',
 'document_link_public' => 'Públic',
@@ -307,6 +310,7 @@ URL: [url]',
 'edit_folder_notify' => 'Llista de notificació',
 'edit_folder_props' => 'Editar directori',
 'edit_group' => 'Editar grup...',
+'edit_transmittal_props' => '',
 'edit_user' => 'Editar usuari...',
 'edit_user_details' => 'Editar detalls d\'usuari',
 'email' => 'Email',
@@ -492,6 +496,7 @@ URL: [url]',
 'move_folder' => 'Moure directori',
 'my_account' => 'El meu compte',
 'my_documents' => 'Els meus documents',
+'my_transmittals' => '',
 'name' => 'Nom',
 'needs_workflow_action' => '',
 'never' => '',
@@ -581,6 +586,7 @@ URL: [url]',
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
 'quota_warning' => '',
+'recipients' => '',
 'refresh' => 'Refresh',
 'rejected' => 'Rebutjat',
 'released' => 'Publicat',
@@ -598,6 +604,7 @@ URL: [url]',
 'repairing_objects' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Pàgina de resultats',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
@@ -634,6 +641,7 @@ URL: [url]',
 'rm_folder' => 'Eliminar carpeta',
 'rm_from_clipboard' => '',
 'rm_group' => 'Eliminar aquest grup',
+'rm_transmittal' => '',
 'rm_user' => 'Eliminar aquest usuari',
 'rm_version' => 'Eliminar versió',
 'rm_workflow' => '',
@@ -975,7 +983,9 @@ URL: [url]',
 'status_approved' => 'Aprovat',
 'status_approver_removed' => 'Aprovador eliminat del procés',
 'status_not_approved' => 'Sense aprovar',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Sense revisar',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Revisat',
 'status_reviewer_rejected' => 'Esborrany rebutjat',
 'status_reviewer_removed' => 'Revisor eliminat del procés',
@@ -1007,6 +1017,8 @@ URL: [url]',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => '',
 'tr_TR' => '',
 'tuesday' => 'Dimarts',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 2fcfe5bea..f63a24cf1 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Přidat člena',
 'add_multiple_documents' => 'Přidat více dokumentů',
 'add_multiple_files' => 'Přidat více souborů (název souboru se použije jako název dokumentu)',
+'add_receipt' => '',
 'add_review' => 'Poslat ke kontrole',
 'add_subfolder' => 'Přidat podsložku',
 'add_to_clipboard' => 'Přidat do schránky',
@@ -258,6 +259,7 @@ URL: [url]',
 'discspace' => 'Místo na disku',
 'document' => 'Dokument',
 'documents' => 'Dokumenty',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Zpracovávané dokumenty',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
 'documents_only' => 'Pouze dokumenty',
@@ -285,6 +287,7 @@ Uživatel: [username]',
 'document_duplicate_name' => 'Duplicitní název dokumentu',
 'document_has_no_workflow' => 'Dokument nemá pracovní postup',
 'document_infos' => 'Informace o dokumentu',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Tento dokument není zamčený',
 'document_link_by' => 'Odkazuje sem',
 'document_link_public' => 'Veřejný',
@@ -354,6 +357,7 @@ URL: [url]',
 'edit_folder_notify' => 'Seznam upozornění',
 'edit_folder_props' => 'Upravit adresář',
 'edit_group' => 'Upravit skupinu',
+'edit_transmittal_props' => '',
 'edit_user' => 'Upravit uživatele',
 'edit_user_details' => 'Upravit podrobnosti uživatele',
 'email' => 'E-mail',
@@ -563,6 +567,7 @@ URL: [url]',
 'move_folder' => 'Přesunout adresář',
 'my_account' => 'Můj účet',
 'my_documents' => 'Moje dokumenty',
+'my_transmittals' => '',
 'name' => 'Název',
 'needs_workflow_action' => 'Tento dokument vyžaduje Vaši pozornost. Prosím zkontrolujte záložku pracovního postupu.',
 'never' => 'nikdy',
@@ -686,6 +691,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'quota_exceeded' => 'Vaše kvóta disku je překročena o [bytes].',
 'quota_is_disabled' => 'Podpora kvót je v současné době zakázána v nastavení. Nastavení uživatelských kvót nebude mít žádný vliv, dokud se znovu neaktivuje.',
 'quota_warning' => 'Vaše maximální využití disku je překročeno o [bajtů]. Prosím, odstraňte dokumenty nebo předchozí verze.',
+'recipients' => '',
 'refresh' => 'Obnovit',
 'rejected' => 'Odmítnuto',
 'released' => 'Vydáno',
@@ -711,6 +717,7 @@ URL: [url]',
 'repairing_objects' => 'Opravuji dokumenty a složky.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Stránka s výsledky',
 'return_from_subworkflow' => 'Návrat z vedlejšího pracovního postupu',
 'return_from_subworkflow_email_body' => 'Návrat z vedlejšího pracovního postupu
@@ -766,6 +773,7 @@ URL: [url]',
 'rm_folder' => 'Odstranit složku',
 'rm_from_clipboard' => 'Odstranit ze schránky',
 'rm_group' => 'Odstranit tuto skupinu',
+'rm_transmittal' => '',
 'rm_user' => 'Odstranit tohoto uživatele',
 'rm_version' => 'Odstranit verzi',
 'rm_workflow' => 'Odstranit pracovní postup',
@@ -1114,7 +1122,9 @@ URL: [url]',
 'status_approved' => 'Schválen',
 'status_approver_removed' => 'Schvalovatel odstraněn z procesu',
 'status_not_approved' => 'Neschválený',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Nezkontrolovaný',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Zkontrolovaný',
 'status_reviewer_rejected' => 'Návrh zamítnut',
 'status_reviewer_removed' => 'Kontrolor odstraněn z procesu',
@@ -1155,6 +1165,8 @@ Nadřazená složky: [folder_path]
 Uživatel: [uživatelské jméno]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Transformace praconího postupu spuštěna',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Pracovní postup',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Úterý',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 55de1d55a..2375b0b0e 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1994), dgrutsch (18)
+//    Translators: Admin (2006), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Gruppenmitglied anlegen',
 'add_multiple_documents' => 'Mehrere Dokumente anlegen',
 'add_multiple_files' => 'Mehrere Dateien hochladen (Dateiname wird als Dokumentenname verwendet)',
+'add_receipt' => 'Empfang bestätigen',
 'add_review' => 'Überprüfung hinzufügen',
 'add_subfolder' => 'Unterordner anlegen',
 'add_to_clipboard' => 'Zur Zwischenablage hinzufügen',
@@ -202,8 +203,8 @@ URL: [url]',
 'chart_selection' => 'Diagrammauswahl',
 'chart_sizeperuser_title' => 'Speicherplatz pro Benutzer',
 'checkedout_file_has_different_version' => 'Die ausgecheckte Version ist nicht identisch mit der aktuellen Version. Das Einchecken wird das Dokument nicht aktualisieren.',
-'checkedout_file_has_disappeared' => 'Die Datei des ausgecheckten Dokuments ist nicht mehr vorhanden. Das Einchecken wird keine neue Version erzeugen, setzt aber den Checkout-Status zurück..',
-'checkedout_file_is_unchanged' => 'Die Datei des ausgecheckten Dokuments ist noch unverändert. Das Einchecken wird keine neue Version anlegen, setzt aber den Checkout-Status zurück.',
+'checkedout_file_has_disappeared' => 'Die Datei des ausgecheckten Dokuments ist nicht mehr vorhanden. Ein Einchecken ist nicht möglich.',
+'checkedout_file_is_unchanged' => 'Die Datei des ausgecheckten Dokuments ist noch unverändert. Das Einchecken ist daher nicht möglich. Wenn Sie keine weiteren Änderungen am Dokument vornehmen möchten, dann setzen Sie den CheckOut-Status zurück.',
 'checkin_document' => 'Einchecken',
 'checkout_document' => 'Auschecken',
 'checkout_is_disabled' => 'Auschecken von Dokumenten ist in der Konfiguration ausgeschaltet.',
@@ -263,6 +264,7 @@ URL: [url]',
 'discspace' => 'Plattenplatz',
 'document' => 'Dokument',
 'documents' => 'Dokumente',
+'documents_checked_out_by_you' => 'Von mir ausgecheckte Dokumente',
 'documents_in_process' => 'Dokumente in Bearbeitung',
 'documents_locked_by_you' => 'Von mir gesperrte Dokumente',
 'documents_only' => 'Nur Dokumente',
@@ -290,6 +292,7 @@ Benutzer: [username]',
 'document_duplicate_name' => 'Doppelter Dokumentenname',
 'document_has_no_workflow' => 'Dokument hat keinen Workflow',
 'document_infos' => 'Informationen',
+'document_is_checked_out' => 'Das Dokument ist zur Zeit ausgecheckt. Wenn Sie eine neue Version hochladen, werden Sie die ausgecheckte Version nicht mehr einchecken können.',
 'document_is_not_locked' => 'Dieses Dokument ist nicht gesperrt',
 'document_link_by' => 'Verweis erstellt von',
 'document_link_public' => 'Für alle sichtbar',
@@ -359,6 +362,7 @@ URL: [url]',
 'edit_folder_notify' => 'Beobachtung von Ordnern',
 'edit_folder_props' => 'Bearbeiten',
 'edit_group' => 'Gruppe bearbeiten',
+'edit_transmittal_props' => '',
 'edit_user' => 'Benutzer bearbeiten',
 'edit_user_details' => 'Benutzerdetails bearbeiten',
 'email' => 'Email',
@@ -568,6 +572,7 @@ URL: [url]',
 'move_folder' => 'Verschieben',
 'my_account' => 'Mein Profil',
 'my_documents' => 'Meine Dokumente',
+'my_transmittals' => '',
 'name' => 'Name',
 'needs_workflow_action' => 'Dieses Dokument erfordert eine Aktion. Bitte schauen Sie auf den Workflow-Reiter.',
 'never' => 'nie',
@@ -694,6 +699,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'quota_exceeded' => 'Ihr maximal verfügbarer Plattenplatz wurde um [bytes] überschritten.',
 'quota_is_disabled' => 'Quota-Unterstützung ist zur Zeit ausgeschaltet. Benutzer-Quota werden ignoriert bis Quota-Unterstützung in den Einstellungen eingeschaltet wird.',
 'quota_warning' => 'Ihr maximal verfügbarer Plattenplatz wurde um [bytes] überschritten. Bitte löschen Sie Dokumente oder ältere Versionen.',
+'recipients' => 'Empfänger',
 'refresh' => 'Aktualisieren',
 'rejected' => 'abgelehnt',
 'released' => 'freigegeben',
@@ -720,6 +726,7 @@ URL: [url]',
 'repairing_objects' => 'Repariere Dokumente und Ordner.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => 'Auschecken beenden',
 'results_page' => 'Ergebnis-Seite',
 'return_from_subworkflow' => 'Rückkehr aus Sub-Workflow',
 'return_from_subworkflow_email_body' => 'Rückkehr vom Subworkflow
@@ -786,6 +793,7 @@ URL: [url]',
 'rm_folder' => 'Löschen',
 'rm_from_clipboard' => 'Aus Zwischenablage löschen',
 'rm_group' => 'Diese Gruppe löschen',
+'rm_transmittal' => '',
 'rm_user' => 'Diesen Benutzer löschen',
 'rm_version' => 'Version löschen',
 'rm_workflow' => 'Lösche Workflow',
@@ -1134,7 +1142,9 @@ URL: [url]',
 'status_approved' => 'freigegeben',
 'status_approver_removed' => 'Freigebender wurde vom Prozess ausgeschlossen',
 'status_not_approved' => 'keine Freigabe',
+'status_not_receipted' => 'Empfang noch nicht bestätigt',
 'status_not_reviewed' => 'nicht geprüft',
+'status_recipient_removed' => 'Empfänger aus Liste entfernt',
 'status_reviewed' => 'geprüft',
 'status_reviewer_rejected' => 'Entwurf abgelehnt',
 'status_reviewer_removed' => 'Prüfer wurde vom Prozess ausgeschlossen',
@@ -1175,6 +1185,8 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow transition triggered',
+'transmittal_comment' => 'Kommentar',
+'transmittal_name' => 'Name',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Türkisch',
 'tuesday' => 'Dienstag',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index b1e91f583..ca9cfecc7 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1127), dgrutsch (3), netixw (14)
+//    Translators: Admin (1142), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Add a member',
 'add_multiple_documents' => 'Add multiple documents',
 'add_multiple_files' => 'Add multiple files (will use filename as document name)',
+'add_receipt' => 'Acknowledge reception',
 'add_review' => 'Add review',
 'add_subfolder' => 'Add subfolder',
 'add_to_clipboard' => 'Add to clipboard',
@@ -202,8 +203,8 @@ URL: [url]',
 'chart_selection' => 'Select chart',
 'chart_sizeperuser_title' => 'Diskspace per user',
 'checkedout_file_has_different_version' => 'The checked out version is not identical to the current version. Check in will not update the document.',
-'checkedout_file_has_disappeared' => 'The file of the checked out document has disappeared. Check in will not create a new version, but clears the checkout status..',
-'checkedout_file_is_unchanged' => 'The file of the checked out document is still unchanged. Check in will not create a new version but clears the checkout status.',
+'checkedout_file_has_disappeared' => 'The file of the checked out document has disappeared. Check in will not be possible.',
+'checkedout_file_is_unchanged' => 'The file of the checked out document is still unchanged. Check in will not be possible. If do not plan any modifications, you can reset the check out status.',
 'checkin_document' => 'Check In',
 'checkout_document' => 'Check out',
 'checkout_is_disabled' => 'Check out of documents is disabled in the configuration.',
@@ -263,6 +264,7 @@ URL: [url]',
 'discspace' => 'Disc space',
 'document' => 'Document',
 'documents' => 'Documents',
+'documents_checked_out_by_you' => 'Documents checked out by you',
 'documents_in_process' => 'Documents In Process',
 'documents_locked_by_you' => 'Documents locked by you',
 'documents_only' => 'Documents only',
@@ -290,6 +292,7 @@ User: [username]',
 'document_duplicate_name' => 'Duplicate document name',
 'document_has_no_workflow' => 'Document has no workflow',
 'document_infos' => 'Document Information',
+'document_is_checked_out' => 'Document is currently checked out. If you upload a new version, then the checked out version cannot be checked back in anymore.',
 'document_is_not_locked' => 'This document is not locked',
 'document_link_by' => 'Linked by',
 'document_link_public' => 'Public',
@@ -359,6 +362,7 @@ URL: [url]',
 'edit_folder_notify' => 'Folder Notification List',
 'edit_folder_props' => 'Edit folder',
 'edit_group' => 'Edit group',
+'edit_transmittal_props' => 'Edit transmittal properties',
 'edit_user' => 'Edit user',
 'edit_user_details' => 'Edit User Details',
 'email' => 'Email',
@@ -568,6 +572,7 @@ URL: [url]',
 'move_folder' => 'Move Folder',
 'my_account' => 'My Account',
 'my_documents' => 'My Documents',
+'my_transmittals' => 'My transmittals',
 'name' => 'Name',
 'needs_workflow_action' => 'This document requires your attention. Please check the workflow tab.',
 'never' => 'never',
@@ -694,6 +699,7 @@ If you have still problems to login, then please contact your administrator.',
 'quota_exceeded' => 'Your disk quota is exceeded by [bytes].',
 'quota_is_disabled' => 'Quota support is currently disabled in the settings. Setting a user quota will have no effect until it is enabled again.',
 'quota_warning' => 'Your maximum disc usage is exceeded by [bytes]. Please remove documents or previous versions.',
+'recipients' => 'Recipients',
 'refresh' => 'Refresh',
 'rejected' => 'Rejected',
 'released' => 'Released',
@@ -727,6 +733,7 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => 'Workflow action required',
+'reset_checkout' => 'Finish Check out',
 'results_page' => 'Results Page',
 'return_from_subworkflow' => 'Return from sub workflow',
 'return_from_subworkflow_email_body' => 'Return from subworkflow
@@ -793,6 +800,7 @@ URL: [url]',
 'rm_folder' => 'Remove folder',
 'rm_from_clipboard' => 'Remove from clipboard',
 'rm_group' => 'Remove this group',
+'rm_transmittal' => 'Remove transmittal',
 'rm_user' => 'Remove this user',
 'rm_version' => 'Remove version',
 'rm_workflow' => 'Remove Workflow',
@@ -1141,7 +1149,9 @@ URL: [url]',
 'status_approved' => 'Approved',
 'status_approver_removed' => 'Approver removed from process',
 'status_not_approved' => 'Not approved',
+'status_not_receipted' => 'Not receipted yet',
 'status_not_reviewed' => 'Not reviewed',
+'status_recipient_removed' => 'Recipient removed from list',
 'status_reviewed' => 'Reviewed',
 'status_reviewer_rejected' => 'Draft rejected',
 'status_reviewer_removed' => 'Reviewer removed from process',
@@ -1182,6 +1192,8 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow transition triggered',
+'transmittal_comment' => 'Comment',
+'transmittal_name' => 'Name',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Turkish',
 'tuesday' => 'Tuesday',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 1ad2f47de..caa5ccade 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Añadir miembro',
 'add_multiple_documents' => 'Añadir múltiples documentos',
 'add_multiple_files' => 'Añadir múltiples ficheros (Se usará el nombre de fichero como nombre de documento)',
+'add_receipt' => '',
 'add_review' => 'Enviar revisión',
 'add_subfolder' => 'Añadir subcarpeta',
 'add_to_clipboard' => 'Añadir al portapapeles',
@@ -258,6 +259,7 @@ URL: [url]',
 'discspace' => 'Espacio en disco',
 'document' => 'Documento',
 'documents' => 'Documentos',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos en proceso',
 'documents_locked_by_you' => 'Documentos bloqueados por usted',
 'documents_only' => 'Solo documentos',
@@ -285,6 +287,7 @@ Usuario: [username]',
 'document_duplicate_name' => 'Nombre de documento duplicado',
 'document_has_no_workflow' => 'Documento sin flujo de trabajo',
 'document_infos' => 'Informaciones',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Este documento no está bloqueado',
 'document_link_by' => 'Vinculado por',
 'document_link_public' => 'Público',
@@ -354,6 +357,7 @@ URL: [url]',
 'edit_folder_notify' => 'Lista de notificación',
 'edit_folder_props' => 'Editar carpeta',
 'edit_group' => 'Editar grupo...',
+'edit_transmittal_props' => '',
 'edit_user' => 'Editar usuario...',
 'edit_user_details' => 'Editar detalles de usuario',
 'email' => 'Email',
@@ -563,6 +567,7 @@ URL: [url]',
 'move_folder' => 'Mover carpeta',
 'my_account' => 'Mi cuenta',
 'my_documents' => 'Mis documentos',
+'my_transmittals' => '',
 'name' => 'Nombre',
 'needs_workflow_action' => 'Este documento requiere su atención. Por favor chequee la pestaña de flujo de trabajo.',
 'never' => '',
@@ -690,6 +695,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'quota_exceeded' => 'Su cuota de disco se ha excedido en [bytes].',
 'quota_is_disabled' => 'La cuota está actualmente deshabilitada en las opciones. Establecer una cuota de usuario no tendrá efecto hasta que sea habilitada de nuevo.',
 'quota_warning' => 'El máximo de uso de disco se ha excedido en [bytes]. Por favor eliminar documentos o versiones anteriores.',
+'recipients' => '',
 'refresh' => 'Actualizar',
 'rejected' => 'Rechazado',
 'released' => 'Publicado',
@@ -716,6 +722,7 @@ nURL: [url]',
 'repairing_objects' => 'Reparando documentos y carpetas.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Página de resultados',
 'return_from_subworkflow' => 'Regreso a sub Flujo de trabajo',
 'return_from_subworkflow_email_body' => 'Retorno del subflujo de trabajo
@@ -772,6 +779,7 @@ URL: [url]',
 'rm_folder' => 'Eliminar carpeta',
 'rm_from_clipboard' => 'Borrar del portapapeles',
 'rm_group' => 'Eliminar este grupo',
+'rm_transmittal' => '',
 'rm_user' => 'Eliminar este usuario',
 'rm_version' => 'Eliminar versión',
 'rm_workflow' => 'Eliminar Flujo de Trabajo',
@@ -1120,7 +1128,9 @@ URL: [url]',
 'status_approved' => 'Aprobado',
 'status_approver_removed' => 'Aprobador eliminado del proceso',
 'status_not_approved' => 'Sin aprobar',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Sin revisar',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Revisado',
 'status_reviewer_rejected' => 'Borrador rechazado',
 'status_reviewer_removed' => 'Revisor eliminado del proceso',
@@ -1161,6 +1171,8 @@ Carpeta principal: [folder_path]
 Usuario: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow transition triggered',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Flujo de Trabajo',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martes',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 84d912bed..53b6348ab 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (964), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (965), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Ajouter un membre',
 'add_multiple_documents' => 'Ajouter plusieurs documents',
 'add_multiple_files' => 'Ajouter plusieurs fichiers (le nom du fichier servira de nom de document)',
+'add_receipt' => '',
 'add_review' => 'Soumettre la correction',
 'add_subfolder' => 'Ajouter un sous-dossier',
 'add_to_clipboard' => 'Ajouter au presse-papiers',
@@ -258,6 +259,7 @@ URL: [url]',
 'discspace' => 'Espace disque',
 'document' => 'Document',
 'documents' => 'Documents',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documents en cours',
 'documents_locked_by_you' => 'Documents verrouillés',
 'documents_only' => 'Documents uniquement',
@@ -285,6 +287,7 @@ Utilisateur: [username]',
 'document_duplicate_name' => 'Dupliquer le nom de document',
 'document_has_no_workflow' => 'Le document n\'a pas de workflow',
 'document_infos' => 'Informations sur le document',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Ce document n\'est pas verrouillé',
 'document_link_by' => 'Lié par',
 'document_link_public' => 'Public',
@@ -354,6 +357,7 @@ URL: [url]',
 'edit_folder_notify' => 'Liste de notification de dossiers',
 'edit_folder_props' => 'Modifier le dossier',
 'edit_group' => 'Modifier un groupe',
+'edit_transmittal_props' => '',
 'edit_user' => 'Modifier un utilisateur',
 'edit_user_details' => 'Modifier les détails d\'utilisateur',
 'email' => 'E-mail',
@@ -563,6 +567,7 @@ URL: [url]',
 'move_folder' => 'Déplacer le dossier',
 'my_account' => 'Mon compte',
 'my_documents' => 'Mes documents',
+'my_transmittals' => '',
 'name' => 'Nom',
 'needs_workflow_action' => 'Ce document requiert votre attention. Consultez l\'onglet workflow.',
 'never' => 'Jamais',
@@ -687,6 +692,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'quota_exceeded' => 'Votre quota de disque est dépassé de [bytes].',
 'quota_is_disabled' => 'Le support des quota est actuellement désactivé dans les réglages. Affecter un quota utilisateur n\'aura pas d\'effet jusqu\'à ce qu\'il soit de nouveau activé.',
 'quota_warning' => 'Votre taille maximale de disque est dépassée de [bytes]. SVP supprimer des documents ou d\'anciennes versions.',
+'recipients' => '',
 'refresh' => 'Actualiser',
 'rejected' => 'Rejeté',
 'released' => 'Publié',
@@ -712,6 +718,7 @@ URL: [url]',
 'repairing_objects' => 'Réparation des documents et des dossiers.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Page de résultats',
 'return_from_subworkflow' => 'Revenir du sous-workflow',
 'return_from_subworkflow_email_body' => '',
@@ -755,6 +762,7 @@ URL: [url]',
 'rm_folder' => 'Supprimer le dossier',
 'rm_from_clipboard' => 'Supprimer le dossier du presse-papiers',
 'rm_group' => 'Supprimer ce groupe',
+'rm_transmittal' => '',
 'rm_user' => 'Supprimer cet utilisateur',
 'rm_version' => 'Retirer la version',
 'rm_workflow' => 'Supprimer le Workflow',
@@ -1096,7 +1104,9 @@ URL: [url]',
 'status_approved' => 'Approuvé',
 'status_approver_removed' => 'Approbateur retiré du processus',
 'status_not_approved' => 'Non approuvé',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Non corrigé',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Corrigé',
 'status_reviewer_rejected' => 'Correction rejetée',
 'status_reviewer_removed' => 'Correcteur retiré du processus',
@@ -1128,8 +1138,10 @@ URL: [url]',
 'transition_triggered_email' => 'Transition de workflow activé',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Workflow',
-'tr_TR' => '',
+'tr_TR' => 'Turc',
 'tuesday' => 'Mardi',
 'tuesday_abbr' => 'Mar.',
 'type_to_search' => 'Effectuer une recherche',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 3e6c8b6da..60a77c125 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (548), ribaz (1019)
+//    Translators: Admin (552), ribaz (1019)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Tag hozzáadása',
 'add_multiple_documents' => 'Több dokumentum hozzáadása',
 'add_multiple_files' => 'Több állomány hozzáadása (az állomány nevét használja dokumentum névként)',
+'add_receipt' => '',
 'add_review' => 'Felülvizsgálat küldése',
 'add_subfolder' => 'Alkönyvtár hozzáadása',
 'add_to_clipboard' => 'Vágólaphoz hozzáad',
@@ -161,7 +162,7 @@ URL: [url]',
 'backup_remove' => 'Mentési állomány eltávolítása',
 'backup_tools' => 'Mentő eszközök',
 'between' => 'között',
-'bg_BG' => '',
+'bg_BG' => 'Bulgár',
 'browse' => 'Tallózás',
 'calendar' => 'Naptár',
 'calendar_week' => 'Naptári hét',
@@ -258,6 +259,7 @@ URL: [url]',
 'discspace' => 'Lemezterület',
 'document' => 'Dokumentum',
 'documents' => 'Dokumentumok',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
 'documents_only' => 'Csak dokumentumok',
@@ -285,6 +287,7 @@ Felhasználó: [username]',
 'document_duplicate_name' => 'Duplikált dokumentum név',
 'document_has_no_workflow' => 'Dokumentumhoz nincs munkafolyamat',
 'document_infos' => 'Dokumentum információ',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Ez a dokumentum NEM zßrolt',
 'document_link_by' => 'Hivatkozást létrehozta:',
 'document_link_public' => 'Nyilvános',
@@ -354,6 +357,7 @@ URL: [url]',
 'edit_folder_notify' => 'Mappa értesítési lista',
 'edit_folder_props' => 'Mappa szerkesztése',
 'edit_group' => 'Csoport szerkesztése',
+'edit_transmittal_props' => '',
 'edit_user' => 'Felhasználó szerkesztése',
 'edit_user_details' => 'Felhasználó részletes adatainak szerkesztése',
 'email' => 'Email',
@@ -563,6 +567,7 @@ URL: [url]',
 'move_folder' => 'Könyvtár áthelyezése',
 'my_account' => 'Saját hozzáférés',
 'my_documents' => 'Saját dokumentumok',
+'my_transmittals' => '',
 'name' => 'Név',
 'needs_workflow_action' => 'Ez a dokumentum az Ön beavatkozására vár. Ellenőrizze a munkafolyamat fület.',
 'never' => '',
@@ -690,6 +695,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'quota_exceeded' => 'Túllépte a lemezterület korlátot [bytes].',
 'quota_is_disabled' => 'Kvóta támogatás jelenleg le van tiltva a beállításoknál. Felhasználói korlát beállítások nem kerülnek érvényesítésre amíg nincs újra engedélyezve.',
 'quota_warning' => 'Túllépte lemez korlátot [bytes] bájttal. Kérjük távolítson el dokumentumokat vagy korábbi változatokat.',
+'recipients' => '',
 'refresh' => 'Frissítés',
 'rejected' => 'Elutasított',
 'released' => 'Kiadott',
@@ -716,6 +722,7 @@ URL: [url]',
 'repairing_objects' => 'Dokumentumok és mappák helyreállítása',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Találati oldal',
 'return_from_subworkflow' => 'Visszatérés a segéd munkafolyamatból',
 'return_from_subworkflow_email_body' => 'Visszatérés segéd munkafolyamatból
@@ -772,6 +779,7 @@ URL: [url]',
 'rm_folder' => 'Könyvtár eltávolítása',
 'rm_from_clipboard' => 'Eltávolítás a vágólapról',
 'rm_group' => 'Csoport eltávolítása',
+'rm_transmittal' => '',
 'rm_user' => 'Felhasználó eltávolítása',
 'rm_version' => 'Változat eltávolítása',
 'rm_workflow' => 'Munkafolyamat eltávolítása',
@@ -782,7 +790,7 @@ URL: [url]',
 'role_admin' => 'Adminisztrátor',
 'role_guest' => 'Vendég',
 'role_user' => 'Felhasználó',
-'ro_RO' => '',
+'ro_RO' => 'Román',
 'run_subworkflow' => 'Segéd munkafolyamat futtatása',
 'run_subworkflow_email_body' => 'Segéd munkafolyamat elindult
 Dokumentum: [name]
@@ -1119,7 +1127,9 @@ URL: [url]',
 'status_approved' => 'Jóváhagyott',
 'status_approver_removed' => 'Jóváhagyó eltávolítva a folyamatból',
 'status_not_approved' => 'Nem jóváhagyott',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Nem felülvizsgált',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Felülvizsgált',
 'status_reviewer_rejected' => 'Piszkozat elutasítva',
 'status_reviewer_removed' => 'Felülvizsgáló eltávolítva a folyamatból',
@@ -1160,8 +1170,10 @@ Szülő mappa: [folder_path]
 Felhasználó: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Munkamanet átmenet kiváltva',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Munkafolyamat',
-'tr_TR' => '',
+'tr_TR' => 'Török',
 'tuesday' => 'Kedd',
 'tuesday_abbr' => 'Ke',
 'type_to_search' => 'Adja meg a keresendő kifejezést',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 135ac6b6f..a52157763 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Aggiungi un membro',
 'add_multiple_documents' => 'Aggiungi documenti multipli',
 'add_multiple_files' => 'Aggiungi documenti multipli (il nome del file verrà usato come nome del documento)',
+'add_receipt' => '',
 'add_review' => 'Invio revisione',
 'add_subfolder' => 'Aggiungi sottocartella',
 'add_to_clipboard' => 'Aggiungi agli appunti',
@@ -263,6 +264,7 @@ URL: [url]',
 'discspace' => 'Spazio su disco',
 'document' => 'Documento',
 'documents' => 'Documenti',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documenti in lavorazione',
 'documents_locked_by_you' => 'Documenti bloccati da te',
 'documents_only' => 'Solo documenti',
@@ -290,6 +292,7 @@ Utente: [username]',
 'document_duplicate_name' => 'Nome del Documento duplicato',
 'document_has_no_workflow' => 'Il documento non ha un flusso di lavoro',
 'document_infos' => 'Informazioni documento',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Questo documento non è bloccato',
 'document_link_by' => 'Collegato da',
 'document_link_public' => 'Pubblico',
@@ -359,6 +362,7 @@ URL: [url]',
 'edit_folder_notify' => 'Modifica la lista di notifica per la cartella',
 'edit_folder_props' => 'Modifica proprietà cartella',
 'edit_group' => 'Modifica il gruppo',
+'edit_transmittal_props' => '',
 'edit_user' => 'Modifica l\'utente',
 'edit_user_details' => 'Modifica i dettagli utente',
 'email' => 'Email',
@@ -568,6 +572,7 @@ URL: [url]',
 'move_folder' => 'Sposta cartella',
 'my_account' => 'Account personale',
 'my_documents' => 'Documenti personali',
+'my_transmittals' => '',
 'name' => 'Nome',
 'needs_workflow_action' => 'Il documento richiede attenzione. Prego controllare il flusso di lavoro.',
 'never' => 'Mai',
@@ -695,6 +700,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].',
 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.',
 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.',
+'recipients' => '',
 'refresh' => 'Ricarica',
 'rejected' => 'Rifiutato',
 'released' => 'Rilasciato',
@@ -728,6 +734,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => 'Richiesta di azione in un flusso di lavoro',
+'reset_checkout' => '',
 'results_page' => 'Pagina dei risultati',
 'return_from_subworkflow' => 'Ritorno dal sotto-flusso di lavoro',
 'return_from_subworkflow_email_body' => 'Ritorno dal sotto-flusso di lavoro
@@ -794,6 +801,7 @@ URL: [url]',
 'rm_folder' => 'Rimuovi cartella',
 'rm_from_clipboard' => 'Rimuovi dalla clipboard',
 'rm_group' => 'Rimuovi questo gruppo',
+'rm_transmittal' => '',
 'rm_user' => 'Rimuovi questo utente',
 'rm_version' => 'Rimuovi versione',
 'rm_workflow' => 'Rimuovi flusso di lavoro',
@@ -1142,7 +1150,9 @@ URL: [url]',
 'status_approved' => 'Approvato',
 'status_approver_removed' => 'Approvatore rimosso dal processo',
 'status_not_approved' => 'Non ancora approvato',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Non ancora revisionato',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Revisionato',
 'status_reviewer_rejected' => 'Bozza rifiutata',
 'status_reviewer_removed' => 'Revisore rimosso dal processo',
@@ -1183,6 +1193,8 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'transition_triggered_email_subject' => 'Transizione del flusso di lavoro iniziata',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Flusso di lavoro',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martedì',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index b7733bf8c..c921a99e4 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Lid toevoegen',
 'add_multiple_documents' => 'Meerdere Documenten Toevoegen',
 'add_multiple_files' => 'Meerdere bestanden toevoegen (Gebruikt bestandsnaam als document naam)',
+'add_receipt' => '',
 'add_review' => 'Verzend [Controle]',
 'add_subfolder' => 'Submap toevoegen',
 'add_to_clipboard' => 'Toevoegen aan klembord',
@@ -251,6 +252,7 @@ URL: [url]',
 'discspace' => '',
 'document' => 'Document',
 'documents' => 'Documenten',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documenten in behandeling',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
 'documents_only' => 'Alleen documenten',
@@ -278,6 +280,7 @@ Gebruiker: [username]',
 'document_duplicate_name' => 'Dupliceer documentnaam',
 'document_has_no_workflow' => 'Document bevat geen workflow',
 'document_infos' => 'Document Informatie',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Dit document is niet geblokkeerd',
 'document_link_by' => 'Gekoppeld met',
 'document_link_public' => 'Publiek',
@@ -347,6 +350,7 @@ URL: [url]',
 'edit_folder_notify' => 'Map Notificatie Lijst',
 'edit_folder_props' => 'Wijzig Map eigenschappen',
 'edit_group' => 'Wijzig Groep',
+'edit_transmittal_props' => '',
 'edit_user' => 'Wijzig gebruiker',
 'edit_user_details' => 'Wijzig gebruiker Details',
 'email' => 'E-mail',
@@ -556,6 +560,7 @@ URL: [url]',
 'move_folder' => 'Verplaats Map',
 'my_account' => 'Mijn Account',
 'my_documents' => 'Mijn Documenten',
+'my_transmittals' => '',
 'name' => 'Naam',
 'needs_workflow_action' => 'Dit document vereist uw aandacht. Bekijk deze onder het tabblad workflows.',
 'never' => '',
@@ -683,6 +688,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'quota_exceeded' => 'Uw data quota is overschreden met [bytes].',
 'quota_is_disabled' => 'Quota support is momenteel niet aktief in de eigenschappen. Een user quota zetten zal geen effect hebben tot quotas actief zijn.',
 'quota_warning' => 'Uw maximale data gebruik is overschreden met [bytes]. Gelieve documenten of eerdere versies te verwijderen.',
+'recipients' => '',
 'refresh' => 'Verversen',
 'rejected' => 'Afgewezen',
 'released' => 'Gepubliceerd',
@@ -708,6 +714,7 @@ URL: [url]',
 'repairing_objects' => 'Documenten en mappen repareren.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Resultaten pagina',
 'return_from_subworkflow' => 'Ga terug naar sub workflow',
 'return_from_subworkflow_email_body' => 'Terug van subworflow
@@ -763,6 +770,7 @@ URL: [url]',
 'rm_folder' => 'Verwijder map',
 'rm_from_clipboard' => 'Verwijder van klembord',
 'rm_group' => 'Verwijder deze Groep',
+'rm_transmittal' => '',
 'rm_user' => 'Verwijder deze Gebruiker',
 'rm_version' => 'Verwijder versie',
 'rm_workflow' => 'Verwijder workflwo',
@@ -1111,7 +1119,9 @@ URL: [url]',
 'status_approved' => 'Goedgekeurd',
 'status_approver_removed' => '[Goedkeurder] verwijderd van dit proces',
 'status_not_approved' => 'Niet goedgekeurd',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Niet gecontroleerd',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Gecontroleerd',
 'status_reviewer_rejected' => 'Klad Controle [Afgewezen]',
 'status_reviewer_removed' => '[Controleur] verwijderd van dit proces',
@@ -1152,6 +1162,8 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow overgang geactiveerd',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Turks',
 'tuesday' => 'Dinsdag',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 4e7e8cc1e..cfcad2fb4 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Dodaj członka',
 'add_multiple_documents' => 'Dodaj wiele dokumentów',
 'add_multiple_files' => 'Dodaj wiele plików (Nazwy plików zostaną użyte jako nazwy dokumentów)',
+'add_receipt' => '',
 'add_review' => 'Zatwierdź recenzję',
 'add_subfolder' => 'Dodaj podfolder',
 'add_to_clipboard' => 'Dodaj do schowka',
@@ -251,6 +252,7 @@ URL: [url]',
 'discspace' => 'Miejsce na dysku',
 'document' => 'Dokument',
 'documents' => 'Dokumenty',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokumenty procesowane',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
 'documents_only' => 'Tylko dokumenty',
@@ -278,6 +280,7 @@ Użytkownik: [username]',
 'document_duplicate_name' => 'Zduplikowana nazwa dokumentu',
 'document_has_no_workflow' => 'Dokument nie ma przypisanego procesu',
 'document_infos' => 'Informacje o dokumencie',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Ten dokument nie jest zablokowany',
 'document_link_by' => 'Dowiązane przez',
 'document_link_public' => 'Publiczny',
@@ -347,6 +350,7 @@ URL: [url]',
 'edit_folder_notify' => 'Lista powiadomień dla folderu',
 'edit_folder_props' => 'Edytuj folder',
 'edit_group' => 'Edytuj grupę',
+'edit_transmittal_props' => '',
 'edit_user' => 'Edytuj użytkownika',
 'edit_user_details' => 'Zmień dane użytkownika',
 'email' => 'Email',
@@ -556,6 +560,7 @@ URL: [url]',
 'move_folder' => 'Przenieś folder',
 'my_account' => 'Moje konto',
 'my_documents' => 'Moje dokumenty',
+'my_transmittals' => '',
 'name' => 'Nazwa',
 'needs_workflow_action' => 'Dokument wymaga uwagi. Proszę sprawdzić kartę workflow.',
 'never' => '',
@@ -683,6 +688,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'quota_exceeded' => 'Twój limit przydzielonej przestrzeni dyskowej został przekroczony o [bytes].',
 'quota_is_disabled' => 'Wsparcie limitów dyskowych jest obecnie wyłączone w ustawieniach. Ustawiony limit dyskowy użytkownika nie będzie działał dopóki wparcie nie zostanie ponownie włączone.',
 'quota_warning' => 'Przekroczono użycie dysku o [bytes]. Usuń dokumenty lub poprzednie wersje.',
+'recipients' => '',
 'refresh' => 'Odśwież',
 'rejected' => 'Odrzucony',
 'released' => 'Zatwierdzony',
@@ -709,6 +715,7 @@ URL: [url]',
 'repairing_objects' => 'Naprawa dokumentów i katalogów.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Strona z wynikami',
 'return_from_subworkflow' => 'Powróć z sub procesu',
 'return_from_subworkflow_email_body' => 'Powrót z sub procesu dokumentu: [name] Wersja: [version] Proces: [workflow] Sub proces: [subworkflow] folderu nadrzędnego: [folder_path] Użytkownik: [username] URL: [url]',
@@ -751,6 +758,7 @@ URL: [url]',
 'rm_folder' => 'Usuń folder',
 'rm_from_clipboard' => 'Usuń ze schowka',
 'rm_group' => 'Usuń tą grupę',
+'rm_transmittal' => '',
 'rm_user' => 'Usuń tego użytkownika',
 'rm_version' => 'Usuń wersję',
 'rm_workflow' => 'Usuń proces',
@@ -1099,7 +1107,9 @@ URL: [url]',
 'status_approved' => 'Zatwierdzone',
 'status_approver_removed' => 'Osoba zatwierdzająca usunięta z procesu',
 'status_not_approved' => 'Nie zatwierdzone',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Nie zrecenzowane',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Zrecenzowane',
 'status_reviewer_rejected' => 'Szkic odrzucony',
 'status_reviewer_removed' => 'Recenzent usunięty z procesu',
@@ -1140,6 +1150,8 @@ Folder nadrzędny: [folder_path]
 Użytkownik: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Uruchomiono proces przepływu',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Proces',
 'tr_TR' => 'Turecki',
 'tuesday' => 'Wtorek',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 7376cad3e..e481b2db5 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Novo membro',
 'add_multiple_documents' => 'Adicionar vários documentos',
 'add_multiple_files' => 'Add multiple files (will use filename as document name)',
+'add_receipt' => '',
 'add_review' => '',
 'add_subfolder' => 'Criar sub-pasta',
 'add_to_clipboard' => 'Adicionar ao clipboard',
@@ -258,6 +259,7 @@ URL: [url]',
 'discspace' => 'Espaço em Disco',
 'document' => 'Documento',
 'documents' => 'Documentos',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos em Processo',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
 'documents_only' => 'Somente documentos',
@@ -285,6 +287,7 @@ Usuário: [username]',
 'document_duplicate_name' => 'Duplicar nome do documento',
 'document_has_no_workflow' => 'Documento não tem fluxo de trabalho',
 'document_infos' => 'Informações',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Este documento não está travado',
 'document_link_by' => 'Ligado por',
 'document_link_public' => 'Público',
@@ -353,6 +356,7 @@ URL: [url]',
 'edit_folder_notify' => 'Lista de notificação',
 'edit_folder_props' => 'Editar pasta',
 'edit_group' => 'Editar grupo',
+'edit_transmittal_props' => '',
 'edit_user' => 'Editar usuário',
 'edit_user_details' => 'Editar Perfil',
 'email' => 'Email',
@@ -562,6 +566,7 @@ URL: [url]',
 'move_folder' => 'Mover Pasta',
 'my_account' => 'Minha Conta',
 'my_documents' => 'Meus Documentos',
+'my_transmittals' => '',
 'name' => 'Nome',
 'needs_workflow_action' => 'Este documento requer sua atenção. Por favor, verifique a guia de fluxo de trabalho.',
 'never' => '',
@@ -688,6 +693,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'quota_exceeded' => 'Sua cota de disco foi ultrapassada em [bytes].',
 'quota_is_disabled' => 'Suporte a cota está desativado nas configurações. A definição de cota do usuário não terá efeito até que seja habilitada novamente.',
 'quota_warning' => 'Seu uso máximo do disco foi ultrapassado em [bytes]. Por favor, remova documentos ou versões anteriores.',
+'recipients' => '',
 'refresh' => 'Atualizar',
 'rejected' => 'Rejected',
 'released' => 'Released',
@@ -714,6 +720,7 @@ URL: [url]',
 'repairing_objects' => 'Reparando documentos e pastas',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Results Page',
 'return_from_subworkflow' => 'Retorno de sub fluxo de trabalho',
 'return_from_subworkflow_email_body' => 'Retorno de sub fluxo de trabalho
@@ -769,6 +776,7 @@ URL: [url]',
 'rm_folder' => 'Remove pasta',
 'rm_from_clipboard' => 'Remover da área de transferência',
 'rm_group' => 'Remove este grupo',
+'rm_transmittal' => '',
 'rm_user' => 'Remove este usuário',
 'rm_version' => 'Remove versão',
 'rm_workflow' => 'Retire do fluxo de trabalho',
@@ -1117,7 +1125,9 @@ URL: [url]',
 'status_approved' => 'Approved',
 'status_approver_removed' => 'Approver removed from proceá',
 'status_not_approved' => 'Not approved',
+'status_not_receipted' => '',
 'status_not_reviewed' => '',
+'status_recipient_removed' => '',
 'status_reviewed' => '',
 'status_reviewer_rejected' => '',
 'status_reviewer_removed' => '',
@@ -1158,6 +1168,8 @@ Parent pasta: [folder_path]
 User: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Transição de fluxo de trabalho desencadeado',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Fluxo de trabalho',
 'tr_TR' => 'Turco',
 'tuesday' => 'Tuesday',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 411582758..d8deddceb 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Adaugă un membru',
 'add_multiple_documents' => 'Adaugă documente multiple',
 'add_multiple_files' => 'Adaugă fisiere multiple (va folosi numele fișierului ca nume de document)',
+'add_receipt' => '',
 'add_review' => 'Trimite revizuire',
 'add_subfolder' => 'Adaugă subfolder',
 'add_to_clipboard' => 'Adaugă in clipboard',
@@ -258,6 +259,7 @@ URL: [url]',
 'discspace' => 'Spațiu pe disc',
 'document' => 'Document',
 'documents' => 'Documente',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documente în procesare',
 'documents_locked_by_you' => 'Documente blocate de tine',
 'documents_only' => 'Doar documente',
@@ -285,6 +287,7 @@ Utilizator: [username]',
 'document_duplicate_name' => 'Nume document duplicat',
 'document_has_no_workflow' => 'Documentul nu are workflow',
 'document_infos' => 'Informații document',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Acest document nu este blocat',
 'document_link_by' => 'Corelat cu (Linked by)',
 'document_link_public' => 'Public',
@@ -354,6 +357,7 @@ URL: [url]',
 'edit_folder_notify' => 'Listă de notificare pentru folder',
 'edit_folder_props' => 'Editează folder',
 'edit_group' => 'Editează grup',
+'edit_transmittal_props' => '',
 'edit_user' => 'Editează utilizator',
 'edit_user_details' => 'Editează detalii utilizator',
 'email' => 'Email',
@@ -563,6 +567,7 @@ URL: [url]',
 'move_folder' => 'Mută Folder',
 'my_account' => 'Contul Meu',
 'my_documents' => 'Documentele Mele',
+'my_transmittals' => '',
 'name' => 'Nume',
 'needs_workflow_action' => 'Acest document necesită atenția dumneavoastră. Vă rugăm să verificați tab-ul workflow.',
 'never' => 'niciodată',
@@ -690,6 +695,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'quota_exceeded' => 'Spatiul tău alocat pe disc este depășit cu [bytes].',
 'quota_is_disabled' => 'Spatiu alocat este dezactivată în setări. Stabilirea unui spatiu alocat pentru utilizator nu va avea nici un efect până când setarea este reactivată din nou.',
 'quota_warning' => 'Dimensiunea dumneavoastră maximă este depasită cu [bytes]. Vă rugăm să eliminați documente sau versiuni anterioare.',
+'recipients' => '',
 'refresh' => 'Refresh',
 'rejected' => 'Respins',
 'released' => 'Final(Released)',
@@ -716,6 +722,7 @@ URL: [url]',
 'repairing_objects' => 'Reparare documente și foldere.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Pagina rezultate',
 'return_from_subworkflow' => 'Întoarcere din subworkflow',
 'return_from_subworkflow_email_body' => 'Întoarcere din subworkflow
@@ -772,6 +779,7 @@ URL: [url]',
 'rm_folder' => 'Eliminați folder',
 'rm_from_clipboard' => 'Eliminați din clipboard',
 'rm_group' => 'Eliminați acest grup',
+'rm_transmittal' => '',
 'rm_user' => 'Eliminați acest utilizator',
 'rm_version' => 'Eliminați versiune',
 'rm_workflow' => 'Eliminați Workflow',
@@ -1120,7 +1128,9 @@ URL: [url]',
 'status_approved' => 'Aprobat',
 'status_approver_removed' => 'Aprobator eliminat din proces',
 'status_not_approved' => 'Neaprobat',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Nerevizuit',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Revizuit',
 'status_reviewer_rejected' => 'Proiect respins',
 'status_reviewer_removed' => 'Revizuitor eliminat din proces',
@@ -1161,6 +1171,8 @@ Folder parinte: [folder_path]
 Utilizator: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Tranziție Workflow declanșată',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => '',
 'tuesday' => 'Marți',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 1d1ad2104..9162d4a2e 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Добавить члена',
 'add_multiple_documents' => 'Добавить документы',
 'add_multiple_files' => 'Добавить несколько файлов (название файла будет названием документа)',
+'add_receipt' => '',
 'add_review' => 'Рецензировать',
 'add_subfolder' => 'Добавить подкаталог',
 'add_to_clipboard' => 'Добавить в буфер',
@@ -251,6 +252,7 @@ URL: [url]',
 'discspace' => '',
 'document' => 'Документ',
 'documents' => 'док.',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Документы в работе',
 'documents_locked_by_you' => 'Документы, заблокированные вами',
 'documents_only' => 'только документы',
@@ -278,6 +280,7 @@ URL: [url]',
 'document_duplicate_name' => 'Одноимённый документ уже существует.',
 'document_has_no_workflow' => 'Для документа не назначен процесс',
 'document_infos' => 'Информация о документе',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Документ не заблокирован',
 'document_link_by' => 'Связан',
 'document_link_public' => 'Публичный',
@@ -347,6 +350,7 @@ URL: [url]',
 'edit_folder_notify' => 'Список уведомления каталога',
 'edit_folder_props' => 'Изменить каталог',
 'edit_group' => 'Изменить группу',
+'edit_transmittal_props' => '',
 'edit_user' => 'Редактировать пользователя',
 'edit_user_details' => 'Изменить данные пользователя',
 'email' => 'E-mail',
@@ -556,6 +560,7 @@ URL: [url]',
 'move_folder' => 'Переместить каталог',
 'my_account' => 'Моя учётка',
 'my_documents' => 'Мои документы',
+'my_transmittals' => '',
 'name' => 'Имя',
 'needs_workflow_action' => 'Этот документ требует вашего внимания. См. вкладку «Процесс».',
 'never' => '',
@@ -680,6 +685,7 @@ URL: [url]',
 'quota_exceeded' => 'Ваша дисковая квота превышена на [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'Ваша дисковая квота превышена на [bytes]. Удалите ненужные документы или их предыдущие версии.',
+'recipients' => '',
 'refresh' => 'Обновить',
 'rejected' => 'Отклонён',
 'released' => 'Утверждён',
@@ -706,6 +712,7 @@ URL: [url]',
 'repairing_objects' => 'Восстановление каталогов и документов',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Страница результатов',
 'return_from_subworkflow' => 'Выход из подпроцесса',
 'return_from_subworkflow_email_body' => 'Выход из подпроцесса
@@ -762,6 +769,7 @@ URL: [url]',
 'rm_folder' => 'Удалить каталог',
 'rm_from_clipboard' => 'Удалить из буфера обмена',
 'rm_group' => 'Удалить группу',
+'rm_transmittal' => '',
 'rm_user' => 'Удалить пользователя',
 'rm_version' => 'Удалить версию',
 'rm_workflow' => 'Удалить процесс',
@@ -1110,7 +1118,9 @@ URL: [url]',
 'status_approved' => 'Утверждён',
 'status_approver_removed' => 'Утверждающий удалён из процесса',
 'status_not_approved' => 'Не утверждён',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Не рецензирован',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Рецензирован',
 'status_reviewer_rejected' => 'Черновик отклонён',
 'status_reviewer_removed' => 'Рецензирующий удалён из процесса',
@@ -1151,6 +1161,8 @@ URL: [url]',
 Пользователь: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: изменено состояние процесса для «[name]»',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Процесс',
 'tr_TR' => 'Турецкий',
 'tuesday' => 'Вторник',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 9a4449963..a36b59de3 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -55,6 +55,7 @@ $text = array(
 'add_member' => 'Pridať člena',
 'add_multiple_documents' => 'Pridaj viac dokumentov',
 'add_multiple_files' => 'Pridať viacero súborov (názov súboru sa použije ako názov dokumentu)',
+'add_receipt' => '',
 'add_review' => 'Poslať kontrolu',
 'add_subfolder' => 'Pridať podzložku',
 'add_to_clipboard' => 'Pridaj do schránky',
@@ -236,6 +237,7 @@ $text = array(
 'discspace' => '',
 'document' => 'Dokument',
 'documents' => 'Dokumenty',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokumenty v spracovaní',
 'documents_locked_by_you' => 'Vami uzamknuté dokumenty',
 'documents_only' => '',
@@ -254,6 +256,7 @@ $text = array(
 'document_duplicate_name' => '',
 'document_has_no_workflow' => '',
 'document_infos' => 'Informácie o dokumente',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Tento dokument nie je zamknutý',
 'document_link_by' => 'Odkazuje sem',
 'document_link_public' => 'Verejný',
@@ -302,6 +305,7 @@ $text = array(
 'edit_folder_notify' => 'Zoznam upozornení',
 'edit_folder_props' => 'Uprav priečinok',
 'edit_group' => 'Upraviť skupinu',
+'edit_transmittal_props' => '',
 'edit_user' => 'Upraviť používateľa',
 'edit_user_details' => 'Upraviť podrobnosti používateľa',
 'email' => 'Email',
@@ -487,6 +491,7 @@ $text = array(
 'move_folder' => 'Presunúť zložku',
 'my_account' => 'Môj účet',
 'my_documents' => 'Moje dokumenty',
+'my_transmittals' => '',
 'name' => 'Meno',
 'needs_workflow_action' => '',
 'never' => '',
@@ -576,6 +581,7 @@ $text = array(
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
 'quota_warning' => '',
+'recipients' => '',
 'refresh' => '',
 'rejected' => 'Odmietnuté',
 'released' => 'Vydané',
@@ -593,6 +599,7 @@ $text = array(
 'repairing_objects' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Výsledky',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
@@ -629,6 +636,7 @@ $text = array(
 'rm_folder' => 'Odstrániť zložku',
 'rm_from_clipboard' => '',
 'rm_group' => 'Odstrániť túto skupinu',
+'rm_transmittal' => '',
 'rm_user' => 'Odstrániť tohto používateľa',
 'rm_version' => 'Odstrániť verziu',
 'rm_workflow' => '',
@@ -970,7 +978,9 @@ $text = array(
 'status_approved' => 'Schválený',
 'status_approver_removed' => 'Schvaľovateľ odstránený z procesu',
 'status_not_approved' => 'Neschválený',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Neskontrolovaný',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Skontrolovaný',
 'status_reviewer_rejected' => 'Návrh zamietnutý',
 'status_reviewer_removed' => 'Kontrolór odstránený z procesu',
@@ -1002,6 +1012,8 @@ $text = array(
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => '',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Utorok',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 4ff21500d..fcdcfcfbd 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1086), tmichelfelder (106)
+//    Translators: Admin (1089), tmichelfelder (106)
 
 $text = array(
 'accept' => 'Godkänn',
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => 'Lägg till användare',
 'add_multiple_documents' => 'Lägg till flera dokument',
 'add_multiple_files' => 'Lägg till flera dokument (använder filnamnet som dokumentnamn)',
+'add_receipt' => '',
 'add_review' => 'Skicka granskning',
 'add_subfolder' => 'Lägg till katalog',
 'add_to_clipboard' => 'Flytta till Urklipp',
@@ -154,7 +155,7 @@ URL: [url]',
 'backup_remove' => 'Ta bort backup-fil',
 'backup_tools' => 'Backup-verktyg',
 'between' => 'mellan',
-'bg_BG' => '',
+'bg_BG' => 'Bulgariska',
 'browse' => 'Bläddra',
 'calendar' => 'Kalender',
 'calendar_week' => 'Kalender vecka',
@@ -251,6 +252,7 @@ URL: [url]',
 'discspace' => '',
 'document' => 'Dokument',
 'documents' => 'Dokument',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokument i bearbetning',
 'documents_locked_by_you' => 'Dokument som du har låst',
 'documents_only' => 'Bara dokument',
@@ -278,6 +280,7 @@ Användare: [username]',
 'document_duplicate_name' => 'Dubbelt dokumentnamn',
 'document_has_no_workflow' => 'Dokumentet har inget arbetsflöde',
 'document_infos' => 'Dokumentinformation',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Detta dokument är inte låst',
 'document_link_by' => 'Länkat av',
 'document_link_public' => 'Offentlig länk',
@@ -347,6 +350,7 @@ URL: [url]',
 'edit_folder_notify' => 'Katalog-meddelandelista',
 'edit_folder_props' => 'Ändra katalog',
 'edit_group' => 'Ändra grupp',
+'edit_transmittal_props' => '',
 'edit_user' => 'Ändra användare',
 'edit_user_details' => 'Ändra användarens information',
 'email' => 'E-post',
@@ -556,6 +560,7 @@ URL: [url]',
 'move_folder' => 'Flytta katalog',
 'my_account' => 'Min Sida',
 'my_documents' => 'Mina dokument',
+'my_transmittals' => '',
 'name' => 'Namn',
 'needs_workflow_action' => 'Detta dokument behöver din uppmärksamhet. Kolla arbetsflödet.',
 'never' => '',
@@ -675,6 +680,7 @@ URL: [url]',
 'quota_exceeded' => 'Din minneskvot har överskridits med [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'Din maximala minneskvot har överskridits med [bytes]. Ta bort dokument eller tidigare versioner.',
+'recipients' => '',
 'refresh' => 'Uppdatera',
 'rejected' => 'Avvisat',
 'released' => 'Klart för användning',
@@ -701,6 +707,7 @@ URL: [url]',
 'repairing_objects' => 'Förbereder dokument och kataloger.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Resultatsida',
 'return_from_subworkflow' => 'Tillbaka från under-arbetsflöde',
 'return_from_subworkflow_email_body' => 'Tillbaka från underliggande arbetsflöde
@@ -757,6 +764,7 @@ URL: [url]',
 'rm_folder' => 'Ta bort katalog',
 'rm_from_clipboard' => 'Ta bort från Urklipp',
 'rm_group' => 'Ta bort denna grupp',
+'rm_transmittal' => '',
 'rm_user' => 'Ta bort denna användare',
 'rm_version' => 'Ta bort version',
 'rm_workflow' => 'Ta bort arbetsflöde',
@@ -767,7 +775,7 @@ URL: [url]',
 'role_admin' => 'Administratör',
 'role_guest' => 'Gäst',
 'role_user' => 'Användare',
-'ro_RO' => '',
+'ro_RO' => 'Rumänska',
 'run_subworkflow' => 'Utför under-arbetsflöde',
 'run_subworkflow_email_body' => 'Under-arbetsflöde utförs
 Dokument: [name]
@@ -1105,7 +1113,9 @@ URL: [url]',
 'status_approved' => 'Godkänt',
 'status_approver_removed' => 'Person som godkänner har tagits bort från processen',
 'status_not_approved' => 'Ej godkänt',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Ej granskat',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Granskat',
 'status_reviewer_rejected' => 'Utkast avvisat',
 'status_reviewer_removed' => 'Person som granskar har tagits bort från processen',
@@ -1146,8 +1156,10 @@ Aktuell status: [current_state]
 Användare: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Arbetsflödesövergång utlöstes',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'Arbetsflöde',
-'tr_TR' => '',
+'tr_TR' => 'Turkiska',
 'tuesday' => 'tisdag',
 'tuesday_abbr' => 'ti',
 'type_to_search' => 'Skriv för att söka',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index cca409e17..36b64ef5c 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -58,6 +58,7 @@ URL: [url]',
 'add_member' => 'Yeni üye ekle',
 'add_multiple_documents' => 'Çoklu doküman ekleme',
 'add_multiple_files' => 'Çoklu dosya ekle (dosya adı dokümanın adı olarak kullanılacak)',
+'add_receipt' => '',
 'add_review' => 'Kabul et',
 'add_subfolder' => 'Alt klasör ekle',
 'add_to_clipboard' => 'Panoya ekle',
@@ -257,6 +258,7 @@ URL: [url]',
 'discspace' => 'Disk alanı',
 'document' => 'Doküman',
 'documents' => 'Dokümanlar',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => 'İşlemdeki Dokümanlar',
 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
 'documents_only' => 'Sadece dokümanlar',
@@ -284,6 +286,7 @@ Kullanıcı: [username]',
 'document_duplicate_name' => 'Mükerrer doküman ismi',
 'document_has_no_workflow' => 'Dokümanın iş akışı yok',
 'document_infos' => 'Doküman Bilgisi',
+'document_is_checked_out' => '',
 'document_is_not_locked' => 'Bu doküman kilitli değil',
 'document_link_by' => 'Link veren',
 'document_link_public' => 'Genel',
@@ -353,6 +356,7 @@ URL: [url]',
 'edit_folder_notify' => 'Klasör Bildirim Listesi',
 'edit_folder_props' => 'Klasörü düzenle',
 'edit_group' => 'Grubu düzenle',
+'edit_transmittal_props' => '',
 'edit_user' => 'Kullanıcıyı düzenle',
 'edit_user_details' => 'Kullanıcı Detaylarını Düzenle',
 'email' => 'E-posta',
@@ -562,6 +566,7 @@ URL: [url]',
 'move_folder' => 'Klasörü Taşı',
 'my_account' => 'Hesabım',
 'my_documents' => 'Dokümanlarım',
+'my_transmittals' => '',
 'name' => 'İsim',
 'needs_workflow_action' => 'Bu doküman dikkatinizi gerektiriyor. Lütfen iş akış sekmesini kontrol ediniz.',
 'never' => 'asla',
@@ -691,6 +696,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'quota_exceeded' => 'Size ayrılan disk kotası [bytes] aşıldı.',
 'quota_is_disabled' => 'Kota desteği ayarlardan kapatılmış durumda. Açılana kadar kullanıcıya kota tanımlamanın bir etkisi olmaz.',
 'quota_warning' => 'Size ayrılan disk kotası [bytes] aşıldı. Lütfen gereksiz olduğunu düşündüğünüz dokümanları veya eski versiyonları silin.',
+'recipients' => '',
 'refresh' => 'Yenile',
 'rejected' => 'Reddedildi',
 'released' => 'Yayınlandı',
@@ -717,6 +723,7 @@ URL: [url]',
 'repairing_objects' => 'Doküman ve klasörler onarılıyor.',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => 'Sonuç Sayfası',
 'return_from_subworkflow' => 'Alt iş akış dönüşü',
 'return_from_subworkflow_email_body' => 'Alt iş akış dönüşü
@@ -773,6 +780,7 @@ URL: [url]',
 'rm_folder' => 'Klasörü sil',
 'rm_from_clipboard' => 'Panodan sil',
 'rm_group' => 'Bu grubu sil',
+'rm_transmittal' => '',
 'rm_user' => 'Bu kullanıcıyı sil',
 'rm_version' => 'Versiyonu sil',
 'rm_workflow' => 'İş akışını sil',
@@ -1121,7 +1129,9 @@ URL: [url]',
 'status_approved' => 'Onaylandı',
 'status_approver_removed' => 'Onaylayan süreci sildi',
 'status_not_approved' => 'Onaylanmadı',
+'status_not_receipted' => '',
 'status_not_reviewed' => 'Kontrol edilmedi',
+'status_recipient_removed' => '',
 'status_reviewed' => 'Kontrol edildi',
 'status_reviewer_rejected' => 'Taslak reddedildi',
 'status_reviewer_removed' => 'Kontrol eden süreci sildi',
@@ -1162,6 +1172,8 @@ Mevcut durum: [current_state]
 Kullanıcı: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - İş Akış Geçişi Tetiklendi',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => 'İş Akışı',
 'tr_TR' => 'Türkçe',
 'tuesday' => 'Salı',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index c4a5357e8..1a7514ba9 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => '添加成员',
 'add_multiple_documents' => '添加多个文件',
 'add_multiple_files' => '批量添加文档(文档名无法手动修改)',
+'add_receipt' => '',
 'add_review' => '提交校对',
 'add_subfolder' => '添加子文件夹',
 'add_to_clipboard' => '复制',
@@ -242,6 +243,7 @@ URL: [url]',
 'discspace' => '',
 'document' => '文档',
 'documents' => '文档',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => '待处理文档',
 'documents_locked_by_you' => '被您锁定的文档',
 'documents_only' => '指定文件',
@@ -260,6 +262,7 @@ URL: [url]',
 'document_duplicate_name' => '',
 'document_has_no_workflow' => '',
 'document_infos' => '文档信息',
+'document_is_checked_out' => '',
 'document_is_not_locked' => '该文档没有被锁定',
 'document_link_by' => '链接',
 'document_link_public' => '公开',
@@ -308,6 +311,7 @@ URL: [url]',
 'edit_folder_notify' => '文件夹通知列表',
 'edit_folder_props' => '编辑文件夹',
 'edit_group' => '编辑组别',
+'edit_transmittal_props' => '',
 'edit_user' => '编辑用户',
 'edit_user_details' => '编辑用户详情',
 'email' => 'Email',
@@ -493,6 +497,7 @@ URL: [url]',
 'move_folder' => '移动文件夹',
 'my_account' => '我的账户',
 'my_documents' => '我的文档',
+'my_transmittals' => '',
 'name' => '名称',
 'needs_workflow_action' => '',
 'never' => '',
@@ -582,6 +587,7 @@ URL: [url]',
 'quota_exceeded' => '',
 'quota_is_disabled' => '配额的支持',
 'quota_warning' => '',
+'recipients' => '',
 'refresh' => '',
 'rejected' => '拒绝',
 'released' => '发布',
@@ -599,6 +605,7 @@ URL: [url]',
 'repairing_objects' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => '结果页面',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
@@ -635,6 +642,7 @@ URL: [url]',
 'rm_folder' => '删除文件夹',
 'rm_from_clipboard' => '',
 'rm_group' => '删除该组',
+'rm_transmittal' => '',
 'rm_user' => '删除该用户',
 'rm_version' => '删除该版本',
 'rm_workflow' => '',
@@ -976,7 +984,9 @@ URL: [url]',
 'status_approved' => '批准',
 'status_approver_removed' => '从审核队列中删除',
 'status_not_approved' => '未批准',
+'status_not_receipted' => '',
 'status_not_reviewed' => '未校对',
+'status_recipient_removed' => '',
 'status_reviewed' => '通过',
 'status_reviewer_rejected' => '拟拒绝',
 'status_reviewer_removed' => '从校对队列中删除',
@@ -1008,6 +1018,8 @@ URL: [url]',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => '',
 'tr_TR' => '土耳其',
 'tuesday' => 'Tuesday',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 1781a955f..9d214e617 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -59,6 +59,7 @@ URL: [url]',
 'add_member' => '添加成員',
 'add_multiple_documents' => '添加多個檔',
 'add_multiple_files' => '批量添加文檔(文檔名無法手動修改)',
+'add_receipt' => '',
 'add_review' => '提交校對',
 'add_subfolder' => '添加子資料夾',
 'add_to_clipboard' => '複製',
@@ -240,6 +241,7 @@ URL: [url]',
 'discspace' => '',
 'document' => '文檔',
 'documents' => '文檔',
+'documents_checked_out_by_you' => '',
 'documents_in_process' => '待處理文檔',
 'documents_locked_by_you' => '被您鎖定的文檔',
 'documents_only' => '指定檔',
@@ -258,6 +260,7 @@ URL: [url]',
 'document_duplicate_name' => '',
 'document_has_no_workflow' => '',
 'document_infos' => '文檔信息',
+'document_is_checked_out' => '',
 'document_is_not_locked' => '該文檔沒有被鎖定',
 'document_link_by' => '連結',
 'document_link_public' => '公開',
@@ -306,6 +309,7 @@ URL: [url]',
 'edit_folder_notify' => '資料夾通知列表',
 'edit_folder_props' => '編輯資料夾',
 'edit_group' => '編輯組別',
+'edit_transmittal_props' => '',
 'edit_user' => '編輯用戶',
 'edit_user_details' => '編輯用戶詳情',
 'email' => 'Email',
@@ -491,6 +495,7 @@ URL: [url]',
 'move_folder' => '移動資料夾',
 'my_account' => '我的帳戶',
 'my_documents' => '我的文件',
+'my_transmittals' => '',
 'name' => '名稱',
 'needs_workflow_action' => '',
 'never' => '',
@@ -580,6 +585,7 @@ URL: [url]',
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
 'quota_warning' => '',
+'recipients' => '',
 'refresh' => '',
 'rejected' => '拒絕',
 'released' => '發佈',
@@ -597,6 +603,7 @@ URL: [url]',
 'repairing_objects' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
+'reset_checkout' => '',
 'results_page' => '結果頁面',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
@@ -633,6 +640,7 @@ URL: [url]',
 'rm_folder' => '刪除資料夾',
 'rm_from_clipboard' => '',
 'rm_group' => '刪除該組',
+'rm_transmittal' => '',
 'rm_user' => '刪除該用戶',
 'rm_version' => '刪除該版本',
 'rm_workflow' => '',
@@ -974,7 +982,9 @@ URL: [url]',
 'status_approved' => '批准',
 'status_approver_removed' => '從審核佇列中刪除',
 'status_not_approved' => '未批准',
+'status_not_receipted' => '',
 'status_not_reviewed' => '未校對',
+'status_recipient_removed' => '',
 'status_reviewed' => '通過',
 'status_reviewer_rejected' => '擬拒絕',
 'status_reviewer_removed' => '從校對佇列中刪除',
@@ -1006,6 +1016,8 @@ URL: [url]',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal_comment' => '',
+'transmittal_name' => '',
 'trigger_workflow' => '',
 'tr_TR' => '',
 'tuesday' => 'Tuesday',

From eefc3463125fd7bb915af63531a20bc61c39bbf9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Apr 2015 20:08:10 +0200
Subject: [PATCH 0062/2006] include correct files in right direction

---
 op/op.ApproveDocument.php | 3 ++-
 op/op.ReviewDocument.php  | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 6d5c0adc1..74587764f 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -20,14 +20,15 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('approvedocument')) {
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 5e6a2ef31..c7a93cb4b 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -19,14 +19,15 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
-include("../inc/inc.ClassEmail.php");
 include("../inc/inc.Language.php");
-include("../inc/inc.DBInit.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
-include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassEmail.php");
+include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('reviewdocument')) {

From 47d97e77d8ca963bed83057c0c674e18c76afee7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 30 Apr 2015 07:09:21 +0200
Subject: [PATCH 0063/2006] add files for transmittal management and receptions

---
 op/op.AddTransmittal.php                    |  50 +++++
 op/op.ReceiptDocument.php                   |  97 ++++++++++
 op/op.TransmittalMgr.php                    | 125 ++++++++++++
 out/out.AddTransmittal.php                  |  38 ++++
 out/out.ReceiptDocument.php                 |  82 ++++++++
 out/out.RemoveTransmittal.php               |  49 +++++
 out/out.TransmittalMgr.php                  |  51 +++++
 views/bootstrap/class.AddTransmittal.php    |  95 ++++++++++
 views/bootstrap/class.ReceiptDocument.php   | 198 ++++++++++++++++++++
 views/bootstrap/class.RemoveTransmittal.php |  63 +++++++
 views/bootstrap/class.TransmittalMgr.php    | 163 ++++++++++++++++
 11 files changed, 1011 insertions(+)
 create mode 100644 op/op.AddTransmittal.php
 create mode 100644 op/op.ReceiptDocument.php
 create mode 100644 op/op.TransmittalMgr.php
 create mode 100644 out/out.AddTransmittal.php
 create mode 100644 out/out.ReceiptDocument.php
 create mode 100644 out/out.RemoveTransmittal.php
 create mode 100644 out/out.TransmittalMgr.php
 create mode 100644 views/bootstrap/class.AddTransmittal.php
 create mode 100644 views/bootstrap/class.ReceiptDocument.php
 create mode 100644 views/bootstrap/class.RemoveTransmittal.php
 create mode 100644 views/bootstrap/class.TransmittalMgr.php

diff --git a/op/op.AddTransmittal.php b/op/op.AddTransmittal.php
new file mode 100644
index 000000000..80a5fbcb4
--- /dev/null
+++ b/op/op.AddTransmittal.php
@@ -0,0 +1,50 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassEmail.php");
+include("../inc/inc.Authentication.php");
+
+/* Check if the form data comes for a trusted request */
+if(!checkFormKey('addtransmittal')) {
+	UI::exitError(getMLText("my_documents"), getMLText("invalid_request_token"));
+}
+
+$name = $_POST["name"];
+$comment = $_POST["comment"];
+
+$transmittal = $dms->addTransmittal($name, $comment, $user);
+
+if (!is_object($transmittal)) {
+	UI::exitError(getMLText("my_document"), getMLText("error_occured"));
+}
+
+add_log_line("?name=".$name);
+
+header("Location:../out/out.MyDocuments.php");
+
+?>
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
new file mode 100644
index 000000000..7b408bf94
--- /dev/null
+++ b/op/op.ReceiptDocument.php
@@ -0,0 +1,97 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.ClassEmail.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
+
+/* Check if the form data comes for a trusted request */
+if(!checkFormKey('receiptdocument')) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
+}
+
+if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$documentid = $_POST["documentid"];
+$document = $dms->getDocument($documentid);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_READ) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
+if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+$version = $_POST["version"];
+$content = $document->getContentByVersion($version);
+
+if (!is_object($content)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+// operation is only allowed for the last document version
+$latestContent = $document->getLatestContent();
+if ($latestContent->getVersion()!=$version) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+// verify if document has expired
+if ($document->hasExpired()){
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
+if (!isset($_POST["receiptStatus"]) || !is_numeric($_POST["receiptStatus"]) ||
+		(intval($_POST["receiptStatus"])!=1 && intval($_POST["receiptStatus"])!=-1)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_receipt_status"));
+}
+
+if ($_POST["receiptType"] == "ind") {
+
+	$comment = $_POST["comment"];
+	$receiptLogID = $latestContent->setReceiptByInd($user, $user, $_POST["receiptStatus"], $comment);
+	if(0 > $receiptLogID) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("receipt_update_failed"));
+	}
+} elseif ($_POST["receiptType"] == "grp") {
+	$comment = $_POST["comment"];
+	$group = $dms->getGroup($_POST['receiptGroup']);
+	$receiptLogID = $latestContent->setReceiptByGrp($group, $user, $_POST["receiptStatus"], $comment);
+	if(0 > $receiptLogID) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("receipt_update_failed"));
+	}
+}
+
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+
+?>
diff --git a/op/op.TransmittalMgr.php b/op/op.TransmittalMgr.php
new file mode 100644
index 000000000..df75bf097
--- /dev/null
+++ b/op/op.TransmittalMgr.php
@@ -0,0 +1,125 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2012 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassPasswordStrength.php");
+
+if ($user->isGuest()) {
+	UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));
+}
+
+if (isset($_POST["action"])) $action=$_POST["action"];
+else $action=NULL;
+
+// add new transmittal ---------------------------------------------------
+if ($action == "addtransmittal") {
+	
+	/* Check if the form data comes for a trusted request */
+	if(!checkFormKey('addtransmittal')) {
+		UI::exitError(getMLText("my_transmittals"),getMLText("invalid_request_token"));
+	}
+
+	$name    = $_POST["name"];
+	$comment = $_POST["comment"];
+
+	$newTransmittal = $dms->addTransmittal($name, $comment, $user);
+	if ($newTransmittal) {
+	}
+	else UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));
+	
+	$transmittalid=$newTransmittal->getID();
+	
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_transmittal')));
+
+	add_log_line(".php&action=addtransmittal&name=".$name);
+}
+
+// delete user ------------------------------------------------------------
+else if ($action == "removetransmittal") {
+
+	/* Check if the form data comes for a trusted request */
+	if(!checkFormKey('removetransmittal')) {
+		UI::exitError(getMLText("my_transmittals"),getMLText("invalid_request_token"));
+	}
+
+	if (isset($_POST["transmittalid"])) {
+		$transmittalid = $_POST["transmittalid"];
+	}
+
+	if (!isset($transmittalid) || !is_numeric($transmittalid) || intval($transmittalid)<1) {
+		UI::exitError(getMLText("my_transmittals"),getMLText("invalid_transmittal_id"));
+	}
+
+	$transmittalToRemove = $dms->getUser($transmittalid);
+	if (!is_object($transmittalToRemove)) {
+		UI::exitError(getMLText("my_transmittals"),getMLText("invalid_transmittal_id"));
+	}
+
+	add_log_line(".php&action=removetransmittal&transmittalid=".$transmittalid);
+	
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_transmittal')));
+	$transmittalid=-1;
+}
+
+// modify transmittal ----------------------------------------------------
+else if ($action == "edittransmittal") {
+
+	/* Check if the form data comes for a trusted request */
+	if(!checkFormKey('edittransmittal')) {
+		UI::exitError(getMLText("my_transmittals"),getMLText("invalid_request_token"));
+	}
+
+	if (!isset($_POST["transmittalid"]) || !is_numeric($_POST["transmittalid"]) || intval($_POST["transmittalid"])<1) {
+		UI::exitError(getMLText("my_transmittals"),getMLText("invalid_transmittal"));
+	}
+	
+	$transmittalid=$_POST["transmittalid"];
+	$editedTransmittal = $dms->getTransmittal($transmittalid);
+	
+	if (!is_object($editedTransmittal)) {
+		UI::exitError(getMLText("my_transmittals"),getMLText("invalid_transmittal"));
+	}
+
+	$name = $_POST["name"];
+	$comment = $_POST["comment"];
+	
+	if ($editedTransmittal->getName() != $name)
+		$editedTransmittal->setName($name);
+	if ($editedTransmittal->getComment() != $comment)
+		$editedTransmittal->setComment($comment);
+
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_transmittal')));
+	add_log_line(".php&action=edittransmittal&transmittalid=".$transmittalid);
+}
+else UI::exitError(getMLText("my_transmittals"),getMLText("unknown_command"));
+
+header("Location:../out/out.TransmittalMgr.php?transmittalid=".$transmittalid);
+
+?>
+
diff --git a/out/out.AddTransmittal.php b/out/out.AddTransmittal.php
new file mode 100644
index 000000000..28734b525
--- /dev/null
+++ b/out/out.AddTransmittal.php
@@ -0,0 +1,38 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2012 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'strictformcheck'=>$settings->_strictFormCheck));
+if($view) {
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php
new file mode 100644
index 000000000..c115b4eac
--- /dev/null
+++ b/out/out.ReceiptDocument.php
@@ -0,0 +1,82 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$document = $dms->getDocument(intval($_GET["documentid"]));
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$folder = $document->getFolder();
+
+if ($document->getAccessMode($user) < M_READ) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+$version = $_GET["version"];
+$content = $document->getContentByVersion($version);
+if (!is_object($content)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+
+// operation is admitted only for last deocument version
+$latestContent = $document->getLatestContent();
+if ($latestContent->getVersion()!=$version) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+// verify if document has expired
+if ($document->hasExpired()){
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+$receipts = $content->getReceiptStatus();
+if(!$receipts) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_action"));
+}
+
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
+if($view) {
+	$view->setParam('accessobject', $accessop);
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/out/out.RemoveTransmittal.php b/out/out.RemoveTransmittal.php
new file mode 100644
index 000000000..233da7d7d
--- /dev/null
+++ b/out/out.RemoveTransmittal.php
@@ -0,0 +1,49 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010-2012 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if ($user->isGuest()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+if (!isset($_GET["transmittalid"]) || !is_numeric($_GET["transmittalid"]) || intval($_GET["transmittalid"])<1) {
+	UI::exitError(getMLText("rm_transmittal"),getMLText("invalid_transmittal_id"));
+}
+
+$rmtransmittal = $dms->getTransmittal(intval($_GET["transmittalid"]));
+if (!is_object($rmtransmittal)) {
+	UI::exitError(getMLText("rm_transmittal"),getMLText("invalid_transmittal_id"));
+}
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'rmtransmittal'=>$rmtransmittal));
+if($view) {
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
new file mode 100644
index 000000000..ea7265ccd
--- /dev/null
+++ b/out/out.TransmittalMgr.php
@@ -0,0 +1,51 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+if ($user->isGuest()) {
+	UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));
+}
+
+if(isset($_GET['transmittalid']) && $_GET['transmittalid']) {
+	$seltransmittal = $dms->getTransmittal($_GET['transmittalid']);
+} else {
+	$seltransmittal = null;
+}
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seltransmittal'=>$seltransmittal,  'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+if($view) {
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.AddTransmittal.php b/views/bootstrap/class.AddTransmittal.php
new file mode 100644
index 000000000..a7dda67d0
--- /dev/null
+++ b/views/bootstrap/class.AddTransmittal.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Implementation of AddTransmittal view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for AddTransmittal view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_AddTransmittal extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$strictformcheck = $this->params['strictformcheck'];
+
+		$this->htmlStartPage(getMLText("my_documents"));
+		$this->globalNavigation($folder);
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_documents"), "my_documents");
+		$this->contentHeading(getMLText("add_transmittal"));
+		$this->contentContainerStart();
+?>
+<script language="JavaScript">
+function checkForm()
+{
+	msg = new Array();
+	if (document.form1.name.value == "") msg.push("<?php printMLText("js_no_name");?>");
+<?php
+	if ($strictformcheck) {
+?>
+	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+<?php
+	}
+?>
+	if (msg != "") {
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+</script>
+
+<form action="../op/op.AddTransmittal.php" name="form1" onsubmit="return checkForm();" method="post">
+	<?php echo createHiddenFieldWithKey('addtransmittal'); ?>
+	<table class="table-condensed">
+		<tr>
+			<td class="inputDescription"><?php printMLText("name");?>:</td>
+			<td><input type="text" name="name" size="60"></td>
+		</tr>
+		<tr>
+			<td class="inputDescription"><?php printMLText("comment");?>:</td>
+			<td><textarea name="comment" rows="4" cols="80"></textarea></td>
+		</tr>
+		<tr>
+			<td></td><td><input type="submit" class="btn" value="<?php printMLText("add_transmittal");?>"></td>
+		</tr>
+	</table>
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>
diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
new file mode 100644
index 000000000..6544f2054
--- /dev/null
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Implementation of ReceiptDocument view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for ReceiptDocument view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_ReceiptDocument extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$document = $this->params['document'];
+		$content = $this->params['version'];
+
+		$receipts = $content->getReceiptStatus();
+		foreach($receipts as $receipt) {
+			if($receipt['receiptID'] == $_GET['receiptid']) {
+				$receiptStatus = $receipt;
+				break;
+			}
+		}
+
+		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
+		$this->globalNavigation($folder);
+		$this->contentStart();
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
+		$this->contentHeading(getMLText("submit_receipt"));
+?>
+<script language="JavaScript">
+function checkIndForm()
+{
+	msg = new Array();
+	if (document.form1.receiptStatus.value == "") msg.push("<?php printMLText("js_no_receipt_status");?>");
+	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+	if (msg != "") {
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+function checkGrpForm()
+{
+	msg = "";
+	if (document.form1.receiptGroup.value == "") msg += "<?php printMLText("js_no_receipt_group");?>\n";
+	if (document.form1.receiptStatus.value == "") msg += "<?php printMLText("js_no_receipt_status");?>\n";
+	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
+	if (msg != "")
+	{
+		alert(msg);
+		return false;
+	}
+	else
+		return true;
+}
+</script>
+
+<?php
+		$this->contentContainerStart();
+
+		// Display the Receipt form.
+		if ($receiptStatus['type'] == 0) {
+			if($receiptStatus["status"]!=0) {
+
+				print "<table class=\"folderView\"><thead><tr>";
+				print "<th>".getMLText("status")."</th>";
+				print "<th>".getMLText("comment")."</th>";
+				print "<th>".getMLText("last_update")."</th>";
+				print "</tr></thead><tbody><tr>";
+				print "<td>";
+				printReceiptStatusText($receiptStatus["status"]);
+				print "</td>";
+				print "<td>".htmlspecialchars($receiptStatus["comment"])."</td>";
+				$indUser = $dms->getUser($receiptStatus["userID"]);
+				print "<td>".$receiptStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
+				print "</tr></tbody></table><br>";
+			}
+?>
+	<form method="post" action="../op/op.ReceiptDocument.php" name="form1" onsubmit="return checkIndForm();">
+	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
+	<table class="table-condensed">
+		<tr>
+			<td><?php printMLText("comment")?>:</td>
+			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
+		</tr>
+		<tr>
+			<td><?php printMLText("receipt_status")?></td>
+			<td>
+				<select name="receiptStatus">
+<?php if($receiptStatus['status'] != 1) { ?>
+					<option value='1'><?php printMLText("status_receipted")?></option>
+<?php } ?>
+<?php if($receiptStatus['status'] != -1) { ?>
+					<option value='-1'><?php printMLText("rejected")?></option>
+<?php } ?>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td><input type='submit' class="btn" name='indReceipt' value='<?php printMLText("submit_receipt")?>'/></td>
+		</tr>
+	</table>
+	<input type='hidden' name='receiptType' value='ind'/>
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+	</form>
+<?php
+		}
+		else if ($receiptStatus['type'] == 1) {
+
+			if($receiptStatus["status"]!=0) {
+
+				print "<table class=\"folderView\"><thead><tr>";
+				print "<th>".getMLText("status")."</th>";
+				print "<th>".getMLText("comment")."</th>";
+				print "<th>".getMLText("last_update")."</th>";
+				print "</tr></thead><tbody><tr>";
+				print "<td>";
+				printReceiptStatusText($receiptStatus["status"]);
+				print "</td>";
+				print "<td>".htmlspecialchars($receiptStatus["comment"])."</td>";
+				$indUser = $dms->getUser($receiptStatus["userID"]);
+				print "<td>".$receiptStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
+				print "</tr></tbody></table><br>\n";
+			}
+
+?>
+	<form method="post" action="../op/op.ReceiptDocument.php" name="form1" onsubmit="return checkGrpForm();">
+	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
+	<table class="table-condensed">
+		<tr>
+			<td><?php printMLText("comment")?>:</td>
+			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
+		</tr>
+		<tr>
+			<td><?php printMLText("receipt_status")?>:</td>
+			<td>
+				<select name="receiptStatus">
+<?php if($receiptStatus['status'] != 1) { ?>
+					<option value='1'><?php printMLText("status_receipted")?></option>
+<?php } ?>
+<?php if($receiptStatus['status'] != -1) { ?>
+					<option value='-1'><?php printMLText("rejected")?></option>
+<?php } ?>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td><input type='submit' class="btn" name='groupReceipt' value='<?php printMLText("submit_receipt")?>'/></td>
+		</tr>
+	</table>
+	<input type='hidden' name='receiptType' value='grp'/>
+	<input type='hidden' name='receiptGroup' value='<?php echo $receiptStatus['required']; ?>'/>
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+	</form>
+<?php
+		}
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>
diff --git a/views/bootstrap/class.RemoveTransmittal.php b/views/bootstrap/class.RemoveTransmittal.php
new file mode 100644
index 000000000..d9ad09adf
--- /dev/null
+++ b/views/bootstrap/class.RemoveTransmittal.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Implementation of RemoveTransmittal view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for RemoveTransmittal view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_RemoveTransmittal extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$rmtransmittal = $this->params['rmtransmittal'];
+
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+		$this->contentHeading(getMLText("rm_transmittal"));
+		$this->contentContainerStart();
+
+?>
+<form action="../op/op.UsrMgr.php" name="form1" method="post">
+<input type="hidden" name="transmittalid" value="<?php print $rmtransmittal->getID();?>">
+<input type="hidden" name="action" value="removetransmittal">
+<?php echo createHiddenFieldWithKey('removetransmittal'); ?>
+<p>
+<?php printMLText("confirm_rm_transmittal", array ("name" => htmlspecialchars($rmtransmittal->getName())));?>
+</p>
+
+<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_transmittal");?></button></p>
+
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
new file mode 100644
index 000000000..7e7c5d349
--- /dev/null
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Implementation of TransmittalMgr view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for TransmittalMgr view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
+
+	function showTransmittalForm($transmittal) { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+?>
+	<form action="../op/op.TransmittalMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $transmittal ? $transmittal->getID() : '0';?>" onsubmit="return checkForm('<?php print $transmittal ? $transmittal->getID() : '0';?>');">
+<?php
+		if($transmittal) {
+			echo createHiddenFieldWithKey('edittransmittal');
+?>
+	<input type="hidden" name="transmittalid" value="<?php print $transmittal->getID();?>">
+	<input type="hidden" name="action" value="edittransmittal">
+<?php
+		} else {
+			echo createHiddenFieldWithKey('addtransmittal');
+?>
+	<input type="hidden" name="action" value="addtransmittal">
+<?php
+		}
+?>
+	<table class="table-condensed">
+<?php
+	if($transmittal) {
+?>
+		<tr>
+			<td></td>
+			<td><a class="standardText btn" href="../out/out.RemoveTransmittal.php?transmittalid=<?php print $transmittal->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_transmittal");?></a></td>
+		</tr>
+<?php
+	}
+?>
+		<tr>
+			<td><?php printMLText("transmittal_name");?>:</td>
+			<td><input type="text" name="name" value="<?php print $transmittal ? htmlspecialchars($transmittal->getName()) : "";?>"></td>
+		</tr>
+		<tr>
+			<td><?php printMLText("transmittal_comment");?>:</td>
+			<td><input type="text" name="comment" value="<?php print $transmittal ? htmlspecialchars($transmittal->getComment()) : "";?>"></td>
+		</tr>
+		<tr>
+			<td></td>
+			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText($transmittal ? "save" : "add_transmittal")?></button></td>
+		</tr>
+	</table>
+	</form>
+<?php
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$seltransmittal = $this->params['seltransmittal'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+
+		$db = $dms->getDB();
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+
+		$this->htmlStartPage(getMLText("my_transmittals"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_transmittals"), "my_documents");
+		$this->contentHeading(getMLText("my_transmittals"));
+?>
+<div class="row-fluid">
+<div class="span4">
+<?php
+		$this->contentContainerStart();
+
+		$transmittals = $dms->getAllTransmittals($user);
+
+		if ($transmittals){
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("comment")."</th>\n";
+			print "<th></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+			foreach($transmittals as $transmittal) {
+				print "<tr>\n";
+				print "<td>".$transmittal->getName()."</td>";
+				print "<td>".$transmittal->getComment()."</td>";
+				print "<td>";
+				print "<div class=\"list-action\">";
+				print "<a href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"icon-edit\"></i></a>";
+				print "</div>";
+				print "</td>";
+				print "</tr>\n";
+			}
+			print "</tbody>\n</table>\n";
+		}
+
+		$this->contentContainerEnd();
+?>
+</div>
+<div class="span8">
+<?php
+		$this->contentContainerStart();
+		$this->showTransmittalForm($seltransmittal);
+		$this->contentContainerEnd();
+		$items = $seltransmittal->getItems();
+		if($items) {
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th>".getMLText("document")."</th>\n";
+			print "<th>".getMLText("version")."</th>\n";
+			print "<th></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+			foreach($items as $item) {
+				print "<tr>";
+				print "<td>";
+				$content = $item->getContent();
+				$document = $content->getDocument();
+				print $content->getVersion();
+				print "</td>";
+				print "<td>";
+				echo $this->documentListRow($document, $previewer, false, $content->getVersion());
+				print $item->getDate();
+				print "</td>";
+				print "</tr>";
+			}
+			print "</tbody>\n</table>\n";
+		}
+?>
+</div>
+</div>
+<?php
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From f32dbe5ef89b43bfabb0e6c11a7ac06a895ccd99 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 30 Apr 2015 14:04:56 +0200
Subject: [PATCH 0064/2006] escape html code before output

---
 views/bootstrap/class.Charts.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Charts.php b/views/bootstrap/class.Charts.php
index d3ab00ee6..e7763a263 100644
--- a/views/bootstrap/class.Charts.php
+++ b/views/bootstrap/class.Charts.php
@@ -132,7 +132,7 @@ if(in_array($type, array('docspermonth'))) {
 	var data = [
 <?php
 	foreach($data as $rec) {
-		echo '['.$rec['key'].','.$rec['total'].'],'."\n";
+		echo '['.htmlspecialchars($rec['key']).','.$rec['total'].'],'."\n";
 	}
 ?>
 	];
@@ -169,7 +169,7 @@ if(in_array($type, array('docspermonth'))) {
 	var data = [
 <?php
 	foreach($data as $rec) {
-		echo '{ label: "'.$rec['key'].'", data: [[1,'.$rec['total'].']]},'."\n";
+		echo '{ label: "'.htmlspecialchars($rec['key']).'", data: [[1,'.$rec['total'].']]},'."\n";
 	}
 ?>
 	];

From fa43001824adb267e8b7b9dd47b0d2250ce53123 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 2 May 2015 08:04:41 +0200
Subject: [PATCH 0065/2006] use propper name of converters array in settings

---
 op/op.AddDocument.php | 2 +-
 op/op.Ajax.php        | 2 +-
 utils/indexer.php     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 6c6ef7672..8c34c9745 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -306,7 +306,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 			$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
 			if($index) {
 				SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
-				$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->converters['fulltext']) ? $settings->converters['fulltext'] : null, true));
+				$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true));
 			}
 		}
 
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 3853ccab7..a85a6c9bf 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -591,7 +591,7 @@ switch($command) {
 						$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
 						if($index) {
 							SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
-							$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->converters['fulltext']) ? $settings->converters['fulltext'] : null, true));
+							$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true));
 						}
 					}
 
diff --git a/utils/indexer.php b/utils/indexer.php
index b5ac01eaa..4d85614ff 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -58,7 +58,7 @@ function tree($folder, $indent='') {
 	foreach($documents as $document) {
 		echo $indent."  ".$document->getId().":".$document->getName()."\n";
 		if(!($hits = $index->find('document_id:'.$document->getId()))) {
-			$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->converters['fulltext']) ? $settings->converters['fulltext'] : null));
+			$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null));
 		} else {
 			$hit = $hits[0];
 			$created = (int) $hit->getDocument()->getFieldValue('created');
@@ -66,7 +66,7 @@ function tree($folder, $indent='') {
 				echo $indent."    Document unchanged\n";
 			} else {
 				if($index->delete($hit->id)) {
-					$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, $settings->_converters ? $settings->_converters : null));
+					$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, $settings->_converters['fulltext'] ? $settings->_converters['fulltext'] : null));
 				}
 			}
 		}

From 3d10f91026d78394986e6252d2cc6bf377509bdc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 2 May 2015 08:34:28 +0200
Subject: [PATCH 0066/2006] use FILEINFO_MIME_TYPE instead of FILEINFO_MIME
 (Closes Bug #209)

---
 utils/adddoc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index d88df7a01..1b6df25d9 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -145,7 +145,7 @@ $user = $dms->getUser(1);
 
 if(is_readable($filename)) {
 	if(filesize($filename)) {
-		$finfo = new finfo(FILEINFO_MIME);
+		$finfo = new finfo(FILEINFO_MIME_TYPE);
 		if(!$mimetype) {
 			$mimetype = $finfo->file($filename);
 		}

From a16a57a1f9d36e8ff382215bf3315ce214dc8455 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 May 2015 06:11:35 +0200
Subject: [PATCH 0067/2006] new documentList for 'ReceiptByMe'

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 32 +++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index b6bbb7d58..37eb6f9e8 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -619,7 +619,7 @@ class SeedDMS_Core_DMS {
 	 * [statusName] => name of user who has initiated the status change
 	 *
 	 * @param string $listtype type of document list, can be 'AppRevByMe',
-	 * 'AppRevOwner', 'LockedByMe', 'MyDocs'
+	 * 'AppRevOwner', 'ReceiptByMe', 'LockedByMe', 'MyDocs'
 	 * @param object $param1 user
 	 * @param string $param2 sort list if listtype='MyDocs'
 	 * @return array list of documents
@@ -691,6 +691,36 @@ class SeedDMS_Core_DMS {
 				$queryStr = '';
 			}
 			break;
+		case 'ReiptByMe': // Documents I have to receipt
+			$user = $param1;
+			// Get document list for the current user.
+			$receiptStatus = $user->getReceiptStatus();
+			
+			// Create a comma separated list of all the documentIDs whose information is
+			// required.
+			$dList = array();
+			foreach ($receiptStatus["indstatus"] as $st) {
+				if (!in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			foreach ($receiptStatus["grpstatus"] as $st) {
+				if (!in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			$docCSV = "";
+			foreach ($dList as $d) {
+				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
+			}
+			
+			if (strlen($docCSV)>0) {
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
+							"ORDER BY `statusDate` DESC";
+			} else {
+				$queryStr = '';
+			}
+			break;
 		case 'AppRevOwner': // Documents waiting for review/approval I'm owning
 			$user = $param1;
 			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".

From b872318350c3c64f194374c3909c72c2d5c1ae78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 May 2015 06:12:30 +0200
Subject: [PATCH 0068/2006] output list of documents receipt by me

---
 views/bootstrap/class.MyDocuments.php | 112 ++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index ebe6fb90d..8c8f97f86 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -326,6 +326,118 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				
 				$this->contentContainerEnd();
 			}
+
+			$receiptStatus = $user->getReceiptStatus();
+			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+			if (is_bool($resArr) && !$resArr) {
+				$this->contentHeading(getMLText("warning"));
+				$this->contentContainer(getMLText("internal_error_exit"));
+				$this->htmlEndPage();
+				exit;
+			}
+			if($resArr) {
+				/* Create an array to hold all of these results, and index the array 
+				 * by document id. This makes it easier to retrieve document ID
+				 * information later on and saves us having to repeatedly poll the
+				 * database every time
+				 * new document information is required.
+				 */
+				$docIdx = array();
+				foreach ($resArr as $res) {
+					
+					/* verify expiry */
+					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+						$res["status"]=S_EXPIRED;
+					}
+
+					$docIdx[$res["id"]][$res["version"]] = $res;
+				}
+				$this->contentHeading(getMLText("documents_to_receipt"));
+				$this->contentContainerStart();
+				$printheader=true;
+				$iRev = array();
+				$dList = array();
+				foreach ($receiptStatus["indstatus"] as $st) {
+				
+					if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
+						$dList[] = $st["documentID"];
+						$document = $dms->getDocument($st["documentID"]);
+					
+						if ($printheader){
+							print "<table class=\"table table-condensed\">";
+							print "<thead>\n<tr>\n";
+							print "<th></th>\n";
+							print "<th>".getMLText("name")."</th>\n";
+							print "<th>".getMLText("owner")."</th>\n";
+							print "<th>".getMLText("version")."</th>\n";
+							print "<th>".getMLText("last_update")."</th>\n";
+							print "<th>".getMLText("expires")."</th>\n";
+							print "</tr>\n</thead>\n<tbody>\n";
+							$printheader=false;
+						}
+					
+						print "<tr>\n";
+						$latestContent = $document->getLatestContent();
+						$previewer->createPreview($latestContent);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($latestContent)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
+						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
+					}
+				}
+				foreach ($receiptStatus["grpstatus"] as $st) {
+				
+					if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
+						$dList[] = $st["documentID"];
+						$document = $dms->getDocument($st["documentID"]);
+
+						if ($printheader){
+							print "<table class=\"table table-condensed\">";
+							print "<thead>\n<tr>\n";
+							print "<th></th>\n";
+							print "<th>".getMLText("name")."</th>\n";
+							print "<th>".getMLText("owner")."</th>\n";
+							print "<th>".getMLText("version")."</th>\n";
+							print "<th>".getMLText("last_update")."</th>\n";
+							print "<th>".getMLText("expires")."</th>\n";
+							print "</tr>\n</thead>\n<tbody>\n";
+							$printheader=false;
+						}
+
+						print "<tr>\n";
+						$latestContent = $document->getLatestContent();
+						$previewer->createPreview($latestContent);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($latestContent)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
+					}
+				}
+				if (!$printheader){
+					echo "</tbody>\n</table>";
+				}else{
+					printMLText("no_docs_to_receipt");
+				}
+				$this->contentContainerEnd();
+			}
 			
 			/* Get list of documents locked by current user */
 			$resArr = $dms->getDocumentList('LockedByMe', $user);

From a5c27190c1e2303eb48cf184547796218ca518a4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 May 2015 07:01:51 +0200
Subject: [PATCH 0069/2006] no need to pass document status to
 addWorkflowAction()

---
 op/op.WorkflowActionsMgr.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/op/op.WorkflowActionsMgr.php b/op/op.WorkflowActionsMgr.php
index ac2906341..454f49b7e 100644
--- a/op/op.WorkflowActionsMgr.php
+++ b/op/op.WorkflowActionsMgr.php
@@ -46,13 +46,12 @@ if ($action == "addworkflowaction") {
 	}
 
 	$name    = $_POST["name"];
-	$docstatus = $_POST["docstatus"];
 
 	if (is_object($dms->getWorkflowActionByName($name))) {
 		UI::exitError(getMLText("admin_tools"),getMLText("workflow_action_exists"));
 	}
 
-	$newWorkflowaction = $dms->addWorkflowAction($name, $docstatus);
+	$newWorkflowaction = $dms->addWorkflowAction($name);
 	if (!$newWorkflowaction) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}

From 9b643fa70027da495a740876c25b7af0f3e49b8b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 May 2015 07:14:24 +0200
Subject: [PATCH 0070/2006] check for extension dir before reading contents

---
 inc/inc.ClassExtensionMgr.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 64d94ceb2..163893206 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -76,16 +76,18 @@ class SeedDMS_Extension_Mgr {
 
 	function getExtensions() { /* {{{ */
 		$extensions = array();
-		$handle = opendir($this->extdir);
-		while ($entry = readdir($handle) ) {
-			if ($entry == ".." || $entry == ".")
-				continue;
-			else if (is_dir($this->extdir ."/". $entry))
-				array_push($extensions, $entry);
-		}
-		closedir($handle);
+		if(file_exists($this->extdir)) {
+			$handle = opendir($this->extdir);
+			while ($entry = readdir($handle) ) {
+				if ($entry == ".." || $entry == ".")
+					continue;
+				else if (is_dir($this->extdir ."/". $entry))
+					array_push($extensions, $entry);
+			}
+			closedir($handle);
 
-		asort($extensions);
+			asort($extensions);
+		}
 		return $extensions;
 	} /* }}} */
 }

From 6c35f106a4ea059d0df66c9bc0ccd1d621224789 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 May 2015 08:27:20 +0200
Subject: [PATCH 0071/2006] add optional parameter $msg to
 SeedDMS_Core_DocumentContent::verifyStatus()

set when method is called in removeWorkflow
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index cae9a69cb..7be40f56c 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2336,12 +2336,16 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * The status of a document with the current status S_OBSOLETE, S_REJECTED,
 	 * or S_EXPIRED will not be changed unless the parameter
 	 * $ignorecurrentstatus is set to true.
+	 * This method will call {@see SeedDMS_Core_DocumentContent::setStatus()}
+	 * which checks if the state has actually changed. This is, why this
+	 * function can be called at any time without harm to the status log.
 	 *
 	 * @param boolean $ignorecurrentstatus ignore the current status and
 	 *        recalculate a new status in any case
 	 * @param object $user the user initiating this method
+	 * @param string $msg message stored in status log when status is set
 	 */
-	function verifyStatus($ignorecurrentstatus=false, $user=null) { /* {{{ */
+	function verifyStatus($ignorecurrentstatus=false, $user=null, $msg='') { /* {{{ */
 
 		unset($this->_status);
 		$st=$this->getStatus();
@@ -4239,7 +4243,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			}
 			$this->_workflow = null;
 			$this->_workflowState = null;
-			$this->verifyStatus(false, $user);
+			$this->verifyStatus(false, $user, 'Workflow removed');
 			$db->commitTransaction();
 		}
 

From af177f52499cc6bf1126a0383822e07eb4621355 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 May 2015 08:34:23 +0200
Subject: [PATCH 0072/2006] include all needed files

---
 out/out.EditComment.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/out/out.EditComment.php b/out/out.EditComment.php
index 0fe44c67a..11a159e9d 100644
--- a/out/out.EditComment.php
+++ b/out/out.EditComment.php
@@ -20,8 +20,10 @@
 
 include("../inc/inc.Settings.php");
 include("../inc/inc.Utils.php");
-include("../inc/inc.DBInit.php");
 include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");

From b2027eb2d733a10406038089f09a579a0db0709b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 May 2015 08:38:46 +0200
Subject: [PATCH 0073/2006] pass on msg to setStatus() in verifyStatus()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 7be40f56c..49f103a2c 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2376,10 +2376,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		unset($this->_workflow); // force to be reloaded from DB
-		if ($this->getWorkflow()) $this->setStatus(S_IN_WORKFLOW,"",$user);
-		elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,"",$user);
-		elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,"",$user);
-		else $this->setStatus(S_RELEASED,"",$user);
+		if ($this->getWorkflow()) $this->setStatus(S_IN_WORKFLOW,$msg,$user);
+		elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user);
+		elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user);
+		else $this->setStatus(S_RELEASED,$msg,$user);
 	} /* }}} */
 
 	function SeedDMS_Core_DocumentContent($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='') { /* {{{ */

From a6a335d4811c627324ee1d29964adf7066daf52d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 May 2015 07:55:07 +0200
Subject: [PATCH 0074/2006] add inc.ClassTransmittal.php

---
 SeedDMS_Core/package.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index dec22bda9..eae05c6d8 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -77,6 +77,9 @@ clean workflow log when a document version was deleted
     <file name="inc.ClassWorkflow.php" role="php">
      <tasks:replace from="@package_version@" to="version" type="package-info" />
     </file>
+    <file name="inc.ClassTransmittal.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
    </dir> <!-- /DTD -->
    <dir name="tests">
     <file name="getfoldertree.php" role="test" />

From ed0b1f28cb7ee1f573d38aff44636f55344edba0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 May 2015 08:23:33 +0200
Subject: [PATCH 0075/2006] do not show items if no transmittal is selected

---
 views/bootstrap/class.TransmittalMgr.php | 44 +++++++++++++-----------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 7e7c5d349..e073022e5 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -130,28 +130,30 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		$this->showTransmittalForm($seltransmittal);
 		$this->contentContainerEnd();
-		$items = $seltransmittal->getItems();
-		if($items) {
-			print "<table class=\"table table-condensed\">";
-			print "<thead>\n<tr>\n";
-			print "<th>".getMLText("document")."</th>\n";
-			print "<th>".getMLText("version")."</th>\n";
-			print "<th></th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-			foreach($items as $item) {
-				print "<tr>";
-				print "<td>";
-				$content = $item->getContent();
-				$document = $content->getDocument();
-				print $content->getVersion();
-				print "</td>";
-				print "<td>";
-				echo $this->documentListRow($document, $previewer, false, $content->getVersion());
-				print $item->getDate();
-				print "</td>";
-				print "</tr>";
+		if($seltransmittal) {
+			$items = $seltransmittal->getItems();
+			if($items) {
+				print "<table class=\"table table-condensed\">";
+				print "<thead>\n<tr>\n";
+				print "<th>".getMLText("document")."</th>\n";
+				print "<th>".getMLText("version")."</th>\n";
+				print "<th></th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+				foreach($items as $item) {
+					print "<tr>";
+					print "<td>";
+					$content = $item->getContent();
+					$document = $content->getDocument();
+					print $content->getVersion();
+					print "</td>";
+					print "<td>";
+					echo $this->documentListRow($document, $previewer, false, $content->getVersion());
+					print $item->getDate();
+					print "</td>";
+					print "</tr>";
+				}
+				print "</tbody>\n</table>\n";
 			}
-			print "</tbody>\n</table>\n";
 		}
 ?>
 </div>

From 2ddd6aa468b730f1695523991a8e9ddd527794e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 May 2015 08:25:05 +0200
Subject: [PATCH 0076/2006] various updates

---
 languages/ar_EG/lang.inc |  4 ++++
 languages/bg_BG/lang.inc |  4 ++++
 languages/ca_ES/lang.inc |  4 ++++
 languages/cs_CZ/lang.inc |  8 +++++--
 languages/de_DE/lang.inc |  8 +++++--
 languages/en_GB/lang.inc |  6 ++++-
 languages/es_ES/lang.inc |  4 ++++
 languages/fr_FR/lang.inc |  4 ++++
 languages/hu_HU/lang.inc | 18 ++++++++------
 languages/it_IT/lang.inc |  4 ++++
 languages/nl_NL/lang.inc |  4 ++++
 languages/pl_PL/lang.inc |  4 ++++
 languages/pt_BR/lang.inc |  4 ++++
 languages/ro_RO/lang.inc | 10 +++++---
 languages/ru_RU/lang.inc |  4 ++++
 languages/sk_SK/lang.inc |  4 ++++
 languages/sv_SE/lang.inc |  4 ++++
 languages/tr_TR/lang.inc |  4 ++++
 languages/zh_CN/lang.inc | 52 +++++++++++++++++++++-------------------
 languages/zh_TW/lang.inc |  4 ++++
 20 files changed, 119 insertions(+), 39 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 877236b8e..c38319bf1 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'بدأ المراجعة',
 'add_subfolder' => 'إضافة مجلد فرعي',
 'add_to_clipboard' => 'اضف الى لوحة القصاصات',
+'add_transmittal' => '',
 'add_user' => 'إضافة مستخدم',
 'add_user_to_group' => 'إضافة مستخدم لمجموعة',
 'add_workflow' => 'اضف مسار عمل جديد',
@@ -257,6 +258,7 @@ URL: [url]',
 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك',
 'documents_only' => 'مستندات فقط',
 'documents_to_approve' => 'مستندات في انتظار الموافقة',
+'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
 'document_already_checkedout' => '',
@@ -621,6 +623,7 @@ URL: [url]',
 'no_attached_files' => 'لا يوجد مرفقات',
 'no_current_version' => '',
 'no_default_keywords' => 'لايوجد كلمات بحثية متاحة',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'لايوجد مستندات حاليا مقفلة/محمية من التعديل',
 'no_docs_to_approve' => 'لايوجد مستندات حالية في انتظار الموافقة',
 'no_docs_to_look_at' => 'لايوجد مستندات حاليا تستدعي انتباهك',
@@ -680,6 +683,7 @@ URL: [url]',
 'quota_exceeded' => 'لقد قمت بتعدي المساحة المخصصة لك بمقدار [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'اقصى مساحة للقرص الصلب تم تعديها بمقدار [bytes]. من فضلك قم بمسح بعض المستندات او اصدارات سابقة منها',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'اعادة تحميل',
 'rejected' => 'مرفوض',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 49fbe2f9c..b7c9e8e75 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -59,6 +59,7 @@ $text = array(
 'add_review' => 'Рецензирай',
 'add_subfolder' => 'Добави подпапка',
 'add_to_clipboard' => 'Добави към clipboard',
+'add_transmittal' => '',
 'add_user' => 'Добави потребител',
 'add_user_to_group' => 'Добави потребител в група',
 'add_workflow' => 'Добави нов workflow',
@@ -242,6 +243,7 @@ $text = array(
 'documents_locked_by_you' => 'Документи, блокирани от Вас',
 'documents_only' => 'Само документи',
 'documents_to_approve' => 'Документи, чакащи Вашето утвърждаване',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
 'document_already_checkedout' => '',
@@ -528,6 +530,7 @@ $text = array(
 'no_attached_files' => 'Няма прикрачени файлове',
 'no_current_version' => '',
 'no_default_keywords' => 'Няма ключови думи',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Няма блокирани документи',
 'no_docs_to_approve' => 'Няма документи, нуждаещи се от утвърждаване',
 'no_docs_to_look_at' => 'Няма документи, нуждаещи се от внимание',
@@ -581,6 +584,7 @@ $text = array(
 'quota_exceeded' => 'Вашата дискова квота е превишена с [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'Вашето max. използуване на диска е превишена с [bytes]. Please remove documents or previous versions.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Обнови',
 'rejected' => 'Отказан',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 7e19e30e7..959b17a9a 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -59,6 +59,7 @@ $text = array(
 'add_review' => 'Enviar revisiót',
 'add_subfolder' => 'Afegir subdirectori',
 'add_to_clipboard' => '',
+'add_transmittal' => '',
 'add_user' => 'Afegir nou usuari',
 'add_user_to_group' => '',
 'add_workflow' => '',
@@ -247,6 +248,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
 'documents_only' => '',
 'documents_to_approve' => 'Documents en espera d\'aprovació d\'usuaris',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
 'document_already_checkedout' => '',
@@ -533,6 +535,7 @@ URL: [url]',
 'no_attached_files' => 'No hi ha fitxers adjunts',
 'no_current_version' => '',
 'no_default_keywords' => 'No hi ha mots clau disponibles',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'No hi ha documents bloquejats.',
 'no_docs_to_approve' => 'Actualmente no hi ha documents que necessitin aprovació.',
 'no_docs_to_look_at' => 'No hi ha documents que necessitin atenció.',
@@ -586,6 +589,7 @@ URL: [url]',
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
 'quota_warning' => '',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Refresh',
 'rejected' => 'Rebutjat',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index f63a24cf1..4dd9f5b5f 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (681), kreml (455)
+//    Translators: Admin (682), kreml (455)
 
 $text = array(
 'accept' => 'Přijmout',
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Poslat ke kontrole',
 'add_subfolder' => 'Přidat podsložku',
 'add_to_clipboard' => 'Přidat do schránky',
+'add_transmittal' => '',
 'add_user' => 'Přidat nového uživatele',
 'add_user_to_group' => 'Přidat uživatele do skupiny',
 'add_workflow' => 'Přidat nový pracovní postup',
@@ -162,7 +163,7 @@ URL: [url]',
 'backup_remove' => 'Odstranit soubor zálohy',
 'backup_tools' => 'Nástroje pro zálohování',
 'between' => 'mezi',
-'bg_BG' => 'Bulharsky',
+'bg_BG' => 'Bulharština',
 'browse' => 'Prohlížet',
 'calendar' => 'Kalendář',
 'calendar_week' => 'Kaledářní týden',
@@ -264,6 +265,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
 'documents_only' => 'Pouze dokumenty',
 'documents_to_approve' => 'Dokumenty čekající na schválení uživatele',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
 'document_already_checkedout' => '',
@@ -628,6 +630,7 @@ URL: [url]',
 'no_attached_files' => 'Žádné přiložené soubory',
 'no_current_version' => 'Používáte starou verzi SeedDMS. Nejnovější dostupná verze je [latestversion].',
 'no_default_keywords' => 'Nejsou dostupná žádná klíčová slova.',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Žádné uzamčené dokumenty',
 'no_docs_to_approve' => 'Momentálně neexistují žádné dokumenty, které vyžadují schválení.',
 'no_docs_to_look_at' => 'Žádné dokumenty, které vyžadují pozornost.',
@@ -691,6 +694,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'quota_exceeded' => 'Vaše kvóta disku je překročena o [bytes].',
 'quota_is_disabled' => 'Podpora kvót je v současné době zakázána v nastavení. Nastavení uživatelských kvót nebude mít žádný vliv, dokud se znovu neaktivuje.',
 'quota_warning' => 'Vaše maximální využití disku je překročeno o [bajtů]. Prosím, odstraňte dokumenty nebo předchozí verze.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Obnovit',
 'rejected' => 'Odmítnuto',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 2375b0b0e..5148fb308 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2006), dgrutsch (18)
+//    Translators: Admin (2012), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Überprüfung hinzufügen',
 'add_subfolder' => 'Unterordner anlegen',
 'add_to_clipboard' => 'Zur Zwischenablage hinzufügen',
+'add_transmittal' => 'Transmittal hinzufügen',
 'add_user' => 'Neuen Benutzer anlegen',
 'add_user_to_group' => 'Benutzer in Gruppe einfügen',
 'add_workflow' => 'Neuen Workflow anlegen',
@@ -269,6 +270,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Von mir gesperrte Dokumente',
 'documents_only' => 'Nur Dokumente',
 'documents_to_approve' => 'Freigabe erforderlich',
+'documents_to_receipt' => 'Dokumente deren Empfang bestätigt werden muss',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
 'document_already_checkedout' => 'Dieses Dokument ist bereits ausgecheckt',
@@ -572,7 +574,7 @@ URL: [url]',
 'move_folder' => 'Verschieben',
 'my_account' => 'Mein Profil',
 'my_documents' => 'Meine Dokumente',
-'my_transmittals' => '',
+'my_transmittals' => 'Meine Übergabedokumente',
 'name' => 'Name',
 'needs_workflow_action' => 'Dieses Dokument erfordert eine Aktion. Bitte schauen Sie auf den Workflow-Reiter.',
 'never' => 'nie',
@@ -632,6 +634,7 @@ URL: [url]',
 'no_attached_files' => 'Keine angehängten Dokumente',
 'no_current_version' => 'Sie verwenden eine ältere Version als die zur Zeit verfügbare Version [latestversion].',
 'no_default_keywords' => 'Keine Vorlagen vorhanden',
+'no_docs_checked_out' => 'Keine Dokumente ausgecheckt',
 'no_docs_locked' => 'Keine Dokumente gesperrt.',
 'no_docs_to_approve' => 'Es gibt zur Zeit keine Dokumente, die eine Freigabe erfordern.',
 'no_docs_to_look_at' => 'Keine Dokumente, nach denen geschaut werden müsste.',
@@ -699,6 +702,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'quota_exceeded' => 'Ihr maximal verfügbarer Plattenplatz wurde um [bytes] überschritten.',
 'quota_is_disabled' => 'Quota-Unterstützung ist zur Zeit ausgeschaltet. Benutzer-Quota werden ignoriert bis Quota-Unterstützung in den Einstellungen eingeschaltet wird.',
 'quota_warning' => 'Ihr maximal verfügbarer Plattenplatz wurde um [bytes] überschritten. Bitte löschen Sie Dokumente oder ältere Versionen.',
+'receipt_summary' => 'Übersicht Bestätigungen',
 'recipients' => 'Empfänger',
 'refresh' => 'Aktualisieren',
 'rejected' => 'abgelehnt',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index ca9cfecc7..9f7fc5a89 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1142), dgrutsch (3), netixw (14)
+//    Translators: Admin (1145), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Add review',
 'add_subfolder' => 'Add subfolder',
 'add_to_clipboard' => 'Add to clipboard',
+'add_transmittal' => 'Add transmittal',
 'add_user' => 'Add new user',
 'add_user_to_group' => 'Add user to group',
 'add_workflow' => 'Add new workflow',
@@ -269,6 +270,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documents locked by you',
 'documents_only' => 'Documents only',
 'documents_to_approve' => 'Documents awaiting your approval',
+'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
 'document_already_checkedout' => 'This document is already checked out',
@@ -632,6 +634,7 @@ URL: [url]',
 'no_attached_files' => 'No attached files',
 'no_current_version' => 'You are running an old version of SeedDMS. The latest available version is [latestversion].',
 'no_default_keywords' => 'No keywords available',
+'no_docs_checked_out' => 'No documents checked out',
 'no_docs_locked' => 'No documents locked.',
 'no_docs_to_approve' => 'There are currently no documents that require approval.',
 'no_docs_to_look_at' => 'No documents that need attention.',
@@ -699,6 +702,7 @@ If you have still problems to login, then please contact your administrator.',
 'quota_exceeded' => 'Your disk quota is exceeded by [bytes].',
 'quota_is_disabled' => 'Quota support is currently disabled in the settings. Setting a user quota will have no effect until it is enabled again.',
 'quota_warning' => 'Your maximum disc usage is exceeded by [bytes]. Please remove documents or previous versions.',
+'receipt_summary' => '',
 'recipients' => 'Recipients',
 'refresh' => 'Refresh',
 'rejected' => 'Rejected',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index caa5ccade..1a77229b7 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Enviar revisión',
 'add_subfolder' => 'Añadir subcarpeta',
 'add_to_clipboard' => 'Añadir al portapapeles',
+'add_transmittal' => '',
 'add_user' => 'Añadir nuevo usuario',
 'add_user_to_group' => 'Añadir usuario a grupo',
 'add_workflow' => 'Añadir nuevo flujo de trabajo',
@@ -264,6 +265,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documentos bloqueados por usted',
 'documents_only' => 'Solo documentos',
 'documents_to_approve' => 'Documentos en espera de aprobación de usuarios',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
 'document_already_checkedout' => '',
@@ -628,6 +630,7 @@ URL: [url]',
 'no_attached_files' => 'No hay ficheros adjuntos',
 'no_current_version' => 'Está utilizando una versión desactualizada de este producto. La última versión disponible es [latestversion].',
 'no_default_keywords' => 'No hay palabras clave disponibles',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'No hay documentos bloqueados.',
 'no_docs_to_approve' => 'Actualmente no hay documentos que necesiten aprobación.',
 'no_docs_to_look_at' => 'No hay documentos que necesiten atención.',
@@ -695,6 +698,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'quota_exceeded' => 'Su cuota de disco se ha excedido en [bytes].',
 'quota_is_disabled' => 'La cuota está actualmente deshabilitada en las opciones. Establecer una cuota de usuario no tendrá efecto hasta que sea habilitada de nuevo.',
 'quota_warning' => 'El máximo de uso de disco se ha excedido en [bytes]. Por favor eliminar documentos o versiones anteriores.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Actualizar',
 'rejected' => 'Rechazado',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 53b6348ab..5f661d3d9 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Soumettre la correction',
 'add_subfolder' => 'Ajouter un sous-dossier',
 'add_to_clipboard' => 'Ajouter au presse-papiers',
+'add_transmittal' => '',
 'add_user' => 'Ajouter un utilisateur',
 'add_user_to_group' => 'Ajouter un utilisateur au groupe',
 'add_workflow' => 'Ajouter un workflow',
@@ -264,6 +265,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documents verrouillés',
 'documents_only' => 'Documents uniquement',
 'documents_to_approve' => 'Documents en attente d\'approbation',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en attente de correction',
 'documents_user_requiring_attention' => 'Documents à surveiller',
 'document_already_checkedout' => '',
@@ -627,6 +629,7 @@ URL: [url]',
 'no_attached_files' => 'Aucun fichier attaché',
 'no_current_version' => 'Vous utilisez une vieille version de SeedDMS. La dernière version disponible est la [latestversion].',
 'no_default_keywords' => 'Aucun mot-clé disponible',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Aucun document verrouillé',
 'no_docs_to_approve' => 'Aucun document ne nécessite actuellement une approbation',
 'no_docs_to_look_at' => 'Aucun document à surveiller',
@@ -692,6 +695,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'quota_exceeded' => 'Votre quota de disque est dépassé de [bytes].',
 'quota_is_disabled' => 'Le support des quota est actuellement désactivé dans les réglages. Affecter un quota utilisateur n\'aura pas d\'effet jusqu\'à ce qu\'il soit de nouveau activé.',
 'quota_warning' => 'Votre taille maximale de disque est dépassée de [bytes]. SVP supprimer des documents ou d\'anciennes versions.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Actualiser',
 'rejected' => 'Rejeté',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 60a77c125..63fdb8e45 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (552), ribaz (1019)
+//    Translators: Admin (558), ribaz (1019)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Felülvizsgálat küldése',
 'add_subfolder' => 'Alkönyvtár hozzáadása',
 'add_to_clipboard' => 'Vágólaphoz hozzáad',
+'add_transmittal' => '',
 'add_user' => 'Új felhasználó hozzáadása',
 'add_user_to_group' => 'Felhasználó csoporthoz rendelése',
 'add_workflow' => 'Új munkafolyamat hozzáadása',
@@ -264,6 +265,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
 'documents_only' => 'Csak dokumentumok',
 'documents_to_approve' => 'Jóváhagyására váró dokumentumok',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
 'document_already_checkedout' => '',
@@ -628,6 +630,7 @@ URL: [url]',
 'no_attached_files' => 'Nincsenek csatolt állományok',
 'no_current_version' => 'Ön a SeedDMS régebbi változatát futtatja. A legutolsó elérhető verzió [latestversion].',
 'no_default_keywords' => 'Nincsenek elérhető kulcsszavak',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Nincsenek zárolt dokumentumok.',
 'no_docs_to_approve' => 'Nincsenek jóváhagyandó dokumentumok.',
 'no_docs_to_look_at' => 'Nincs karbantartást igénylő dokumentum.',
@@ -695,6 +698,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'quota_exceeded' => 'Túllépte a lemezterület korlátot [bytes].',
 'quota_is_disabled' => 'Kvóta támogatás jelenleg le van tiltva a beállításoknál. Felhasználói korlát beállítások nem kerülnek érvényesítésre amíg nincs újra engedélyezve.',
 'quota_warning' => 'Túllépte lemez korlátot [bytes] bájttal. Kérjük távolítson el dokumentumokat vagy korábbi változatokat.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Frissítés',
 'rejected' => 'Elutasított',
@@ -897,7 +901,7 @@ URL: [url]',
 'settings_enableConverting' => 'Konvertálás engedélyezése',
 'settings_enableConverting_desc' => 'Engedélyezi/tiltja az állományok konverzióját',
 'settings_enableDropUpload' => 'Gyorsfeltöltés engedélyezése',
-'settings_enableDropUpload_desc' => '',
+'settings_enableDropUpload_desc' => 'Be/Ki kapcsolja a \'Mappa nézet\' oldalon a fogd és vidd feltöltéshez tartozó területetet',
 'settings_enableDuplicateDocNames' => 'Azonos dokumentum név engedélyezése',
 'settings_enableDuplicateDocNames_desc' => 'Engedélyezi az azonos dokumentum neveket egy mappában.',
 'settings_enableEmail' => 'Email engedélyezése',
@@ -914,8 +918,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Ha beállítja az állományok feltöltése elérhető lesz egy jumploadernek hívott java appleten keresztül a böngészőprogram állomány méret korlátja nélkül. Ez engedélyezi több állomány feltöltését egy lépésben.',
 'settings_enableNotificationAppRev' => 'A felülvizsgáló/jóváhagyó értesítés engedélyezése',
 'settings_enableNotificationAppRev_desc' => 'Ellenőrzi az értesítés küldését a felülvizsgálónak/jóváhagyónak új dokumentum változat hozzáadásakor',
-'settings_enableNotificationWorkflow' => '',
-'settings_enableNotificationWorkflow_desc' => '',
+'settings_enableNotificationWorkflow' => 'A felhasználó értesítése a következő munkafolyamatnál',
+'settings_enableNotificationWorkflow_desc' => 'Ha ez az opció be van kapcsolva, a felhasználók és csoportok melyekkel műveletet kell végezni a következő munkafolyamat-átmenetnél értesítést kapnak. Akkor is, ha nem adtak hozzá értesítőt.',
 'settings_enableOwnerNotification' => 'Engedélyezi a tulajdonos értesítését alapesetben',
 'settings_enableOwnerNotification_desc' => 'Ellenőrzi az értesítés hozzáadását a tulajdonosnak ha egy dokumentum hozzáadásra kerül.',
 'settings_enableOwnerRevApp' => 'Engedélyezi a felülvizsgálatot/jóváhagyást a tulajdonosnak',
@@ -1005,8 +1009,8 @@ URL: [url]',
 'settings_php_gd2' => 'PHP kiterjesztés : php_gd2',
 'settings_php_mbstring' => 'PHP kiterjesztés : php_mbstring',
 'settings_php_version' => 'PHP verzió',
-'settings_presetExpirationDate' => '',
-'settings_presetExpirationDate_desc' => '',
+'settings_presetExpirationDate' => 'Lejárat beállítása',
+'settings_presetExpirationDate_desc' => 'Minden feltöltött dokumentumhoz ezt a lejárati dátumot rendeli hozzá. A PHP strtotime() függvényének formátuma használható, pl.: +5 weeks.',
 'settings_previewWidthDetail' => 'Előnézeti képek szélessége (részletek)',
 'settings_previewWidthDetail_desc' => 'A részletek oldalon megjelenő előnézeti képek szélessége',
 'settings_previewWidthList' => 'Előnézeti képek szélessége (lista)',
@@ -1078,7 +1082,7 @@ URL: [url]',
 'settings_workflowMode_desc' => 'A részletes munkafolyamat engedélyezi saját kiadási munkafolyamat megadását a dokumentum változatokhoz.',
 'settings_workflowMode_valadvanced' => 'részletes',
 'settings_workflowMode_valtraditional' => 'hagyományos',
-'settings_workflowMode_valtraditional_only_approval' => '',
+'settings_workflowMode_valtraditional_only_approval' => 'hagyományos (áttekintés nélkül)',
 'settings_zendframework' => 'Zend keretrendszer',
 'set_expiry' => 'Lejárat beállítása',
 'set_owner' => 'Tulajdonos beállítása',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index a52157763..a5bcb9ef0 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Invio revisione',
 'add_subfolder' => 'Aggiungi sottocartella',
 'add_to_clipboard' => 'Aggiungi agli appunti',
+'add_transmittal' => '',
 'add_user' => 'Aggiungi un nuovo utente',
 'add_user_to_group' => 'Aggiungi un utente al gruppo',
 'add_workflow' => 'Crea un flusso di lavoro',
@@ -269,6 +270,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documenti bloccati da te',
 'documents_only' => 'Solo documenti',
 'documents_to_approve' => 'Documenti in attesa della tua approvazione',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
 'document_already_checkedout' => '',
@@ -633,6 +635,7 @@ URL: [url]',
 'no_attached_files' => 'Nessun file allegato',
 'no_current_version' => 'La corrente versione di SeedDMS non è aggiornata. La versione più recente disponibile è la [latestversion].',
 'no_default_keywords' => 'Nessuna parola-chiave disponibile',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Nessun documento bloccato.',
 'no_docs_to_approve' => 'Non ci sono documenti che richiedano approvazione.',
 'no_docs_to_look_at' => 'Non ci sono documenti che richiedano attenzione.',
@@ -700,6 +703,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].',
 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.',
 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Ricarica',
 'rejected' => 'Rifiutato',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index c921a99e4..665102946 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Verzend [Controle]',
 'add_subfolder' => 'Submap toevoegen',
 'add_to_clipboard' => 'Toevoegen aan klembord',
+'add_transmittal' => '',
 'add_user' => 'Nieuwe gebruiker toevoegen',
 'add_user_to_group' => 'Gebruiker aan groep toevoegen',
 'add_workflow' => 'Nieuwe workflow toevoegen',
@@ -257,6 +258,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
 'documents_only' => 'Alleen documenten',
 'documents_to_approve' => 'Documenten die wachten op uw goedkeuring',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
 'document_already_checkedout' => '',
@@ -620,6 +622,7 @@ URL: [url]',
 'no_attached_files' => 'Geen bijlagen',
 'no_current_version' => 'U werkt met een oude versie van SeedDMS. De laatste versie beschikbaar is [latestversion].',
 'no_default_keywords' => 'Geen Sleutelwoorden beschikbaar',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Geen documenten in gebruik.',
 'no_docs_to_approve' => 'Er zijn momenteel geen documenten die Goedkeuring behoeven.',
 'no_docs_to_look_at' => 'Geen documenten die aandacht behoeven.',
@@ -688,6 +691,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'quota_exceeded' => 'Uw data quota is overschreden met [bytes].',
 'quota_is_disabled' => 'Quota support is momenteel niet aktief in de eigenschappen. Een user quota zetten zal geen effect hebben tot quotas actief zijn.',
 'quota_warning' => 'Uw maximale data gebruik is overschreden met [bytes]. Gelieve documenten of eerdere versies te verwijderen.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Verversen',
 'rejected' => 'Afgewezen',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index cfcad2fb4..673290531 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Zatwierdź recenzję',
 'add_subfolder' => 'Dodaj podfolder',
 'add_to_clipboard' => 'Dodaj do schowka',
+'add_transmittal' => '',
 'add_user' => 'Dodaj nowego użytkownika',
 'add_user_to_group' => 'Przypisz użytkownika do grupy',
 'add_workflow' => 'Dodaj nowy proces',
@@ -257,6 +258,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
 'documents_only' => 'Tylko dokumenty',
 'documents_to_approve' => 'Dokumenty oczekujące na Twoje zatwierdzenie',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
 'document_already_checkedout' => '',
@@ -621,6 +623,7 @@ URL: [url]',
 'no_attached_files' => 'Brak załączonych plików',
 'no_current_version' => '',
 'no_default_keywords' => 'Nie ma słów kluczowych',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Brak zablokowanych dokumentów.',
 'no_docs_to_approve' => 'Aktualnie nie ma dokumentów wymagających akceptacji.',
 'no_docs_to_look_at' => 'Brak dokumentów wymagających uwagi.',
@@ -688,6 +691,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'quota_exceeded' => 'Twój limit przydzielonej przestrzeni dyskowej został przekroczony o [bytes].',
 'quota_is_disabled' => 'Wsparcie limitów dyskowych jest obecnie wyłączone w ustawieniach. Ustawiony limit dyskowy użytkownika nie będzie działał dopóki wparcie nie zostanie ponownie włączone.',
 'quota_warning' => 'Przekroczono użycie dysku o [bytes]. Usuń dokumenty lub poprzednie wersje.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Odśwież',
 'rejected' => 'Odrzucony',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index e481b2db5..99a3a80be 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => '',
 'add_subfolder' => 'Criar sub-pasta',
 'add_to_clipboard' => 'Adicionar ao clipboard',
+'add_transmittal' => '',
 'add_user' => 'Novo usuário',
 'add_user_to_group' => 'Adicionar usuário ao grupo',
 'add_workflow' => 'Adicionar novo fluxo de trabalho',
@@ -264,6 +265,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
 'documents_only' => 'Somente documentos',
 'documents_to_approve' => 'Documents Awaiting User\'s Approval',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
 'document_already_checkedout' => '',
@@ -626,6 +628,7 @@ URL: [url]',
 'no_attached_files' => 'Não há arquivos anexados',
 'no_current_version' => 'Você está executando uma versão antiga do SeedDMS. A última versão disponível é [latestversion].',
 'no_default_keywords' => 'não há palavras-chave disponíveis',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Nenhum documento bloqueado.',
 'no_docs_to_approve' => 'There are currently no documents that require approval.',
 'no_docs_to_look_at' => 'Não há documentos que precisam de atenção.',
@@ -693,6 +696,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'quota_exceeded' => 'Sua cota de disco foi ultrapassada em [bytes].',
 'quota_is_disabled' => 'Suporte a cota está desativado nas configurações. A definição de cota do usuário não terá efeito até que seja habilitada novamente.',
 'quota_warning' => 'Seu uso máximo do disco foi ultrapassado em [bytes]. Por favor, remova documentos ou versões anteriores.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Atualizar',
 'rejected' => 'Rejected',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index d8deddceb..a26ee7275 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1003), balan (6)
+//    Translators: Admin (1005), balan (6)
 
 $text = array(
 'accept' => 'Accept',
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Trimite revizuire',
 'add_subfolder' => 'Adaugă subfolder',
 'add_to_clipboard' => 'Adaugă in clipboard',
+'add_transmittal' => '',
 'add_user' => 'Adaugă utilizator nou',
 'add_user_to_group' => 'Adaugă utilizator la grup',
 'add_workflow' => 'Adaugă workflow nou',
@@ -162,7 +163,7 @@ URL: [url]',
 'backup_remove' => 'Sterge fișier backup',
 'backup_tools' => 'Backup tools',
 'between' => 'între',
-'bg_BG' => '',
+'bg_BG' => 'Bulgară',
 'browse' => 'Browse',
 'calendar' => 'Calendar',
 'calendar_week' => 'Săptămână calendar',
@@ -264,6 +265,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Documente blocate de tine',
 'documents_only' => 'Doar documente',
 'documents_to_approve' => 'Documente care așteaptă aprobarea dumneavoastră',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
 'document_already_checkedout' => '',
@@ -628,6 +630,7 @@ URL: [url]',
 'no_attached_files' => 'Nu sunt fișiere atașate',
 'no_current_version' => 'Utilizați o versiune veche de SeedDMS. Cea mai recentă versiune disponibilă este [latestversion].',
 'no_default_keywords' => 'Nu există cuvinte cheie disponibile',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Nici un document blocat.',
 'no_docs_to_approve' => 'Momentan nu există documente care necesită aprobarea.',
 'no_docs_to_look_at' => 'Nici un document care necesită atenție.',
@@ -695,6 +698,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'quota_exceeded' => 'Spatiul tău alocat pe disc este depășit cu [bytes].',
 'quota_is_disabled' => 'Spatiu alocat este dezactivată în setări. Stabilirea unui spatiu alocat pentru utilizator nu va avea nici un efect până când setarea este reactivată din nou.',
 'quota_warning' => 'Dimensiunea dumneavoastră maximă este depasită cu [bytes]. Vă rugăm să eliminați documente sau versiuni anterioare.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Refresh',
 'rejected' => 'Respins',
@@ -1174,7 +1178,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'trigger_workflow' => 'Workflow',
-'tr_TR' => '',
+'tr_TR' => 'Turcă',
 'tuesday' => 'Marți',
 'tuesday_abbr' => 'Ma',
 'type_to_search' => 'Tastați pentru a căuta',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 9162d4a2e..dead290d1 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Рецензировать',
 'add_subfolder' => 'Добавить подкаталог',
 'add_to_clipboard' => 'Добавить в буфер',
+'add_transmittal' => '',
 'add_user' => 'Добавить пользователя',
 'add_user_to_group' => 'Добавить пользователя в группу',
 'add_workflow' => 'Добавить процесс',
@@ -257,6 +258,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Документы, заблокированные вами',
 'documents_only' => 'только документы',
 'documents_to_approve' => 'Документы, ожидающие вашего утверждения',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
 'document_already_checkedout' => '',
@@ -620,6 +622,7 @@ URL: [url]',
 'no_attached_files' => 'Нет приложений',
 'no_current_version' => '',
 'no_default_keywords' => 'Нет меток',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Нет заблокированных документов',
 'no_docs_to_approve' => 'Нет документов, нуждающихся в утверждении',
 'no_docs_to_look_at' => 'Нет документов, нуждающихся во внимании',
@@ -685,6 +688,7 @@ URL: [url]',
 'quota_exceeded' => 'Ваша дисковая квота превышена на [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'Ваша дисковая квота превышена на [bytes]. Удалите ненужные документы или их предыдущие версии.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Обновить',
 'rejected' => 'Отклонён',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index a36b59de3..218c1d78a 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -59,6 +59,7 @@ $text = array(
 'add_review' => 'Poslať kontrolu',
 'add_subfolder' => 'Pridať podzložku',
 'add_to_clipboard' => 'Pridaj do schránky',
+'add_transmittal' => '',
 'add_user' => 'Pridať nového používatela',
 'add_user_to_group' => '',
 'add_workflow' => '',
@@ -242,6 +243,7 @@ $text = array(
 'documents_locked_by_you' => 'Vami uzamknuté dokumenty',
 'documents_only' => '',
 'documents_to_approve' => 'Dokumenty čakajúce na schválenie používateľa',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
 'document_already_checkedout' => '',
@@ -528,6 +530,7 @@ $text = array(
 'no_attached_files' => 'Žiadne prílohy',
 'no_current_version' => '',
 'no_default_keywords' => 'Nie sú dostupné žiadne kľúčové slová.',
+'no_docs_checked_out' => '',
 'no_docs_locked' => '',
 'no_docs_to_approve' => 'Momentálne neexistujú žiadne dokumenty, ktoré vyžadujú schválenie.',
 'no_docs_to_look_at' => '',
@@ -581,6 +584,7 @@ $text = array(
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
 'quota_warning' => '',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => '',
 'rejected' => 'Odmietnuté',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index fcdcfcfbd..92786a186 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => 'Skicka granskning',
 'add_subfolder' => 'Lägg till katalog',
 'add_to_clipboard' => 'Flytta till Urklipp',
+'add_transmittal' => '',
 'add_user' => 'Lägg till ny användare',
 'add_user_to_group' => 'Lägg till användare till grupp',
 'add_workflow' => 'Lägg till nytt arbetsflöde',
@@ -257,6 +258,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Dokument som du har låst',
 'documents_only' => 'Bara dokument',
 'documents_to_approve' => 'Dokument som du behöver godkänna',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
 'document_already_checkedout' => '',
@@ -621,6 +623,7 @@ URL: [url]',
 'no_attached_files' => 'Inga filer har bifogats.',
 'no_current_version' => 'Du har en gammal version av SeedDMS. Senaste versionen är [latestversion].',
 'no_default_keywords' => 'Inga nyckelord tillgängliga',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Inga dokument är låsta.',
 'no_docs_to_approve' => 'Det finns inga dokument som du behöver godkänna.',
 'no_docs_to_look_at' => 'Det finns inga dokument som behöver godkännas eller granskas.',
@@ -680,6 +683,7 @@ URL: [url]',
 'quota_exceeded' => 'Din minneskvot har överskridits med [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'Din maximala minneskvot har överskridits med [bytes]. Ta bort dokument eller tidigare versioner.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Uppdatera',
 'rejected' => 'Avvisat',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 36b64ef5c..466cb247c 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -62,6 +62,7 @@ URL: [url]',
 'add_review' => 'Kabul et',
 'add_subfolder' => 'Alt klasör ekle',
 'add_to_clipboard' => 'Panoya ekle',
+'add_transmittal' => '',
 'add_user' => 'Yeni kullanıcı ekle',
 'add_user_to_group' => 'Kullanıcıyı gruba ekle',
 'add_workflow' => 'Yeni iş akışı ekle',
@@ -263,6 +264,7 @@ URL: [url]',
 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
 'documents_only' => 'Sadece dokümanlar',
 'documents_to_approve' => 'Onayınızı bekleyen dokümanlar',
+'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
 'document_already_checkedout' => '',
@@ -627,6 +629,7 @@ URL: [url]',
 'no_attached_files' => 'Ek dosya yok',
 'no_current_version' => 'Kullandığınız SeedDMS versiyonu eski görünüyor. Son versiyon [latestversion].',
 'no_default_keywords' => 'Anahtar kelime yok',
+'no_docs_checked_out' => '',
 'no_docs_locked' => 'Kilitli doküman yok.',
 'no_docs_to_approve' => 'Şu anda onay bekleyen doküman yok.',
 'no_docs_to_look_at' => 'Dikkat edilmesi gereken bir doküman yok.',
@@ -696,6 +699,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'quota_exceeded' => 'Size ayrılan disk kotası [bytes] aşıldı.',
 'quota_is_disabled' => 'Kota desteği ayarlardan kapatılmış durumda. Açılana kadar kullanıcıya kota tanımlamanın bir etkisi olmaz.',
 'quota_warning' => 'Size ayrılan disk kotası [bytes] aşıldı. Lütfen gereksiz olduğunu düşündüğünüz dokümanları veya eski versiyonları silin.',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Yenile',
 'rejected' => 'Reddedildi',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 1a7514ba9..e58a9afad 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (552), fengjohn (5)
+//    Translators: Admin (575), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => '提交校对',
 'add_subfolder' => '添加子文件夹',
 'add_to_clipboard' => '复制',
+'add_transmittal' => '',
 'add_user' => '添加新用户',
 'add_user_to_group' => '',
 'add_workflow' => '',
@@ -248,6 +249,7 @@ URL: [url]',
 'documents_locked_by_you' => '被您锁定的文档',
 'documents_only' => '指定文件',
 'documents_to_approve' => '待您审核的文档',
+'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_user_requiring_attention' => '需您关注的文档',
 'document_already_checkedout' => '',
@@ -341,8 +343,8 @@ URL: [url]',
 'files_deletion' => '删除文件',
 'files_deletion_warning' => '通过此操作，您可以删除整个DMS(文档管理系统)文件夹里的所有文件.但版本信息将被保留',
 'file_size' => '文件大小',
-'filter_for_documents' => '',
-'filter_for_folders' => '',
+'filter_for_documents' => '文档新增过滤',
+'filter_for_folders' => '文件夹新增过滤',
 'folder' => '文件夹',
 'folders' => '文件夹',
 'folders_and_documents_statistic' => '内容概要',
@@ -484,15 +486,15 @@ URL: [url]',
 'mimetype' => 'MIME类型',
 'minutes' => '',
 'misc' => '其他',
-'missing_checksum' => '',
-'missing_filesize' => '',
+'missing_checksum' => '缺失校验',
+'missing_filesize' => '缺失文件大小',
 'missing_transition_user_group' => '',
 'monday' => 'Monday',
 'monday_abbr' => '',
 'monthly' => '',
 'month_view' => '月视图',
 'move' => '移动',
-'move_clipboard' => '',
+'move_clipboard' => '移动剪切板',
 'move_document' => '移动文档',
 'move_folder' => '移动文件夹',
 'my_account' => '我的账户',
@@ -534,6 +536,7 @@ URL: [url]',
 'no_attached_files' => '无附件',
 'no_current_version' => '',
 'no_default_keywords' => '无关键字',
+'no_docs_checked_out' => '',
 'no_docs_locked' => '无锁定的文档',
 'no_docs_to_approve' => '当前没有需要审核的文档',
 'no_docs_to_look_at' => '没有需要关注的文档',
@@ -555,7 +558,7 @@ URL: [url]',
 'old' => 'Old',
 'only_jpg_user_images' => '只用jpg格式的图片才可以作为用户身份图片',
 'order_by_sequence_off' => '',
-'original_filename' => '',
+'original_filename' => '原始文件名',
 'owner' => '所有者',
 'ownership_changed_email' => '所有者已变更',
 'ownership_changed_email_body' => '',
@@ -587,6 +590,7 @@ URL: [url]',
 'quota_exceeded' => '',
 'quota_is_disabled' => '配额的支持',
 'quota_warning' => '',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => '',
 'rejected' => '拒绝',
@@ -640,7 +644,7 @@ URL: [url]',
 'rm_document_category' => '删除分类',
 'rm_file' => '删除文件',
 'rm_folder' => '删除文件夹',
-'rm_from_clipboard' => '',
+'rm_from_clipboard' => '从剪切板删除',
 'rm_group' => '删除该组',
 'rm_transmittal' => '',
 'rm_user' => '删除该用户',
@@ -806,8 +810,8 @@ URL: [url]',
 'settings_extraPath_desc' => '附加软件的路径。这是包含目录，例如在ADODB目录或额外的PEAR包',
 'settings_firstDayOfWeek' => '',
 'settings_firstDayOfWeek_desc' => '',
-'settings_footNote' => '',
-'settings_footNote_desc' => '',
+'settings_footNote' => '附注',
+'settings_footNote_desc' => '显示在每个页面底部的信息',
 'settings_guestID' => '',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
@@ -821,7 +825,7 @@ URL: [url]',
 'settings_install_welcome_title' => '',
 'settings_install_zendframework' => '',
 'settings_language' => '语言设置',
-'settings_language_desc' => '',
+'settings_language_desc' => '默认语言（“语言”文件夹的一个子文件夹的名字',
 'settings_logFileEnable' => '',
 'settings_logFileEnable_desc' => '',
 'settings_logFileRotation' => '',
@@ -864,12 +868,12 @@ URL: [url]',
 'settings_php_version' => '',
 'settings_presetExpirationDate' => '',
 'settings_presetExpirationDate_desc' => '',
-'settings_previewWidthDetail' => '',
-'settings_previewWidthDetail_desc' => '',
-'settings_previewWidthList' => '',
-'settings_previewWidthList_desc' => '',
-'settings_printDisclaimer' => '',
-'settings_printDisclaimer_desc' => '',
+'settings_previewWidthDetail' => '缩略图宽度（详情页中)',
+'settings_previewWidthDetail_desc' => '详情页面中缩略图的宽度',
+'settings_previewWidthList' => '缩略图宽度(列表中)',
+'settings_previewWidthList_desc' => '列表中缩略图的宽度',
+'settings_printDisclaimer' => '显示免责声明',
+'settings_printDisclaimer_desc' => '如果开启，这个免责声明信息将在每个页面的底部显示',
 'settings_quota' => '',
 'settings_quota_desc' => '',
 'settings_restricted' => '',
@@ -882,11 +886,11 @@ URL: [url]',
 'settings_Server' => '',
 'settings_showMissingTranslations' => '',
 'settings_showMissingTranslations_desc' => '',
-'settings_Site' => '',
+'settings_Site' => '站点设置',
 'settings_siteDefaultPage' => '网站的默认页',
 'settings_siteDefaultPage_desc' => '',
-'settings_siteName' => '',
-'settings_siteName_desc' => '',
+'settings_siteName' => '站点名称',
+'settings_siteName_desc' => '用于页面标题的站点名称，默认为SeedDMS',
 'settings_SMTP' => 'SMTP 服务器设定',
 'settings_smtpPassword' => '',
 'settings_smtpPassword_desc' => '',
@@ -915,9 +919,9 @@ URL: [url]',
 'settings_strictFormCheck' => '',
 'settings_strictFormCheck_desc' => '',
 'settings_suggestionvalue' => '',
-'settings_System' => '',
+'settings_System' => '系统设置',
 'settings_theme' => '主题设置',
-'settings_theme_desc' => '',
+'settings_theme_desc' => '默认风格（“风格”文件夹的一个子文件夹的名字',
 'settings_titleDisplayHack' => '',
 'settings_titleDisplayHack_desc' => '',
 'settings_undelUserIds' => '',
@@ -966,7 +970,7 @@ URL: [url]',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
-'splash_removed_from_clipboard' => '',
+'splash_removed_from_clipboard' => '已从剪切板删除',
 'splash_rm_attribute' => '',
 'splash_rm_document' => '文档已被移除',
 'splash_rm_folder' => '已删除的文件夹',
@@ -1034,7 +1038,7 @@ URL: [url]',
 'unknown_keyword_category' => '未知类别',
 'unknown_owner' => '未知所有者ID号',
 'unknown_user' => '未知用户ID号',
-'unlinked_content' => '',
+'unlinked_content' => '未链接内容',
 'unlinked_documents' => '',
 'unlinked_folders' => '',
 'unlinking_objects' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 9d214e617..3d24ee2a1 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -63,6 +63,7 @@ URL: [url]',
 'add_review' => '提交校對',
 'add_subfolder' => '添加子資料夾',
 'add_to_clipboard' => '複製',
+'add_transmittal' => '',
 'add_user' => '添加新用戶',
 'add_user_to_group' => '添加新用戶至群組',
 'add_workflow' => '添加工作流程',
@@ -246,6 +247,7 @@ URL: [url]',
 'documents_locked_by_you' => '被您鎖定的文檔',
 'documents_only' => '指定檔',
 'documents_to_approve' => '待您審核的文檔',
+'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_user_requiring_attention' => '需您關注的文檔',
 'document_already_checkedout' => '',
@@ -532,6 +534,7 @@ URL: [url]',
 'no_attached_files' => '無附件',
 'no_current_version' => '',
 'no_default_keywords' => '無關鍵字',
+'no_docs_checked_out' => '',
 'no_docs_locked' => '無鎖定的文檔',
 'no_docs_to_approve' => '當前沒有需要審核的文檔',
 'no_docs_to_look_at' => '沒有需要關注的文檔',
@@ -585,6 +588,7 @@ URL: [url]',
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
 'quota_warning' => '',
+'receipt_summary' => '',
 'recipients' => '',
 'refresh' => '',
 'rejected' => '拒絕',

From 7d664ac105f2851fc2e287b06630f70bd7008945 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 May 2015 08:30:35 +0200
Subject: [PATCH 0077/2006] correct wrong phrase if there are no group receipts

---
 views/bootstrap/class.ReceiptSummary.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 2576ff3ea..725aa16ce 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -135,7 +135,7 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 		if (!$printheader) {
 			echo "</tbody>\n</table>";
 		}else{
-			printMLText("empty_notify_list");
+			printMLText("no_docs_to_receipt");
 		}
 
 

From cf2160993f024578c2acd7a474864633d2e7ffc6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 May 2015 08:32:09 +0200
Subject: [PATCH 0078/2006] correct wrong phrase if there are no group
 approvals/reviews

---
 views/bootstrap/class.ApprovalSummary.php | 2 +-
 views/bootstrap/class.ReviewSummary.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 26c1d1c7d..932b3fb7e 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -133,7 +133,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		if (!$printheader) {
 			echo "</tbody>\n</table>\n";
 		}else{
-			printMLText("empty_notify_list");
+			printMLText("no_approval_needed");
 		}
 
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index fc58772bc..49001f7af 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -135,7 +135,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		if (!$printheader) {
 			echo "</tbody>\n</table>";
 		}else{
-			printMLText("empty_notify_list");
+			printMLText("no_docs_to_review");
 		}
 
 

From 9955a0e07bb744a6152524d4d4d1712a28dbc629 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 11 May 2015 09:28:31 +0200
Subject: [PATCH 0079/2006] rename tblDocumentRevisers to tblDocumentRevisors

---
 install/create_tables-innodb.sql  | 9 +++++----
 install/create_tables-sqlite3.sql | 7 ++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index c88ae3310..92e08a044 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -250,6 +250,7 @@ CREATE TABLE `tblDocumentContent` (
   `mimeType` varchar(100) NOT NULL default '',
   `fileSize` BIGINT,
   `checksum` char(32),
+  `revsiondate` datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY  (`id`),
   UNIQUE (`document`, `version`),
   CONSTRAINT `tblDocumentContent_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`)
@@ -418,10 +419,10 @@ CREATE TABLE `tblDocumentReceiptLog` (
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `tblDocumentRevisers`
+-- Table structure for table `tblDocumentRevisors`
 -- 
 
-CREATE TABLE `tblDocumentRevisers` (
+CREATE TABLE `tblDocumentRevisors` (
   `revisionID` int(11) NOT NULL auto_increment,
   `documentID` int(11) NOT NULL default '0',
   `version` smallint(5) unsigned NOT NULL default '0',
@@ -430,7 +431,7 @@ CREATE TABLE `tblDocumentRevisers` (
   `startdate` datetime default NULL,
   PRIMARY KEY  (`revisionID`),
   UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
-  CONSTRAINT `tblDocumentRevisers_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
+  CONSTRAINT `tblDocumentRevisors_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -447,7 +448,7 @@ CREATE TABLE `tblDocumentRevisionLog` (
   `date` datetime NOT NULL default '0000-00-00 00:00:00',
   `userID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`revisionLogID`),
-  CONSTRAINT `tblDocumentRevisionLog_revision` FOREIGN KEY (`revisionID`) REFERENCES `tblDocumentRevisers` (`revisionID`) ON DELETE CASCADE,
+  CONSTRAINT `tblDocumentRevisionLog_revision` FOREIGN KEY (`revisionID`) REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
   CONSTRAINT `tblDocumentRevisionLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index def876660..5d38a6c1e 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -223,6 +223,7 @@ CREATE TABLE `tblDocumentContent` (
   `mimeType` varchar(70) NOT NULL default '',
   `fileSize` INTEGER,
   `checksum` char(32),
+  `revsiondate` INTEGER default NULL,
   UNIQUE (`document`,`version`)
 ) ;
 
@@ -367,7 +368,7 @@ CREATE TABLE `tblDocumentRecipients` (
 
 CREATE TABLE `tblDocumentRevisionLog` (
   `revisionLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `revisionID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRevisers` (`revisionID`) ON DELETE CASCADE,
+  `revisionID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
   `status` INTEGER NOT NULL default 0,
   `comment` TEXT NOT NULL,
   `date` TEXT NOT NULL default '0000-00-00 00:00:00',
@@ -377,10 +378,10 @@ CREATE TABLE `tblDocumentRevisionLog` (
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `tblDocumentRevisers`
+-- Table structure for table `tblDocumentRevisors`
 -- 
 
-CREATE TABLE `tblDocumentRevisers` (
+CREATE TABLE `tblDocumentRevisors` (
   `revisionID` INTEGER PRIMARY KEY AUTOINCREMENT,
   `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',

From 7b41fa961c9d23ed33ea43d5772232c747bab9af Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 11 May 2015 09:29:00 +0200
Subject: [PATCH 0080/2006] lots of key corrections

---
 languages/ar_EG/lang.inc | 14 +++++++-------
 languages/bg_BG/lang.inc | 14 +++++++-------
 languages/ca_ES/lang.inc | 14 +++++++-------
 languages/cs_CZ/lang.inc | 14 +++++++-------
 languages/de_DE/lang.inc | 14 +++++++-------
 languages/en_GB/lang.inc | 14 +++++++-------
 languages/es_ES/lang.inc | 14 +++++++-------
 languages/fr_FR/lang.inc | 14 +++++++-------
 languages/hu_HU/lang.inc | 14 +++++++-------
 languages/it_IT/lang.inc | 14 +++++++-------
 languages/nl_NL/lang.inc | 14 +++++++-------
 languages/pl_PL/lang.inc | 14 +++++++-------
 languages/pt_BR/lang.inc | 14 +++++++-------
 languages/ro_RO/lang.inc | 14 +++++++-------
 languages/ru_RU/lang.inc | 14 +++++++-------
 languages/sk_SK/lang.inc | 14 +++++++-------
 languages/sv_SE/lang.inc | 14 +++++++-------
 languages/tr_TR/lang.inc | 14 +++++++-------
 languages/zh_CN/lang.inc | 14 +++++++-------
 languages/zh_TW/lang.inc | 14 +++++++-------
 20 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index c38319bf1..29442c0ec 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -180,7 +180,7 @@ URL: [url]',
 'change_password' => 'تغيير كلمة السر',
 'change_password_message' => 'تم تغيير كلمة السر.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'تغيير الحالة',
 'charts' => 'ﺝﺩﺍﻮﻟ',
 'chart_docsaccumulated_title' => '',
@@ -697,7 +697,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - تم ازالة المرفقات',
 'removed_recipient' => '',
 'removed_reviewer' => 'تم ازالته من قائمة المراجعة',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'تم ازالة مسار العمل من اصدار المستند
 مستند: [name]
 اصدار: [version]
@@ -748,8 +748,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - تم تقديم المراجعة',
 'review_summary' => 'ملخص المراجعة',
 'review_update_failed' => 'خطأ في تحديث حالة المراجعة. التحديث فشل.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'اعادة بدء مسار العمل',
 'rewind_workflow_email_body' => 'اعادة بدء مسار العمل
 المستند: [name]
@@ -814,12 +814,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'اضغط لاختيار مجموعة المراجعون',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'اضغط لاختيار موافق فردي',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'اضغط لاختيار مراجع فردي',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'اختر واحد',
 'select_users' => 'اضغط لاختيار المستخدم',
 'select_workflow' => 'اختر مسار العمل',
@@ -1191,7 +1191,7 @@ URL: [url]',
 'update_locked_msg' => 'هذا المستند محمي من التعديل.',
 'update_recipients' => '',
 'update_reviewers' => 'تحيث قائمة المراجعين',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'تم الرفع بواسطة',
 'uploading_failed' => 'عملية رفع واحد من ملفاتك فشلت . من فضلك قم بالتأكد من اقصى ملف يمكن تحميله',
 'uploading_maxsize' => 'الملف المرفوع يتخطى حجم الملف القياسي المسموح',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index b7c9e8e75..5984ee8bc 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -165,7 +165,7 @@ $text = array(
 'change_password' => 'Промени паролата',
 'change_password_message' => 'Паролата променена',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Промени статусът',
 'charts' => '',
 'chart_docsaccumulated_title' => '',
@@ -595,7 +595,7 @@ $text = array(
 'removed_file_email_subject' => '',
 'removed_recipient' => '',
 'removed_reviewer' => 'изтрит от списъка с рецензиращи',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -626,8 +626,8 @@ $text = array(
 'review_submit_email_subject' => '',
 'review_summary' => 'Сводка по рецензиите',
 'review_update_failed' => 'грешка при обновяване статуса на рецензията',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Превърти процес',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
@@ -679,12 +679,12 @@ $text = array(
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Кликни да избереш група рецензенти',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Кликни да избереш утвърждаващ',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Кликни да избереш рецензент',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Избери един',
 'select_users' => 'Кликни да избереш потребители',
 'select_workflow' => 'Избери процес',
@@ -1047,7 +1047,7 @@ $text = array(
 'update_locked_msg' => 'Този документ е блокиран',
 'update_recipients' => '',
 'update_reviewers' => 'Обнови списъка с рецензиращи',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Качен от',
 'uploading_failed' => 'Качването не стана. Свържете се с админа',
 'uploading_maxsize' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 959b17a9a..7742b0961 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -170,7 +170,7 @@ URL: [url]',
 'change_password' => '',
 'change_password_message' => '',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Canviar estat',
 'charts' => '',
 'chart_docsaccumulated_title' => '',
@@ -600,7 +600,7 @@ URL: [url]',
 'removed_file_email_subject' => '',
 'removed_recipient' => '',
 'removed_reviewer' => 'Ha estat eliminat de la llista de revisors',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -631,8 +631,8 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => 'Resum de revisió',
 'review_update_failed' => 'Error actualitzant l\'estat de la revisió. L\'actualizació ha fallat.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => '',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
@@ -684,12 +684,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Seleccionar un',
 'select_users' => '',
 'select_workflow' => '',
@@ -1052,7 +1052,7 @@ URL: [url]',
 'update_locked_msg' => 'Aquest document està bloquejat.',
 'update_recipients' => '',
 'update_reviewers' => 'Actualitzar llista de revisors',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Enviat per',
 'uploading_failed' => 'Enviament (Upload) fallat. Si us plau, contacteu amb l\'administrador.',
 'uploading_maxsize' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 4dd9f5b5f..4aaf43605 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -187,7 +187,7 @@ URL: [url]',
 'change_password' => 'Změnit heslo',
 'change_password_message' => 'Vaše heslo bylo změněno.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Změna stavu',
 'charts' => 'Grafy',
 'chart_docsaccumulated_title' => 'Počet dokumentů',
@@ -708,7 +708,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Odstraněná příloha',
 'removed_recipient' => '',
 'removed_reviewer' => 'byl odstraněn ze seznamu kontrolorů.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Odstraněn pracovní postup z verze dokumentu: [name]
 Verze: [version]
 Praconí postup: [workflow]
@@ -757,8 +757,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Odesláno přezkoumání',
 'review_summary' => 'Souhrn kontroly',
 'review_update_failed' => 'Chyba při aktualizaci stavu kontroly. Aktualizace selhala.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Nové spuštění pracovního postupu',
 'rewind_workflow_email_body' => 'Pracovní postup byl spuštěn znovu
 Dokument: [name]
@@ -823,12 +823,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kliknutím vyberte skupinu posuzovatele',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Kliknutím vyberte jednotlivého schvalovatele',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Klepnutím vyberte jednotlivého posuzovatele',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Vyberte jeden',
 'select_users' => 'Kliknutím vyberte uživatele',
 'select_workflow' => 'Vyberte postup práce',
@@ -1200,7 +1200,7 @@ URL: [url]',
 'update_locked_msg' => 'Tento dokument je zamčený.',
 'update_recipients' => 'Update list of recipients',
 'update_reviewers' => 'Aktualizovat seznam kontrolorů',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Nahrál',
 'uploading_failed' => 'Nahrání selhalo. Prosím, kontaktujte správce.',
 'uploading_maxsize' => 'Nahrávaný soubor je větší než maximální velikost pro upload.',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 5148fb308..79be3092b 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -192,7 +192,7 @@ URL: [url]',
 'change_password' => 'Passwort ändern',
 'change_password_message' => 'Ihr Passwort wurde geändert.',
 'change_recipients' => 'Empfänger ändern',
-'change_revisers' => 'Wiedervorlage ändern',
+'change_revisors' => 'Wiedervorlage ändern',
 'change_status' => 'Status ändern',
 'charts' => 'Diagramme',
 'chart_docsaccumulated_title' => 'Anzahl Dokumente',
@@ -716,7 +716,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Anhang gelöscht',
 'removed_recipient' => 'ist von der Empfängerliste entfernt worden',
 'removed_reviewer' => 'ist von der Prüfer-Liste entfernt worden.',
-'removed_reviser' => 'ist von der Liste der Wiederholungsprüfer entfernt worden.',
+'removed_revispr' => 'ist von der Liste der Wiederholungsprüfer entfernt worden.',
 'removed_workflow_email_body' => 'Workflow von Dokumentenversion entfernt
 Dokument: [name]
 Version: [version]
@@ -777,8 +777,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Prüfung ausgeführt',
 'review_summary' => 'Übersicht Prüfungen',
 'review_update_failed' => 'Störung bei Aktualisierung des Prüfstatus. Aktualisierung gescheitert.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Zurück zum Anfangszustand',
 'rewind_workflow_email_body' => 'Workflow wurde zurückgestellt
 Dokument: [name]
@@ -843,12 +843,12 @@ URL: [url]',
 'select_grp_notification' => 'Klicken zur Auswahl einer Beobachtergruppe',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Klicken zur Auswahl einer Prüfgruppe',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Klicken zur Auswahl eines Freigebers',
 'select_ind_notification' => 'Klicken zur Auswahl eines Beobachters',
 'select_ind_recipients' => 'Click to select individual recipients',
 'select_ind_reviewers' => 'Klicken zur Auswahl eines Prüfers',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Bitte wählen',
 'select_users' => 'Klicken zur Auswahl eines Benutzers',
 'select_workflow' => 'Workflow auswählen',
@@ -1220,7 +1220,7 @@ URL: [url]',
 'update_locked_msg' => 'Dieses Dokument wurde gesperrt<p>Die Sperrung wurde von <a href="mailto:[email]">[username]</a> eingerichtet.<br>',
 'update_recipients' => 'Liste der Empfänger aktualisieren',
 'update_reviewers' => 'Liste der Prüfer aktualisieren',
-'update_reviser' => 'Liste der Wiederholungsprüfer ändern',
+'update_revisor' => 'Liste der Wiederholungsprüfer ändern',
 'uploaded_by' => 'Hochgeladen durch',
 'uploading_failed' => 'Das Hochladen einer Datei ist fehlgeschlagen. Bitte überprüfen Sie die maximale Dateigröße für Uploads.',
 'uploading_maxsize' => 'Die Datei überschreitet die maximale Dateigröße für Uploads.',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 9f7fc5a89..2a326419c 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -192,7 +192,7 @@ URL: [url]',
 'change_password' => 'Change password',
 'change_password_message' => 'Your password has been changed.',
 'change_recipients' => 'Change recipients',
-'change_revisers' => 'Change resubmission',
+'change_revisors' => 'Change resubmission',
 'change_status' => 'Change Status',
 'charts' => 'Charts',
 'chart_docsaccumulated_title' => 'Number of documents',
@@ -716,7 +716,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Removed attachment',
 'removed_recipient' => 'has been removed from the list of recipients.',
 'removed_reviewer' => 'has been removed from the list of reviewers.',
-'removed_reviser' => 'has been removed from the list of resubmitter.',
+'removed_revispr' => 'has been removed from the list of resubmitter.',
 'removed_workflow_email_body' => 'Removed workflow from document version
 Document: [name]
 Version: [version]
@@ -784,8 +784,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Submitted review',
 'review_summary' => 'Review Summary',
 'review_update_failed' => 'Error updating review status. Update failed.',
-'reviser_already_assigned' => 'User is already assigned as an resubmitter.',
-'reviser_already_removed' => 'Resubmitter has already been removed from revision process or has already revised the document.',
+'revisor_already_assigned' => 'User is already assigned as an resubmitter.',
+'revisor_already_removed' => 'Resubmitter has already been removed from revision process or has already revised the document.',
 'rewind_workflow' => 'Rewind workflow',
 'rewind_workflow_email_body' => 'Workflow was rewinded
 Document: [name]
@@ -850,12 +850,12 @@ URL: [url]',
 'select_grp_notification' => 'Click to select group notification',
 'select_grp_recipients' => 'Click to select group of recipients',
 'select_grp_reviewers' => 'Click to select group reviewer',
-'select_grp_revisers' => 'Click to select group of resubmitters',
+'select_grp_revisors' => 'Click to select group of resubmitters',
 'select_ind_approvers' => 'Click to select individual approver',
 'select_ind_notification' => 'Click to select individual notification',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Click to select individual reviewer',
-'select_ind_revisers' => 'Click to select individual resubmitters',
+'select_ind_revisors' => 'Click to select individual resubmitters',
 'select_one' => 'Select one',
 'select_users' => 'Click to select users',
 'select_workflow' => 'Select workflow',
@@ -1227,7 +1227,7 @@ URL: [url]',
 'update_locked_msg' => 'This document is locked.',
 'update_recipients' => '',
 'update_reviewers' => 'Update List of Reviewers',
-'update_reviser' => 'Update list of resubmitters',
+'update_revisor' => 'Update list of resubmitters',
 'uploaded_by' => 'Uploaded by',
 'uploading_failed' => 'Uploading one of your files failed. Please check your maximum upload file size.',
 'uploading_maxsize' => 'The uploaded file exceeds the maximum upload file size.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 1a77229b7..b3c2ff093 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -187,7 +187,7 @@ URL: [url]',
 'change_password' => 'cambiar contraseña',
 'change_password_message' => 'Su contraseña se ha modificado.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'cambiar estado',
 'charts' => 'Gráficos',
 'chart_docsaccumulated_title' => 'Cantidad de documentos',
@@ -712,7 +712,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Eliminar adjunto',
 'removed_recipient' => '',
 'removed_reviewer' => 'Ha sido eliminado de la lista de revisores.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Eliminar flujo de trabajo de la versión del documento
 Documento: [name]
 Versión: [version]
@@ -763,8 +763,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revisión enviada',
 'review_summary' => 'Resumen de revisión',
 'review_update_failed' => 'Error actualizando el estado de la revisión. La actualización ha fallado.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Retroceso del flujo de trabajo',
 'rewind_workflow_email_body' => 'Flujo de trabajo fue retrocedido
 Documento: [name]
@@ -829,12 +829,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Haga Click para seleccionar grupo de revisores',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Haga Click para seleccionar aprobador individual',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Haga Click para seleccionar revisor individual',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Seleccionar uno',
 'select_users' => 'Haga Click para seleccionar usuarios',
 'select_workflow' => 'Selecionar Flujo de Trabajo',
@@ -1206,7 +1206,7 @@ URL: [url]',
 'update_locked_msg' => 'Este documento está bloqueado.',
 'update_recipients' => '',
 'update_reviewers' => 'Actualizar lista de revisores',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Enviado por',
 'uploading_failed' => 'Envío (Upload) fallido. Por favor contacte con el Administrador.',
 'uploading_maxsize' => 'El archivo subido supera el tamaño máximo de upload',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 5f661d3d9..579a46ea8 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -187,7 +187,7 @@ URL: [url]',
 'change_password' => 'Changer de mot de passe',
 'change_password_message' => 'Votre mot de passe a été changé.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Modifier le statut',
 'charts' => 'Graphiques',
 'chart_docsaccumulated_title' => 'Nombre de documents',
@@ -709,7 +709,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Attachement supprimé',
 'removed_recipient' => '',
 'removed_reviewer' => 'a été retiré de la liste des correcteurs.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Workflow du document supprimé: [name]
 Version: [version]
 Workflow: [workflow]
@@ -752,8 +752,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Correction soumise',
 'review_summary' => 'Sommaire de correction',
 'review_update_failed' => 'Erreur lors de la mise à jour de la correction. Echec de la mise à jour.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Remonter le workflow',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '[sitename]: [name] - Le workflow a été réinitialisé',
@@ -805,12 +805,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Cliquer pour choisir un groupe de correcteur',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Cliquer pour choisir un approbateur individuel',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Cliquer pour choisir un correcteur individuel',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Selectionner',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_workflow' => 'Choisir un workflow',
@@ -1173,7 +1173,7 @@ URL: [url]',
 'update_locked_msg' => 'Ce document est verrouillé.',
 'update_recipients' => '',
 'update_reviewers' => 'Mise à jour de la liste de correcteurs',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Déposé par',
 'uploading_failed' => 'Dépose du document échoué. SVP Contactez le responsable.',
 'uploading_maxsize' => 'La taille du fichier téléchargé excède la taille maximale accepté',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 63fdb8e45..0123bb35e 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -187,7 +187,7 @@ URL: [url]',
 'change_password' => 'Jelszó módosítása',
 'change_password_message' => 'Jelszava módosításra került.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Állapot módosítása',
 'charts' => 'Diagramok',
 'chart_docsaccumulated_title' => 'Dokumentumok száma',
@@ -712,7 +712,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Eltávolított melléklet',
 'removed_recipient' => '',
 'removed_reviewer' => 'eltávolításra került a felülvizsgálók listájáról.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Dokumentum változatból eltávolított munkafolyamat
 Dokumentum: [name]
 Verzió: [version]
@@ -763,8 +763,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Beküldött felülvizsgálat',
 'review_summary' => 'Felülvizsgálat összefoglaló',
 'review_update_failed' => 'Hiba a felülvizsgálat állapot frissítése során. Frissítés sikertelen.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Munkafolyamat visszajátszás',
 'rewind_workflow_email_body' => 'Munkafolyamat visszajátszva
 Dokumentum: [name]
@@ -828,12 +828,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kattintson a csoport felülvizsgáló kijelöléséhez',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Kattintson az önálló jóváhagyó kijelöléséhez',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Kattintson az önálló felülvizsgáló kijelöléséhez',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Vßlasszon egyet',
 'select_users' => 'Kattintson a felhasználó kiválasztásához',
 'select_workflow' => 'Munkafolyamat választás',
@@ -1205,7 +1205,7 @@ URL: [url]',
 'update_locked_msg' => 'Ez a dokumentum zárolt.',
 'update_recipients' => '',
 'update_reviewers' => 'Felülvizsgálók listájának frissítése',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Feltöltötte',
 'uploading_failed' => 'Állományai egyikének feltöltése sikertelen. Kérjük ellenőrizze a legnagyobb feltölthető állomány méretet.',
 'uploading_maxsize' => 'A feltöltött fájl nagyobb, mint a megengedezz maximális méret',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index a5bcb9ef0..506b70108 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -192,7 +192,7 @@ URL: [url]',
 'change_password' => 'Cambia la password',
 'change_password_message' => 'La password è stata cambiata',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Modifica lo Stato',
 'charts' => 'Grafici',
 'chart_docsaccumulated_title' => 'Numero di documenti',
@@ -717,7 +717,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Allegato rimosso',
 'removed_recipient' => '',
 'removed_reviewer' => 'é stato rimosso dalla lista dei revisori.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Flusso di lavoro rimosso dalla versione del documento
 Documento: [name]
 Versione: [version]
@@ -785,8 +785,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Sottoposta revisione',
 'review_summary' => 'Dettaglio revisioni',
 'review_update_failed' => 'Errore nella variazione dello stato di revisione. Aggiornamento fallito.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Inverti il flusso di lavoro',
 'rewind_workflow_email_body' => 'Il flusso di lavoro è stato invertito
 Document: [name]
@@ -851,12 +851,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Seleziona gruppo revisore',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Seleziona approvatore',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Seleziona revisore',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Seleziona uno',
 'select_users' => 'Clicca per selezionare gli utenti',
 'select_workflow' => 'Seleziona il flusso di lavoro',
@@ -1228,7 +1228,7 @@ URL: [url]',
 'update_locked_msg' => 'Questo documento è bloccato.',
 'update_recipients' => '',
 'update_reviewers' => 'Aggiorna lista revisori',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Caricato da',
 'uploading_failed' => 'Upload fallito. Controllare la dimensione massima caricabile consentita.',
 'uploading_maxsize' => 'Il file caricato supera la dimensione massima consentita.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 665102946..0130a989b 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -180,7 +180,7 @@ URL: [url]',
 'change_password' => 'Wijzig wachtwoord',
 'change_password_message' => 'Wachtwoord is gewijzigd.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Wijzig Status',
 'charts' => 'Grafieken',
 'chart_docsaccumulated_title' => 'Aantal documenten',
@@ -705,7 +705,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Bijlage verwijderd',
 'removed_recipient' => '',
 'removed_reviewer' => 'is verwijderd uit de lijst van [Controleurs].',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Workflow verwijderd van document versiedocument: [name]
 Versie: [version]
 Workflow: [workflow]
@@ -754,8 +754,8 @@ URL: [url',
 'review_submit_email_subject' => '[sitename]: [name] - Beoordeling toegevoegd',
 'review_summary' => '[Controle] Samenvatting',
 'review_update_failed' => 'Foutmelding: fout bij bijwerken [Controle] Status. Bijwerken mislukt.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Terugzetten workflow',
 'rewind_workflow_email_body' => 'Workflow is teruggezet
 Document: [name]
@@ -820,12 +820,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Klik om groep beoordelaar te selecteren',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Klik om individuele beoordelaar te selecteren',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Klik om individuele beoordelaar te selecteren',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Selecteer een',
 'select_users' => 'Klik om gebruikers te selecteren',
 'select_workflow' => 'Selecteer workflow',
@@ -1197,7 +1197,7 @@ URL: [url]',
 'update_locked_msg' => 'Dit document is geblokkeerd.',
 'update_recipients' => '',
 'update_reviewers' => 'Bijwerken lijst van [Controleurs]',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Ge-upload door',
 'uploading_failed' => 'Upload mislukt. Neem contact op met de [Beheerder].',
 'uploading_maxsize' => 'Het geuploade bestand overschrijdt de maximum grootte.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 673290531..8cf4f90c6 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -180,7 +180,7 @@ URL: [url]',
 'change_password' => 'Zmiana hasła',
 'change_password_message' => 'Twoje hasło zostało zmienione.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Zmień status',
 'charts' => 'Wykresy',
 'chart_docsaccumulated_title' => 'Liczba dokumentów',
@@ -705,7 +705,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Usunięty załącznik',
 'removed_recipient' => '',
 'removed_reviewer' => 'został usunięty z listy recenzentów.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Usunięcie procesu z wersji dokumentu
 Dokument: [name]
 Wersja: [version]
@@ -742,8 +742,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Napisano recenzję',
 'review_summary' => 'Podsumowanie opiniowania',
 'review_update_failed' => 'Błąd podczas aktualizowania statusu recenzji. Aktualizacja nie powiodła się.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Przewiń proces',
 'rewind_workflow_email_body' => 'Przewinięcie procesu
 Dokument: [name]
@@ -808,12 +808,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kliknij by wybrać grupę recenzentów',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Kliknij by wybrać zatwierdzającego',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Kliknij by wybrać recenzenta',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Wybierz',
 'select_users' => 'Kliknij by wybrać użytkowników',
 'select_workflow' => 'Wybierz proces',
@@ -1185,7 +1185,7 @@ URL: [url]',
 'update_locked_msg' => 'Ten dokument jest zablokowany.',
 'update_recipients' => '',
 'update_reviewers' => 'Aktualizuj listę recenzentów',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Przesłane przez',
 'uploading_failed' => 'Przesyłanie nie powiodło się. Skontaktuj się z administratorem.',
 'uploading_maxsize' => 'Rozmiar pliku większy niż dopuszczalny',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 99a3a80be..9325dbb65 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -187,7 +187,7 @@ URL: [url]',
 'change_password' => 'Modificar senha',
 'change_password_message' => 'Sua senha foi modificada.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Mudar status',
 'charts' => 'Gráficos',
 'chart_docsaccumulated_title' => 'Número de documentos',
@@ -710,7 +710,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Anexo removido',
 'removed_recipient' => '',
 'removed_reviewer' => 'has been removed from the list of reviewers.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Removido do fluxo de trabalho de documentos version
 Document: [name]
 Versão: [version]
@@ -760,8 +760,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revisão submetida',
 'review_summary' => 'Review Summary',
 'review_update_failed' => 'Error updating review status. Update failed.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Fluxo de trabalho revisto',
 'rewind_workflow_email_body' => 'Fluxo de processo foi revisto
 Documento: [name]
@@ -826,12 +826,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Clique para selecionar o grupo revisor',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Clique para selecionar aprovador indivídual',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Clique para selecionar revisor individual',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Selecione um',
 'select_users' => 'Clique para selecionar os usuários',
 'select_workflow' => 'Selecione o fluxo de trabalho',
@@ -1203,7 +1203,7 @@ URL: [url]',
 'update_locked_msg' => 'Este documento está travado.',
 'update_recipients' => '',
 'update_reviewers' => 'Update List of Reviewers',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Inserido por',
 'uploading_failed' => 'Inserção falhou. Por favor contacte o administrador',
 'uploading_maxsize' => 'O arquivo excede o tamanho máximo permitido para upload.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index a26ee7275..b37ffd735 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -187,7 +187,7 @@ URL: [url]',
 'change_password' => 'Schimbă parola',
 'change_password_message' => 'Parola dumneavoastra a fost schimbată.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Schimbă status',
 'charts' => 'Grafice',
 'chart_docsaccumulated_title' => 'Numărul de documente',
@@ -712,7 +712,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Atașament eliminat',
 'removed_recipient' => '',
 'removed_reviewer' => 'a fost eliminat din lista de revizuitori.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Workflow eliminat din versiunea documentului
 Document: [name]
 Versiune: [version]
@@ -763,8 +763,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revizuire trimisă',
 'review_summary' => 'Sumar revizuire',
 'review_update_failed' => 'Eroare actualizarea status revizuire. Actualizarea a eșuat.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Derulare workflow',
 'rewind_workflow_email_body' => 'Workflow derulat
 Document: [name]
@@ -829,12 +829,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Click pentru a selecta grupul de revizuitori',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Click pentru a selecta un aprobator individual',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Click pentru a selecta un revizuitor individual',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Selectați unul',
 'select_users' => 'Click pentru a selecta utilizatori',
 'select_workflow' => 'Selectați workflow',
@@ -1206,7 +1206,7 @@ URL: [url]',
 'update_locked_msg' => 'Acest document este blocat.',
 'update_recipients' => '',
 'update_reviewers' => 'Actualizare Listă de revizuitori',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Adaugate de',
 'uploading_failed' => 'Încărcarea unuia dintre fișierele a eșuat. Vă rugăm să verificați dimensiunea maximă de încărcare fișiere.',
 'uploading_maxsize' => 'Fișierul încărcat depășește dimensiunea maximă de încărcare fișiere.',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index dead290d1..aa1300b93 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -180,7 +180,7 @@ URL: [url]',
 'change_password' => 'Изменить пароль',
 'change_password_message' => 'Пароль изменён',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Изменить статус',
 'charts' => 'Диаграммы',
 'chart_docsaccumulated_title' => 'Количество документов',
@@ -702,7 +702,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: удалено приложение к «[document]»',
 'removed_recipient' => '',
 'removed_reviewer' => 'удалён из списка рецензирующих',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Удалён процесс из версии документа
 Документ: [name]
 Версия: [version]
@@ -753,8 +753,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: отправлена рецензия на «[name]»',
 'review_summary' => 'Сводка по рецензии',
 'review_update_failed' => 'Ошибка обновления статуса рецензии',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Начать процесс с начала',
 'rewind_workflow_email_body' => 'Процесс был начат с начала
 Документ: [name]
@@ -819,12 +819,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Выберите рецензирующую группу',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Выберите индивидуального утверждающего',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Выберите индивидуального рецензента',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Выберите',
 'select_users' => 'Выберите пользователей',
 'select_workflow' => 'Выберите процесс',
@@ -1196,7 +1196,7 @@ URL: [url]',
 'update_locked_msg' => 'Этот документ заблокирован',
 'update_recipients' => '',
 'update_reviewers' => 'Обновить список рецензирующих',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Загрузил(а)',
 'uploading_failed' => 'Загрузка не удалась. Свяжитесь с администратором.',
 'uploading_maxsize' => 'Размер загруженного файла превышает максимально возможный',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 218c1d78a..453beb798 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -165,7 +165,7 @@ $text = array(
 'change_password' => '',
 'change_password_message' => '',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Zmeniť stav',
 'charts' => '',
 'chart_docsaccumulated_title' => '',
@@ -595,7 +595,7 @@ $text = array(
 'removed_file_email_subject' => '',
 'removed_recipient' => '',
 'removed_reviewer' => 'bol odstránený zo zoznamu kontrolórov.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -626,8 +626,8 @@ $text = array(
 'review_submit_email_subject' => '',
 'review_summary' => 'Zhrnutie kontroly',
 'review_update_failed' => 'Chyba pri aktualizácii stavu kontroly. Aktualizácia zlyhala.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => '',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
@@ -679,12 +679,12 @@ $text = array(
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Vyberte jeden',
 'select_users' => '',
 'select_workflow' => '',
@@ -1047,7 +1047,7 @@ $text = array(
 'update_locked_msg' => 'Tento dokument je zamknutý.',
 'update_recipients' => '',
 'update_reviewers' => 'Aktualizovať zoznam kontrolórov',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Nahral',
 'uploading_failed' => 'Nahranie zlyhalo. Prosám, kontaktujte správcu.',
 'uploading_maxsize' => 'Uploadovaný súbor prekročil maximálnu povolenú velkosť.',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 92786a186..1a02dcfb7 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -180,7 +180,7 @@ URL: [url]',
 'change_password' => 'Ändra lösenord',
 'change_password_message' => 'Ditt lösenord har ändrats.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Ändra status',
 'charts' => 'Diagram',
 'chart_docsaccumulated_title' => 'Antal dokument',
@@ -697,7 +697,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Borttagen bilaga',
 'removed_recipient' => '',
 'removed_reviewer' => 'har tagits bort från listan med personer som ska granska dokumentet.',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Arbetsflöde borttagen från dokument version
 Dokument: [name]
 Version: [version]
@@ -748,8 +748,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Skickat granskning',
 'review_summary' => 'Sammanfattning av granskningen',
 'review_update_failed' => 'Fel vid uppdatering av granskningsstatus. Kunde inte uppdatera.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'Återställ arbetsflödet',
 'rewind_workflow_email_body' => 'Återställ arbetsflödet
 Dokument: [name]
@@ -814,12 +814,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Välj en grupp som ska granska',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Välj en person som ska godkänna',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Välj en person som ska granska',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Välj',
 'select_users' => 'Välj användare',
 'select_workflow' => 'Välj arbetsflöde',
@@ -1191,7 +1191,7 @@ URL: [url]',
 'update_locked_msg' => 'Dokumentet är låst.',
 'update_recipients' => '',
 'update_reviewers' => 'Uppdatera listan med personer som granskar',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Uppladdat av',
 'uploading_failed' => 'Fel vid uppladdningen. Kontakta administratören.',
 'uploading_maxsize' => 'Uppladdade filen översteg maxgränsen för storleken på filstorlek',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 466cb247c..577c43d5a 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -186,7 +186,7 @@ URL: [url]',
 'change_password' => 'Parola degiştir',
 'change_password_message' => 'Parolanız değişti.',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => 'Değişme Durumu',
 'charts' => 'Grafikler',
 'chart_docsaccumulated_title' => 'Doküman sayısı',
@@ -713,7 +713,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Ek silindi',
 'removed_recipient' => '',
 'removed_reviewer' => 'kontrol edenler listesinden çıkarıldı',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => 'Doküman versiyonundan iş akışı silindi
 Doküman: [name]
 Versiyon: [version]
@@ -764,8 +764,8 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Kontrol gönderildi',
 'review_summary' => 'Kontrol Özeti',
 'review_update_failed' => 'Kontrol güncelleme durumu hatalı. Güncelleme başarısız.',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => 'İş akışını geri al',
 'rewind_workflow_email_body' => 'İş akışı geri alındı
 Doküman: [name]
@@ -830,12 +830,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Grup kontrol edeni seçmek için tıklayın',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => 'Bireysel onaylanı seçmek için tıklayın',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Biresysel kontrol edeni seçmek için tıklayın',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => 'Birini seçiniz',
 'select_users' => 'Kullanıcı seçmek için tıklayın',
 'select_workflow' => 'İş akışı seç',
@@ -1207,7 +1207,7 @@ URL: [url]',
 'update_locked_msg' => 'Bu doküman kilitli.',
 'update_recipients' => '',
 'update_reviewers' => 'Kontrol edenlerin listesini güncelle',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => 'Yükleyen',
 'uploading_failed' => 'Dosyalardan biri yüklenirken başarısız oldu. Maksimum yükleme boyutunuzu kontrol ediniz.',
 'uploading_maxsize' => 'Yüklenen dosya maksimum yükleme boyutundan fazla.',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index e58a9afad..59bd81cde 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -169,7 +169,7 @@ URL: [url]',
 'change_password' => '',
 'change_password_message' => '',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => '变更状态',
 'charts' => '图表',
 'chart_docsaccumulated_title' => '',
@@ -601,7 +601,7 @@ URL: [url]',
 'removed_file_email_subject' => '',
 'removed_recipient' => '',
 'removed_reviewer' => '已经从校对人名单中删除',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -632,8 +632,8 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => '校对汇总',
 'review_update_failed' => '错误 更新校对状态.更新失败',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => '',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
@@ -685,12 +685,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => '选择一个',
 'select_users' => '点击选择用户',
 'select_workflow' => '',
@@ -1053,7 +1053,7 @@ URL: [url]',
 'update_locked_msg' => '该文档被锁定',
 'update_recipients' => '',
 'update_reviewers' => '更新校对人名单',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => '上传者',
 'uploading_failed' => '文件太大无法上传！请处理后重新上传。',
 'uploading_maxsize' => '最大上传限制',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 3d24ee2a1..eaa7088d5 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -169,7 +169,7 @@ URL: [url]',
 'change_password' => '變更密碼',
 'change_password_message' => '變更密碼提示',
 'change_recipients' => '',
-'change_revisers' => '',
+'change_revisors' => '',
 'change_status' => '變更狀態',
 'charts' => '圖表',
 'chart_docsaccumulated_title' => '',
@@ -599,7 +599,7 @@ URL: [url]',
 'removed_file_email_subject' => '',
 'removed_recipient' => '',
 'removed_reviewer' => '已經從校對人名單中刪除',
-'removed_reviser' => '',
+'removed_revispr' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
 'remove_marked_files' => '',
@@ -630,8 +630,8 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => '校對匯總',
 'review_update_failed' => '錯誤 更新校對狀態.更新失敗',
-'reviser_already_assigned' => '',
-'reviser_already_removed' => '',
+'revisor_already_assigned' => '',
+'revisor_already_removed' => '',
 'rewind_workflow' => '',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
@@ -683,12 +683,12 @@ URL: [url]',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '',
-'select_grp_revisers' => '',
+'select_grp_revisors' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => '',
-'select_ind_revisers' => '',
+'select_ind_revisors' => '',
 'select_one' => '選擇一個',
 'select_users' => '點擊選擇用戶',
 'select_workflow' => '',
@@ -1051,7 +1051,7 @@ URL: [url]',
 'update_locked_msg' => '該文檔被鎖定',
 'update_recipients' => '',
 'update_reviewers' => '更新校對人名單',
-'update_reviser' => '',
+'update_revisor' => '',
 'uploaded_by' => '上傳者',
 'uploading_failed' => '文件太大無法上傳！請處理後重新上傳。',
 'uploading_maxsize' => '最大上傳限制',

From 0fab2df676607a0917bd2b23d185b82835b89ec4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 11 May 2015 09:29:34 +0200
Subject: [PATCH 0081/2006] many changes on revision workflow

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 555 ++++++++++++++----------
 SeedDMS_Core/Core/inc.ClassGroup.php    |  27 +-
 SeedDMS_Core/Core/inc.ClassUser.php     |  46 +-
 3 files changed, 359 insertions(+), 269 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 49f103a2c..7329b714d 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -64,6 +64,41 @@ define("S_OBSOLETE", -2);
  */
 define("S_EXPIRED",  -3);
 
+/**
+ * The different states a workflow log can be in. This is used in
+ * all tables tblDocumentXXXLog
+ */
+/*
+ * workflow is in a neutral status waiting for action of user
+ */
+define("S_LOG_WAITING",  0);
+
+/*
+ * workflow has been successful ended. The document content has been
+ * approved, reviewed, aknowledged or revised
+ */
+define("S_LOG_ACCEPTED",  1);
+
+/*
+ * workflow has been unsuccessful ended. The document content has been
+ * rejected
+ */
+define("S_LOG_REJECTED",  -1);
+
+/*
+ * user has been removed from workflow. This can be for different reasons
+ * 1. the user has been actively removed from the workflow, 2. the user has
+ * been deleted.
+ */
+define("S_LOG_USER_REMOVED",  -2);
+
+/*
+ * workflow is sleeping until reactivation. The workflow has been set up
+ * but not started. This is only valid for the revision workflow, which
+ * may run over and over again.
+ */
+define("S_LOG_SLEEPING",  -3);
+
 /**
  * Class to represent a document in the document management system
  *
@@ -591,7 +626,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if($lc) {
 			$st=$lc->getStatus();
 
-			if (($st["status"]==S_DRAFT_REV || $st["status"]==S_DRAFT_APP || $st["status"]==S_IN_WORKFLOW || $st["status"]==S_RELEASED) && $this->hasExpired()){
+			if (($st["status"]==S_DRAFT_REV || $st["status"]==S_DRAFT_APP || $st["status"]==S_IN_WORKFLOW || $st["status"]==S_RELEASED || $st["status"]==S_IN_REVISION) && $this->hasExpired()){
 				return $lc->setStatus(S_EXPIRED,"", $this->getOwner());
 			}
 			elseif ($st["status"]==S_EXPIRED && !$this->hasExpired() ){
@@ -1620,7 +1655,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 			$this->_content = array();
 			foreach ($resArr as $row)
-				array_push($this->_content, new SeedDMS_Core_DocumentContent($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum']));
+				array_push($this->_content, new SeedDMS_Core_DocumentContent($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum'], $row['reviѕiondate']));
 		}
 
 		return $this->_content;
@@ -1652,7 +1687,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 
 		$resArr = $resArr[0];
-		return new SeedDMS_Core_DocumentContent($resArr["id"], $this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"], $resArr['fileSize'], $resArr['checksum']);
+		return new SeedDMS_Core_DocumentContent($resArr["id"], $this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"], $resArr['fileSize'], $resArr['checksum'], $resArr['revisiondate']);
 	} /* }}} */
 
 	function getLatestContent() { /* {{{ */
@@ -1666,7 +1701,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 
 			$resArr = $resArr[0];
-			$this->_latestContent = new SeedDMS_Core_DocumentContent($resArr["id"], $this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"], $resArr['fileSize'], $resArr['checksum']);
+			$this->_latestContent = new SeedDMS_Core_DocumentContent($resArr["id"], $this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"], $resArr['fileSize'], $resArr['checksum'], $resArr['revisiondate']);
 		}
 		return $this->_latestContent;
 	} /* }}} */
@@ -2374,15 +2409,27 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				}
 			}
 		}
+		$pendingRevision=false;
+		unset($this->_revisionStatus);  // force to be reloaded from DB
+		$revsisionStatus=$this->getRevisionStatus();
+		if (is_array($revsisionStatus) && count($revsisionStatus)>0) {
+			foreach ($revsisionStatus as $a){
+				if ($a["status"]==0){
+					$pendingRevision=true;
+					break;
+				}
+			}
+		}
 
 		unset($this->_workflow); // force to be reloaded from DB
 		if ($this->getWorkflow()) $this->setStatus(S_IN_WORKFLOW,$msg,$user);
 		elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user);
 		elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user);
+		elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user);
 		else $this->setStatus(S_RELEASED,$msg,$user);
 	} /* }}} */
 
-	function SeedDMS_Core_DocumentContent($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='') { /* {{{ */
+	function SeedDMS_Core_DocumentContent($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='', $revisionDate=null) { /* {{{ */
 		parent::__construct($id);
 		$this->_document = $document;
 		$this->_version = (int) $version;
@@ -2402,6 +2449,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$this->_checksum = $checksum;
 		$this->_workflow = null;
 		$this->_workflowState = null;
+		$this->_revisionDate = $revisionDate;
 	} /* }}} */
 
 	function getVersion() { return $this->_version; }
@@ -2412,6 +2460,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	function getFileName(){ return $this->_version . $this->_fileType; }
 	function getDir() { return $this->_dir; }
 	function getMimeType() { return $this->_mimeType; }
+	function getRevisionDate() { return $this->_revisionDate; }
 	function getDocument() { return $this->_document; }
 
 	function getUser() { /* {{{ */
@@ -2422,6 +2471,21 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 	function getPath() { return $this->_document->getDir() . $this->_version . $this->_fileType; }
 
+	function setRevisionDate($date = false) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		if(!$date)
+			$date = date('Y-m-d');
+
+		$queryStr = "UPDATE tblDocumentContent SET revisiondate = ".$db->qstr($date)." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_revisionDate = $date;
+
+		return true;
+	} /* }}} */
+
 	function setDate($date = false) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
@@ -2566,6 +2630,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * S_DRAFT_APP, 1
 	 * S_RELEASED, 2
 	 * S_IN_WORKFLOW, 3
+	 * S_IN_REVISION, 4
 	 * S_REJECTED, -1
 	 * S_OBSOLETE, -2
 	 * S_EXPIRED, -3
@@ -2892,7 +2957,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (1 || !isset($this->_revisionStatus)) {
 			/* First get a list of all revisions for this document content */
 			$queryStr=
-				"SELECT revisionID FROM tblDocumentRevisers WHERE `version`='".$this->_version
+				"SELECT revisionID FROM tblDocumentRevisors WHERE `version`='".$this->_version
 				."' AND `documentID` = '". $this->_document->getID() ."' ";
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
@@ -2901,16 +2966,16 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if($recs) {
 				foreach($recs as $rec) {
 					$queryStr=
-						"SELECT `tblDocumentRevisers`.*, `tblDocumentRevisionLog`.`revisionLogID`, ".
+						"SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`revisionLogID`, ".
 						"`tblDocumentRevisionLog`.`status`, ".
 						"`tblDocumentRevisionLog`.`comment`, ".
 						"`tblDocumentRevisionLog`.`date`, ".
 						"`tblDocumentRevisionLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` AS `groupName` ".
-						"FROM `tblDocumentRevisers` ".
+						"FROM `tblDocumentRevisors` ".
 						"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
-						"LEFT JOIN `tblUsers` on `tblUsers`.`id` = `tblDocumentRevisers`.`required` ".
-						"LEFT JOIN `tblGroups` on `tblGroups`.`id` = `tblDocumentRevisers`.`required` ".
-						"WHERE `tblDocumentRevisers`.`revisionID` = '". $rec['revisionID'] ."' ".
+						"LEFT JOIN `tblUsers` on `tblUsers`.`id` = `tblDocumentRevisors`.`required` ".
+						"LEFT JOIN `tblGroups` on `tblGroups`.`id` = `tblDocumentRevisors`.`required` ".
+						"WHERE `tblDocumentRevisors`.`revisionID` = '". $rec['revisionID'] ."' ".
 						"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC LIMIT ".(int) $limit;
 
 					$res = $db->getResultArray($queryStr);
@@ -2925,7 +2990,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_revisionStatus;
 	} /* }}} */
 
-	function addIndReviewer($user, $requestUser, $listadmin=false) { /* {{{ */
+	function addIndReviewer($user, $requestUser) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		$userID = $user->getID();
@@ -2934,21 +2999,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if($this->_document->getAccessMode($user) < M_READ) {
 			return -2;
 		}
-		/*
-		if (!isset($this->_readAccessList)) {
-			$this->_readAccessList = $this->_document->getReadAccessList($listadmin);
-		}
-		$approved = false;
-		foreach ($this->_readAccessList["users"] as $appUser) {
-			if ($userID == $appUser->getID()) {
-				$approved = true;
-				break;
-			}
-		}
-		if (!$approved) {
-			return -2;
-		}
-		*/
 
 		// Check to see if the user has already been added to the review list.
 		$reviewStatus = $user->getReviewStatus($this->_document->getID(), $this->_version);
@@ -3155,7 +3205,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
  } /* }}} */
 
-	function addIndApprover($user, $requestUser, $listadmin=false) { /* {{{ */
+	function addIndApprover($user, $requestUser) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		$userID = $user->getID();
@@ -3164,19 +3214,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if($this->_document->getAccessMode($user) < M_READ) {
 			return -2;
 		}
-		/*
-		$readAccessList = $this->_document->getReadAccessList($listadmin);
-		$approved = false;
-		foreach ($readAccessList["users"] as $appUser) {
-			if ($userID == $appUser->getID()) {
-				$approved = true;
-				break;
-			}
-		}
-		if (!$approved) {
-			return -2;
-		}
-		*/
 
 		// Check to see if the user has already been added to the approvers list.
 		$approvalStatus = $user->getApprovalStatus($this->_document->getID(), $this->_version);
@@ -3373,7 +3410,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return 0;
  } /* }}} */
 
-	function addIndRecipient($user, $requestUser, $listadmin=false) { /* {{{ */
+	function addIndRecipient($user, $requestUser) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		$userID = $user->getID();
@@ -3483,46 +3520,85 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return 0;
 	} /* }}} */
 
-	function addIndReviser($user, $requestUser, $listadmin=false) { /* {{{ */
-		$db = $this->_document->_dms->getDB();
+	/**
+	 * Add an individual revisor to the document content
+	 *
+	 * This function adds a user as a revisor but doesn't start the
+	 * revision workflow by default. This behaviour is different from all
+	 * other workflows (approval, review, receipt), because it doesn't add
+	 * the initial entry in the revision log, which starts the workflow.
+	 * It just adds the revisors to the content. The workflow is started
+	 * at a later point in time by adding the first entry in the revision log.
+	 *
+	 * @param object $user user to be added as a revisor
+	 * @param object $requestUser user requesting the addition
+	 * @return integer 0 if successful otherwise a value < 0
+	 */
+	function addRevisor($object, $requestUser) { /* {{{ */
+		$dms = $this->_document->_dms;
+		$db = $dms->getDB();
 
-		$userID = $user->getID();
+		/* getRevisionStatus() returns an array with either an element
+		 * 'indstatus' (user) or 'status' (group) containing the revision log
+		 */
+		if(get_class($object) == $dms->getClassname('user')) {
+			$field = 'indstatus';
+			$type = 0;
 
-		// Get the list of users and groups with read access to this document.
-		if($this->_document->getAccessMode($user) < M_READ) {
-			return -2;
+			// Get the list of users and groups with read access to this document.
+			if($this->_document->getAccessMode($object) < M_READ) {
+				return -2;
+			}
+		} elseif(get_class($object) == $dms->getClassname('group')) {
+			$field = 'status';
+			$type = 1;
+
+			// Get the list of users and groups with read access to this document.
+			if($this->_document->getGroupAccessMode($object) < M_READ) {
+				return -2;
+			}
+		} else {
+			return -1;
 		}
 
-		// Check to see if the user has already been added to the reviser list.
-		$revisionStatus = $user->getRevisionStatus($this->_document->getID(), $this->_version);
+		// Check to see if the user has already been added to the revisor list.
+		$revisionStatus = $object->getRevisionStatus($this->_document->getID(), $this->_version);
 		if (is_bool($revisionStatus) && !$revisionStatus) {
 			return -1;
 		}
+
+		/* There are two cases: 1. the user has not been added at all or 2.
+		 * the user was added before but has been removed later. In both
+		 * cases the user may be added. In case 2. 'indstatus' will be set
+		 * and the last status is -2. If it is not -2, then the user is still
+		 * in the process and cannot be added again.
+		 */
 		$indstatus = false;
-		if (count($revisionStatus["indstatus"]) > 0) {
-			$indstatus = array_pop($revisionStatus["indstatus"]);
-			if($indstatus["status"]!=-2) {
-				// User is already on the list of recipients; return an error.
-				return -3;
+		if(isset($revisionStatus[$field])) {
+			if (count($revisionStatus[$field]) > 0) {
+				$indstatus = array_pop($revisionStatus[$field]);
+				if($indstatus["status"] != S_LOG_USER_REMOVED) {
+					// User is already on the list of recipients; return an error.
+					return -3;
+				}
 			}
 		}
 
-		// Add the user into the revisers database.
-		if (!$indstatus || ($indstatus && $indstatus["status"]!=-2)) {
-			$queryStr = "INSERT INTO `tblDocumentRevisers` (`documentID`, `version`, `type`, `required`) ".
-				"VALUES ('". $this->_document->getID() ."', '". $this->_version ."', '0', '". $userID ."')";
+		// Add the user into the revisors database.
+		if (!$indstatus) {
+			$queryStr = "INSERT INTO `tblDocumentRevisors` (`documentID`, `version`, `type`, `required`) ".
+				"VALUES ('". $this->_document->getID() ."', '". $this->_version ."', '". $type ."', '". $object->getID() ."')";
 			$res = $db->getResult($queryStr);
 			if (is_bool($res) && !$res) {
 				return -1;
 			}
 			$revisionID = $db->getInsertID();
-		}
-		else {
+		} else {
 			$revisionID = isset($indstatus["revisionID"]) ? $indstatus["revisionID"] : NULL;
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $revisionID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+			"VALUES ('". $revisionID ."', '".S_LOG_SLEEPING."', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -3531,63 +3607,12 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return 0;
 	} /* }}} */
 
-	function addGrpReviser($group, $requestUser) { /* {{{ */
-		$db = $this->_document->_dms->getDB();
+	function addIndRevisor($user, $requestUser, $donotstart=true) { /* {{{ */
+		return self::addRevisor($user, $requestUser, $donotstart);
+	} /* }}} */
 
-		$groupID = $group->getID();
-
-		// Get the list of users and groups with read access to this document.
-		if (!isset($this->_readAccessList)) {
-			// TODO: error checking.
-			$this->_readAccessList = $this->_document->getReadAccessList();
-		}
-		$approved = false;
-		foreach ($this->_readAccessList["groups"] as $appGroup) {
-			if ($groupID == $appGroup->getID()) {
-				$approved = true;
-				break;
-			}
-		}
-		if (!$approved) {
-			return -2;
-		}
-
-		// Check to see if the group has already been added to the review list.
-		$revisionStatus = $group->getRevisionStatus($this->_document->getID(), $this->_version);
-		if (is_bool($revisionStatus) && !$revisionStatus) {
-			return -1;
-		}
-		$status = false;
-		if (count($revisionStatus["status"]) > 0) {
-			$status = array_pop($revisionStatus["status"]);
-			if($status["status"]!=-2) {
-				// User is already on the list of recipients; return an error.
-				return -3;
-			}
-		}
-
-		// Add the group into the recipients database.
-		if (!$status || ($status && $status["status"]!=-2)) {
-			$queryStr = "INSERT INTO `tblDocumentRevisers` (`documentID`, `version`, `type`, `required`) ".
-				"VALUES ('". $this->_document->getID() ."', '". $this->_version ."', '1', '". $groupID ."')";
-			$res = $db->getResult($queryStr);
-			if (is_bool($res) && !$res) {
-				return -1;
-			}
-			$revisionID = $db->getInsertID();
-		}
-		else {
-			$revisionID = isset($status["revisionID"]) ? $status["revisionID"] : NULL;
-		}
-
-		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $revisionID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
-		$res = $db->getResult($queryStr);
-		if (is_bool($res) && !$res) {
-			return -1;
-		}
-
-		return 0;
+	function addGrpRevisor($group, $requestUser, $donotstart=true) { /* {{{ */
+		return self::addRevisor($group, $requestUser, $donotstart);
 	} /* }}} */
 
 	/**
@@ -3595,19 +3620,20 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * This method will add an entry to the table tblDocumentReceiptLog.
 	 * It will first check if the user is ment to receipt the document version.
-	 * It not the return value is -3.
-	 * Next it will check if the users has been removed from the list of
+	 * If not the return value is -3.
+	 * Next it will check if the user has been removed from the list of
 	 * recipients. In that case -4 will be returned.
 	 * If the given receipt has been set by the user before, it cannot
-	 * be set again and 0 will be returned. Іf the review could be succesfully
-	 * added, the review log id will be returned.
+	 * be set again and 0 will be returned. Іf the receipt could be succesfully
+	 * added, the receiptview log id will be returned.
 	 *
 	 * @see SeedDMS_Core_DocumentContent::setApprovalByInd()
 	 * @param object $user user doing the receipt
 	 * @param object $requestUser user asking for the receipt, this is mostly
 	 * @param integer $status the status of the receipt, possible values are
-	 *        0=unprocessed (maybe used to reset a status)
+	 *        0=unprocessed (may be used to reset a status)
 	 *        1=received,
+	 *       -1=rejected,
 	 *       -2=user is deleted (use {link
 	 *       SeedDMS_Core_DocumentContent::delIndRecipient} instead)
 	 * the user currently logged in.
@@ -3627,7 +3653,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return -3;
 		}
 		$indstatus = array_pop($receiptStatus["indstatus"]);
-		if ($indstatus["status"]==-2) {
+		if ($indstatus["status"] == S_LOG_USER_REMOVED) {
 			// User has been deleted from recipients
 			return -4;
 		}
@@ -3702,39 +3728,62 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * This method will add an entry to the table tblDocumentRevisionLog.
 	 * It will first check if the user is ment to revision the document version.
-	 * It not the return value is -3.
-	 * Next it will check if the users has been removed from the list of
+	 * If not the return value is -3.
+	 * Next it will check if the user has been removed from the list of
 	 * recipients. In that case -4 will be returned.
 	 * If the given revision has been set by the user before, it cannot
-	 * be set again and 0 will be returned. Іf the review could be succesfully
-	 * added, the review log id will be returned.
+	 * be set again and 0 will be returned. Іf the revision could be succesfully
+	 * added, the revision log id will be returned.
 	 *
 	 * @see SeedDMS_Core_DocumentContent::setApprovalByInd()
 	 * @param object $user user doing the revision
 	 * @param object $requestUser user asking for the revision, this is mostly
+	 * the user currently logged in.
 	 * @param integer $status the status of the revision, possible values are
-	 *        0=unprocessed (maybe used to reset a status)
+	 *        0=unprocessed (may be used to reset a status)
 	 *        1=received,
 	 *       -2=user is deleted (use {link
 	 *       SeedDMS_Core_DocumentContent::delIndRecipient} instead)
-	 * the user currently logged in.
-	 * @return integer new revision log id
+	 *       -3=workflow revision is sleeping
+	 * @return integer new revision log id, 0, or a value < 0. 0 means the
+	 * status has not changed because the new status is equal the current
+	 * status. A value < 0 indicate
+	 * an error. -1: internal error, -3: user may not revise this document
+	 * -4: the user has been removed from the list of revisors,
+	 * -5: the revision has not been started at all.
 	 */
-	function setRevisionByInd($user, $requestUser, $status, $comment) { /* {{{ */
-		$db = $this->_document->_dms->getDB();
+	function setRevision($object, $requestUser, $status, $comment) { /* {{{ */
+		$dms = $this->_document->_dms;
+		$db = $dms->getDB();
 
-		// Check to see if the user can be removed from the review list.
-		$revisionStatus = $user->getRevisionStatus($this->_document->getID(), $this->_version);
+		/* getRevisionStatus() returns an array with either an element
+		 * 'indstatus' (user) or 'status' (group) containing the revision log
+		 */
+		if(get_class($object) == $dms->getClassname('user')) {
+			$field = 'indstatus';
+		} elseif(get_class($object) == $dms->getClassname('group')) {
+			$field = 'status';
+		} else {
+			return -1;
+		}
+
+		// Check to see if the user/group can be removed from the review list.
+		$revisionStatus = $object->getRevisionStatus($this->_document->getID(), $this->_version);
 		if (is_bool($revisionStatus) && !$revisionStatus) {
 			return -1;
 		}
-		if (count($revisionStatus["indstatus"])==0) {
+		if (!isset($revisionStatus[$field])) {
 			// User is not assigned to revision this document. No action required.
 			// Return an error.
 			return -3;
 		}
-		$indstatus = array_pop($revisionStatus["indstatus"]);
-		if ($indstatus["status"]==-2) {
+		$indstatus = array_pop($revisionStatus[$field]);
+
+		/* check if revision workflow has been started already */
+		if($indstatusi['status'] == S_LOG_SLEEPING && ($status == S_LOG_REJECTED || $status == S_LOG_ACCEPTED))
+			return -5;
+
+		if ($indstatus["status"] == -2) {
 			// User has been deleted from recipients
 			return -4;
 		}
@@ -3743,7 +3792,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return 0;
 
 		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
-  	  `comment`, `date`, `userID`) ".
+			`comment`, `date`, `userID`) ".
 			"VALUES ('". $indstatus["revisionID"] ."', '".
 			(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '".
 			$requestUser->getID() ."')";
@@ -3756,53 +3805,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
  } /* }}} */
 
-	/**
-	 * Add a revision to the document content
-	 *
-	 * This method is similar to
-	 * {@see SeedDMS_Core_DocumentContent::setRevisionByInd()} but adds a revision
-	 * for a group instead of a user.
-	 *
-	 * @param object $group group doing the revision
-	 * @param object $requestUser user asking for the revision, this is mostly
-	 * the user currently logged in.
-	 * @return integer new revision log id
-	 */
+	function setRevisionByInd($user, $requestUser, $status, $comment) { /* {{{ */
+		return self::setRevision($user, $requestUser, $status, $comment);
+	} /* }}} */
+
 	function setRevisionByGrp($group, $requestUser, $status, $comment) { /* {{{ */
-		$db = $this->_document->_dms->getDB();
-
-		// Check to see if the user can be removed from the recipient list.
-		$revisionStatus = $group->getRevisionStatus($this->_document->getID(), $this->_version);
-		if (is_bool($revisionStatus) && !$revisionStatus) {
-			return -1;
-		}
-		if (count($revisionStatus)==0) {
-			// User is not assigned to revision this document. No action required.
-			// Return an error.
-			return -3;
-		}
-		if ($revisionStatus[0]["status"]==-2) {
-			// Group has been deleted from recipients
-			return -4;
-		}
-
-		// Check if the status is really different from the current status
-		if ($revisionStatus[0]["status"] == $status)
-			return 0;
-
-		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`recipientsID`, `status`,
-  	  `comment`, `date`, `userID`) ".
-			"VALUES ('". $revisionStatus[0]["recipientsID"] ."', '".
-			(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '".
-			$requestUser->getID() ."')";
-		$res=$db->getResult($queryStr);
-		if (is_bool($res) && !$res)
-			return -1;
-		else {
-			$revisionLogID = $db->getInsertID();
-			return $revisionLogID;
-		}
- } /* }}} */
+		return self::setRevision($group, $requestUser, $status, $comment);
+	} /* }}} */
 
 	function delIndReviewer($user, $requestUser) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
@@ -3817,7 +3826,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (count($reviewStatus["indstatus"])==0) {
 			// User is not assigned to review this document. No action required.
 			// Return an error.
-			return -3;
+			return -2;
 		}
 		$indstatus = array_pop($reviewStatus["indstatus"]);
 		if ($indstatus["status"]!=0) {
@@ -3849,7 +3858,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (count($reviewStatus)==0) {
 			// User is not assigned to review this document. No action required.
 			// Return an error.
-			return -3;
+			return -2;
 		}
 		if ($reviewStatus[0]["status"]!=0) {
 			// User has already submitted a review or has already been deleted;
@@ -3880,7 +3889,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (count($approvalStatus["indstatus"])==0) {
 			// User is not assigned to approve this document. No action required.
 			// Return an error.
-			return -3;
+			return -2;
 		}
 		$indstatus = array_pop($approvalStatus["indstatus"]);
 		if ($indstatus["status"]!=0) {
@@ -3912,7 +3921,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (count($approvalStatus)==0) {
 			// User is not assigned to approve this document. No action required.
 			// Return an error.
-			return -3;
+			return -2;
 		}
 		if ($approvalStatus[0]["status"]!=0) {
 			// User has already submitted an approval or has already been deleted;
@@ -3943,7 +3952,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (count($receiptStatus["indstatus"])==0) {
 			// User is not assigned to receipt this document. No action required.
 			// Return an error.
-			return -3;
+			return -2;
 		}
 		$indstatus = array_pop($receiptStatus["indstatus"]);
 		if ($indstatus["status"]!=0) {
@@ -3975,7 +3984,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (count($receiptStatus["status"])==0) {
 			// User is not assigned to receipt this document. No action required.
 			// Return an error.
-			return -3;
+			return -2;
 		}
 		$status = array_pop($receiptStatus["status"]);
 		if ($tatus["status"]!=0) {
@@ -3994,68 +4003,133 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return 0;
 	} /* }}} */
 
-	function delIndReviser($user, $requestUser) { /* {{{ */
-		$db = $this->_document->_dms->getDB();
+	/**
+	 * Removes a user from the revision workflow
+	 *
+	 * This methods behaves differently from one in the other workflows, e.g.
+	 * {@see SeedDMS_Core_DocumentContent::delIndReviewer}, because it
+	 * also takes into account if the workflow has been started already.
+	 * A workflow has been started, when there are entries in the revision log.
+	 * If the revision workflow has not been started, then the user will
+	 * be silently removed from the list of revisors. If the workflow has
+	 * started already, then log entry will indicated the removal of the
+	 * user (just as it is done with the other workflows)
+	 *
+	 * @param object $object user/group which is to be removed
+	 * @param object $requestUser user requesting the removal
+	 * @return integer 0 if removal was successfull, -1 if an internal error
+	 * occured, -3 if the user is not in the list of revisors
+	 *
+	 */
+	function delRevisor($object, $requestUser, $msg='') { /* {{{ */
+		$dms = $this->_document->_dms;
+		$db = $dms->getDB();
 
-		$userID = $user->getID();
+		/* getRevisionStatus() returns an array with either an element
+		 * 'indstatus' (user) or 'status' (group) containing the revision log
+		 */
+		if(get_class($object) == $dms->getClassname('user')) {
+			$field = 'indstatus';
+			$type = 0;
+		} elseif(get_class($object) == $dms->getClassname('group')) {
+			$field = 'status';
+			$type = 1;
+		} else {
+			return -1;
+		}
 
-		// Check to see if the user can be removed from the reviser list.
-		$revisionStatus = $user->getRevisionStatus($this->_document->getID(), $this->_version);
+		// Check to see if the user/group can be removed from the revisor list.
+		$revisionStatus = $object->getRevisionStatus($this->_document->getID(), $this->_version);
 		if (is_bool($revisionStatus) && !$revisionStatus) {
 			return -1;
 		}
-		if (count($revisionStatus["indstatus"])==0) {
+
+		if (!isset($revisionStatus[$field])) {
 			// User is not assigned to revision this document. No action required.
 			// Return an error.
-			return -3;
-		}
-		$indstatus = array_pop($revisionStatus["indstatus"]);
-		if ($indstatus["status"]!=0) {
-			// User has already submitted a revision or has already been deleted;
-			// return an error.
-			return -3;
+			return -2;
 		}
 
-		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $indstatus["revisionID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
-		$res = $db->getResult($queryStr);
-		if (is_bool($res) && !$res) {
-			return -1;
+		/* If the revision log doesn't contain an entry yet, then remove the
+		 * user/group from the list of revisors. The first case should not happen.
+		 */
+		if(count($revisionStatus[$field]) == 0) {
+			$queryStr = "DELETE from tblDocumentRevisors WHERE `documentID` = ". $this->_document->getID() ." AND `version` = ".$this->_version." AND `type` = ". $type ." AND `required` = ".$object->getID();
+			echo $queryStr;
+			if (!$db->getResult($queryStr)) {
+				return -1;
+			}
+		} else {
+			$indstatus = array_pop($revisionStatus[$field]);
+			if ($indstatus["status"] != S_LOG_WAITING && $indstatus["status"] != S_LOG_SLEEPING) {
+				// User has already submitted a revision or has already been deleted;
+				// return an error.
+				return -3;
+			}
+
+			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+				"VALUES ('". $indstatus["revisionID"] ."', '".S_LOG_USER_REMOVED."', ".$db->qstr($msg).", CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+			$res = $db->getResult($queryStr);
+			if (is_bool($res) && !$res) {
+				return -1;
+			}
 		}
 
 		return 0;
 	} /* }}} */
 
-	function delGrpReviser($group, $requestUser) { /* {{{ */
-		$db = $this->_document->_dms->getDB();
+	function delIndRevisor($user, $requestUser, $msg='') { /* {{{ */
+		return self::delRevisor($user, $requestUser, $msg);
+	} /* }}} */
 
-		$groupID = $group->getID();
+	function delGrpRevisor($group, $requestUser, $msg='') { /* {{{ */
+		return self::delRevisor($group, $requestUser, $msg);
+	} /* }}} */
 
-		// Check to see if the user can be removed from the reviser list.
-		$revisionStatus = $group->getRevisionStatus($this->_document->getID(), $this->_version);
-		if (is_bool($revisionStatus) && !$revisionStatus) {
-			return -1;
-		}
-		if (count($revisionStatus["status"])==0) {
-			// User is not assigned to revision this document. No action required.
-			// Return an error.
-			return -3;
-		}
-		$status = array_pop($revisionStatus["status"]);
-		if ($tatus["status"]!=0) {
-			// User has already submitted a revision or has already been deleted;
-			// return an error.
-			return -3;
+	/**
+	 * Start a new revision workflow
+	 *
+	 * This function starts a new revision unless there are users/groups
+	 * having finished the previous revision. This means the log status
+	 * must be S_LOG_SLEEPING or the user/group was removed (S_LOG_USER_REMOVED)
+	 *
+	 * @param object $requestUser user requesting the revision start
+	 * @param string $msg message saved for the initial log message
+	 */
+	function startRevision($requestUser, $msg='') { /* {{{ */
+		$dms = $this->_document->_dms;
+		$db = $dms->getDB();
+
+		$revisionStatus = self::getRevisionStatus();
+		if(!$revisionStatus)
+			return false;
+
+		/* A new revision may only be started if we are not in the middle of
+		 * revision or the user/group has been removed from the workflow
+		 */
+		foreach($revisionStatus as $status) {
+			if($status['status'] != S_LOG_SLEEPING && $status['status'] != S_LOG_USER_REMOVED)
+				return false;
 		}
 
-		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $status["revisionID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
-		$res = $db->getResult($queryStr);
-		if (is_bool($res) && !$res) {
-			return -1;
+		$db->startTransaction();
+		foreach($revisionStatus as $status) {
+			if($status['status'] == S_LOG_SLEEPING) {
+				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
+					`comment`, `date`, `userID`) ".
+					"VALUES ('". $status["revisionID"] ."', ".
+					S_LOG_WAITING.", ".$db->qstr($msg).", CURRENT_TIMESTAMP, '".
+					$requestUser->getID() ."')";
+				$res=$db->getResult($queryStr);
+				if (is_bool($res) && !$res) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
 		}
+		$db->commitTransaction();
+		return true;
 
-		return 0;
 	} /* }}} */
 
 	/**
@@ -4880,6 +4954,11 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
 	 */
 	protected $_mimeType;
 
+	/**
+	 * @var string date when revision starts
+	 */
+	protected $_revisionDate;
+
 	/**
 	 * @var string name of the file that was originally uploaded
 	 */
@@ -4963,12 +5042,13 @@ class SeedDMS_Core_AddContentResultSet { /* {{{ */
 	} /* }}} */
 
 	function addReviewer($reviewer, $type, $status) { /* {{{ */
+		$dms = $this->_dms;
 
 		if (!is_object($reviewer) || (strcasecmp($type, "i") && strcasecmp($type, "g")) && !is_integer($status)){
 			return false;
 		}
 		if (!strcasecmp($type, "i")) {
-			if (strcasecmp(get_class($reviewer), "SeedDMS_Core_User")) {
+			if (strcasecmp(get_class($reviewer), $dms->getClassname("user"))) {
 				return false;
 			}
 			if ($this->_indReviewers == null) {
@@ -4977,7 +5057,7 @@ class SeedDMS_Core_AddContentResultSet { /* {{{ */
 			$this->_indReviewers[$status][] = $reviewer;
 		}
 		if (!strcasecmp($type, "g")) {
-			if (strcasecmp(get_class($reviewer), "SeedDMS_Core_Group")) {
+			if (strcasecmp(get_class($reviewer), $dms->getClassname("group"))) {
 				return false;
 			}
 			if ($this->_grpReviewers == null) {
@@ -4989,12 +5069,13 @@ class SeedDMS_Core_AddContentResultSet { /* {{{ */
 	} /* }}} */
 
 	function addApprover($approver, $type, $status) { /* {{{ */
+		$dms = $this->_dms;
 
 		if (!is_object($approver) || (strcasecmp($type, "i") && strcasecmp($type, "g")) && !is_integer($status)){
 			return false;
 		}
 		if (!strcasecmp($type, "i")) {
-			if (strcasecmp(get_class($approver), "SeedDMS_Core_User")) {
+			if (strcasecmp(get_class($approver), $dms->getClassname("user"))) {
 				return false;
 			}
 			if ($this->_indApprovers == null) {
@@ -5003,7 +5084,7 @@ class SeedDMS_Core_AddContentResultSet { /* {{{ */
 			$this->_indApprovers[$status][] = $approver;
 		}
 		if (!strcasecmp($type, "g")) {
-			if (strcasecmp(get_class($approver), "SeedDMS_Core_Group")) {
+			if (strcasecmp(get_class($approver), $dms->getClassname("group"))) {
 				return false;
 			}
 			if ($this->_grpApprovers == null) {
diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 693424e1f..ac0eb531b 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -326,7 +326,7 @@ class SeedDMS_Core_Group {
 		$revisionStatus = $this->getRevisionStatus();
 		foreach ($revisionStatus as $r) {
 			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $r["revisionID"] ."', '-2', 'Revisers group removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+				"VALUES ('". $r["revisionID"] ."', '-2', 'Revisors group removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
 			$res=$db->getResult($queryStr);
 			if(!$res) {
 				$db->rollbackTransaction();
@@ -439,27 +439,30 @@ class SeedDMS_Core_Group {
 
 		$status = array();
 
-		// See if the group is assigned as a reviser.
-		$queryStr = "SELECT `tblDocumentRevisers`.*, `tblDocumentRevisionLog`.`status`, ".
+		// See if the group is assigned as a revisor.
+		$queryStr = "SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`status`, ".
 			"`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ".
 			"`tblDocumentRevisionLog`.`userID` ".
-			"FROM `tblDocumentRevisers` ".
+			"FROM `tblDocumentRevisors` ".
 			"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
-			"WHERE `tblDocumentRevisers`.`type`='1' ".
-			($documentID==null ? "" : "AND `tblDocumentRevisers`.`documentID` = '". (int) $documentID ."' ").
-			($version==null ? "" : "AND `tblDocumentRevisers`.`version` = '". (int) $version ."' ").
-			"AND `tblDocumentRevisers`.`required`='". $this->_id ."' ";
+			"WHERE `tblDocumentRevisors`.`type`='1' ".
+			($documentID==null ? "" : "AND `tblDocumentRevisors`.`documentID` = '". (int) $documentID ."' ").
+			($version==null ? "" : "AND `tblDocumentRevisors`.`version` = '". (int) $version ."' ").
+			"AND `tblDocumentRevisors`.`required`='". $this->_id ."' ";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
 			return false;
 		if (count($resArr)>0) {
+			$status['status'] = array();
 			foreach ($resArr as $res) {
-				if(isset($status["status"][$res['documentID']])) {
-					if($status["status"][$res['documentID']]['date'] < $res['date']) {
+				if($res['date']) {
+					if(isset($status["status"][$res['documentID']])) {
+						if($status["status"][$res['documentID']]['date'] < $res['date']) {
+							$status["status"][$res['documentID']] = $res;
+						}
+					} else {
 						$status["status"][$res['documentID']] = $res;
 					}
-				} else {
-					$status["status"][$res['documentID']] = $res;
 				}
 			}
 		}
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index f5bb4ebd9..e36631ae6 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -700,7 +700,7 @@ class SeedDMS_Core_User {
 		$revisionStatus = $this->getRevisionStatus();
 		foreach ($revisionStatus["indstatus"] as $ri) {
 			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $ri["revisionID"] ."', '-2', 'Reviser removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+				"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
 			$res=$db->getResult($queryStr);
 			if(!$res) {
 				$db->rollbackTransaction();
@@ -1193,56 +1193,62 @@ class SeedDMS_Core_User {
 	 * @param int $documentID optional document id for which to retrieve the
 	 *        revisions
 	 * @param int $version optional version of the document
-	 * @return array list of all revisions
+	 * @return array list of all revisions. If the result array has no elements,
+	 * then the user was not a revisor. If there elements for 'indstatus' or
+	 * 'grpstatus' then the revision hasn't been started.
 	 */
 	function getRevisionStatus($documentID=null, $version=null) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$status = array("indstatus"=>array(), "grpstatus"=>array());
+		$status = array();
 
-		// See if the user is assigned as an individual reviser.
-		$queryStr = "SELECT `tblDocumentRevisers`.*, `tblDocumentRevisionLog`.`status`, ".
+		// See if the user is assigned as an individual revisor.
+		$queryStr = "SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`status`, ".
 			"`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ".
 			"`tblDocumentRevisionLog`.`userID` ".
-			"FROM `tblDocumentRevisers` ".
+			"FROM `tblDocumentRevisors` ".
 			"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
-			"WHERE `tblDocumentRevisers`.`type`='0' ".
-			($documentID==null ? "" : "AND `tblDocumentRevisers`.`documentID` = '". (int) $documentID ."' ").
-			($version==null ? "" : "AND `tblDocumentRevisers`.`version` = '". (int) $version ."' ").
-			"AND `tblDocumentRevisers`.`required`='". $this->_id ."' ".
+			"WHERE `tblDocumentRevisors`.`type`='0' ".
+			($documentID==null ? "" : "AND `tblDocumentRevisors`.`documentID` = '". (int) $documentID ."' ").
+			($version==null ? "" : "AND `tblDocumentRevisors`.`version` = '". (int) $version ."' ").
+			"AND `tblDocumentRevisors`.`required`='". $this->_id ."' ".
 			"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return false;
 		if (count($resArr)>0) {
+			$status['indstatus'] = array();
 			foreach ($resArr as $res) {
-				if(isset($status["indstatus"][$res['documentID']])) {
-					if($status["indstatus"][$res['documentID']]['date'] < $res['date']) {
+				if($res['date']) {
+					if(isset($status["indstatus"][$res['documentID']])) {
+						if($status["indstatus"][$res['documentID']]['date'] < $res['date']) {
+							$status["indstatus"][$res['documentID']] = $res;
+						}
+					} else {
 						$status["indstatus"][$res['documentID']] = $res;
 					}
-				} else {
-					$status["indstatus"][$res['documentID']] = $res;
 				}
 			}
 		}
 
 		// See if the user is the member of a group that has been assigned to
 		// revision the document version.
-		$queryStr = "SELECT `tblDocumentRevisers`.*, `tblDocumentRevisionLog`.`status`, ".
+		$queryStr = "SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`status`, ".
 			"`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ".
 			"`tblDocumentRevisionLog`.`userID` ".
-			"FROM `tblDocumentRevisers` ".
+			"FROM `tblDocumentRevisors` ".
 			"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
-			"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentRevisers`.`required` ".
-			"WHERE `tblDocumentRevisers`.`type`='1' ".
-			($documentID==null ? "" : "AND `tblDocumentRevisers`.`documentID` = '". (int) $documentID ."' ").
-			($version==null ? "" : "AND `tblDocumentRevisers`.`version` = '". (int) $version ."' ").
+			"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentRevisors`.`required` ".
+			"WHERE `tblDocumentRevisors`.`type`='1' ".
+			($documentID==null ? "" : "AND `tblDocumentRevisors`.`documentID` = '". (int) $documentID ."' ").
+			($version==null ? "" : "AND `tblDocumentRevisors`.`version` = '". (int) $version ."' ").
 			"AND `tblGroupMembers`.`userID`='". $this->_id ."' ".
 			"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return false;
 		if (count($resArr)>0) {
+			$status['grpstatus'] = array();
 			foreach ($resArr as $res) {
 				if(isset($status["grpstatus"][$res['documentID']])) {
 					if($status["grpstatus"][$res['documentID']]['date'] < $res['date']) {

From 608a86d45cb14073d4f26da747c483fe9c0e9817 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 11 May 2015 09:30:13 +0200
Subject: [PATCH 0082/2006] rename reviser to revisor, added revision workflow
 to document page

---
 inc/inc.ClassAccessOperation.php       | 27 ++++++--
 op/op.SetRevisers.php                  | 34 +++++++---
 views/bootstrap/class.SetRevisers.php  | 39 +++++++-----
 views/bootstrap/class.ViewDocument.php | 86 +++++++++++++++++++++++++-
 4 files changed, 153 insertions(+), 33 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 9c3ed17fd..08174df6c 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -126,15 +126,15 @@ class SeedDMS_AccessOperation {
 	} /* }}} */
 
 	/**
-	 * Check if revisers may be edited
+	 * Check if revisors may be edited
 	 *
 	 * This check can only be done for documents. Setting the document
-	 * revisers is only allowed if version modification is turned on
+	 * revisors is only allowed if version modification is turned on
 	 * in the settings.  The
-	 * admin may even set revisers if is disallowed in the
+	 * admin may even set revisors if is disallowed in the
 	 * settings.
 	 */
-	function maySetRevisers() { /* {{{ */
+	function maySetRevisors() { /* {{{ */
 		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
@@ -264,5 +264,24 @@ class SeedDMS_AccessOperation {
 		}
 		return false;
 	} /* }}} */
+
+	/**
+	 * Check if document content may be revised
+	 *
+	 * Revising a document content is only allowed if the document was not
+	 * obsoleted. There are other requirements which are not taken into
+	 * account here.
+	 */
+	function mayRevise() { /* {{{ */
+		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
+			$latestContent = $this->obj->getLatestContent();
+			$status = $latestContent->getStatus();
+			if ($status["status"]!=S_OBSOLETE) {
+				return true;
+			}
+		}
+		return false;
+	} /* }}} */
+
 }
 ?>
diff --git a/op/op.SetRevisers.php b/op/op.SetRevisers.php
index 28fdac5ef..b661aa458 100644
--- a/op/op.SetRevisers.php
+++ b/op/op.SetRevisers.php
@@ -56,6 +56,14 @@ if (!is_object($content)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
+if (isset($_POST["startdate"])) {
+	$startdate = $_POST["startdate"];
+} else {
+	$startdate = date('Y-m-d');
+}
+
+$content->setRevisionDate($startdate);
+
 $folder = $document->getFolder();
 
 // Retrieve a list of all users and groups that have read rights.
@@ -87,8 +95,8 @@ foreach ($revisionStatus as $i=>$rs) {
 }
 
 // Get the list of proposed recipients, stripping out any duplicates.
-$pIndRev = (isset($_POST["indRevisers"]) ? array_values(array_unique($_POST["indRevisers"])) : array());
-$pGrpRev = (isset($_POST["grpRevisers"]) ? array_values(array_unique($_POST["grpRevisers"])) : array());
+$pIndRev = (isset($_POST["indRevisors"]) ? array_values(array_unique($_POST["indRevisors"])) : array());
+$pGrpRev = (isset($_POST["grpRevisors"]) ? array_values(array_unique($_POST["grpRevisors"])) : array());
 foreach ($pIndRev as $p) {
 	if (is_numeric($p)) {
 		if (isset($accessIndex["i"][$p])) {
@@ -96,7 +104,7 @@ foreach ($pIndRev as $p) {
 			if (!isset($revisionIndex["i"][$p])) {
 				// Proposed recipient is not a current recipient, so add as a new
 				// recipient.
-				$res = $content->addIndReviser($accessIndex["i"][$p], $user);
+				$res = $content->addIndRevisor($accessIndex["i"][$p], $user);
 				$unm = $accessIndex["i"][$p]->getFullName();
 				$uml = $accessIndex["i"][$p]->getEmail();
 				
@@ -147,17 +155,20 @@ foreach ($pIndRev as $p) {
 }
 if (count($revisionIndex["i"]) > 0) {
 	foreach ($revisionIndex["i"] as $rx=>$rv) {
-		if ($rv["status"] == 0) {
+	//	if ($rv["status"] == 0) {
 			// User is to be removed from the recipients list.
 			if (!isset($accessIndex["i"][$rx])) {
 				// User does not have any revision privileges for this document
 				// revision or does not exist.
+				/* Take this out for now 
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $revisionStatus[$rv["idx"]]["revisionID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
 				$res = $db->getResult($queryStr);
+				 */
+				$res = $content->delIndRevisor($dms->getUser($rx), $user, getMLText("removed_recipient"));
 			}
 			else {
-				$res = $content->delIndReviser($accessIndex["i"][$rx], $user);
+				$res = $content->delIndRevisor($accessIndex["i"][$rx], $user);
 				$unm = $accessIndex["i"][$rx]->getFullName();
 				$uml = $accessIndex["i"][$rx]->getEmail();
 				switch ($res) {
@@ -195,7 +206,7 @@ if (count($revisionIndex["i"]) > 0) {
 						break;
 				}
 			}
-		}
+//		}
 	}
 }
 foreach ($pGrpRev as $p) {
@@ -205,7 +216,7 @@ foreach ($pGrpRev as $p) {
 			if (!isset($revisionIndex["g"][$p])) {
 				// Proposed recipient is not a current recipient, so add as a new
 				// recipient.
-				$res = $content->addGrpReviser($accessIndex["g"][$p], $user);
+				$res = $content->addGrpRevisor($accessIndex["g"][$p], $user);
 				$gnm = $accessIndex["g"][$p]->getName();
 				switch ($res) {
 					case 0:
@@ -251,17 +262,20 @@ foreach ($pGrpRev as $p) {
 }
 if (count($revisionIndex["g"]) > 0) {
 	foreach ($revisionIndex["g"] as $rx=>$rv) {
-		if ($rv["status"] == 0) {
+//		if ($rv["status"] == 0) {
 			// Group is to be removed from the recipientist.
 			if (!isset($accessIndex["g"][$rx])) {
 				// Group does not have any revision privileges for this document
 				// revision or does not exist.
+				/*
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $revisionStatus[$rv["idx"]]["revisionID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
 				$res = $db->getResult($queryStr);
+*/
+				$res = $content->delGrpRevisor($dms->getGroup($rx), $user, getMLText("removed_recipient"));
 			}
 			else {
-				$res = $content->delGrpReviser($accessIndex["g"][$rx], $user);
+				$res = $content->delGrpRevisor($accessIndex["g"][$rx], $user);
 				$gnm = $accessIndex["g"][$rx]->getName();
 				switch ($res) {
 					case 0:
@@ -298,7 +312,7 @@ if (count($revisionIndex["g"]) > 0) {
 						break;
 				}
 			}
-		}
+//		}
 	}
 }
 
diff --git a/views/bootstrap/class.SetRevisers.php b/views/bootstrap/class.SetRevisers.php
index 54e53b978..187ff2f03 100644
--- a/views/bootstrap/class.SetRevisers.php
+++ b/views/bootstrap/class.SetRevisers.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Implementation of SetRevisers view
+ * Implementation of SetRevisors view
  *
  * @category   DMS
  * @package    SeedDMS
@@ -19,7 +19,7 @@
 require_once("class.Bootstrap.php");
 
 /**
- * Class which outputs the html page for SetRevisers view
+ * Class which outputs the html page for SetRevisors view
  *
  * @category   DMS
  * @package    SeedDMS
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2015 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_SetRevisers extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -49,12 +49,15 @@ class SeedDMS_View_SetRevisers extends SeedDMS_Bootstrap_Style {
 		// Retrieve a list of all users and groups that have revision privileges.
 		$docAccess = $document->getReadAccessList();
 
-		// Retrieve list of currently assigned revisers, along with
+		// Retrieve list of currently assigned revisors, along with
 		// their latest status.
 		$revisionStatus = $content->getRevisionStatus();
-		$startdate = '2015-05-23';
+		echo "<pre>";
+		print_r($revisionStatus);
+		echo "</pre>";
+		$startdate = substr($content->getRevisionDate(), 0, 10);
 
-		// Index the revision results for easy cross-reference with the reviser list.
+		// Index the revision results for easy cross-reference with the revisor list.
 		$revisionIndex = array("i"=>array(), "g"=>array());
 		foreach ($revisionStatus as $i=>$rs) {
 			if ($rs["type"]==0) {
@@ -67,27 +70,28 @@ class SeedDMS_View_SetRevisers extends SeedDMS_Bootstrap_Style {
 
 <?php $this->contentContainerStart(); ?>
 
-<form action="../op/op.SetRevisers.php" method="post" name="form1">
+<form action="../op/op.SetRevisors.php" method="post" name="form1">
 
-<?php $this->contentSubHeading(getMLText("update_revisers"));?>
+<?php $this->contentSubHeading(getMLText("update_revisors"));?>
 
-  <span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-    <input class="span4" size="16" name="startdate" type="text" value="<?php if($startdate) echo $startdate; else echo date('d-m-Y'); ?>">
+  <span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+    <input class="span4" size="16" name="startdate" type="text" value="<?php if($startdate) echo $startdate; else echo date('Y-m-d'); ?>">
     <span class="add-on"><i class="icon-calendar"></i></span>
   </span>
 
   <div class="cbSelectTitle"><?php printMLText("individuals")?>:</div>
-  <select class="chzn-select span9" name="indRevisers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_revisers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+  <select class="chzn-select span9" name="indRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 
 		foreach ($docAccess["users"] as $usr) {
 			if (isset($revisionIndex["i"][$usr->getID()])) {
 
 				switch ($revisionIndex["i"][$usr->getID()]["status"]) {
-					case 0:
+					case S_LOG_WAITING:
+					case S_LOG_SLEEPING:
 						print "<option value='". $usr->getID() ."' selected='selected'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
 						break;
-					case -2:
+					case S_LOG_USER_REMOVED:
 						print "<option value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
 						break;
 					default:
@@ -102,19 +106,20 @@ class SeedDMS_View_SetRevisers extends SeedDMS_Bootstrap_Style {
   </select>
 
   <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
-  <select class="chzn-select span9" name="grpRevisers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_revisers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+  <select class="chzn-select span9" name="grpRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
 		foreach ($docAccess["groups"] as $group) {
 			if (isset($revisionIndex["g"][$group->getID()])) {
 				switch ($revisionIndex["g"][$group->getID()]["status"]) {
-					case 0:
+					case S_LOG_WAITING:
+					case S_LOG_SLEEPING:
 						print "<option value='". $group->getID() ."' selected='selected'>".htmlspecialchars($group->getName())."</option>";
 						break;
-					case -2:
+					case S_LOG_USER_REMOVED:
 						print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
 						break;
 					default:
-						print "<option id='recGrp".$group->getID()."' type='checkbox' name='grpRevisers[]' value='". $group->getID() ."' disabled='disabled'>".htmlspecialchars($group->getName())."</option>";
+						print "<option id='recGrp".$group->getID()."' type='checkbox' name='grpRevisors[]' value='". $group->getID() ."' disabled='disabled'>".htmlspecialchars($group->getName())."</option>";
 						break;
 				}
 			} else {
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index b356b735e..f209a02e9 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -178,6 +178,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$reviewStatus = $latestContent->getReviewStatus();
 		$approvalStatus = $latestContent->getApprovalStatus();
 		$receiptStatus = $latestContent->getReceiptStatus();
+		$revisionStatus = $latestContent->getRevisionStatus();
 ?>
 
 <div class="row-fluid">
@@ -330,6 +331,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			if(is_array($receiptStatus) && count($receiptStatus)>0) {
 ?>
 		  <li><a data-target="#recipients" data-toggle="tab"><?php echo getMLText('recipients'); ?></a></li>
+<?php
+			}
+			if(is_array($revisionStatus) && count($revisionStatus)>0) {
+?>
+		  <li><a data-target="#revision" data-toggle="tab"><?php echo getMLText('revise document'); ?></a></li>
 <?php
 			}
 ?>
@@ -450,8 +456,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($accessop->maySetRecipients()) {
 			print "<li><a href='../out/out.SetRecipients.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_recipients")."</a></li>";
 		}
-		if($accessop->maySetRevisers()) {
-			print "<li><a href='../out/out.SetRevisers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_revisers")."</a></li>";
+		if($accessop->maySetRevisors()) {
+			print "<li><a href='../out/out.SetRevisors.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_revisors")."</a></li>";
 		}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
@@ -1036,6 +1042,82 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerEnd();
 ?>
 		  </div>
+<?php
+		}
+		if(is_array($revisionStatus) && count($revisionStatus)>0) {
+?>
+		  <div class="tab-pane" id="revision">
+<?php
+			$this->contentContainerStart();
+			print "<table class=\"table-condensed\">\n";
+
+			print "<tr><td colspan=5>\n";
+			$this->contentSubHeading(getMLText("revisors"));
+			print "</tr>";
+
+			print "<tr>\n";
+			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
+			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";
+			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
+			print "<td width='15%'><b>".getMLText("status")."</b></td>\n";
+			print "<td width='20%'></td>\n";
+			print "</tr>\n";
+
+			foreach ($revisionStatus as $r) {
+				$required = null;
+				$is_recipient = false;
+				switch ($r["type"]) {
+					case 0: // Reviewer is an individual.
+						$required = $dms->getUser($r["required"]);
+						if (!is_object($required)) {
+							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
+						}
+						else {
+							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+						}
+						if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+							$is_recipient = true;
+						break;
+					case 1: // Reviewer is a group.
+						$required = $dms->getGroup($r["required"]);
+						if (!is_object($required)) {
+							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
+						}
+						else {
+							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
+							if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+								$is_recipient = true;
+						}
+						break;
+				}
+				print "<tr>\n";
+				print "<td>".$reqName."</td>\n";
+				print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+				/* $updateUser is the user who has done the receipt */
+				$updateUser = $dms->getUser($r["userID"]);
+				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
+				print "<td>".htmlspecialchars($r["comment"])."</td>\n";
+				print "<td>".getReceiptStatusText($r["status"])."</td>\n";
+				print "<td><ul class=\"unstyled\">";
+
+				if($accessop->mayReview()) {
+					if ($is_recipient && $r["status"]==0) {
+						print "<li><a href=\"../out/out.ReviseDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("add_receipt")."</a></li>";
+					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
+						print "<li><a href=\"../out/out.ReviseDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("edit")."</a></li>";
+					}
+				}
+
+				print "</ul></td>\n";	
+				print "</td>\n</tr>\n";
+			}
+?>
+		</table>
+<?php
+
+			$this->contentContainerEnd();
+?>
+		  </div>
 <?php
 		}
 		if (count($versions)>1) {

From 9859737668d1ebbe85ee9a39c58d5d36951db138 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 11 May 2015 09:32:10 +0200
Subject: [PATCH 0083/2006] fix typo in file

---
 op/{op.SetRevisers.php => op.SetRevisors.php}                    | 0
 out/{out.SetRevisers.php => out.SetRevisors.php}                 | 0
 views/bootstrap/{class.SetRevisers.php => class.SetRevisors.php} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename op/{op.SetRevisers.php => op.SetRevisors.php} (100%)
 rename out/{out.SetRevisers.php => out.SetRevisors.php} (100%)
 rename views/bootstrap/{class.SetRevisers.php => class.SetRevisors.php} (100%)

diff --git a/op/op.SetRevisers.php b/op/op.SetRevisors.php
similarity index 100%
rename from op/op.SetRevisers.php
rename to op/op.SetRevisors.php
diff --git a/out/out.SetRevisers.php b/out/out.SetRevisors.php
similarity index 100%
rename from out/out.SetRevisers.php
rename to out/out.SetRevisors.php
diff --git a/views/bootstrap/class.SetRevisers.php b/views/bootstrap/class.SetRevisors.php
similarity index 100%
rename from views/bootstrap/class.SetRevisers.php
rename to views/bootstrap/class.SetRevisors.php

From 71da44c618a86dc0412b3de972ccf020234cb43d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:05:02 +0200
Subject: [PATCH 0084/2006] add missing files for revising documents

---
 op/op.ReviseDocument.php                 | 217 +++++++++++++++++++++++
 views/bootstrap/class.ReviseDocument.php | 199 +++++++++++++++++++++
 2 files changed, 416 insertions(+)
 create mode 100644 op/op.ReviseDocument.php
 create mode 100644 views/bootstrap/class.ReviseDocument.php

diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
new file mode 100644
index 000000000..ec035177a
--- /dev/null
+++ b/op/op.ReviseDocument.php
@@ -0,0 +1,217 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.ClassEmail.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
+
+/* Check if the form data comes for a trusted request */
+if(!checkFormKey('revisedocument')) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
+}
+
+if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$documentid = $_POST["documentid"];
+$document = $dms->getDocument($documentid);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_READ) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
+if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+$version = $_POST["version"];
+$content = $document->getContentByVersion($version);
+
+if (!is_object($content)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+// operation is only allowed for the last document version
+$latestContent = $document->getLatestContent();
+if ($latestContent->getVersion()!=$version) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+// verify if document has expired
+if ($document->hasExpired()){
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
+if (!isset($_POST["revisionStatus"]) || !is_numeric($_POST["revisionStatus"]) ||
+		(intval($_POST["revisionStatus"])!=1 && intval($_POST["revisionStatus"])!=-1)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_revision_status"));
+}
+
+if ($_POST["revisionType"] == "ind") {
+	$comment = $_POST["comment"];
+	$revisionLogID = $latestContent->setRevision($user, $user, $_POST["revisionStatus"], $comment);
+} elseif ($_POST["revisionType"] == "grp") {
+	$comment = $_POST["comment"];
+	$group = $dms->getGroup($_POST['revisionGroup']);
+	$revisionLogID = $latestContent->setRevision($group, $user, $_POST["revisionStatus"], $comment);
+}
+
+if(0 > $revisionLogID) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("revision_update_failed"));
+} else {
+	// Send an email notification to the document updater.
+	if($notifier) {
+		$nl=$document->getNotifyList();
+		$folder = $document->getFolder();
+
+		$subject = "revision_submit_email_subject";
+		$message = "revision_submit_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['version'] = $version;
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getRevisionStatusText($_POST["revisionStatus"]);
+		$params['comment'] = $comment;
+		$params['username'] = $user->getFullName();
+		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
+		}
+		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+	}
+}
+
+/* Check to see if the overall status for the document version needs
+ * to be updated.
+ */
+if ($_POST["revisionStatus"] == -1){
+
+	if($content->setStatus(S_REJECTED,$comment,$user)) {
+		// Send notification to subscribers.
+		if($notifier) {
+			$nl=$document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "document_status_changed_email_subject";
+			$message = "document_status_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['status'] = getRevisionStatusText(S_REJECTED);
+			$params['username'] = $user->getFullName();
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			$notifier->toList($user, $nl["users"], $subject, $message, $params);
+			foreach ($nl["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+		}
+	}
+
+} else {
+
+	$docRevisionStatus = $content->getRevisionStatus();
+	if (is_bool($docRevisionStatus) && !$docRevisionStatus) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_retrieve_revision_snapshot"));
+	}
+	$revisionCT = 0;
+	$revisionTotal = 0;
+	foreach ($docRevisionStatus as $drstat) {
+		if ($drstat["status"] == 1) {
+			$revisionCT++;
+		}
+		if ($drstat["status"] != -2) {
+			$revisionTotal++;
+		}
+	}
+	// If all revisions have been received and there are no rejections,
+	// then release the document otherwise put it back into revision workflow
+	if ($revisionCT == $revisionTotal) {
+		$newStatus=S_RELEASED;
+		if ($content->finishRevision($user, $newStatus, '', getMLText("automatic_status_update"))) {
+			// Send notification to subscribers.
+			if($notifier) {
+				$nl=$document->getNotifyList();
+				$folder = $document->getFolder();
+				$subject = "document_status_changed_email_subject";
+				$message = "document_status_changed_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['status'] = getRevisionStatusText($newStatus);
+				$params['username'] = $user->getFullName();
+				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+				$notifier->toList($user, $nl["users"], $subject, $message, $params);
+				foreach ($nl["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
+			}
+		}
+	} else {
+		/* Setting the status to S_IN_REVISION though it is already in that
+		 * status doesn't harm, as setStatus() will catch it.
+		 */
+		$newStatus=S_IN_REVISION;
+		if($content->setStatus($newStatus,$comment,$user)) {
+			// Send notification to subscribers.
+			if($notifier) {
+				$nl=$document->getNotifyList();
+				$folder = $document->getFolder();
+				$subject = "document_status_changed_email_subject";
+				$message = "document_status_changed_email_body";
+				$params = array();
+				$params['name'] = $document->getName();
+				$params['folder_path'] = $folder->getFolderPathPlain();
+				$params['status'] = getRevisionStatusText($newStatus);
+				$params['username'] = $user->getFullName();
+				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['sitename'] = $settings->_siteName;
+				$params['http_root'] = $settings->_httpRoot;
+				$notifier->toList($user, $nl["users"], $subject, $message, $params);
+				foreach ($nl["groups"] as $grp) {
+					$notifier->toGroup($user, $grp, $subject, $message, $params);
+				}
+				$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+			}
+		}
+	}
+}
+
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+
+?>
diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
new file mode 100644
index 000000000..88523777f
--- /dev/null
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Implementation of ReviseDocument view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for ReviseDocument view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_ReviseDocument extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$document = $this->params['document'];
+		$content = $this->params['version'];
+		$revisionid = $this->params['revisionid'];
+
+		$reviews = $content->getRevisionStatus();
+		foreach($reviews as $review) {
+			if($review['revisionID'] == $revisionid) {
+				$revisionStatus = $review;
+				break;
+			}
+		}
+
+		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
+		$this->globalNavigation($folder);
+		$this->contentStart();
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
+		$this->contentHeading(getMLText("submit_review"));
+?>
+<script language="JavaScript">
+function checkIndForm()
+{
+	msg = new Array();
+	if (document.form1.revisionStatus.value == "") msg.push("<?php printMLText("js_no_review_status");?>");
+	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+	if (msg != "") {
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+function checkGrpForm()
+{
+	msg = "";
+	if (document.form1.revisionGroup.value == "") msg += "<?php printMLText("js_no_revision_group");?>\n";
+	if (document.form1.revisionStatus.value == "") msg += "<?php printMLText("js_no_revision_status");?>\n";
+	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
+	if (msg != "")
+	{
+		alert(msg);
+		return false;
+	}
+	else
+		return true;
+}
+</script>
+
+<?php
+		$this->contentContainerStart();
+
+		// Display the Revision form.
+		if ($revisionStatus['type'] == 0) {
+			if($revisionStatus["status"]!=0) {
+
+				print "<table class=\"folderView\"><thead><tr>";
+				print "<th>".getMLText("status")."</th>";
+				print "<th>".getMLText("comment")."</th>";
+				print "<th>".getMLText("last_update")."</th>";
+				print "</tr></thead><tbody><tr>";
+				print "<td>";
+				printRevisionStatusText($revisionStatus["status"]);
+				print "</td>";
+				print "<td>".htmlspecialchars($revisionStatus["comment"])."</td>";
+				$indUser = $dms->getUser($revisionStatus["userID"]);
+				print "<td>".$revisionStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
+				print "</tr></tbody></table><br>";
+			}
+?>
+	<form method="post" action="../op/op.ReviseDocument.php" name="form1" onsubmit="return checkIndForm();">
+	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
+	<table class="table-condensed">
+		<tr>
+			<td><?php printMLText("comment")?>:</td>
+			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
+		</tr>
+		<tr>
+			<td><?php printMLText("revision_status")?></td>
+			<td>
+				<select name="revisionStatus">
+<?php if($revisionStatus['status'] != 1) { ?>
+					<option value='1'><?php printMLText("status_revised")?></option>
+<?php } ?>
+<?php if($revisionStatus['status'] != -1) { ?>
+					<option value='-1'><?php printMLText("rejected")?></option>
+<?php } ?>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td><input type='submit' class="btn" name='indRevision' value='<?php printMLText("submit_revision")?>'/></td>
+		</tr>
+	</table>
+	<input type='hidden' name='revisionType' value='ind'/>
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+	</form>
+<?php
+		}
+		else if ($revisionStatus['type'] == 1) {
+
+			if($revisionStatus["status"]!=0) {
+
+				print "<table class=\"folderView\"><thead><tr>";
+				print "<th>".getMLText("status")."</th>";
+				print "<th>".getMLText("comment")."</th>";
+				print "<th>".getMLText("last_update")."</th>";
+				print "</tr></thead><tbody><tr>";
+				print "<td>";
+				printRevisionStatusText($revisionStatus["status"]);
+				print "</td>";
+				print "<td>".htmlspecialchars($revisionStatus["comment"])."</td>";
+				$indUser = $dms->getUser($revisionStatus["userID"]);
+				print "<td>".$revisionStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
+				print "</tr></tbody></table><br>\n";
+			}
+
+?>
+	<form method="post" action="../op/op.ReviseDocument.php" name="form1" onsubmit="return checkGrpForm();">
+	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
+	<table class="table-condensed">
+		<tr>
+			<td><?php printMLText("comment")?>:</td>
+			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
+		</tr>
+		<tr>
+			<td><?php printMLText("revision_status")?>:</td>
+			<td>
+				<select name="revisionStatus">
+<?php if($revisionStatus['status'] != 1) { ?>
+					<option value='1'><?php printMLText("status_revised")?></option>
+<?php } ?>
+<?php if($revisionStatus['status'] != -1) { ?>
+					<option value='-1'><?php printMLText("rejected")?></option>
+<?php } ?>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td><input type='submit' class="btn" name='groupRevision' value='<?php printMLText("submit_revision")?>'/></td>
+		</tr>
+	</table>
+	<input type='hidden' name='revisionType' value='grp'/>
+	<input type='hidden' name='revisionGroup' value='<?php echo $revisionStatus['required']; ?>'/>
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+	</form>
+<?php
+		}
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From 22c5470b9ba544dfb3d79e3283cf495a1d30c768 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:05:47 +0200
Subject: [PATCH 0085/2006] add missing file to revise document

---
 out/out.ReviseDocument.php | 82 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 out/out.ReviseDocument.php

diff --git a/out/out.ReviseDocument.php b/out/out.ReviseDocument.php
new file mode 100644
index 000000000..a07f4b312
--- /dev/null
+++ b/out/out.ReviseDocument.php
@@ -0,0 +1,82 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$document = $dms->getDocument(intval($_GET["documentid"]));
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$folder = $document->getFolder();
+
+if ($document->getAccessMode($user) < M_READ) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+$version = $_GET["version"];
+$content = $document->getContentByVersion($version);
+if (!is_object($content)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+
+// operation is admitted only for last deocument version
+$latestContent = $document->getLatestContent();
+if ($latestContent->getVersion()!=$version) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+// verify if document has expired
+if ($document->hasExpired()){
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+$revisions = $content->getRevisionStatus();
+if(!$revisions) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_action"));
+}
+
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content, 'revisionid'=>(int) $_GET['revisionid']));
+if($view) {
+	$view->setParam('accessobject', $accessop);
+	$view->show();
+	exit;
+}
+
+?>

From 4c74bda247d9d3ba3fc6a10fb067fe60f7a94546 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:06:23 +0200
Subject: [PATCH 0086/2006] add files to download content of transmittal

---
 controllers/class.TransmittalDownload.php | 40 ++++++++++++++++++
 op/op.TransmittalDownload.php             | 51 +++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 controllers/class.TransmittalDownload.php
 create mode 100644 op/op.TransmittalDownload.php

diff --git a/controllers/class.TransmittalDownload.php b/controllers/class.TransmittalDownload.php
new file mode 100644
index 000000000..73ade9f50
--- /dev/null
+++ b/controllers/class.TransmittalDownload.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Implementation of Transmittal Download controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for downloading a transmittal
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$transmittal = $this->params['transmittal'];
+
+		$items = $transmittal->getItems();
+		foreach($items as $item) {
+			$content = $item->getContent();
+			$document = $content->getDocument();
+			if ($document->getAccessMode($user) >= M_READ) {
+				echo $document->getName();
+			}
+		}
+	}
+}
+
diff --git a/op/op.TransmittalDownload.php b/op/op.TransmittalDownload.php
new file mode 100644
index 000000000..9ddcf6ca2
--- /dev/null
+++ b/op/op.TransmittalDownload.php
@@ -0,0 +1,51 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2011-2013 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
+include("../inc/inc.Authentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
+
+if(isset($_GET["transmittalid"])) {
+	$transmittalid = $_GET["transmittalid"];
+	$transmittal = $dms->getTransmittal($transmittalid);
+
+	if (!is_object($transmittal)) {
+		UI::exitError(getMLText("my_account"), getMLText("invalid_version"));
+	}
+
+	if($transmittal->getUser()->getID() != $user->getID()) {
+		UI::exitError(getMLText("my_account"), getMLText("access_denied"));
+	}
+
+
+	$controller->setParam('transmittal', $transmittal);
+	$controller->run();
+}

From a5d77d7cbbe4b80a0316d9656cca1af3bd670a1c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:07:26 +0200
Subject: [PATCH 0087/2006] add more document lists

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 32 +++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 37eb6f9e8..b1c8916f7 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -691,7 +691,7 @@ class SeedDMS_Core_DMS {
 				$queryStr = '';
 			}
 			break;
-		case 'ReiptByMe': // Documents I have to receipt
+		case 'ReceiptByMe': // Documents I have to receipt
 			$user = $param1;
 			// Get document list for the current user.
 			$receiptStatus = $user->getReceiptStatus();
@@ -714,6 +714,36 @@ class SeedDMS_Core_DMS {
 				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
 			}
 			
+			if (strlen($docCSV)>0) {
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
+							"ORDER BY `statusDate` DESC";
+			} else {
+				$queryStr = '';
+			}
+			break;
+		case 'ReviseByMe': // Documents I have to receipt
+			$user = $param1;
+			// Get document list for the current user.
+			$revisionStatus = $user->getRevisionStatus();
+			
+			// Create a comma separated list of all the documentIDs whose information is
+			// required.
+			$dList = array();
+			foreach ($revisionStatus["indstatus"] as $st) {
+				if (!in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			foreach ($revisionStatus["grpstatus"] as $st) {
+				if (!in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			$docCSV = "";
+			foreach ($dList as $d) {
+				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
+			}
+			
 			if (strlen($docCSV)>0) {
 				$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
 							"ORDER BY `statusDate` DESC";

From 448dc172d0957ef13ecc720ae96901db70054c78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:07:59 +0200
Subject: [PATCH 0088/2006] add functions to manage revising documents

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 112 +++++++++++++++++++++++-
 1 file changed, 108 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 7329b714d..e58dba462 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -637,6 +637,39 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if latest content of the document has a schedult
+	 * revision workflow.
+	 * The method will update the document status log database table
+	 * if needed.
+	 *
+	 * @param object $user user requesting the possible automatic change
+	 * @param string $next next date for review
+	 * @return boolean true if status has changed
+	 */
+	function checkForDueRevisionWorkflow($user, $next=''){ /* {{{ */
+		$lc=$this->getLatestContent();
+		if($lc) {
+			$st=$lc->getStatus();
+
+			if($st["status"] == S_RELEASED) {
+				if($lc->getRevisionDate() && $lc->getRevisionDate() <= date('Y-m-d 00:00:00')) {
+					if($lc->startRevision($user, 'Automatic start of revision workflow')) {
+						if($next) {
+							$tmp = explode('-', substr($next, 0, 10));
+							if(checkdate($tmp[1], $tmp[2], $tmp[0]))
+								$lc->setRevisionDate($next);
+						} else {
+							$lc->setRevisionDate(false);
+						}
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	} /* }}} */
+
 	/**
 	 * Check if document is locked
 	 *
@@ -2475,9 +2508,12 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		if(!$date)
-			$date = date('Y-m-d');
-
-		$queryStr = "UPDATE tblDocumentContent SET revisiondate = ".$db->qstr($date)." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
+			$queryStr = "UPDATE tblDocumentContent SET revisiondate = null WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
+		elseif($date == 'now')
+			$queryStr = "UPDATE tblDocumentContent SET revisiondate = CURRENT_TIMESTAMP WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
+		else
+			$queryStr = "UPDATE tblDocumentContent SET revisiondate = ".$db->qstr($date)." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
+		echo $queryStr;
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -2733,7 +2769,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		// If the supplied value lies outside of the accepted range, return an
 		// error.
-		if ($status < -3 || $status > 3) {
+		if ($status < -3 || $status > 4) {
 			return false;
 		}
 
@@ -2892,6 +2928,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * Get the current receipt status of the document content
 	 * The receipt status is a list of receipts
 	 *
+	 * @param integer $limit maximum number of status changes per receiver
 	 * @return array list of receipts
 	 */
 	function getReceiptStatus($limit=1) { /* {{{ */
@@ -2943,6 +2980,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * Get the current revision status of the document content
 	 * The revision status is a list of revisions
 	 *
+	 * @param integer $limit maximum number of records per revisor
 	 * @return array list of revisions
 	 */
 	function getRevisionStatus($limit=1) { /* {{{ */
@@ -4112,6 +4150,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 		}
 
+		/* Make sure all Logs will be set to the right status, in order to
+		 * prevent inconsistent states. Actually it could be a feature to
+		 * force only some users/groups to revise the document, but for now
+		 * this may not be possible.
+		 */
 		$db->startTransaction();
 		foreach($revisionStatus as $status) {
 			if($status['status'] == S_LOG_SLEEPING) {
@@ -4127,6 +4170,67 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				}
 			}
 		}
+		if(!$this->setStatus(S_IN_REVISION, "Started revision", $requestUser)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+		$db->commitTransaction();
+		return true;
+
+	} /* }}} */
+
+	/**
+	 * Finish a revision workflow
+	 *
+	 * This function ends a revision This means the log status
+	 * is set back S_LOG_SLEEPING and the document status is set as
+	 * passed to the method. The function doesn't not check if all
+	 * users/groups has made it vote already.
+	 *
+	 * @param object $requestUser user requesting the revision start
+	 * @param integer $docstatus document status
+	 * @param string $msg message saved in revision log
+	 * @param string $msg message saved in document status log
+	 */
+	function finishRevision($requestUser, $docstatus, $msg='', $docmsg='') { /* {{{ */
+		$dms = $this->_document->_dms;
+		$db = $dms->getDB();
+
+		$revisionStatus = self::getRevisionStatus();
+		if(!$revisionStatus)
+			return false;
+
+		/* A revision may only be finished if it wasn't finished already
+		 */
+		foreach($revisionStatus as $status) {
+			if($status['status'] == S_LOG_SLEEPING)
+				return false;
+		}
+
+		/* Make sure all Logs will be set to the right status, in order to
+		 * prevent inconsistent states. Actually it could be a feature to
+		 * end only some users/groups to revise the document, but for now
+		 * this may not be possible.
+		 */
+		$db->startTransaction();
+		foreach($revisionStatus as $status) {
+			if($status['status'] != S_LOG_SLEEPING && $status['status'] != S_LOG_USER_REMOVED) {
+				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
+					`comment`, `date`, `userID`) ".
+					"VALUES ('". $status["revisionID"] ."', ".
+					S_LOG_SLEEPING.", ".$db->qstr($msg).", CURRENT_TIMESTAMP, '".
+					$requestUser->getID() ."')";
+				$res=$db->getResult($queryStr);
+				if (is_bool($res) && !$res) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
+		}
+		if(!$this->setStatus($docstatus, $docmsg, $requestUser)) {
+			$db->rollbackTransaction();
+			return false;
+		}
 		$db->commitTransaction();
 		return true;
 

From 309be28256e6a80a75560d426ece925cb1ba2b55 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:08:55 +0200
Subject: [PATCH 0089/2006] add getUser()

---
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index aeba37d7a..bac682edb 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -191,6 +191,8 @@ class SeedDMS_Core_Transmittal {
 		return true;
 	} /* }}} */
 
+	function getUser() { return $this->_user; }
+
 	function getItems() { /* {{{ */
 		$db = $this->_dms->getDB();
 

From 6cfdea17b37b90e92fd96019dc59d7c95dfde868 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:10:02 +0200
Subject: [PATCH 0090/2006] add function to return revision status

---
 inc/inc.Language.php | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index e1c84374a..4baae226a 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -176,7 +176,7 @@ function getReceiptStatusText($status, $date=0) { /* {{{ */
 				return getMLText("status_recipient_removed");
 				break;
 			case -1:
-				return getMLText("status_recipient_rejected").($date !=0 ? " ".$date : "");
+				return getMLText("status_receipt_rejected").($date !=0 ? " ".$date : "");
 				break;
 			case 0:
 				return getMLText("status_not_receipted");
@@ -191,6 +191,38 @@ function getReceiptStatusText($status, $date=0) { /* {{{ */
 	}
 } /* }}} */
 
+function printRevisionStatusText($status, $date=0) { /* {{{ */
+	print getRevisionStatusText($status, $date);
+} /* }}} */
+
+function getRevisionStatusText($status, $date=0) { /* {{{ */
+	if (is_null($status)) {
+		return getMLText("status_unknown");
+	}
+	else {
+		switch ($status) {
+			case -3:
+				return getMLText("status_revision_sleeping");
+				break;
+			case -2:
+				return getMLText("status_revisor_removed");
+				break;
+			case -1:
+				return getMLText("status_revision_rejected").($date !=0 ? " ".$date : "");
+				break;
+			case 0:
+				return getMLText("status_not_revised");
+				break;
+			case 1:
+				return getMLText("status_revised").($date !=0 ? " ".$date : "");
+				break;
+			default:
+				return getMLText("status_unknown");
+				break;
+		}
+	}
+} /* }}} */
+
 function printApprovalStatusText($status, $date=0) { /* {{{ */
 	if (is_null($status)) {
 		print getMLText("status_unknown");
@@ -272,6 +304,9 @@ function getOverallStatusText($status) { /* {{{ */
 			case S_EXPIRED:
 				return getMLText("expired");
 				break;
+			case S_IN_REVISION:
+				return getMLText("in_revision");
+				break;
 			default:
 				return getMLText("status_unknown");
 				break;

From 5296edb8d20af01ea307e68f039541d1d6658835 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:10:40 +0200
Subject: [PATCH 0091/2006] more updates and new phrases

---
 languages/ar_EG/lang.inc | 11 ++++++++++-
 languages/bg_BG/lang.inc | 11 ++++++++++-
 languages/ca_ES/lang.inc | 11 ++++++++++-
 languages/cs_CZ/lang.inc | 11 ++++++++++-
 languages/de_DE/lang.inc | 13 +++++++++++--
 languages/en_GB/lang.inc | 13 +++++++++++--
 languages/es_ES/lang.inc | 13 +++++++++++--
 languages/fr_FR/lang.inc | 11 ++++++++++-
 languages/hu_HU/lang.inc | 11 ++++++++++-
 languages/it_IT/lang.inc | 11 ++++++++++-
 languages/nl_NL/lang.inc | 11 ++++++++++-
 languages/pl_PL/lang.inc | 11 ++++++++++-
 languages/pt_BR/lang.inc | 11 ++++++++++-
 languages/ro_RO/lang.inc | 11 ++++++++++-
 languages/ru_RU/lang.inc | 11 ++++++++++-
 languages/sk_SK/lang.inc | 11 ++++++++++-
 languages/sv_SE/lang.inc | 11 ++++++++++-
 languages/tr_TR/lang.inc | 11 ++++++++++-
 languages/zh_CN/lang.inc | 11 ++++++++++-
 languages/zh_TW/lang.inc | 11 ++++++++++-
 20 files changed, 203 insertions(+), 23 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 29442c0ec..03554a7d2 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -485,6 +485,7 @@ URL: [url]',
 'invalid_target_folder' => 'معرف خاطىء لمجلد الهدف',
 'invalid_user_id' => 'معرف مستخدم خاطىء',
 'invalid_version' => 'اصدار مستند خاطىء',
+'in_revision' => '',
 'in_workflow' => 'رهن مسار عمل',
 'is_disabled' => 'تعطيل الحساب',
 'is_hidden' => 'اخفاء من قائمة المستخدمين',
@@ -748,6 +749,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - تم تقديم المراجعة',
 'review_summary' => 'ملخص المراجعة',
 'review_update_failed' => 'خطأ في تحديث حالة المراجعة. التحديث فشل.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'اعادة بدء مسار العمل',
@@ -1119,10 +1123,15 @@ URL: [url]',
 'status_not_approved' => 'لم تتم الموافقة بعد',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'لم تتم مراجعته بعد',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'تمت المراجعة',
 'status_reviewer_rejected' => 'مسودة مرفوضة',
 'status_reviewer_removed' => 'تم ازالة مراجع من العملية',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'مجهول',
 'storage_size' => 'حجم التخزين',
 'submit_approval' => 'ادخال موافقة',
@@ -1191,7 +1200,7 @@ URL: [url]',
 'update_locked_msg' => 'هذا المستند محمي من التعديل.',
 'update_recipients' => '',
 'update_reviewers' => 'تحيث قائمة المراجعين',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'تم الرفع بواسطة',
 'uploading_failed' => 'عملية رفع واحد من ملفاتك فشلت . من فضلك قم بالتأكد من اقصى ملف يمكن تحميله',
 'uploading_maxsize' => 'الملف المرفوع يتخطى حجم الملف القياسي المسموح',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 5984ee8bc..5bb782a7b 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -416,6 +416,7 @@ $text = array(
 'invalid_target_folder' => 'Неправилен идентификатор на целевата папка',
 'invalid_user_id' => 'Неправилен идентификатор на потребителя',
 'invalid_version' => 'Неправилна версия на документа',
+'in_revision' => '',
 'in_workflow' => 'в процес',
 'is_disabled' => 'забранена сметка',
 'is_hidden' => 'Не показвай в списъка с потребители',
@@ -626,6 +627,9 @@ $text = array(
 'review_submit_email_subject' => '',
 'review_summary' => 'Сводка по рецензиите',
 'review_update_failed' => 'грешка при обновяване статуса на рецензията',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Превърти процес',
@@ -984,10 +988,15 @@ $text = array(
 'status_not_approved' => 'Не утвърден',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Не рецензиран',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Рецензиран',
 'status_reviewer_rejected' => 'Чернова отказана',
 'status_reviewer_removed' => 'Рецензиращия премахнат от процеса',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Неизвестен',
 'storage_size' => 'Размер на хранилището',
 'submit_approval' => 'Утвърди',
@@ -1047,7 +1056,7 @@ $text = array(
 'update_locked_msg' => 'Този документ е блокиран',
 'update_recipients' => '',
 'update_reviewers' => 'Обнови списъка с рецензиращи',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Качен от',
 'uploading_failed' => 'Качването не стана. Свържете се с админа',
 'uploading_maxsize' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 7742b0961..fb2d569f0 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -421,6 +421,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID de carpeta destinació no válid',
 'invalid_user_id' => 'ID d\'usuari no vàlid',
 'invalid_version' => 'La versión de documento no és vàlida',
+'in_revision' => '',
 'in_workflow' => '',
 'is_disabled' => '',
 'is_hidden' => 'Amagar de la llista d\'usuaris',
@@ -631,6 +632,9 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => 'Resum de revisió',
 'review_update_failed' => 'Error actualitzant l\'estat de la revisió. L\'actualizació ha fallat.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => '',
@@ -989,10 +993,15 @@ URL: [url]',
 'status_not_approved' => 'Sense aprovar',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Sense revisar',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Revisat',
 'status_reviewer_rejected' => 'Esborrany rebutjat',
 'status_reviewer_removed' => 'Revisor eliminat del procés',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Desconegut',
 'storage_size' => 'Storage size',
 'submit_approval' => 'Enviar aprovació',
@@ -1052,7 +1061,7 @@ URL: [url]',
 'update_locked_msg' => 'Aquest document està bloquejat.',
 'update_recipients' => '',
 'update_reviewers' => 'Actualitzar llista de revisors',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Enviat per',
 'uploading_failed' => 'Enviament (Upload) fallat. Si us plau, contacteu amb l\'administrador.',
 'uploading_maxsize' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 4aaf43605..3beecc59f 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -492,6 +492,7 @@ URL: [url]',
 'invalid_target_folder' => 'Neplatné cílové ID adresáře',
 'invalid_user_id' => 'Neplatné ID uživatele',
 'invalid_version' => 'Neplatná verze dokumentu',
+'in_revision' => '',
 'in_workflow' => 'Zpracováváno',
 'is_disabled' => 'Zakázaný účet',
 'is_hidden' => 'Utajit v seznamu uživatelů',
@@ -757,6 +758,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Odesláno přezkoumání',
 'review_summary' => 'Souhrn kontroly',
 'review_update_failed' => 'Chyba při aktualizaci stavu kontroly. Aktualizace selhala.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Nové spuštění pracovního postupu',
@@ -1128,10 +1132,15 @@ URL: [url]',
 'status_not_approved' => 'Neschválený',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Nezkontrolovaný',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Zkontrolovaný',
 'status_reviewer_rejected' => 'Návrh zamítnut',
 'status_reviewer_removed' => 'Kontrolor odstraněn z procesu',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Neznámý',
 'storage_size' => 'Velikost úložiště',
 'submit_approval' => 'Poslat ke schválení',
@@ -1200,7 +1209,7 @@ URL: [url]',
 'update_locked_msg' => 'Tento dokument je zamčený.',
 'update_recipients' => 'Update list of recipients',
 'update_reviewers' => 'Aktualizovat seznam kontrolorů',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Nahrál',
 'uploading_failed' => 'Nahrání selhalo. Prosím, kontaktujte správce.',
 'uploading_maxsize' => 'Nahrávaný soubor je větší než maximální velikost pro upload.',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 79be3092b..feb83d058 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2012), dgrutsch (18)
+//    Translators: Admin (2020), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -497,6 +497,7 @@ URL: [url]',
 'invalid_target_folder' => 'Unzulässige Ziel-Ordner Identifikation',
 'invalid_user_id' => 'Unzulässige Benutzernummer',
 'invalid_version' => 'Unzulässige Dokumenten-Version',
+'in_revision' => 'Erneute Prüfung',
 'in_workflow' => 'im Workflow',
 'is_disabled' => 'Anmeldung sperren',
 'is_hidden' => 'In der Benutzerliste verbergen',
@@ -777,6 +778,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Prüfung ausgeführt',
 'review_summary' => 'Übersicht Prüfungen',
 'review_update_failed' => 'Störung bei Aktualisierung des Prüfstatus. Aktualisierung gescheitert.',
+'revise_document' => 'Dokument überprüfen',
+'revise_document_on' => '',
+'revisors' => 'Überprüfer',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Zurück zum Anfangszustand',
@@ -1148,10 +1152,15 @@ URL: [url]',
 'status_not_approved' => 'keine Freigabe',
 'status_not_receipted' => 'Empfang noch nicht bestätigt',
 'status_not_reviewed' => 'nicht geprüft',
+'status_not_revised' => 'nicht überprüft',
+'status_receipted' => 'Empfang bestätigt',
 'status_recipient_removed' => 'Empfänger aus Liste entfernt',
 'status_reviewed' => 'geprüft',
 'status_reviewer_rejected' => 'Entwurf abgelehnt',
 'status_reviewer_removed' => 'Prüfer wurde vom Prozess ausgeschlossen',
+'status_revised' => 'überprüft',
+'status_revision_sleeping' => 'wartend',
+'status_revisor_removed' => 'Überprüfer von Liste entfernt',
 'status_unknown' => 'unbekannt',
 'storage_size' => 'Speicherverbrauch',
 'submit_approval' => 'Freigabe hinzufügen',
@@ -1220,7 +1229,7 @@ URL: [url]',
 'update_locked_msg' => 'Dieses Dokument wurde gesperrt<p>Die Sperrung wurde von <a href="mailto:[email]">[username]</a> eingerichtet.<br>',
 'update_recipients' => 'Liste der Empfänger aktualisieren',
 'update_reviewers' => 'Liste der Prüfer aktualisieren',
-'update_revisor' => 'Liste der Wiederholungsprüfer ändern',
+'update_revisors' => 'Liste der Wiederholungsprüfer ändern',
 'uploaded_by' => 'Hochgeladen durch',
 'uploading_failed' => 'Das Hochladen einer Datei ist fehlgeschlagen. Bitte überprüfen Sie die maximale Dateigröße für Uploads.',
 'uploading_maxsize' => 'Die Datei überschreitet die maximale Dateigröße für Uploads.',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 2a326419c..aa662ec70 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1145), dgrutsch (3), netixw (14)
+//    Translators: Admin (1154), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -497,6 +497,7 @@ URL: [url]',
 'invalid_target_folder' => 'Invalid Target Folder ID',
 'invalid_user_id' => 'Invalid User ID',
 'invalid_version' => 'Invalid Document Version',
+'in_revision' => 'In revision',
 'in_workflow' => 'In workflow',
 'is_disabled' => 'Disable account',
 'is_hidden' => 'Hide from users list',
@@ -784,6 +785,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Submitted review',
 'review_summary' => 'Review Summary',
 'review_update_failed' => 'Error updating review status. Update failed.',
+'revise_document' => 'Revise document',
+'revise_document_on' => 'Next revision of document version on [date]',
+'revisors' => 'Revisors',
 'revisor_already_assigned' => 'User is already assigned as an resubmitter.',
 'revisor_already_removed' => 'Resubmitter has already been removed from revision process or has already revised the document.',
 'rewind_workflow' => 'Rewind workflow',
@@ -1155,10 +1159,15 @@ URL: [url]',
 'status_not_approved' => 'Not approved',
 'status_not_receipted' => 'Not receipted yet',
 'status_not_reviewed' => 'Not reviewed',
+'status_not_revised' => 'not revised',
+'status_receipted' => 'Receipted',
 'status_recipient_removed' => 'Recipient removed from list',
 'status_reviewed' => 'Reviewed',
 'status_reviewer_rejected' => 'Draft rejected',
 'status_reviewer_removed' => 'Reviewer removed from process',
+'status_revised' => 'revised',
+'status_revision_sleeping' => 'pending',
+'status_revisor_removed' => 'Revisor removed from list',
 'status_unknown' => 'Unknown',
 'storage_size' => 'Storage size',
 'submit_approval' => 'Submit approval',
@@ -1227,7 +1236,7 @@ URL: [url]',
 'update_locked_msg' => 'This document is locked.',
 'update_recipients' => '',
 'update_reviewers' => 'Update List of Reviewers',
-'update_revisor' => 'Update list of resubmitters',
+'update_revisors' => 'Update list of resubmitters',
 'uploaded_by' => 'Uploaded by',
 'uploading_failed' => 'Uploading one of your files failed. Please check your maximum upload file size.',
 'uploading_maxsize' => 'The uploaded file exceeds the maximum upload file size.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index b3c2ff093..7e3c66fda 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (936), angel (123), francisco (2), jaimem (14)
+//    Translators: Admin (937), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -492,6 +492,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID de carpeta destino no válido',
 'invalid_user_id' => 'ID de usuario no válido',
 'invalid_version' => 'Versión de documento no válida',
+'in_revision' => '',
 'in_workflow' => 'En flujo de trabajo',
 'is_disabled' => 'Deshabilitar cuenta',
 'is_hidden' => 'Ocultar de la lista de usuarios',
@@ -763,6 +764,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revisión enviada',
 'review_summary' => 'Resumen de revisión',
 'review_update_failed' => 'Error actualizando el estado de la revisión. La actualización ha fallado.',
+'revise_document' => '',
+'revise_document_on' => 'Nächste Überprüfung des Dokuments am [date]',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Retroceso del flujo de trabajo',
@@ -1134,10 +1138,15 @@ URL: [url]',
 'status_not_approved' => 'Sin aprobar',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Sin revisar',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Revisado',
 'status_reviewer_rejected' => 'Borrador rechazado',
 'status_reviewer_removed' => 'Revisor eliminado del proceso',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Desconocido',
 'storage_size' => 'Tamaño de almacenamiento',
 'submit_approval' => 'Enviar aprobación',
@@ -1206,7 +1215,7 @@ URL: [url]',
 'update_locked_msg' => 'Este documento está bloqueado.',
 'update_recipients' => '',
 'update_reviewers' => 'Actualizar lista de revisores',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Enviado por',
 'uploading_failed' => 'Envío (Upload) fallido. Por favor contacte con el Administrador.',
 'uploading_maxsize' => 'El archivo subido supera el tamaño máximo de upload',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 579a46ea8..a959e318a 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -492,6 +492,7 @@ URL: [url]',
 'invalid_target_folder' => 'Identifiant de dossier cible invalide',
 'invalid_user_id' => 'Identifiant utilisateur invalide',
 'invalid_version' => 'Version de document invalide',
+'in_revision' => '',
 'in_workflow' => 'Dans le workflow',
 'is_disabled' => 'Compte désactivé',
 'is_hidden' => 'Cacher de la liste utilisateur',
@@ -752,6 +753,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Correction soumise',
 'review_summary' => 'Sommaire de correction',
 'review_update_failed' => 'Erreur lors de la mise à jour de la correction. Echec de la mise à jour.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Remonter le workflow',
@@ -1110,10 +1114,15 @@ URL: [url]',
 'status_not_approved' => 'Non approuvé',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Non corrigé',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Corrigé',
 'status_reviewer_rejected' => 'Correction rejetée',
 'status_reviewer_removed' => 'Correcteur retiré du processus',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Inconnu',
 'storage_size' => 'Taille occupée',
 'submit_approval' => 'Soumettre approbation',
@@ -1173,7 +1182,7 @@ URL: [url]',
 'update_locked_msg' => 'Ce document est verrouillé.',
 'update_recipients' => '',
 'update_reviewers' => 'Mise à jour de la liste de correcteurs',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Déposé par',
 'uploading_failed' => 'Dépose du document échoué. SVP Contactez le responsable.',
 'uploading_maxsize' => 'La taille du fichier téléchargé excède la taille maximale accepté',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 0123bb35e..ba4e957ff 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -492,6 +492,7 @@ URL: [url]',
 'invalid_target_folder' => 'Érvénytelen cél mappa állapot',
 'invalid_user_id' => 'Érvénytelen felhasználói azonosító',
 'invalid_version' => 'Érvénytelen dokumentum változat',
+'in_revision' => '',
 'in_workflow' => 'Munkafolyamatban',
 'is_disabled' => 'Hozzáférés tiltás',
 'is_hidden' => 'Felhasználó listáról elrejt',
@@ -763,6 +764,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Beküldött felülvizsgálat',
 'review_summary' => 'Felülvizsgálat összefoglaló',
 'review_update_failed' => 'Hiba a felülvizsgálat állapot frissítése során. Frissítés sikertelen.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Munkafolyamat visszajátszás',
@@ -1133,10 +1137,15 @@ URL: [url]',
 'status_not_approved' => 'Nem jóváhagyott',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Nem felülvizsgált',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Felülvizsgált',
 'status_reviewer_rejected' => 'Piszkozat elutasítva',
 'status_reviewer_removed' => 'Felülvizsgáló eltávolítva a folyamatból',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Ismeretlen',
 'storage_size' => 'Tároló mérete',
 'submit_approval' => 'Jóváhagyás küldése',
@@ -1205,7 +1214,7 @@ URL: [url]',
 'update_locked_msg' => 'Ez a dokumentum zárolt.',
 'update_recipients' => '',
 'update_reviewers' => 'Felülvizsgálók listájának frissítése',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Feltöltötte',
 'uploading_failed' => 'Állományai egyikének feltöltése sikertelen. Kérjük ellenőrizze a legnagyobb feltölthető állomány méretet.',
 'uploading_maxsize' => 'A feltöltött fájl nagyobb, mint a megengedezz maximális méret',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 506b70108..ba897303c 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -497,6 +497,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID cartella selezionata non valido',
 'invalid_user_id' => 'ID utente non valido',
 'invalid_version' => 'Versione del documento non valida',
+'in_revision' => '',
 'in_workflow' => 'In fase di lavorazione',
 'is_disabled' => 'Account Disabilitato',
 'is_hidden' => 'Nascondi dalla lista utenti',
@@ -785,6 +786,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Sottoposta revisione',
 'review_summary' => 'Dettaglio revisioni',
 'review_update_failed' => 'Errore nella variazione dello stato di revisione. Aggiornamento fallito.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Inverti il flusso di lavoro',
@@ -1156,10 +1160,15 @@ URL: [url]',
 'status_not_approved' => 'Non ancora approvato',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Non ancora revisionato',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Revisionato',
 'status_reviewer_rejected' => 'Bozza rifiutata',
 'status_reviewer_removed' => 'Revisore rimosso dal processo',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Sconosciuto',
 'storage_size' => 'Spazio di archiviazione',
 'submit_approval' => 'Invio approvazione',
@@ -1228,7 +1237,7 @@ URL: [url]',
 'update_locked_msg' => 'Questo documento è bloccato.',
 'update_recipients' => '',
 'update_reviewers' => 'Aggiorna lista revisori',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Caricato da',
 'uploading_failed' => 'Upload fallito. Controllare la dimensione massima caricabile consentita.',
 'uploading_maxsize' => 'Il file caricato supera la dimensione massima consentita.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 0130a989b..6ee3c676e 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -485,6 +485,7 @@ URL: [url]',
 'invalid_target_folder' => 'Foutief Doel Map ID',
 'invalid_user_id' => 'Foutief Gebruiker ID',
 'invalid_version' => 'Foutief Document Versie',
+'in_revision' => '',
 'in_workflow' => 'In workflow',
 'is_disabled' => 'Deactiveer account',
 'is_hidden' => 'Afschermen van Gebruikerslijst',
@@ -754,6 +755,9 @@ URL: [url',
 'review_submit_email_subject' => '[sitename]: [name] - Beoordeling toegevoegd',
 'review_summary' => '[Controle] Samenvatting',
 'review_update_failed' => 'Foutmelding: fout bij bijwerken [Controle] Status. Bijwerken mislukt.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Terugzetten workflow',
@@ -1125,10 +1129,15 @@ URL: [url]',
 'status_not_approved' => 'Niet goedgekeurd',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Niet gecontroleerd',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Gecontroleerd',
 'status_reviewer_rejected' => 'Klad Controle [Afgewezen]',
 'status_reviewer_removed' => '[Controleur] verwijderd van dit proces',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Onbekend',
 'storage_size' => 'Omvang opslag',
 'submit_approval' => 'Verzend [Goedkeuring]',
@@ -1197,7 +1206,7 @@ URL: [url]',
 'update_locked_msg' => 'Dit document is geblokkeerd.',
 'update_recipients' => '',
 'update_reviewers' => 'Bijwerken lijst van [Controleurs]',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Ge-upload door',
 'uploading_failed' => 'Upload mislukt. Neem contact op met de [Beheerder].',
 'uploading_maxsize' => 'Het geuploade bestand overschrijdt de maximum grootte.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 8cf4f90c6..0c86e994c 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -485,6 +485,7 @@ URL: [url]',
 'invalid_target_folder' => 'Nieprawidłowy identyfikator folderu docelowego',
 'invalid_user_id' => 'Nieprawidłowy identyfikator użytkownika',
 'invalid_version' => 'Nieprawidłowa wersja dokumentu',
+'in_revision' => '',
 'in_workflow' => 'W procesie',
 'is_disabled' => 'Konto nieaktywne',
 'is_hidden' => 'Nie pokazuj na liście użytkowników',
@@ -742,6 +743,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Napisano recenzję',
 'review_summary' => 'Podsumowanie opiniowania',
 'review_update_failed' => 'Błąd podczas aktualizowania statusu recenzji. Aktualizacja nie powiodła się.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Przewiń proces',
@@ -1113,10 +1117,15 @@ URL: [url]',
 'status_not_approved' => 'Nie zatwierdzone',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Nie zrecenzowane',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Zrecenzowane',
 'status_reviewer_rejected' => 'Szkic odrzucony',
 'status_reviewer_removed' => 'Recenzent usunięty z procesu',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Nieznany',
 'storage_size' => 'Zajętość dysku',
 'submit_approval' => 'Zaakceptuj',
@@ -1185,7 +1194,7 @@ URL: [url]',
 'update_locked_msg' => 'Ten dokument jest zablokowany.',
 'update_recipients' => '',
 'update_reviewers' => 'Aktualizuj listę recenzentów',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Przesłane przez',
 'uploading_failed' => 'Przesyłanie nie powiodło się. Skontaktuj się z administratorem.',
 'uploading_maxsize' => 'Rozmiar pliku większy niż dopuszczalny',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 9325dbb65..9d574ec04 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -491,6 +491,7 @@ URL: [url]',
 'invalid_target_folder' => 'Invalid Target Folder ID',
 'invalid_user_id' => 'Invalid User ID',
 'invalid_version' => 'Invalid Document Version',
+'in_revision' => '',
 'in_workflow' => 'No fluxo de trabalho',
 'is_disabled' => 'Desativar conta',
 'is_hidden' => 'Ocultar perfil da lista de usuários',
@@ -760,6 +761,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revisão submetida',
 'review_summary' => 'Review Summary',
 'review_update_failed' => 'Error updating review status. Update failed.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Fluxo de trabalho revisto',
@@ -1131,10 +1135,15 @@ URL: [url]',
 'status_not_approved' => 'Not approved',
 'status_not_receipted' => '',
 'status_not_reviewed' => '',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => '',
 'status_reviewer_rejected' => '',
 'status_reviewer_removed' => '',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Unknown',
 'storage_size' => 'Tamanho de armazenamento',
 'submit_approval' => '',
@@ -1203,7 +1212,7 @@ URL: [url]',
 'update_locked_msg' => 'Este documento está travado.',
 'update_recipients' => '',
 'update_reviewers' => 'Update List of Reviewers',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Inserido por',
 'uploading_failed' => 'Inserção falhou. Por favor contacte o administrador',
 'uploading_maxsize' => 'O arquivo excede o tamanho máximo permitido para upload.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index b37ffd735..970dd3a78 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -492,6 +492,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID Folder țintă invalid',
 'invalid_user_id' => 'ID Utilizator invalid',
 'invalid_version' => 'Versiune Document invalidă',
+'in_revision' => '',
 'in_workflow' => 'În workflow',
 'is_disabled' => 'Dezactivează cont',
 'is_hidden' => 'Ascunde din lista de utilizatori',
@@ -763,6 +764,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revizuire trimisă',
 'review_summary' => 'Sumar revizuire',
 'review_update_failed' => 'Eroare actualizarea status revizuire. Actualizarea a eșuat.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Derulare workflow',
@@ -1134,10 +1138,15 @@ URL: [url]',
 'status_not_approved' => 'Neaprobat',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Nerevizuit',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Revizuit',
 'status_reviewer_rejected' => 'Proiect respins',
 'status_reviewer_removed' => 'Revizuitor eliminat din proces',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Necunoscut',
 'storage_size' => 'Dimensiunea de stocare',
 'submit_approval' => 'Trimite aprobare',
@@ -1206,7 +1215,7 @@ URL: [url]',
 'update_locked_msg' => 'Acest document este blocat.',
 'update_recipients' => '',
 'update_reviewers' => 'Actualizare Listă de revizuitori',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Adaugate de',
 'uploading_failed' => 'Încărcarea unuia dintre fișierele a eșuat. Vă rugăm să verificați dimensiunea maximă de încărcare fișiere.',
 'uploading_maxsize' => 'Fișierul încărcat depășește dimensiunea maximă de încărcare fișiere.',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index aa1300b93..c44382470 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -485,6 +485,7 @@ URL: [url]',
 'invalid_target_folder' => 'Неверный идентификатор целевого каталога',
 'invalid_user_id' => 'Неверный идентификатор пользователя',
 'invalid_version' => 'Неверная версия документа',
+'in_revision' => '',
 'in_workflow' => 'В процессе',
 'is_disabled' => 'Отключить учётную запись',
 'is_hidden' => 'Не показывать в<br/>списке пользователей',
@@ -753,6 +754,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: отправлена рецензия на «[name]»',
 'review_summary' => 'Сводка по рецензии',
 'review_update_failed' => 'Ошибка обновления статуса рецензии',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Начать процесс с начала',
@@ -1124,10 +1128,15 @@ URL: [url]',
 'status_not_approved' => 'Не утверждён',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Не рецензирован',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Рецензирован',
 'status_reviewer_rejected' => 'Черновик отклонён',
 'status_reviewer_removed' => 'Рецензирующий удалён из процесса',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Неизвестный',
 'storage_size' => 'Размер хранилища',
 'submit_approval' => 'Утвердить',
@@ -1196,7 +1205,7 @@ URL: [url]',
 'update_locked_msg' => 'Этот документ заблокирован',
 'update_recipients' => '',
 'update_reviewers' => 'Обновить список рецензирующих',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Загрузил(а)',
 'uploading_failed' => 'Загрузка не удалась. Свяжитесь с администратором.',
 'uploading_maxsize' => 'Размер загруженного файла превышает максимально возможный',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 453beb798..9a036c327 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -416,6 +416,7 @@ $text = array(
 'invalid_target_folder' => 'Neplatné cieľové ID zložky',
 'invalid_user_id' => 'Neplatné ID používateľa',
 'invalid_version' => 'Neplatná verzia dokumentu',
+'in_revision' => '',
 'in_workflow' => '',
 'is_disabled' => '',
 'is_hidden' => 'Nezobrazovať v zozname používateľov',
@@ -626,6 +627,9 @@ $text = array(
 'review_submit_email_subject' => '',
 'review_summary' => 'Zhrnutie kontroly',
 'review_update_failed' => 'Chyba pri aktualizácii stavu kontroly. Aktualizácia zlyhala.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => '',
@@ -984,10 +988,15 @@ $text = array(
 'status_not_approved' => 'Neschválený',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Neskontrolovaný',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Skontrolovaný',
 'status_reviewer_rejected' => 'Návrh zamietnutý',
 'status_reviewer_removed' => 'Kontrolór odstránený z procesu',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Neznámy',
 'storage_size' => 'Objem dát',
 'submit_approval' => 'Poslať schválenie',
@@ -1047,7 +1056,7 @@ $text = array(
 'update_locked_msg' => 'Tento dokument je zamknutý.',
 'update_recipients' => '',
 'update_reviewers' => 'Aktualizovať zoznam kontrolórov',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Nahral',
 'uploading_failed' => 'Nahranie zlyhalo. Prosám, kontaktujte správcu.',
 'uploading_maxsize' => 'Uploadovaný súbor prekročil maximálnu povolenú velkosť.',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 1a02dcfb7..14aacc907 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -485,6 +485,7 @@ URL: [url]',
 'invalid_target_folder' => 'Ogiltigt ID för målkatalogen',
 'invalid_user_id' => 'Ogiltigt användar-ID',
 'invalid_version' => 'Ogiltig dokumentversion',
+'in_revision' => '',
 'in_workflow' => 'Utkast: under bearbetning',
 'is_disabled' => 'Inaktivera kontot',
 'is_hidden' => 'Dölj från listan med användare',
@@ -748,6 +749,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Skickat granskning',
 'review_summary' => 'Sammanfattning av granskningen',
 'review_update_failed' => 'Fel vid uppdatering av granskningsstatus. Kunde inte uppdatera.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'Återställ arbetsflödet',
@@ -1119,10 +1123,15 @@ URL: [url]',
 'status_not_approved' => 'Ej godkänt',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Ej granskat',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Granskat',
 'status_reviewer_rejected' => 'Utkast avvisat',
 'status_reviewer_removed' => 'Person som granskar har tagits bort från processen',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Okänd',
 'storage_size' => 'Platsstorlek',
 'submit_approval' => 'Skicka godkännande',
@@ -1191,7 +1200,7 @@ URL: [url]',
 'update_locked_msg' => 'Dokumentet är låst.',
 'update_recipients' => '',
 'update_reviewers' => 'Uppdatera listan med personer som granskar',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Uppladdat av',
 'uploading_failed' => 'Fel vid uppladdningen. Kontakta administratören.',
 'uploading_maxsize' => 'Uppladdade filen översteg maxgränsen för storleken på filstorlek',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 577c43d5a..6ff0447e7 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -491,6 +491,7 @@ URL: [url]',
 'invalid_target_folder' => 'Geçersiz Hedef Klasör ID',
 'invalid_user_id' => 'Geçersiz Kullanıcı ID',
 'invalid_version' => 'Geçersiz Doküman Versiyonu',
+'in_revision' => '',
 'in_workflow' => 'İş Akışında',
 'is_disabled' => 'Hesap devredışı',
 'is_hidden' => 'Kullanıcı listesinde gizle',
@@ -764,6 +765,9 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Kontrol gönderildi',
 'review_summary' => 'Kontrol Özeti',
 'review_update_failed' => 'Kontrol güncelleme durumu hatalı. Güncelleme başarısız.',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => 'İş akışını geri al',
@@ -1135,10 +1139,15 @@ URL: [url]',
 'status_not_approved' => 'Onaylanmadı',
 'status_not_receipted' => '',
 'status_not_reviewed' => 'Kontrol edilmedi',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Kontrol edildi',
 'status_reviewer_rejected' => 'Taslak reddedildi',
 'status_reviewer_removed' => 'Kontrol eden süreci sildi',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => 'Bilinmeyen',
 'storage_size' => 'Depo boyutu',
 'submit_approval' => 'Onay ver',
@@ -1207,7 +1216,7 @@ URL: [url]',
 'update_locked_msg' => 'Bu doküman kilitli.',
 'update_recipients' => '',
 'update_reviewers' => 'Kontrol edenlerin listesini güncelle',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => 'Yükleyen',
 'uploading_failed' => 'Dosyalardan biri yüklenirken başarısız oldu. Maksimum yükleme boyutunuzu kontrol ediniz.',
 'uploading_maxsize' => 'Yüklenen dosya maksimum yükleme boyutundan fazla.',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 59bd81cde..c61604e4c 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -422,6 +422,7 @@ URL: [url]',
 'invalid_target_folder' => '无效目标文件夹ID号',
 'invalid_user_id' => '无效用户ID号',
 'invalid_version' => '无效文档版本',
+'in_revision' => '',
 'in_workflow' => '',
 'is_disabled' => '禁用帐户',
 'is_hidden' => '从用户列表中隐藏',
@@ -632,6 +633,9 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => '校对汇总',
 'review_update_failed' => '错误 更新校对状态.更新失败',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => '',
@@ -990,10 +994,15 @@ URL: [url]',
 'status_not_approved' => '未批准',
 'status_not_receipted' => '',
 'status_not_reviewed' => '未校对',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => '通过',
 'status_reviewer_rejected' => '拟拒绝',
 'status_reviewer_removed' => '从校对队列中删除',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => '未知',
 'storage_size' => '存储大小',
 'submit_approval' => '提交审核',
@@ -1053,7 +1062,7 @@ URL: [url]',
 'update_locked_msg' => '该文档被锁定',
 'update_recipients' => '',
 'update_reviewers' => '更新校对人名单',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => '上传者',
 'uploading_failed' => '文件太大无法上传！请处理后重新上传。',
 'uploading_maxsize' => '最大上传限制',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index eaa7088d5..907a3abc0 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -420,6 +420,7 @@ URL: [url]',
 'invalid_target_folder' => '無效目的檔案夾ID號',
 'invalid_user_id' => '無效用戶ID號',
 'invalid_version' => '無效文檔版本',
+'in_revision' => '',
 'in_workflow' => '',
 'is_disabled' => '禁用帳戶',
 'is_hidden' => '從用戶列表中隱藏',
@@ -630,6 +631,9 @@ URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => '校對匯總',
 'review_update_failed' => '錯誤 更新校對狀態.更新失敗',
+'revise_document' => '',
+'revise_document_on' => '',
+'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
 'rewind_workflow' => '',
@@ -988,10 +992,15 @@ URL: [url]',
 'status_not_approved' => '未批准',
 'status_not_receipted' => '',
 'status_not_reviewed' => '未校對',
+'status_not_revised' => '',
+'status_receipted' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => '通過',
 'status_reviewer_rejected' => '擬拒絕',
 'status_reviewer_removed' => '從校對佇列中刪除',
+'status_revised' => '',
+'status_revision_sleeping' => '',
+'status_revisor_removed' => '',
 'status_unknown' => '未知',
 'storage_size' => '存儲大小',
 'submit_approval' => '提交審核',
@@ -1051,7 +1060,7 @@ URL: [url]',
 'update_locked_msg' => '該文檔被鎖定',
 'update_recipients' => '',
 'update_reviewers' => '更新校對人名單',
-'update_revisor' => '',
+'update_revisors' => '',
 'uploaded_by' => '上傳者',
 'uploading_failed' => '文件太大無法上傳！請處理後重新上傳。',
 'uploading_maxsize' => '最大上傳限制',

From 4101a8363979a6701a161f76aba225be4799b12d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:11:17 +0200
Subject: [PATCH 0092/2006] better error checking

---
 op/op.SetRevisors.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index b661aa458..9057ccf0a 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -62,7 +62,9 @@ if (isset($_POST["startdate"])) {
 	$startdate = date('Y-m-d');
 }
 
-$content->setRevisionDate($startdate);
+if(!$content->setRevisionDate($startdate)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+}
 
 $folder = $document->getFolder();
 

From f083b6fd7a0def5278c8ae569f01166880da9871 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:11:38 +0200
Subject: [PATCH 0093/2006] check for due revision workflow

---
 out/out.ViewDocument.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 31cf836ee..cc13a5384 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -65,6 +65,13 @@ if ($document->verifyLastestContentExpriry()){
 	header("Location:../out/out.ViewDocument.php?documentid=".$document->getID());
 }
 
+/* Recalculate the status of a document and reload the page if the status
+ * has changed. A status change may occur if a revision workflow is due
+ */
+if ($document->checkForDueRevisionWorkflow($user)){
+	header("Location:../out/out.ViewDocument.php?documentid=".$document->getID());
+}
+
 if($view) {
 	$view->setParam('dms', $dms);
 	$view->setParam('user', $user);

From bc7407ad855830d0e0b628febc7c85a9c5420111 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:12:22 +0200
Subject: [PATCH 0094/2006] add transmittal mgr to user menu, some code cleanup

---
 views/bootstrap/class.Bootstrap.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index d875e5c92..65279136f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -259,6 +259,7 @@ $(document).ready(function () {
 			if (!$this->params['user']->isGuest()) {
 				echo "    <li><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("my_documents")."</a></li>\n";
 				echo "    <li><a href=\"../out/out.MyAccount.php\">".getMLText("my_account")."</a></li>\n";
+				echo "    <li><a href=\"../out/out.TransmittalMgr.php\">".getMLText("my_transmittals")."</a></li>\n";
 				echo "    <li class=\"divider\"></li>\n";
 			}
 			$showdivider = false;
@@ -1524,24 +1525,27 @@ $('#delete-folder-btn-".$folderid."').popover({
 			$links = $document->getDocumentLinks();
 			$links = SeedDMS_Core_DMS::filterDocumentLinks($user, $links);
 
+			$content .= "<td>";
 			if (file_exists($dms->contentDir . $latestContent->getPath())) {
-				$content .= "<td><a rel=\"document_".$docID."\" draggable=\"true\" ondragstart=\"onDragStartDocument(event);\" href=\"../op/op.Download.php?documentid=".$docID."&version=".$version."\">";
+				$content .= "<a rel=\"document_".$docID."\" draggable=\"true\" ondragstart=\"onDragStartDocument(event);\" href=\"../op/op.Download.php?documentid=".$docID."&version=".$version."\">";
 				if($previewer->hasPreview($latestContent)) {
 					$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				} else {
 					$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				}
-				$content .= "</a></td>";
+				$content .= "</a>";
 			} else
-				$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
-			
-			$content .= "<td><a href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
+				$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+			$content .= "</td>";
+
+			$content .= "<td>";	
+			$content .= "<a href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
 			$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $latestContent->getDate())."</b></span>";
 			if($comment) {
 				$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
 			}
 			$content .= "</td>\n";
-//				$content .= "<td>".htmlspecialchars($owner->getFullName())."</td>";
+
 			$content .= "<td nowrap>";
 			$attentionstr = '';
 			if ( $document->isLocked() ) {
@@ -1557,8 +1561,9 @@ $('#delete-folder-btn-".$folderid."').popover({
 				$content .= count($files)." ".getMLText("linked_files")."<br />";
 			if(count($links))
 				$content .= count($links)." ".getMLText("linked_documents")."<br />";
-			$content .= getOverallStatusText($status["status"])."</small></td>";
-//				$content .= "<td>".$version."</td>";
+			$content .= getOverallStatusText($status["status"])."</small>";
+			$content .= "</td>\n";
+
 			$content .= "<td>";
 			$content .= "<div class=\"list-action\">";
 			if($document->getAccessMode($user) >= M_ALL) {

From d538bde57962b3ffff6cd626a7314d8a7358ee11 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:13:08 +0200
Subject: [PATCH 0095/2006] add more lists of documents

---
 views/bootstrap/class.MyDocuments.php | 114 +++++++++++++++++++++++++-
 1 file changed, 112 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 8c8f97f86..32429b2e9 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -267,6 +267,118 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					$this->contentContainerEnd();
 				}
 
+				// Get document list for the current user.
+				$revisionStatus = $user->getRevisionStatus();
+
+				$resArr = $dms->getDocumentList('ReviseByMe', $user);
+				if (is_bool($resArr) && !$resArr) {
+					$this->contentHeading(getMLText("warning"));
+					$this->contentContainer(getMLText("internal_error_exit"));
+					$this->htmlEndPage();
+					exit;
+				}
+				if($resArr) {
+					/* Create an array to hold all of these results, and index the array 
+					 * by document id. This makes it easier to retrieve document ID
+					 * information later on and saves us having to repeatedly poll the
+					 * database every time new document information is required.
+					 */
+					$docIdx = array();
+					foreach ($resArr as $res) {
+						/* verify expiry */
+						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+							$res["status"]=S_EXPIRED;
+						}
+						$docIdx[$res["id"]][$res["version"]] = $res;
+					}
+
+					$this->contentHeading(getMLText("documents_to_revise"));
+					$this->contentContainerStart();
+					$printheader=true;
+					$iRev = array();
+					$dList = array();
+					foreach ($revisionStatus["indstatus"] as $st) {
+					
+						if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
+							$dList[] = $st["documentID"];
+							$document = $dms->getDocument($st["documentID"]);
+						
+							if ($printheader){
+								print "<table class=\"table table-condensed\">";
+								print "<thead>\n<tr>\n";
+								print "<th></th>\n";
+								print "<th>".getMLText("name")."</th>\n";
+								print "<th>".getMLText("owner")."</th>\n";
+								print "<th>".getMLText("version")."</th>\n";
+								print "<th>".getMLText("last_update")."</th>\n";
+								print "<th>".getMLText("expires")."</th>\n";
+								print "</tr>\n</thead>\n<tbody>\n";
+								$printheader=false;
+							}
+						
+							print "<tr>\n";
+							$latestContent = $document->getLatestContent();
+							$previewer->createPreview($latestContent);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+							if($previewer->hasPreview($latestContent)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+							print "<td>".$st["version"]."</td>";
+							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
+							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+							print "</tr>\n";
+						}
+					}
+					foreach ($revisionStatus["grpstatus"] as $st) {
+					
+						if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
+							$dList[] = $st["documentID"];
+							$document = $dms->getDocument($st["documentID"]);
+
+							if ($printheader){
+								print "<table class=\"table table-condensed\">";
+								print "<thead>\n<tr>\n";
+								print "<th></th>\n";
+								print "<th>".getMLText("name")."</th>\n";
+								print "<th>".getMLText("owner")."</th>\n";
+								print "<th>".getMLText("version")."</th>\n";
+								print "<th>".getMLText("last_update")."</th>\n";
+								print "<th>".getMLText("expires")."</th>\n";
+								print "</tr>\n</thead>\n<tbody>\n";
+								$printheader=false;
+							}
+
+							print "<tr>\n";
+							$latestContent = $document->getLatestContent();
+							$previewer->createPreview($latestContent);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+							if($previewer->hasPreview($latestContent)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+							print "<td>".$st["version"]."</td>";
+							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+							print "</tr>\n";
+						}
+					}
+					if (!$printheader){
+						echo "</tbody>\n</table>";
+					}else{
+						printMLText("no_docs_to_revise");
+					}
+					$this->contentContainerEnd();
+				}
+
 				/* Get list of documents owned by current user that are
 				 * pending review or pending approval.
 				 */
@@ -344,12 +456,10 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				 */
 				$docIdx = array();
 				foreach ($resArr as $res) {
-					
 					/* verify expiry */
 					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
 						$res["status"]=S_EXPIRED;
 					}
-
 					$docIdx[$res["id"]][$res["version"]] = $res;
 				}
 				$this->contentHeading(getMLText("documents_to_receipt"));

From 20227a44a4f3389d1b1d0a9f06deff48fd6e3b8d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:13:34 +0200
Subject: [PATCH 0096/2006] take out debug code

---
 views/bootstrap/class.SetRevisors.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 187ff2f03..9e8d612a0 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -52,9 +52,6 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 		// Retrieve list of currently assigned revisors, along with
 		// their latest status.
 		$revisionStatus = $content->getRevisionStatus();
-		echo "<pre>";
-		print_r($revisionStatus);
-		echo "</pre>";
 		$startdate = substr($content->getRevisionDate(), 0, 10);
 
 		// Index the revision results for easy cross-reference with the revisor list.
@@ -74,6 +71,7 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 
 <?php $this->contentSubHeading(getMLText("update_revisors"));?>
 
+  <div class="cbSelectTitle"><?php printMLText("revision_date")?>:</div>
   <span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
     <input class="span4" size="16" name="startdate" type="text" value="<?php if($startdate) echo $startdate; else echo date('Y-m-d'); ?>">
     <span class="add-on"><i class="icon-calendar"></i></span>

From d446034193566bb40423db7f481a44b9593255af Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:13:55 +0200
Subject: [PATCH 0097/2006] nicer output of item list

---
 views/bootstrap/class.TransmittalMgr.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index e073022e5..a6b3e10c1 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -130,29 +130,25 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		$this->showTransmittalForm($seltransmittal);
 		$this->contentContainerEnd();
+
 		if($seltransmittal) {
 			$items = $seltransmittal->getItems();
 			if($items) {
 				print "<table class=\"table table-condensed\">";
 				print "<thead>\n<tr>\n";
-				print "<th>".getMLText("document")."</th>\n";
-				print "<th>".getMLText("version")."</th>\n";
 				print "<th></th>\n";
+				print "<th>".getMLText("name")."</th>\n";
+				print "<th>".getMLText("status")."</th>\n";
+				print "<th>".getMLText("action")."</th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
 				foreach($items as $item) {
-					print "<tr>";
-					print "<td>";
 					$content = $item->getContent();
 					$document = $content->getDocument();
-					print $content->getVersion();
-					print "</td>";
-					print "<td>";
-					echo $this->documentListRow($document, $previewer, false, $content->getVersion());
-					print $item->getDate();
-					print "</td>";
-					print "</tr>";
+					if ($document->getAccessMode($user) >= M_READ)
+						echo $this->documentListRow($document, $previewer, false, $content->getVersion());
 				}
 				print "</tbody>\n</table>\n";
+				print "<a class=\"btn btn-default\" href=\"../op/op.TransmittalDownload.php?transmittalid=".$seltransmittal->getID()."\">".getMLText('download')."</a>";
 			}
 		}
 ?>

From 3efa77e78f42eb86eb92e738589671cd8ac1f14d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 May 2015 19:14:25 +0200
Subject: [PATCH 0098/2006] add generic function for printing a workflow
 protocol

---
 views/bootstrap/class.ViewDocument.php | 256 ++++++++++++++-----------
 1 file changed, 143 insertions(+), 113 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f209a02e9..30f8aaa42 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -110,6 +110,93 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 	
 	} /* }}} */
 
+	/**
+	 * Output a protocol
+	 *
+	 * @param object $attribute attribute
+	 */
+	protected function printProtocol($latestContent, $type="") { /* {{{ */
+		$dms = $this->params['dms'];
+?>
+		<legend><?php printMLText($type.'_log'); ?></legend>
+		<table class="table condensed">
+			<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('last_update'); ?>/<?php printMLText('comment'); ?></th><th><?php printMLText('status'); ?></th></tr>
+<?php
+		switch($type) {
+		case "review":
+			$statusList = $latestContent->getReviewStatus(10);
+			break;
+		case "approval":
+			$statusList = $latestContent->getApprovalStatus(10);
+			break;
+		case "revision":
+			$statusList = $latestContent->getRevisionStatus(10);
+			break;
+		case "receipt":
+			$statusList = $latestContent->getReceiptStatus(10);
+			break;
+		default:
+			$statusList = array();
+		}
+		foreach($statusList as $rec) {
+			echo "<tr>";
+			echo "<td>";
+			switch ($rec["type"]) {
+				case 0: // individual.
+					$required = $dms->getUser($rec["required"]);
+					if (!is_object($required)) {
+						$reqName = getMLText("unknown_user")." '".$rec["required"]."'";
+					} else {
+						$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+					}
+					break;
+				case 1: // Approver is a group.
+					$required = $dms->getGroup($rec["required"]);
+					if (!is_object($required)) {
+						$reqName = getMLText("unknown_group")." '".$rec["required"]."'";
+					}
+					else {
+						$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
+					}
+					break;
+			}
+			echo $reqName;
+			echo "</td>";
+			echo "<td>";
+			echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
+			$updateuser = $dms->getUser($rec["userID"]);
+			if(!is_object($required))
+				echo getMLText("unknown_user");
+			else
+				echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");
+			echo "</i>";
+			if($rec['comment'])
+				echo "<br />".htmlspecialchars($rec['comment']);
+			echo "</td>";
+			echo "<td>";
+			switch($type) {
+			case "review":
+				echo getReviewStatusText($rec["status"]);
+				break;
+			case "approval":
+				echo getApprovalStatusText($rec["status"]);
+				break;
+			case "revision":
+				echo getRevisionStatusText($rec["status"]);
+				break;
+			case "receipt":
+				echo getReceiptStatusText($rec["status"]);
+				break;
+			default:
+			}
+			echo "</td>";
+			echo "</tr>";
+		}
+?>
+				</table>
+<?php
+	} /* }}} */
+
 	function show() { /* {{{ */
 		parent::show();
 		$dms = $this->params['dms'];
@@ -335,7 +422,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 			if(is_array($revisionStatus) && count($revisionStatus)>0) {
 ?>
-		  <li><a data-target="#revision" data-toggle="tab"><?php echo getMLText('revise document'); ?></a></li>
+		  <li><a data-target="#revision" data-toggle="tab"><?php echo getMLText('revise_document'); ?></a></li>
 <?php
 			}
 ?>
@@ -669,120 +756,27 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 
 		print "</table>\n";
+		$this->contentContainerEnd();
+
 		if($user->isAdmin()) {
-			$this->contentContainerEnd();
 ?>
 			<div class="row-fluid">
 <?php
 			if($workflowmode != 'traditional_only_approval') {
 ?>
 				<div class="span6">
-				<legend><?php printMLText('review_log'); ?></legend>
-				<table class="table condensed">
-					<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('last_update'); ?>/<?php printMLText('comment'); ?></th><th><?php printMLText('status'); ?></th></tr>
-<?php
-					$reviewStatusList = $latestContent->getReviewStatus(10);
-					foreach($reviewStatusList as $rec) {
-						echo "<tr>";
-						echo "<td>";
-						switch ($rec["type"]) {
-							case 0: // Approver is an individual.
-								$required = $dms->getUser($rec["required"]);
-								if (!is_object($required)) {
-									$reqName = getMLText("unknown_user")." '".$rec["required"]."'";
-								}
-								else {
-									$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
-								}
-								break;
-							case 1: // Approver is a group.
-								$required = $dms->getGroup($rec["required"]);
-								if (!is_object($required)) {
-									$reqName = getMLText("unknown_group")." '".$rec["required"]."'";
-								}
-								else {
-									$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-								}
-								break;
-						}
-						echo $reqName;
-						echo "</td>";
-						echo "<td>";
-						echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
-						$updateuser = $dms->getUser($rec["userID"]);
-						if(!is_object($required))
-							echo getMLText("unknown_user");
-						else
-							echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");
-						echo "</i>";
-						if($rec['comment'])
-							echo "<br />".htmlspecialchars($rec['comment']);
-						echo "</td>";
-						echo "<td>";
-						echo getApprovalStatusText($rec["status"]);
-						echo "</td>";
-						echo "</tr>";
-					}
-?>
-					</table>
-				</div>
-<?php
-				}
-?>
-				<div class="span6">
-				<legend><?php printMLText('approval_log'); ?></legend>
-				<table class="table condensed">
-					<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('last_update'); ?>/<?php printMLText('comment'); ?></th><th><?php printMLText('status'); ?></th></tr>
-<?php
-					$approvalStatusList = $latestContent->getApprovalStatus(10);
-					foreach($approvalStatusList as $rec) {
-						echo "<tr>";
-						echo "<td>";
-						switch ($rec["type"]) {
-							case 0: // Approver is an individual.
-								$required = $dms->getUser($rec["required"]);
-								if (!is_object($required)) {
-									$reqName = getMLText("unknown_user")." '".$rec["required"]."'";
-								}
-								else {
-									$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
-								}
-								break;
-							case 1: // Approver is a group.
-								$required = $dms->getGroup($rec["required"]);
-								if (!is_object($required)) {
-									$reqName = getMLText("unknown_group")." '".$rec["required"]."'";
-								}
-								else {
-									$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-								}
-								break;
-						}
-						echo $reqName;
-						echo "</td>";
-						echo "<td>";
-						echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
-						$updateuser = $dms->getUser($rec["userID"]);
-						if(!is_object($required))
-							echo getMLText("unknown_user");
-						else
-							echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");
-						echo "</i>";
-						if($rec['comment'])
-							echo "<br />".htmlspecialchars($rec['comment']);
-						echo "</td>";
-						echo "<td>";
-						echo getApprovalStatusText($rec["status"]);
-						echo "</td>";
-						echo "</tr>";
-					}
-?>
-				</table>
+				<?php $this->printProtocol($latestContent, 'review'); ?>
 				</div>
 <?php
 			}
 ?>
+				<div class="span6">
+				<?php $this->printProtocol($latestContent, 'approval'); ?>
+				</div>
 			</div>
+<?php
+		}
+?>
 		  </div>
 <?php
 		}
@@ -1040,14 +1034,40 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 
 			$this->contentContainerEnd();
+			if($user->isAdmin()) {
+?>
+			<div class="row-fluid">
+			<div class="span12">
+<?php
+				$this->printProtocol($latestContent, 'receipt');
+?>
+			</div>
+			</div>
+<?php
+			}
 ?>
 		  </div>
 <?php
 		}
 		if(is_array($revisionStatus) && count($revisionStatus)>0) {
 ?>
-		  <div class="tab-pane" id="revision">
+			<div class="tab-pane" id="revision">
 <?php
+			if($status['status'] == S_RELEASED) {
+				if($latestContent->getRevisionDate()) {
+?>
+				<div class="alert alert-warning">
+<?php
+				print getMLText('revise_document_on', array('date' => substr($latestContent->getRevisionDate(), 0, 10)));
+?>
+				</div>
+<?php
+				}
+			} elseif($status['status'] != S_IN_REVISION) {
+?>
+				<div class="alert alert-info"><?= getMLText('no_revision_planed') ?></div>
+<?php
+			}
 			$this->contentContainerStart();
 			print "<table class=\"table-condensed\">\n";
 
@@ -1093,18 +1113,18 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<tr>\n";
 				print "<td>".$reqName."</td>\n";
 				print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
-				/* $updateUser is the user who has done the receipt */
+				/* $updateUser is the user who has done the revision */
 				$updateUser = $dms->getUser($r["userID"]);
 				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
 				print "<td>".htmlspecialchars($r["comment"])."</td>\n";
-				print "<td>".getReceiptStatusText($r["status"])."</td>\n";
+				print "<td>".getRevisionStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 
-				if($accessop->mayReview()) {
+				if($accessop->mayRevise()) {
 					if ($is_recipient && $r["status"]==0) {
-						print "<li><a href=\"../out/out.ReviseDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("add_receipt")."</a></li>";
-					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-						print "<li><a href=\"../out/out.ReviseDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("edit")."</a></li>";
+						print "<li><a href=\"../out/out.ReviseDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&revisionid=".$r['revisionID']."\" class=\"btn btn-mini\">".getMLText("add_revision")."</a></li>";
+					} elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
+						print "<li><a href=\"../out/out.ReviseDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&revisionid=".$r['revisionID']."\" class=\"btn btn-mini\">".getMLText("edit")."</a></li>";
 					}
 				}
 
@@ -1114,10 +1134,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		</table>
 <?php
-
-			$this->contentContainerEnd();
+		$this->contentContainerEnd();
+		if($user->isAdmin()) {
 ?>
-		  </div>
+			<div class="row-fluid">
+			<div class="span12">
+<?php
+			$this->printProtocol($latestContent, 'revision');
+?>
+			</div>
+			</div>
+<?php
+		}
+?>
+		</div>
 <?php
 		}
 		if (count($versions)>1) {

From 540b1ece0a0a7c8e9702c7cd713b9898c3619815 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 17:32:10 +0200
Subject: [PATCH 0099/2006] add getSize(), updateContent() etc.

---
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 53 +++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index bac682edb..310689474 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -101,6 +101,9 @@ class SeedDMS_Core_Transmittal {
 	 * @return object instance of class SeedDMS_Core_Transmittal
 	 */
 	public static function getInstance($id, $dms, $by='') { /* {{{ */
+		if(!$dms || get_class($dms) != 'SeedDMS_Core_DMS')
+			return false;
+
 		$db = $dms->getDB();
 
 		switch($by) {
@@ -217,6 +220,21 @@ class SeedDMS_Core_Transmittal {
 		return $this->_items;
 	} /* }}} */
 
+	function getSize() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if (!$this->_items) {
+			self::getItems();
+		}
+
+		$size = 0;
+		foreach ($this->_items as $item) {
+			$content = $item->getContent();
+			$size += $content->getFileSize();
+		}
+		return $size;
+	} /* }}} */
+
 	/**
 	 * Add an item to the transmittal
 	 *
@@ -240,6 +258,7 @@ class SeedDMS_Core_Transmittal {
 
 		return SeedDMS_Core_TransmittalItem::getInstance($itemID);
 	} /* }}} */
+
 }
 
 /**
@@ -290,6 +309,9 @@ class SeedDMS_Core_TransmittalItem {
 	}
 
 	public static function getInstance($id, $dms) { /* {{{ */
+		if(!$dms || get_class($dms) != 'SeedDMS_Core_DMS')
+			return false;
+
 		$db = $dms->getDB();
 
 		$queryStr = "SELECT * FROM tblTransmittalItems WHERE id = " . (int) $id;
@@ -303,7 +325,7 @@ class SeedDMS_Core_TransmittalItem {
 		$transmittal = SeedDMS_Core_Transmittal::getInstance($resArr['transmittal'], $dms);
 		$dclassname = $dms->getClassname('document');
 		$document = $dclassname::getInstance($resArr['document'], $dms);
-		$content = $document->getVersion($resArr['version']);
+		$content = $document->getContentByVersion((int) $resArr['version']);
 
 		$item = new self($resArr["id"], $transmittal, $content, $resArr["date"]);
 		$item->setDMS($dms);
@@ -316,6 +338,8 @@ class SeedDMS_Core_TransmittalItem {
 
 	function getID() { return $this->_id; }
 
+	function getTransmittal() { return $this->_transmittal; }
+
 	function getContent() { return $this->_content; }
 
 	function getDate() { return $this->_date; }
@@ -331,5 +355,32 @@ class SeedDMS_Core_TransmittalItem {
 
 		return true;
 	} /* }}} */
+
+	/**
+	 * Check if the content referenzed by the transmittal item is unequal
+	 * to the latest content of the document.
+	 *
+	 * This function updateѕ always to the latest version of the document,
+	 * even if the version in the item is higher. This can happen if a
+	 * version has been removed.
+	 *
+	 * @return boolean/integer false in case of an error, otherwise the new
+	 * version.
+	 */
+	function updateContent() { /* {{{ */
+		$db = $this->_dms->getDB();
+		$transmittal = $this->_transmittal;
+
+		$document = $this->_content->getDocument();
+		$latestcontent = $document->getLatestContent();
+		if($latestcontent->getVersion() != $this->_content->getVersion()) {
+			$queryStr = "UPDATE tblTransmittalItems set version = ".$latestcontent->getVersion()." WHERE id = " . $this->_id;
+			if (!$db->getResult($queryStr)) {
+				return false;
+			}
+		}
+
+		return $latestcontent->getVersion();
+	} /* }}} */
 }
 ?>

From 359f030ddba7f57a471b61c2c28cf89a8d01a657 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 17:32:44 +0200
Subject: [PATCH 0100/2006] make it work again with new language dirs

---
 develop/retrieveml.sh |  2 +-
 develop/transcomp.php | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/develop/retrieveml.sh b/develop/retrieveml.sh
index 3f45c0554..bd0577131 100644
--- a/develop/retrieveml.sh
+++ b/develop/retrieveml.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 # This command retrieves the strings that need to be translated
-sgrep -o "%r\n" '"getMLText(\"" __ "\""' */*.php|sort|uniq -c
+sgrep -o "%r\n" '"getMLText(\"" __ "\""' */*.php views/bootstrap/*.php |sort|uniq -c
diff --git a/develop/transcomp.php b/develop/transcomp.php
index e24d75fad..c4755bf24 100644
--- a/develop/transcomp.php
+++ b/develop/transcomp.php
@@ -1,7 +1,7 @@
 <?php
 /* Determine all languages keys used in the php files */
 $output = array();
-if(exec('sgrep -o "%r\n" \'"tMLText(\"" __ "\""\' */*.php|sort|uniq -c', &$output)) {
+if(exec('sgrep -o "%r\n" \'"tMLText(\"" __ "\""\' */*.php views/bootstrap/*.php|sort|uniq -c', $output)) {
 	$allkeys = array();
 	foreach($output as $line) {
 		$data = explode(' ', trim($line));
@@ -9,8 +9,9 @@ if(exec('sgrep -o "%r\n" \'"tMLText(\"" __ "\""\' */*.php|sort|uniq -c', &$outpu
 	}
 }
 
+$languages = array('ar_EG', 'bg_BG', 'ca_ES', 'cs_CZ', 'de_DE', 'en_GB', 'es_ES', 'fr_FR', 'hu_HU', 'it_IT', 'nl_NL', 'pl_PL', 'pt_BR', 'ro_RO', 'ru_RU', 'sk_SK', 'sv_SE', 'tr_TR', 'zh_CN', 'zh_TW');
 /* Reading languages */
-foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
+foreach($languages as $lang) {
 	include('languages/'.$lang.'/lang.inc');
 	ksort($text);
 	$langarr[$lang] = $text;
@@ -20,7 +21,7 @@ foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
 echo "List of missing keys\n";
 echo "-----------------------------\n";
 foreach(array_keys($allkeys) as $key) {
-	foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
+	foreach($languages as $lang) {
 		if(!isset($langarr[$lang][$key])) {
 			echo "Missing key '".$key."' in language ".$lang."\n";
 		}
@@ -31,7 +32,7 @@ echo "\n";
 /* Check for phrases not used anymore */
 echo "List of superflous keys\n";
 echo "-----------------------------\n";
-foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
+foreach($languages as $lang) {
 	$n = 0;
 	foreach($langarr[$lang] as $key=>$value) {
 		if(!isset($allkeys[$key])) {
@@ -45,8 +46,8 @@ foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
 exit;
 
 $fpout = fopen('php://stdout', 'w');
-foreach(array_keys($langarr['English']) as $key) {
-	$data = array($key, $langarr['English'][$key], $langarr['German'][$key]);
+foreach(array_keys($langarr['en_GB']) as $key) {
+	$data = array($key, $langarr['en_GB'][$key], $langarr['de_DE'][$key]);
 	fputcsv($fpout, $data);
 }
 ?>

From d7232aa8cd8504c3516dec623e87ad86c9fb8f2c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 17:34:23 +0200
Subject: [PATCH 0101/2006] fix key of phrase

---
 op/op.AddTransmittal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.AddTransmittal.php b/op/op.AddTransmittal.php
index 80a5fbcb4..1fc840d71 100644
--- a/op/op.AddTransmittal.php
+++ b/op/op.AddTransmittal.php
@@ -40,7 +40,7 @@ $comment = $_POST["comment"];
 $transmittal = $dms->addTransmittal($name, $comment, $user);
 
 if (!is_object($transmittal)) {
-	UI::exitError(getMLText("my_document"), getMLText("error_occured"));
+	UI::exitError(getMLText("my_documents"), getMLText("error_occured"));
 }
 
 add_log_line("?name=".$name);

From 6f3594d294596b33d159b46ec53c02599df29d78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 17:34:50 +0200
Subject: [PATCH 0102/2006] add cmd [remove|update]transmittalitem

---
 op/op.Ajax.php | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index a85a6c9bf..b38a69302 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -646,6 +646,74 @@ switch($command) {
 		}
 		break; /* }}} */
 
+	case 'removetransmittalitem': /* {{{ */
+		if($user) {
+			if(!checkFormKey('removetransmittalitem', 'GET')) {
+				header('Content-Type', 'application/json');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+			} else {
+				$item = SeedDMS_Core_TransmittalItem::getInstance((int) $_REQUEST['id'], $dms);
+				if($item) {
+					$transmittal = $item->getTransmittal();
+					if($transmittal) {
+						if ($transmittal->getUser()->getID() == $user->getID()) {
+							if($item->remove()) {
+								header('Content-Type', 'application/json');
+								echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+							} else {
+								header('Content-Type', 'application/json');
+								echo json_encode(array('success'=>false, 'message'=>'Error removing transmittal item', 'data'=>''));
+							}
+						} else {
+							header('Content-Type', 'application/json');
+							echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+						}
+					} else {
+						header('Content-Type', 'application/json');
+						echo json_encode(array('success'=>false, 'message'=>'No transmittal', 'data'=>''));
+					}
+				} else {
+					header('Content-Type', 'application/json');
+					echo json_encode(array('success'=>false, 'message'=>'No transmittal item', 'data'=>''));
+				}
+			}
+		}
+		break; /* }}} */
+
+	case 'updatetransmittalitem': /* {{{ */
+		if($user) {
+			if(!checkFormKey('updatetransmittalitem', 'GET')) {
+				header('Content-Type', 'application/json');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+			} else {
+				$item = SeedDMS_Core_TransmittalItem::getInstance((int) $_REQUEST['id'], $dms);
+				if($item) {
+					$transmittal = $item->getTransmittal();
+					if($transmittal) {
+						if ($transmittal->getUser()->getID() == $user->getID()) {
+							if($item->updateContent()) {
+								header('Content-Type', 'application/json');
+								echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+							} else {
+								header('Content-Type', 'application/json');
+								echo json_encode(array('success'=>false, 'message'=>'Error removing transmittal item', 'data'=>''));
+							}
+						} else {
+							header('Content-Type', 'application/json');
+							echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+						}
+					} else {
+						header('Content-Type', 'application/json');
+						echo json_encode(array('success'=>false, 'message'=>'No transmittal', 'data'=>''));
+					}
+				} else {
+					header('Content-Type', 'application/json');
+					echo json_encode(array('success'=>false, 'message'=>'No transmittal item', 'data'=>''));
+				}
+			}
+		}
+		break; /* }}} */
+
 }
 add_log_line();
 ?>

From 3aa22eccbdc62c1eeaddae557172fb3a68df4583 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 17:35:36 +0200
Subject: [PATCH 0103/2006] add icon from removing and updating transmittal
 item

---
 views/bootstrap/class.TransmittalMgr.php | 149 ++++++++++++++++++++++-
 1 file changed, 147 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index a6b3e10c1..481836dcc 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -31,6 +31,137 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 
+	/**
+	 * Add some javascript at the bottom of the page
+	 */
+	function addAdditionalJS(){ /* {{{ */
+		$this->addFooterJS("
+	$('body').on('click', 'button.removetransmittalitem', function(ev){
+		ev.preventDefault();
+		var element = $(this);
+		attr_rel = $(ev.currentTarget).attr('rel');
+		attr_msg = $(ev.currentTarget).attr('msg');
+		attr_formtoken = $(ev.currentTarget).attr('formtoken');
+		id = attr_rel;
+		$.get('../op/op.Ajax.php',
+			{ command: 'removetransmittalitem', id: id, formtoken: attr_formtoken },
+			function(data) {
+//				console.log(data);
+				if(data.success) {
+					$('#table-row-transmittalitem-'+id).hide('slow');
+					noty({
+						text: attr_msg,
+						type: 'success',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 1500,
+					});
+				} else {
+					noty({
+						text: data.message,
+						type: 'error',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 3500,
+					});
+				}
+			},
+			'json'
+		);
+	});
+	$('body').on('click', 'button.updatetransmittalitem', function(ev){
+		ev.preventDefault();
+		var element = $(this);
+		attr_rel = $(ev.currentTarget).attr('rel');
+		attr_msg = $(ev.currentTarget).attr('msg');
+		attr_formtoken = $(ev.currentTarget).attr('formtoken');
+		id = attr_rel;
+		$.get('../op/op.Ajax.php',
+			{ command: 'updatetransmittalitem', id: id, formtoken: attr_formtoken },
+			function(data) {
+//				console.log(data);
+				if(data.success) {
+					$('#update-transmittalitem-btn-'+id).hide('slow');
+					noty({
+						text: attr_msg,
+						type: 'success',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 1500,
+					});
+				} else {
+					noty({
+						text: data.message,
+						type: 'error',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 3500,
+					});
+				}
+			},
+			'json'
+		);
+		$('#update-transmittalitem-btn-'+id).popover('hide');
+	});
+");
+	} /* }}} */
+
+	/**
+	 * Print button for updating the transmittal item to the newest version
+	 *
+	 * @param object $item
+	 * @param string $msg message shown in case of successful update
+	 */
+	function printUpdateItemButton($item, $msg, $return=false){ /* {{{ */
+		$itemid = $item->getID();
+		$content = '';
+    $content .= '<a id="update-transmittalitem-btn-'.$itemid.'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'"><i class="icon-refresh"></i></a>';
+		$this->addFooterJS("
+$('#update-transmittalitem-btn-".$itemid."').popover({
+	title: '".getMLText("update_transmittalitem")."',
+	placement: 'left',
+	html: true,
+	content: \"<div>".htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES)."</div><div><button class='btn btn-danger updatetransmittalitem' style='float: right; margin:10px 0px;' rel='".$itemid."' msg='".htmlspecialchars($msg, ENT_QUOTES)."' formtoken='".createFormKey('updatetransmittalitem')."' id='confirm-update-transmittalitem-btn-".$itemid."'><i class='icon-refresh'></i> ".getMLText("update_transmittalitem")."</button> <button type='button' class='btn' style='float: right; margin:10px 10px;' onclick='$(&quot;#update-transmittalitem-btn-".$itemid."&quot;).popover(&quot;hide&quot;);'>".getMLText('cancel')."</button></div>\"});
+");
+		if($return)
+			return $content;
+		else
+			echo $content;
+		return '';
+	} /* }}} */
+
+	/**
+	 * Print button with link for deleting a transmittal item
+	 *
+	 * This button works just like the printDeleteDocumentButton()
+	 *
+	 * @param object $item transmittal item to be deleted
+	 * @param string $msg message shown in case of successful deletion
+	 * @param boolean $return return html instead of printing it
+	 * @return string html content if $return is true, otherwise an empty string
+	 */
+	function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
+		$itemid = $item->getID();
+		$content = '';
+    $content .= '<a id="delete-transmittalitem-btn-'.$itemid.'" rel="'.$itemid.'" msg="'.getMLText($msg).'"><i class="icon-remove"></i></a>';
+		$this->addFooterJS("
+$('#delete-transmittalitem-btn-".$itemid."').popover({
+	title: '".getMLText("rm_transmittalitem")."',
+	placement: 'left',
+	html: true,
+	content: \"<div>".htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES)."</div><div><button class='btn btn-danger removetransmittalitem' style='float: right; margin:10px 0px;' rel='".$itemid."' msg='".getMLText($msg)."' formtoken='".createFormKey('removetransmittalitem')."' id='confirm-delete-transmittalitem-btn-".$itemid."'><i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."</button> <button type='button' class='btn' style='float: right; margin:10px 10px;' onclick='$(&quot;#delete-transmittalitem-btn-".$itemid."&quot;).popover(&quot;hide&quot;);'>".getMLText('cancel')."</button></div>\"});
+");
+		if($return)
+			return $content;
+		else
+			echo $content;
+		return '';
+	} /* }}} */
+
 	function showTransmittalForm($transmittal) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -106,12 +237,15 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("comment")."</th>\n";
+			print "<th>#</th>\n";
 			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($transmittals as $transmittal) {
 				print "<tr>\n";
 				print "<td>".$transmittal->getName()."</td>";
 				print "<td>".$transmittal->getComment()."</td>";
+				$items = $transmittal->getItems();
+				print "<td>".count($items)." <em>(".SeedDMS_Core_File::format_filesize($transmittal->getSize()).")</em></td>";
 				print "<td>";
 				print "<div class=\"list-action\">";
 				print "<a href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"icon-edit\"></i></a>";
@@ -134,18 +268,29 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 		if($seltransmittal) {
 			$items = $seltransmittal->getItems();
 			if($items) {
+				$this->addAdditionalJS();
 				print "<table class=\"table table-condensed\">";
 				print "<thead>\n<tr>\n";
 				print "<th></th>\n";
 				print "<th>".getMLText("name")."</th>\n";
 				print "<th>".getMLText("status")."</th>\n";
+				print "<th>".getMLText("document")."</th>\n";
 				print "<th>".getMLText("action")."</th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
 				foreach($items as $item) {
 					$content = $item->getContent();
 					$document = $content->getDocument();
-					if ($document->getAccessMode($user) >= M_READ)
-						echo $this->documentListRow($document, $previewer, false, $content->getVersion());
+					$latestcontent = $document->getLatestContent();
+					if ($document->getAccessMode($user) >= M_READ) {
+						echo "<tr id=\"table-row-transmittalitem-".$item->getID()."\">";
+						echo $this->documentListRow($document, $previewer, true, $content->getVersion());
+						echo "<td><div class=\"list-action\">";
+						$this->printDeleteItemButton($item, '');
+						if($latestcontent->getVersion() != $content->getVersion())
+							$this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion())));
+						echo "</div></td>";
+						echo "</tr>";
+					}
 				}
 				print "</tbody>\n</table>\n";
 				print "<a class=\"btn btn-default\" href=\"../op/op.TransmittalDownload.php?transmittalid=".$seltransmittal->getID()."\">".getMLText('download')."</a>";

From 37fe7925a4c27a7c6e85a5e4987db669c89e5979 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 17:37:53 +0200
Subject: [PATCH 0104/2006] add checking for duplicates

---
 SeedDMS_Core/Core/inc.ClassDMS.php    | 28 ++++++++++++++++++++++++++
 out/out.ObjectCheck.php               |  3 ++-
 views/bootstrap/class.ObjectCheck.php | 29 +++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index b1c8916f7..a48d28a4a 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2339,6 +2339,34 @@ class SeedDMS_Core_DMS {
 		
 	} /* }}} */
 
+	/**
+	 * Returns document content which is duplicated
+	 *
+	 * This method is for finding document content which is available twice
+	 * in the database. The checksum of a document content was introduced
+	 * in version 4.0.0 of SeedDMS for finding duplicates.
+	 */
+	function getDuplicateDocumentContent() { /* {{{ */
+		$queryStr = "SELECT a.*, b.id as dupid FROM tblDocumentContent a LEFT JOIN tblDocumentContent b ON a.checksum=b.checksum where a.id!=b.id ORDER by a.id";
+		$resArr = $this->db->getResultArray($queryStr);
+		if (!$resArr)
+			return false;
+
+		$versions = array();
+		foreach($resArr as $row) {
+			$document = new $this->classnames['document']($row['document'], '', '', '', '', '', '', '', '', '', '', '');
+			$document->setDMS($this);
+			$version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum']);
+			if(!isset($versions[$row['dupid']])) {
+				$versions[$row['id']]['content'] = $version;
+				$versions[$row['id']]['duplicates'] = array();
+			} else
+				$versions[$row['dupid']]['duplicates'][] = $version;
+		}
+		return $versions;
+		
+	} /* }}} */
+
 	/**
 	 * Returns statitical information
 	 *
diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index d4d16f42e..c0457c94b 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -62,10 +62,11 @@ $unlinkedfolders = $dms->checkFolders();
 $unlinkeddocuments = $dms->checkDocuments();
 $nofilesizeversions = $dms->getNoFileSizeDocumentContent();
 $nochecksumversions = $dms->getNoChecksumDocumentContent();
+$duplicateversions = $dms->getDuplicateDocumentContent();
 $rootfolder = $dms->getFolder($settings->_rootFolderID);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'unlinkedcontent'=>$unlinkedversions, 'unlinkedfolders'=>$unlinkedfolders, 'unlinkeddocuments'=>$unlinkeddocuments, 'nofilesizeversions'=>$nofilesizeversions, 'nochecksumversions'=>$nochecksumversions, 'unlink'=>$unlink, 'setfilesize'=>$setfilesize, 'setchecksum'=>$setchecksum, 'repair'=>$repair, 'rootfolder'=>$rootfolder));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'unlinkedcontent'=>$unlinkedversions, 'unlinkedfolders'=>$unlinkedfolders, 'unlinkeddocuments'=>$unlinkeddocuments, 'nofilesizeversions'=>$nofilesizeversions, 'nochecksumversions'=>$nochecksumversions, 'duplicateversions'=>$duplicateversions, 'unlink'=>$unlink, 'setfilesize'=>$setfilesize, 'setchecksum'=>$setchecksum, 'repair'=>$repair, 'rootfolder'=>$rootfolder));
 if($view) {
 	$view->show();
 	exit;
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index d3c87b68c..a312d972f 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -172,6 +172,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$unlinkeddocuments = $this->params['unlinkeddocuments'];
 		$nofilesizeversions = $this->params['nofilesizeversions'];
 		$nochecksumversions = $this->params['nochecksumversions'];
+		$duplicateversions = $this->params['duplicateversions'];
 		$repair = $this->params['repair'];
 		$unlink = $this->params['unlink'];
 		$setfilesize = $this->params['setfilesize'];
@@ -340,6 +341,34 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			}
 		}
 
+		$this->contentContainerEnd();
+
+		$this->contentHeading(getMLText("duplicate_content"));
+		$this->contentContainerStart();
+
+		if($duplicateversions) {
+			print "<table class=\"table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th>".getMLText("document")."</th>\n";
+			print "<th>".getMLText("version")."</th>\n";
+			print "<th>".getMLText("original_filename")."</th>\n";
+			print "<th>".getMLText("mimetype")."</th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+			foreach($duplicateversions as $rec) {
+				$version = $rec['content'];
+				$doc = $version->getDocument();
+				print "<tr>";
+				print "<td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td>";
+				print "<td>";
+				foreach($rec['duplicates'] as $duplicate) {
+					print $duplicate->getVersion();
+				}
+				print "</td>";
+				print "</tr>\n";
+			}
+			print "</tbody></table>\n";
+		}
+
 		$this->contentContainerEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From bdd75ecfee9eb54e3ceb2e7ba2091d00fd735172 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 18:41:10 +0200
Subject: [PATCH 0105/2006] fix addContent()

---
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index 310689474..96e2acbac 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -249,14 +249,14 @@ class SeedDMS_Core_Transmittal {
 
 		$document = $item->getDocument();
 		$queryStr = "INSERT INTO `tblTransmittalItems` (`transmittal`, `document`, `version`, `date`) ".
-			"VALUES ('". $this->_id ."', $document->getID(), $item->getVersion(), CURRENT_TIMESTAMP)";
+			"VALUES ('". $this->_id ."', ".$document->getID().", ".$item->getVersion().", CURRENT_TIMESTAMP)";
 		$res=$db->getResult($queryStr);
 		if(!$res) {
 			return false;
 		}
 		$itemID = $db->getInsertID();
 
-		return SeedDMS_Core_TransmittalItem::getInstance($itemID);
+		return SeedDMS_Core_TransmittalItem::getInstance($itemID, $this->_dms);
 	} /* }}} */
 
 }

From 2d967f87412900fe758b75b75e7e86a2ce1bc955 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 18:41:27 +0200
Subject: [PATCH 0106/2006] replace # in table header

---
 views/bootstrap/class.TransmittalMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 481836dcc..1767a3d44 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -237,7 +237,7 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("comment")."</th>\n";
-			print "<th>#</th>\n";
+			print "<th>".getMLText("size")."</th>\n";
 			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($transmittals as $transmittal) {

From fe9229c8bc34c4a3775c0bc67ce199df1403f6dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 18:42:03 +0200
Subject: [PATCH 0107/2006] add link for addind content to transmittal

---
 views/bootstrap/class.ViewDocument.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 30f8aaa42..671c0f1b8 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -562,7 +562,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($accessop->maySetExpires()) {
 			print "<li><a href='../out/out.SetExpires.php?documentid=".$documentid."'><i class=\"icon-time\"></i>".getMLText("set_expiry")."</a></li>";
 		}
-		*/
+		 */
+		if($dms->getAllTransmittals($user)) {
+			print "<li><a href=\"out.AddToTransmittal.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("add_to_transmittal")."</a></li>";
+		}
 		if($accessop->mayEditComment()) {
 			print "<li><a href=\"out.EditComment.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";
 		}

From eb7f3613ca85a9b7c3fe41c27dcca0f563608240 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2015 18:43:28 +0200
Subject: [PATCH 0108/2006] add scripts for adding content to a transmittal

---
 op/op.AddToTransmittal.php                 | 85 ++++++++++++++++++++++
 out/out.AddToTransmittal.php               | 69 ++++++++++++++++++
 views/bootstrap/class.AddToTransmittal.php | 73 +++++++++++++++++++
 3 files changed, 227 insertions(+)
 create mode 100644 op/op.AddToTransmittal.php
 create mode 100644 out/out.AddToTransmittal.php
 create mode 100644 views/bootstrap/class.AddToTransmittal.php

diff --git a/op/op.AddToTransmittal.php b/op/op.AddToTransmittal.php
new file mode 100644
index 000000000..c87d4d9d5
--- /dev/null
+++ b/op/op.AddToTransmittal.php
@@ -0,0 +1,85 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.ClassEmail.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+/* Check if the form data comes for a trusted request */
+if(!checkFormKey('addtotransmittal')) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
+}
+
+if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+$documentid = $_POST["documentid"];
+$document = $dms->getDocument($documentid);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_READ) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
+if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+$version_num = $_POST["version"];
+$version = $document->getContentByVersion($version_num);
+
+if (!is_object($version)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+if (!isset($_POST["assignTo"]) || !is_numeric($_POST["assignTo"]) || intval($_POST["assignTo"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+$transmittalid = $_POST["assignTo"];
+$transmittal = $dms->getTransmittal($transmittalid);
+
+if (!is_object($transmittal)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+if ($transmittal->getUser()->getID() != $user->getID()) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+}
+
+if($transmittal->addContent($version)) {
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_to_transmittal')));
+} else {
+	$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_error_add_to_transmittal')));
+}
+
+add_log_line("?documentid=".$documentid."&version".$version_num);
+
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+
+?>
diff --git a/out/out.AddToTransmittal.php b/out/out.AddToTransmittal.php
new file mode 100644
index 000000000..b909f9461
--- /dev/null
+++ b/out/out.AddToTransmittal.php
@@ -0,0 +1,69 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
+include("../inc/inc.Authentication.php");
+
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+$document = $dms->getDocument($_GET["documentid"]);
+
+if (!is_object($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+if ($document->getAccessMode($user) < M_ALL) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
+if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"]<1)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+
+$content = $document->getContentByVersion($_GET["version"]);
+if (!is_object($content)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
+}
+
+$folder = $document->getFolder();
+$transmittals = $dms->getAllTransmittals($user);
+
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
+if($view) {
+	$view->setParam('accessobject', $accessop);
+	$view->setParam('transmittals', $transmittals);
+	$view->show();
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.AddToTransmittal.php b/views/bootstrap/class.AddToTransmittal.php
new file mode 100644
index 000000000..a67775739
--- /dev/null
+++ b/views/bootstrap/class.AddToTransmittal.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Implementation of AddToTransmittal view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for AddToTransmittal view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_AddToTransmittal extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$transmittals = $this->params['transmittals'];
+		$content = $this->params['version'];
+
+		$this->htmlStartPage(getMLText("my_documents"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_documents"), "my_documents");
+		$this->contentHeading(getMLText("add_to_transmittal"));
+		$this->contentContainerStart();
+
+?>
+<form action="../op/op.AddToTransmittal.php" name="form1" method="post">
+<input type="hidden" name="documentid" value="<?php print $content->getDocument()->getID();?>">
+<input type="hidden" name="version" value="<?php print $content->getVersion();?>">
+<input type="hidden" name="action" value="addtotransmittal">
+<?php echo createHiddenFieldWithKey('addtotransmittal'); ?>
+
+<p>
+<?php printMLText("transmittal"); ?>:
+<select name="assignTo">
+<?php
+		foreach ($transmittals as $transmittal) {
+			print "<option value=\"".$transmittal->getID()."\">" . htmlspecialchars($transmittal->getName()) . "</option>";
+		}
+?>
+</select>
+</p>
+
+<p><button type="submit" class="btn"><i class="icon-plus"></i> <?php printMLText("add");?></button></p>
+
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From ce572f82cbb6ee3834a79c33857053e096e854c5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 May 2015 07:16:46 +0200
Subject: [PATCH 0109/2006] add option -u to set the user doing the upload (Bug
 #214)

---
 utils/adddoc.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index 1b6df25d9..2ad644b7d 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -20,6 +20,7 @@ function usage() { /* {{{ */
 	echo "  -s <number>: set sequence for file (used for ordering files within a folder\n";
 	echo "  -n <name>: set name of file\n";
 	echo "  -V <version>: set version of file (defaults to 1).\n";
+	echo "  -u <user>: login name of user\n";
 	echo "  -f <filename>: upload this file\n";
 	echo "  -s <sequence>: set sequence of file\n";
 	echo "  -t <mimetype> set mimetype of file manually. Do not do that unless you know\n";
@@ -27,7 +28,7 @@ function usage() { /* {{{ */
 } /* }}} */
 
 $version = "0.0.1";
-$shortoptions = "F:c:C:k:K:s:V:f:n:t:hv";
+$shortoptions = "F:c:C:k:K:s:V:u:f:n:t:hv";
 $longoptions = array('help', 'version', 'config:');
 if(false === ($options = getopt($shortoptions, $longoptions))) {
 	usage();
@@ -104,6 +105,11 @@ if(isset($options['n'])) {
 	$name = $options['n'];
 }
 
+$username = '';
+if(isset($options['u'])) {
+	$username = $options['u'];
+}
+
 $filename = '';
 if(isset($options['f'])) {
 	$filename = $options['f'];
@@ -141,7 +147,10 @@ $dms->setEnableConverting($settings->_enableConverting);
 $dms->setViewOnlineFileTypes($settings->_viewOnlineFileTypes);
 
 /* Create a global user object */
-$user = $dms->getUser(1);
+if($username)
+	$user = $dms->getUserByLogin();
+else
+	$user = $dms->getUser(1);
 
 if(is_readable($filename)) {
 	if(filesize($filename)) {

From 54525d60eff15e15cf02a5f94b69994340fcd884 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 May 2015 14:22:16 +0200
Subject: [PATCH 0110/2006] make revsiondate default to NULL

---
 install/create_tables-innodb.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 92e08a044..99e2ff7a2 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -250,7 +250,7 @@ CREATE TABLE `tblDocumentContent` (
   `mimeType` varchar(100) NOT NULL default '',
   `fileSize` BIGINT,
   `checksum` char(32),
-  `revsiondate` datetime NOT NULL default '0000-00-00 00:00:00',
+  `revsiondate` datetime default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE (`document`, `version`),
   CONSTRAINT `tblDocumentContent_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`)

From 277fe6d5ad2c6cac31d4dda7d302b987cba030db Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 16 May 2015 19:41:43 +0200
Subject: [PATCH 0111/2006] lots of new phrases

---
 languages/ar_EG/lang.inc |  19 ++++
 languages/bg_BG/lang.inc |  19 ++++
 languages/ca_ES/lang.inc |  19 ++++
 languages/cs_CZ/lang.inc |  19 ++++
 languages/de_DE/lang.inc |  33 +++++--
 languages/en_GB/lang.inc |  23 ++++-
 languages/es_ES/lang.inc |  21 ++++-
 languages/fr_FR/lang.inc |  19 ++++
 languages/hu_HU/lang.inc |  19 ++++
 languages/it_IT/lang.inc |  19 ++++
 languages/nl_NL/lang.inc |  19 ++++
 languages/pl_PL/lang.inc |  19 ++++
 languages/pt_BR/lang.inc |  19 ++++
 languages/ro_RO/lang.inc | 195 +++++++++++++++++++++++----------------
 languages/ru_RU/lang.inc |  19 ++++
 languages/sk_SK/lang.inc |  19 ++++
 languages/sv_SE/lang.inc |  19 ++++
 languages/tr_TR/lang.inc |  19 ++++
 languages/zh_CN/lang.inc |  19 ++++
 languages/zh_TW/lang.inc |  19 ++++
 20 files changed, 489 insertions(+), 87 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 03554a7d2..62af0eecc 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'إضافة مستندات عديدة - سيتم استخدام اسم الملف كاسم المستند',
 'add_receipt' => '',
 'add_review' => 'بدأ المراجعة',
+'add_revision' => '',
 'add_subfolder' => 'إضافة مجلد فرعي',
 'add_to_clipboard' => 'اضف الى لوحة القصاصات',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'إضافة مستخدم',
 'add_user_to_group' => 'إضافة مستخدم لمجموعة',
@@ -225,8 +227,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'هل تود حقا ازالة كل الملفات الموجودة بالمجلد "[foldername]" وكل مافي المجلدات الفرعية؟<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
 'confirm_rm_group' => 'هل تود حقا ازالة المجموعة "[groupname]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
 'confirm_rm_log' => 'هل تود حقا ازالة ملف السجل "[logname]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'هل تود حقا ازالة المستخدم "[username]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
 'confirm_rm_version' => 'هل تود حقا ازالة الاصدار [version] الخاص بالمستند "[documentname]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
+'confirm_update_transmittalitem' => '',
 'content' => 'المحتوى',
 'continue' => 'استمرار',
 'create_fulltext_index' => 'انشاء فهرس للنص الكامل',
@@ -260,6 +264,7 @@ URL: [url]',
 'documents_to_approve' => 'مستندات في انتظار الموافقة',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
 'document_already_checkedout' => '',
 'document_already_locked' => 'هذا المستند محمي ضد التعديل',
@@ -445,6 +450,7 @@ URL: [url]',
 'group_exists' => 'المجموعة موجودة بالفعل.',
 'group_management' => 'إدارة المجموعات',
 'group_members' => 'أعضاء المجموعة',
+'group_receipt_summary' => '',
 'group_review_summary' => 'ملخص مراجعة المجموعة',
 'guest_login' => 'الدخول كضيف',
 'guest_login_disabled' => 'دخول ضيف غير متاح.',
@@ -628,7 +634,9 @@ URL: [url]',
 'no_docs_locked' => 'لايوجد مستندات حاليا مقفلة/محمية من التعديل',
 'no_docs_to_approve' => 'لايوجد مستندات حالية في انتظار الموافقة',
 'no_docs_to_look_at' => 'لايوجد مستندات حاليا تستدعي انتباهك',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'لايوجد مستندات حاليا متاحة للمراجعة',
+'no_docs_to_revise' => '',
 'no_email_or_login' => '',
 'no_fulltextindex' => 'لايوجد فهرس للنص الكامل متاح',
 'no_groups' => 'لايوجد مجموعات',
@@ -684,6 +692,7 @@ URL: [url]',
 'quota_exceeded' => 'لقد قمت بتعدي المساحة المخصصة لك بمقدار [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'اقصى مساحة للقرص الصلب تم تعديها بمقدار [bytes]. من فضلك قم بمسح بعض المستندات او اصدارات سابقة منها',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'اعادة تحميل',
@@ -751,6 +760,7 @@ URL: [url]',
 'review_update_failed' => 'خطأ في تحديث حالة المراجعة. التحديث فشل.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -773,6 +783,7 @@ URL: [url]',
 'rm_from_clipboard' => 'ازالة من لوحة القصاصات',
 'rm_group' => 'ازالة هذه المجموعة',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'ازالة هذا المستخدم',
 'rm_version' => 'ازالة اصدار',
 'rm_workflow' => 'ازالة مسار عمل',
@@ -1125,11 +1136,13 @@ URL: [url]',
 'status_not_reviewed' => 'لم تتم مراجعته بعد',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'تمت المراجعة',
 'status_reviewer_rejected' => 'مسودة مرفوضة',
 'status_reviewer_removed' => 'تم ازالة مراجع من العملية',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'مجهول',
@@ -1138,6 +1151,7 @@ URL: [url]',
 'submit_login' => 'تسجيل الدخول',
 'submit_password' => 'تحديد كلمة سر جديدة',
 'submit_password_forgotten' => 'بدء العملية',
+'submit_receipt' => '',
 'submit_review' => 'بدأ المراجعة',
 'submit_userinfo' => 'ادخال بيانات',
 'substitute_user' => 'استبدال المستخدم',
@@ -1169,8 +1183,12 @@ Parent folder: [folder_path]
 المستخدم: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - تم تحريك انتقال مسار العمل',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'مسار العمل',
 'tr_TR' => 'ﺕﺮﻜﻳﺓ',
 'tuesday' => 'الثلاثاء',
@@ -1201,6 +1219,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'تحيث قائمة المراجعين',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'تم الرفع بواسطة',
 'uploading_failed' => 'عملية رفع واحد من ملفاتك فشلت . من فضلك قم بالتأكد من اقصى ملف يمكن تحميله',
 'uploading_maxsize' => 'الملف المرفوع يتخطى حجم الملف القياسي المسموح',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 5bb782a7b..516751ba0 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -57,8 +57,10 @@ $text = array(
 'add_multiple_files' => 'Добави няколко файла (името на файла ще бъде използвано като име на документа)',
 'add_receipt' => '',
 'add_review' => 'Рецензирай',
+'add_revision' => '',
 'add_subfolder' => 'Добави подпапка',
 'add_to_clipboard' => 'Добави към clipboard',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Добави потребител',
 'add_user_to_group' => 'Добави потребител в група',
@@ -210,8 +212,10 @@ $text = array(
 'confirm_rm_folder_files' => 'Изтрий всички файлове в папка "[foldername]" и нейните подпапки?<br>Действието е перманентно',
 'confirm_rm_group' => 'Изтрий група "[groupname]"?<br>Действието е перманентно',
 'confirm_rm_log' => 'Изтрий лог "[logname]"?<br>Действието е перманентно',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Изтрий потребител "[username]"?<br>Действието е перманентно',
 'confirm_rm_version' => 'Изтрий версия на [version] документ "[documentname]"?<br>Действието е перманентно',
+'confirm_update_transmittalitem' => '',
 'content' => 'Съдържание',
 'continue' => 'Продължи',
 'create_fulltext_index' => 'Създай пълнотекстов индекс',
@@ -245,6 +249,7 @@ $text = array(
 'documents_to_approve' => 'Документи, чакащи Вашето утвърждаване',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Документът е вече блокиран',
@@ -376,6 +381,7 @@ $text = array(
 'group_exists' => 'Групата вече съществува',
 'group_management' => 'Управление на групи',
 'group_members' => 'Членове на групата',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Сводка по рецензирането на групи',
 'guest_login' => 'Влез като гост',
 'guest_login_disabled' => 'Входът като гост изключен',
@@ -535,7 +541,9 @@ $text = array(
 'no_docs_locked' => 'Няма блокирани документи',
 'no_docs_to_approve' => 'Няма документи, нуждаещи се от утвърждаване',
 'no_docs_to_look_at' => 'Няма документи, нуждаещи се от внимание',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Няма документови, нуждаещи се от рецензия',
+'no_docs_to_revise' => '',
 'no_email_or_login' => '',
 'no_fulltextindex' => 'Няма достъпен пълнотекстов индекс',
 'no_groups' => 'Няма групи',
@@ -585,6 +593,7 @@ $text = array(
 'quota_exceeded' => 'Вашата дискова квота е превишена с [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'Вашето max. използуване на диска е превишена с [bytes]. Please remove documents or previous versions.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Обнови',
@@ -629,6 +638,7 @@ $text = array(
 'review_update_failed' => 'грешка при обновяване статуса на рецензията',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -645,6 +655,7 @@ $text = array(
 'rm_from_clipboard' => 'Премахни от clipboard буфера',
 'rm_group' => 'Премахни тази група',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Премахни тоз потребител',
 'rm_version' => 'Премахни версия',
 'rm_workflow' => 'Премахни процес',
@@ -990,11 +1001,13 @@ $text = array(
 'status_not_reviewed' => 'Не рецензиран',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Рецензиран',
 'status_reviewer_rejected' => 'Чернова отказана',
 'status_reviewer_removed' => 'Рецензиращия премахнат от процеса',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Неизвестен',
@@ -1003,6 +1016,7 @@ $text = array(
 'submit_login' => 'Влез',
 'submit_password' => 'Установи нова парола',
 'submit_password_forgotten' => 'Започни процеса',
+'submit_receipt' => '',
 'submit_review' => 'Рецензирай',
 'submit_userinfo' => 'Изпрати информация за потребител',
 'substitute_user' => '',
@@ -1025,8 +1039,12 @@ $text = array(
 'transition_triggered_email' => 'Забелязана промяна на процес',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Процес',
 'tr_TR' => '',
 'tuesday' => 'вторник',
@@ -1057,6 +1075,7 @@ $text = array(
 'update_recipients' => '',
 'update_reviewers' => 'Обнови списъка с рецензиращи',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Качен от',
 'uploading_failed' => 'Качването не стана. Свържете се с админа',
 'uploading_maxsize' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index fb2d569f0..18f1f0f43 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -57,8 +57,10 @@ $text = array(
 'add_multiple_files' => 'Afegir múltiples fitxers (s\'utilitzarà el nom de fitxer com a nom del document)',
 'add_receipt' => '',
 'add_review' => 'Enviar revisiót',
+'add_revision' => '',
 'add_subfolder' => 'Afegir subdirectori',
 'add_to_clipboard' => '',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Afegir nou usuari',
 'add_user_to_group' => '',
@@ -215,8 +217,10 @@ URL: [url]',
 'confirm_rm_folder_files' => '¿Vol realment eliminar tots els fitxers de la carpeta "[foldername]" i de les seves subcarpetes?<br />Atenció: aquesta acció no es pot desfer.',
 'confirm_rm_group' => '¿Vol realment eliminar el grup "[groupname]"?<br />atenció: aquesta acció no es pot desfer.',
 'confirm_rm_log' => '¿Vol realment eliminar el fitxer de registre "[logname]"?<br />Atenció: aquesta acció no es pot desfer.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '¿Vol realment eliminar l\'usuari "[username]"?<br />Atenció: aquesta acció no es pot desfer.',
 'confirm_rm_version' => '¿Vol realment eliminar la versió [version] del document "[documentname]"?<br />Atenció: aquesta acció no es pot desfer.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Contingut',
 'continue' => 'Continuar',
 'create_fulltext_index' => '',
@@ -250,6 +254,7 @@ URL: [url]',
 'documents_to_approve' => 'Documents en espera d\'aprovació d\'usuaris',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Aquest document ja està bloquejat',
@@ -381,6 +386,7 @@ URL: [url]',
 'group_exists' => 'El grup ja existeix',
 'group_management' => 'Grups',
 'group_members' => 'Membres del grup',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Resum del grup revisor',
 'guest_login' => 'Accés com a invitat',
 'guest_login_disabled' => 'El compte d\'invitat està deshabilitat.',
@@ -540,7 +546,9 @@ URL: [url]',
 'no_docs_locked' => 'No hi ha documents bloquejats.',
 'no_docs_to_approve' => 'Actualmente no hi ha documents que necessitin aprovació.',
 'no_docs_to_look_at' => 'No hi ha documents que necessitin atenció.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Actualmente no hi ha documents que necessitin revisió.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => '',
 'no_fulltextindex' => '',
 'no_groups' => 'No hi ha grups',
@@ -590,6 +598,7 @@ URL: [url]',
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
 'quota_warning' => '',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Refresh',
@@ -634,6 +643,7 @@ URL: [url]',
 'review_update_failed' => 'Error actualitzant l\'estat de la revisió. L\'actualizació ha fallat.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -650,6 +660,7 @@ URL: [url]',
 'rm_from_clipboard' => '',
 'rm_group' => 'Eliminar aquest grup',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Eliminar aquest usuari',
 'rm_version' => 'Eliminar versió',
 'rm_workflow' => '',
@@ -995,11 +1006,13 @@ URL: [url]',
 'status_not_reviewed' => 'Sense revisar',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Revisat',
 'status_reviewer_rejected' => 'Esborrany rebutjat',
 'status_reviewer_removed' => 'Revisor eliminat del procés',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Desconegut',
@@ -1008,6 +1021,7 @@ URL: [url]',
 'submit_login' => 'Connectat',
 'submit_password' => '',
 'submit_password_forgotten' => '',
+'submit_receipt' => '',
 'submit_review' => 'Enviar revisiót',
 'submit_userinfo' => '',
 'substitute_user' => '',
@@ -1030,8 +1044,12 @@ URL: [url]',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => '',
 'tr_TR' => '',
 'tuesday' => 'Dimarts',
@@ -1062,6 +1080,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Actualitzar llista de revisors',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Enviat per',
 'uploading_failed' => 'Enviament (Upload) fallat. Si us plau, contacteu amb l\'administrador.',
 'uploading_maxsize' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 3beecc59f..ce7f49d9b 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Přidat více souborů (název souboru se použije jako název dokumentu)',
 'add_receipt' => '',
 'add_review' => 'Poslat ke kontrole',
+'add_revision' => '',
 'add_subfolder' => 'Přidat podsložku',
 'add_to_clipboard' => 'Přidat do schránky',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Přidat nového uživatele',
 'add_user_to_group' => 'Přidat uživatele do skupiny',
@@ -232,8 +234,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Skutečně chcete odstranit všechny soubory z podsložky "[foldername]" ?<br>Buďte opatrní: Tuto akci nelze vrátit zpět.',
 'confirm_rm_group' => 'Skutečně chcete odstranit skupinu "[groupname]"?<br>Pozor: Akce je nevratná.',
 'confirm_rm_log' => 'Skutečně chcete odstranit LOG soubor "[logname]"?<br>Pozor: Akci nelze vrátit zpět.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Skutečně chcete odstranit uživatele "[username]"?<br>Pozor: Akce je nevratná.',
 'confirm_rm_version' => 'Skutečně chcete odstranit verzi [version] dokumentu "[documentname]"?<br>Buďte opatrní: Tuto činnost není možné vrátit zpět.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Domů',
 'continue' => 'Pokračovat',
 'create_fulltext_index' => 'Vytvořit fulltext index',
@@ -267,6 +271,7 @@ URL: [url]',
 'documents_to_approve' => 'Dokumenty čekající na schválení uživatele',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamčený',
@@ -452,6 +457,7 @@ URL: [url]',
 'group_exists' => 'Skupina již existuje.',
 'group_management' => 'Skupiny',
 'group_members' => 'Členové skupiny',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Souhrn revizí skupiny',
 'guest_login' => 'Přihlásit se jako host',
 'guest_login_disabled' => 'Přihlášení jako host je vypnuté.',
@@ -635,7 +641,9 @@ URL: [url]',
 'no_docs_locked' => 'Žádné uzamčené dokumenty',
 'no_docs_to_approve' => 'Momentálně neexistují žádné dokumenty, které vyžadují schválení.',
 'no_docs_to_look_at' => 'Žádné dokumenty, které vyžadují pozornost.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Momentálně neexistují žádné dokumenty, které vyžadují kontrolu.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => 'Přihlašovací jméno a email musí být zadán',
 'no_fulltextindex' => 'Není k dispozici "fulltext index"',
 'no_groups' => 'Žádné skupiny',
@@ -695,6 +703,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'quota_exceeded' => 'Vaše kvóta disku je překročena o [bytes].',
 'quota_is_disabled' => 'Podpora kvót je v současné době zakázána v nastavení. Nastavení uživatelských kvót nebude mít žádný vliv, dokud se znovu neaktivuje.',
 'quota_warning' => 'Vaše maximální využití disku je překročeno o [bajtů]. Prosím, odstraňte dokumenty nebo předchozí verze.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Obnovit',
@@ -760,6 +769,7 @@ URL: [url]',
 'review_update_failed' => 'Chyba při aktualizaci stavu kontroly. Aktualizace selhala.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -782,6 +792,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Odstranit ze schránky',
 'rm_group' => 'Odstranit tuto skupinu',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Odstranit tohoto uživatele',
 'rm_version' => 'Odstranit verzi',
 'rm_workflow' => 'Odstranit pracovní postup',
@@ -1134,11 +1145,13 @@ URL: [url]',
 'status_not_reviewed' => 'Nezkontrolovaný',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Zkontrolovaný',
 'status_reviewer_rejected' => 'Návrh zamítnut',
 'status_reviewer_removed' => 'Kontrolor odstraněn z procesu',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Neznámý',
@@ -1147,6 +1160,7 @@ URL: [url]',
 'submit_login' => 'Přihlásit se',
 'submit_password' => 'Zadat nové heslo',
 'submit_password_forgotten' => 'Zahájit proces',
+'submit_receipt' => '',
 'submit_review' => 'Poslat ke kontrole',
 'submit_userinfo' => 'Odeslat info',
 'substitute_user' => 'Zaměnit uživatele',
@@ -1178,8 +1192,12 @@ Nadřazená složky: [folder_path]
 Uživatel: [uživatelské jméno]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Transformace praconího postupu spuštěna',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Pracovní postup',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Úterý',
@@ -1210,6 +1228,7 @@ URL: [url]',
 'update_recipients' => 'Update list of recipients',
 'update_reviewers' => 'Aktualizovat seznam kontrolorů',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Nahrál',
 'uploading_failed' => 'Nahrání selhalo. Prosím, kontaktujte správce.',
 'uploading_maxsize' => 'Nahrávaný soubor je větší než maximální velikost pro upload.',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index feb83d058..6c46d7d54 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2020), dgrutsch (18)
+//    Translators: Admin (2045), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -61,9 +61,11 @@ URL: [url]',
 'add_multiple_files' => 'Mehrere Dateien hochladen (Dateiname wird als Dokumentenname verwendet)',
 'add_receipt' => 'Empfang bestätigen',
 'add_review' => 'Überprüfung hinzufügen',
+'add_revision' => 'Wiederholungsprüfung hinzufügen',
 'add_subfolder' => 'Unterordner anlegen',
 'add_to_clipboard' => 'Zur Zwischenablage hinzufügen',
-'add_transmittal' => 'Transmittal hinzufügen',
+'add_to_transmittal' => 'Zur Dokumentenliste hinzufügen',
+'add_transmittal' => 'Dokumentenliste hinzufügen',
 'add_user' => 'Neuen Benutzer anlegen',
 'add_user_to_group' => 'Benutzer in Gruppe einfügen',
 'add_workflow' => 'Neuen Workflow anlegen',
@@ -191,7 +193,7 @@ URL: [url]',
 'change_assignments' => 'Zuweisungen ändern',
 'change_password' => 'Passwort ändern',
 'change_password_message' => 'Ihr Passwort wurde geändert.',
-'change_recipients' => 'Empfänger ändern',
+'change_recipients' => 'Empfängerliste ändern',
 'change_revisors' => 'Wiedervorlage ändern',
 'change_status' => 'Status ändern',
 'charts' => 'Diagramme',
@@ -237,8 +239,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Möchten Sie wirklich alle Dateien und Unterordner des Ordner "[foldername]" löschen?<br>Vorsicht: Diese Operation kann nicht rückgängig gemacht werden.',
 'confirm_rm_group' => 'Möchten Sie wirklich die Gruppe "[groupname]" löschen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
 'confirm_rm_log' => 'Möchten Sie wirklich die Log-Datei "[logname]" löschen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
+'confirm_rm_transmittalitem' => 'Löschen bestätigen',
 'confirm_rm_user' => 'Möchten Sie wirklich den Benutzer "[username]" löschen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
 'confirm_rm_version' => 'Wollen Sie die Version [version] des Dokumentes "[documentname]" wirklich löschen?<br>Achtung: Dieser Vorgang kann nicht rückgängig gemacht werden.',
+'confirm_update_transmittalitem' => 'Aktualisierung bestätigen',
 'content' => 'Inhalt',
 'continue' => 'fortführen',
 'create_fulltext_index' => 'Erzeuge Volltextindex',
@@ -272,6 +276,7 @@ URL: [url]',
 'documents_to_approve' => 'Freigabe erforderlich',
 'documents_to_receipt' => 'Dokumente deren Empfang bestätigt werden muss',
 'documents_to_review' => 'Prüfung erforderlich',
+'documents_to_revise' => 'Erneute Prüfung erforderlich',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
 'document_already_checkedout' => 'Dieses Dokument ist bereits ausgecheckt',
 'document_already_locked' => 'Dieses Dokument ist bereits gesperrt',
@@ -364,7 +369,7 @@ URL: [url]',
 'edit_folder_notify' => 'Beobachtung von Ordnern',
 'edit_folder_props' => 'Bearbeiten',
 'edit_group' => 'Gruppe bearbeiten',
-'edit_transmittal_props' => '',
+'edit_transmittal_props' => 'Attribute der Dokumentenliste bearbeiten',
 'edit_user' => 'Benutzer bearbeiten',
 'edit_user_details' => 'Benutzerdetails bearbeiten',
 'email' => 'Email',
@@ -457,6 +462,7 @@ URL: [url]',
 'group_exists' => 'Gruppe existiert bereits',
 'group_management' => 'Gruppenverwaltung',
 'group_members' => 'Gruppenmitglieder',
+'group_receipt_summary' => 'Übersicht Gruppenbestätigungen',
 'group_review_summary' => 'Prüfergruppen',
 'guest_login' => 'Als Gast anmelden',
 'guest_login_disabled' => 'Anmeldung als Gast ist gesperrt.',
@@ -575,7 +581,7 @@ URL: [url]',
 'move_folder' => 'Verschieben',
 'my_account' => 'Mein Profil',
 'my_documents' => 'Meine Dokumente',
-'my_transmittals' => 'Meine Übergabedokumente',
+'my_transmittals' => 'Meine Dokumentenlisten',
 'name' => 'Name',
 'needs_workflow_action' => 'Dieses Dokument erfordert eine Aktion. Bitte schauen Sie auf den Workflow-Reiter.',
 'never' => 'nie',
@@ -639,7 +645,9 @@ URL: [url]',
 'no_docs_locked' => 'Keine Dokumente gesperrt.',
 'no_docs_to_approve' => 'Es gibt zur Zeit keine Dokumente, die eine Freigabe erfordern.',
 'no_docs_to_look_at' => 'Keine Dokumente, nach denen geschaut werden müsste.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Es gibt zur Zeit keine Dokumente, die eine Prüfung erfordern.',
+'no_docs_to_revise' => 'Es gibt zur Zeit keine Dokumente, die erneut geprüft werden müssen.',
 'no_email_or_login' => 'Login und E-Mail müssen eingegeben werden',
 'no_fulltextindex' => 'Kein Volltext-Index verfügbar',
 'no_groups' => 'keine Gruppen',
@@ -703,6 +711,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'quota_exceeded' => 'Ihr maximal verfügbarer Plattenplatz wurde um [bytes] überschritten.',
 'quota_is_disabled' => 'Quota-Unterstützung ist zur Zeit ausgeschaltet. Benutzer-Quota werden ignoriert bis Quota-Unterstützung in den Einstellungen eingeschaltet wird.',
 'quota_warning' => 'Ihr maximal verfügbarer Plattenplatz wurde um [bytes] überschritten. Bitte löschen Sie Dokumente oder ältere Versionen.',
+'receipt_log' => 'Protokoll der Empfangsbestätigungen',
 'receipt_summary' => 'Übersicht Bestätigungen',
 'recipients' => 'Empfänger',
 'refresh' => 'Aktualisieren',
@@ -780,6 +789,7 @@ URL: [url]',
 'review_update_failed' => 'Störung bei Aktualisierung des Prüfstatus. Aktualisierung gescheitert.',
 'revise_document' => 'Dokument überprüfen',
 'revise_document_on' => '',
+'revision_log' => 'Protokoll der erneuten Prüfung',
 'revisors' => 'Überprüfer',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -801,7 +811,8 @@ URL: [url]',
 'rm_folder' => 'Löschen',
 'rm_from_clipboard' => 'Aus Zwischenablage löschen',
 'rm_group' => 'Diese Gruppe löschen',
-'rm_transmittal' => '',
+'rm_transmittal' => 'Dokumentenliste entfernen',
+'rm_transmittalitem' => 'Eintrag löschen',
 'rm_user' => 'Diesen Benutzer löschen',
 'rm_version' => 'Version löschen',
 'rm_workflow' => 'Lösche Workflow',
@@ -845,7 +856,7 @@ URL: [url]',
 'select_groups' => 'Klicken zur Auswahl einer Gruppe',
 'select_grp_approvers' => 'Klicken zur Auswahl einer Freigabegruppe',
 'select_grp_notification' => 'Klicken zur Auswahl einer Beobachtergruppe',
-'select_grp_recipients' => '',
+'select_grp_recipients' => 'Klicken zur Auswahl einer Empfängergruppe',
 'select_grp_reviewers' => 'Klicken zur Auswahl einer Prüfgruppe',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Klicken zur Auswahl eines Freigebers',
@@ -1154,11 +1165,13 @@ URL: [url]',
 'status_not_reviewed' => 'nicht geprüft',
 'status_not_revised' => 'nicht überprüft',
 'status_receipted' => 'Empfang bestätigt',
+'status_receipt_rejected' => 'Abgelehnt',
 'status_recipient_removed' => 'Empfänger aus Liste entfernt',
 'status_reviewed' => 'geprüft',
 'status_reviewer_rejected' => 'Entwurf abgelehnt',
 'status_reviewer_removed' => 'Prüfer wurde vom Prozess ausgeschlossen',
 'status_revised' => 'überprüft',
+'status_revision_rejected' => 'Abgelehnt',
 'status_revision_sleeping' => 'wartend',
 'status_revisor_removed' => 'Überprüfer von Liste entfernt',
 'status_unknown' => 'unbekannt',
@@ -1167,6 +1180,7 @@ URL: [url]',
 'submit_login' => 'Anmelden',
 'submit_password' => 'Setze neues Passwort',
 'submit_password_forgotten' => 'Neues Passwort setzen und per E-Mail schicken',
+'submit_receipt' => 'Empfang bestätigen',
 'submit_review' => 'Überprüfung hinzufügen',
 'submit_userinfo' => 'Daten setzen',
 'substitute_user' => 'Benutzer wechseln',
@@ -1198,8 +1212,12 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow transition triggered',
+'transmittal' => 'Dokumentenliste',
+'transmittalitem_removed' => 'Eintrag aus Dokumentenliste gelöscht',
+'transmittalitem_updated' => 'Dokument auf neueste Version aktualisiert',
 'transmittal_comment' => 'Kommentar',
 'transmittal_name' => 'Name',
+'transmittal_size' => 'Größe',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Türkisch',
 'tuesday' => 'Dienstag',
@@ -1230,6 +1248,7 @@ URL: [url]',
 'update_recipients' => 'Liste der Empfänger aktualisieren',
 'update_reviewers' => 'Liste der Prüfer aktualisieren',
 'update_revisors' => 'Liste der Wiederholungsprüfer ändern',
+'update_transmittalitem' => 'Auf neueste Dokumentenversion aktualisieren',
 'uploaded_by' => 'Hochgeladen durch',
 'uploading_failed' => 'Das Hochladen einer Datei ist fehlgeschlagen. Bitte überprüfen Sie die maximale Dateigröße für Uploads.',
 'uploading_maxsize' => 'Die Datei überschreitet die maximale Dateigröße für Uploads.',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index aa662ec70..a27ea55b2 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1154), dgrutsch (3), netixw (14)
+//    Translators: Admin (1174), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Add multiple files (will use filename as document name)',
 'add_receipt' => 'Acknowledge reception',
 'add_review' => 'Add review',
+'add_revision' => 'Add approval',
 'add_subfolder' => 'Add subfolder',
 'add_to_clipboard' => 'Add to clipboard',
+'add_to_transmittal' => 'Add to transmittal',
 'add_transmittal' => 'Add transmittal',
 'add_user' => 'Add new user',
 'add_user_to_group' => 'Add user to group',
@@ -191,7 +193,7 @@ URL: [url]',
 'change_assignments' => 'Change Assignments',
 'change_password' => 'Change password',
 'change_password_message' => 'Your password has been changed.',
-'change_recipients' => 'Change recipients',
+'change_recipients' => 'Change list of recipients',
 'change_revisors' => 'Change resubmission',
 'change_status' => 'Change Status',
 'charts' => 'Charts',
@@ -237,8 +239,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Do you really want to remove all the files of the folder "[foldername]" and of its subfolders?<br>Be careful: This action cannot be undone.',
 'confirm_rm_group' => 'Do you really want to remove the group "[groupname]"?<br>Be careful: This action cannot be undone.',
 'confirm_rm_log' => 'Do you really want to remove log file "[logname]"?<br>Be careful: This action cannot be undone.',
+'confirm_rm_transmittalitem' => 'Confirm removal',
 'confirm_rm_user' => 'Do you really want to remove the user "[username]"?<br>Be careful: This action cannot be undone.',
 'confirm_rm_version' => 'Do you really want to remove version [version] of document "[documentname]"?<br>Be careful: This action cannot be undone.',
+'confirm_update_transmittalitem' => 'Confirm update',
 'content' => 'Content',
 'continue' => 'Continue',
 'create_fulltext_index' => 'Create fulltext index',
@@ -272,6 +276,7 @@ URL: [url]',
 'documents_to_approve' => 'Documents awaiting your approval',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
+'documents_to_revise' => 'Documents to revise',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
 'document_already_checkedout' => 'This document is already checked out',
 'document_already_locked' => 'This document is aleady locked',
@@ -457,6 +462,7 @@ URL: [url]',
 'group_exists' => 'Group already exists.',
 'group_management' => 'Groups management',
 'group_members' => 'Group members',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Group review summary',
 'guest_login' => 'Login as guest',
 'guest_login_disabled' => 'Guest login is disabled.',
@@ -639,7 +645,9 @@ URL: [url]',
 'no_docs_locked' => 'No documents locked.',
 'no_docs_to_approve' => 'There are currently no documents that require approval.',
 'no_docs_to_look_at' => 'No documents that need attention.',
+'no_docs_to_receipt' => 'No document receipts required',
 'no_docs_to_review' => 'There are currently no documents that require review.',
+'no_docs_to_revise' => 'There are currently no documents that need to be revised.',
 'no_email_or_login' => 'Login and email must be entered',
 'no_fulltextindex' => 'No fulltext index available',
 'no_groups' => 'No groups',
@@ -703,6 +711,7 @@ If you have still problems to login, then please contact your administrator.',
 'quota_exceeded' => 'Your disk quota is exceeded by [bytes].',
 'quota_is_disabled' => 'Quota support is currently disabled in the settings. Setting a user quota will have no effect until it is enabled again.',
 'quota_warning' => 'Your maximum disc usage is exceeded by [bytes]. Please remove documents or previous versions.',
+'receipt_log' => 'Reception Log',
 'receipt_summary' => '',
 'recipients' => 'Recipients',
 'refresh' => 'Refresh',
@@ -787,6 +796,7 @@ URL: [url]',
 'review_update_failed' => 'Error updating review status. Update failed.',
 'revise_document' => 'Revise document',
 'revise_document_on' => 'Next revision of document version on [date]',
+'revision_log' => 'Revision log',
 'revisors' => 'Revisors',
 'revisor_already_assigned' => 'User is already assigned as an resubmitter.',
 'revisor_already_removed' => 'Resubmitter has already been removed from revision process or has already revised the document.',
@@ -809,6 +819,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Remove from clipboard',
 'rm_group' => 'Remove this group',
 'rm_transmittal' => 'Remove transmittal',
+'rm_transmittalitem' => 'Remove item',
 'rm_user' => 'Remove this user',
 'rm_version' => 'Remove version',
 'rm_workflow' => 'Remove Workflow',
@@ -1161,11 +1172,13 @@ URL: [url]',
 'status_not_reviewed' => 'Not reviewed',
 'status_not_revised' => 'not revised',
 'status_receipted' => 'Receipted',
+'status_receipt_rejected' => 'Rejected',
 'status_recipient_removed' => 'Recipient removed from list',
 'status_reviewed' => 'Reviewed',
 'status_reviewer_rejected' => 'Draft rejected',
 'status_reviewer_removed' => 'Reviewer removed from process',
 'status_revised' => 'revised',
+'status_revision_rejected' => 'rejected',
 'status_revision_sleeping' => 'pending',
 'status_revisor_removed' => 'Revisor removed from list',
 'status_unknown' => 'Unknown',
@@ -1174,6 +1187,7 @@ URL: [url]',
 'submit_login' => 'Sign in',
 'submit_password' => 'Set new password',
 'submit_password_forgotten' => 'Start process',
+'submit_receipt' => 'Submit receipt',
 'submit_review' => 'Submit review',
 'submit_userinfo' => 'Submit info',
 'substitute_user' => 'Substitute User',
@@ -1205,8 +1219,12 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow transition triggered',
+'transmittal' => 'Transmittal',
+'transmittalitem_removed' => 'Transmittal item removed',
+'transmittalitem_updated' => 'Dokument updated to latest version',
 'transmittal_comment' => 'Comment',
 'transmittal_name' => 'Name',
+'transmittal_size' => 'Size',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Turkish',
 'tuesday' => 'Tuesday',
@@ -1237,6 +1255,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Update List of Reviewers',
 'update_revisors' => 'Update list of resubmitters',
+'update_transmittalitem' => 'Update to latest document version',
 'uploaded_by' => 'Uploaded by',
 'uploading_failed' => 'Uploading one of your files failed. Please check your maximum upload file size.',
 'uploading_maxsize' => 'The uploaded file exceeds the maximum upload file size.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 7e3c66fda..aaee4832d 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (937), angel (123), francisco (2), jaimem (14)
+//    Translators: Admin (938), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Añadir múltiples ficheros (Se usará el nombre de fichero como nombre de documento)',
 'add_receipt' => '',
 'add_review' => 'Enviar revisión',
+'add_revision' => '',
 'add_subfolder' => 'Añadir subcarpeta',
 'add_to_clipboard' => 'Añadir al portapapeles',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Añadir nuevo usuario',
 'add_user_to_group' => 'Añadir usuario a grupo',
@@ -232,8 +234,10 @@ URL: [url]',
 'confirm_rm_folder_files' => '¿Desea realmente eliminar todos los ficheros de la carpeta "[foldername]" y de sus subcarpetas?<br />Atención: Esta acción no se puede deshacer.',
 'confirm_rm_group' => '¿Desea realmente eliminar el grupo "[groupname]"?<br />Atención: Esta acción no se puede deshacer.',
 'confirm_rm_log' => '¿Desea realmente eliminar el fichero de registro "[logname]"?<br />Atención: Esta acción no se puede deshacer.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '¿Desea realmente eliminar el usuario "[username]"?<br />Atención: Esta acción no se puede deshacer.',
 'confirm_rm_version' => '¿Desea realmente eliminar la versión [version] del documento "[documentname]"?<br />Atención: esta acción no se puede deshacer.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Contenido',
 'continue' => 'Continuar',
 'create_fulltext_index' => 'Crear índice de texto completo',
@@ -267,6 +271,7 @@ URL: [url]',
 'documents_to_approve' => 'Documentos en espera de aprobación de usuarios',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento ya está bloqueado',
@@ -452,6 +457,7 @@ URL: [url]',
 'group_exists' => 'El grupo ya existe.',
 'group_management' => 'Gestion de Grupos',
 'group_members' => 'Miembros de grupo',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Resumen del grupo revisor',
 'guest_login' => 'Acceso como invitado',
 'guest_login_disabled' => 'La cuenta de invitado está deshabilitada.',
@@ -635,7 +641,9 @@ URL: [url]',
 'no_docs_locked' => 'No hay documentos bloqueados.',
 'no_docs_to_approve' => 'Actualmente no hay documentos que necesiten aprobación.',
 'no_docs_to_look_at' => 'No hay documentos que necesiten atención.',
+'no_docs_to_receipt' => 'Keine Dokumentenempfangsbestätigung erforderlich',
 'no_docs_to_review' => 'Actualmente no hay documentos que necesiten revisión.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => 'Debe ingresar el usuario o e-mail',
 'no_fulltextindex' => 'No hay índice de texto completo disponible',
 'no_groups' => 'No hay grupos',
@@ -699,6 +707,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'quota_exceeded' => 'Su cuota de disco se ha excedido en [bytes].',
 'quota_is_disabled' => 'La cuota está actualmente deshabilitada en las opciones. Establecer una cuota de usuario no tendrá efecto hasta que sea habilitada de nuevo.',
 'quota_warning' => 'El máximo de uso de disco se ha excedido en [bytes]. Por favor eliminar documentos o versiones anteriores.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Actualizar',
@@ -766,6 +775,7 @@ URL: [url]',
 'review_update_failed' => 'Error actualizando el estado de la revisión. La actualización ha fallado.',
 'revise_document' => '',
 'revise_document_on' => 'Nächste Überprüfung des Dokuments am [date]',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -788,6 +798,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Borrar del portapapeles',
 'rm_group' => 'Eliminar este grupo',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Eliminar este usuario',
 'rm_version' => 'Eliminar versión',
 'rm_workflow' => 'Eliminar Flujo de Trabajo',
@@ -1140,11 +1151,13 @@ URL: [url]',
 'status_not_reviewed' => 'Sin revisar',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Revisado',
 'status_reviewer_rejected' => 'Borrador rechazado',
 'status_reviewer_removed' => 'Revisor eliminado del proceso',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Desconocido',
@@ -1153,6 +1166,7 @@ URL: [url]',
 'submit_login' => 'Conectar',
 'submit_password' => 'Fijar nueva contraseña',
 'submit_password_forgotten' => 'Comenzar el proceso',
+'submit_receipt' => '',
 'submit_review' => 'Enviar revisión',
 'submit_userinfo' => 'Enviar información',
 'substitute_user' => 'Cambiar de usuario',
@@ -1184,8 +1198,12 @@ Carpeta principal: [folder_path]
 Usuario: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow transition triggered',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Flujo de Trabajo',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martes',
@@ -1216,6 +1234,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Actualizar lista de revisores',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Enviado por',
 'uploading_failed' => 'Envío (Upload) fallido. Por favor contacte con el Administrador.',
 'uploading_maxsize' => 'El archivo subido supera el tamaño máximo de upload',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index a959e318a..25300a9c6 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Ajouter plusieurs fichiers (le nom du fichier servira de nom de document)',
 'add_receipt' => '',
 'add_review' => 'Soumettre la correction',
+'add_revision' => '',
 'add_subfolder' => 'Ajouter un sous-dossier',
 'add_to_clipboard' => 'Ajouter au presse-papiers',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Ajouter un utilisateur',
 'add_user_to_group' => 'Ajouter un utilisateur au groupe',
@@ -232,8 +234,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Voulez-vous vraiment supprimer tous les fichiers du dossier "[foldername]" et ses sous-dossiers?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_rm_group' => 'Voulez-vous vraiment supprimer le groupe "[groupname]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_rm_log' => 'Voulez-vous vraiment supprimer le fichier log "[logname]"?<br>Attention: Cette action ne peut pas être annulée.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Voulez-vous vraiment supprimer l\'utilisateur "[username]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_rm_version' => 'Voulez-vous réellement supprimer la [version] du document "[documentname]"?<br>Attention: Cette action ne peut pas être annulée.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Contenu',
 'continue' => 'Continuer',
 'create_fulltext_index' => 'Créer un index de recherche plein texte',
@@ -267,6 +271,7 @@ URL: [url]',
 'documents_to_approve' => 'Documents en attente d\'approbation',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en attente de correction',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Documents à surveiller',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ce document est déjà verrouillé',
@@ -452,6 +457,7 @@ URL: [url]',
 'group_exists' => 'Ce groupe existe déjà.',
 'group_management' => 'Groupes',
 'group_members' => 'Membres de groupes',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Résumé groupe correcteur',
 'guest_login' => 'Se connecter comme invité',
 'guest_login_disabled' => 'Connexion d\'invité désactivée.',
@@ -634,7 +640,9 @@ URL: [url]',
 'no_docs_locked' => 'Aucun document verrouillé',
 'no_docs_to_approve' => 'Aucun document ne nécessite actuellement une approbation',
 'no_docs_to_look_at' => 'Aucun document à surveiller',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Aucun document en attente de correction',
+'no_docs_to_revise' => '',
 'no_email_or_login' => '',
 'no_fulltextindex' => 'Aucun fichier d\'index disponibles',
 'no_groups' => 'Aucun groupe',
@@ -696,6 +704,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'quota_exceeded' => 'Votre quota de disque est dépassé de [bytes].',
 'quota_is_disabled' => 'Le support des quota est actuellement désactivé dans les réglages. Affecter un quota utilisateur n\'aura pas d\'effet jusqu\'à ce qu\'il soit de nouveau activé.',
 'quota_warning' => 'Votre taille maximale de disque est dépassée de [bytes]. SVP supprimer des documents ou d\'anciennes versions.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Actualiser',
@@ -755,6 +764,7 @@ URL: [url]',
 'review_update_failed' => 'Erreur lors de la mise à jour de la correction. Echec de la mise à jour.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -771,6 +781,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Supprimer le dossier du presse-papiers',
 'rm_group' => 'Supprimer ce groupe',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Supprimer cet utilisateur',
 'rm_version' => 'Retirer la version',
 'rm_workflow' => 'Supprimer le Workflow',
@@ -1116,11 +1127,13 @@ URL: [url]',
 'status_not_reviewed' => 'Non corrigé',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Corrigé',
 'status_reviewer_rejected' => 'Correction rejetée',
 'status_reviewer_removed' => 'Correcteur retiré du processus',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Inconnu',
@@ -1129,6 +1142,7 @@ URL: [url]',
 'submit_login' => 'Connexion',
 'submit_password' => 'Entrez nouveau mot de passe',
 'submit_password_forgotten' => 'Envoyer',
+'submit_receipt' => '',
 'submit_review' => 'Soumettre la correction',
 'submit_userinfo' => 'Soumettre info',
 'substitute_user' => 'Utilisateur de substitution',
@@ -1151,8 +1165,12 @@ URL: [url]',
 'transition_triggered_email' => 'Transition de workflow activé',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Turc',
 'tuesday' => 'Mardi',
@@ -1183,6 +1201,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Mise à jour de la liste de correcteurs',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Déposé par',
 'uploading_failed' => 'Dépose du document échoué. SVP Contactez le responsable.',
 'uploading_maxsize' => 'La taille du fichier téléchargé excède la taille maximale accepté',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index ba4e957ff..94f91f5c9 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Több állomány hozzáadása (az állomány nevét használja dokumentum névként)',
 'add_receipt' => '',
 'add_review' => 'Felülvizsgálat küldése',
+'add_revision' => '',
 'add_subfolder' => 'Alkönyvtár hozzáadása',
 'add_to_clipboard' => 'Vágólaphoz hozzáad',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Új felhasználó hozzáadása',
 'add_user_to_group' => 'Felhasználó csoporthoz rendelése',
@@ -232,8 +234,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Biztosan el kívánja távolítani az összes állományt és almappát a "[foldername]" mappából?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
 'confirm_rm_group' => 'Biztosan el kívánja távolítani ezt a csoportot "[groupname]"?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
 'confirm_rm_log' => 'Biztosan el kívánja távolítani ezt a napló állományt "[logname]"?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Biztosan el kívánja távolítani ezt a felhasználót "[username]"?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
 'confirm_rm_version' => 'Biztosan el kívánaj távolítani a dokumentum "[documentname]" [version] verzióját?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Tartalom',
 'continue' => 'Folytatás',
 'create_fulltext_index' => 'Teljes szöveg index létrehozása',
@@ -267,6 +271,7 @@ URL: [url]',
 'documents_to_approve' => 'Jóváhagyására váró dokumentumok',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ez a dokumentum már zárolt',
@@ -452,6 +457,7 @@ URL: [url]',
 'group_exists' => 'Csoport már létezik.',
 'group_management' => 'Csoportok',
 'group_members' => 'Csoporttagok',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Csoport felülvizsgálat összefoglaló',
 'guest_login' => 'Bejelentkezés vendégként',
 'guest_login_disabled' => 'Vendég bejelentkezés letiltva.',
@@ -635,7 +641,9 @@ URL: [url]',
 'no_docs_locked' => 'Nincsenek zárolt dokumentumok.',
 'no_docs_to_approve' => 'Nincsenek jóváhagyandó dokumentumok.',
 'no_docs_to_look_at' => 'Nincs karbantartást igénylő dokumentum.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Nincsenek felülvizsgálandó dokumentumok.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => 'Felhasználónevet és emailt meg kell adni',
 'no_fulltextindex' => 'Nincs elérhető teljes szöveg index',
 'no_groups' => 'Nincsenek csoportok',
@@ -699,6 +707,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'quota_exceeded' => 'Túllépte a lemezterület korlátot [bytes].',
 'quota_is_disabled' => 'Kvóta támogatás jelenleg le van tiltva a beállításoknál. Felhasználói korlát beállítások nem kerülnek érvényesítésre amíg nincs újra engedélyezve.',
 'quota_warning' => 'Túllépte lemez korlátot [bytes] bájttal. Kérjük távolítson el dokumentumokat vagy korábbi változatokat.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Frissítés',
@@ -766,6 +775,7 @@ URL: [url]',
 'review_update_failed' => 'Hiba a felülvizsgálat állapot frissítése során. Frissítés sikertelen.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -788,6 +798,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Eltávolítás a vágólapról',
 'rm_group' => 'Csoport eltávolítása',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Felhasználó eltávolítása',
 'rm_version' => 'Változat eltávolítása',
 'rm_workflow' => 'Munkafolyamat eltávolítása',
@@ -1139,11 +1150,13 @@ URL: [url]',
 'status_not_reviewed' => 'Nem felülvizsgált',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Felülvizsgált',
 'status_reviewer_rejected' => 'Piszkozat elutasítva',
 'status_reviewer_removed' => 'Felülvizsgáló eltávolítva a folyamatból',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Ismeretlen',
@@ -1152,6 +1165,7 @@ URL: [url]',
 'submit_login' => 'Bejelentkezés',
 'submit_password' => 'Új jelszó megadása',
 'submit_password_forgotten' => 'Folyamat indítás',
+'submit_receipt' => '',
 'submit_review' => 'Felülvizsgálat küldése',
 'submit_userinfo' => 'Információ küldése',
 'substitute_user' => 'Helyettesítő felhasználó',
@@ -1183,8 +1197,12 @@ Szülő mappa: [folder_path]
 Felhasználó: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Munkamanet átmenet kiváltva',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Munkafolyamat',
 'tr_TR' => 'Török',
 'tuesday' => 'Kedd',
@@ -1215,6 +1233,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Felülvizsgálók listájának frissítése',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Feltöltötte',
 'uploading_failed' => 'Állományai egyikének feltöltése sikertelen. Kérjük ellenőrizze a legnagyobb feltölthető állomány méretet.',
 'uploading_maxsize' => 'A feltöltött fájl nagyobb, mint a megengedezz maximális méret',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index ba897303c..6e7139dd3 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Aggiungi documenti multipli (il nome del file verrà usato come nome del documento)',
 'add_receipt' => '',
 'add_review' => 'Invio revisione',
+'add_revision' => '',
 'add_subfolder' => 'Aggiungi sottocartella',
 'add_to_clipboard' => 'Aggiungi agli appunti',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Aggiungi un nuovo utente',
 'add_user_to_group' => 'Aggiungi un utente al gruppo',
@@ -237,8 +239,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Vuoi davvero rimuovere tutti i file dalla cartella "[foldername]" e dalle sue sottocartelle?<br>Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_group' => 'Vuoi davvero rimuovere il gruppo "[groupname]"?<br>Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_log' => 'Vuoi davvero rimuovere il file di log "[logname]"?<br>Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"?<br>Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"?<br>Attenzione: questa operazione non può essere annullata.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Contenuto',
 'continue' => 'Continua',
 'create_fulltext_index' => 'Crea indice fulltext',
@@ -272,6 +276,7 @@ URL: [url]',
 'documents_to_approve' => 'Documenti in attesa della tua approvazione',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Questo documento è già bloccato',
@@ -457,6 +462,7 @@ URL: [url]',
 'group_exists' => 'Il gruppo è già esistente',
 'group_management' => 'Amministrazione gruppi',
 'group_members' => 'Membri del gruppo',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Dettaglio revisioni di gruppo',
 'guest_login' => 'Login come Ospite',
 'guest_login_disabled' => 'Il login come Ospite è disabilitato.',
@@ -640,7 +646,9 @@ URL: [url]',
 'no_docs_locked' => 'Nessun documento bloccato.',
 'no_docs_to_approve' => 'Non ci sono documenti che richiedano approvazione.',
 'no_docs_to_look_at' => 'Non ci sono documenti che richiedano attenzione.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Non ci sono documenti che richiedano revisioni.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => 'Login ed email devono essere digitate',
 'no_fulltextindex' => 'Nessun indice fulltext disponibile',
 'no_groups' => 'Nessun gruppo',
@@ -704,6 +712,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].',
 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.',
 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Ricarica',
@@ -788,6 +797,7 @@ URL: [url]',
 'review_update_failed' => 'Errore nella variazione dello stato di revisione. Aggiornamento fallito.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -810,6 +820,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Rimuovi dalla clipboard',
 'rm_group' => 'Rimuovi questo gruppo',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Rimuovi questo utente',
 'rm_version' => 'Rimuovi versione',
 'rm_workflow' => 'Rimuovi flusso di lavoro',
@@ -1162,11 +1173,13 @@ URL: [url]',
 'status_not_reviewed' => 'Non ancora revisionato',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Revisionato',
 'status_reviewer_rejected' => 'Bozza rifiutata',
 'status_reviewer_removed' => 'Revisore rimosso dal processo',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Sconosciuto',
@@ -1175,6 +1188,7 @@ URL: [url]',
 'submit_login' => 'Accedi',
 'submit_password' => 'Impostazione nuova password',
 'submit_password_forgotten' => 'Inizio processo di recupero',
+'submit_receipt' => '',
 'submit_review' => 'Invio revisione',
 'submit_userinfo' => 'Invio info utente',
 'substitute_user' => 'Impersona utente',
@@ -1206,8 +1220,12 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'transition_triggered_email_subject' => 'Transizione del flusso di lavoro iniziata',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Flusso di lavoro',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martedì',
@@ -1238,6 +1256,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Aggiorna lista revisori',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Caricato da',
 'uploading_failed' => 'Upload fallito. Controllare la dimensione massima caricabile consentita.',
 'uploading_maxsize' => 'Il file caricato supera la dimensione massima consentita.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 6ee3c676e..400e620ac 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Meerdere bestanden toevoegen (Gebruikt bestandsnaam als document naam)',
 'add_receipt' => '',
 'add_review' => 'Verzend [Controle]',
+'add_revision' => '',
 'add_subfolder' => 'Submap toevoegen',
 'add_to_clipboard' => 'Toevoegen aan klembord',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Nieuwe gebruiker toevoegen',
 'add_user_to_group' => 'Gebruiker aan groep toevoegen',
@@ -225,8 +227,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Weet U zeker dat U alle bestanden en submappen van de map "[foldername]" wilt verwijderen?<br>Let op: deze actie kan niet ongedaan worden gemaakt.',
 'confirm_rm_group' => 'Weet U zeker dat U de Groep "[groupname]" wilt verwijderen?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_rm_log' => 'Weet U zeker dat U het logbestand "[logname]" wilt verwijderen?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_rm_version' => 'Weet U zeker dat U deze versie van het document "[documentname]" wilt verwijderen?<br>Pas op: deze handeling kan niet ongedaan worden gemaakt.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Welkomstpagina',
 'continue' => 'Doorgaan',
 'create_fulltext_index' => 'Creeer volledige tekst index',
@@ -260,6 +264,7 @@ URL: [url]',
 'documents_to_approve' => 'Documenten die wachten op uw goedkeuring',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documenten die wachten op uw controle',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Dit document is al geblokkeerd',
@@ -445,6 +450,7 @@ URL: [url]',
 'group_exists' => 'Groep bestaat reeds.',
 'group_management' => 'Groepen beheer',
 'group_members' => 'Groepsleden',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Groep [Controle] samenvatting',
 'guest_login' => 'Login als Gast',
 'guest_login_disabled' => 'Gast login is uitgeschakeld.',
@@ -627,7 +633,9 @@ URL: [url]',
 'no_docs_locked' => 'Geen documenten in gebruik.',
 'no_docs_to_approve' => 'Er zijn momenteel geen documenten die Goedkeuring behoeven.',
 'no_docs_to_look_at' => 'Geen documenten die aandacht behoeven.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Er zijn momenteel geen documenten die Controle behoeven.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => 'Gebruikersnaam en emailadres moeten worden ingevoerd',
 'no_fulltextindex' => 'Geen volledigetekst index beschikbaar',
 'no_groups' => 'Geen Groepen',
@@ -692,6 +700,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'quota_exceeded' => 'Uw data quota is overschreden met [bytes].',
 'quota_is_disabled' => 'Quota support is momenteel niet aktief in de eigenschappen. Een user quota zetten zal geen effect hebben tot quotas actief zijn.',
 'quota_warning' => 'Uw maximale data gebruik is overschreden met [bytes]. Gelieve documenten of eerdere versies te verwijderen.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Verversen',
@@ -757,6 +766,7 @@ URL: [url',
 'review_update_failed' => 'Foutmelding: fout bij bijwerken [Controle] Status. Bijwerken mislukt.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -779,6 +789,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Verwijder van klembord',
 'rm_group' => 'Verwijder deze Groep',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Verwijder deze Gebruiker',
 'rm_version' => 'Verwijder versie',
 'rm_workflow' => 'Verwijder workflwo',
@@ -1131,11 +1142,13 @@ URL: [url]',
 'status_not_reviewed' => 'Niet gecontroleerd',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Gecontroleerd',
 'status_reviewer_rejected' => 'Klad Controle [Afgewezen]',
 'status_reviewer_removed' => '[Controleur] verwijderd van dit proces',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Onbekend',
@@ -1144,6 +1157,7 @@ URL: [url]',
 'submit_login' => 'Log in',
 'submit_password' => 'Nieuw wachtwoord instellen',
 'submit_password_forgotten' => 'Start proces',
+'submit_receipt' => '',
 'submit_review' => 'Verzend [Controle]',
 'submit_userinfo' => 'Wijzigingen opslaan',
 'substitute_user' => 'Invaller/ vervanger Gebruiker',
@@ -1175,8 +1189,12 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow overgang geactiveerd',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Turks',
 'tuesday' => 'Dinsdag',
@@ -1207,6 +1225,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Bijwerken lijst van [Controleurs]',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Ge-upload door',
 'uploading_failed' => 'Upload mislukt. Neem contact op met de [Beheerder].',
 'uploading_maxsize' => 'Het geuploade bestand overschrijdt de maximum grootte.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 0c86e994c..1593d5794 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Dodaj wiele plików (Nazwy plików zostaną użyte jako nazwy dokumentów)',
 'add_receipt' => '',
 'add_review' => 'Zatwierdź recenzję',
+'add_revision' => '',
 'add_subfolder' => 'Dodaj podfolder',
 'add_to_clipboard' => 'Dodaj do schowka',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Dodaj nowego użytkownika',
 'add_user_to_group' => 'Przypisz użytkownika do grupy',
@@ -225,8 +227,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Czy rzeczywiście chcesz usunąć wszystkie pliki z folderu "[foldername]" oraz jego podfoldery?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
 'confirm_rm_group' => 'Czy rzeczywiście chcesz usunąć grupę "[groupname]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
 'confirm_rm_log' => 'Czy rzeczywiście chcesz usunąć plik dziennika "[logname]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Czy rzeczywiście chcesz usunąć użytkownika "[username]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
 'confirm_rm_version' => 'Czy rzeczywiście chcesz usunąć wersję [version] dokumentu "[documentname]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Zawartość',
 'continue' => 'Kontynuuj',
 'create_fulltext_index' => 'Utwórz indeks pełnotekstowy',
@@ -260,6 +264,7 @@ URL: [url]',
 'documents_to_approve' => 'Dokumenty oczekujące na Twoje zatwierdzenie',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ten dokument jest już zablokowany',
@@ -445,6 +450,7 @@ URL: [url]',
 'group_exists' => 'Grupa już istnieje.',
 'group_management' => 'Zarządzanie grupami',
 'group_members' => 'Członkowie grupy',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Podsumowanie opiniowania dla grupy',
 'guest_login' => 'Zalogowany jako gość',
 'guest_login_disabled' => 'Logowanie dla gościa jest wyłączone.',
@@ -628,7 +634,9 @@ URL: [url]',
 'no_docs_locked' => 'Brak zablokowanych dokumentów.',
 'no_docs_to_approve' => 'Aktualnie nie ma dokumentów wymagających akceptacji.',
 'no_docs_to_look_at' => 'Brak dokumentów wymagających uwagi.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Aktualnie nie ma dokumentów oczekujących na recenzję.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => '',
 'no_fulltextindex' => 'Brak indeksu pełnotekstowego',
 'no_groups' => 'Brak grup',
@@ -692,6 +700,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'quota_exceeded' => 'Twój limit przydzielonej przestrzeni dyskowej został przekroczony o [bytes].',
 'quota_is_disabled' => 'Wsparcie limitów dyskowych jest obecnie wyłączone w ustawieniach. Ustawiony limit dyskowy użytkownika nie będzie działał dopóki wparcie nie zostanie ponownie włączone.',
 'quota_warning' => 'Przekroczono użycie dysku o [bytes]. Usuń dokumenty lub poprzednie wersje.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Odśwież',
@@ -745,6 +754,7 @@ URL: [url]',
 'review_update_failed' => 'Błąd podczas aktualizowania statusu recenzji. Aktualizacja nie powiodła się.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -767,6 +777,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Usuń ze schowka',
 'rm_group' => 'Usuń tą grupę',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Usuń tego użytkownika',
 'rm_version' => 'Usuń wersję',
 'rm_workflow' => 'Usuń proces',
@@ -1119,11 +1130,13 @@ URL: [url]',
 'status_not_reviewed' => 'Nie zrecenzowane',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Zrecenzowane',
 'status_reviewer_rejected' => 'Szkic odrzucony',
 'status_reviewer_removed' => 'Recenzent usunięty z procesu',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Nieznany',
@@ -1132,6 +1145,7 @@ URL: [url]',
 'submit_login' => 'Zaloguj się',
 'submit_password' => 'Ustaw nowe hasło',
 'submit_password_forgotten' => 'Uruchom proces',
+'submit_receipt' => '',
 'submit_review' => 'Zatwierdź recenzję',
 'submit_userinfo' => 'Zatwierdź dane',
 'substitute_user' => 'Zastępca użytkownika',
@@ -1163,8 +1177,12 @@ Folder nadrzędny: [folder_path]
 Użytkownik: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Uruchomiono proces przepływu',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Proces',
 'tr_TR' => 'Turecki',
 'tuesday' => 'Wtorek',
@@ -1195,6 +1213,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Aktualizuj listę recenzentów',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Przesłane przez',
 'uploading_failed' => 'Przesyłanie nie powiodło się. Skontaktuj się z administratorem.',
 'uploading_maxsize' => 'Rozmiar pliku większy niż dopuszczalny',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 9d574ec04..2a9d7c1fe 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Add multiple files (will use filename as document name)',
 'add_receipt' => '',
 'add_review' => '',
+'add_revision' => '',
 'add_subfolder' => 'Criar sub-pasta',
 'add_to_clipboard' => 'Adicionar ao clipboard',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Novo usuário',
 'add_user_to_group' => 'Adicionar usuário ao grupo',
@@ -232,8 +234,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Você realmente deseja remover todos os arquivos da pasta "[foldername]" e de suas subpastas <br> Cuidado: Eáa ação não pode ser desfeita.',
 'confirm_rm_group' => 'Do you really want to remove the group "[groupname]"?<br>Be careful: This action cannot be undone.',
 'confirm_rm_log' => 'Do you really want to remove log file "[logname]"?<br>Be careful: This action cannot be undone.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Do you really want to remove the user "[username]"?<br>Be careful: This action cannot be undone.',
 'confirm_rm_version' => 'Deseja realmente remover versão [version] do documento "[documentname]"?<br>Por favor, tenha cuidado porque esta ação não poderá ser desfeita.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Conteúdo',
 'continue' => 'Continue',
 'create_fulltext_index' => 'Criar índice de texto completo',
@@ -267,6 +271,7 @@ URL: [url]',
 'documents_to_approve' => 'Documents Awaiting User\'s Approval',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento já está travado',
@@ -451,6 +456,7 @@ URL: [url]',
 'group_exists' => 'Group already exists.',
 'group_management' => 'Grupos',
 'group_members' => 'Grupo membros',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Resumo da avaliação do grupo',
 'guest_login' => 'Entre como convidado',
 'guest_login_disabled' => 'Guest login is disabled.',
@@ -633,7 +639,9 @@ URL: [url]',
 'no_docs_locked' => 'Nenhum documento bloqueado.',
 'no_docs_to_approve' => 'There are currently no documents that require approval.',
 'no_docs_to_look_at' => 'Não há documentos que precisam de atenção.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'There are currently no documents that require review.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => 'Login e e-mail devem ser digitados',
 'no_fulltextindex' => 'Nenhum índice de texto completo disponível',
 'no_groups' => 'Sem grupos',
@@ -697,6 +705,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'quota_exceeded' => 'Sua cota de disco foi ultrapassada em [bytes].',
 'quota_is_disabled' => 'Suporte a cota está desativado nas configurações. A definição de cota do usuário não terá efeito até que seja habilitada novamente.',
 'quota_warning' => 'Seu uso máximo do disco foi ultrapassado em [bytes]. Por favor, remova documentos ou versões anteriores.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Atualizar',
@@ -763,6 +772,7 @@ URL: [url]',
 'review_update_failed' => 'Error updating review status. Update failed.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -785,6 +795,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Remover da área de transferência',
 'rm_group' => 'Remove este grupo',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Remove este usuário',
 'rm_version' => 'Remove versão',
 'rm_workflow' => 'Retire do fluxo de trabalho',
@@ -1137,11 +1148,13 @@ URL: [url]',
 'status_not_reviewed' => '',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => '',
 'status_reviewer_rejected' => '',
 'status_reviewer_removed' => '',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Unknown',
@@ -1150,6 +1163,7 @@ URL: [url]',
 'submit_login' => 'Entrar',
 'submit_password' => 'Definir uma nova senha',
 'submit_password_forgotten' => 'Iniciar processo',
+'submit_receipt' => '',
 'submit_review' => '',
 'submit_userinfo' => 'Submeter informação',
 'substitute_user' => 'Substituto do usuário',
@@ -1181,8 +1195,12 @@ Parent pasta: [folder_path]
 User: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Transição de fluxo de trabalho desencadeado',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Fluxo de trabalho',
 'tr_TR' => 'Turco',
 'tuesday' => 'Tuesday',
@@ -1213,6 +1231,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Update List of Reviewers',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Inserido por',
 'uploading_failed' => 'Inserção falhou. Por favor contacte o administrador',
 'uploading_maxsize' => 'O arquivo excede o tamanho máximo permitido para upload.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 970dd3a78..e70f91d73 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1005), balan (6)
+//    Translators: Admin (1005), balan (87)
 
 $text = array(
 'accept' => 'Accept',
@@ -51,7 +51,7 @@ URL: [url]',
 'add_approval' => 'Trimite aprobare',
 'add_document' => 'Adaugă document',
 'add_document_link' => 'Adauga link',
-'add_document_notify' => '',
+'add_document_notify' => 'Alocati notificare',
 'add_doc_reviewer_approver_warning' => 'N.B. Documentele care nu au atasat revizuitori(reviwers) și/sau aprobatori sunt automat marcate ca "final(released)".',
 'add_doc_workflow_warning' => 'N.B. Documentele care nu au atasat un workflow sunt automat marcate ca final(released)".',
 'add_event' => 'Adaugă eveniment',
@@ -59,11 +59,13 @@ URL: [url]',
 'add_member' => 'Adaugă un membru',
 'add_multiple_documents' => 'Adaugă documente multiple',
 'add_multiple_files' => 'Adaugă fisiere multiple (va folosi numele fișierului ca nume de document)',
-'add_receipt' => '',
+'add_receipt' => 'Recunoaste receptia',
 'add_review' => 'Trimite revizuire',
+'add_revision' => '',
 'add_subfolder' => 'Adaugă subfolder',
 'add_to_clipboard' => 'Adaugă in clipboard',
-'add_transmittal' => '',
+'add_to_transmittal' => '',
+'add_transmittal' => 'Adauga transmitere',
 'add_user' => 'Adaugă utilizator nou',
 'add_user_to_group' => 'Adaugă utilizator la grup',
 'add_workflow' => 'Adaugă workflow nou',
@@ -80,8 +82,13 @@ URL: [url]',
 'and' => 'si',
 'apply' => 'Aplică',
 'approval_deletion_email' => 'Cerere de aprobare stearsă',
-'approval_deletion_email_body' => '',
-'approval_deletion_email_subject' => '',
+'approval_deletion_email_body' => 'Cerere aprobare stearsa
+Document: [name]
+Versiune: [version]
+Folder parinte: [folder_path]
+Utilizator: [username]
+URL: [url]',
+'approval_deletion_email_subject' => '[sitename]: [name] - Cerere aprobare stearsa',
 'approval_group' => 'Grup aprobare',
 'approval_log' => 'Log aprobare',
 'approval_request_email' => 'Cerere aprobare',
@@ -106,8 +113,8 @@ URL: [url]',
 'approval_summary' => 'Sumar aprobare',
 'approval_update_failed' => 'Eroare actualizare status aprobare. Actualizarea nu a reușit.',
 'approvers' => 'Aprobatori',
-'approver_already_assigned' => '',
-'approver_already_removed' => '',
+'approver_already_assigned' => 'Utilizatorul este deja asignat ca un aprobator.',
+'approver_already_removed' => 'Aprobatorul a fost deja eliminat din procesul de aprobare sau a trimis deja o aprobare.',
 'april' => 'Aprilie',
 'archive_creation' => 'Creare arhiva',
 'archive_creation_warning' => 'Cu această operațiune puteți crea o arhiva care sa conțina fișierele din toate folderele DMS. După creare, arhiva va fi salvata în folderul de date din serverul dumneavoastră. <br> AVERTISMENT:. O arhivă creată ca lizibilă pentru om nu va putea fi utilizata ca server de backup.',
@@ -129,12 +136,12 @@ URL: [url]',
 'attrdef_objtype' => 'Tip obiect',
 'attrdef_regex' => 'Expresie regulată',
 'attrdef_type' => 'Tip',
-'attrdef_type_boolean' => '',
-'attrdef_type_email' => '',
-'attrdef_type_float' => '',
-'attrdef_type_int' => '',
-'attrdef_type_string' => '',
-'attrdef_type_url' => '',
+'attrdef_type_boolean' => 'Boolean',
+'attrdef_type_email' => 'Email',
+'attrdef_type_float' => 'Float',
+'attrdef_type_int' => 'Intreg',
+'attrdef_type_string' => 'String',
+'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Set de valori',
 'attributes' => 'Atribute',
 'attribute_changed_email_body' => 'Atribut schimbat
@@ -147,8 +154,8 @@ URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Atribut schimbat',
 'attribute_count' => 'Numărul de utilizări',
 'attribute_value' => 'Valoare atribut',
-'attr_malformed_email' => '',
-'attr_malformed_url' => '',
+'attr_malformed_email' => 'Valoarea \'[value]\' a atributului \'[attrname]\' nu este o adresa URL valida.',
+'attr_malformed_url' => 'Valoarea \'[value]\' a atributului \'[attrname]\' nu este o adresa URL valida.',
 'attr_max_values' => 'Numărul maxim de valori necesare pentru atributul [attrname] este depășit.',
 'attr_min_values' => 'Numărul minim de valori necesare pentru atributul [attrname] nu este atins.',
 'attr_no_regex_match' => 'Valoarea atributului nu se potrivește cu expresia regulată',
@@ -186,8 +193,8 @@ URL: [url]',
 'change_assignments' => 'Schimbă alocările',
 'change_password' => 'Schimbă parola',
 'change_password_message' => 'Parola dumneavoastra a fost schimbată.',
-'change_recipients' => '',
-'change_revisors' => '',
+'change_recipients' => 'Schimba destinatari',
+'change_revisors' => 'Schimba retrimiterea',
 'change_status' => 'Schimbă status',
 'charts' => 'Grafice',
 'chart_docsaccumulated_title' => 'Numărul de documente',
@@ -198,12 +205,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documente per utilizator',
 'chart_selection' => 'Selectați grafic',
 'chart_sizeperuser_title' => 'Spațiu pe disc per utilizator',
-'checkedout_file_has_different_version' => '',
-'checkedout_file_has_disappeared' => '',
-'checkedout_file_is_unchanged' => '',
-'checkin_document' => '',
-'checkout_document' => '',
-'checkout_is_disabled' => '',
+'checkedout_file_has_different_version' => 'Versiunea verificata nu este identica cu versiunea curenta. Check in-ul nu va actualiza documentul.',
+'checkedout_file_has_disappeared' => 'Fisierul documentului verificat a disparut. Check in-ul nu va fi posibil.',
+'checkedout_file_is_unchanged' => 'Fisierul documentului verificat este inca neschimbat. Check in-ul nu va fi posibil. Daca nu planuiti modificari, puteti reseta starea de Verificare.',
+'checkin_document' => 'Check In',
+'checkout_document' => 'Verifica',
+'checkout_is_disabled' => 'Verificarea documentelor este dezactivata in configurari.',
 'choose_attrdef' => 'Vă rugăm să alegeți definiția atributului',
 'choose_category' => 'Vă rugăm să alegeți',
 'choose_group' => 'Alege grup',
@@ -232,8 +239,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Sigur doriți să eliminați toate fișierele din folderul "[foldername]" si toate subfolderele?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
 'confirm_rm_group' => 'Sigur doriți să eliminați grupul "[groupname]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
 'confirm_rm_log' => 'Sigur doriți să eliminați fișierul log "[logname]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Sigur doriți să eliminați utilizatorul "[username]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
 'confirm_rm_version' => 'Sigur doriți să eliminați versiunea [version] a documentului "[documentname]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Conținut',
 'continue' => 'Continuă',
 'create_fulltext_index' => 'Creați indexul pentru tot textul',
@@ -260,15 +269,16 @@ URL: [url]',
 'discspace' => 'Spațiu pe disc',
 'document' => 'Document',
 'documents' => 'Documente',
-'documents_checked_out_by_you' => '',
+'documents_checked_out_by_you' => 'Documente verificate de tine',
 'documents_in_process' => 'Documente în procesare',
 'documents_locked_by_you' => 'Documente blocate de tine',
 'documents_only' => 'Doar documente',
 'documents_to_approve' => 'Documente care așteaptă aprobarea dumneavoastră',
-'documents_to_receipt' => '',
+'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
+'documents_to_revise' => 'Documente de revizut',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
-'document_already_checkedout' => '',
+'document_already_checkedout' => 'Acest document este deja verificat',
 'document_already_locked' => 'Acest document este deja blocat',
 'document_comment_changed_email' => 'Comentariu schimbat',
 'document_comment_changed_email_body' => 'Comentariu schimbat
@@ -289,7 +299,7 @@ Utilizator: [username]',
 'document_duplicate_name' => 'Nume document duplicat',
 'document_has_no_workflow' => 'Documentul nu are workflow',
 'document_infos' => 'Informații document',
-'document_is_checked_out' => '',
+'document_is_checked_out' => 'Documentul este in prezent verificat. Daca incarcati o noua versiune, versiunea verificata nu mai poate fi verificata din nou.',
 'document_is_not_locked' => 'Acest document nu este blocat',
 'document_link_by' => 'Corelat cu (Linked by)',
 'document_link_public' => 'Public',
@@ -301,7 +311,7 @@ Folder nou: [new_folder_path]
 Utilizator: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Document mutat',
-'document_not_checkedout' => '',
+'document_not_checkedout' => 'Documentul nu este verificat.',
 'document_renamed_email' => 'Document redenumit',
 'document_renamed_email_body' => 'Nume document schimbat
 Document: [name]
@@ -359,7 +369,7 @@ URL: [url]',
 'edit_folder_notify' => 'Listă de notificare pentru folder',
 'edit_folder_props' => 'Editează folder',
 'edit_group' => 'Editează grup',
-'edit_transmittal_props' => '',
+'edit_transmittal_props' => 'Editeaza proprietatile de transmitere',
 'edit_user' => 'Editează utilizator',
 'edit_user_details' => 'Editează detalii utilizator',
 'email' => 'Email',
@@ -452,6 +462,7 @@ URL: [url]',
 'group_exists' => 'Grupul există deja.',
 'group_management' => 'Management grupuri',
 'group_members' => 'Membrii grupului',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Sumar revizuiri grup',
 'guest_login' => 'Login ca oaspete',
 'guest_login_disabled' => 'Logarea ca oaspete este dezactivată.',
@@ -492,7 +503,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID Folder țintă invalid',
 'invalid_user_id' => 'ID Utilizator invalid',
 'invalid_version' => 'Versiune Document invalidă',
-'in_revision' => '',
+'in_revision' => 'In revizuire',
 'in_workflow' => 'În workflow',
 'is_disabled' => 'Dezactivează cont',
 'is_hidden' => 'Ascunde din lista de utilizatori',
@@ -570,7 +581,7 @@ URL: [url]',
 'move_folder' => 'Mută Folder',
 'my_account' => 'Contul Meu',
 'my_documents' => 'Documentele Mele',
-'my_transmittals' => '',
+'my_transmittals' => 'Trimiterile mele',
 'name' => 'Nume',
 'needs_workflow_action' => 'Acest document necesită atenția dumneavoastră. Vă rugăm să verificați tab-ul workflow.',
 'never' => 'niciodată',
@@ -631,11 +642,13 @@ URL: [url]',
 'no_attached_files' => 'Nu sunt fișiere atașate',
 'no_current_version' => 'Utilizați o versiune veche de SeedDMS. Cea mai recentă versiune disponibilă este [latestversion].',
 'no_default_keywords' => 'Nu există cuvinte cheie disponibile',
-'no_docs_checked_out' => '',
+'no_docs_checked_out' => 'Nu exista documente verificate',
 'no_docs_locked' => 'Nici un document blocat.',
 'no_docs_to_approve' => 'Momentan nu există documente care necesită aprobarea.',
 'no_docs_to_look_at' => 'Nici un document care necesită atenție.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Momentan nu există documente care necesită revizuirea.',
+'no_docs_to_revise' => 'In prezent nu exista documente care trebuie sa fie revizuite.',
 'no_email_or_login' => 'Login și email trebuie să fie introduse',
 'no_fulltextindex' => 'Nu există index pe tot textul disponibil',
 'no_groups' => 'Nu există grupe',
@@ -646,13 +659,13 @@ URL: [url]',
 'no_update_cause_locked' => 'Deci, nu puteti sa actualizati acest document. Vă rugăm să contactați administratorul.',
 'no_user_image' => 'Nu au fost găsite imagini',
 'no_version_check' => 'Verificarea pentru o noua versiune SeedDMS a reușit! Acest lucru ar putea fi cauzat de setarea allow_url_fopen=0 în configurația php-ului dumneavoastră.',
-'no_workflow_available' => '',
+'no_workflow_available' => 'Nici un workflow disponibil',
 'objectcheck' => 'Verificare folder/document',
 'obsolete' => 'Învechit',
 'october' => 'Octombrie',
 'old' => 'Vechi',
 'only_jpg_user_images' => 'Doar imagini .jpg pot fi utilizate ca imagine-utilizator',
-'order_by_sequence_off' => '',
+'order_by_sequence_off' => 'Ordonarea dupa secventa este dezactivata in setari. Daca doriti acest parametru sa aiba efect, va trebui sa-l reactivati.',
 'original_filename' => 'Nume de fișier original',
 'owner' => 'Proprietar',
 'ownership_changed_email' => 'Proprietar schimbat',
@@ -699,8 +712,9 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'quota_exceeded' => 'Spatiul tău alocat pe disc este depășit cu [bytes].',
 'quota_is_disabled' => 'Spatiu alocat este dezactivată în setări. Stabilirea unui spatiu alocat pentru utilizator nu va avea nici un efect până când setarea este reactivată din nou.',
 'quota_warning' => 'Dimensiunea dumneavoastră maximă este depasită cu [bytes]. Vă rugăm să eliminați documente sau versiuni anterioare.',
+'receipt_log' => '',
 'receipt_summary' => '',
-'recipients' => '',
+'recipients' => 'Destinatari',
 'refresh' => 'Refresh',
 'rejected' => 'Respins',
 'released' => 'Final(Released)',
@@ -711,9 +725,9 @@ Document: [document]
 Utilizator: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Atașament eliminat',
-'removed_recipient' => '',
+'removed_recipient' => 'a fost eliminat de pe lista de destinatari.',
 'removed_reviewer' => 'a fost eliminat din lista de revizuitori.',
-'removed_revispr' => '',
+'removed_revispr' => 'a fost eliminat din lista de retrimitori.',
 'removed_workflow_email_body' => 'Workflow eliminat din versiunea documentului
 Document: [name]
 Versiune: [version]
@@ -725,9 +739,16 @@ URL: [url]',
 'remove_marked_files' => 'Eliminați fișierele marcate',
 'repaired' => 'reparat',
 'repairing_objects' => 'Reparare documente și foldere.',
-'request_workflow_action_email_body' => '',
-'request_workflow_action_email_subject' => '',
-'reset_checkout' => '',
+'request_workflow_action_email_body' => 'Workflow-ul a ajuns la o stare care necesita actiunea ta.
+Document: [name]
+Versiune: [version]
+Workflow: [workflow]
+Starea curenta: [current_state]
+Folder parinte: [folder_path]
+Utilizator: [username]
+URL: [url]',
+'request_workflow_action_email_subject' => 'Actiune workflow necesara',
+'reset_checkout' => 'Termina verificarea',
 'results_page' => 'Pagina rezultate',
 'return_from_subworkflow' => 'Întoarcere din subworkflow',
 'return_from_subworkflow_email_body' => 'Întoarcere din subworkflow
@@ -744,13 +765,23 @@ URL: [url]',
 'reviewer_already_assigned' => 'este deja alocat ca un revizuitor',
 'reviewer_already_removed' => 'a fost deja eliminat din procesul de revizuire sau a postat deja o revizuire',
 'review_deletion_email' => 'Cerere de revizuire eliminată',
-'review_deletion_email_body' => '',
-'review_deletion_email_subject' => '',
+'review_deletion_email_body' => 'Cerere de revizuire eliminata
+Document: [name]
+Versiune: [version]
+Folder parinte: [folder_path]
+Utilizator: [username]
+URL: [url]',
+'review_deletion_email_subject' => '[sitename]: [name] - Cerere de revizuire eliminata',
 'review_group' => 'Grup revizuire',
 'review_log' => 'Log revizuire',
 'review_request_email' => 'Cerere de revizuire',
-'review_request_email_body' => '',
-'review_request_email_subject' => '',
+'review_request_email_body' => 'Cerere de revizuire
+Document: [name]
+Versiune: [version]
+Folder parinte: [folder_path]
+Utilizator: [username]
+URL: [url]',
+'review_request_email_subject' => '[sitename]: [name] - Cerere de revizuire',
 'review_status' => 'Status revizuire:',
 'review_submit_email' => 'Revizuire trimisă',
 'review_submit_email_body' => 'Revizuire trimisă
@@ -764,11 +795,12 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Revizuire trimisă',
 'review_summary' => 'Sumar revizuire',
 'review_update_failed' => 'Eroare actualizarea status revizuire. Actualizarea a eșuat.',
-'revise_document' => '',
-'revise_document_on' => '',
-'revisors' => '',
-'revisor_already_assigned' => '',
-'revisor_already_removed' => '',
+'revise_document' => 'Revizuiti documentul',
+'revise_document_on' => 'Urmatoarea revizuire a versiunii document pe [data]',
+'revision_log' => 'Log revizuire',
+'revisors' => 'Revizuitori',
+'revisor_already_assigned' => 'Utilizatorul este deja asignat ca retrimitor.',
+'revisor_already_removed' => 'Retrimitorul a fost deja eliminat din procesul de revizuire sau a revizuit deja documentul.',
 'rewind_workflow' => 'Derulare workflow',
 'rewind_workflow_email_body' => 'Workflow derulat
 Document: [name]
@@ -787,7 +819,8 @@ URL: [url]',
 'rm_folder' => 'Eliminați folder',
 'rm_from_clipboard' => 'Eliminați din clipboard',
 'rm_group' => 'Eliminați acest grup',
-'rm_transmittal' => '',
+'rm_transmittal' => 'Elimina transmiterea',
+'rm_transmittalitem' => '',
 'rm_user' => 'Eliminați acest utilizator',
 'rm_version' => 'Eliminați versiune',
 'rm_workflow' => 'Eliminați Workflow',
@@ -830,15 +863,15 @@ URL: [url]',
 'select_category' => 'Click pentru a selecta categoria',
 'select_groups' => 'Click pentru a selecta grupuri',
 'select_grp_approvers' => 'Click pentru a selecta grupul de aprobatori',
-'select_grp_notification' => '',
-'select_grp_recipients' => '',
+'select_grp_notification' => 'Faceti click pentru a selecta o notificare de grup',
+'select_grp_recipients' => 'Faceti click pentru a selecta un grup de destinatari',
 'select_grp_reviewers' => 'Click pentru a selecta grupul de revizuitori',
-'select_grp_revisors' => '',
+'select_grp_revisors' => 'Faceti click pentru a selecta un grup de retrimitori',
 'select_ind_approvers' => 'Click pentru a selecta un aprobator individual',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Faceti click pentru a selecta o notificare individuala',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Click pentru a selecta un revizuitor individual',
-'select_ind_revisors' => '',
+'select_ind_revisors' => 'Faceti click pentru a selecta retrimitori individuali',
 'select_one' => 'Selectați unul',
 'select_users' => 'Click pentru a selecta utilizatori',
 'select_workflow' => 'Selectați workflow',
@@ -864,8 +897,8 @@ URL: [url]',
 'settings_calendarDefaultView' => 'Vizualizare implicită Calendar',
 'settings_calendarDefaultView_desc' => 'Vizualizare implicită Calendar',
 'settings_cannot_disable' => 'Fișierul ENABLE_INSTALL_TOOL nu a putut fi șters',
-'settings_checkOutDir' => '',
-'settings_checkOutDir_desc' => '',
+'settings_checkOutDir' => 'Director pentru documente verificate',
+'settings_checkOutDir_desc' => 'Acesta este directorul unde se copie ultimul continut al unui document daca documentul este verificat. Daca faceti acest director accesibil pentru utilizatori, ei pot edita fisierul si ii pot face iar check in cand au terminat.',
 'settings_contentDir' => 'Director conținut',
 'settings_contentDir_desc' => 'Unde sunt stocate  fișierele încărcate (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_contentOffsetDir' => 'Conținut Director Offset',
@@ -923,8 +956,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Dacă este setat, incărcarea este de asemenea disponibilă prin intermediul unui applet Java numit jumploader fără limită de dimensiune a fișierului stabilită de browser. De asemenea, permite încărcarea mai multor fișiere într-un singur pas. Activand aceasta optiune va dezactiva optiunea http only cookies.',
 'settings_enableNotificationAppRev' => 'Activare notificari rezuitor/aprobator',
 'settings_enableNotificationAppRev_desc' => 'Bifati pentru a trimite o notificare către revizuitor/aprobator când se adaugă o nouă versiune la document',
-'settings_enableNotificationWorkflow' => '',
-'settings_enableNotificationWorkflow_desc' => '',
+'settings_enableNotificationWorkflow' => 'Trimite notificare utilizatorilor din urmatorul pas al workflow-ului',
+'settings_enableNotificationWorkflow_desc' => 'Daca aceasta optiune este activata, utilizatorii si grupurile care trebuie sa ia masuri in urmatorul pas din workflow vor fi notificati. Chiar daca ei nu au adaugat o notificare pentru document.',
 'settings_enableOwnerNotification' => 'Activarea notificarii proprietarului, în mod implicit',
 'settings_enableOwnerNotification_desc' => 'Bifati pentru a adăuga o notificare pentru proprietar în cazul în care un document este adăugat.',
 'settings_enableOwnerRevApp' => 'Permite revizuirea/aprobarea de catre proprietar',
@@ -1014,8 +1047,8 @@ URL: [url]',
 'settings_php_gd2' => 'PHP extension : php_gd2',
 'settings_php_mbstring' => 'PHP extension : php_mbstring',
 'settings_php_version' => 'Versiune PHP',
-'settings_presetExpirationDate' => '',
-'settings_presetExpirationDate_desc' => '',
+'settings_presetExpirationDate' => 'Data de expirare prestabilita',
+'settings_presetExpirationDate_desc' => 'Toate documentele noi incarcate vor avea o data de expirare stabilita la aceasta valoare. Data introdusa poate fi specificata astfel incat sa fie inteleasa de functia PHP strtotime(), de exemplu +5 weeks.',
 'settings_previewWidthDetail' => 'Lățimea imaginii de previzualizare (detalii)',
 'settings_previewWidthDetail_desc' => 'Lățimea imaginii de previzualizare afișată pe pagina detalii',
 'settings_previewWidthList' => 'Lățimea imaginii de previzualizare (listă)',
@@ -1087,7 +1120,7 @@ URL: [url]',
 'settings_workflowMode_desc' => 'Workflow-ul avansat permite să specificați propriul flux de lucru(workflow) pentru versiunile de documente.',
 'settings_workflowMode_valadvanced' => 'avansat',
 'settings_workflowMode_valtraditional' => 'traditional',
-'settings_workflowMode_valtraditional_only_approval' => '',
+'settings_workflowMode_valtraditional_only_approval' => 'traditional (fara revizuire)',
 'settings_zendframework' => 'Zend Framework',
 'set_expiry' => 'Setare Expirare',
 'set_owner' => 'Setare Proprietar',
@@ -1107,7 +1140,7 @@ URL: [url]',
 'splash_add_user' => 'Utilizator nou adăugat',
 'splash_cleared_clipboard' => 'Clipboard golit',
 'splash_document_added' => 'Document adăugat',
-'splash_document_checkedout' => '',
+'splash_document_checkedout' => 'Document verificat',
 'splash_document_edited' => 'Document salvat',
 'splash_document_locked' => 'Document blocat',
 'splash_document_unlocked' => 'Document deblocat',
@@ -1136,23 +1169,26 @@ URL: [url]',
 'status_approved' => 'Aprobat',
 'status_approver_removed' => 'Aprobator eliminat din proces',
 'status_not_approved' => 'Neaprobat',
-'status_not_receipted' => '',
+'status_not_receipted' => 'Neprimit inca',
 'status_not_reviewed' => 'Nerevizuit',
-'status_not_revised' => '',
+'status_not_revised' => 'nerevizuit',
 'status_receipted' => '',
-'status_recipient_removed' => '',
+'status_receipt_rejected' => '',
+'status_recipient_removed' => 'Destinatar eliminat din lista',
 'status_reviewed' => 'Revizuit',
 'status_reviewer_rejected' => 'Proiect respins',
 'status_reviewer_removed' => 'Revizuitor eliminat din proces',
-'status_revised' => '',
-'status_revision_sleeping' => '',
-'status_revisor_removed' => '',
+'status_revised' => 'revizuit',
+'status_revision_rejected' => 'respins',
+'status_revision_sleeping' => 'in asteptare',
+'status_revisor_removed' => 'Revizuitor eliminat din lista',
 'status_unknown' => 'Necunoscut',
 'storage_size' => 'Dimensiunea de stocare',
 'submit_approval' => 'Trimite aprobare',
 'submit_login' => 'Sign in',
 'submit_password' => 'Setare parolă nouă',
 'submit_password_forgotten' => 'Start proces',
+'submit_receipt' => '',
 'submit_review' => 'Trimite revizuire',
 'submit_userinfo' => 'Trimite informații',
 'substitute_user' => 'Substituie Utilizator',
@@ -1160,10 +1196,10 @@ URL: [url]',
 'sunday_abbr' => 'Du',
 'sv_SE' => 'Suedeză',
 'switched_to' => 'Comutat pe',
-'takeOverGrpApprover' => '',
-'takeOverGrpReviewer' => '',
-'takeOverIndApprover' => '',
-'takeOverIndReviewer' => '',
+'takeOverGrpApprover' => 'Preia grupul de aprobatori din ultima versiune.',
+'takeOverGrpReviewer' => 'Preia grupul de revizuitori din ultima versiune.',
+'takeOverIndApprover' => 'Preia aprobatorul individual din ultima versiune.',
+'takeOverIndReviewer' => 'Preia revizuitorul individual din ultima versiune.',
 'testmail_body' => 'Acest e-mail este doar pentru testarea configurarea email din SeedDMS',
 'testmail_subject' => 'Mail de test',
 'theme' => 'Temă',
@@ -1184,8 +1220,12 @@ Folder parinte: [folder_path]
 Utilizator: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Tranziție Workflow declanșată',
-'transmittal_comment' => '',
-'transmittal_name' => '',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
+'transmittal_comment' => 'Comentariu',
+'transmittal_name' => 'Nume',
+'transmittal_size' => '',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Turcă',
 'tuesday' => 'Marți',
@@ -1215,7 +1255,8 @@ URL: [url]',
 'update_locked_msg' => 'Acest document este blocat.',
 'update_recipients' => '',
 'update_reviewers' => 'Actualizare Listă de revizuitori',
-'update_revisors' => '',
+'update_revisors' => 'Actualizati lista de retrimitori',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Adaugate de',
 'uploading_failed' => 'Încărcarea unuia dintre fișierele a eșuat. Vă rugăm să verificați dimensiunea maximă de încărcare fișiere.',
 'uploading_maxsize' => 'Fișierul încărcat depășește dimensiunea maximă de încărcare fișiere.',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index c44382470..087a39eeb 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Добавить несколько файлов (название файла будет названием документа)',
 'add_receipt' => '',
 'add_review' => 'Рецензировать',
+'add_revision' => '',
 'add_subfolder' => 'Добавить подкаталог',
 'add_to_clipboard' => 'Добавить в буфер',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Добавить пользователя',
 'add_user_to_group' => 'Добавить пользователя в группу',
@@ -225,8 +227,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Удалить в каталоге «[foldername]» все файлы и подкаталоги?<br>Действие <b>необратимо</b>',
 'confirm_rm_group' => 'Удалить группу «[groupname]»?<br>Действие <b>необратимо</b>',
 'confirm_rm_log' => 'Удалить журнал «[logname]»?<br>Действие <b>необратимо</b>',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Удалить пользователя «[username]»?<br>Действие <b>необратимо</b>',
 'confirm_rm_version' => 'Удалить версию [version] документа «[documentname]»?<br>Действие <b>необратимо</b>',
+'confirm_update_transmittalitem' => '',
 'content' => 'Содержимое',
 'continue' => 'Продолжить',
 'create_fulltext_index' => 'Создать полнотекстовый индекс',
@@ -260,6 +264,7 @@ URL: [url]',
 'documents_to_approve' => 'Документы, ожидающие вашего утверждения',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Документ уже заблокирован',
@@ -445,6 +450,7 @@ URL: [url]',
 'group_exists' => 'Группа уже существует',
 'group_management' => 'Управление группами',
 'group_members' => 'Члены группы',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Сводка по рецензированию группы',
 'guest_login' => 'Войти как гость',
 'guest_login_disabled' => 'Гостевой вход отключён',
@@ -627,7 +633,9 @@ URL: [url]',
 'no_docs_locked' => 'Нет заблокированных документов',
 'no_docs_to_approve' => 'Нет документов, нуждающихся в утверждении',
 'no_docs_to_look_at' => 'Нет документов, нуждающихся во внимании',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Нет документов, нуждающихся в рецензии',
+'no_docs_to_revise' => '',
 'no_email_or_login' => '',
 'no_fulltextindex' => 'Полнотекстовый индекс не доступен',
 'no_groups' => 'Нет групп',
@@ -689,6 +697,7 @@ URL: [url]',
 'quota_exceeded' => 'Ваша дисковая квота превышена на [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'Ваша дисковая квота превышена на [bytes]. Удалите ненужные документы или их предыдущие версии.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Обновить',
@@ -756,6 +765,7 @@ URL: [url]',
 'review_update_failed' => 'Ошибка обновления статуса рецензии',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -778,6 +788,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Удалить из буфера обмена',
 'rm_group' => 'Удалить группу',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Удалить пользователя',
 'rm_version' => 'Удалить версию',
 'rm_workflow' => 'Удалить процесс',
@@ -1130,11 +1141,13 @@ URL: [url]',
 'status_not_reviewed' => 'Не рецензирован',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Рецензирован',
 'status_reviewer_rejected' => 'Черновик отклонён',
 'status_reviewer_removed' => 'Рецензирующий удалён из процесса',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Неизвестный',
@@ -1143,6 +1156,7 @@ URL: [url]',
 'submit_login' => 'Войти',
 'submit_password' => 'Установить новый пароль',
 'submit_password_forgotten' => 'Начать процесс',
+'submit_receipt' => '',
 'submit_review' => 'Рецензировать',
 'submit_userinfo' => 'Отправить информацию',
 'substitute_user' => 'Переключиться',
@@ -1174,8 +1188,12 @@ URL: [url]',
 Пользователь: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: изменено состояние процесса для «[name]»',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Процесс',
 'tr_TR' => 'Турецкий',
 'tuesday' => 'Вторник',
@@ -1206,6 +1224,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Обновить список рецензирующих',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Загрузил(а)',
 'uploading_failed' => 'Загрузка не удалась. Свяжитесь с администратором.',
 'uploading_maxsize' => 'Размер загруженного файла превышает максимально возможный',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 9a036c327..289af439b 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -57,8 +57,10 @@ $text = array(
 'add_multiple_files' => 'Pridať viacero súborov (názov súboru sa použije ako názov dokumentu)',
 'add_receipt' => '',
 'add_review' => 'Poslať kontrolu',
+'add_revision' => '',
 'add_subfolder' => 'Pridať podzložku',
 'add_to_clipboard' => 'Pridaj do schránky',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Pridať nového používatela',
 'add_user_to_group' => '',
@@ -210,8 +212,10 @@ $text = array(
 'confirm_rm_folder_files' => 'Skutočne si prajete odstrániť všetky súbory zložky "[foldername]" a všetkých jej podzložiek?<br>Buďte opatrní, táto akcia je nezvratná.',
 'confirm_rm_group' => 'Skutočne si prajete odstrániť skupinu "[groupname]"?<br>Buďte opatrní, táto akcia je nezvratná.',
 'confirm_rm_log' => 'Skutočne si prajete zmazať protokol "[logname]"?<br>Buďte opatrní, táto akcia je nezvratná.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Skutočne si prajete odstrániť používateľa "[username]"?<br>Buďte opatrní, táto akcia je nezvratná.',
 'confirm_rm_version' => 'Naozaj chcete odstrániť verziu [version] dokumentu "[documentname]"?<br>Buďte opatrní: Túto činnosť nemožno vrátiť späť.',
+'confirm_update_transmittalitem' => '',
 'content' => 'Obsah',
 'continue' => 'Pokračovať',
 'create_fulltext_index' => '',
@@ -245,6 +249,7 @@ $text = array(
 'documents_to_approve' => 'Dokumenty čakajúce na schválenie používateľa',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamknutý',
@@ -376,6 +381,7 @@ $text = array(
 'group_exists' => 'Skupina už existuje.',
 'group_management' => 'Skupiny',
 'group_members' => 'Členovia skupiny',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Zhrnutie skupinovej recenzie',
 'guest_login' => 'Prihlásiť sa ako hosť',
 'guest_login_disabled' => 'Prihlásenie ako hosť je vypnuté.',
@@ -535,7 +541,9 @@ $text = array(
 'no_docs_locked' => '',
 'no_docs_to_approve' => 'Momentálne neexistujú žiadne dokumenty, ktoré vyžadujú schválenie.',
 'no_docs_to_look_at' => '',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Momentálne neexistujú žiadne dokumenty, ktoré vyžadujú kontrolu.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => '',
 'no_fulltextindex' => '',
 'no_groups' => 'Žiadne skupiny',
@@ -585,6 +593,7 @@ $text = array(
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
 'quota_warning' => '',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => '',
@@ -629,6 +638,7 @@ $text = array(
 'review_update_failed' => 'Chyba pri aktualizácii stavu kontroly. Aktualizácia zlyhala.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -645,6 +655,7 @@ $text = array(
 'rm_from_clipboard' => '',
 'rm_group' => 'Odstrániť túto skupinu',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Odstrániť tohto používateľa',
 'rm_version' => 'Odstrániť verziu',
 'rm_workflow' => '',
@@ -990,11 +1001,13 @@ $text = array(
 'status_not_reviewed' => 'Neskontrolovaný',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Skontrolovaný',
 'status_reviewer_rejected' => 'Návrh zamietnutý',
 'status_reviewer_removed' => 'Kontrolór odstránený z procesu',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Neznámy',
@@ -1003,6 +1016,7 @@ $text = array(
 'submit_login' => 'Prihlásiť sa',
 'submit_password' => '',
 'submit_password_forgotten' => '',
+'submit_receipt' => '',
 'submit_review' => 'Poslať kontrolu',
 'submit_userinfo' => '',
 'substitute_user' => 'Nahradiť používateľa',
@@ -1025,8 +1039,12 @@ $text = array(
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => '',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Utorok',
@@ -1057,6 +1075,7 @@ $text = array(
 'update_recipients' => '',
 'update_reviewers' => 'Aktualizovať zoznam kontrolórov',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Nahral',
 'uploading_failed' => 'Nahranie zlyhalo. Prosám, kontaktujte správcu.',
 'uploading_maxsize' => 'Uploadovaný súbor prekročil maximálnu povolenú velkosť.',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 14aacc907..340c07e6c 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => 'Lägg till flera dokument (använder filnamnet som dokumentnamn)',
 'add_receipt' => '',
 'add_review' => 'Skicka granskning',
+'add_revision' => '',
 'add_subfolder' => 'Lägg till katalog',
 'add_to_clipboard' => 'Flytta till Urklipp',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Lägg till ny användare',
 'add_user_to_group' => 'Lägg till användare till grupp',
@@ -225,8 +227,10 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Vill du verkligen ta bort alla filer i katalogen "[foldername]" och i katalogens undermappar?<br>OBS! Filerna kan inte återskapas!',
 'confirm_rm_group' => 'Vill du verkligen ta bort gruppen "[groupname]"?<br>OBS! Gruppen kan inte återskapas!',
 'confirm_rm_log' => 'Vill du verkligen ta bort loggfilen "[logname]"?<br>OBS! Loggfilen kan inte återskapas!',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Vill du verkligen ta bort användaren "[username]"?<br>OBS! Användaren kan inte återskapas!',
 'confirm_rm_version' => 'Vill du verkligen ta bort versionen [version] av dokumentet "[documentname]"?<br>OBS! Versionen kan inte återskapas!',
+'confirm_update_transmittalitem' => '',
 'content' => 'Innehåll',
 'continue' => 'Fortsätt',
 'create_fulltext_index' => 'Skapa fulltext-sökindex',
@@ -260,6 +264,7 @@ URL: [url]',
 'documents_to_approve' => 'Dokument som du behöver godkänna',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokument som du behöver granska',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Detta dokument är redan låst',
@@ -445,6 +450,7 @@ URL: [url]',
 'group_exists' => 'Grupp finns redan.',
 'group_management' => 'Grupphantering',
 'group_members' => 'Gruppmedlemmar',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Sammanfattning av gruppgranskning',
 'guest_login' => 'Gästinloggning',
 'guest_login_disabled' => 'Gästinloggningen är inaktiverad.',
@@ -628,7 +634,9 @@ URL: [url]',
 'no_docs_locked' => 'Inga dokument är låsta.',
 'no_docs_to_approve' => 'Det finns inga dokument som du behöver godkänna.',
 'no_docs_to_look_at' => 'Det finns inga dokument som behöver godkännas eller granskas.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Det finns inga dokument som du behöver granska.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => 'Användarnamn och epost måste anges',
 'no_fulltextindex' => 'Fulltext-index saknas',
 'no_groups' => 'Inga grupper',
@@ -684,6 +692,7 @@ URL: [url]',
 'quota_exceeded' => 'Din minneskvot har överskridits med [bytes].',
 'quota_is_disabled' => '',
 'quota_warning' => 'Din maximala minneskvot har överskridits med [bytes]. Ta bort dokument eller tidigare versioner.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Uppdatera',
@@ -751,6 +760,7 @@ URL: [url]',
 'review_update_failed' => 'Fel vid uppdatering av granskningsstatus. Kunde inte uppdatera.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -773,6 +783,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Ta bort från Urklipp',
 'rm_group' => 'Ta bort denna grupp',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Ta bort denna användare',
 'rm_version' => 'Ta bort version',
 'rm_workflow' => 'Ta bort arbetsflöde',
@@ -1125,11 +1136,13 @@ URL: [url]',
 'status_not_reviewed' => 'Ej granskat',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Granskat',
 'status_reviewer_rejected' => 'Utkast avvisat',
 'status_reviewer_removed' => 'Person som granskar har tagits bort från processen',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Okänd',
@@ -1138,6 +1151,7 @@ URL: [url]',
 'submit_login' => 'Logga in',
 'submit_password' => 'Sätt nytt lösenord',
 'submit_password_forgotten' => 'Starta process',
+'submit_receipt' => '',
 'submit_review' => 'Skicka granskning',
 'submit_userinfo' => 'Skicka info',
 'substitute_user' => 'Byt användare',
@@ -1169,8 +1183,12 @@ Aktuell status: [current_state]
 Användare: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Arbetsflödesövergång utlöstes',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'Arbetsflöde',
 'tr_TR' => 'Turkiska',
 'tuesday' => 'tisdag',
@@ -1201,6 +1219,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Uppdatera listan med personer som granskar',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Uppladdat av',
 'uploading_failed' => 'Fel vid uppladdningen. Kontakta administratören.',
 'uploading_maxsize' => 'Uppladdade filen översteg maxgränsen för storleken på filstorlek',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 6ff0447e7..7f46b278f 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -60,8 +60,10 @@ URL: [url]',
 'add_multiple_files' => 'Çoklu dosya ekle (dosya adı dokümanın adı olarak kullanılacak)',
 'add_receipt' => '',
 'add_review' => 'Kabul et',
+'add_revision' => '',
 'add_subfolder' => 'Alt klasör ekle',
 'add_to_clipboard' => 'Panoya ekle',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Yeni kullanıcı ekle',
 'add_user_to_group' => 'Kullanıcıyı gruba ekle',
@@ -231,8 +233,10 @@ URL: [url]',
 'confirm_rm_folder_files' => '"[foldername]" klasöründeki tüm dosyaları ve alt klasörleri silmeyi onaylıyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
 'confirm_rm_group' => '"[groupname]" grubunu silmeyi onaylıyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
 'confirm_rm_log' => '"[logname]" log dosyasını silmeyi onaylıyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '"[username]" kullanıcısını silmeyi onaylıyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
 'confirm_rm_version' => '"[documentname]" dokümanının [version] versiyonunu silmek istiyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
+'confirm_update_transmittalitem' => '',
 'content' => 'İçerik',
 'continue' => 'Devam',
 'create_fulltext_index' => 'Tam metin indeksi oluştur',
@@ -266,6 +270,7 @@ URL: [url]',
 'documents_to_approve' => 'Onayınızı bekleyen dokümanlar',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Bu doküman zaten kilitli',
@@ -451,6 +456,7 @@ URL: [url]',
 'group_exists' => 'Grup zaten mevcut.',
 'group_management' => 'Grup yönetimi',
 'group_members' => 'Grup üyeleri',
+'group_receipt_summary' => '',
 'group_review_summary' => 'Grup gözden geçirme özeti',
 'guest_login' => 'Misafir olarak giriş yap',
 'guest_login_disabled' => 'Misafir girişi devre dışı.',
@@ -634,7 +640,9 @@ URL: [url]',
 'no_docs_locked' => 'Kilitli doküman yok.',
 'no_docs_to_approve' => 'Şu anda onay bekleyen doküman yok.',
 'no_docs_to_look_at' => 'Dikkat edilmesi gereken bir doküman yok.',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Şu anda kontrol bekleyen doküman yok.',
+'no_docs_to_revise' => '',
 'no_email_or_login' => 'Kullanıcı adı ve e-posta adresi girilmeli',
 'no_fulltextindex' => 'Tam metin indeksi yok',
 'no_groups' => 'Grup yok',
@@ -700,6 +708,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'quota_exceeded' => 'Size ayrılan disk kotası [bytes] aşıldı.',
 'quota_is_disabled' => 'Kota desteği ayarlardan kapatılmış durumda. Açılana kadar kullanıcıya kota tanımlamanın bir etkisi olmaz.',
 'quota_warning' => 'Size ayrılan disk kotası [bytes] aşıldı. Lütfen gereksiz olduğunu düşündüğünüz dokümanları veya eski versiyonları silin.',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => 'Yenile',
@@ -767,6 +776,7 @@ URL: [url]',
 'review_update_failed' => 'Kontrol güncelleme durumu hatalı. Güncelleme başarısız.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -789,6 +799,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Panodan sil',
 'rm_group' => 'Bu grubu sil',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => 'Bu kullanıcıyı sil',
 'rm_version' => 'Versiyonu sil',
 'rm_workflow' => 'İş akışını sil',
@@ -1141,11 +1152,13 @@ URL: [url]',
 'status_not_reviewed' => 'Kontrol edilmedi',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => 'Kontrol edildi',
 'status_reviewer_rejected' => 'Taslak reddedildi',
 'status_reviewer_removed' => 'Kontrol eden süreci sildi',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => 'Bilinmeyen',
@@ -1154,6 +1167,7 @@ URL: [url]',
 'submit_login' => 'Giriş',
 'submit_password' => 'Yeni parola ayarla',
 'submit_password_forgotten' => 'Süreci başlat',
+'submit_receipt' => '',
 'submit_review' => 'Kabul et',
 'submit_userinfo' => 'Bilgi gönder',
 'substitute_user' => 'Kullanıcının Yerine Geç',
@@ -1185,8 +1199,12 @@ Mevcut durum: [current_state]
 Kullanıcı: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - İş Akış Geçişi Tetiklendi',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => 'İş Akışı',
 'tr_TR' => 'Türkçe',
 'tuesday' => 'Salı',
@@ -1217,6 +1235,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => 'Kontrol edenlerin listesini güncelle',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => 'Yükleyen',
 'uploading_failed' => 'Dosyalardan biri yüklenirken başarısız oldu. Maksimum yükleme boyutunuzu kontrol ediniz.',
 'uploading_maxsize' => 'Yüklenen dosya maksimum yükleme boyutundan fazla.',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index c61604e4c..c6aa37ce4 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => '批量添加文档(文档名无法手动修改)',
 'add_receipt' => '',
 'add_review' => '提交校对',
+'add_revision' => '',
 'add_subfolder' => '添加子文件夹',
 'add_to_clipboard' => '复制',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => '添加新用户',
 'add_user_to_group' => '',
@@ -214,8 +216,10 @@ URL: [url]',
 'confirm_rm_folder_files' => '您确定要删除"[foldername]" 中所有文件及其子文件夹?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_group' => '您确定要删除"[groupname]"组?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_log' => '您确定要删除"[logname]"日志文件?<br>请注意：此动作执行后不能撤销.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '您确定要删除"[username]"用户?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_version' => '您确定要删除"[documentname]文档的[version]版本文件?<br>请注意：此动作执行后不能撤销.',
+'confirm_update_transmittalitem' => '',
 'content' => '内容',
 'continue' => '继续',
 'create_fulltext_index' => '创建全文索引',
@@ -251,6 +255,7 @@ URL: [url]',
 'documents_to_approve' => '待您审核的文档',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => '需您关注的文档',
 'document_already_checkedout' => '',
 'document_already_locked' => '该文档已被锁定',
@@ -382,6 +387,7 @@ URL: [url]',
 'group_exists' => '组已存在',
 'group_management' => '组管理',
 'group_members' => '组成员',
+'group_receipt_summary' => '',
 'group_review_summary' => '校对组汇总',
 'guest_login' => '来宾登录',
 'guest_login_disabled' => '来宾登录被禁止',
@@ -541,7 +547,9 @@ URL: [url]',
 'no_docs_locked' => '无锁定的文档',
 'no_docs_to_approve' => '当前没有需要审核的文档',
 'no_docs_to_look_at' => '没有需要关注的文档',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => '当前没有需要校对的文档',
+'no_docs_to_revise' => '',
 'no_email_or_login' => '',
 'no_fulltextindex' => '',
 'no_groups' => '无组别',
@@ -591,6 +599,7 @@ URL: [url]',
 'quota_exceeded' => '',
 'quota_is_disabled' => '配额的支持',
 'quota_warning' => '',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => '',
@@ -635,6 +644,7 @@ URL: [url]',
 'review_update_failed' => '错误 更新校对状态.更新失败',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -651,6 +661,7 @@ URL: [url]',
 'rm_from_clipboard' => '从剪切板删除',
 'rm_group' => '删除该组',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => '删除该用户',
 'rm_version' => '删除该版本',
 'rm_workflow' => '',
@@ -996,11 +1007,13 @@ URL: [url]',
 'status_not_reviewed' => '未校对',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => '通过',
 'status_reviewer_rejected' => '拟拒绝',
 'status_reviewer_removed' => '从校对队列中删除',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => '未知',
@@ -1009,6 +1022,7 @@ URL: [url]',
 'submit_login' => '登录',
 'submit_password' => '',
 'submit_password_forgotten' => '',
+'submit_receipt' => '',
 'submit_review' => '提交校对',
 'submit_userinfo' => '',
 'substitute_user' => '代理人',
@@ -1031,8 +1045,12 @@ URL: [url]',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => '',
 'tr_TR' => '土耳其',
 'tuesday' => 'Tuesday',
@@ -1063,6 +1081,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => '更新校对人名单',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => '上传者',
 'uploading_failed' => '文件太大无法上传！请处理后重新上传。',
 'uploading_maxsize' => '最大上传限制',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 907a3abc0..5f9f110b7 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -61,8 +61,10 @@ URL: [url]',
 'add_multiple_files' => '批量添加文檔(文檔名無法手動修改)',
 'add_receipt' => '',
 'add_review' => '提交校對',
+'add_revision' => '',
 'add_subfolder' => '添加子資料夾',
 'add_to_clipboard' => '複製',
+'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => '添加新用戶',
 'add_user_to_group' => '添加新用戶至群組',
@@ -214,8 +216,10 @@ URL: [url]',
 'confirm_rm_folder_files' => '您確定要刪除"[foldername]" 中所有檔及其子資料夾?<br>請注意：此動作執行後不能撤銷.',
 'confirm_rm_group' => '您確定要刪除"[groupname]"組?<br>請注意：此動作執行後不能撤銷.',
 'confirm_rm_log' => '您確定要刪除"[logname]"日誌檔?<br>請注意：此動作執行後不能撤銷.',
+'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '您確定要刪除"[username]"用戶?<br>請注意：此動作執行後不能撤銷.',
 'confirm_rm_version' => '您確定要刪除"[documentname]文檔的[version]版本檔?<br>請注意：此動作執行後不能撤銷.',
+'confirm_update_transmittalitem' => '',
 'content' => '內容',
 'continue' => '繼續',
 'create_fulltext_index' => '創建全文索引',
@@ -249,6 +253,7 @@ URL: [url]',
 'documents_to_approve' => '待您審核的文檔',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
+'documents_to_revise' => '',
 'documents_user_requiring_attention' => '需您關注的文檔',
 'document_already_checkedout' => '',
 'document_already_locked' => '該文檔已被鎖定',
@@ -380,6 +385,7 @@ URL: [url]',
 'group_exists' => '組已存在',
 'group_management' => '組管理',
 'group_members' => '組成員',
+'group_receipt_summary' => '',
 'group_review_summary' => '校對組匯總',
 'guest_login' => '來賓登錄',
 'guest_login_disabled' => '來賓登錄被禁止',
@@ -539,7 +545,9 @@ URL: [url]',
 'no_docs_locked' => '無鎖定的文檔',
 'no_docs_to_approve' => '當前沒有需要審核的文檔',
 'no_docs_to_look_at' => '沒有需要關注的文檔',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => '當前沒有需要校對的文檔',
+'no_docs_to_revise' => '',
 'no_email_or_login' => '',
 'no_fulltextindex' => '',
 'no_groups' => '無組別',
@@ -589,6 +597,7 @@ URL: [url]',
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
 'quota_warning' => '',
+'receipt_log' => '',
 'receipt_summary' => '',
 'recipients' => '',
 'refresh' => '',
@@ -633,6 +642,7 @@ URL: [url]',
 'review_update_failed' => '錯誤 更新校對狀態.更新失敗',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
 'revisor_already_removed' => '',
@@ -649,6 +659,7 @@ URL: [url]',
 'rm_from_clipboard' => '',
 'rm_group' => '刪除該組',
 'rm_transmittal' => '',
+'rm_transmittalitem' => '',
 'rm_user' => '刪除該用戶',
 'rm_version' => '刪除該版本',
 'rm_workflow' => '',
@@ -994,11 +1005,13 @@ URL: [url]',
 'status_not_reviewed' => '未校對',
 'status_not_revised' => '',
 'status_receipted' => '',
+'status_receipt_rejected' => '',
 'status_recipient_removed' => '',
 'status_reviewed' => '通過',
 'status_reviewer_rejected' => '擬拒絕',
 'status_reviewer_removed' => '從校對佇列中刪除',
 'status_revised' => '',
+'status_revision_rejected' => '',
 'status_revision_sleeping' => '',
 'status_revisor_removed' => '',
 'status_unknown' => '未知',
@@ -1007,6 +1020,7 @@ URL: [url]',
 'submit_login' => '登錄',
 'submit_password' => '',
 'submit_password_forgotten' => '',
+'submit_receipt' => '',
 'submit_review' => '提交校對',
 'submit_userinfo' => '',
 'substitute_user' => '代理人',
@@ -1029,8 +1043,12 @@ URL: [url]',
 'transition_triggered_email' => '',
 'transition_triggered_email_body' => '',
 'transition_triggered_email_subject' => '',
+'transmittal' => '',
+'transmittalitem_removed' => '',
+'transmittalitem_updated' => '',
 'transmittal_comment' => '',
 'transmittal_name' => '',
+'transmittal_size' => '',
 'trigger_workflow' => '',
 'tr_TR' => '',
 'tuesday' => 'Tuesday',
@@ -1061,6 +1079,7 @@ URL: [url]',
 'update_recipients' => '',
 'update_reviewers' => '更新校對人名單',
 'update_revisors' => '',
+'update_transmittalitem' => '',
 'uploaded_by' => '上傳者',
 'uploading_failed' => '文件太大無法上傳！請處理後重新上傳。',
 'uploading_maxsize' => '最大上傳限制',

From b374e8e96282394acb711a315d9f958596297598 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 16 May 2015 19:42:07 +0200
Subject: [PATCH 0112/2006] fix output of message when item was deleted

---
 views/bootstrap/class.TransmittalMgr.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 1767a3d44..ffcf0a4e8 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -147,13 +147,13 @@ $('#update-transmittalitem-btn-".$itemid."').popover({
 	function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
 		$itemid = $item->getID();
 		$content = '';
-    $content .= '<a id="delete-transmittalitem-btn-'.$itemid.'" rel="'.$itemid.'" msg="'.getMLText($msg).'"><i class="icon-remove"></i></a>';
+    $content .= '<a id="delete-transmittalitem-btn-'.$itemid.'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'"><i class="icon-remove"></i></a>';
 		$this->addFooterJS("
 $('#delete-transmittalitem-btn-".$itemid."').popover({
 	title: '".getMLText("rm_transmittalitem")."',
 	placement: 'left',
 	html: true,
-	content: \"<div>".htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES)."</div><div><button class='btn btn-danger removetransmittalitem' style='float: right; margin:10px 0px;' rel='".$itemid."' msg='".getMLText($msg)."' formtoken='".createFormKey('removetransmittalitem')."' id='confirm-delete-transmittalitem-btn-".$itemid."'><i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."</button> <button type='button' class='btn' style='float: right; margin:10px 10px;' onclick='$(&quot;#delete-transmittalitem-btn-".$itemid."&quot;).popover(&quot;hide&quot;);'>".getMLText('cancel')."</button></div>\"});
+	content: \"<div>".htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES)."</div><div><button class='btn btn-danger removetransmittalitem' style='float: right; margin:10px 0px;' rel='".$itemid."' msg='".htmlspecialchars($msg, ENT_QUOTES)."' formtoken='".createFormKey('removetransmittalitem')."' id='confirm-delete-transmittalitem-btn-".$itemid."'><i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."</button> <button type='button' class='btn' style='float: right; margin:10px 10px;' onclick='$(&quot;#delete-transmittalitem-btn-".$itemid."&quot;).popover(&quot;hide&quot;);'>".getMLText('cancel')."</button></div>\"});
 ");
 		if($return)
 			return $content;
@@ -237,7 +237,7 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("comment")."</th>\n";
-			print "<th>".getMLText("size")."</th>\n";
+			print "<th>".getMLText("transmittal_size")."</th>\n";
 			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($transmittals as $transmittal) {
@@ -285,7 +285,7 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
 						echo "<tr id=\"table-row-transmittalitem-".$item->getID()."\">";
 						echo $this->documentListRow($document, $previewer, true, $content->getVersion());
 						echo "<td><div class=\"list-action\">";
-						$this->printDeleteItemButton($item, '');
+						$this->printDeleteItemButton($item, getMLText('transmittalitem_removed'));
 						if($latestcontent->getVersion() != $content->getVersion())
 							$this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion())));
 						echo "</div></td>";

From d4652a614ca038cb1b61fc11eabc3c504baeb945 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2015 08:03:12 +0200
Subject: [PATCH 0113/2006] add functions for handling substitutes

---
 SeedDMS_Core/Core/inc.ClassUser.php | 139 +++++++++++++++++++++++++++-
 1 file changed, 134 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index e36631ae6..e654172fb 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -22,7 +22,7 @@
  *             2010 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_Core_User {
+class SeedDMS_Core_User { /* {{{ */
 	/**
 	 * @var integer id of user
 	 *
@@ -67,9 +67,7 @@ class SeedDMS_Core_User {
 
 	/**
 	 * @var string prefered language of user
-	 *      possible values are 'English', 'German', 'Chinese_ZH_TW', 'Czech'
-	 *      'Francais', 'Hungarian', 'Italian', 'Portuguese_BR', 'Slovak', 
-	 *      'Spanish'
+	 *      possible values are subdirectories within the language directory
 	 *
 	 * @access protected
 	 */
@@ -125,6 +123,13 @@ class SeedDMS_Core_User {
 	 */
 	var $_homeFolder;
 
+	/**
+	 * @var array list of users this user can substitute
+	 *
+	 * @access protected
+	 */
+	var $_substitutes;
+
 	/**
 	 * @var object reference to the dms instance this user belongs to
 	 *
@@ -1488,5 +1493,129 @@ class SeedDMS_Core_User {
 		return true;
 	} /* }}} */
 
-}
+	/**
+	 * Get all substitutes of the user
+	 *
+	 * These users are substitutes of the current user
+	 *
+	 * @return array list of users
+	 */
+	function getSubstitutes() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if (!isset($this->_substitutes)) {
+			$queryStr = "SELECT `tblUsers`.* FROM `tblUserSubstitutes` ".
+				"LEFT JOIN `tblUsers` ON `tblUserSubstitutes`.`substitute` = `tblUsers`.`id` ".
+				"WHERE `tblUserSubstitutes`.`user`='". $this->_id ."'";
+			$resArr = $db->getResultArray($queryStr);
+			if (is_bool($resArr) && $resArr == false)
+				return false;
+
+			$this->_substitutes = array();
+			$classname = $this->_dms->getClassname('user');
+			foreach ($resArr as $row) {
+				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row["hidden"], $row["disabled"], $row["pwdExpiration"], $row["loginfailures"], $row["quota"], $row["homefolder"]);
+				$user->setDMS($this->_dms);
+				array_push($this->_substitutes, $user);
+			}
+		}
+		return $this->_substitutes;
+	} /* }}} */
+
+	/**
+	 * Get all users this user is a substitute of
+	 *
+	 * @return array list of users
+	 */
+	function getReverseSubstitutes() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if (!isset($this->_substitutes))
+		{
+			$queryStr = "SELECT tblUsers`.* FROM `tblUserSubstitutes` ".
+				"LEFT JOIN `tblUsers` ON `tblUserSubstitutes`.`user` = `tblUsers`.`userID` ".
+				"WHERE `tblUserSubstitutes`.`substitute`='". $this->_id ."'";
+			$resArr = $db->getResultArray($queryStr);
+			if (is_bool($resArr) && $resArr == false)
+				return false;
+
+			$this->_substitutes = array();
+			$classname = $this->_dms->getClassname('user');
+			foreach ($resArr as $row) {
+				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row["hidden"], $row["disabled"], $row["pwdExpiration"], $row["loginfailures"], $row["quota"], $row["homefolder"]);
+				$user->setDMS($this->_dms);
+				array_push($this->_substitutes, $user);
+			}
+		}
+		return $this->_substitutes;
+	} /* }}} */
+
+	/**
+	 * Add a substitute to the user
+	 *
+	 * @return boolean true if successful otherwise false
+	 */
+	function addSubstitute($substitute) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(get_class($substitute) != $this->_dms->getClassname('user'))
+			return false;
+
+		$queryStr = "SELECT * FROM tblUserSubstitutes WHERE user=" . $this->_id . " AND substitute=".$substitute->getID();
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false) return false;
+		if (count($resArr) == 1) return true;
+
+		$queryStr = "INSERT INTO tblUserSubstitutes (user, substitute) VALUES (" . $this->_id . ", ".$substitute->getID().")";
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_substitutes = null;
+		return true;
+	} /* }}} */
+
+	/**
+	 * Remove a substitute from the user
+	 *
+	 * @return boolean true if successful otherwise false
+	 */
+	function removeSubstitute($substitute) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(get_class($substitute) != $this->_dms->getClassname('user'))
+			return false;
+
+		$queryStr = "SELECT * FROM tblUserSubstitutes WHERE user=" . $this->_id . " AND substitute=".$substitute->getID();
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false) return false;
+		if (count($resArr) == 0) return true;
+
+		$queryStr = "DELETE FROM tblUserSubstitutes WHERE user=" . $this->_id . " AND substitute=".$substitute->getID();
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_substitutes = null;
+		return true;
+	}
+
+	/**
+	 * Check if user is a substitute of the current user
+	 *
+	 * @return boolean true if successful otherwise false
+	 */
+	function isSubstitute($substitute) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(get_class($substitute) != $this->_dms->getClassname('user'))
+			return false;
+
+		$queryStr = "SELECT * FROM tblUserSubstitutes WHERE user=" . $this->_id . " AND substitute=".$substitute->getID();
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false) return false;
+		if (count($resArr) == 1) return true;
+
+		return false;
+	} /* }}} */
+
+} /* }}} */
 ?>

From fedcdb1b997cb0cc4b79278a2f0266626c684e42 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2015 08:05:15 +0200
Subject: [PATCH 0114/2006] add table for user substitutes and not yet
 implemented acls

---
 install/create_tables-innodb.sql  | 57 +++++++++++++++++++++
 install/create_tables-sqlite3.sql | 83 +++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 99e2ff7a2..8440c2927 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -72,6 +72,22 @@ CREATE TABLE `tblUsers` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblUserSubstitutes`
+-- 
+
+CREATE TABLE `tblUserSubstitutes` (
+  `id` int(11) NOT NULL auto_increment,
+  `user` int(11) default null,
+  `substitute` int(11) default null,
+  PRIMARY KEY (`id`),
+  UNIQUE (`user`, `substitute`),
+  CONSTRAINT `tblUserSubstitutes_user` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblUserSubstitutes_substitute` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+);
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table `tblUserPasswordRequest`
 -- 
@@ -815,6 +831,47 @@ CREATE TABLE `tblTransmittalItems` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for access request objects
+-- 
+
+CREATE TABLE `tblAros` (
+  `id` int(11) NOT NULL auto_increment,
+  `model` text NOT NULL,
+	`foreignid` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+-- 
+-- Table structure for access control objects
+-- 
+
+CREATE TABLE `tblAcos` (
+  `id` int(11) NOT NULL auto_increment,
+  `model` text NOT NULL,
+	`foreignid` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for acos/aros relation
+-- 
+
+CREATE TABLE `tblArosAcos` (
+  `id` int(11) NOT NULL auto_increment,
+	`aro` int(11) NOT NULL DEFAULT '0',
+	`aco` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE (aco, aro),
+  CONSTRAINT `tblArosAcos_acos` FOREIGN KEY (`aco`) REFERENCES `tblAcos` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblArosAcos_aros` FOREIGN KEY (`aro`) REFERENCES `tblAros` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for version
 -- 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 5d38a6c1e..bca377b64 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -63,11 +63,25 @@ CREATE TABLE `tblUsers` (
   `disabled` INTEGER NOT NULL default '0',
   `quota` INTEGER,
   `homefolder` INTEGER default '0',
+  `homefolder` INTEGER default '0',
   UNIQUE (`login`)
 );
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblUserSubstitutes`
+-- 
+
+CREATE TABLE `tblUserSubstitutes` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `user` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `substitute` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  UNIQUE (`user`, `substitute`)
+);
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table `tblUserPasswordRequest`
 -- 
@@ -366,6 +380,38 @@ CREATE TABLE `tblDocumentRecipients` (
 -- Table structure for table `tblDocumentRevisionLog`
 -- 
 
+CREATE TABLE `tblDocumentRevisionLog` (
+  `revisionLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `revisionID` INTEGER NOT NULL default '0',
+  `status` INTEGER NOT NULL default '0',
+  `comment` TEXT NOT NULL,
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblDocumentRevisors`
+-- 
+
+CREATE TABLE `tblDocumentRevisors` (
+  `revisionID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `type` INTEGER NOT NULL default '0',
+  `required` INTEGER NOT NULL default '0',
+  `startdate` TEXT default NULL,
+  UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
+  CONSTRAINT `tblDocumentRevisors_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
+);
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblDocumentRevisionLog`
+-- 
+
 CREATE TABLE `tblDocumentRevisionLog` (
   `revisionLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
   `revisionID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
@@ -706,6 +752,43 @@ CREATE TABLE `tblTransmittalItems` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for access request objects
+-- 
+
+CREATE TABLE `tblAros` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `model` TEXT NOT NULL,
+	`foreignid` INTEGER NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ;
+
+
+-- 
+-- Table structure for access control objects
+-- 
+
+CREATE TABLE `tblAcos` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `model` TEXT NOT NULL,
+	`foreignid` INTEGER NOT NULL DEFAULT '0'
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for acos/aros relation
+-- 
+
+CREATE TABLE `tblArosAcos` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+	`aro` int(11) NOT NULL DEFAULT '0' REFERENCES `tblAros` (`id`) ON DELETE CASCADE,
+	`aco` int(11) NOT NULL DEFAULT '0' REFERENCES `tblAcos` (`id`) ON DELETE CASCADE,
+  UNIQUE (aco, aro),
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for version
 -- 

From 06c71cc332c8779a6f5b208c89563550fea9ef71 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2015 08:06:24 +0200
Subject: [PATCH 0115/2006] add handling of substitutes

---
 op/op.UsrMgr.php                 | 28 ++++++++++++++++++++++++++++
 views/bootstrap/class.UsrMgr.php | 27 +++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 6494ae454..99eecfc46 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -95,6 +95,14 @@ if ($action == "adduser") {
 				$group->addUser($newUser);
 			}
 		}
+
+		/* Set substitute user if set */
+		if(isset($_POST["substitute"]) && $_POST["substitute"]) {
+			foreach($_POST["substitute"] as $substitute) {
+				$subsuser = $dms->getUser($substitute);
+				$newUser->addSubstitute($subsuser);
+			}
+		}
 	}
 	else UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 	
@@ -316,6 +324,26 @@ else if ($action == "edituser") {
 		$group->removeUser($editedUser);
 	}
 
+	/* Set substitute user if set */
+	if(isset($_POST["substitute"]) && $_POST["substitute"]) 
+		$newsubs = $_POST['substitute'];
+	else
+		$newsubs = array();
+	$oldsubs = array();
+	foreach($editedUser->getSubstitutes() as $k)
+		$oldsubs[] = $k->getID();
+
+	$addsubs = array_diff($newsubs, $oldsubs);
+	foreach($addsubs as $subid) {
+		$subsuser = $dms->getUser($subid);
+		$editedUser->addSubstitute($subsuser);
+	}
+	$delsubs = array_diff($oldsubs, $newsubs);
+	foreach($delsubs as $subid) {
+		$subsuser = $dms->getUser($subid);
+		$editedUser->removeSubstitute($subsuser);
+	}
+
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_user')));
 	add_log_line(".php&action=edituser&userid=".$userid);
 }
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index d7cf2297a..86aa2a78c 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -35,6 +35,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$seluser = $this->params['seluser'];
+		$users = $this->params['allusers'];
 		$groups = $this->params['allgroups'];
 		$passwordstrength = $this->params['passwordstrength'];
 		$passwordexpiration = $this->params['passwordexpiration'];
@@ -189,6 +190,32 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 
 <?php
 		}
+?>
+		<tr>
+			<td>
+				<div class="cbSelectTitle"><?php printMLText("substitute_user");?>:</div>
+			</td>
+			<td>
+        <select class="chzn-select-deselect" name="substitute[]" multiple data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+		if($currUser) {
+			$substitutes = $currUser->getSubstitutes();
+		} else {
+			$substitutes = array();
+		}
+		foreach ($users as $usr) {
+			if ($usr->isGuest() || ($currUser && $usr->getID() == $currUser->getID()))
+				continue;
+			$checked=false;
+			foreach ($substitutes as $r) if ($r->getID()==$usr->getID()) $checked=true;
+
+			print "<option value=\"".$usr->getID()."\" ".($checked?"selected='selected' ":"").">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
+		}
+?>
+				</select>
+			</td>
+		</tr>
+<?php
 		if($workflowmode == "traditional" || $workflowmode == 'traditional_only_approval') {
 		if($workflowmode == "traditional") {
 ?>

From 20a695f5719d78962983b033aebd5fec05c4ec6f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2015 13:26:10 +0200
Subject: [PATCH 0116/2006] minor html fixes

---
 views/bootstrap/class.UsrMgr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 86aa2a78c..355831936 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -196,7 +196,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 				<div class="cbSelectTitle"><?php printMLText("substitute_user");?>:</div>
 			</td>
 			<td>
-        <select class="chzn-select-deselect" name="substitute[]" multiple data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+        <select class="chzn-select-deselect" name="substitute[]" multiple="multiple" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 		if($currUser) {
 			$substitutes = $currUser->getSubstitutes();
@@ -228,7 +228,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
 			</td>
 			<td>
-        <select class="chzn-select" name="usrReviewers[]" multiple="multiple">
+        <select class="chzn-select" name="usrReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_users'); ?>">
 <?php
 
 				if($currUser)

From 395f742bce214128e11fb5b3385f29991a684cfe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2015 19:40:43 +0200
Subject: [PATCH 0117/2006] various new phrases

---
 languages/ar_EG/lang.inc | 4 ++++
 languages/bg_BG/lang.inc | 4 ++++
 languages/ca_ES/lang.inc | 4 ++++
 languages/cs_CZ/lang.inc | 4 ++++
 languages/de_DE/lang.inc | 6 +++++-
 languages/en_GB/lang.inc | 6 +++++-
 languages/es_ES/lang.inc | 4 ++++
 languages/fr_FR/lang.inc | 4 ++++
 languages/hu_HU/lang.inc | 4 ++++
 languages/it_IT/lang.inc | 4 ++++
 languages/nl_NL/lang.inc | 4 ++++
 languages/pl_PL/lang.inc | 4 ++++
 languages/pt_BR/lang.inc | 4 ++++
 languages/ro_RO/lang.inc | 4 ++++
 languages/ru_RU/lang.inc | 4 ++++
 languages/sk_SK/lang.inc | 4 ++++
 languages/sv_SE/lang.inc | 4 ++++
 languages/tr_TR/lang.inc | 4 ++++
 languages/zh_CN/lang.inc | 4 ++++
 languages/zh_TW/lang.inc | 4 ++++
 20 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 62af0eecc..ca7cf4617 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -685,6 +685,7 @@ URL: [url]',
 'password_wrong' => 'كلمة سر خاطئة',
 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية',
 'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ',
+'possible_substitutes' => '',
 'previous_state' => 'حالة سابقة',
 'previous_versions' => 'اصدارات سابقة',
 'pt_BR' => 'البرتغالية (BR)',
@@ -870,6 +871,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => '',
 'settings_coreDir_desc' => '',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => '',
 'settings_createdirectory' => '',
 'settings_currentvalue' => '',
@@ -1154,6 +1157,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'بدأ المراجعة',
 'submit_userinfo' => 'ادخال بيانات',
+'substitute_to_user' => '',
 'substitute_user' => 'استبدال المستخدم',
 'sunday' => 'الأحد',
 'sunday_abbr' => 'ح',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 516751ba0..c4bdd836d 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -586,6 +586,7 @@ $text = array(
 'password_wrong' => 'Грешна парола',
 'personal_default_keywords' => 'Личен списък с ключови думи',
 'pl_PL' => '',
+'possible_substitutes' => '',
 'previous_state' => 'Предишно състояние',
 'previous_versions' => 'Предишни версии',
 'pt_BR' => '',
@@ -735,6 +736,8 @@ $text = array(
 'settings_cookieLifetime_desc' => 'Животът на бисквитките в секунди. Ако е =0 бисквитката ще бъде изтрита при затваряне на браузъра.',
 'settings_coreDir' => 'Папка Core letoDMS',
 'settings_coreDir_desc' => 'Път към SeedDMS_Core (не е задължително)',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Създай таблици БД',
 'settings_createdirectory' => 'Създаи папка',
 'settings_currentvalue' => 'Текущо значение',
@@ -1019,6 +1022,7 @@ $text = array(
 'submit_receipt' => '',
 'submit_review' => 'Рецензирай',
 'submit_userinfo' => 'Изпрати информация за потребител',
+'substitute_to_user' => '',
 'substitute_user' => '',
 'sunday' => 'неделя',
 'sunday_abbr' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 18f1f0f43..3d537ab1c 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -591,6 +591,7 @@ URL: [url]',
 'password_wrong' => '',
 'personal_default_keywords' => 'Mots clau personals',
 'pl_PL' => '',
+'possible_substitutes' => '',
 'previous_state' => '',
 'previous_versions' => 'Versions anteriors',
 'pt_BR' => '',
@@ -740,6 +741,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => 'Core letoDMS directory',
 'settings_coreDir_desc' => 'Path to LetoDMS_Core (optional)',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => '',
 'settings_createdirectory' => '',
 'settings_currentvalue' => 'Current value',
@@ -1024,6 +1027,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Enviar revisiót',
 'submit_userinfo' => '',
+'substitute_to_user' => '',
 'substitute_user' => '',
 'sunday' => 'Diumenge',
 'sunday_abbr' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index ce7f49d9b..afb954524 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -696,6 +696,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'password_wrong' => 'Špatné heslo',
 'personal_default_keywords' => 'Osobní klíčová slova',
 'pl_PL' => 'Polština',
+'possible_substitutes' => '',
 'previous_state' => 'Předchozí stav',
 'previous_versions' => 'Předešlé verze',
 'pt_BR' => 'Portugalština (BR)',
@@ -879,6 +880,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Životnost "cookie" v sekundách. Pokud je nula, bude "cookie" odstraněno po zavření prohlížeče.',
 'settings_coreDir' => 'Core SeedDMS directory',
 'settings_coreDir_desc' => 'Path to SeedDMS_Core (optional)',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => '',
 'settings_createdirectory' => 'Create directory',
 'settings_currentvalue' => 'Current value',
@@ -1163,6 +1166,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Poslat ke kontrole',
 'submit_userinfo' => 'Odeslat info',
+'substitute_to_user' => '',
 'substitute_user' => 'Zaměnit uživatele',
 'sunday' => 'Neděle',
 'sunday_abbr' => 'Ne',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 6c46d7d54..2aab93c74 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2045), dgrutsch (18)
+//    Translators: Admin (2049), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -704,6 +704,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'password_wrong' => 'Falsches Passwort',
 'personal_default_keywords' => 'Persönliche Stichwortlisten',
 'pl_PL' => 'Polnisch',
+'possible_substitutes' => 'Vertreter',
 'previous_state' => 'Voriger Status',
 'previous_versions' => 'Vorhergehende Versionen',
 'pt_BR' => 'Portugiesisch (BR)',
@@ -899,6 +900,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Die Lebensdauer des Cookies für die Sitzungsverwaltung. Wenn dieser Wert auf 0 gesetzt wird, dann wird der Cookie beim Schließen des Browsers gelöscht.',
 'settings_coreDir' => 'Core SeedDMS Verzeichnis',
 'settings_coreDir_desc' => 'Pfad zum PEAR-Paket SeedDMS_Core (optional). Lassen Sie diese Einstellung leer, wenn SeedDMS_Core ohnehin von PHP gefunden wird, weil es beispielweise im \'Extra PHP Include-Path\' installiert ist.',
+'settings_createCheckOutDir' => 'Check out Verzeichnis',
+'settings_createCheckOutDir_desc' => 'Dokumentenversionen werden hierhin kopiert, wenn ein Dokument ausgecheckt wird.',
 'settings_createdatabase' => 'Datenbank erzeugen',
 'settings_createdirectory' => 'Verzeichnis erzeugen',
 'settings_currentvalue' => 'Aktueller Wert',
@@ -1183,6 +1186,7 @@ URL: [url]',
 'submit_receipt' => 'Empfang bestätigen',
 'submit_review' => 'Überprüfung hinzufügen',
 'submit_userinfo' => 'Daten setzen',
+'substitute_to_user' => 'Wechsel zu \'[username]\'',
 'substitute_user' => 'Benutzer wechseln',
 'sunday' => 'Sonntag',
 'sunday_abbr' => 'So',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index a27ea55b2..83b772dd8 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1174), dgrutsch (3), netixw (14)
+//    Translators: Admin (1178), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -704,6 +704,7 @@ If you have still problems to login, then please contact your administrator.',
 'password_wrong' => 'Wrong password',
 'personal_default_keywords' => 'Personal keywordlists',
 'pl_PL' => 'Polish',
+'possible_substitutes' => 'Substitutes',
 'previous_state' => 'Previous state',
 'previous_versions' => 'Previous versions',
 'pt_BR' => 'Portugese (BR)',
@@ -906,6 +907,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'The life time of a cookie in seconds. If set to 0 the cookie will be removed when the browser is closed.',
 'settings_coreDir' => 'Core SeedDMS directory',
 'settings_coreDir_desc' => 'Path to SeedDMS_Core (optional). Leave this empty if you have installed SeedDMS_Core at a place where it can be found by PHP, e.g. Extra PHP Include-Path',
+'settings_createCheckOutDir' => 'Check out directory',
+'settings_createCheckOutDir_desc' => 'Document version will be copied in this directory, when a document is checked out.',
 'settings_createdatabase' => 'Create database tables',
 'settings_createdirectory' => 'Create directory',
 'settings_currentvalue' => 'Current value',
@@ -1190,6 +1193,7 @@ URL: [url]',
 'submit_receipt' => 'Submit receipt',
 'submit_review' => 'Submit review',
 'submit_userinfo' => 'Submit info',
+'substitute_to_user' => 'Switch to \'[username]\'',
 'substitute_user' => 'Substitute User',
 'sunday' => 'Sunday',
 'sunday_abbr' => 'Su',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index aaee4832d..43380c312 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -700,6 +700,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'password_wrong' => 'Contraseña incorrecta',
 'personal_default_keywords' => 'Listas de palabras clave personales',
 'pl_PL' => 'Polaco',
+'possible_substitutes' => '',
 'previous_state' => 'Estado anterior',
 'previous_versions' => 'Versiones anteriores',
 'pt_BR' => 'Portuges (BR)',
@@ -885,6 +886,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Tiempo de vida de las cookies en segundos. Si asigna 0 la cookie será eliminada cuando el navegador se cierre.',
 'settings_coreDir' => 'Carpeta de SeedDMS Core',
 'settings_coreDir_desc' => 'Ruta hacia SeedDMS_Core (opcional)',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Crear tablas de base de datos',
 'settings_createdirectory' => 'Crear carpeta',
 'settings_currentvalue' => 'Valor actual',
@@ -1169,6 +1172,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Enviar revisión',
 'submit_userinfo' => 'Enviar información',
+'substitute_to_user' => '',
 'substitute_user' => 'Cambiar de usuario',
 'sunday' => 'Domingo',
 'sunday_abbr' => 'D',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 25300a9c6..d1f8b1320 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -697,6 +697,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'password_wrong' => 'Mauvais mot de passe',
 'personal_default_keywords' => 'Mots-clés personnels',
 'pl_PL' => 'Polonais',
+'possible_substitutes' => '',
 'previous_state' => 'Previous state',
 'previous_versions' => 'Versions précédentes',
 'pt_BR' => 'Portuguais (BR)',
@@ -861,6 +862,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'La durée de vie d\'un cooke en secondes. Si réglée à 0, le cookie sera supprimé à la fermeture du navigateur.',
 'settings_coreDir' => 'Répertoire Core letoDMS',
 'settings_coreDir_desc' => 'Chemin vers SeedDMS_Core (optionnel)',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Créer tables de la base de données',
 'settings_createdirectory' => 'Créer répertoire',
 'settings_currentvalue' => 'Valeur courante',
@@ -1145,6 +1148,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Soumettre la correction',
 'submit_userinfo' => 'Soumettre info',
+'substitute_to_user' => '',
 'substitute_user' => 'Utilisateur de substitution',
 'sunday' => 'Dimanche',
 'sunday_abbr' => 'Dim.',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 94f91f5c9..a29f812a8 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -700,6 +700,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'password_wrong' => 'Hibás jelszó',
 'personal_default_keywords' => 'Személyes kulcsszó lista',
 'pl_PL' => 'Lengyel',
+'possible_substitutes' => '',
 'previous_state' => 'Előző állapot',
 'previous_versions' => 'Előző változatok',
 'pt_BR' => 'Portugál (BR)',
@@ -884,6 +885,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'A süti élettartama másodpercben. Ha az értéke 0 akkor a süti a böngésző bezárásakor lesz törölve.',
 'settings_coreDir' => 'Alap SeedDMS könyvtár',
 'settings_coreDir_desc' => 'Elérési útvonal a SeedDMS_Core (opcionális) programhoz. Hagyja üresen ha már telepítette a SeedDMS_Core alkalmazást arra a helyre, ahol a PHP meg tudja találni, pl.: az Extra PHP Include-Path alapján.',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Adatbázis táblák létrehozása',
 'settings_createdirectory' => 'Könyvtár létrehozása',
 'settings_currentvalue' => 'Aktuális érték',
@@ -1168,6 +1171,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Felülvizsgálat küldése',
 'submit_userinfo' => 'Információ küldése',
+'substitute_to_user' => '',
 'substitute_user' => 'Helyettesítő felhasználó',
 'sunday' => 'Vasárnap',
 'sunday_abbr' => 'Va',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 6e7139dd3..6e7034714 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -705,6 +705,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'password_wrong' => 'Password errata',
 'personal_default_keywords' => 'Parole-chiave personali',
 'pl_PL' => 'Polacco',
+'possible_substitutes' => '',
 'previous_state' => 'Stato precedente',
 'previous_versions' => 'Versioni precedenti',
 'pt_BR' => 'Portoghese (BR)',
@@ -907,6 +908,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Tempo di vita del cookie in secondi: se impostato su 0 il cookie verrà rimosso alla chiusura del browser',
 'settings_coreDir' => 'Cartella principale dell\'applicazione',
 'settings_coreDir_desc' => 'Percorso del pacchetto principale dell\'applicazione',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Crea database',
 'settings_createdirectory' => 'Crea cartella',
 'settings_currentvalue' => 'Valore corrente',
@@ -1191,6 +1194,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Invio revisione',
 'submit_userinfo' => 'Invio info utente',
+'substitute_to_user' => '',
 'substitute_user' => 'Impersona utente',
 'sunday' => 'Domenica',
 'sunday_abbr' => 'Dom',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 400e620ac..b540759ce 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -693,6 +693,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'password_wrong' => 'Verkeerde wachtwoord',
 'personal_default_keywords' => 'Persoonlijke sleutelwoorden',
 'pl_PL' => 'Polen',
+'possible_substitutes' => '',
 'previous_state' => 'Vorige staat',
 'previous_versions' => 'Vorige versies',
 'pt_BR' => 'Portugees (BR)',
@@ -876,6 +877,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Hoe lang een cookie moet worden behouden. Indien ingesteld op 0 worden de cookies verwijderd bij het afsluiten van de browser.',
 'settings_coreDir' => 'Core letoDMS map',
 'settings_coreDir_desc' => 'Pad naar SeedDMS_Core (optioneel)',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Maak database tabellen',
 'settings_createdirectory' => 'Maak map',
 'settings_currentvalue' => 'Huidige waarde',
@@ -1160,6 +1163,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Verzend [Controle]',
 'submit_userinfo' => 'Wijzigingen opslaan',
+'substitute_to_user' => '',
 'substitute_user' => 'Invaller/ vervanger Gebruiker',
 'sunday' => 'Zondag',
 'sunday_abbr' => 'Su',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 1593d5794..30a40a9d8 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -693,6 +693,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'password_wrong' => 'Złe hasło',
 'personal_default_keywords' => 'Osobiste sława kluczowe',
 'pl_PL' => 'Polski',
+'possible_substitutes' => '',
 'previous_state' => 'Poprzedni stan',
 'previous_versions' => 'Poprzednie wersje',
 'pt_BR' => 'Portugalski(BR)',
@@ -864,6 +865,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Czas życia pliku cookie w sekundach. Jeśli wartość zostanie ustawione na 0, plik cookie zostanie usunięte po zamknięciu przeglądarki.',
 'settings_coreDir' => 'Katalog Core letoDMS',
 'settings_coreDir_desc' => 'Ścieżka do LetoDMS_Core (opcjonalnie)',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Utwórz tabele basy danych',
 'settings_createdirectory' => 'Utwórz katalog',
 'settings_currentvalue' => 'Bieżąca wartość',
@@ -1148,6 +1151,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Zatwierdź recenzję',
 'submit_userinfo' => 'Zatwierdź dane',
+'substitute_to_user' => '',
 'substitute_user' => 'Zastępca użytkownika',
 'sunday' => 'Niedziela',
 'sunday_abbr' => 'Ni',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 2a9d7c1fe..37b2e8476 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -698,6 +698,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'password_wrong' => 'Senha errada',
 'personal_default_keywords' => 'palavras-chave pessoais',
 'pl_PL' => 'Polonês',
+'possible_substitutes' => '',
 'previous_state' => 'Estado anterior',
 'previous_versions' => 'Previous Versions',
 'pt_BR' => 'Português (BR)',
@@ -882,6 +883,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'O tempo de vida de um cookie em segundos. Se definido como 0, o cookie será removido quando o navegador é fechado.',
 'settings_coreDir' => 'Diretório Núcleo do SeedDMS',
 'settings_coreDir_desc' => 'Caminho para SeedDMS_Core (opcional). Deixe em branco se você tiver instalado SeedDMS_Core em um lugar onde ele pode ser encontrado por PHP, por exemplo, Extra PHP Include-Path',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Criar tabelas de banco de dados',
 'settings_createdirectory' => 'Criar diretório',
 'settings_currentvalue' => 'Valor atual',
@@ -1166,6 +1169,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => '',
 'submit_userinfo' => 'Submeter informação',
+'substitute_to_user' => '',
 'substitute_user' => 'Substituto do usuário',
 'sunday' => 'Sunday',
 'sunday_abbr' => 'Su',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index e70f91d73..88911e0d8 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -705,6 +705,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'password_wrong' => 'Parolă greșită',
 'personal_default_keywords' => 'Liste de cuvinte cheie personale',
 'pl_PL' => 'Poloneză',
+'possible_substitutes' => '',
 'previous_state' => 'Stare precedentă',
 'previous_versions' => 'Versiune precedentă',
 'pt_BR' => 'Portugheză (BR)',
@@ -907,6 +908,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Durata de viață a unui cookie în secunde. Dacă este setat la 0 cookie-ul va fi eliminat atunci când browser-ul este închis.',
 'settings_coreDir' => 'Director SeedDMS Core',
 'settings_coreDir_desc' => 'Calea spre SeedDMS_Core (opțional). Lăsați acest SeedDMS_Core gol dacă ați instalat într-un loc unde poate fi găsit de PHP (de exemplu:  Extra PHP Include-Path)',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Creare tabele baza de date',
 'settings_createdirectory' => 'Creare director',
 'settings_currentvalue' => 'Valoare curentă',
@@ -1191,6 +1194,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Trimite revizuire',
 'submit_userinfo' => 'Trimite informații',
+'substitute_to_user' => '',
 'substitute_user' => 'Substituie Utilizator',
 'sunday' => 'Duminică',
 'sunday_abbr' => 'Du',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 087a39eeb..2abd1f24d 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -690,6 +690,7 @@ URL: [url]',
 'password_wrong' => 'Неверный пароль',
 'personal_default_keywords' => 'Личный список меток',
 'pl_PL' => 'Polish',
+'possible_substitutes' => '',
 'previous_state' => 'Предыдущее состояние',
 'previous_versions' => 'Предыдущие версии',
 'pt_BR' => 'Portugese (BR)',
@@ -875,6 +876,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Время жизни куки в секундах. Если установлено 0, то куки будут удалены при закрытии браузера.',
 'settings_coreDir' => 'Каталог Core SeedDMS',
 'settings_coreDir_desc' => 'Путь к SeedDMS_Core (не обязательно).',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Создать таблицы базы данных',
 'settings_createdirectory' => 'Создать каталог',
 'settings_currentvalue' => 'Текущее значение',
@@ -1159,6 +1162,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Рецензировать',
 'submit_userinfo' => 'Отправить информацию',
+'substitute_to_user' => '',
 'substitute_user' => 'Переключиться',
 'sunday' => 'Воскресенье',
 'sunday_abbr' => 'Вс',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 289af439b..4baf8e810 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -586,6 +586,7 @@ $text = array(
 'password_wrong' => '',
 'personal_default_keywords' => 'Osobné kľúčové slová',
 'pl_PL' => 'Polština',
+'possible_substitutes' => '',
 'previous_state' => '',
 'previous_versions' => 'Predošlé verzie',
 'pt_BR' => 'Portugalčina',
@@ -735,6 +736,8 @@ $text = array(
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => '',
 'settings_coreDir_desc' => '',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => '',
 'settings_createdirectory' => '',
 'settings_currentvalue' => '',
@@ -1019,6 +1022,7 @@ $text = array(
 'submit_receipt' => '',
 'submit_review' => 'Poslať kontrolu',
 'submit_userinfo' => '',
+'substitute_to_user' => '',
 'substitute_user' => 'Nahradiť používateľa',
 'sunday' => 'Nedeľa',
 'sunday_abbr' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 340c07e6c..57816dcfa 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -685,6 +685,7 @@ URL: [url]',
 'password_wrong' => 'Fel lösenord',
 'personal_default_keywords' => 'Personlig nyckelordslista',
 'pl_PL' => 'polska',
+'possible_substitutes' => '',
 'previous_state' => 'Föregående status',
 'previous_versions' => 'Tidigare versioner',
 'pt_BR' => 'portugisiska (BR)',
@@ -870,6 +871,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Livslängd för en cookie i sekunder. Om värdet sätts till 0, kommer cookien att tas bort efter att webbläsaren har stängts ner.',
 'settings_coreDir' => 'LetoDMS_Core-mapp',
 'settings_coreDir_desc' => 'Sökväg till LetoDMS_Core (valfritt)',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Skapa databastabeller',
 'settings_createdirectory' => 'Skapa katalog',
 'settings_currentvalue' => 'Aktuellt värde',
@@ -1154,6 +1157,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Skicka granskning',
 'submit_userinfo' => 'Skicka info',
+'substitute_to_user' => '',
 'substitute_user' => 'Byt användare',
 'sunday' => 'söndag',
 'sunday_abbr' => 'sö',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 7f46b278f..bb5aceaf4 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -701,6 +701,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'password_wrong' => 'Yanlış parola',
 'personal_default_keywords' => 'Kişisel anahtar kelimeler',
 'pl_PL' => 'Polonyaca',
+'possible_substitutes' => '',
 'previous_state' => 'Önceki durum',
 'previous_versions' => 'Önceki versiyonlar',
 'pt_BR' => 'Portekizce',
@@ -886,6 +887,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Çerezlerin saniye olarak geçerlilik süresi. 0 olarak ayarlanırsa tarayıcı kapatıldığında çerezler silinir.',
 'settings_coreDir' => 'Çekirdek (core) SeedDMS klasörü',
 'settings_coreDir_desc' => 'SeedDMS_Core yolu (isteğe bağlı). SeedDMS_Core PHP tarafından bulunabilecek bir yere (örneğin ekstra PHP Include-Path) kurulmuşsa burayı boş bırakın',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => 'Veritabanı tablolarını oluştur',
 'settings_createdirectory' => 'Dizin oluştur',
 'settings_currentvalue' => 'Mevcut değer',
@@ -1170,6 +1173,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Kabul et',
 'submit_userinfo' => 'Bilgi gönder',
+'substitute_to_user' => '',
 'substitute_user' => 'Kullanıcının Yerine Geç',
 'sunday' => 'Pazar',
 'sunday_abbr' => 'Pa',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index c6aa37ce4..b5654a6fd 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -592,6 +592,7 @@ URL: [url]',
 'password_wrong' => '',
 'personal_default_keywords' => '用户关键字',
 'pl_PL' => '波兰语',
+'possible_substitutes' => '',
 'previous_state' => '',
 'previous_versions' => '先前版本',
 'pt_BR' => '葡萄牙语',
@@ -741,6 +742,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => 'SeedDMS核心目录',
 'settings_coreDir_desc' => '',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => '',
 'settings_createdirectory' => '',
 'settings_currentvalue' => '',
@@ -1025,6 +1028,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => '提交校对',
 'submit_userinfo' => '',
+'substitute_to_user' => '',
 'substitute_user' => '代理人',
 'sunday' => 'Sunday',
 'sunday_abbr' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 5f9f110b7..4f90a2ef1 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -590,6 +590,7 @@ URL: [url]',
 'password_wrong' => '',
 'personal_default_keywords' => '用戶關鍵字',
 'pl_PL' => '波蘭語',
+'possible_substitutes' => '',
 'previous_state' => '',
 'previous_versions' => '先前版本',
 'pt_BR' => '葡萄牙語',
@@ -739,6 +740,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => 'KME文檔系統核心目錄',
 'settings_coreDir_desc' => '',
+'settings_createCheckOutDir' => '',
+'settings_createCheckOutDir_desc' => '',
 'settings_createdatabase' => '',
 'settings_createdirectory' => '',
 'settings_currentvalue' => '',
@@ -1023,6 +1026,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => '提交校對',
 'submit_userinfo' => '',
+'substitute_to_user' => '',
 'substitute_user' => '代理人',
 'sunday' => 'Sunday',
 'sunday_abbr' => '',

From a80f4090afe9f6045816e3b6f5ab80205cabdcd8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2015 19:41:40 +0200
Subject: [PATCH 0118/2006] add filter for documents in revision

---
 op/op.Search.php                     | 3 +++
 views/bootstrap/class.Search.php     | 1 +
 views/bootstrap/class.SearchForm.php | 1 +
 3 files changed, 5 insertions(+)

diff --git a/op/op.Search.php b/op/op.Search.php
index c03cc4fdb..f3809faa3 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -329,6 +329,9 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 	if (isset($_GET["rejected"])){
 		$status[] = S_REJECTED;
 	}
+	if (isset($_GET["inrevision"])){
+		$status[] = S_IN_REVISION;
+	}
 	if (isset($_GET["obsolete"])){
 		$status[] = S_OBSOLETE;
 	}
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 49d41af5a..248e6d3a9 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -251,6 +251,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <label class="checkbox" for='released'><input type="checkbox" id="released" name="released" value="1" <?php echo in_array(S_RELEASED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_RELEASED);?></label>
 <label class="checkbox" for='rejected'><input type="checkbox" id="rejected" name="rejected" value="1" <?php echo in_array(S_REJECTED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_REJECTED);?></label>
+<label class="checkbox" for='inrevision'><input type="checkbox" id="inrevision" name="inrevision" value="1" <?php echo in_array(S_IN_REVISION, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_IN_REVISION);?></label>
 <label class="checkbox" for='obsolete'><input type="checkbox" id="obsolete" name="obsolete" value="1" <?php echo in_array(S_OBSOLETE, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_OBSOLETE);?></label>
 <label class="checkbox" for='expired'><input type="checkbox" id="expired" name="expired" value="1" <?php echo in_array(S_EXPIRED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_EXPIRED);?></label>
 </td>
diff --git a/views/bootstrap/class.SearchForm.php b/views/bootstrap/class.SearchForm.php
index a9ad210fb..fdb8110ea 100644
--- a/views/bootstrap/class.SearchForm.php
+++ b/views/bootstrap/class.SearchForm.php
@@ -139,6 +139,7 @@ function checkForm()
 <?php } ?>
 <label class="checkbox" for='released'><input type="checkbox" id="released" name="released" value="1"><?php printOverallStatusText(S_RELEASED);?></label>
 <label class="checkbox" for='rejected'><input type="checkbox" id="rejected" name="rejected" value="1"><?php printOverallStatusText(S_REJECTED);?></label>
+<label class="checkbox" for='inrevision'><input type="checkbox" id="inrevision" name="inrevision" value="1"><?php printOverallStatusText(S_IN_REVISION);?></label>
 <label class="checkbox" for='obsolete'><input type="checkbox" id="obsolete" name="obsolete" value="1"><?php printOverallStatusText(S_OBSOLETE);?></label>
 <label class="checkbox" for='expired'><input type="checkbox" id="expired" name="expired" value="1"><?php printOverallStatusText(S_EXPIRED);?></label>
 </td>

From 207f0b255f2f7004badb6af9bbdf2da56463e2e8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2015 19:42:29 +0200
Subject: [PATCH 0119/2006] add method maySwitchToUser(), fix
 getReverseSubstitutes()

---
 SeedDMS_Core/Core/inc.ClassUser.php | 57 +++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 8 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index e654172fb..5b4ee1007 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -130,6 +130,13 @@ class SeedDMS_Core_User { /* {{{ */
 	 */
 	var $_substitutes;
 
+	/**
+	 * @var array reverse list of users this user can substitute
+	 *
+	 * @access protected
+	 */
+	var $_rev_substitutes;
+
 	/**
 	 * @var object reference to the dms instance this user belongs to
 	 *
@@ -157,6 +164,8 @@ class SeedDMS_Core_User { /* {{{ */
 		$this->_loginFailures = $loginFailures;
 		$this->_quota = $quota;
 		$this->_homeFolder = $homeFolder;
+		$this->_substitutes = null;
+		$this->_rev_substitutes = null;
 		$this->_dms = null;
 	}
 
@@ -1530,24 +1539,28 @@ class SeedDMS_Core_User { /* {{{ */
 	function getReverseSubstitutes() { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		if (!isset($this->_substitutes))
-		{
-			$queryStr = "SELECT tblUsers`.* FROM `tblUserSubstitutes` ".
-				"LEFT JOIN `tblUsers` ON `tblUserSubstitutes`.`user` = `tblUsers`.`userID` ".
+		if (!isset($this->_rev_substitutes)) {
+			$queryStr = "SELECT `tblUsers`.* FROM `tblUserSubstitutes` ".
+				"LEFT JOIN `tblUsers` ON `tblUserSubstitutes`.`user` = `tblUsers`.`id` ".
 				"WHERE `tblUserSubstitutes`.`substitute`='". $this->_id ."'";
+			/* None admins can only be substitutes for regular users, otherwise
+			 * regular users can become admin
+			 */
+			if(!$this->isAdmin())
+				$queryStr .= " AND `tblUsers`.`role` = ".SeedDMS_Core_User::role_user;
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr == false)
 				return false;
 
-			$this->_substitutes = array();
+			$this->_rev_substitutes = array();
 			$classname = $this->_dms->getClassname('user');
 			foreach ($resArr as $row) {
 				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row["hidden"], $row["disabled"], $row["pwdExpiration"], $row["loginfailures"], $row["quota"], $row["homefolder"]);
 				$user->setDMS($this->_dms);
-				array_push($this->_substitutes, $user);
+				array_push($this->_rev_substitutes, $user);
 			}
 		}
-		return $this->_substitutes;
+		return $this->_rev_substitutes;
 	} /* }}} */
 
 	/**
@@ -1596,7 +1609,7 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$this->_substitutes = null;
 		return true;
-	}
+	} /* }}} */
 
 	/**
 	 * Check if user is a substitute of the current user
@@ -1617,5 +1630,33 @@ class SeedDMS_Core_User { /* {{{ */
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if user may switch to the given user
+	 *
+	 * Switching to the given user is only allowed if the given user
+	 * is a substitute for the current user.
+	 *
+	 * @return boolean true if successful otherwise false
+	 */
+	function maySwitchToUser($touser) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		if(get_class($touser) != $this->_dms->getClassname('user'))
+			return false;
+
+		/* switching to an admin account is always forbitten, unless the
+		 * current user is admin itself
+		 */
+		if(!$this->isAdmin() && $touser->isAdmin())
+			return false;
+
+		$queryStr = "SELECT * FROM tblUserSubstitutes WHERE substitute=" . $this->_id . " AND user=".$touser->getID();
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false) return false;
+		if (count($resArr) == 1) return true;
+
+		return false;
+	} /* }}} */
+
 } /* }}} */
 ?>

From 6c1ac6f038d7b6998d4c9fc4fdda867229f8d654 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2015 19:43:57 +0200
Subject: [PATCH 0120/2006] set width of .chzn-select-deselect to 95%

---
 styles/bootstrap/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 7c595de3d..c4bf38648 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -22,7 +22,7 @@ $(document).ready( function() {
 		});
 
 	$(".chzn-select").chosen({width: "95%"});
-	$(".chzn-select-deselect").chosen({allow_single_deselect:true});
+	$(".chzn-select-deselect").chosen({width: "95%", allow_single_deselect:true});
 
 	/* change the color and length of the bar graph showing the password
 	 * strength on each change to the passwod field.

From 536ead64ac7b618b0cc771342b42b61ec36a8582 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2015 19:44:18 +0200
Subject: [PATCH 0121/2006] allow to substitute user for regular users

---
 inc/inc.Authentication.php               | 10 +++++++---
 op/op.SubstituteUser.php                 | 20 ++++++++++++++++++--
 out/out.SubstituteUser.php               |  8 ++++----
 views/bootstrap/class.Bootstrap.php      | 14 +++++++++++---
 views/bootstrap/class.SubstituteUser.php |  2 +-
 views/bootstrap/class.UsrMgr.php         |  6 +++---
 6 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index a7dd6af3d..86c7961e2 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -41,9 +41,13 @@ $session->updateAccess($dms_session);
 /* Load user data */
 
 $user = $dms->getUser($resArr["userID"]);
-if($user->isAdmin()) {
-	if($resArr["su"]) {
-		$user = $dms->getUser($resArr["su"]);
+/* Check if user was substituted */
+if($resArr["su"] && $su = $dms->getUser($resArr["su"])) {
+	/* Admin may always substitute the user, but regular users are*/
+	if($user->isAdmin() || $user->maySwitchToUser($su)) {
+		$user = $su;
+	} else {
+		$session->resetSu();
 	}
 }
 if (!is_object($user)) {
diff --git a/op/op.SubstituteUser.php b/op/op.SubstituteUser.php
index f67498b74..ad460c733 100644
--- a/op/op.SubstituteUser.php
+++ b/op/op.SubstituteUser.php
@@ -25,14 +25,30 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
-	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+/* Check if the form data comes for a trusted request */
+if(!checkFormKey('substituteuser', 'GET')) {
+	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
 }
 
 if (!isset($_GET["userid"])) {
 	UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 }
 
+/* Check if user is allowed to switch to a different user */
+if (!$user->isAdmin()) {
+	$substitutes = $user->getReverseSubstitutes();
+	$found = false;
+	foreach($substitutes as $subsuser) {
+		/* Make sure a substitution is allowed and the substituted user
+		 * is not an admin.
+		 */
+		if($subsuser->getID() == $_GET["userid"] && !$subsuser->isAdmin())
+			$found = true;
+	}
+	if(!$found)
+		UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
 $session->setSu($_GET['userid']);
 
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_substituted_user')));
diff --git a/out/out.SubstituteUser.php b/out/out.SubstituteUser.php
index 159af1394..0fc7b74ab 100644
--- a/out/out.SubstituteUser.php
+++ b/out/out.SubstituteUser.php
@@ -26,12 +26,12 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
-	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+if ($user->isAdmin()) {
+	$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
+} else {
+	$allUsers = $user->getReverseSubstitutes();
 }
 
-$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1]);
 if($view) {
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 65279136f..26cac857b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -280,9 +280,17 @@ $(document).ready(function () {
 				echo "     </ul>\n";
 				echo "    </li>\n";
 			}
-			if($this->params['user']->isAdmin()) {
-				$showdivider = true;
-				echo "    <li><a href=\"../out/out.SubstituteUser.php\">".getMLText("substitute_user")."</a></li>\n";
+			if(!$this->params['session']->getSu()) {
+				if($this->params['user']->isAdmin()) {
+					$showdivider = true;
+					echo "    <li><a href=\"../out/out.SubstituteUser.php\">".getMLText("substitute_user")."</a></li>\n";
+				} elseif($substitutes = $this->params['user']->getReverseSubstitutes()) {
+					if(count($substitutes) == 1) {
+						echo "    <li><a href=\"../op/op.SubstituteUser.php?userid=".$substitutes[0]->getID()."&formtoken=".createFormKey('substituteuser')."\">".getMLText("substitute_to_user", array('username'=>$substitutes[0]->getFullName()))."</a></li>\n";
+					} else {
+						echo "    <li><a href=\"../out/out.SubstituteUser.php\">".getMLText("substitute_user")."</a></li>\n";
+					}
+				}
 			}
 			if($showdivider)
 				echo "    <li class=\"divider\"></li>\n";
diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index b94cbfedb..69657d666 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -68,7 +68,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>";
 			if($currUser->getID() != $user->getID()) {
-				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".$currUser->getID()."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
+				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".$currUser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
 			}
 			echo "</td>";
 			echo "</tr>";
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 355831936..457ea5f78 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -193,10 +193,10 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 ?>
 		<tr>
 			<td>
-				<div class="cbSelectTitle"><?php printMLText("substitute_user");?>:</div>
+				<div class="cbSelectTitle"><?php printMLText("possible_substitutes");?>:</div>
 			</td>
 			<td>
-        <select class="chzn-select-deselect" name="substitute[]" multiple="multiple" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+        <select class="chzn-select" name="substitute[]" multiple="multiple" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 		if($currUser) {
 			$substitutes = $currUser->getSubstitutes();
@@ -204,7 +204,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 			$substitutes = array();
 		}
 		foreach ($users as $usr) {
-			if ($usr->isGuest() || ($currUser && $usr->getID() == $currUser->getID()))
+			if ($usr->isGuest() || ($currUser && !$usr->isAdmin() && $currUser->isAdmin()) || ($currUser && $usr->getID() == $currUser->getID()))
 				continue;
 			$checked=false;
 			foreach ($substitutes as $r) if ($r->getID()==$usr->getID()) $checked=true;

From f76536b0a482b8386467287c22bfa6fa6da5653c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 May 2015 13:21:05 +0200
Subject: [PATCH 0122/2006] set some new icons

---
 views/bootstrap/class.ViewDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 671c0f1b8..8fd475107 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -541,10 +541,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
 		}
 		if($accessop->maySetRecipients()) {
-			print "<li><a href='../out/out.SetRecipients.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_recipients")."</a></li>";
+			print "<li><a href='../out/out.SetRecipients.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-check\"></i>".getMLText("change_recipients")."</a></li>";
 		}
 		if($accessop->maySetRevisors()) {
-			print "<li><a href='../out/out.SetRevisors.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_revisors")."</a></li>";
+			print "<li><a href='../out/out.SetRevisors.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-refresh\"></i>".getMLText("change_revisors")."</a></li>";
 		}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
@@ -564,7 +564,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		 */
 		if($dms->getAllTransmittals($user)) {
-			print "<li><a href=\"out.AddToTransmittal.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("add_to_transmittal")."</a></li>";
+			print "<li><a href=\"out.AddToTransmittal.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-list\"></i>".getMLText("add_to_transmittal")."</a></li>";
 		}
 		if($accessop->mayEditComment()) {
 			print "<li><a href=\"out.EditComment.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";

From 5e846059f7e340fae35d4f89cf05617ee718b040 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 May 2015 15:58:10 +0200
Subject: [PATCH 0123/2006] replace '/' by ', ' for better line break in header

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8fd475107..27143b6a5 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -120,7 +120,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		<legend><?php printMLText($type.'_log'); ?></legend>
 		<table class="table condensed">
-			<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('last_update'); ?>/<?php printMLText('comment'); ?></th><th><?php printMLText('status'); ?></th></tr>
+			<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('last_update'); ?>, <?php printMLText('comment'); ?></th><th><?php printMLText('status'); ?></th></tr>
 <?php
 		switch($type) {
 		case "review":

From e65c266831c59da866e2a60f875c54e7816645d6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 May 2015 22:09:33 +0200
Subject: [PATCH 0124/2006] add SeedDMS_Core_AddContentResultSet::setDMS(),
 fixed typo

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index e58dba462..dfccbab45 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1497,6 +1497,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if($workflow)
 			$content->setWorkflow($workflow, $user);
 		$docResultSet = new SeedDMS_Core_AddContentResultSet($content);
+		$docResultSet->setDMS($this->_dms);
 
 		if($attributes) {
 			foreach($attributes as $attrdefid=>$attribute) {
@@ -1688,7 +1689,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 			$this->_content = array();
 			foreach ($resArr as $row)
-				array_push($this->_content, new SeedDMS_Core_DocumentContent($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum'], $row['reviѕiondate']));
+				array_push($this->_content, new SeedDMS_Core_DocumentContent($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum'], $row['revisiondate']));
 		}
 
 		return $this->_content;
@@ -5136,6 +5137,11 @@ class SeedDMS_Core_AddContentResultSet { /* {{{ */
 	protected $_content;
 	protected $_status;
 
+	/**
+	 * @var object back reference to document management system
+	 */
+	protected $_dms;
+
 	function SeedDMS_Core_AddContentResultSet($content) { /* {{{ */
 		$this->_content = $content;
 		$this->_indReviewers = null;
@@ -5143,6 +5149,21 @@ class SeedDMS_Core_AddContentResultSet { /* {{{ */
 		$this->_indApprovers = null;
 		$this->_grpApprovers = null;
 		$this->_status = null;
+		$this->_dms = null;
+	} /* }}} */
+
+	/*
+	 * Set dms this object belongs to.
+	 *
+	 * Each object needs a reference to the dms it belongs to. It will be
+	 * set when the object is created.
+	 * The dms has a references to the currently logged in user
+	 * and the database connection.
+	 *
+	 * @param object $dms reference to dms
+	 */
+	function setDMS($dms) { /* {{{ */
+		$this->_dms = $dms;
 	} /* }}} */
 
 	function addReviewer($reviewer, $type, $status) { /* {{{ */

From 3bc72a46df5ae3c37f9b9b241983ca53cd1820ce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 May 2015 22:10:06 +0200
Subject: [PATCH 0125/2006] do not include jquery-cookie/jquery.cookie.js

it's currently not needed and not available
---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 26cac857b..941124760 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -71,7 +71,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/layouts/topRight.js"></script>'."\n";
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/noty/themes/default.js"></script>'."\n";
 		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n";
-		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
+//		echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
 		echo '<link rel="shortcut icon" href="../styles/'.$this->theme.'/favicon.ico" type="image/x-icon"/>'."\n";
 		if($this->params['session'] && $this->params['session']->getSu()) {
 ?>

From 38b7a7c6607dbfc39f01c94204a36513262c3cc6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:41:52 +0200
Subject: [PATCH 0126/2006] callHook() returns null if no method was found

---
 inc/inc.ClassControllerCommon.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassControllerCommon.php b/inc/inc.ClassControllerCommon.php
index d3a949dff..308872d43 100644
--- a/inc/inc.ClassControllerCommon.php
+++ b/inc/inc.ClassControllerCommon.php
@@ -115,6 +115,7 @@ class SeedDMS_Controller_Common {
 	function callHook($hook) { /* {{{ */
 		$tmp = explode('_', get_class($this));
 		if(isset($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp[2])])) {
+			$result = null;
 			foreach($GLOBALS['SEEDDMS_HOOKS']['controller'][lcfirst($tmp[2])] as $hookObj) {
 				if (method_exists($hookObj, $hook)) {
 					switch(func_num_args()) {
@@ -130,7 +131,7 @@ class SeedDMS_Controller_Common {
 					}
 				}
 			}
-			return true;
+			return $result;
 		}
 		return null;
 	} /* }}} */

From b8d06babeefdf9e37febe4d95dea0bc7ed30e416 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:42:37 +0200
Subject: [PATCH 0127/2006] add setting for library folder

---
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 15cb6060d..b770d8d9c 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -83,6 +83,8 @@ class Settings { /* {{{ */
 	var $_luceneDir = null;
 	// Where the drop folders are located
 	var $_dropFolderDir = null;
+	// Where the library folder is located
+	var $_libraryFolder = 1;
 	// Where the checked out files are located
 	var $_checkOutDir = null;
 	// Create checkout dir if it doesn't exists
@@ -358,6 +360,7 @@ class Settings { /* {{{ */
 		$this->_sortUsersInList = strval($tab["sortUsersInList"]);
 		$this->_sortFoldersDefault = strval($tab["sortFoldersDefault"]);
 		$this->_expandFolderTree = intval($tab["expandFolderTree"]);
+		$this->_libraryFolder = intval($tab["libraryFolder"]);
 
 		// XML Path: /configuration/site/calendar
 		$node = $xml->xpath('/configuration/site/calendar');
@@ -645,6 +648,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "stopWordsFile", $this->_stopWordsFile);
     $this->setXMLAttributValue($node, "sortUsersInList", $this->_sortUsersInList);
     $this->setXMLAttributValue($node, "sortFoldersDefault", $this->_sortFoldersDefault);
+    $this->setXMLAttributValue($node, "libraryFolder", $this->_libraryFolder);
 
     // XML Path: /configuration/site/calendar
     $node = $this->getXMLNode($xml, '/configuration/site', 'calendar');
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 6c7d3724c..8d6aa0695 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -80,6 +80,7 @@ if ($action == "saveSettings")
 	$settings->_stopWordsFile = $_POST["stopWordsFile"];
 	$settings->_sortUsersInList = $_POST["sortUsersInList"];
 	$settings->_sortFoldersDefault = $_POST["sortFoldersDefault"];
+  $settings->_libraryFolder = intval($_POST["libraryFolder"]);
 
   // SETTINGS - SITE - CALENDAR
   $settings->_enableCalendar = getBoolValue("enableCalendar");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 64c3df226..6fc9ace1e 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -220,6 +220,10 @@ if(!is_writeable($settings->_configFilePath)) {
             <OPTION VALUE="n" <?php if ($settings->_sortFoldersDefault=='n') echo "SELECTED" ?> ><?php printMLText("settings_sortFoldersDefault_val_name");?></OPTION>
           </SELECT>
       </tr>
+      <tr title="<?php printMLText("settings_libraryFolder_desc");?>">
+        <td><?php printMLText("settings_libraryFolder");?>:</td>
+				<td><?php $this->printFolderChooser("form1", M_READWRITE, -1, $dms->getFolder($settings->_libraryFolder), 'libraryFolder');?></td>
+      </tr>
 
       <!--
         -- SETTINGS - SITE - CALENDAR

From 66789283016053b1ed4b3597cb47fc7b6632e5a7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:42:50 +0200
Subject: [PATCH 0128/2006] some spanish updates

---
 languages/ar_EG/lang.inc |  1 +
 languages/bg_BG/lang.inc |  1 +
 languages/ca_ES/lang.inc |  1 +
 languages/cs_CZ/lang.inc |  1 +
 languages/de_DE/lang.inc |  5 +++--
 languages/en_GB/lang.inc |  3 ++-
 languages/es_ES/lang.inc | 41 ++++++++++++++++++++--------------------
 languages/fr_FR/lang.inc |  1 +
 languages/hu_HU/lang.inc |  1 +
 languages/it_IT/lang.inc |  1 +
 languages/nl_NL/lang.inc |  1 +
 languages/pl_PL/lang.inc |  1 +
 languages/pt_BR/lang.inc |  1 +
 languages/ro_RO/lang.inc |  1 +
 languages/ru_RU/lang.inc |  5 +++--
 languages/sk_SK/lang.inc |  1 +
 languages/sv_SE/lang.inc |  1 +
 languages/tr_TR/lang.inc |  1 +
 languages/zh_CN/lang.inc |  5 +++--
 languages/zh_TW/lang.inc |  1 +
 20 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index ca7cf4617..a925d277c 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -233,6 +233,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'المحتوى',
 'continue' => 'استمرار',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'انشاء فهرس للنص الكامل',
 'create_fulltext_index_warning' => 'انت على وشك اعادة انشاء فهرس النص الكامل.هذا سيتطلب وقت كافي وسيؤثر بشكل عام على كفاءة النظام. اذا كنت حقا تود اعادة انشاء الفهرس، من فضلك قم بتاكيد العملية.',
 'creation_date' => 'تم انشاؤه',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index c4bdd836d..f2dcbe896 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -218,6 +218,7 @@ $text = array(
 'confirm_update_transmittalitem' => '',
 'content' => 'Съдържание',
 'continue' => 'Продължи',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Създай пълнотекстов индекс',
 'create_fulltext_index_warning' => 'Вие искате да пресъздадете пълнотекстов индекс. Това ще отнеме време и ще понижи производителността. Да продолжа ли?',
 'creation_date' => 'Създаден',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 3d537ab1c..9a59ab64f 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -223,6 +223,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contingut',
 'continue' => 'Continuar',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => '',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Creació',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index afb954524..84b3cc6d0 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -240,6 +240,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Domů',
 'continue' => 'Pokračovat',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Vytvořit fulltext index',
 'create_fulltext_index_warning' => 'Hodláte znovu vytvořit fulltext index. Může to trvat dlouho a zpomalit běh systému. Pokud víte, co děláte, potvďte operaci.',
 'creation_date' => 'Vytvořeno',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 2aab93c74..b678144ea 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2049), dgrutsch (18)
+//    Translators: Admin (2051), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -194,7 +194,7 @@ URL: [url]',
 'change_password' => 'Passwort ändern',
 'change_password_message' => 'Ihr Passwort wurde geändert.',
 'change_recipients' => 'Empfängerliste ändern',
-'change_revisors' => 'Wiedervorlage ändern',
+'change_revisors' => 'Wiederholungsprüfung ändern',
 'change_status' => 'Status ändern',
 'charts' => 'Diagramme',
 'chart_docsaccumulated_title' => 'Anzahl Dokumente',
@@ -245,6 +245,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => 'Aktualisierung bestätigen',
 'content' => 'Inhalt',
 'continue' => 'fortführen',
+'copied_to_checkout_as' => 'Datei in den Checkout-Space als \'[filename]\' kopiert.',
 'create_fulltext_index' => 'Erzeuge Volltextindex',
 'create_fulltext_index_warning' => 'Sie möchten den Volltextindex neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.',
 'creation_date' => 'Erstellt am',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 83b772dd8..2fdf94747 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1178), dgrutsch (3), netixw (14)
+//    Translators: Admin (1179), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -245,6 +245,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => 'Confirm update',
 'content' => 'Content',
 'continue' => 'Continue',
+'copied_to_checkout_as' => 'File copied to checkout space as \'[filename]\'',
 'create_fulltext_index' => 'Create fulltext index',
 'create_fulltext_index_warning' => 'You are about to recreate the fulltext index. This can take a considerable amount of time and reduce your overall system performance. If you really want to recreate the index, please confirm your operation.',
 'creation_date' => 'Created',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 43380c312..70a567149 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (938), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (938), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -131,12 +131,12 @@ URL: [url]',
 'attrdef_objtype' => 'Tipo de objeto',
 'attrdef_regex' => 'Expresión regular',
 'attrdef_type' => 'Tipo',
-'attrdef_type_boolean' => '',
-'attrdef_type_email' => '',
-'attrdef_type_float' => '',
-'attrdef_type_int' => '',
-'attrdef_type_string' => '',
-'attrdef_type_url' => '',
+'attrdef_type_boolean' => 'Lógico (booleano)',
+'attrdef_type_email' => 'E-mail',
+'attrdef_type_float' => 'Número decimal',
+'attrdef_type_int' => 'Número entero',
+'attrdef_type_string' => 'Texto',
+'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Conjunto de valores',
 'attributes' => 'Atributos',
 'attribute_changed_email_body' => 'Atributo modificado
@@ -157,7 +157,7 @@ URL: [url]',
 'at_least_n_users_of_group' => 'Al menos [number_of_users] usuarios de [group]',
 'august' => 'Agosto',
 'authentication' => 'Autenticación',
-'author' => '',
+'author' => 'Autor',
 'automatic_status_update' => 'Cambio automático de estado',
 'back' => 'Atrás',
 'backup_list' => 'Lista de copias de seguridad existentes',
@@ -240,6 +240,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenido',
 'continue' => 'Continuar',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Crear índice de texto completo',
 'create_fulltext_index_warning' => 'Usted va a regenerar el índice te texto completo. Esto puede tardar un tiempo considerable y consumir capacidad de su equipo. Si realmente quiere regenerar el índice, por favor confirme la operación.',
 'creation_date' => 'Creación',
@@ -579,7 +580,7 @@ URL: [url]',
 'my_transmittals' => '',
 'name' => 'Nombre',
 'needs_workflow_action' => 'Este documento requiere su atención. Por favor chequee la pestaña de flujo de trabajo.',
-'never' => '',
+'never' => 'nunca',
 'new' => 'Nuevo',
 'new_attrdef' => 'Nueva definición de atributo',
 'new_default_keywords' => 'Agregar palabras claves',
@@ -660,7 +661,7 @@ URL: [url]',
 'october' => 'Octubre',
 'old' => 'Viejo',
 'only_jpg_user_images' => 'Sólo puede usar imágenes .jpg como imágenes de usuario',
-'order_by_sequence_off' => '',
+'order_by_sequence_off' => 'El orden secuencial está desactivado en la configuración. Si quiere utilizar este parámetro, deberá activarlo.',
 'original_filename' => 'Nombre de fichero original',
 'owner' => 'Propietario',
 'ownership_changed_email' => 'Propietario modificado',
@@ -799,7 +800,7 @@ URL: [url]',
 'rm_from_clipboard' => 'Borrar del portapapeles',
 'rm_group' => 'Eliminar este grupo',
 'rm_transmittal' => '',
-'rm_transmittalitem' => '',
+'rm_transmittalitem' => 'Eliminar elemento',
 'rm_user' => 'Eliminar este usuario',
 'rm_version' => 'Eliminar versión',
 'rm_workflow' => 'Eliminar Flujo de Trabajo',
@@ -1028,8 +1029,8 @@ URL: [url]',
 'settings_php_gd2' => 'Extensión PHP : php_gd2',
 'settings_php_mbstring' => 'Extensión PHP : php_mbstring',
 'settings_php_version' => 'Versión de PHP',
-'settings_presetExpirationDate' => '',
-'settings_presetExpirationDate_desc' => '',
+'settings_presetExpirationDate' => 'Fecha de caducidad predeterminada',
+'settings_presetExpirationDate_desc' => 'Todos los documentos subidos tendrán esta fecha de caducidad. La fecha puede establecerse con una expresión comprensible para  la función strtotime() de PHP, como \'+5 weeks\'',
 'settings_previewWidthDetail' => 'Ancho de las imágenes de vista en miniatura (detalle)',
 'settings_previewWidthDetail_desc' => 'Ancho de las imágenes de vista en miniatura que se muestran en el detalle del documento',
 'settings_previewWidthList' => 'Ancho de las imágenes de vista en miniatura (listas)',
@@ -1120,7 +1121,7 @@ URL: [url]',
 'splash_add_group_member' => 'Nuevo miembro del grupo agregado',
 'splash_add_user' => 'Nuevo usuario agregado',
 'splash_cleared_clipboard' => 'Portapapeles limpiado',
-'splash_document_added' => '',
+'splash_document_added' => 'Documento añadido',
 'splash_document_checkedout' => '',
 'splash_document_edited' => 'Documento guardado',
 'splash_document_locked' => 'Documento bloqueado',
@@ -1159,9 +1160,9 @@ URL: [url]',
 'status_reviewed' => 'Revisado',
 'status_reviewer_rejected' => 'Borrador rechazado',
 'status_reviewer_removed' => 'Revisor eliminado del proceso',
-'status_revised' => '',
-'status_revision_rejected' => '',
-'status_revision_sleeping' => '',
+'status_revised' => 'revisado',
+'status_revision_rejected' => 'rechazado',
+'status_revision_sleeping' => 'pendiente',
 'status_revisor_removed' => '',
 'status_unknown' => 'Desconocido',
 'storage_size' => 'Tamaño de almacenamiento',
@@ -1172,7 +1173,7 @@ URL: [url]',
 'submit_receipt' => '',
 'submit_review' => 'Enviar revisión',
 'submit_userinfo' => 'Enviar información',
-'substitute_to_user' => '',
+'substitute_to_user' => 'Cambiar a \'[username]\'',
 'substitute_user' => 'Cambiar de usuario',
 'sunday' => 'Domingo',
 'sunday_abbr' => 'D',
@@ -1206,8 +1207,8 @@ URL: [url]',
 'transmittalitem_removed' => '',
 'transmittalitem_updated' => '',
 'transmittal_comment' => '',
-'transmittal_name' => '',
-'transmittal_size' => '',
+'transmittal_name' => 'Nombre',
+'transmittal_size' => 'Tamaño',
 'trigger_workflow' => 'Flujo de Trabajo',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martes',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index d1f8b1320..16e37485e 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -240,6 +240,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenu',
 'continue' => 'Continuer',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Créer un index de recherche plein texte',
 'create_fulltext_index_warning' => 'Vous allez recréer l\'index de texte intégral. Cela peut prendre une grande quantité de temps et réduire les performances de votre système dans son ensemble. Si vous voulez vraiment recréer l\'index, merci de confirmer votre opération.',
 'creation_date' => 'Créé le',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index a29f812a8..a43338903 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -240,6 +240,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Tartalom',
 'continue' => 'Folytatás',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Teljes szöveg index létrehozása',
 'create_fulltext_index_warning' => 'Ön a teljes szöveg index újraépítését kezdeményezte. Ez a művelet hosszú ideig eltarthat és jelentősen csökkentheti az egész rendszer teljesítményét. Ha biztosan újra kívánja építeni az indexet, kérjük erősítse meg a műveletet.',
 'creation_date' => 'Létrehozva',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 6e7034714..df9cf7c6a 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -245,6 +245,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenuto',
 'continue' => 'Continua',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Crea indice fulltext',
 'create_fulltext_index_warning' => 'Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l\'indice? Prego conferma l\'operazione.',
 'creation_date' => 'Data creazione',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index b540759ce..c427e3059 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -233,6 +233,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Welkomstpagina',
 'continue' => 'Doorgaan',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Creeer volledige tekst index',
 'create_fulltext_index_warning' => 'U staat op het punt de volledigetekst opnieuw te indexeren. Dit kan behoorlijk veel tijd en snelheid vergen van het systeem. Als u zeker bent om opnieuw te indexeren, bevestig deze actie.',
 'creation_date' => 'Aangemaakt',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 30a40a9d8..3b4970eeb 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -233,6 +233,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Zawartość',
 'continue' => 'Kontynuuj',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Utwórz indeks pełnotekstowy',
 'create_fulltext_index_warning' => 'Zamierzasz ponownie utworzyć indeks pełnotekstowy. To może zająć sporo czasu i ograniczyć ogólną wydajność systemu. Jeśli faktycznie chcesz to zrobić, proszę potwierdź tę operację.',
 'creation_date' => 'Utworzony',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 37b2e8476..7d13e5453 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -240,6 +240,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Conteúdo',
 'continue' => 'Continue',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Criar índice de texto completo',
 'create_fulltext_index_warning' => 'Você está para recriar o índice de texto completo. Isso pode levar uma quantidade considerável de tempo e reduzir o desempenho geral do sistema. Se você realmente deseja recriar o índice, por favor confirme a operação.',
 'creation_date' => 'Criado',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 88911e0d8..ce68ed3be 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -245,6 +245,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Conținut',
 'continue' => 'Continuă',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Creați indexul pentru tot textul',
 'create_fulltext_index_warning' => 'Sunteți pe cale sa recreați indexul pentru tot textul. Acest lucru poate dura o perioadă considerabilă de timp și poate reduce performanța sistemului în ansamblu. Dacă doriți cu adevărat să recreati indexul pentru tot textul, vă rugăm să confirmați operațiunea.',
 'creation_date' => 'Creat',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 2abd1f24d..e37603124 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1250)
+//    Translators: Admin (1251)
 
 $text = array(
 'accept' => 'Принять',
@@ -158,7 +158,7 @@ URL: [url]',
 'backup_remove' => 'Удалить резервную копию',
 'backup_tools' => 'Резервные копии',
 'between' => 'между',
-'bg_BG' => '',
+'bg_BG' => 'Болгарский',
 'browse' => 'Выбрать',
 'calendar' => 'Календарь',
 'calendar_week' => 'Неделя',
@@ -233,6 +233,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Содержимое',
 'continue' => 'Продолжить',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Создать полнотекстовый индекс',
 'create_fulltext_index_warning' => 'Вы хотите пересоздать полнотекстовый индекс. Это займёт какое-то время и снизит производительность. Продолжить?',
 'creation_date' => 'Создан',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 4baf8e810..6aa0b24b1 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -218,6 +218,7 @@ $text = array(
 'confirm_update_transmittalitem' => '',
 'content' => 'Obsah',
 'continue' => 'Pokračovať',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => '',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Vytvorené',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 57816dcfa..486d6ebb3 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -233,6 +233,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Innehåll',
 'continue' => 'Fortsätt',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Skapa fulltext-sökindex',
 'create_fulltext_index_warning' => 'Du håller på att skapa fulltext-sökindex. Detta kan ta mycket lång tid och sakta ner den allmänna systemprestandan. Om du verkligen vill skapa indexet, bekräfta åtgärden.',
 'creation_date' => 'Skapat',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index bb5aceaf4..5c66a19ca 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -239,6 +239,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'İçerik',
 'continue' => 'Devam',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Tam metin indeksi oluştur',
 'create_fulltext_index_warning' => 'Tam metin indeksi yeniden oluşturmak üzeresiniz. Bu işlem bir hayli uzun sürebilir ve sistem performansını olumsuz etkileyebilir. Buna rağmen indeksi oluşturmak istiyorsanız lütfen bu işlemi onaylayın.',
 'creation_date' => 'Oluşturma tarihi',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index b5654a6fd..d23a3dc2f 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (575), fengjohn (5)
+//    Translators: Admin (576), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -222,6 +222,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => '内容',
 'continue' => '继续',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => '创建全文索引',
 'create_fulltext_index_warning' => '你将重新创建全
 文索引。这将花费一定的时间但是会提升系统的整体表现。如果你想要重新创建索引，请确
@@ -633,7 +634,7 @@ URL: [url]',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
 'review_group' => '校对组',
-'review_log' => '',
+'review_log' => '审阅记录',
 'review_request_email' => '校对请求',
 'review_request_email_body' => '',
 'review_request_email_subject' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 4f90a2ef1..551059c73 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -222,6 +222,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => '內容',
 'continue' => '繼續',
+'copied_to_checkout_as' => '',
 'create_fulltext_index' => '創建全文索引',
 'create_fulltext_index_warning' => '',
 'creation_date' => '創建日期',

From 5b931afefb5318ca2995ffd268f622e768299621 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:43:37 +0200
Subject: [PATCH 0129/2006] split AddDocument into stub and controller

---
 controllers/class.AddDocument.php |  99 ++++++++++++++++++
 op/op.AddDocument.php             | 163 ++++++++++++++++++------------
 2 files changed, 195 insertions(+), 67 deletions(-)
 create mode 100644 controllers/class.AddDocument.php

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
new file mode 100644
index 000000000..3217ba9dc
--- /dev/null
+++ b/controllers/class.AddDocument.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Implementation of AddDocument controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for downloading a document
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
+
+	public function run() {
+		/* Call preAddDocument early, because it might need to modify some
+		 * of the parameters.
+		 */
+		if(false === $this->callHook('preAddDocument')) {
+			$this->errormsg = 'hook_preAddDocument_failed';
+			return null;
+		}
+
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$documentsource = $this->params['documentsource'];
+		$index = $this->params['index'];
+		$folder = $this->params['folder'];
+		$name = $this->getParam('name');
+		$comment = $this->getParam('comment');
+		$expires = $this->getParam('expires');
+		$keywords = $this->getParam('keywords');
+		$cats = $this->getParam('categories');
+		$userfiletmp = $this->getParam('userfiletmp');
+		$userfilename = $this->getParam('userfilename');
+		$filetype = $this->getParam('filetype');
+		$userfiletype = $this->getParam('userfiletype');
+		$sequence = $this->getParam('sequence');
+		$reviewers = $this->getParam('reviewers');
+		$approvers = $this->getParam('approvers');
+		$reqversion = $this->getParam('reqversion');
+		$version_comment = $this->getParam('versioncomment');
+		$attributes = $this->getParam('attributes');
+		$attributes_version = $this->getParam('attributesversion');
+		$workflow = $this->getParam('workflow');
+		$notificationgroups = $this->getParam('notificationgroups');
+		$notificationusers = $this->getParam('notificationusers');
+
+		$result = $this->callHook('addDocument');
+		if($result === null) {
+			$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
+															$cats, $userfiletmp, basename($userfilename),
+	                            $filetype, $userfiletype, $sequence,
+	                            $reviewers, $approvers, $reqversion,
+	                            $version_comment, $attributes, $attributes_version, $workflow);
+
+			if (is_bool($res) && !$res) {
+				$this->errormsg = "error_occured";
+				return false;
+			}
+
+			$document = $res[0];
+
+			if($index) {
+				$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true));
+			}
+
+			/* Add a default notification for the owner of the document */
+			if($settings->_enableOwnerNotification) {
+				$res = $document->addNotify($user->getID(), true);
+			}
+			/* Check if additional notification shall be added */
+			foreach($notificationusers as $notuser) {
+					$res = $document->addNotify($notuser->getID(), true);
+			}
+			foreach($notificationgroups as $notgroup) {
+				$res = $document->addNotify($notgroup->getID(), false);
+			}
+
+			if(!$this->callHook('postAddDocument', $document)) {
+			}
+			$result = $document;
+		}
+
+		return $result;
+	}
+}
+
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 8c34c9745..2d639170e 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -28,6 +28,10 @@ include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('adddocument')) {
@@ -65,6 +69,13 @@ if($version_comment == "" && isset($_POST["use_comment"]))
 
 $keywords = $_POST["keywords"];
 $categories = isset($_POST["categories"]) ? $_POST["categories"] : null;
+$cats = array();
+if($categories) {
+	foreach($categories as $catid) {
+		$cats[] = $dms->getDocumentCategory($catid);
+	}
+}
+
 if(isset($_POST["attributes"]))
 	$attributes = $_POST["attributes"];
 else
@@ -217,10 +228,13 @@ if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'tra
 	}
 }
 
+$docsource = 'upload';
+
 if($settings->_dropFolderDir) {
 	if(isset($_POST["dropfolderfileform1"]) && $_POST["dropfolderfileform1"]) {
 		$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"];
 		if(file_exists($fullfile)) {
+			$docsource = 'dropfolder';
 			/* Check if a local file is uploaded as well */
 			if(isset($_FILES["userfile"]['error'][0])) {
 				if($_FILES["userfile"]['error'][0] != 0)
@@ -237,6 +251,64 @@ if($settings->_dropFolderDir) {
 	}
 }
 
+if($settings->_libraryFolder) {
+	if(isset($_POST["librarydoc"]) && $_POST["librarydoc"]) {
+		if($clonedoc = $dms->getDocument($_POST["librarydoc"])) {
+			if($content = $clonedoc->getLatestContent()) {
+				$docsource = 'library';
+				$fullfile = tempnam('', '');
+				if(SeedDMS_Core_File::copyFile($dms->contentDir . $content->getPath(), $fullfile)) {
+					/* Check if a local file is uploaded as well */
+					if(isset($_FILES["userfile"]['error'][0])) {
+						if($_FILES["userfile"]['error'][0] != 0)
+							$_FILES["userfile"] = array();
+					}
+					$_FILES["userfile"]['tmp_name'][] = $fullfile;
+					$_FILES["userfile"]['type'][] = $content->getMimeType();
+					$_FILES["userfile"]['name'][] = $content->getOriginalFileName();
+					$_FILES["userfile"]['size'][] = $content->getFileSize();
+					$_FILES["userfile"]['error'][] = 0;
+				}
+			}
+		}
+	}
+}
+
+$index = null;
+if($settings->_enableFullSearch) {
+	if(!empty($settings->_luceneClassDir))
+		require_once($settings->_luceneClassDir.'/Lucene.php');
+	else
+		require_once('SeedDMS/Lucene.php');
+
+	$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
+	if($index) {
+		SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
+	}
+}
+
+/* Check if additional notification shall be added */
+$notusers = array();
+if(!empty($_POST['notification_users'])) {
+	foreach($_POST['notification_users'] as $notuserid) {
+		$notuser = $dms->getUser($notuserid);
+		if($notuser) {
+			if($document->getAccessMode($user) >= M_READ)
+				$notusers[] = $notuser;
+		}
+	}
+}
+$notgroups = array();
+if(!empty($_POST['notification_groups'])) {
+	foreach($_POST['notification_groups'] as $notgroupid) {
+		$notgroup = $dms->getGroup($notgroupid);
+		if($notgroup) {
+			if($document->getGroupAccessMode($notgroup) >= M_READ)
+				$notgroups[] = $notgroup;
+		}
+	}
+}
+
 /* Check files for Errors first */
 for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	if ($_FILES["userfile"]["size"][$file_num]==0) {
@@ -265,75 +337,32 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 		}
 	}
 
-	$cats = array();
-	if($categories) {
-		foreach($categories as $catid) {
-			$cats[] = $dms->getDocumentCategory($catid);
-		}
-	}
+	$controller->setParam('documentsource', $docsource);
+	$controller->setParam('folder', $folder);
+	$controller->setParam('index', $index);
+	$controller->setParam('name', $name);
+	$controller->setParam('comment', $comment);
+	$controller->setParam('expires', $expires);
+	$controller->setParam('keywords', $keywords);
+	$controller->setParam('categories', $cats);
+	$controller->setParam('userfiletmp', $userfiletmp);
+	$controller->setParam('userfilename', $userfilename);
+	$controller->setParam('filetype', $fileType);
+	$controller->setParam('userfiletype', $userfiletype);
+	$controller->setParam('sequence', $sequence);
+	$controller->setParam('reviewers', $reviewers);
+	$controller->setParam('approvers', $approvers);
+	$controller->setParam('reqversion', $reqversion);
+	$controller->setParam('versioncomment', $version_comment);
+	$controller->setParam('attributes', $attributes);
+	$controller->setParam('attributesversion', $attributes_version);
+	$controller->setParam('workflow', $workflow);
+	$controller->setParam('notificationgroups', $notgroups);
+	$controller->setParam('notificationusers', $notusers);
 
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'pretAddDocument')) {
-				$hookObj->preAddDocument(array('name'=>&$name, 'comment'=>&$comment));
-			}
-		}
-	}
-
-	$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
-															$cats, $userfiletmp, basename($userfilename),
-	                            $fileType, $userfiletype, $sequence,
-	                            $reviewers, $approvers, $reqversion,
-	                            $version_comment, $attributes, $attributes_version, $workflow);
-
-	if (is_bool($res) && !$res) {
-		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
+	if(!$document = $controller->run()) {
+		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText($controller->getErrorMsg()));
 	} else {
-		$document = $res[0];
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
-				if (method_exists($hookObj, 'postAddDocument')) {
-					$hookObj->postAddDocument($document);
-				}
-			}
-		}
-		if($settings->_enableFullSearch) {
-			if(!empty($settings->_luceneClassDir))
-				require_once($settings->_luceneClassDir.'/Lucene.php');
-			else
-				require_once('SeedDMS/Lucene.php');
-
-			$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
-			if($index) {
-				SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
-				$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true));
-			}
-		}
-
-		/* Add a default notification for the owner of the document */
-		if($settings->_enableOwnerNotification) {
-			$res = $document->addNotify($user->getID(), true);
-		}
-		/* Check if additional notification shall be added */
-		if(!empty($_POST['notification_users'])) {
-			foreach($_POST['notification_users'] as $notuserid) {
-				$notuser = $dms->getUser($notuserid);
-				if($notuser) {
-					if($document->getAccessMode($user) >= M_READ)
-						$res = $document->addNotify($notuserid, true);
-				}
-			}
-		}
-		if(!empty($_POST['notification_groups'])) {
-			foreach($_POST['notification_groups'] as $notgroupid) {
-				$notgroup = $dms->getGroup($notgroupid);
-				if($notgroup) {
-					if($document->getGroupAccessMode($notgroup) >= M_READ)
-						$res = $document->addNotify($notgroupid, false);
-				}
-			}
-		}
-
 		// Send notification to subscribers of folder.
 		if($notifier) {
 			$notifyList = $folder->getNotifyList();

From 220fa8a8fc6064e9fadd23c2ebb2cf4e6bdee1ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:44:16 +0200
Subject: [PATCH 0130/2006] split file into stub and controller

---
 controllers/class.ApproveDocument.php |  65 ++++++++
 op/op.ApproveDocument.php             | 220 +++++++++-----------------
 2 files changed, 140 insertions(+), 145 deletions(-)
 create mode 100644 controllers/class.ApproveDocument.php

diff --git a/controllers/class.ApproveDocument.php b/controllers/class.ApproveDocument.php
new file mode 100644
index 000000000..7e7410521
--- /dev/null
+++ b/controllers/class.ApproveDocument.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Implementation of ApproveDocument controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for downloading a document
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$document = $this->params['document'];
+		$content = $this->params['content'];
+		$approvalstatus = $this->params['approvalstatus'];
+		$approvaltype = $this->params['approvaltype'];
+		$group = $this->params['group'];
+		$comment = $this->params['comment'];
+
+		/* Get the document id and name before removing the document */
+		$docname = $document->getName();
+		$documentid = $document->getID();
+
+		if(!$this->callHook('preApproveDocument', $document)) {
+		}
+
+		$result = $this->callHook('approveDocument', $document);
+		if($result === null) {
+			if ($approvaltype == "ind") {
+				if(0 > $content->setApprovalByInd($user, $user, $approvalstatus, $comment)) {
+					$this->error = 1;
+					$this->errormsg = "approval_update_failed";
+					return false;
+				}
+			} elseif ($approvaltype == "grp") {
+				if(0 > $content->setApprovalByGrp($group, $user, $approvalstatus, $comment)) {
+					$this->error = 1;
+					$this->errormsg = "approval_update_failed";
+					return false;
+				}
+			}
+			if(!$this->callHook('postApproveDocument', $document)) {
+			}
+		}
+
+		return true;
+	}
+}
+
diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 74587764f..04296e5c6 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -29,6 +29,10 @@ include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('approvedocument')) {
@@ -80,93 +84,59 @@ if (!isset($_POST["approvalStatus"]) || !is_numeric($_POST["approvalStatus"]) ||
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_approval_status"));
 }
 
-if ($_POST["approvalType"] == "ind") {
+$controller->setParam('document', $document);
+$controller->setParam('content', $latestContent);
+$controller->setParam('approvalstatus', $_POST["approvalStatus"]);
+$controller->setParam('approvaltype', $_POST["approvalType"]);
+if ($_POST["approvalType"] == "grp") {
+	$group = $dms->getGroup($_POST['approvalGroup']);
+} else {
+	$group = null;
+}
+$controller->setParam('group', $group);
+$controller->setParam('comment', $_POST["comment"]);
+if(!$controller->run()) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
+}
 
+/*
+if ($_POST["approvalType"] == "ind") {
 	$comment = $_POST["comment"];
 	if(0 > $latestContent->setApprovalByInd($user, $user, $_POST["approvalStatus"], $comment)) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approval_update_failed"));
 	}
-	else {
-		// Send an email notification to the document updater.
-		if($notifier) {
-/*
-			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
-			$message = getMLText("approval_submit_email")."\r\n";
-			$message .= 
-				getMLText("name").": ".$document->getName()."\r\n".
-				getMLText("version").": ".$version."\r\n".
-				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-				getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n".
-				getMLText("comment").": ".$comment."\r\n".
-				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
-*/
-
-			$subject = "approval_submit_email_subject";
-			$message = "approval_submit_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['version'] = $version;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getApprovalStatusText($_POST["approvalStatus"]);
-			$params['comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
-
-			// Send notification to subscribers.
-			$nl=$document->getNotifyList();
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
-		}
-	}
-}
-else if ($_POST["approvalType"] == "grp") {
+} elseif ($_POST["approvalType"] == "grp") {
 	$comment = $_POST["comment"];
 	$group = $dms->getGroup($_POST['approvalGroup']);
 	if(0 > $latestContent->setApprovalByGrp($group, $user, $_POST["approvalStatus"], $comment)) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approval_update_failed"));
 	}
-	else {
-		// Send an email notification to the document updater.
-		if($notifier) {
-/*
-			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_submit_email");
-			$message = getMLText("approval_submit_email")."\r\n";
-			$message .= 
-				getMLText("name").": ".$document->getName()."\r\n".
-				getMLText("version").": ".$version."\r\n".
-				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-				getMLText("status").": ".getApprovalStatusText($_POST["approvalStatus"])."\r\n".
-				getMLText("comment").": ".$comment."\r\n".
-				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
-*/
+}
+ */
 
-			$subject = "approval_submit_email_subject";
-			$message = "approval_submit_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['version'] = $version;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getApprovalStatusText($_POST["approvalStatus"]);
-			$params['comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+if ($_POST["approvalType"] == "ind" || $_POST["approvalType"] == "grp") {
+	// Send an email notification to the document updater.
+	if($notifier) {
+		$subject = "approval_submit_email_subject";
+		$message = "approval_submit_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['version'] = $version;
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getApprovalStatusText($_POST["approvalStatus"]);
+		$params['comment'] = $_POST['comment'];
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
 
-			// Send notification to subscribers.
-			$nl=$document->getNotifyList();
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
+		// Send notification to subscribers.
+		$nl=$document->getNotifyList();
+		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
 		}
 	}
 }
@@ -176,46 +146,13 @@ else if ($_POST["approvalType"] == "grp") {
 // updated.
 //
 
+$sendnotification = false;
+/* If document was rejected, set the document status to S_REJECTED right away */
 if ($_POST["approvalStatus"]==-1){
 	if($content->setStatus(S_REJECTED,$comment,$user)) {
-		// Send notification to subscribers.
-		if($notifier) {
-			$nl=$document->getNotifyList();
-			$folder = $document->getFolder();
-/*
-			$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
-			$message = getMLText("document_status_changed_email")."\r\n";
-			$message .= 
-				getMLText("document").": ".$document->getName()."\r\n".
-				getMLText("status").": ".getOverallStatusText($status)."\r\n".
-				getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
-				getMLText("comment").": ".$document->getComment()."\r\n".
-				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
-*/
-
-			$subject = "document_status_changed_email_subject";
-			$message = "document_status_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getOverallStatusText($status);
-			$params['comment'] = $document->getComment();
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
-		}
-		
-		// TODO: if user os not owner send notification to owner
-
+		$sendnotification = true;
 	}
-}else{
-
+} else {
 	$docApprovalStatus = $content->getApprovalStatus();
 	if (is_bool($docApprovalStatus) && !$docApprovalStatus) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_retrieve_approval_snapshot"));
@@ -236,44 +173,37 @@ if ($_POST["approvalStatus"]==-1){
 		// Change the status to released.
 		$newStatus=S_RELEASED;
 		if($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
-			// Send notification to subscribers.
-			if($notifier) {
-				$nl=$document->getNotifyList();
-				$folder = $document->getFolder();
-/*
-				$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
-				$message = getMLText("document_status_changed_email")."\r\n";
-				$message .= 
-					getMLText("document").": ".$document->getName()."\r\n".
-					getMLText("status").": ".getOverallStatusText($newStatus)."\r\n".
-					getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
-					getMLText("comment").": ".$document->getComment()."\r\n".
-					"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
-
-*/
-				$subject = "document_status_changed_email_subject";
-				$message = "document_status_changed_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['status'] = getOverallStatusText($newStatus);
-				$params['comment'] = $document->getComment();
-				$params['username'] = $user->getFullName();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-
-				$notifier->toList($user, $nl["users"], $subject, $message, $params);
-				foreach ($nl["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
-				}
-			}
-			
-			// TODO: if user os not owner send notification to owner
+			$sendnotification = true;
 		}
 	}
 }
 
+if($sendnotification) {
+	// Send notification to subscribers.
+	if($notifier) {
+		$nl=$document->getNotifyList();
+		$folder = $document->getFolder();
+		$subject = "document_status_changed_email_subject";
+		$message = "document_status_changed_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getOverallStatusText($status);
+		$params['comment'] = $document->getComment();
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+
+		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
+		}
+	}
+	
+	// TODO: if user os not owner send notification to owner
+}
+
 header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
 
 ?>

From 062097a4382ce7c361aa30dd06b7218693367682 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:44:52 +0200
Subject: [PATCH 0131/2006] pass libraryfolder to view

---
 out/out.AddDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 069592e55..4793dd6b8 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -48,7 +48,7 @@ if($settings->_quota > 0) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList, 'orderby'=>$settings->_sortFoldersDefault));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'libraryfolder'=>$dms->getFolder($settings->_libraryFolder), 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList, 'orderby'=>$settings->_sortFoldersDefault));
 if($view) {
 	$view->show();
 	exit;

From 4e6081bacc3f90f5a6dccfcdd93176f03d2587ba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:45:34 +0200
Subject: [PATCH 0132/2006] fix wrong access on $settings

---
 out/out.SetReviewersApprovers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.SetReviewersApprovers.php b/out/out.SetReviewersApprovers.php
index 598be7a16..a9ee8a4fc 100644
--- a/out/out.SetReviewersApprovers.php
+++ b/out/out.SetReviewersApprovers.php
@@ -50,7 +50,7 @@ if (!is_object($content)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
 
-if(!$this->settings->_enableVersionModification) {
+if(!$settings->_enableVersionModification) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_version_modification"));
 }
 

From ed1db4599065ba95b05c9f783f321af15dd81055 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:45:57 +0200
Subject: [PATCH 0133/2006] pass checkoutDir to view

---
 out/out.ViewDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index cc13a5384..091c2b496 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -84,6 +84,7 @@ if($view) {
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('checkOutDir', $settings->_checkOutDir);
 	$view->show();
 	exit;
 }

From 13babfa3f9c13a254022b8e19d1a1aed9adf6472 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:46:25 +0200
Subject: [PATCH 0134/2006] add field for selecting a document from the library

---
 views/bootstrap/class.AddDocument.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 3cd74b1b7..b33edb532 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -41,6 +41,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style {
 		$enableselfrevapp = $this->params['enableselfrevapp'];
 		$strictformcheck = $this->params['strictformcheck'];
 		$dropfolderdir = $this->params['dropfolderdir'];
+		$libraryfolder = $this->params['libraryfolder'];
 		$workflowmode = $this->params['workflowmode'];
 		$presetexpiration = $this->params['presetexpiration'];
 		$sortusersinlist = $this->params['sortusersinlist'];
@@ -214,6 +215,12 @@ $(document).ready(function() {
 			<td><?php printMLText("dropfolder_file");?>:</td>
 			<td><?php $this->printDropFolderChooser("form1");?></td>
 		</tr>
+<?php } ?>
+<?php if($libraryfolder) { ?>
+		<tr>
+			<td><?php printMLText("librarydoc");?>:</td>
+			<td><?php $this->printDocumentChooser("form1", M_READ, -1, null, 'librarydoc', $libraryfolder, 1);?></td>
+		</tr>
 <?php } ?>
 		<tr>
 			<td><?php printMLText("comment_for_current_version");?>:</td>

From c48030d54e284fc9c4c3103520a70c22da3b7538 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:47:03 +0200
Subject: [PATCH 0135/2006] add more parameter to printDocumentChooser()

---
 views/bootstrap/class.Bootstrap.php | 41 ++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 941124760..8f9eb9857 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -903,14 +903,21 @@ $(document).ready(function () {
 		print "</select>";
 	} /* }}} */
 	
-	function printDocumentChooser($formName) { /* {{{ */
-		print "<input type=\"hidden\" id=\"docid".$formName."\" name=\"docid\" value=\"\">";
+	function printDocumentChooser($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
+		$formid = "docid".$form;
+		if(!$formname)
+			$formname = "docid";
+		if(!$folder)
+			$folderid = $this->params['rootfolderid'];
+		else
+			$folderid = $folder->getID();
+		print "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		print "<div class=\"input-append\">\n";
-		print "<input type=\"text\" id=\"choosedocsearch\" data-target=\"docid".$formName."\" data-provide=\"typeahead\" name=\"docname".$formName."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
-		print "<a data-target=\"#docChooser".$formName."\" href=\"out.DocumentChooser.php?form=".$formName."&folderid=".$this->params['rootfolderid']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…</a>\n";
+		print "<input type=\"text\" id=\"choosedocsearch\" data-target=\"docid".$form."\" data-provide=\"typeahead\" name=\"docname".$form."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
+		print "<a data-target=\"#docChooser".$form."\" href=\"out.DocumentChooser.php?form=".$form."&folderid=".$folderid."&partialtree=".$partialtree."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…</a>\n";
 		print "</div>\n";
 ?>
-<div class="modal hide" id="docChooser<?php echo $formName ?>" tabindex="-1" role="dialog" aria-labelledby="docChooserLabel" aria-hidden="true">
+<div class="modal hide" id="docChooser<?php echo $form ?>" tabindex="-1" role="dialog" aria-labelledby="docChooserLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="docChooserLabel"><?php printMLText("choose_target_document") ?></h3>
@@ -923,13 +930,13 @@ $(document).ready(function () {
   </div>
 </div>
 		<script language="JavaScript">
-modalDocChooser<?php echo $formName ?> = $('#docChooser<?php echo $formName ?>');
-function documentSelected<?php echo $formName ?>(id, name) {
-	$('#docid<?php echo $formName ?>').val(id);
+modalDocChooser<?php echo $form ?> = $('#docChooser<?php echo $form ?>');
+function documentSelected<?php echo $form ?>(id, name) {
+	$('#docid<?php echo $form ?>').val(id);
 	$('#choosedocsearch').val(name);
-	modalDocChooser<?php echo $formName ?>.modal('hide');
+	modalDocChooser<?php echo $form ?>.modal('hide');
 }
-function folderSelected<?php echo $formName ?>(id, name) {
+function folderSelected<?php echo $form ?>(id, name) {
 }
 		</script>
 <?php
@@ -1182,7 +1189,7 @@ function clearFilename<?php print $formName ?>() {
 	 * @param boolean $showdocs set to true if tree shall contain documents
 	 *   as well.
 	 */
-	function printNewTreeNavigation($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */
+	function printNewTreeNavigation($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='', $partialtree=false) { /* {{{ */
 		function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='') {
 			if($path || $expandtree) {
 				if($path)
@@ -1222,11 +1229,21 @@ function clearFilename<?php print $formName ?>() {
 		if($folderid) {
 			$folder = $this->params['dms']->getFolder($folderid);
 			$path = $folder->getPath();
-			$folder = array_shift($path);
+			if(!$partialtree) {
+				$folder = array_shift($path);
+			}
 			$node = array('label'=>$folder->getName(), 'id'=>$folder->getID(), 'load_on_demand'=>true, 'is_folder'=>true);
 			if(!$folder->hasSubFolders()) {
 				$node['load_on_demand'] = false;
 				$node['children'] = array();
+				if($showdocs) {
+					$documents = $folder->getDocuments($orderby);
+					$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
+					foreach($documents as $document) {
+						$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
+						$node['children'][] = $node2;
+					}
+				}
 			} else {
 				$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby);
 			}

From 5c94655bd7d9e944a58c4ef672c89d71db4bc3af Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:47:46 +0200
Subject: [PATCH 0136/2006] allow to show partial trees

---
 out/out.DocumentChooser.php               | 7 ++++++-
 views/bootstrap/class.DocumentChooser.php | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/out/out.DocumentChooser.php b/out/out.DocumentChooser.php
index 95ab432de..7e06d982d 100644
--- a/out/out.DocumentChooser.php
+++ b/out/out.DocumentChooser.php
@@ -29,10 +29,15 @@ include("../inc/inc.Authentication.php");
 $folderid = intval($_GET["folderid"]);
 $form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]);
 
+if(isset($_GET['partialtree'])) {
+	$partialtree = intval($_GET['partialtree']);
+} else {
+	$partialtree = 0;
+}
 $folder = $dms->getFolder($folderid);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'form'=>$form));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'form'=>$form, 'partialtree'=>$partialtree));
 if($view) {
 	$view->show();
 	exit;
diff --git a/views/bootstrap/class.DocumentChooser.php b/views/bootstrap/class.DocumentChooser.php
index 71e71a8db..6edc3e9a5 100644
--- a/views/bootstrap/class.DocumentChooser.php
+++ b/views/bootstrap/class.DocumentChooser.php
@@ -36,10 +36,11 @@ class SeedDMS_View_DocumentChooser extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$form = $this->params['form'];
+		$partialtree = $this->params['partialtree'];
 
 		$this->htmlStartPage(getMLText("choose_target_document"));
 		$this->contentContainerStart();
-		$this->printNewTreeNavigation($folder->getID(), M_READ, 1, $form);
+		$this->printNewTreeNavigation($folder->getID(), M_READ, 1, $form, 0, '', $partialtree);
 		$this->contentContainerEnd();
 		echo "</body>\n</html>\n";
 	} /* }}} */

From d5e9c7532a30d9facd294d4439cfd842f20baee5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 May 2015 20:48:27 +0200
Subject: [PATCH 0137/2006] fix error in calling hook
 showDocumentContentAttribute, show if document was checked out

---
 views/bootstrap/class.ViewDocument.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 27143b6a5..9848f9e02 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -210,6 +210,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$cachedir = $this->params['cachedir'];
 		$previewwidthlist = $this->params['previewWidthList'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
+		$checkoutdir = $this->params['checkOutDir'];
 		$documentid = $document->getId();
 
 		$versions = $document->getContent();
@@ -272,6 +273,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <div class="span3">
 <?php
 		$this->contentHeading(getMLText("document_infos"));
+		if($document->isCheckedOut()) {
+			echo "<div class=\"alert alert-info\">";
+			$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
+			echo "<a href=\"file://".$checkoutpath.urldecode($latestContent->getOriginalFileName())."\">".getMLText('copied_to_checkout_as', array('filename'=>$latestContent->getOriginalFileName()))."</a>";
+			echo "</div>";
+		}
 		$this->contentContainerStart();
 		$txt = $this->callHook('documentInfos', $document);
 		if(is_string($txt))
@@ -501,7 +508,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$attributes = $latestContent->getAttributes();
 		if($attributes) {
 			foreach($attributes as $attribute) {
-				$arr = $this->callHook('showDocumentContentAttribute', $latestcontent, $attribute);
+				$arr = $this->callHook('showDocumentContentAttribute', $latestContent, $attribute);
 				if(is_array($arr)) {
 					print "<li>".$arr[0].": ".$arr[1]."</li>\n";
 				} else {

From 570e0fa7821271e132e7a88e94ead2417c24811b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 30 May 2015 07:32:36 +0200
Subject: [PATCH 0138/2006] some code reorganisation

---
 op/op.ApproveDocument.php | 84 ++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 49 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 04296e5c6..fcf60f0c2 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -74,6 +74,7 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
+$olddocstatus = $content->getStatus();
 // verify if document has expired
 if ($document->hasExpired()){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
@@ -84,6 +85,7 @@ if (!isset($_POST["approvalStatus"]) || !is_numeric($_POST["approvalStatus"]) ||
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_approval_status"));
 }
 
+
 $controller->setParam('document', $document);
 $controller->setParam('content', $latestContent);
 $controller->setParam('approvalstatus', $_POST["approvalStatus"]);
@@ -99,20 +101,39 @@ if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
 
-/*
-if ($_POST["approvalType"] == "ind") {
-	$comment = $_POST["comment"];
-	if(0 > $latestContent->setApprovalByInd($user, $user, $_POST["approvalStatus"], $comment)) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approval_update_failed"));
+//
+// Check to see if the overall status for the document version needs to be
+// updated.
+//
+
+/* If document was rejected, set the document status to S_REJECTED right away */
+if ($_POST["approvalStatus"]==-1){
+	if($content->setStatus(S_REJECTED,$comment,$user)) {
 	}
-} elseif ($_POST["approvalType"] == "grp") {
-	$comment = $_POST["comment"];
-	$group = $dms->getGroup($_POST['approvalGroup']);
-	if(0 > $latestContent->setApprovalByGrp($group, $user, $_POST["approvalStatus"], $comment)) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approval_update_failed"));
+} else {
+	$docApprovalStatus = $content->getApprovalStatus();
+	if (is_bool($docApprovalStatus) && !$docApprovalStatus) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_retrieve_approval_snapshot"));
+	}
+	$approvalCT = 0;
+	$approvalTotal = 0;
+	foreach ($docApprovalStatus as $drstat) {
+		if ($drstat["status"] == 1) {
+			$approvalCT++;
+		}
+		if ($drstat["status"] != -2) {
+			$approvalTotal++;
+		}
+	}
+	// If all approvals have been received and there are no rejections, retrieve a
+	// count of the approvals required for this document.
+	if ($approvalCT == $approvalTotal) {
+		// Change the status to released.
+		$newStatus=S_RELEASED;
+		if($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
+		}
 	}
 }
- */
 
 if ($_POST["approvalType"] == "ind" || $_POST["approvalType"] == "grp") {
 	// Send an email notification to the document updater.
@@ -141,44 +162,9 @@ if ($_POST["approvalType"] == "ind" || $_POST["approvalType"] == "grp") {
 	}
 }
 
-//
-// Check to see if the overall status for the document version needs to be
-// updated.
-//
-
-$sendnotification = false;
-/* If document was rejected, set the document status to S_REJECTED right away */
-if ($_POST["approvalStatus"]==-1){
-	if($content->setStatus(S_REJECTED,$comment,$user)) {
-		$sendnotification = true;
-	}
-} else {
-	$docApprovalStatus = $content->getApprovalStatus();
-	if (is_bool($docApprovalStatus) && !$docApprovalStatus) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_retrieve_approval_snapshot"));
-	}
-	$approvalCT = 0;
-	$approvalTotal = 0;
-	foreach ($docApprovalStatus as $drstat) {
-		if ($drstat["status"] == 1) {
-			$approvalCT++;
-		}
-		if ($drstat["status"] != -2) {
-			$approvalTotal++;
-		}
-	}
-	// If all approvals have been received and there are no rejections, retrieve a
-	// count of the approvals required for this document.
-	if ($approvalCT == $approvalTotal) {
-		// Change the status to released.
-		$newStatus=S_RELEASED;
-		if($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
-			$sendnotification = true;
-		}
-	}
-}
-
-if($sendnotification) {
+/* Send notification about status change only if status has actually changed */
+$newdocstatus = $content->getStatus();
+if($olddocstatus['status'] != $newdocstatus['status']) {
 	// Send notification to subscribers.
 	if($notifier) {
 		$nl=$document->getNotifyList();

From bcebca9c9725f2bf4401d8406f9ac0f160a57247 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 30 May 2015 07:33:28 +0200
Subject: [PATCH 0139/2006] unset $this->_status in
 SeedDMS_Core_DocumentContent::setStatus()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index dfccbab45..07a608ef6 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2788,6 +2788,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($res) && !$res)
 			return false;
 
+		unset($this->_status);
 		return true;
 	} /* }}} */
 

From 19b9888d347335e339b38b400e89c0899aaaa173 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 07:16:21 +0200
Subject: [PATCH 0140/2006] place business logic into controller

---
 controllers/class.ReviewDocument.php | 128 +++++++++++
 op/op.ReviewDocument.php             | 331 +++++++--------------------
 2 files changed, 207 insertions(+), 252 deletions(-)
 create mode 100644 controllers/class.ReviewDocument.php

diff --git a/controllers/class.ReviewDocument.php b/controllers/class.ReviewDocument.php
new file mode 100644
index 000000000..aec1e7667
--- /dev/null
+++ b/controllers/class.ReviewDocument.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Implementation of ReviewDocument controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for downloading a document
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_ReviewDocument extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$document = $this->params['document'];
+		$content = $this->params['content'];
+		$reviewstatus = $this->params['reviewstatus'];
+		$reviewtype = $this->params['reviewtype'];
+		$group = $this->params['group'];
+		$comment = $this->params['comment'];
+
+		/* Get the document id and name before removing the document */
+		$docname = $document->getName();
+		$documentid = $document->getID();
+
+		if(!$this->callHook('preReviewDocument', $document)) {
+		}
+
+		$result = $this->callHook('reviewDocument', $document);
+		if($result === null) {
+
+			if ($reviewtype == "ind") {
+				if(0 > $content->setReviewByInd($user, $user, $reviewstatus, $comment)) {
+					$this->error = 1;
+					$this->errormsg = "review_update_failed";
+					return false;
+				}
+			} elseif ($reviewtype == "grp") {
+				if(0 > $content->setReviewByGrp($group, $user, $reviewstatus, $comment)) {
+					$this->error = 1;
+					$this->errormsg = "review_update_failed";
+					return false;
+				}
+			}
+		}
+
+		/* Check to see if the overall status for the document version needs to be
+		 * updated.
+		 */
+		$result = $this->callHook('reviewUpdateDocumentStatus', $document);
+		if($result === null) {
+			if ($reviewstatus == -1){
+				if($content->setStatus(S_REJECTED,$comment,$user)) {
+				}
+			} else {
+				$docReviewStatus = $content->getReviewStatus();
+				if (is_bool($docReviewStatus) && !$docReviewStatus) {
+					$this->error = 1;
+					$this->errormsg = "cannot_retrieve_review_snapshot";
+					return false;
+				}
+				$reviewCT = 0;
+				$reviewTotal = 0;
+				foreach ($docReviewStatus as $drstat) {
+					if ($drstat["status"] == 1) {
+						$reviewCT++;
+					}
+					if ($drstat["status"] != -2) {
+						$reviewTotal++;
+					}
+				}
+				// If all reviews have been received and there are no rejections, retrieve a
+				// count of the approvals required for this document.
+				if ($reviewCT == $reviewTotal) {
+					$docApprovalStatus = $content->getApprovalStatus();
+					if (is_bool($docApprovalStatus) && !$docApprovalStatus) {
+						$this->error = 1;
+						$this->errormsg = "cannot_retrieve_approval_snapshot";
+						return false;
+					}
+					$approvalCT = 0;
+					$approvalTotal = 0;
+					foreach ($docApprovalStatus as $dastat) {
+						if ($dastat["status"] == 1) {
+							$approvalCT++;
+						}
+						if ($dastat["status"] != -2) {
+							$approvalTotal++;
+						}
+					}
+					// If the approvals received is less than the approvals total, then
+					// change status to pending approval.
+					if ($approvalCT<$approvalTotal) {
+						$newStatus=S_DRAFT_APP;
+					}
+					else {
+						// Otherwise, change the status to released.
+						$newStatus=S_RELEASED;
+					}
+					if ($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
+						// Send notification to subscribers.
+
+					}
+				}
+			}
+		}
+
+		if(!$this->callHook('postReviewDocument', $document)) {
+		}
+
+		return true;
+	}
+}
+
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index c7a93cb4b..cd9849be2 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -28,6 +28,10 @@ include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('reviewdocument')) {
@@ -45,6 +49,8 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+$folder = $document->getFolder();
+
 if ($document->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
@@ -66,6 +72,7 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
+$olddocstatus = $content->getStatus();
 // verify if document has expired
 if ($document->hasExpired()){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
@@ -76,271 +83,91 @@ if (!isset($_POST["reviewStatus"]) || !is_numeric($_POST["reviewStatus"]) ||
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_review_status"));
 }
 
-if ($_POST["reviewType"] == "ind") {
-
-	$comment = $_POST["comment"];
-	$reviewLogID = $latestContent->setReviewByInd($user, $user, $_POST["reviewStatus"], $comment);
-	if(0 > $reviewLogID) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("review_update_failed"));
-	}
-	else {
-		// Send an email notification to the document updater.
-		if($notifier) {
-			$nl=$document->getNotifyList();
-			$folder = $document->getFolder();
-/*
-			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
-			$message = getMLText("review_submit_email")."\r\n";
-			$message .= 
-				getMLText("name").": ".$document->getName()."\r\n".
-				getMLText("version").": ".$version."\r\n".
-				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-				getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n".
-				getMLText("comment").": ".$comment."\r\n".
-				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
-
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message);
-
-			// Send notification to subscribers.
-			$notifier->toList($user, $nl["users"], $subject, $message);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message);
-			}
-*/
-
-			$subject = "review_submit_email_subject";
-			$message = "review_submit_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['version'] = $version;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getReviewStatusText($_POST["reviewStatus"]);
-			$params['comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
-		}
-	}
-}
-else if ($_POST["reviewType"] == "grp") {
-	$comment = $_POST["comment"];
+$controller->setParam('document', $document);
+$controller->setParam('content', $latestContent);
+$controller->setParam('reviewstatus', $_POST["reviewStatus"]);
+$controller->setParam('reviewtype', $_POST["reviewType"]);
+if ($_POST["reviewType"] == "grp") {
 	$group = $dms->getGroup($_POST['reviewGroup']);
-	$reviewLogID = $latestContent->setReviewByGrp($group, $user, $_POST["reviewStatus"], $comment);
-	if(0 > $reviewLogID) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("review_update_failed"));
-	}
-	else {
-		// Send an email notification to the document updater.
-		if($notifier) {
-			$nl=$document->getNotifyList();
-			$folder = $document->getFolder();
-/*
-			$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("review_submit_email");
-			$message = getMLText("review_submit_email")."\r\n";
-			$message .= 
-				getMLText("name").": ".$document->getName()."\r\n".
-				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-				getMLText("version").": ".$version."\r\n".
-				getMLText("status").": ".getReviewStatusText($_POST["reviewStatus"])."\r\n".
-				getMLText("comment").": ".$comment."\r\n".
-				"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."\r\n";
+} else {
+	$group = null;
+}
+$controller->setParam('group', $group);
+$controller->setParam('comment', $_POST["comment"]);
+if(!$controller->run()) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
+}
 
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message);
-
-			// Send notification to subscribers.
-			$notifier->toList($user, $nl["users"], $subject, $message);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message);
-			}
-*/
-			$subject = "review_submit_email_subject";
-			$message = "review_submit_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['version'] = $version;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getReviewStatusText($_POST["reviewStatus"]);
-			$params['comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+if ($_POST["reviewType"] == "ind" || $_POST["reviewType"] == "grp") {
+	if($notifier) {
+		$nl=$document->getNotifyList();
+		$subject = "review_submit_email_subject";
+		$message = "review_submit_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['version'] = $version;
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getReviewStatusText($_POST["reviewStatus"]);
+		$params['comment'] = $comment;
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
 		}
+		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
 	}
 }
 
-//
-// Check to see if the overall status for the document version needs to be
-// updated.
-//
-
-if ($_POST["reviewStatus"]==-1){
-
-	if($content->setStatus(S_REJECTED,$comment,$user)) {
-		// Send notification to subscribers.
-		if($notifier) {
-			$nl=$document->getNotifyList();
-			$folder = $document->getFolder();
-/*
-			$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
-			$message = getMLText("document_status_changed_email")."\r\n";
-			$message .= 
-				getMLText("document").": ".$document->getName()."\r\n".
-				getMLText("status").": ".getOverallStatusText(S_REJECTED)."\r\n".
-				getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
-				getMLText("comment").": ".$document->getComment()."\r\n".
-				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
-
-			$notifier->toList($user, $nl["users"], $subject, $message);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message);
-			}
-*/
-			$subject = "document_status_changed_email_subject";
-			$message = "document_status_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getReviewStatusText(S_REJECTED);
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+/* Send notification about status change only if status has actually changed */
+$newdocstatus = $content->getStatus();
+if($olddocstatus['status'] != $newdocstatus['status']) {
+	// Send notification to subscribers.
+	if($notifier) {
+		$nl=$document->getNotifyList();
+		$subject = "document_status_changed_email_subject";
+		$message = "document_status_changed_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getReviewStatusText(S_REJECTED);
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
 		}
+		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
 	}
+}
 
-}else{
+// Notify approvers, if necessary.
+if ($newStatus == S_DRAFT_APP) {
+	$requestUser = $document->getOwner();
 
-	$docReviewStatus = $content->getReviewStatus();
-	if (is_bool($docReviewStatus) && !$docReviewStatus) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_retrieve_review_snapshot"));
-	}
-	$reviewCT = 0;
-	$reviewTotal = 0;
-	foreach ($docReviewStatus as $drstat) {
-		if ($drstat["status"] == 1) {
-			$reviewCT++;
-		}
-		if ($drstat["status"] != -2) {
-			$reviewTotal++;
-		}
-	}
-	// If all reviews have been received and there are no rejections, retrieve a
-	// count of the approvals required for this document.
-	if ($reviewCT == $reviewTotal) {
-		$docApprovalStatus = $content->getApprovalStatus();
-		if (is_bool($docApprovalStatus) && !$docApprovalStatus) {
-			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_retrieve_approval_snapshot"));
-		}
-		$approvalCT = 0;
-		$approvalTotal = 0;
+	if($notifier) {
+		$subject = "approval_request_email_subject";
+		$message = "approval_request_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['version'] = $version;
+		$params['username'] = $user->getFullName();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
 		foreach ($docApprovalStatus as $dastat) {
-			if ($dastat["status"] == 1) {
-				$approvalCT++;
-			}
-			if ($dastat["status"] != -2) {
-				$approvalTotal++;
-			}
-		}
-		// If the approvals received is less than the approvals total, then
-		// change status to pending approval.
-		if ($approvalCT<$approvalTotal) {
-			$newStatus=S_DRAFT_APP;
-		}
-		else {
-			// Otherwise, change the status to released.
-			$newStatus=S_RELEASED;
-		}
-		if ($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
-			// Send notification to subscribers.
-			if($notifier) {
-				$nl=$document->getNotifyList();
-				$folder = $document->getFolder();
-/*
-				$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_status_changed_email");
-				$message = getMLText("document_status_changed_email")."\r\n";
-				$message .= 
-					getMLText("document").": ".$document->getName()."\r\n".
-					getMLText("status").": ".getOverallStatusText($newStatus)."\r\n".
-					getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
-					"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$content->_version."\r\n";
+		
+			if ($dastat["status"] == 0) {
+				if ($dastat["type"] == 0) {
 
-//				$subject=mydmsDecodeString($subject);
-//				$message=mydmsDecodeString($message);
+					$approver = $dms->getUser($dastat["required"]);
+					$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
+				} elseif ($dastat["type"] == 1) {
 				
-				$notifier->toList($user, $nl["users"], $subject, $message);
-				foreach ($nl["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message);
-				}
-*/
-				$subject = "document_status_changed_email_subject";
-				$message = "document_status_changed_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['status'] = getReviewStatusText($newStatus);
-				$params['username'] = $user->getFullName();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-				$notifier->toList($user, $nl["users"], $subject, $message, $params);
-				foreach ($nl["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
-				}
-			}
-			
-			// TODO: if user os not owner send notification to owner
-
-			// Notify approvers, if necessary.
-			if ($newStatus == S_DRAFT_APP) {
-				$requestUser = $document->getOwner();
-
-				if($notifier) {
-/*
-					$subject = $settings->_siteName.": ".$document->getName().", v.".$version." - ".getMLText("approval_request_email");
-					$message = getMLText("approval_request_email")."\r\n";
-					$message .= 
-						getMLText("name").": ".$content->getOriginalFileName()."\r\n".
-						getMLText("version").": ".$version."\r\n".
-						getMLText("comment").": ".$content->getComment()."\r\n".
-						"URL: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$documentid."&version=".$version."\r\n";
-*/
-					$subject = "approval_request_email_subject";
-					$message = "approval_request_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $version;
-					$params['username'] = $user->getFullName();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-					foreach ($docApprovalStatus as $dastat) {
-					
-						if ($dastat["status"] == 0) {
-							if ($dastat["type"] == 0) {
-	
-								$approver = $dms->getUser($dastat["required"]);
-								$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
-							} elseif ($dastat["type"] == 1) {
-							
-								$group = $dms->getGroup($dastat["required"]);
-								$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);
-							}
-						}
-					}
+					$group = $dms->getGroup($dastat["required"]);
+					$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);
 				}
 			}
 		}

From 5246c3a329aee4589bc0eb3fc80b503777037d41 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 07:21:16 +0200
Subject: [PATCH 0141/2006] place code for updating document content into
 controller

---
 controllers/class.ApproveDocument.php | 40 ++++++++++++++++++++++++++-
 op/op.ApproveDocument.php             | 36 ------------------------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/controllers/class.ApproveDocument.php b/controllers/class.ApproveDocument.php
index 7e7410521..c101ba9c6 100644
--- a/controllers/class.ApproveDocument.php
+++ b/controllers/class.ApproveDocument.php
@@ -55,10 +55,48 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
 					return false;
 				}
 			}
-			if(!$this->callHook('postApproveDocument', $document)) {
+		}
+
+		/* Check to see if the overall status for the document version needs to be
+		 * updated.
+		 */
+		$result = $this->callHook('approveUpdateDocumentStatus', $document);
+		if($result === null) {
+			/* If document was rejected, set the document status to S_REJECTED right away */
+			if ($approvalstatus == -1){
+				if($content->setStatus(S_REJECTED,$comment,$user)) {
+				}
+			} else {
+				$docApprovalStatus = $content->getApprovalStatus();
+				if (is_bool($docApprovalStatus) && !$docApprovalStatus) {
+					$this->error = 1;
+					$this->errormsg = "cannot_retrieve_approval_snapshot";
+					return false;
+				}
+				$approvalCT = 0;
+				$approvalTotal = 0;
+				foreach ($docApprovalStatus as $drstat) {
+					if ($drstat["status"] == 1) {
+						$approvalCT++;
+					}
+					if ($drstat["status"] != -2) {
+						$approvalTotal++;
+					}
+				}
+				// If all approvals have been received and there are no rejections, retrieve a
+				// count of the approvals required for this document.
+				if ($approvalCT == $approvalTotal) {
+					// Change the status to released.
+					$newStatus=S_RELEASED;
+					if($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
+					}
+				}
 			}
 		}
 
+		if(!$this->callHook('postApproveDocument', $document)) {
+		}
+
 		return true;
 	}
 }
diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index fcf60f0c2..c77da0389 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -51,7 +51,6 @@ if (!is_object($document)) {
 }
 
 $folder = $document->getFolder();
-$docPathHTML = getFolderPathHTML($folder, true). " / <a href=\"../out/out.ViewDocument.php?documentid=".$documentid."\">".$document->getName()."</a>";
 
 if ($document->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
@@ -85,7 +84,6 @@ if (!isset($_POST["approvalStatus"]) || !is_numeric($_POST["approvalStatus"]) ||
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_approval_status"));
 }
 
-
 $controller->setParam('document', $document);
 $controller->setParam('content', $latestContent);
 $controller->setParam('approvalstatus', $_POST["approvalStatus"]);
@@ -101,40 +99,6 @@ if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
 
-//
-// Check to see if the overall status for the document version needs to be
-// updated.
-//
-
-/* If document was rejected, set the document status to S_REJECTED right away */
-if ($_POST["approvalStatus"]==-1){
-	if($content->setStatus(S_REJECTED,$comment,$user)) {
-	}
-} else {
-	$docApprovalStatus = $content->getApprovalStatus();
-	if (is_bool($docApprovalStatus) && !$docApprovalStatus) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_retrieve_approval_snapshot"));
-	}
-	$approvalCT = 0;
-	$approvalTotal = 0;
-	foreach ($docApprovalStatus as $drstat) {
-		if ($drstat["status"] == 1) {
-			$approvalCT++;
-		}
-		if ($drstat["status"] != -2) {
-			$approvalTotal++;
-		}
-	}
-	// If all approvals have been received and there are no rejections, retrieve a
-	// count of the approvals required for this document.
-	if ($approvalCT == $approvalTotal) {
-		// Change the status to released.
-		$newStatus=S_RELEASED;
-		if($content->setStatus($newStatus, getMLText("automatic_status_update"), $user)) {
-		}
-	}
-}
-
 if ($_POST["approvalType"] == "ind" || $_POST["approvalType"] == "grp") {
 	// Send an email notification to the document updater.
 	if($notifier) {

From bcff8431867423d2baf04df6ca4f2626d77e3eef Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 07:36:14 +0200
Subject: [PATCH 0142/2006] set comment in notification mail

---
 op/op.ApproveDocument.php | 2 +-
 op/op.ReviewDocument.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index c77da0389..989b9d97f 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -109,7 +109,7 @@ if ($_POST["approvalType"] == "ind" || $_POST["approvalType"] == "grp") {
 		$params['version'] = $version;
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['status'] = getApprovalStatusText($_POST["approvalStatus"]);
-		$params['comment'] = $_POST['comment'];
+		$params['comment'] = strip_tags($_POST['comment']);
 		$params['username'] = $user->getFullName();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index cd9849be2..84054723e 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -108,7 +108,7 @@ if ($_POST["reviewType"] == "ind" || $_POST["reviewType"] == "grp") {
 		$params['version'] = $version;
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['status'] = getReviewStatusText($_POST["reviewStatus"]);
-		$params['comment'] = $comment;
+		$params['comment'] = strip_tags($_POST['comment']);
 		$params['username'] = $user->getFullName();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;

From c2e49aa2d78de95e52e1e72d4601a7d588457657 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 07:40:02 +0200
Subject: [PATCH 0143/2006] take out old code

---
 inc/inc.ClassEmail.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/inc/inc.ClassEmail.php b/inc/inc.ClassEmail.php
index a85d937b7..e8634a123 100644
--- a/inc/inc.ClassEmail.php
+++ b/inc/inc.ClassEmail.php
@@ -114,23 +114,6 @@ class SeedDMS_Email extends SeedDMS_Notify {
 			return true;
 		}
 
-/*
-		$headers   = array();
-		$headers[] = "MIME-Version: 1.0";
-		$headers[] = "Content-type: text/plain; charset=utf-8";
-		//$headers[] = "From: ". $sender->getFullName() ." <". $sender->getEmail() .">";
-		$headers[] = "From: ". $settings->_smtpSendFrom;
-		$headers[] = "Reply-To: ". $sender->getFullName() ." <". $sender->getEmail() .">";
-
-		$lang = $recipient->getLanguage();
-		$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
-		$message .= "\r\n\r\n".getMLText("email_footer", array(), "", $lang);
-
-		$subject = "=?UTF-8?B?".base64_encode(getMLText($subject, $params, "", $lang))."?=";
-		mail($recipient->getEmail(), $subject, $message, implode("\r\n", $headers));
-
-		return true;
-*/
 	} /* }}} */
 
 	function toGroup($sender, $groupRecipient, $subject, $message, $params=array()) { /* {{{ */

From 175485284dbb9cf1033fb4c08380e7ee2dd334d2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 07:41:46 +0200
Subject: [PATCH 0144/2006] take out old blue theme

---
 views/blue/class.AddDocument.php           |  287 ------
 views/blue/class.AddEvent.php              |   93 --
 views/blue/class.AddFile.php               |  107 --
 views/blue/class.AddFile2.php              |   53 -
 views/blue/class.AddMultiDocument.php      |   69 --
 views/blue/class.AddSubFolder.php          |  108 --
 views/blue/class.AdminTools.php            |   74 --
 views/blue/class.ApprovalSummary.php       |  197 ----
 views/blue/class.ApproveDocument.php       |  182 ----
 views/blue/class.AttributeMgr.php          |  255 -----
 views/blue/class.BackupTools.php           |  195 ----
 views/blue/class.BlueStyle.php             | 1071 --------------------
 views/blue/class.Calendar.php              |  335 ------
 views/blue/class.Categories.php            |  152 ---
 views/blue/class.CategoryChooser.php       |   97 --
 views/blue/class.ChangePassword.php        |   74 --
 views/blue/class.CreateIndex.php           |   49 -
 views/blue/class.DefaultKeywords.php       |  200 ----
 views/blue/class.DocumentAccess.php        |  283 ------
 views/blue/class.DocumentChooser.php       |  136 ---
 views/blue/class.DocumentNotify.php        |  154 ---
 views/blue/class.DocumentVersionDetail.php |  260 -----
 views/blue/class.DropFolderChooser.php     |   75 --
 views/blue/class.EditAttributes.php        |   76 --
 views/blue/class.EditComment.php           |   90 --
 views/blue/class.EditDocument.php          |  132 ---
 views/blue/class.EditEvent.php             |  101 --
 views/blue/class.EditFolder.php            |  116 ---
 views/blue/class.EditUserData.php          |  153 ---
 views/blue/class.ErrorDlg.php              |   38 -
 views/blue/class.FolderAccess.php          |  275 -----
 views/blue/class.FolderChooser.php         |   82 --
 views/blue/class.FolderNotify.php          |  171 ----
 views/blue/class.ForcePasswordChange.php   |   78 --
 views/blue/class.GroupMgr.php              |  243 -----
 views/blue/class.GroupView.php             |  103 --
 views/blue/class.Help.php                  |   50 -
 views/blue/class.IndexInfo.php             |   68 --
 views/blue/class.Indexer.php               |   97 --
 views/blue/class.Info.php                  |   45 -
 views/blue/class.KeywordChooser.php        |  220 ----
 views/blue/class.LogManagement.php         |  113 ---
 views/blue/class.Login.php                 |  137 ---
 views/blue/class.ManageNotify.php          |  195 ----
 views/blue/class.MoveDocument.php          |   63 --
 views/blue/class.MoveFolder.php            |   66 --
 views/blue/class.MyAccount.php             |   89 --
 views/blue/class.MyDocuments.php           |  489 ---------
 views/blue/class.ObjectCheck.php           |  216 ----
 views/blue/class.OverrideContentStatus.php |   99 --
 views/blue/class.PasswordForgotten.php     |   71 --
 views/blue/class.RemoveArchive.php         |   57 --
 views/blue/class.RemoveDocument.php        |   60 --
 views/blue/class.RemoveDocumentFile.php    |   60 --
 views/blue/class.RemoveDump.php            |   56 -
 views/blue/class.RemoveEvent.php           |   58 --
 views/blue/class.RemoveFolder.php          |   59 --
 views/blue/class.RemoveFolderFiles.php     |   57 --
 views/blue/class.RemoveGroup.php           |   60 --
 views/blue/class.RemoveLog.php             |   61 --
 views/blue/class.RemoveUser.php            |   78 --
 views/blue/class.RemoveVersion.php         |   59 --
 views/blue/class.ReviewDocument.php        |  178 ----
 views/blue/class.ReviewSummary.php         |   44 -
 views/blue/class.Search.php                |  173 ----
 views/blue/class.SearchForm.php            |  271 -----
 views/blue/class.SearchFulltext.php        |  133 ---
 views/blue/class.SetExpires.php            |   70 --
 views/blue/class.SetReviewersApprovers.php |  245 -----
 views/blue/class.Settings.php              |  523 ----------
 views/blue/class.Statistic.php             |  232 -----
 views/blue/class.UpdateDocument.php        |  251 -----
 views/blue/class.UpdateDocument2.php       |   81 --
 views/blue/class.UserDefaultKeywords.php   |  178 ----
 views/blue/class.UserImage.php             |   38 -
 views/blue/class.UserList.php              |  106 --
 views/blue/class.UsrMgr.php                |  423 --------
 views/blue/class.UsrView.php               |   86 --
 views/blue/class.ViewDocument.php          |  547 ----------
 views/blue/class.ViewEvent.php             |  100 --
 views/blue/class.ViewFolder.php            |  161 ---
 81 files changed, 12687 deletions(-)
 delete mode 100644 views/blue/class.AddDocument.php
 delete mode 100644 views/blue/class.AddEvent.php
 delete mode 100644 views/blue/class.AddFile.php
 delete mode 100644 views/blue/class.AddFile2.php
 delete mode 100644 views/blue/class.AddMultiDocument.php
 delete mode 100644 views/blue/class.AddSubFolder.php
 delete mode 100644 views/blue/class.AdminTools.php
 delete mode 100644 views/blue/class.ApprovalSummary.php
 delete mode 100644 views/blue/class.ApproveDocument.php
 delete mode 100644 views/blue/class.AttributeMgr.php
 delete mode 100644 views/blue/class.BackupTools.php
 delete mode 100644 views/blue/class.BlueStyle.php
 delete mode 100644 views/blue/class.Calendar.php
 delete mode 100644 views/blue/class.Categories.php
 delete mode 100644 views/blue/class.CategoryChooser.php
 delete mode 100644 views/blue/class.ChangePassword.php
 delete mode 100644 views/blue/class.CreateIndex.php
 delete mode 100644 views/blue/class.DefaultKeywords.php
 delete mode 100644 views/blue/class.DocumentAccess.php
 delete mode 100644 views/blue/class.DocumentChooser.php
 delete mode 100644 views/blue/class.DocumentNotify.php
 delete mode 100644 views/blue/class.DocumentVersionDetail.php
 delete mode 100644 views/blue/class.DropFolderChooser.php
 delete mode 100644 views/blue/class.EditAttributes.php
 delete mode 100644 views/blue/class.EditComment.php
 delete mode 100644 views/blue/class.EditDocument.php
 delete mode 100644 views/blue/class.EditEvent.php
 delete mode 100644 views/blue/class.EditFolder.php
 delete mode 100644 views/blue/class.EditUserData.php
 delete mode 100644 views/blue/class.ErrorDlg.php
 delete mode 100644 views/blue/class.FolderAccess.php
 delete mode 100644 views/blue/class.FolderChooser.php
 delete mode 100644 views/blue/class.FolderNotify.php
 delete mode 100644 views/blue/class.ForcePasswordChange.php
 delete mode 100644 views/blue/class.GroupMgr.php
 delete mode 100644 views/blue/class.GroupView.php
 delete mode 100644 views/blue/class.Help.php
 delete mode 100644 views/blue/class.IndexInfo.php
 delete mode 100644 views/blue/class.Indexer.php
 delete mode 100644 views/blue/class.Info.php
 delete mode 100644 views/blue/class.KeywordChooser.php
 delete mode 100644 views/blue/class.LogManagement.php
 delete mode 100644 views/blue/class.Login.php
 delete mode 100644 views/blue/class.ManageNotify.php
 delete mode 100644 views/blue/class.MoveDocument.php
 delete mode 100644 views/blue/class.MoveFolder.php
 delete mode 100644 views/blue/class.MyAccount.php
 delete mode 100644 views/blue/class.MyDocuments.php
 delete mode 100644 views/blue/class.ObjectCheck.php
 delete mode 100644 views/blue/class.OverrideContentStatus.php
 delete mode 100644 views/blue/class.PasswordForgotten.php
 delete mode 100644 views/blue/class.RemoveArchive.php
 delete mode 100644 views/blue/class.RemoveDocument.php
 delete mode 100644 views/blue/class.RemoveDocumentFile.php
 delete mode 100644 views/blue/class.RemoveDump.php
 delete mode 100644 views/blue/class.RemoveEvent.php
 delete mode 100644 views/blue/class.RemoveFolder.php
 delete mode 100644 views/blue/class.RemoveFolderFiles.php
 delete mode 100644 views/blue/class.RemoveGroup.php
 delete mode 100644 views/blue/class.RemoveLog.php
 delete mode 100644 views/blue/class.RemoveUser.php
 delete mode 100644 views/blue/class.RemoveVersion.php
 delete mode 100644 views/blue/class.ReviewDocument.php
 delete mode 100644 views/blue/class.ReviewSummary.php
 delete mode 100644 views/blue/class.Search.php
 delete mode 100644 views/blue/class.SearchForm.php
 delete mode 100644 views/blue/class.SearchFulltext.php
 delete mode 100644 views/blue/class.SetExpires.php
 delete mode 100644 views/blue/class.SetReviewersApprovers.php
 delete mode 100644 views/blue/class.Settings.php
 delete mode 100644 views/blue/class.Statistic.php
 delete mode 100644 views/blue/class.UpdateDocument.php
 delete mode 100644 views/blue/class.UpdateDocument2.php
 delete mode 100644 views/blue/class.UserDefaultKeywords.php
 delete mode 100644 views/blue/class.UserImage.php
 delete mode 100644 views/blue/class.UserList.php
 delete mode 100644 views/blue/class.UsrMgr.php
 delete mode 100644 views/blue/class.UsrView.php
 delete mode 100644 views/blue/class.ViewDocument.php
 delete mode 100644 views/blue/class.ViewEvent.php
 delete mode 100644 views/blue/class.ViewFolder.php

diff --git a/views/blue/class.AddDocument.php b/views/blue/class.AddDocument.php
deleted file mode 100644
index b17be9dc6..000000000
--- a/views/blue/class.AddDocument.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-/**
- * Implementation of AddDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for AddDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_AddDocument extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$enablelargefileupload = $this->params['enablelargefileupload'];
-		$enableadminrevapp = $this->params['enableadminrevapp'];
-		$enableownerrevapp = $this->params['enableownerrevapp'];
-		$enableselfrevapp = $this->params['enableselfrevapp'];
-		$strictformcheck = $this->params['strictformcheck'];
-		$dropfolderdir = $this->params['dropfolderdir'];
-		$folderid = $folder->getId();
-
-		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "view_folder", $folder);
-		
-?>
-		<script language="JavaScript">
-		function checkForm()
-		{
-			msg = "";
-			//if (document.form1.userfile[].value == "") msg += "<?php printMLText("js_no_file");?>\n";
-			
-<?php
-			if ($strictformcheck) {
-?>
-			if(!document.form1.name.disabled){
-				if (document.form1.name.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-			}
-			if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-			if (document.form1.keywords.value == "") msg += "<?php printMLText("js_no_keywords");?>\n";
-<?php
-			}
-?>
-			if (msg != ""){
-				alert(msg);
-				return false;
-			}
-			return true;
-		}
-
-
-		function addFiles()
-		{
-			var li = document.createElement('li');
-			li.innerHTML = '<input type="File" name="userfile[]" size="60">';
-			document.getElementById('files').appendChild(li);	
-		//	document.getElementById("files").innerHTML += '<br><input type="File" name="userfile[]" size="60">'; 
-			document.form1.name.disabled=true;
-		}
-		
-		</script>
-
-<?php
-		$this->contentHeading(getMLText("add_document"));
-		$this->contentContainerStart();
-		
-		// Retrieve a list of all users and groups that have review / approve
-		// privileges.
-		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
-		?>
-		<table>
-		<tr>
-			<td class="warning"><?php echo getMLText("max_upload_size")." : ".ini_get( "upload_max_filesize"); ?></td>
-		</tr>
-<?php
-			if($enablelargefileupload) {
-?>
-		<tr>
-			<td><?php printf(getMLText('link_alt_updatedocument'), "out.AddMultiDocument.php?folderid=".$folderid."&showtree=".showtree()); ?></td>
-		</tr>
-<?php
-			}
-?>
-		</table>
-		<?php $this->contentSubHeading(getMLText("document_infos")); ?>
-		
-		<form action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" name="form1" onsubmit="return checkForm();">
-		<?php echo createHiddenFieldWithKey('adddocument'); ?>
-		<input type="hidden" name="folderid" value="<?php print $folderid; ?>">
-		<input type="hidden" name="showtree" value="<?php echo showtree();?>">
-		<table>
-		<tr>
-			<td><?php printMLText("name");?>:</td>
-			<td><input type="text" name="name" size="60"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="3" cols="80"></textarea></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("keywords");?>:</td>
-			<td>
-			<textarea name="keywords" rows="1" cols="80"></textarea><br>
-			<a href="javascript:chooseKeywords('form1.keywords');"><?php printMLText("use_default_keywords");?></a>
-			<script language="JavaScript">
-			var openDlg;
-		
-			function chooseKeywords(target) {
-				openDlg = open("out.KeywordChooser.php?target="+target, "openDlg", "width=500,height=400,scrollbars=yes,resizable=yes");
-			}
-			</script>
-			</td>
-		</tr>
-		<tr>
-			<td><?php printMLText("categories")?>:</td>
-			<td><?php $this->printCategoryChooser("form1");?></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("sequence");?>:</td>
-			<td><?php $this->printSequenceChooser($folder->getDocuments());?></td>
-		</tr>
-<?php
-			$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_all));
-			if($attrdefs) {
-				foreach($attrdefs as $attrdef) {
-?>
-		<tr>
-			<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-			<td><?php $this->printAttributeEditField($attrdef, '') ?></td>
-		</tr>
-<?php
-				}
-			}
-?>
-		<tr>
-			<td><?php printMLText("expires");?>:</td>
-			<td>
-			<input type="radio" name="expires" value="false" checked><?php printMLText("does_not_expire");?><br>
-			<input type="radio" name="expires" value="true"><?php $this->printDateChooser(-1, "exp");?>
-			</td>
-		</tr>
-
-		</table>
-
-		<?php $this->contentSubHeading(getMLText("version_info")); ?>
-		<table>
-		<tr>
-			<td><?php printMLText("version");?>:</td>
-			<td><input type="text" name="reqversion" value="1"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("local_file");?>:</td>
-			<td>
-			<a href="javascript:addFiles()"><?php printMLtext("add_multiple_files") ?></a>
-			<ol id="files">
-			<li><input type="file" name="userfile[]" size="60"></li>
-			</ol>
-			</td>
-		</tr>
-<?php if($dropfolderdir) { ?>
-		<tr>
-			<td><?php printMLText("dropfolder_file");?>:</td>
-			<td><?php $this->printDropFolderChooser("form1");?></td>
-		</tr>
-<?php } ?>
-		<tr>
-			<td><?php printMLText("comment_for_current_version");?>:</td>
-			<td><textarea name="version_comment" rows="3" cols="80"></textarea></td>
-		</tr>
-<?php
-			$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
-			if($attrdefs) {
-				foreach($attrdefs as $attrdef) {
-?>
-		<tr>
-			<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-			<td><?php $this->printAttributeEditField($attrdef, '', 'attributes_version') ?></td>
-		</tr>
-<?php
-				}
-			}
-?>
-		</table>
-
-		<?php $this->contentSubHeading(getMLText("assign_reviewers")); ?>
-		
-			<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-			<div class="cbSelectContainer">
-			<ul class="cbSelectList">
-<?php
-			$res=$user->getMandatoryReviewers();
-			foreach ($docAccess["users"] as $usr) {
-				if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
-				$mandatory=false;
-				foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
-		
-				if ($mandatory) print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</li>";
-				else print "<li class=\"cbSelectItem\"><input id='revInd".$usr->getID()."' type='checkbox' name='indReviewers[]' value='". $usr->getID() ."'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</li>";
-			}
-?>
-			</ul>
-			</div>
-			<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-			<div class="cbSelectContainer">
-			<ul class="cbSelectList">
-<?php
-			foreach ($docAccess["groups"] as $grp) {
-			
-				$mandatory=false;
-				foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $mandatory=true;	
-		
-				if ($mandatory) print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>".htmlspecialchars($grp->getName())."</li>";
-				else print "<li class=\"cbSelectItem\"><input id='revGrp".$grp->getID()."' type='checkbox' name='grpReviewers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName())."</li>";
-			}
-		?>
-			</ul>
-			</div>
-			
-		<?php $this->contentSubHeading(getMLText("assign_approvers")); ?>
-		
-			<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-			<div class="cbSelectContainer">
-			<ul class="cbSelectList">
-<?php
-			$res=$user->getMandatoryApprovers();
-			foreach ($docAccess["users"] as $usr) {
-				if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
-				$mandatory=false;
-				foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
-				
-				if ($mandatory) print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-				else print "<li class=\"cbSelectItem\"><input id='appInd".$usr->getID()."' type='checkbox' name='indApprovers[]' value='". $usr->getID() ."'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-			}
-?>
-			</ul>
-			</div>
-			<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-			<div class="cbSelectContainer">
-			<ul class="cbSelectList">
-<?php
-			foreach ($docAccess["groups"] as $grp) {
-			
-				$mandatory=false;
-				foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $mandatory=true;	
-		
-				if ($mandatory) print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>".htmlspecialchars($grp->getName());
-				else print "<li class=\"cbSelectItem\"><input id='appGrp".$grp->getID()."' type='checkbox' name='grpApprovers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName());
-
-			}
-		?>
-			</ul>
-			</div>
-
-			<p><?php printMLText("add_doc_reviewer_approver_warning")?></p>
-			<p><input type="Submit" value="<?php printMLText("add_document");?>"></p>
-		</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.AddEvent.php b/views/blue/class.AddEvent.php
deleted file mode 100644
index d97b59b4a..000000000
--- a/views/blue/class.AddEvent.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Implementation of AddEvent view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for AddEvent view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_AddEvent extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-
-		$this->htmlStartPage(getMLText("calendar"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("calendar"), "calendar");
-
-		$this->contentHeading(getMLText("add_event"));
-		$this->contentContainerStart();
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if (document.form1.name.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-<?php
-	if (isset($settings->_strictFormCheck) && $settings->_strictFormCheck) {
-	?>
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-<?php
-	}
-?>
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<form action="../op/op.AddEvent.php" name="form1" onsubmit="return checkForm();" method="POST">
-	<table>
-		<tr>
-			<td><?php printMLText("from");?>:</td>
-			<td><?php $this->printDateChooser(-1, "from");?></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("to");?>:</td>
-			<td><?php $this->printDateChooser(-1, "to");?></td>
-		</tr>
-		<tr>
-			<td class="inputDescription"><?php printMLText("name");?>:</td>
-			<td><input name="name" size="60"></td>
-		</tr>
-		<tr>
-			<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="80"></textarea></td>
-		</tr>
-		<tr>
-			<td colspan="2"><br><input type="submit" value="<?php printMLText("add_event");?>"></td>
-		</tr>
-	</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.AddFile.php b/views/blue/class.AddFile.php
deleted file mode 100644
index 9fef01dab..000000000
--- a/views/blue/class.AddFile.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Implementation of AddFile view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for AddFile view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_AddFile extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$strictformcheck = $this->params['strictformcheck'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if (document.form1.userfile.value == "") msg += "<?php printMLText("js_no_file");?>\n";
-	if (document.form1.name.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-<?php
-	if (isset($settings->_strictFormCheck) && $settings->_strictFormCheck) {
-	?>
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-<?php
-	}
-?>
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-<?php
-		$this->contentHeading(getMLText("linked_files"));
-		$this->contentContainerStart();
-
-?>
-<table>
-<tr>
-	<td class="warning"><?php echo getMLText("max_upload_size")." : ".ini_get( "upload_max_filesize"); ?></td>
-</tr>
-<tr>
-  <td><?php printf(getMLText('link_alt_updatedocument'), "out.AddFile2.php?documentid=".$document->getId()); ?></td>
-</tr>
-</table><br>
-
-<form action="../op/op.AddFile.php" enctype="multipart/form-data" method="post" name="form1" onsubmit="return checkForm();">
-<input type="Hidden" name="documentid" value="<?php print $document->getId(); ?>">
-<table>
-<tr>
-	<td><?php printMLText("local_file");?>:</td>
-	<td><input type="File" name="userfile" size="60"></td>
-</tr>
-<tr>
-	<td><?php printMLText("name");?>:</td>
-	<td><input type="text" name="name" size="60"></td>
-</tr>
-<tr>
-	<td><?php printMLText("comment");?>:</td>
-	<td><textarea name="comment" rows="4" cols="80"></textarea></td>
-</tr>
-</table>
-
-	<p><input type="Submit" value="<?php printMLText("add");?>"></p>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.AddFile2.php b/views/blue/class.AddFile2.php
deleted file mode 100644
index 168e43e79..000000000
--- a/views/blue/class.AddFile2.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Implementation of AddFile2 view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for AddFile2 view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_AddFile2 extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-
-		$this->contentHeading(getMLText("linked_files"));
-		$this->contentContainerStart();
-
-		$this->printUploadApplet('../op/op.AddFile2.php', array('documentid'=>$document->getId()), 1, array('name'=>1, 'comment'=>1));
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.AddMultiDocument.php b/views/blue/class.AddMultiDocument.php
deleted file mode 100644
index b8555a908..000000000
--- a/views/blue/class.AddMultiDocument.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Implementation of AddMultiDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for AddMultiDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_AddMultiDocument extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-
-		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "view_folder", $folder);
-
-?>
-<script language="JavaScript">
-var openDlg;
-function chooseKeywords(target) {
-	openDlg = open("out.KeywordChooser.php?target="+target, "openDlg", "width=500,height=400,scrollbars=yes,resizable=yes");
-}
-function chooseCategory(form, cats) {
-	openDlg = open("out.CategoryChooser.php?form="+form+"&cats="+cats, "openDlg", "width=480,height=480,scrollbars=yes,resizable=yes,status=yes");
-}
-</script>
-
-<?php
-	$this->contentHeading(getMLText("add_document"));
-	$this->contentContainerStart();
-
-	// Retrieve a list of all users and groups that have review / approve
-	// privileges.
-	$docAccess = $folder->getReadAccessList();
-
-	$this->printUploadApplet('../op/op.AddMultiDocument.php', array('folderid'=>$folder->getId()));
-
-	$this->contentContainerEnd();
-	$this->htmlEndPage();
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.AddSubFolder.php b/views/blue/class.AddSubFolder.php
deleted file mode 100644
index 72711e0c0..000000000
--- a/views/blue/class.AddSubFolder.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Implementation of AddSubFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for AddSubFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_AddSubFolder extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$strictformcheck = $this->params['strictformcheck'];
-
-		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "view_folder", $folder);
-		$this->contentHeading(getMLText("add_subfolder"));
-		$this->contentContainerStart();
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if (document.form1.name.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-<?php
-	if ($strictformcheck) {
-	?>
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-<?php
-	}
-?>
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<form action="../op/op.AddSubFolder.php" name="form1" onsubmit="return checkForm();" method="POST">
-	<?php echo createHiddenFieldWithKey('addsubfolder'); ?>
-	<input type="Hidden" name="folderid" value="<?php print $folder->getId();?>">
-	<input type="Hidden" name="showtree" value="<?php echo showtree();?>">
-	<table>
-		<tr>
-			<td class="inputDescription"><?php printMLText("name");?>:</td>
-			<td><input type="text" name="name" size="60"></td>
-		</tr>
-		<tr>
-			<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="80"></textarea></td>
-		</tr>
-		<tr>
-			<td class="inputDescription"><?php printMLText("sequence");?>:</td>
-			<td><?php $this->printSequenceChooser($folder->getSubFolders());?></td>
-		</tr>
-<?php
-	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
-	if($attrdefs) {
-		foreach($attrdefs as $attrdef) {
-?>
-<tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	<td><?php $this->printAttributeEditField($attrdef, '') ?></td>
-</tr>
-<?php
-		}
-	}
-?>
-		<tr>
-			<td colspan="2"><br><input type="Submit" value="<?php printMLText("add_subfolder");?>"></td>
-		</tr>
-	</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.AdminTools.php b/views/blue/class.AdminTools.php
deleted file mode 100644
index 3f4ac5b73..000000000
--- a/views/blue/class.AdminTools.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Implementation of AdminTools view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for AdminTools view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_AdminTools extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$logfileenable = $this->params['logfileenable'];
-		$enablefullsearch = $this->params['enablefullsearch'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentContainerStart();
-?>
-	<ul>
-		<li class="first"><a href="../out/out.Statistic.php"><?php echo getMLText("folders_and_documents_statistic")?></a></li>
-		<li><a href="../out/out.BackupTools.php"><?php echo getMLText("backup_tools")?></a></li>
-<?php		
-		if ($logfileenable) echo "<li><a href=\"../out/out.LogManagement.php\">".getMLText("log_management")."</a></li>";
-?>
-		<li><a href="../out/out.UsrMgr.php"><?php echo getMLText("user_management")?></a></li>
-		<li><a href="../out/out.GroupMgr.php"><?php echo getMLText("group_management")?></a></li>
-		<li><a href="../out/out.DefaultKeywords.php"><?php echo getMLText("global_default_keywords")?></a></li>
-		<li><a href="../out/out.Categories.php"><?php echo getMLText("global_document_categories")?></a></li>
-		<li><a href="../out/out.AttributeMgr.php"><?php echo getMLText("global_attributedefinitions")?></a></li>
-		<li><a href="../out/out.Info.php"><?php echo getMLText("version_info")?></a></li>
-<?php
-		if($enablefullsearch) {
-?>
-		<li><a href="../out/out.Indexer.php"><?php echo getMLText("update_fulltext_index")?></a></li>
-		<li><a href="../out/out.CreateIndex.php"><?php echo getMLText("create_fulltext_index")?></a></li>
-		<li><a href="../out/out.IndexInfo.php"><?php echo getMLText("fulltext_info")?></a></li>
-<?php
-		}
-?>
-	<li><a href="../out/out.ObjectCheck.php"><?php echo getMLText("objectcheck")?></a></li>
-	<li><a href="../out/out.Settings.php"><?php echo getMLText("settings")?></a></li>
-	</ul>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ApprovalSummary.php b/views/blue/class.ApprovalSummary.php
deleted file mode 100644
index 233b1d347..000000000
--- a/views/blue/class.ApprovalSummary.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
- * Implementation of ApprovalSummary view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ApprovalSummary view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ApprovalSummary extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$db = $dms->getDB();
-
-		$this->htmlStartPage(getMLText("approval_summary"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("my_documents"), "my_documents");
-		$this->contentHeading(getMLText("approval_summary"));
-		$this->contentContainerStart();
-
-		if (!$db->createTemporaryTable("ttstatid")) {
-			$this->exitError(getMLText("approval_summary"),getMLText("internal_error_exit"));
-		}
-
-		// TODO: verificare scadenza
-		
-		// Get document list for the current user.
-		$approvalStatus = $user->getApprovalStatus();
-
-		// reverse order
-		$approvalStatus["indstatus"]=array_reverse($approvalStatus["indstatus"],true);
-		$approvalStatus["grpstatus"]=array_reverse($approvalStatus["grpstatus"],true);
-		
-		// Create a comma separated list of all the documentIDs whose information is
-		// required.
-		$dList = array();
-		foreach ($approvalStatus["indstatus"] as $st) {
-			if (!in_array($st["documentID"], $dList)) {
-				$dList[] = $st["documentID"];
-			}
-		}
-		foreach ($approvalStatus["grpstatus"] as $st) {
-			if (!in_array($st["documentID"], $dList)) {
-				$dList[] = $st["documentID"];
-			}
-		}
-		$docCSV = "";
-		foreach ($dList as $d) {
-			$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
-		}
-		
-		if (strlen($docCSV)>0) {
-		
-			$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-				"`tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-				"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-				"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-				"FROM `tblDocumentStatus` ".
-				"LEFT JOIN `tblDocumentStatusLog` USING (`statusID`) ".
-				"LEFT JOIN `ttstatid` on `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentStatus`.`documentID` ".
-				"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-				"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-				"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-				"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
-				"ORDER BY `statusDate` DESC";
-		
-			$resArr = $db->getResultArray($queryStr);
-			
-			if (is_bool($resArr) && !$resArr) {
-				$this->exitError(getMLText("approval_summary"),getMLText("internal_error_exit"));
-			}
-			// Create an array to hold all of these results, and index the array by
-			// document id. This makes it easier to retrieve document ID information
-			// later on and saves us having to repeatedly poll the database every time
-			// new document information is required.
-			$docIdx = array();
-			foreach ($resArr as $res) {
-			
-				// verify expiry
-				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-						$res["status"]=S_EXPIRED;
-					}
-				}
-
-				$docIdx[$res["id"]][$res["version"]] = $res;
-			}
-		}
-		
-		$iRev = array();	
-		$printheader = true;
-		foreach ($approvalStatus["indstatus"] as $st) {
-
-			if (isset($docIdx[$st["documentID"]][$st["version"]])) {
-			
-				if ($printheader){
-					print "<table class=\"folderView\">";
-					print "<thead>\n<tr>\n";
-					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
-					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
-					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
-					print "</tr>\n</thead>\n<tbody>\n";
-					$printheader = false;
-				}
-			
-				print "<tr>\n";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-				print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-				print "<td>".getOverallStatusText($docIdx[$st["documentID"]][$st["version"]]["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-				print "<td>".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-				print "</tr>\n";
-			}
-			if ($st["status"]!=-2) {
-				$iRev[] = $st["documentID"];
-			}
-		}
-		if (!$printheader) {
-			echo "</tbody>\n</table>\n";
-		}else{
-			printMLText("no_approval_needed");
-		}
-
-		$this->contentContainerEnd();
-		$this->contentHeading(getMLText("group_approval_summary"));
-		$this->contentContainerStart();
-
-		$printheader = true;
-		foreach ($approvalStatus["grpstatus"] as $st) {
-
-			if (!in_array($st["documentID"], $iRev) && isset($docIdx[$st["documentID"]][$st["version"]])) {
-			
-				if ($printheader){
-					print "<table class=\"folderView\">";
-					print "<thead>\n<tr>\n";
-					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
-					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
-					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
-					print "</tr>\n</thead>\n<tbody>\n";
-					$printheader = false;
-				}	
-			
-				print "<tr>\n";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-				print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-				print "<td>".getOverallStatusText($docIdx[$st["documentID"]][$st["version"]]["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-				print "<td>".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-				print "</tr>\n";
-			}
-		}
-		if (!$printheader) {
-			echo "</tbody>\n</table>\n";
-		}else{
-			printMLText("empty_notify_list");
-		}
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ApproveDocument.php b/views/blue/class.ApproveDocument.php
deleted file mode 100644
index b2bc11091..000000000
--- a/views/blue/class.ApproveDocument.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * Implementation of ApproveDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ApproveDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ApproveDocument extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-
-		$latestContent = $document->getLatestContent();
-		$approvals = $latestContent->getApprovalStatus();
-
-		foreach($approvals as $approval) {
-			if($approval['approveID'] == $_GET['approveid']) {
-				$approvalStatus = $approval;
-				break;
-			}
-		}
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("submit_approval"));
-?>
-<script language="JavaScript">
-function checkIndForm()
-{
-	msg = "";
-	if (document.form1.approvalStatus.value == "") msg += "<?php printMLText("js_no_approval_status");?>\n";
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-function checkGrpForm()
-{
-	msg = "";
-//	if (document.form1.approvalGroup.value == "") msg += "<?php printMLText("js_no_approval_group");?>\n";
-	if (document.form1.approvalStatus.value == "") msg += "<?php printMLText("js_no_approval_status");?>\n";
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-
-		$this->contentContainerStart();
-
-		// Display the Approval form.
-		if ($approvalStatus['type'] == 0) {
-			if($approvalStatus["status"]!=0) {
-
-				print "<table class=\"folderView\"><thead><tr>";
-				print "<th>".getMLText("status")."</th>";
-				print "<th>".getMLText("comment")."</th>";
-				print "<th>".getMLText("last_update")."</th>";
-				print "</tr></thead><tbody><tr>";
-				print "<td>";
-				printApprovalStatusText($approvalStatus["status"]);
-				print "</td>";
-				print "<td>".htmlspecialchars($approvalStatus["comment"])."</td>";
-				$indUser = $dms->getUser($approvalStatus["userID"]);
-				print "<td>".$approvalStatus["date"]." - ". $indUser->getFullname() ."</td>";
-				print "</tr></tbody></table><br>\n";
-			}
-?>
-	<form method="post" action="../op/op.ApproveDocument.php" name="form1" onsubmit="return checkIndForm();">
-	<?php echo createHiddenFieldWithKey('approvedocument'); ?>
-	<table>
-	<tr><td><?php printMLText("comment")?>:</td>
-	<td><textarea name="comment" cols="80" rows="4"></textarea>
-	</td></tr>
-	<tr><td><?php printMLText("approval_status")?>:</td>
-	<td><select name="approvalStatus">
-<?php if($approvalStatus['status'] != 1) { ?>
-	<option value='1'><?php printMLText("status_approved")?></option>
-<?php } ?>
-<?php if($approvalStatus['status'] != -1) { ?>
-	<option value='-1'><?php printMLText("rejected")?></option>
-<?php } ?>
-	</select>
-	</td></tr><tr><td></td><td>
-	<input type='hidden' name='approvalType' value='ind'/>
-	<input type='hidden' name='documentid' value='<?php echo $document->getId() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
-	<input type='submit' name='indApproval' value='<?php printMLText("submit_approval")?>'/>
-	</td></tr></table>
-	</form>
-<?php
-		}
-		else if ($approvalStatus['type'] == 1) {
-
-			if($approvalStatus["status"]!=0) {
-
-				print "<table class=\"folderView\"><thead><tr>";
-				print "<th>".getMLText("status")."</th>";
-				print "<th>".getMLText("comment")."</th>";
-				print "<th>".getMLText("last_update")."</th>";
-				print "</tr></thead><tbody><tr>";
-				print "<td>";
-				printApprovalStatusText($approvalStatus["status"]);
-				print "</td>";
-				print "<td>".htmlspecialchars($approvalStatus["comment"])."</td>";
-				$indUser = $dms->getUser($approvalStatus["userID"]);
-				print "<td>".$approvalStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
-				print "</tr></tbody></table><br>\n";
-			}
-
-?>
-	<form method="POST" action="../op/op.ApproveDocument.php" name="form1" onsubmit="return checkGrpForm();">
-	<?php echo createHiddenFieldWithKey('approvedocument'); ?>
-	<table>
-	<tr><td><?php printMLText("comment")?>:</td>
-	<td><textarea name="comment" cols="80" rows="4"></textarea>
-	</td></tr>
-	<tr><td><?php printMLText("approval_status")?>:</td>
-	<td>
-	<select name="approvalStatus">
-<?php if($approvalStatus['status'] != 1) { ?>
-	<option value='1'><?php printMLText("status_approved")?></option>
-<?php } ?>
-<?php if($approvalStatus['status'] != -1) { ?>
-	<option value='-1'><?php printMLText("rejected")?></option>
-<?php } ?>
-	</select>
-	</td></tr>
-	<tr><td></td><td>
-	<input type='hidden' name='approvalGroup' value="<?php echo $approvalStatus['required']; ?>" />
-	<input type='hidden' name='approvalType' value='grp'/>
-	<input type='hidden' name='documentid' value='<?php echo $document->getId() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
-	<input type='submit' name='groupApproval' value='<?php printMLText("submit_approval")?>'/></td></tr>
-	</table>
-	</form>
-<?php
-		}
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.AttributeMgr.php b/views/blue/class.AttributeMgr.php
deleted file mode 100644
index 1ae4ed4a7..000000000
--- a/views/blue/class.AttributeMgr.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/**
- * Implementation of AttributeMgr view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for AttributeMgr view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_AttributeMgr extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$attrdefs = $this->params['attrdefs'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-?>
-
-<script language="JavaScript">
-obj = -1;
-function showAttributeDefinitions(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-	
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-	
-	obj = document.getElementById("attrdefs" + id);
-	obj.style.display = "";
-}
-</script>
-<?php
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("attrdef_management"));
-		$this->contentContainerStart();
-?>
-
-	<table>
-	<tr>
-		<td><?php echo getMLText("selection")?>:</td>
-		<td>
-			<select onchange="showAttributeDefinitions(this)" id="selector">
-				<option value="-1"><?php echo getMLText("choose_attrdef")?>
-				<option value="0"><?php echo getMLText("new_attrdef")?>
-
-<?php
-		$selected=0;
-		$count=2;
-		if($attrdefs) {
-			foreach ($attrdefs as $attrdef) {
-			
-				if (isset($_GET["attrdefid"]) && $attrdef->getID()==$_GET["attrdefid"]) $selected=$count;				
-				switch($attrdef->getObjType()) {
-					case SeedDMS_Core_AttributeDefinition::objtype_all:
-						$ot = getMLText("all");
-						break;
-					case SeedDMS_Core_AttributeDefinition::objtype_folder:
-						$ot = getMLText("folder");
-						break;
-					case SeedDMS_Core_AttributeDefinition::objtype_document:
-						$ot = getMLText("document");
-						break;
-					case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
-						$ot = getMLText("version");
-						break;
-				}
-				print "<option value=\"".$attrdef->getID()."\">" . htmlspecialchars($attrdef->getName() ." (".$ot.")");
-				$count++;
-			}
-		}
-?>
-	</select>
-	&nbsp;&nbsp;
-	</td>
-
-		<td id="attrdefs0" style="display : none;">	
-			<form action="../op/op.AttributeMgr.php" method="post">
-  		<?php echo createHiddenFieldWithKey('addattrdef'); ?>
-			<input type="hidden" name="action" value="addattrdef">
-			<table>
-				<tr>
-					<td><?php printMLText("attrdef_name");?>:</td><td><input type="text" name="name"></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_objtype");?>:</td><td><select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>">Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>"><?php printMLText("document"); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>"><?php printMLText("version"); ?></option></select>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_type");?>:</td><td><select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>">Integer</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>">Float</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>">String</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>">Boolean</option></select></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_multiple");?>:</td><td><input type="checkbox" value="1" name="multiple" /></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_minvalues");?>:</td><td><input type="text" value="" name="minvalues" /></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_maxvalues");?>:</td><td><input type="text" value="" name="maxvalues" /></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_valueset");?>:</td><td><input type="text" value="" name="valueset" /></td>
-				</tr>
-			</table>
-			<input type="Submit" value="<?php printMLText("new_attrdef"); ?>">
-			</form>
-		</td>
-	
-<?php	
-	
-			if($attrdefs) {
-				foreach ($attrdefs as $attrdef) {
-				
-					print "<td id=\"attrdefs".$attrdef->getID()."\" style=\"display : none;\">";	
-?>
-				<table>
-					<tr>
-						<td colspan="2">
-<?php
-					if(!$attrdef->isUsed()) {
-?>
-							<form style="display: inline-block;" method="post" action="../op/op.AttributeMgr.php" >
-							<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
-							<input type="hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>">
-							<input type="hidden" name="action" value="removeattrdef">
-							<input value="<?php echo getMLText("rm_attrdef")?>" type="submit">
-							</form>
-<?php
-					} else {
-?>
-							<p><?php echo getMLText('attrdef_in_use') ?></p>
-<?php
-					}
-?>
-						</td>
-					</tr>
-					<tr>
-						<td colspan="2">
-							<?php $this->contentSubHeading("");?>
-						</td>
-					</tr>				
-					<form action="../op/op.AttributeMgr.php" method="post">
-					<tr>
-						<td>
-								<?php echo createHiddenFieldWithKey('editattrdef'); ?>
-								<input type="Hidden" name="action" value="editattrdef">
-								<input type="Hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>" />
-								<?php printMLText("attrdef_name");?>:
-						</td>
-						<td>
-							<input type="text" name="name" value="<?php echo htmlspecialchars($attrdef->getName()) ?>">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_type");?>:
-						</td>
-						<td>
-							<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>>Integer</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>>Float</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>>String</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>>Boolean</option></select>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_objtype");?>:
-						</td>
-						<td>
-							<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>>Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>>Document</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>>Document content</option></select>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_multiple");?>:
-						</td>
-						<td>
-							<input type="checkbox" value="1" name="multiple" <?php echo $attrdef->getMultipleValues() ? "checked" : "" ?>/>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_minvalues");?>:
-						</td>
-						<td>
-							<input type="text" value="<?php echo $attrdef->getMinValues() ?>" name="minvalues" />
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_maxvalues");?>:
-						</td>
-						<td>
-							<input type="text" value="<?php echo $attrdef->getMaxValues() ?>" name="maxvalues" />
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_valueset");?>:
-						</td>
-						<td>
-							<input type="text" value="<?php echo $attrdef->getValueSet() ?>" name="valueset" />
-						</td>
-					</tr>
-					<tr>
-						<td></td>
-						<td>
-							<input type="submit" value="<?php printMLText("save");?>">
-						</td>
-					</tr>
-					</form>
-					
-				</table>
-			</td>
-<?php
-				}
-			}
-?>
-	</tr></table>
-	
-<script language="JavaScript">
-
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showAttributeDefinitions(sel);
-
-</script>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.BackupTools.php b/views/blue/class.BackupTools.php
deleted file mode 100644
index 72c67868d..000000000
--- a/views/blue/class.BackupTools.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Implementation of BackupTools view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for BackupTools view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_BackupTools extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$contentdir = $this->params['contentdir'];
-
-		$this->htmlStartPage(getMLText("backup_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-
-		$this->contentHeading(getMLText("backup_tools"));
-		$this->contentContainerStart();
-		print getMLText("space_used_on_data_folder")." : ".SeedDMS_Core_File::format_filesize(dskspace($contentdir));
-		$this->contentContainerEnd();
-
-		// versioning file creation ////////////////////////////////////////////////////
-
-		$this->contentHeading(getMLText("versioning_file_creation"));
-		$this->contentContainerStart();
-		print "<p>".getMLText("versioning_file_creation_warning")."</p>\n";
-
-		print "<form action=\"../op/op.CreateVersioningFiles.php\" name=\"form1\">";
-		$this->printFolderChooser("form1",M_READWRITE);
-		print "<input type='submit' name='' value='".getMLText("versioning_file_creation")."'/>";
-		print "</form>\n";
-
-		$this->contentContainerEnd();
-
-		// archive creation ////////////////////////////////////////////////////////////
-
-		$this->contentHeading(getMLText("archive_creation"));
-		$this->contentContainerStart();
-		print "<p>".getMLText("archive_creation_warning")."</p>\n";
-
-		print "<form action=\"../op/op.CreateFolderArchive.php\" name=\"form2\">";
-		$this->printFolderChooser("form2",M_READWRITE);
-		print "<input type=\"checkbox\" name=\"human_readable\" value=\"1\">".getMLText("human_readable");
-		print "<input type='submit' name='' value='".getMLText("archive_creation")."'/>";
-		print "</form>\n";
-
-		// list backup files
-		$this->contentSubHeading(getMLText("backup_list"));
-
-		$print_header=true;
-
-		$handle = opendir($contentdir);
-		$entries = array();
-		while ($e = readdir($handle)){
-			if (is_dir($contentdir.$e)) continue;
-			if (strpos($e,".tar.gz")==FALSE) continue;
-			$entries[] = $e;
-		}
-		closedir($handle);
-
-		sort($entries);
-		$entries = array_reverse($entries);
-
-		foreach ($entries as $entry){
-
-			if ($print_header){
-				print "<table class=\"folderView\">\n";
-				print "<thead>\n<tr>\n";
-				print "<th></th>\n";
-				print "<th>".getMLText("folder")."</th>\n";
-				print "<th>".getMLText("creation_date")."</th>\n";
-				print "<th>".getMLText("file_size")."</th>\n";
-				print "<th></th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-				$print_header=false;
-			}
-
-			$folderid=substr($entry,strpos($entry,"_")+1);
-			$folder=$dms->getFolder((int)$folderid);
-					
-			print "<tr>\n";
-			print "<td><a href=\"../op/op.Download.php?arkname=".$entry."\">".$entry."</a></td>\n";
-			if (is_object($folder)) print "<td>".htmlspecialchars($folder->getName())."</td>\n";
-			else print "<td>".getMLText("unknown_id")."</td>\n";
-			print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-			print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
-			print "<td><ul class=\"actions\">";
-			print "<li><a href=\"out.RemoveArchive.php?arkname=".$entry."\">".getMLText("backup_remove")."</a></li>";
-			print "</ul></td>\n";	
-			print "</tr>\n";
-		}
-
-		if ($print_header) printMLText("empty_notify_list");
-		else print "</table>\n";
-
-		$this->contentContainerEnd();
-
-		// dump creation ///////////////////////////////////////////////////////////////
-
-		$this->contentHeading(getMLText("dump_creation"));
-		$this->contentContainerStart();
-		print "<p>".getMLText("dump_creation_warning")."</p>\n";
-
-		print "<form action=\"../op/op.CreateDump.php\" name=\"form4\">";
-		print "<input type='submit' name='' value='".getMLText("dump_creation")."'/>";
-		print "</form>\n";
-
-		// list backup files
-		$this->contentSubHeading(getMLText("dump_list"));
-
-		$print_header=true;
-
-		$handle = opendir($contentdir);
-		$entries = array();
-		while ($e = readdir($handle)){
-			if (is_dir($contentdir.$e)) continue;
-			if (strpos($e,".sql.gz")==FALSE) continue;
-			$entries[] = $e;
-		}
-		closedir($handle);
-
-		sort($entries);
-		$entries = array_reverse($entries);
-
-		foreach ($entries as $entry){
-
-			if ($print_header){
-				print "<table class=\"folderView\">\n";
-				print "<thead>\n<tr>\n";
-				print "<th></th>\n";
-				print "<th>".getMLText("creation_date")."</th>\n";
-				print "<th>".getMLText("file_size")."</th>\n";
-				print "<th></th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-				$print_header=false;
-			}
-
-			print "<tr>\n";
-			print "<td><a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a></td>\n";
-			print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-			print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
-			print "<td><ul class=\"actions\">";
-			print "<li><a href=\"out.RemoveDump.php?dumpname=".$entry."\">".getMLText("dump_remove")."</a></li>";
-			print "</ul></td>\n";	
-			print "</tr>\n";
-		}
-
-		if ($print_header) printMLText("empty_notify_list");
-		else print "</table>\n";
-
-		$this->contentContainerEnd();
-
-		// files deletion //////////////////////////////////////////////////////////////
-
-		$this->contentHeading(getMLText("files_deletion"));
-		$this->contentContainerStart();
-		print "<p>".getMLText("files_deletion_warning")."</p>\n";
-
-		print "<form action=\"../out/out.RemoveFolderFiles.php\" name=\"form3\">";
-		$this->printFolderChooser("form3",M_READWRITE);
-		print "<input type='submit' name='' value='".getMLText("files_deletion")."'/>";
-		print "</form>\n";
-
-		$this->contentContainerEnd();
-
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.BlueStyle.php b/views/blue/class.BlueStyle.php
deleted file mode 100644
index 15a7274c0..000000000
--- a/views/blue/class.BlueStyle.php
+++ /dev/null
@@ -1,1071 +0,0 @@
-<?php
-//    MyDMS. Document Management System
-//    Copyright (C) 2002-2005  Markus Westphal
-//    Copyright (C) 2006-2008 Malcolm Cowe
-//    Copyright (C) 2010 Matteo Lucarelli
-//    Copyright (C) 2009-2012 Uwe Steinmann
-//
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-class SeedDMS_Blue_Style extends SeedDMS_View_Common {
-	function __construct($params, $theme='blue') {
-		$this->theme = $theme;
-		$this->params = $params;
-	}
-
-	protected function htmlStartPage($title="", $bodyClass="") { /* {{{ */
-
-		if(file_exists("../themes/".$this->theme."/HTMLHead.html")) {
-			include("../themes/".$this->theme."/HTMLHead.html");
-		} else {
-			echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n".
-				"\"http://www.w3.org/TR/html4/strict.dtd\">\n";
-			echo "<html>\n<head>\n";
-			echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
-			echo "<link rel=\"STYLESHEET\" type=\"text/css\" href=\"../styles/".$this->theme."/style.css\"/>\n";
-			echo "<link rel=\"STYLESHEET\" type=\"text/css\" href=\"../styles/print.css\" media=\"print\"/>\n";
-			echo "<link rel='shortcut icon' href='../styles/".$this->theme."/favicon.ico' type='image/x-icon'/>\n";
-			echo "<script type='text/javascript' src='../js/jquery.min.js'></script>\n";
-			echo "<script type='text/javascript' src='../js/jquery.passwordstrength.js'></script>\n";
-			echo '<script type="text/javascript" src="../styles/'.$this->theme.'/application.js"></script>'."\n";
-			echo "<title>".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS").(strlen($title)>0 ? ": " : "").htmlspecialchars($title)."</title>\n";
-			echo "</head>\n";
-			echo "<body".(strlen($bodyClass)>0 ? " class=\"".$bodyClass."\"" : "").">\n";
-		}
-	} /* }}} */
-
-	protected function htmlEndPage() { /* {{{ */
-
-		$this->footNote();
-		if(file_exists("../themes/".$this->theme."/HTMLFoot.html")) {
-			include("../themes/".$this->theme."/HTMLFoot.html");
-		} else {
-			echo "</body>\n</html>\n";
-		}
-	} /* }}} */
-
-	function footNote() { /* {{{ */
-		if ($this->params['printdisclaimer']){
-			echo "<div class=\"disclaimer\">".getMLText("disclaimer")."</div>";
-		}
-
-		if (isset($this->params['footnote']) && strlen((string)$this->params['footnote'])>0) {
-			echo "<div class=\"footNote\">".(string)$this->params['footnote']."</div>";
-		}
-	
-		return;
-	} /* }}} */
-
-	function contentStart() { /* {{{ */
-	} /* }}} */
-
-	function contentEnd() { /* {{{ */
-	} /* }}} */
-
-	function globalBanner() { /* {{{ */
-		echo "<div class=\"globalBox\" id=\"noNav\">\n";
-		echo "<div class=\"globalTR\"></div>\n";
-		echo "<div id=\"logo\"><img src='../styles/logo.png'></div>\n";
-		echo "<div class=\"siteNameLogin\">".
-			(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS").
-			"</div>\n";
-		echo "<div style=\"clear: both; height: 0px; font-size:0;\">&nbsp;</div>\n".
-			"</div>\n";
-		return;
-	} /* }}} */
-
-	function globalNavigation($folder=null) { /* {{{ */
-		echo "<div class=\"globalBox\">\n";
-		echo "<div class=\"globalTR\"></div>\n";
-		if(isset($this->params['user']) && $this->params['user']) {
-		echo "<ul class=\"globalNav\">\n";
-			echo "<li id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".getMLText("content")."</a></li>\n";
-			echo "<li><a href=\"../out/out.SearchForm.php?folderid=".$this->params['rootfolderid']."\">".getMLText("search")."</a></li>\n";
-			if ($this->params['enablecalendar']) echo "<li><a href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
-			if (!$this->params['user']->isGuest()) echo "<li><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("my_documents")."</a></li>\n";
-			if (!$this->params['user']->isGuest()) echo "<li><a href=\"../out/out.MyAccount.php\">".getMLText("my_account")."</a></li>\n";
-			if ($this->params['user']->isAdmin()) echo "<li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
-			echo "<li><a href=\"../out/out.Help.php\">".getMLText("help")."</a></li>\n";
-			echo "<li id=\"search\">\n";
-			echo "<form action=\"../op/op.Search.php\">";
-			if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), "SeedDMS_Core_Folder")) {
-				echo "<input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\" />";
-			}
-			echo "<input type=\"hidden\" name=\"navBar\" value=\"1\" />";
-			echo "<input type=\"hidden\" name=\"searchin[]\" value=\"1\" />";
-			echo "<input type=\"hidden\" name=\"searchin[]\" value=\"2\" />";
-			echo "<input type=\"hidden\" name=\"searchin[]\" value=\"3\" />";
-			echo "<input name=\"query\" type=\"text\" size=\"20\" />";
-			if($this->params['enablefullsearch']) {
-				echo "<input type=\"checkbox\" name=\"fullsearch\" value=\"1\" title=\"".getMLText('fullsearch_hint')."\"/> ".getMLText('fullsearch_hint')."";
-			}
-			echo "<input type=\"submit\" value=\"".getMLText("search")."\" id=\"searchButton\"/></form>\n";
-			echo "</li>\n</ul>\n";
-			echo "<div id=\"logo\"><img src='../styles/logo.png'></div>\n";
-			echo "<div class=\"siteName\">".
-				(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS").
-				"</div>\n";
-			echo "<span class=\"absSpacerNorm\"></span>\n";
-			echo "<div id=\"signatory\">".getMLText("signed_in_as")." ".htmlspecialchars($this->params['user']->getFullName()).
-				" (<a href=\"../op/op.Logout.php\">".getMLText("sign_out")."</a>).</div>\n";
-		}
-		echo "<div style=\"clear: both; height: 0px; font-size:0;\">&nbsp;</div>\n".
-			"</div>\n";
-		return;
-	} /* }}} */
-
-	function pageNavigation($pageTitle, $pageType=null, $extra=null) { /* {{{ */
-		global $settings;
-
-		echo "<div class=\"headingContainer\">\n";
-		// This spacer span is an awful hack, but it is the only way I know to
-		// get the spacer to match the mainheading content's size.
-		echo "<span class=\"absSpacerTitle\">".($settings->_titleDisplayHack ? $pageTitle : "")."</span>\n";
-		echo "<div class=\"mainHeading\">".$pageTitle."</div>\n";
-		echo "<div style=\"clear: both; height: 0px; font-size:0;\"></div>\n</div>\n";
-
-		if ($pageType!=null && strcasecmp($pageType, "noNav")) {
-			echo "<div class=\"localNavContainer\">\n";
-			switch ($pageType) {
-				case "view_folder":
-					$this->folderNavigationBar($extra);
-					break;
-				case "view_document":
-					$this->documentNavigationBar();
-					break;
-				case "my_documents":
-					$this->myDocumentsNavigationBar();
-					break;
-				case "my_account":
-					$this->accountNavigationBar();
-					break;
-				case "admin_tools":
-					$this->adminToolsNavigationBar();
-					break;
-				case "calendar";
-					$this->calendarNavigationBar($extra);
-					break;
-			}
-			echo "<div style=\"clear: both; height: 0px; font-size:0;\"></div>\n</div>\n";
-		}
-
-		return;
-	} /* }}} */
-
-	function folderNavigationBar($folder) { /* {{{ */
-		if (!is_object($folder) || strcasecmp(get_class($folder), "SeedDMS_Core_Folder")) {
-			echo "<ul class=\"localNav\">\n";
-			echo "</ul>\n";
-			return;
-		}
-		$accessMode = $folder->getAccessMode($this->params['user']);
-		$folderID = $folder->getID();
-		echo "<ul class=\"localNav\">\n";
-		if ($accessMode == M_READ && !$this->params['user']->isGuest()) {
-			echo "<li id=\"first\"><a href=\"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("edit_folder_notify")."</a></li>\n";
-		}
-		else if ($accessMode >= M_READWRITE) {
-			echo "<li id=\"first\"><a href=\"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("add_subfolder")."</a></li>\n";
-			echo "<li><a href=\"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("add_document")."</a></li>\n";
-			if($this->params['enablelargefileupload'])
-				echo "<li><a href=\"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("add_multiple_documents")."</a></li>\n";
-			echo "<li><a href=\"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("edit_folder_props")."</a></li>\n";
-			echo "<li><a href=\"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("edit_existing_notify")."</a></li>\n";
-			if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-				echo "<li><a href=\"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("move_folder")."</a></li>\n";
-		}
-		if ($accessMode == M_ALL) {
-			if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-				echo "<li><a href=\"../out/out.RemoveFolder.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("rm_folder")."</a></li>\n";
-			echo "<li><a href=\"../out/out.FolderAccess.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("edit_folder_access")."</a></li>\n";
-		}
-		echo "</ul>\n";
-		return;
-	} /* }}} */
-
-	function documentNavigationBar()	{ /* {{{ */
-		global $document;
-
-		$accessMode = $document->getAccessMode($this->params['user']);
-		$docid=".php?documentid=" . $document->getID();
-
-		echo "<ul class=\"localNav\">\n";
-		if ($accessMode >= M_READWRITE) {
-			if (!$document->isLocked()) {
-				echo "<li id=\"first\"><a href=\"../out/out.UpdateDocument". $docid ."\">".getMLText("update_document")."</a></li>";
-				echo "<li><a href=\"../op/op.LockDocument". $docid ."\">".getMLText("lock_document")."</a></li>";
-				echo "<li><a href=\"../out/out.EditDocument". $docid ."\">".getMLText("edit_document_props")."</a></li>";
-				echo "<li><a href=\"../out/out.MoveDocument". $docid ."\">".getMLText("move_document")."</a></li>";
-			}
-			else {
-				$lockingUser = $document->getLockingUser();
-				if (($lockingUser->getID() == $this->params['user']->getID()) || ($document->getAccessMode($this->params['user']) == M_ALL)) {
-					echo "<li id=\"first\"><a href=\"../out/out.UpdateDocument". $docid ."\">".getMLText("update_document")."</a></li>";
-					echo "<li><a href=\"../op/op.UnlockDocument". $docid ."\">".getMLText("unlock_document")."</a></li>";
-					echo "<li><a href=\"../out/out.EditDocument". $docid ."\">".getMLText("edit_document_props")."</a></li>";
-					echo "<li><a href=\"../out/out.MoveDocument". $docid ."\">".getMLText("move_document")."</a></li>";
-					echo "<li><a href=\"../out/out.SetExpires". $docid ."\">".getMLText("expires")."</a></li>";
-				}
-			}
-		}
-		if ($accessMode == M_ALL) {
-			echo "<li><a href=\"../out/out.RemoveDocument". $docid ."\">".getMLText("rm_document")."</a></li>";
-			echo "<li><a href=\"../out/out.DocumentAccess". $docid ."\">".getMLText("edit_document_access")."</a></li>";
-		}
-		if ($accessMode >= M_READ && !$this->params['user']->isGuest()) {
-			echo "<li><a href=\"../out/out.DocumentNotify". $docid ."\">".getMLText("edit_existing_notify")."</a></li>";
-		}
-		echo "</ul>\n";
-		return;
-	} /* }}} */
-
-	function accountNavigationBar() { /* {{{ */
-		echo "<ul class=\"localNav\">\n";
-		if (!$this->params['disableselfedit']) echo "<li id=\"first\"><a href=\"../out/out.EditUserData.php\">".getMLText("edit_user_details")."</a></li>\n";
-		
-		if (!$this->params['user']->isAdmin()) 
-			echo "<li><a href=\"../out/out.UserDefaultKeywords.php\">".getMLText("edit_default_keywords")."</a></li>\n";
-
-		echo "<li><a href=\"../out/out.ManageNotify.php\">".getMLText("edit_existing_notify")."</a></li>\n";
-
-		if ($this->params['enableusersview']){
-			echo "<li><a href=\"../out/out.UsrView.php\">".getMLText("users")."</a></li>\n";
-			echo "<li><a href=\"../out/out.GroupView.php\">".getMLText("groups")."</a></li>\n";
-		}		
-		echo "</ul>\n";
-		return;
-	} /* }}} */
-
-	function myDocumentsNavigationBar() { /* {{{ */
-
-		echo "<ul class=\"localNav\">\n";
-		echo "<li id=\"first\"><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("documents_in_process")."</a></li>\n";
-		echo "<li><a href=\"../out/out.MyDocuments.php\">".getMLText("all_documents")."</a></li>\n";
-		echo "<li><a href=\"../out/out.ReviewSummary.php\">".getMLText("review_summary")."</a></li>\n";
-		echo "<li><a href=\"../out/out.ApprovalSummary.php\">".getMLText("approval_summary")."</a></li>\n";
-		echo "</ul>\n";
-		return;
-	} /* }}} */
-
-	function adminToolsNavigationBar() { /* {{{ */
-		echo "<ul class=\"localNav\">\n";
-		echo "<li id=\"first\"><a href=\"../out/out.Statistic.php\">".getMLText("folders_and_documents_statistic")."</a></li>\n";
-		echo "<li><a href=\"../out/out.BackupTools.php\">".getMLText("backup_tools")."</a></li>\n";
-		if ($this->params['logfileenable']) echo "<li><a href=\"../out/out.LogManagement.php\">".getMLText("log_management")."</a></li>\n";
-		echo "<li><a href=\"../out/out.UsrMgr.php\">".getMLText("user_management")."</a></li>\n";
-		echo "<li><a href=\"../out/out.GroupMgr.php\">".getMLText("group_management")."</a></li>\n";
-		echo "<li><a href=\"../out/out.DefaultKeywords.php\">".getMLText("global_default_keywords")."</a></li>\n";
-		echo "</ul>\n";
-		return;
-	} /* }}} */
-	
-	function calendarNavigationBar($d){ /* {{{ */
-		$ds="&day=".$d[0]."&month=".$d[1]."&year=".$d[2];
-	
-		echo "<ul class=\"localNav\">\n";
-		echo "<li><a href=\"../out/out.Calendar.php?mode=w".$ds."\">".getMLText("week_view")."</a></li>\n";
-		echo "<li><a href=\"../out/out.Calendar.php?mode=m".$ds."\">".getMLText("month_view")."</a></li>\n";
-		echo "<li><a href=\"../out/out.Calendar.php?mode=y".$ds."\">".getMLText("year_view")."</a></li>\n";
-		if (!$this->params['user']->isGuest()) echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
-		echo "</ul>\n";
-		return;
-	
-	} /* }}} */
-
-	function pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
-
-		if (!is_numeric($pageNumber) || !is_numeric($totalPages) || $totalPages<2) {
-			return;
-		}
-
-		// Construct the basic URI based on the $_GET array. One could use a
-		// regular expression to strip out the pg (page number) variable to
-		// achieve the same effect. This seems to be less haphazard though...
-		$resultsURI = $baseURI;
-		$first=true;
-		foreach ($params as $key=>$value) {
-			// Don't include the page number in the basic URI. This is added in
-			// during the list display loop.
-			if (!strcasecmp($key, "pg")) {
-				continue;
-			}
-			if (is_array($value)) {
-				foreach ($value as $subvalue) {
-					$resultsURI .= ($first ? "?" : "&").$key."%5B%5D=".$subvalue;
-					$first = false;
-				}
-			}
-			else {
-					$resultsURI .= ($first ? "?" : "&").$key."=".$value;
-			}
-			$first = false;
-		}
-
-		echo "<div class=\"pageList\">";
-		echo getMLText("results_page").": ";
-		for ($i = 1; $i  <= $totalPages; $i++) {
-			if ($i == $pageNumber)  echo "<span class=\"selected\">".$i."</span> ";
-			else echo "<a href=\"".$resultsURI.($first ? "?" : "&")."pg=".$i."\">".$i."</a>"." ";
-		}
-		if ($totalPages>1) {
-			echo "<a href=\"".$resultsURI.($first ? "?" : "&")."pg=all\">".getMLText("all_pages")."</a>"." ";
-		}
-		echo "</div>";
-
-		return;
-	} /* }}} */
-
-	function contentContainer($content) { /* {{{ */
-		echo "<div class=\"contentContainer\">\n";
-		echo "<div class=\"content\">\n";
-		echo "<div class=\"content-l\"><div class=\"content-r\"><div class=\"content-br\"><div class=\"content-bl\">\n";
-		echo $content;
-		echo "</div></div></div></div>\n</div>\n</div>\n";
-		return;
-	} /* }}} */
-
-	function contentContainerStart() { /* {{{ */
-
-		echo "<div class=\"contentContainer\">\n";
-		echo "<div class=\"content\">\n";
-		echo "<div class=\"content-l\"><div class=\"content-r\"><div class=\"content-br\"><div class=\"content-bl\">\n";
-		return;
-	} /* }}} */
-
-	function contentContainerEnd() { /* {{{ */
-
-		echo "</div></div></div></div>\n</div>\n</div>\n";
-		return;
-	} /* }}} */
-
-	function contentHeading($heading, $noescape=false) { /* {{{ */
-
-		if($noescape)
-			echo "<div class=\"contentHeading\">".$heading."</div>\n";
-		else
-			echo "<div class=\"contentHeading\">".htmlspecialchars($heading)."</div>\n";
-		return;
-	} /* }}} */
-
-	function contentSubHeading($heading, $first=false) { /* {{{ */
-
-		echo "<div class=\"contentSubHeading\"".($first ? " id=\"first\"" : "").">".htmlspecialchars($heading)."</div>\n";
-		return;
-	} /* }}} */
-
-	function getMimeIcon($fileType) { /* {{{ */
-		// for extension use LOWER CASE only
-		$icons = array();
-		$icons["txt"]  = "txt.png";
-		$icons["text"] = "txt.png";
-		$icons["doc"]  = "word.png";
-		$icons["dot"]  = "word.png";
-		$icons["docx"] = "word.png";
-		$icons["dotx"] = "word.png";
-		$icons["rtf"]  = "document.png";
-		$icons["xls"]  = "excel.png";
-		$icons["xlt"]  = "excel.png";
-		$icons["xlsx"] = "excel.png";
-		$icons["xltx"] = "excel.png";
-		$icons["ppt"]  = "powerpoint.png";
-		$icons["pot"]  = "powerpoint.png";
-		$icons["pptx"] = "powerpoint.png";
-		$icons["potx"] = "powerpoint.png";
-		$icons["exe"]  = "binary.png";
-		$icons["html"] = "html.png";
-		$icons["htm"]  = "html.png";
-		$icons["gif"]  = "image.png";
-		$icons["jpg"]  = "image.png";
-		$icons["jpeg"] = "image.png";
-		$icons["bmp"]  = "image.png";
-		$icons["png"]  = "image.png";
-		$icons["tif"]  = "image.png";
-		$icons["tiff"] = "image.png";
-		$icons["log"]  = "log.png";
-		$icons["midi"] = "midi.png";
-		$icons["pdf"]  = "pdf.png";
-		$icons["wav"]  = "sound.png";
-		$icons["mp3"]  = "sound.png";
-		$icons["c"]    = "source_c.png";
-		$icons["cpp"]  = "source_cpp.png";
-		$icons["h"]    = "source_h.png";
-		$icons["java"] = "source_java.png";
-		$icons["py"]   = "source_py.png";
-		$icons["tar"]  = "tar.png";
-		$icons["gz"]   = "gz.png";
-		$icons["7z"]   = "gz.png";
-		$icons["bz"]   = "gz.png";
-		$icons["bz2"]  = "gz.png";
-		$icons["tgz"]  = "gz.png";
-		$icons["zip"]  = "gz.png";
-		$icons["rar"]  = "gz.png";
-		$icons["mpg"]  = "video.png";
-		$icons["avi"]  = "video.png";
-		$icons["tex"]  = "tex.png";
-		$icons["ods"]  = "x-office-spreadsheet.png";
-		$icons["ots"]  = "x-office-spreadsheet.png";
-		$icons["sxc"]  = "x-office-spreadsheet.png";
-		$icons["stc"]  = "x-office-spreadsheet.png";
-		$icons["odt"]  = "x-office-document.png";
-		$icons["ott"]  = "x-office-document.png";
-		$icons["sxw"]  = "x-office-document.png";
-		$icons["stw"]  = "x-office-document.png";
-		$icons["odp"]  = "ooo_presentation.png";
-		$icons["otp"]  = "ooo_presentation.png";
-		$icons["sxi"]  = "ooo_presentation.png";
-		$icons["sti"]  = "ooo_presentation.png";
-		$icons["odg"]  = "ooo_drawing.png";
-		$icons["otg"]  = "ooo_drawing.png";
-		$icons["sxd"]  = "ooo_drawing.png";
-		$icons["std"]  = "ooo_drawing.png";
-		$icons["odf"]  = "ooo_formula.png";
-		$icons["sxm"]  = "ooo_formula.png";
-		$icons["smf"]  = "ooo_formula.png";
-		$icons["mml"]  = "ooo_formula.png";
-
-		$icons["default"] = "default.png";
-
-		$ext = strtolower(substr($fileType, 1));
-		if (isset($icons[$ext])) {
-			return $icons[$ext];
-		}
-		else {
-			return $icons["default"];
-		}
-	} /* }}} */
-
-	function printDateChooser($defDate = -1, $varName) { /* {{{ */
-	
-		if ($defDate == -1)
-			$defDate = mktime();
-		$day   = date("d", $defDate);
-		$month = date("m", $defDate);
-		$year  = date("Y", $defDate);
-
-		print "<select name=\"" . $varName . "day\">\n";
-		for ($i = 1; $i <= 31; $i++)
-		{
-			print "<option value=\"" . $i . "\"";
-			if (intval($day) == $i)
-				print " selected";
-			print ">" . $i . "</option>\n";
-		}
-		print "</select> \n";
-		print "<select name=\"" . $varName . "month\">\n";
-		for ($i = 1; $i <= 12; $i++)
-		{
-			print "<option value=\"" . $i . "\"";
-			if (intval($month) == $i)
-				print " selected";
-			print ">" . $i . "</option>\n";
-		}
-		print "</select> \n";
-		print "<select name=\"" . $varName . "year\">\n";	
-		for ($i = $year-5 ; $i <= $year+5 ; $i++)
-		{
-			print "<option value=\"" . $i . "\"";
-			if (intval($year) == $i)
-				print " selected";
-			print ">" . $i . "</option>\n";
-		}
-		print "</select>";
-	} /* }}} */
-
-	function printSequenceChooser($objArr, $keepID = -1) { /* {{{ */
-		if (count($objArr) > 0) {
-			$max = $objArr[count($objArr)-1]->getSequence() + 1;
-			$min = $objArr[0]->getSequence() - 1;
-		}
-		else {
-			$max = 1.0;
-		}
-		print "<select name=\"sequence\">\n";
-		if ($keepID != -1) {
-			print "  <option value=\"keep\">" . getMLText("seq_keep");
-		}
-		print "  <option value=\"".$max."\">" . getMLText("seq_end");
-		if (count($objArr) > 0) {
-			print "  <option value=\"".$min."\">" . getMLText("seq_start");
-		}
-		for ($i = 0; $i < count($objArr) - 1; $i++) {
-			if (($objArr[$i]->getID() == $keepID) || (($i + 1 < count($objArr)) && ($objArr[$i+1]->getID() == $keepID))) {
-				continue;
-			}
-			$index = ($objArr[$i]->getSequence() + $objArr[$i+1]->getSequence()) / 2;
-			print "  <option value=\"".$index."\">" . getMLText("seq_after", array("prevname" => htmlspecialchars($objArr[$i]->getName())));
-		}
-		print "</select>";
-	} /* }}} */
-	
-	function printDocumentChooser($formName) { /* {{{ */
-?>
-		<script language="JavaScript">
-		var openDlg;
-		function chooseDoc<?php print $formName ?>() {
-			openDlg = open("../out/out.DocumentChooser.php?folderid=<?php echo $this->params['rootfolderid']?>&form=<?php echo urlencode($formName)?>", "openDlg", "width=480,height=480,scrollbars=yes,resizable=yes,status=yes");
-		}
-		</script>
-<?php
-		print "<input type=\"Hidden\" name=\"docid".$formName."\">";
-		print "<input disabled name=\"docname".$formName."\">";
-		print "&nbsp;&nbsp;<input type=\"Button\" value=\"".getMLText("document")."...\" onclick=\"chooseDoc".$formName."();\">";
-	} /* }}} */
-
-	function printFolderChooser($formName, $accessMode, $exclude = -1, $default = false) { /* {{{ */
-?>
-		<script language="JavaScript">
-		var openDlg;
-		function chooseFolder<?php print $formName ?>() {
-			openDlg = open("out.FolderChooser.php?form=<?php echo $formName?>&mode=<?php echo $accessMode?>&exclude=<?php echo $exclude?>", "openDlg", "width=480,height=480,scrollbars=yes,resizable=yes,status=yes");
-		}
-		</script>
-<?php
-		print "<input type=\"Hidden\" name=\"targetid".$formName."\" value=\"". (($default) ? $default->getID() : "") ."\">";
-		print "<input disabled name=\"targetname".$formName."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\">";
-		print "&nbsp;&nbsp;<input type=\"Button\" value=\"".getMLText("folder")."...\" onclick=\"chooseFolder".$formName."();\">";
-	} /* }}} */
-
-	function printCategoryChooser($formName, $categories=array()) { /* {{{ */
-?>
-		<script language="JavaScript">
-		var openDlg;
-		function chooseCategory<?php print $formName ?>() {
-			var current = document.<?php echo $formName ?>.categoryid<?php echo $formName ?>;
-			openDlg = open("out.CategoryChooser.php?form=<?php echo $formName?>&cats="+current.value, "openDlg", "width=480,height=480,scrollbars=yes,resizable=yes,status=yes");
-		}
-		function clearCategory<?php print $formName ?>() {
-			document.<?php echo $formName ?>.categoryid<?php echo $formName ?>.value = '';
-			document.<?php echo $formName ?>.categoryname<?php echo $formName ?>.value = '';
-		}
-		</script>
-<?php
-		$ids = $names = array();
-		if($categories) {
-			foreach($categories as $cat) {
-				$ids[] = $cat->getId();
-				$names[] = htmlspecialchars($cat->getName());
-			}
-		}
-		print "<input type=\"hidden\" name=\"categoryid".$formName."\" value=\"".implode(',', $ids)."\">";
-		print "<input disabled name=\"categoryname".$formName."\" value=\"".implode(' ', $names)."\">";
-		print "&nbsp;&nbsp;<a href=\"javascript:clearCategory".$formName."();\"><img src=\"images/del.gif\" width=\"15\" height=\"15\" border=\"0\" align=\"absmiddle\" alt=\"\"></a>";
-		print "&nbsp;&nbsp;<input type=\"Button\" value=\"".getMLText("category")."...\" onclick=\"chooseCategory".$formName."();\">";
-	} /* }}} */
-
-	function printDropFolderChooser($formName, $dropfolderfile="") { /* {{{ */
-?>
-		<script language="JavaScript">
-		var openDlg;
-		function chooseDropFolderFile<?php print $formName ?>() {
-			var current = document.<?php echo $formName ?>.dropfolderfile<?php echo $formName ?>;
-			openDlg = open("out.DropFolderChooser.php?form=<?php echo $formName?>&dropfolderfile="+current.value, "openDlg", "width=480,height=480,scrollbars=yes,resizable=yes,status=yes");
-		}
-		function clearFilename<?php print $formName ?>() {
-			document.<?php echo $formName ?>.dropfolderfile<?php echo $formName ?>.value = '';
-		}
-		</script>
-<?php
-		print "<input readonly name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
-		print "&nbsp;&nbsp;<a href=\"javascript:clearFilename".$formName."();\"><img src=\"images/del.gif\" width=\"15\" height=\"15\" border=\"0\" align=\"absmiddle\" alt=\"\"></a>";
-		print "&nbsp;&nbsp;<input type=\"Button\" value=\"".getMLText("choose_target_file")."...\" onclick=\"chooseDropFolderFile".$formName."();\">";
-	} /* }}} */
-
-	function printAttributeEditField($attrdef, $objvalue, $fieldname='attributes') { /* {{{ */
-		if($valueset = $attrdef->getValueSetAsArray()) {
-			echo "<select name=\"".$fieldname."[".$attrdef->getId()."]\">";
-			if($attrdef->getMinValues() < 1) {
-				echo "<option value=\"\"></option>";
-			}
-			foreach($valueset as $value) {
-				echo "<option value=\"".htmlspecialchars($value)."\"";
-				if($value == $objvalue)
-					echo " selected";
-				echo ">".htmlspecialchars($value)."</option>";
-			}
-			echo "</select>";
-		} else {
-			echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\" />";
-		}
-	} /* }}} */
-
-	function getImgPath($img) { /* {{{ */
-
-		if ( is_file("../styles/$this->theme/images/$img") ) {
-			return "../styles/$this->theme/images/$img";
-		}
-		else if ( is_file("../styles/$this->theme/img/$img") ) {
-			return "../styles/$this->theme/img/$img";
-		}
-		return "../out/images/$img";
-	} /* }}} */
-
-	function printImgPath($img) { /* {{{ */
-		print $this->getImgPath($img);
-	} /* }}} */
-
-	function exitError($pagetitle,$error) { /* {{{ */
-	
-		$this->htmlStartPage($pagetitle);
-		$this->globalNavigation();
-
-		print "<div class=\"error\">";
-		print htmlspecialchars($error);
-		print "</div>";
-		
-		$this->htmlEndPage();
-		
-		add_log_line(" UI:exitError error=".$error." pagetitle=".$pagetitle);
-		
-		exit;	
-	} /* }}} */
-
-	// navigation flag is used for items links (navigation or selection)
-	function printFoldersTree($accessMode, $exclude, $folderID, $currentFolderID=-1, $navigation=false) {	/* {{{ */
-		if ($this->params['expandfoldertree']==2){
-		
-			// folder completely open
-			$is_open=true;
-			
-		}else if ($this->params['expandfoldertree']==1 && $folderID==$this->params['rootfolderid'] ){
-		
-			$is_open=true;
-			
-		}else{
-			// open the tree until the current folder
-			$is_open=false;
-			
-			if ($currentFolderID!=-1){
-				
-				$currentFolder=$this->params['dms']->getFolder($currentFolderID);
-				
-				if (is_object($currentFolder)){
-				
-					$parent=$currentFolder->getParent();
-					
-					while (is_object($parent)){
-						if ($parent->getID()==$folderID){
-							$is_open=true;
-							break;
-						}
-						$parent=$parent->getParent();
-					}
-				}
-			}
-		}
-		
-		$folder = $this->params['dms']->getFolder($folderID);
-		if (!is_object($folder)) return;
-		
-		$subFolders = $folder->getSubFolders();
-		$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $this->params['user'], M_READ);
-		
-		if ($folderID == $this->params['rootfolderid']) print "<ul style='list-style-type: none;' class='tree'>\n";
-
-		print "<li>\n";
-
-		if (count($subFolders) > 0){
-			print "<a href=\"javascript:toggleTree(".$folderID.")\"><img class='treeicon' name=\"treedot".$folderID."\" src=\"";	
-			if ($is_open) $this->printImgPath("minus.png");
-			else $this->printImgPath("plus.png");
-			print "\" border=0></a>\n";
-		}
-		else{
-			print "<img class='treeicon' src=\"";	
-			$this->printImgPath("blank.png");
-			print "\" border=0>\n";
-		}
-
-		if ($folder->getAccessMode($this->params['user']) >= $accessMode) {
-
-			if ($folderID != $currentFolderID){
-			
-				if ($navigation) print "<a href=\"../out/out.ViewFolder.php?folderid=" . $folderID . "&showtree=1\">";
-				else print "<a class=\"foldertree_selectable\" href=\"javascript:folderSelected(" . $folderID . ", '" . str_replace("'", "\\'", htmlspecialchars($folder->getName())) . "')\">";
-
-			}else print "<span class=\"selectedfoldertree\">";
-			
-			if ($is_open) print "<img src=\"".$this->getImgPath("folder_opened.gif")."\" border=0 name=\"treeimg".$folderID."\">".htmlspecialchars($folder->getName());
-			else print "<img src=\"".$this->getImgPath("folder_closed.gif")."\" border=0 name=\"treeimg".$folderID."\">".htmlspecialchars($folder->getName());
-
-			if ($folderID != $currentFolderID) print "</a>\n";
-			else print "</span>";
-
-		}
-		else print "<img src=\"".$this->getImgPath("folder_closed.gif")."\" width=18 height=18 border=0>".htmlspecialchars($folder->getName())."\n";
-
-		if ($is_open) print "<ul style='list-style-type: none;' id=\"tree".$folderID."\" >\n";
-		else print "<ul style='list-style-type: none; display: none;' id=\"tree".$folderID."\" >\n";
-		
-		for ($i = 0; $i < count($subFolders); $i++) {
-		
-			if ($subFolders[$i]->getID() == $exclude) continue;
-			
-			$this->printFoldersTree( $accessMode, $exclude, $subFolders[$i]->getID(),$currentFolderID,$navigation);
-		}
-
-		print "</ul>\n";
-		
-		if ($folderID == $this->params['rootfolderid']) print "</ul>\n";
-	} /* }}} */
-
-	function printTreeNavigation($folderid,$showtree){ /* {{{ */
-?>
-		<script language="JavaScript">
-		function toggleTree(id){
-			
-			obj = document.getElementById("tree" + id);
-			
-			if ( obj.style.display == "none" ){
-				obj.style.display = "";
-				document["treeimg" + id].src = "<?php $this->printImgPath("folder_opened.gif"); ?>";
-				document["treedot" + id].src = "<?php $this->printImgPath("minus.png"); ?>";
-			}else{
-				obj.style.display = "none";
-				document["treeimg" + id].src = "<?php $this->printImgPath("folder_closed.gif"); ?>";
-				document["treedot" + id].src = "<?php $this->printImgPath("plus.png"); ?>";
-			}
-
-		}
-		</script>
-<?php
-	
-		print "<table width=\"100%\"><tr>";
-
-		if ($showtree==1){
-
-			print "<td id='tree-open'>";
-
-			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><img src=\"".UI::getImgPath("m.png")."\" border=0></a>", true);
-			$this->contentContainerStart();
-			$this->printFoldersTree(M_READ, -1, $this->params['rootfolderid'], $folderid, true);
-			$this->contentContainerEnd();
-
-		}else{
-		
-			print "<td id='tree-closed'>";		
-		
-			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=1\"><img src=\"".UI::getImgPath("p.png")."\" border=0></a>", true);
-			$this->contentContainerStart();
-			$this->contentContainerEnd();
-		}
-
-		print "</td><td>";
-	} /* }}} */
-
-	/**
-	 * Output HTML Code for jumploader
-	 *
-	 * @param string $uploadurl URL where post data is send
-	 * @param integer $folderid id of folder where document is saved
-	 * @param integer $maxfiles maximum number of files allowed to upload
-	 * @param array $fields list of post fields
-	 */
-	function printUploadApplet($uploadurl, $attributes, $maxfiles=0, $fields=array()){ /* {{{ */
-?>
-<applet id="jumpLoaderApplet" name="jumpLoaderApplet"
-code="jmaster.jumploader.app.JumpLoaderApplet.class"
-archive="jl_core_z.jar"
-width="715"
-height="400"
-mayscript>
-  <param name="uc_uploadUrl" value="<?php echo $uploadurl ?>"/>
-  <param name="ac_fireAppletInitialized" value="true"/>
-  <param name="ac_fireUploaderSelectionChanged" value="true"/>
-  <param name="ac_fireUploaderFileStatusChanged" value="true"/>
-  <param name="ac_fireUploaderFileAdded" value="true"/>
-  <param name="uc_partitionLength" value="<?php echo $this->params['partitionsize'] ?>"/>
-<?php
-	if($maxfiles) {
-?>
-  <param name="uc_maxFiles" value="<?php echo $maxfiles ?>"/>
-<?php
-	}
-?>
-</applet>
-<div id="fileLinks">
-</div>
-
-<!-- callback methods -->
-<script language="javascript">
-    /**
-     * applet initialized notification
-     */
-    function uploaderInitialized(  ) {
-        var uploader = document.jumpLoaderApplet.getUploader();
-        var attrSet = uploader.getAttributeSet();
-        var attr;
-<?php
-	foreach($attributes as $name=>$value) {
-?>
-        attr = attrSet.createStringAttribute( '<?php echo $name ?>', '<?php echo $value ?>' );
-        attr.setSendToServer(true);
-<?php
-	}
-?>
-    }
-    /**
-     * uploader selection changed notification
-     */
-    function uploaderSelectionChanged( uploader ) {
-        dumpAllFileAttributes();
-    }
-    /**
-     * uploader file added notification
-     */
-    function uploaderFileAdded( uploader ) {
-        dumpAllFileAttributes();
-    }
-    /**
-     * file status changed notification
-     */
-    function uploaderFileStatusChanged( uploader, file ) {
-        traceEvent( "uploaderFileStatusChanged, index=" + file.getIndex() + ", status=" + file.getStatus() + ", content=" + file.getResponseContent() );
-        if( file.isFinished() ) { 
-            var serverFileName = file.getId() + "." + file.getName(); 
-            var linkHtml = "<a href='/uploaded/" + serverFileName + "'>" + serverFileName + "</a> " + file.getLength() + " bytes"; 
-            var container = document.getElementById( "fileLinks"); 
-            container.innerHTML += linkHtml + "<br />"; 
-        } 
-    }
-    /**
-     * trace event to events textarea
-     */
-    function traceEvent( message ) {
-        document.debugForm.txtEvents.value += message + "\r\n";
-    }
-</script>
-
-<!-- debug auxiliary methods -->
-<script language="javascript">
-    /**
-     * list attributes of file into html
-     */
-    function listFileAttributes( file, edit, index ) {
-        var attrSet = file.getAttributeSet();
-        var content = "";
-        var attr;
-				var value;
-				if(edit)
-					content += "<form name='form" + index + "' id='form" + index + "' action='#' >";
-        content += "<table>";
-				content += "<tr class='dataRow' colspan='2'><td class='dataText'><b>" + file.getName() + "</b></td></tr>";
-
-<?php
-	if(!$fields || (isset($fields['name']) && $fields['name'])) {
-?>
-        content += "<tr class='dataRow'>";
-        content += "<td class='dataField'><?php echo getMLText('name') ?></td>";
-				if(attr = attrSet.getAttributeByName('name'))
-					value = attr.getStringValue();
-				else
-					value = '';
-				if(edit)
-					value = "<input id='name" + index + "' name='name' type='input' value='" + value + "' />";
-        content += "<td class='dataText'>" + value + "</td>";
-        content += "</tr>";
-<?php
-	}
-?>
-
-<?php
-	if(!$fields || (isset($fields['comment']) && $fields['comment'])) {
-?>
-        content += "<tr class='dataRow'>";
-        content += "<td class='dataField'><?php echo getMLText('comment') ?></td>";
-				if(attr = attrSet.getAttributeByName('comment'))
-					value = attr.getStringValue();
-				else
-					value = '';
-				if(edit)
-					value = "<textarea id='comment" + index + "' name='comment' cols='40' rows='2'>" + value + "</textarea>";
-        content += "<td class='dataText'>" + value + "</td>";
-        content += "</tr>";
-<?php
-	}
-?>
-
-<?php
-	if(!$fields || (isset($fields['reqversion']) && $fields['reqversion'])) {
-?>
-        content += "<tr class='dataRow'>";
-        content += "<td class='dataField'><?php echo getMLText('version') ?></td>";
-				if(attr = attrSet.getAttributeByName('reqversion'))
-					value = attr.getStringValue();
-				else
-					value = '';
-				if(edit)
-					value = "<input id='reqversion" + index + "' name='reqversion' type='input' value='" + value + "' />";
-        content += "<td class='dataText'>" + value + "</td>";
-        content += "</tr>";
-<?php
-	}
-?>
-
-<?php
-	if(!$fields || (isset($fields['version_comment']) && $fields['version_comment'])) {
-?>
-        content += "<tr class='dataRow'>";
-        content += "<td class='dataField'><?php echo getMLText('comment_for_current_version') ?></td>";
-				if(attr = attrSet.getAttributeByName('version_comment'))
-					value = attr.getStringValue();
-				else
-					value = '';
-				if(edit)
-					value = "<textarea id='version_comment" + index + "' name='version_comment' cols='40' rows='2'>" + value + "</textarea>";
-        content += "<td class='dataText'>" + value + "</td>";
-        content += "</tr>";
-<?php
-	}
-?>
-
-<?php
-	if(!$fields || (isset($fields['keywords']) && $fields['keywords'])) {
-?>
-        content += "<tr class='dataRow'>";
-        content += "<td class='dataField'><?php echo getMLText('keywords') ?></td>";
-				if(attr = attrSet.getAttributeByName('keywords'))
-					value = attr.getStringValue();
-				else
-					value = '';
-				if(edit) {
-					value = "<textarea id='keywords" + index + "' name='keywords' cols='40' rows='2'>" + value + "</textarea>";
-					value += "<br /><a href='javascript:chooseKeywords(\"form" + index + ".keywords" + index +"\");'><?php echo getMLText("use_default_keywords");?></a>";
-				}
-        content += "<td class='dataText'>" + value + "</td>";
-        content += "</tr>";
-<?php
-	}
-?>
-
-<?php
-	if(!$fields || (isset($fields['categories']) && $fields['categories'])) {
-?>
-				content += "<tr class='dataRow'>";
-				content += "<td class='dataField'><?php echo getMLText('categories') ?></td>";
-				if(attr = attrSet.getAttributeByName('categoryids'))
-					value = attr.getStringValue();
-				else
-					value = '';
-				if(attr = attrSet.getAttributeByName('categorynames'))
-					value2 = attr.getStringValue();
-				else
-					value2 = '';
-				if(edit) {
-					value = "<input type='hidden' id='categoryidform" + index + "' name='categoryids' value='" + value + "' />";
-					value += "<input disabled id='categorynameform" + index + "' name='categorynames' value='" + value2 + "' />";
-					value += "<br /><a href='javascript:chooseCategory(\"form" + index + "\", \"\");'><?php echo getMLText("use_default_categories");?></a>";
-				} else {
-					value = value2;
-				}
-        content += "<td class='dataText'>" + value + "</td>";
-				content += "</tr>";
-<?php
-	}
-?>
-
-				if(edit) {
-					content += "<tr class='dataRow'>";
-					content += "<td class='dataField'></td>";
-					content += "<td class='dataText'><input type='button' value='Set' onClick='updateFileAttributes("+index+")'/></td>";
-					content += "</tr>";
-        	content += "</table>";
-        	content += "</form>";
-				} else {
-        	content += "</table>";
-				}
-        return content;
-    }
-    /**
-     * return selected file if and only if single file selected
-     */
-    function getSelectedFile() {
-        var file = null;
-        var uploader = document.jumpLoaderApplet.getUploader();
-        var selection = uploader.getSelection();
-        var numSelected = selection.getSelectedItemCount();
-        if( numSelected == 1 ) {
-            var selectedIndex = selection.getSelectedItemIndexAt( 0 );
-            file = uploader.getFile( selectedIndex );
-        }
-        return file;
-    }
-    /**
-     * dump attributes of all files into html
-     */
-     function dumpAllFileAttributes() {
-         var content = "";
-         var uploader = document.jumpLoaderApplet.getUploader();
-         var files = uploader.getAllFiles();
-         var file = getSelectedFile();
-				 if(file) {
-					 for (var i = 0; i < uploader.getFileCount() ; i++) { 
-						 if(uploader.getFile(i).getIndex() == file.getIndex())
-							 content += listFileAttributes( uploader.getFile(i), 1, i );
-						 else
-							 content += listFileAttributes( uploader.getFile(i), 0, i );
-					 }
-					 document.getElementById( "fileList" ).innerHTML = content;
-				 }
-    }
-     /**
-      * update attributes for the selected file
-      */
-      function updateFileAttributes(index) {
-        var uploader = document.jumpLoaderApplet.getUploader();
-        var file = uploader.getFile( index );
-        if( file != null ) {
-				  var attr;
-					var value;
-          var attrSet = file.getAttributeSet();
-					value = document.getElementById("name"+index);
-          attr = attrSet.createStringAttribute( 'name', (value.value) ? value.value : "" );
-          attr.setSendToServer( true );
-					value = document.getElementById("comment"+index);
-          attr = attrSet.createStringAttribute( 'comment', (value.value) ? value.value : ""  );
-          attr.setSendToServer( true );
-					value = document.getElementById("reqversion"+index);
-          attr = attrSet.createStringAttribute( 'reqversion', (value.value) ? value.value : ""  );
-          attr.setSendToServer( true );
-					value = document.getElementById("version_comment"+index);
-          attr = attrSet.createStringAttribute( 'version_comment', (value.value) ? value.value : ""  );
-          attr.setSendToServer( true );
-					value = document.getElementById("keywords"+index);
-          attr = attrSet.createStringAttribute( 'keywords', (value.value) ? value.value : ""  );
-          attr.setSendToServer( true );
-
-					value = document.getElementById("categoryidform"+index);
-          attr = attrSet.createStringAttribute( 'categoryids', (value.value) ? value.value : ""  );
-          attr.setSendToServer( true );
-
-					value = document.getElementById("categorynameform"+index);
-          attr = attrSet.createStringAttribute( 'categorynames', (value.value) ? value.value : ""  );
-          attr.setSendToServer( true );
-
-					dumpAllFileAttributes();
-        } else {
-            alert( "Single file should be selected" );
-        }
-     }
-</script>
-<form name="debugForm">
-<textarea name="txtEvents" style="visibility: hidden;width:715px; font:10px monospace" rows="1" wrap="off" id="txtEvents"></textarea></p>
-</form>
-<p></p>
-<p id="fileList"></p>
-<?php
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.Calendar.php b/views/blue/class.Calendar.php
deleted file mode 100644
index 66828e391..000000000
--- a/views/blue/class.Calendar.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/**
- * Implementation of Calendar view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Calendar view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_Calendar extends SeedDMS_Blue_Style {
-
-	function generateCalendarArrays() { /* {{{ */
-		$this->monthNames = array( getMLText("january"),
-												 getMLText("february"),
-												 getMLText("march"),
-												 getMLText("april"),
-												 getMLText("may"), 
-												 getMLText("june"),
-												 getMLText("july"), 
-												 getMLText("august"), 
-												 getMLText("september"), 
-												 getMLText("october"), 
-												 getMLText("november"), 
-												 getMLText("december") );
-												
-		$this->dayNamesLong = array( getMLText("sunday"),
-													 getMLText("monday"),
-													 getMLText("tuesday"),
-													 getMLText("wednesday"), 
-													 getMLText("thursday"),
-													 getMLText("friday"), 
-													 getMLText("saturday") );
-		
-		$this->dayNames = array();
-		foreach ( $this->dayNamesLong as $dn ){
-			 $this->dayNames[] = substr($dn,0,3);   
-		}         
-	} /* }}} */
-
-	// Calculate the number of days in a month, taking into account leap years.
-	function getDaysInMonth($month, $year) { /* {{{ */
-		if ($month < 1 || $month > 12) return 0;
-
-		$daysInMonth = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-		$d = $daysInMonth[$month - 1];
-
-		if ($month == 2){
-		
-			if ($year%4 == 0){
-			
-				if ($year%100 == 0){
-				
-					if ($year%400 == 0) $d = 29;
-				}
-				else $d = 29;
-			}
-		}
-		return $d;
-	} /* }}} */
-
-	// Adjust dates to allow months > 12 and < 0 and day<0 or day>days of the month
-	function adjustDate(&$day,&$month,&$year) { /* {{{ */
-		$d=getDate(mktime(12,0,0, $month, $day, $year));
-		$month=$d["mon"];
-		$day=$d["mday"];
-		$year=$d["year"];
-	} /* }}} */
-
-	// Generate the HTML for a given month
-	function getMonthHTML($month, $year) { /* {{{ */
-		if (!isset($this->monthNames)) $this->generateCalendarArrays();
-		if (!isset($this->dayNames)) $this->generateCalendarArrays();
-
-		$startDay = $this->firstdayofweek;
-
-		$day=1;
-		$this->adjustDate($day,$month,$year);
-
-		$daysInMonth = $this->getDaysInMonth($month, $year);
-		$date = getdate(mktime(12, 0, 0, $month, 1, $year));
-
-		$first = $date["wday"];
-		$monthName = $this->monthNames[$month - 1];
-
-		$s  = "<table border=0>\n";
-		
-		$s .= "<tr>\n";
-		$s .= "<td align=\"center\" class=\"header\" colspan=\"7\"><a href=\"../out/out.Calendar.php?mode=m&year=".$year."&month=".$month."\">".$monthName."</a></td>\n"; ;
-		$s .= "</tr>\n";
-
-		$s .= "<tr>\n";
-		$s .= "<td class=\"header\">" . $this->dayNames[($startDay)%7] . "</td>\n";
-		$s .= "<td class=\"header\">" . $this->dayNames[($startDay+1)%7] . "</td>\n";
-		$s .= "<td class=\"header\">" . $this->dayNames[($startDay+2)%7] . "</td>\n";
-		$s .= "<td class=\"header\">" . $this->dayNames[($startDay+3)%7] . "</td>\n";
-		$s .= "<td class=\"header\">" . $this->dayNames[($startDay+4)%7] . "</td>\n";
-		$s .= "<td class=\"header\">" . $this->dayNames[($startDay+5)%7] . "</td>\n";
-		$s .= "<td class=\"header\">" . $this->dayNames[($startDay+6)%7] . "</td>\n";
-		$s .= "</tr>\n";
-
-		// We need to work out what date to start at so that the first appears in the correct column
-		$d = $startDay + 1 - $first;
-		while ($d > 1) $d -= 7;
-
-		// Make sure we know when today is, so that we can use a different CSS style
-		$today = getdate(time());
-
-		while ($d <= $daysInMonth)
-		{
-			$s .= "<tr>\n";       
-				
-			for ($i = 0; $i < 7; $i++){
-			
-				$class = ($year == $today["year"] && $month == $today["mon"] && $d == $today["mday"]) ? "today" : "";
-				$s .= "<td class=\"$class\">";   
-						
-				if ($d > 0 && $d <= $daysInMonth){
-
-					$s .= "<a href=\"../out/out.Calendar.php?mode=w&year=".$year."&month=".$month."&day=".$d."\">".$d."</a>";
-							}
-				else $s .= "&nbsp;";
-				
-				$s .= "</td>\n";       
-				$d++;
-			}
-			$s .= "</tr>\n";    
-		}
-
-		$s .= "</table>\n";
-
-		return $s;  	
-	} /* }}} */
-
-	function printYearTable($year) { /* {{{ */
-		print "<table class=\"calendaryear\" border=\"0\">\n";
-		print "<tr>";
-		print "<td>" . $this->getMonthHTML(1 , $year) ."</td>\n";
-		print "<td>" . $this->getMonthHTML(2 , $year) ."</td>\n";
-		print "<td>" . $this->getMonthHTML(3 , $year) ."</td>\n";
-		print "<td>" . $this->getMonthHTML(4 , $year) ."</td>\n";
-		print "</tr>\n";
-		print "<tr>\n";
-		print "<td>" . $this->getMonthHTML(5 , $year) ."</td>\n";
-		print "<td>" . $this->getMonthHTML(6 , $year) ."</td>\n";
-		print "<td>" . $this->getMonthHTML(7 , $year) ."</td>\n";
-		print "<td>" . $this->getMonthHTML(8 , $year) ."</td>\n";
-		print "</tr>\n";
-		print "<tr>\n";
-		print "<td>" . $this->getMonthHTML(9 , $year) ."</td>\n";
-		print "<td>" . $this->getMonthHTML(10, $year) ."</td>\n";
-		print "<td>" . $this->getMonthHTML(11, $year) ."</td>\n";
-		print "<td>" . $this->getMonthHTML(12, $year) ."</td>\n";
-		print "</tr>\n";
-		print "</table>\n";
-	} /* }}} */
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$mode = $this->params['mode'];
-		$year = $this->params['year'];
-		$month = $this->params['month'];
-		$day = $this->params['day'];
-		$this->firstdayofweek = $this->params['firstdayofweek'];
-
-		$this->adjustDate($day,$month,$year);
-
-		$this->htmlStartPage(getMLText("calendar"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("calendar"), "calendar",array($day,$month,$year));
-
-		if ($mode=="y"){
-
-			$this->contentHeading(getMLText("year_view")." : ".$year);
-			$this->contentContainerStart();
-			
-			print "<a href=\"../out/out.Calendar.php?mode=y&year=".($year-1)."\"><img src=\"".$this->getImgPath("m.png")."\" border=0></a>&nbsp;";
-			print "<a href=\"../out/out.Calendar.php?mode=y\"><img src=\"".$this->getImgPath("c.png")."\" border=0></a>&nbsp;";
-			print "<a href=\"../out/out.Calendar.php?mode=y&year=".($year+1)."\"><img src=\"".$this->getImgPath("p.png")."\" border=0></a>&nbsp;";
-
-			$this->printYearTable($year);
-			$this->contentContainerEnd();
-
-		}else if ($mode=="m"){
-
-			if (!isset($this->dayNamesLong)) $this->generateCalendarArrays();
-			if (!isset($this->monthNames)) $this->generateCalendarArrays();
-			
-			$this->contentHeading(getMLText("month_view")." : ".$this->monthNames[$month-1]. " ".$year);
-			$this->contentContainerStart();
-			
-			print "<a href=\"../out/out.Calendar.php?mode=m&year=".($year)."&month=".($month-1)."\"><img src=\"".$this->getImgPath("m.png")."\" border=0></a>&nbsp;";
-			print "<a href=\"../out/out.Calendar.php?mode=m\"><img src=\"".$this->getImgPath("c.png")."\" border=0></a>&nbsp;";
-			print "<a href=\"../out/out.Calendar.php?mode=m&year=".($year)."&month=".($month+1)."\"><img src=\"".$this->getImgPath("p.png")."\" border=0></a>&nbsp;";
-			
-			$days = $this->getDaysInMonth($month, $year);
-			$today = getdate(time());
-			
-			$events = getEventsInInterval(mktime(0,0,0, $month, 1, $year), mktime(23,59,59, $month, $days, $year));
-			
-			echo "<table class='calendarmonth'>\n";
-			
-			for ($i=1; $i<=$days; $i++){
-			
-				// separate weeks
-				$date = getdate(mktime(12, 0, 0, $month, $i, $year));
-				if (($date["wday"]==$this->firstdayofweek) && ($i!=1))
-					echo "<tr><td class='separator' colspan='".(count($events)+2)."'>&nbsp;</td></tr>\n";
-				
-				// highlight today
-				$class = ($year == $today["year"] && $month == $today["mon"] && $i == $today["mday"]) ? "todayHeader" : "header";
-				
-				echo "<tr>";
-				echo "<td class='".$class."'><a href=\"../out/out.Calendar.php?mode=w&year=".($year)."&month=".($month)."&day=".($i)."\">".$i."</a></td>";
-				echo "<td class='".$class."'><a href=\"../out/out.Calendar.php?mode=w&year=".($year)."&month=".($month)."&day=".($i)."\">".$this->dayNamesLong[$date["wday"]]."</a></td>";
-				
-				if ($class=="todayHeader") $class="today";
-				else $class="";
-				
-				$xdate=mktime(0, 0, 0, $month, $i, $year);
-				foreach ($events as $event){
-					if (($event["start"]<=$xdate)&&($event["stop"]>=$xdate)){
-					
-						if (strlen($event['name']) > 25) $event['name'] = substr($event['name'], 0, 22) . "...";
-						print "<td class='".$class."'><a href=\"../out/out.ViewEvent.php?id=".$event['id']."\">".htmlspecialchars($event['name'])."</a></td>";
-					}else{
-						print "<td class='".$class."'>&nbsp;</td>";
-					}
-				}
-				
-				echo "</tr>\n";	
-			}
-			echo "</table>\n";
-
-			$this->contentContainerEnd();
-			
-		}else{
-
-			if (!isset($this->dayNamesLong)) $this->generateCalendarArrays();
-			if (!isset($this->monthNames)) $this->generateCalendarArrays();
-			
-			// get the week interval - TODO: $GET
-			$datestart=getdate(mktime(0,0,0,$month,$day,$year));
-			while($datestart["wday"]!=$this->firstdayofweek){
-				$datestart=getdate(mktime(0,0,0,$datestart["mon"],$datestart["mday"]-1,$datestart["year"]));
-			}
-				
-			$datestop=getdate(mktime(23,59,59,$month,$day,$year));
-			if ($datestop["wday"]==$this->firstdayofweek){
-				$datestop=getdate(mktime(23,59,59,$datestop["mon"],$datestop["mday"]+1,$datestop["year"]));
-			}
-			while($datestop["wday"]!=$this->firstdayofweek){
-				$datestop=getdate(mktime(23,59,59,$datestop["mon"],$datestop["mday"]+1,$datestop["year"]));
-			}
-			$datestop=getdate(mktime(23,59,59,$datestop["mon"],$datestop["mday"]-1,$datestop["year"]));
-			
-			$starttime=mktime(0,0,0,$datestart["mon"],$datestart["mday"],$datestart["year"]);
-			$stoptime=mktime(23,59,59,$datestop["mon"],$datestop["mday"],$datestop["year"]);
-			
-			$today = getdate(time());
-			$events = getEventsInInterval($starttime,$stoptime);
-			
-			$this->contentHeading(getMLText("week_view")." : ".getReadableDate(mktime(12, 0, 0, $month, $day, $year)));
-			$this->contentContainerStart();
-			
-			print "<a href=\"../out/out.Calendar.php?mode=w&year=".($year)."&month=".($month)."&day=".($day-7)."\"><img src=\"".$this->getImgPath("m.png")."\" border=0></a>&nbsp;";
-			print "<a href=\"../out/out.Calendar.php?mode=w\"><img src=\"".$this->getImgPath("c.png")."\" border=0></a>&nbsp;";
-			print "<a href=\"../out/out.Calendar.php?mode=w&year=".($year)."&month=".($month)."&day=".($day+7)."\"><img src=\"".$this->getImgPath("p.png")."\" border=0></a>&nbsp;";
-			
-			echo "<table class='calendarweek'>\n";
-			
-			for ($i=$starttime; $i<$stoptime; $i += 86400){
-			
-				$date = getdate($i);
-				
-				// for daylight saving time TODO: could be better
-				if ( ($i!=$starttime) && ($prev_day==$date["mday"]) ){
-					$i += 3600;
-					$date = getdate($i);
-				}
-				
-				// highlight today
-				$class = ($date["year"] == $today["year"] && $date["mon"] == $today["mon"] && $date["mday"]  == $today["mday"]) ? "todayHeader" : "header";
-				
-				echo "<tr>";
-				echo "<td class='".$class."'>".getReadableDate($i)."</td>";
-				echo "<td class='".$class."'>".$this->dayNamesLong[$date["wday"]]."</td>";
-				
-				if ($class=="todayHeader") $class="today";
-				else $class="";
-				
-				foreach ($events as $event){
-					if (($event["start"]<=$i)&&($event["stop"]>=$i)){
-						print "<td class='".$class."'><a href=\"../out/out.ViewEvent.php?id=".$event['id']."\">".htmlspecialchars($event['name'])."</a></td>";
-					}else{
-						print "<td class='".$class."'>&nbsp;</td>";
-					}
-				}
-				
-				echo "</tr>\n";	
-				
-				$prev_day=$date["mday"];
-			}
-			echo "</table>\n";
-
-			$this->contentContainerEnd();
-		}
-
-		$this->htmlEndPage();
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.Categories.php b/views/blue/class.Categories.php
deleted file mode 100644
index caf638c6d..000000000
--- a/views/blue/class.Categories.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Implementation of Categories view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Categories view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_Categories extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$categories = $this->params['categories'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-?>
-
-<script language="JavaScript">
-obj = -1;
-function showCategories(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-	
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-	
-	obj = document.getElementById("categories" + id);
-	obj.style.display = "";
-}
-</script>
-<?php
-		$this->contentHeading(getMLText("global_document_categories"));
-		$this->contentContainerStart();
-?>
-	<table>
-	<tr>
-		<td><?php echo getMLText("selection")?>:</td>
-		<td>
-			<select onchange="showCategories(this)" id="selector">
-				<option value="-1"><?php echo getMLText("choose_category")?>
-				<option value="0"><?php echo getMLText("new_document_category")?>
-
-				<?php
-				
-				$selected=0;
-				$count=2;				
-				foreach ($categories as $category) {
-				
-					if (isset($_GET["categoryid"]) && $category->getID()==$_GET["categoryid"]) $selected=$count;				
-					print "<option value=\"".$category->getID()."\">" . htmlspecialchars($category->getName());
-					$count++;
-				}
-				?>
-			</select>
-			&nbsp;&nbsp;
-		</td>
-
-		<td id="categories0" style="display : none;">	
-			<form action="../op/op.Categories.php" method="post">
-  		<?php echo createHiddenFieldWithKey('addcategory'); ?>
-			<input type="Hidden" name="action" value="addcategory">
-			<?php printMLText("name");?> : <input name="name">
-			<input type="submit" value="<?php printMLText("new_document_category"); ?>">
-			</form>
-		</td>
-	
-<?php	
-			foreach ($categories as $category) {
-				print "<td id=\"categories".$category->getID()."\" style=\"display : none;\">";	
-?>
-			<table>
-				<tr>
-					<td colspan="2">
-<?php
-		if(!$category->isUsed()) {
-?>
-						<form style="display: inline-block;" method="post" action="../op/op.Categories.php" >
-						<?php echo createHiddenFieldWithKey('removecategory'); ?>
-						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<input type="Hidden" name="action" value="removecategory">
-						<input value="<?php echo getMLText("rm_document_category")?>" type="submit">
-						</form>
-<?php
-		} else {
-?>
-						<p><?php echo getMLText('category_in_use') ?></p>
-<?php
-		}
-?>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<?php $this->contentSubHeading("");?>
-					</td>
-				</tr>				
-				<tr>
-					<td><?php echo getMLText("name")?>:</td>
-					<td>
-						<form action="../op/op.Categories.php" method="post">
-  		        <?php echo createHiddenFieldWithKey('editcategory'); ?>
-							<input type="Hidden" name="action" value="editcategory">
-							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">&nbsp;
-							<input type="submit" value="<?php printMLText("save");?>">
-						</form>
-					</td>
-				</tr>
-				
-			</table>
-		</td>
-<?php } ?>
-	</tr></table>
-	
-<script language="JavaScript">
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showCategories(sel);
-</script>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.CategoryChooser.php b/views/blue/class.CategoryChooser.php
deleted file mode 100644
index fc9ea5d81..000000000
--- a/views/blue/class.CategoryChooser.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Implementation of CategoryChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for CategoryChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_CategoryChooser extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$categories = $this->params['categories'];
-		$form = $this->params['form'];
-		$selcats = $this->params['selcats'];
-
-		$this->htmlStartPage(getMLText("choose_target_category"));
-		$this->globalBanner();
-		$this->pageNavigation(getMLText("choose_target_category"));
-?>
-
-<script language="JavaScript">
-var targetName = opener.document.<?php echo $form?>.categoryname<?php print $form ?>;
-var targetID = opener.document.<?php echo $form?>.categoryid<?php print $form ?>;
-$(document).ready(function(){
-	$('#getcategories').click(function(){
-//    alert($('#keywordta option:selected').text());
-		var value = '';
-		$('#keywordta option:selected').each(function(){
-			value += ' ' + $(this).text();
-		});
-		targetName.value = value;
-		targetID.value = $('#keywordta').val();
-		window.close();
-		return true;
-	});
-});
-</script>
-
-<?php
-			$this->contentContainerStart();
-			$selcatsarr = explode(',', $selcats);
-?>
-<table>
-	<tr>
-		<td valign="top" class="inputDescription"><?php echo getMLText("categories")?>:</td>
-		<td>
-			<select id="keywordta" size="5" style="min-width: 100px;" multiple>
-<?php
-			foreach($categories as $category) {
-				echo "<option value=\"".$category->getId()."\"";
-				if(in_array($category->getID(), $selcatsarr))
-					echo " selected";
-				echo ">".htmlspecialchars($category->getName())."</option>\n";
-			}
-?>
-			</select>
-		</td>
-	</tr>
-	<tr>
-	  <td></td>
-		<td>
-			<input type="button" id='getcategories' value="<?php echo getMLText("accept")?>"> &nbsp;&nbsp;
-		</td>
-	</tr>
-
-</table>
-<?php
-			$this->contentContainerEnd();
-			$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ChangePassword.php b/views/blue/class.ChangePassword.php
deleted file mode 100644
index b3d2ae78e..000000000
--- a/views/blue/class.ChangePassword.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Implementation of ChangePassword view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ChangePassword view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ChangePassword extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$referuri = $this->params['referuri'];
-		$hash = $this->params['hash'];
-
-		$this->htmlStartPage(getMLText("change_password"), "login");
-		$this->globalBanner();
-		$this->pageNavigation(getMLText("change_password"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.ChangePassword.php" method="post" name="form1" onsubmit="return checkForm();">
-<?php
-		if ($referuri) {
-			echo "<input type='hidden' name='referuri' value='".$referuri."'/>";
-		}
-		if ($hash) {
-			echo "<input type='hidden' name='hash' value='".$hash."'/>";
-		}
-?>
-	<table border="0">
-		<tr>
-			<td><?php printMLText("password");?></td>
-			<td><input class="pwd" type="password" name="newpassword" id="password"> <div id="outerstrength" style="min-width: 100px; height: 14px; display: inline-block; border: 1px solid black; padding: 1px;"><div id="innerstrength" style="width: 0px; height: 14px; display: inline-block; border: 0px; padding: 0px; background-color: red;">&nbsp;</div> <div id="strength" style="display: inline-block;"></div></div></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("password_repeat");?></td>
-			<td><input type="password" name="newpasswordrepeat" id="passwordrepeat"></td>
-		</tr>
-		<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("submit_password") ?>"></td>
-		</tr>
-	</table>
-</form>
-<?php $this->contentContainerEnd(); ?>
-<script language="JavaScript">document.form1.newpassword.focus();</script>
-<p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
-<?php
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.CreateIndex.php b/views/blue/class.CreateIndex.php
deleted file mode 100644
index 28cde01c4..000000000
--- a/views/blue/class.CreateIndex.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Implementation of CreateIndex view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for CreateIndex view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_CreateIndex extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText('admin_tools'), 'admin_tools');
-		$this->contentHeading(getMLText("create_fulltext_index"));
-		$this->contentContainerStart();
-
-		echo '<p>'.getMLText('create_fulltext_index_warning').'</p>';
-		echo '<a href="out.Indexer.php?create=1&confirm=1">'.getMLText('confirm_create_fulltext_index').'</a>';
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
-
diff --git a/views/blue/class.DefaultKeywords.php b/views/blue/class.DefaultKeywords.php
deleted file mode 100644
index f0288db04..000000000
--- a/views/blue/class.DefaultKeywords.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Implementation of DefaultKeywords view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for DefaultKeywords view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_DefaultKeywords extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$categories = $this->params['categories'];
-		$selcategoryid = $this->params['selcategoryid'];
-
-$this->htmlStartPage(getMLText("admin_tools"));
-$this->globalNavigation();
-$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-
-?>
-<script language="JavaScript">
-obj = -1;
-function showKeywords(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-
-	obj = document.getElementById("keywords" + id);
-	obj.style.display = "";
-}
-</script>
-<?php
-
-		$this->contentHeading(getMLText("global_default_keywords"));
-		$this->contentContainerStart();
-?>
-	<table>
-	<tr>
-		<td><?php echo getMLText("selection")?>:</td>
-		<td>
-			<select onchange="showKeywords(this)" id="selector">
-				<option value="-1"><?php echo getMLText("choose_category")?>
-				<option value="0"><?php echo getMLText("new_default_keyword_category")?>
-
-<?php
-				
-		$selected=0;
-		$count=2;				
-		foreach ($categories as $category) {
-		
-			$owner = $category->getOwner();
-			if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) continue;
-
-			if ($selcategoryid && $category->getID()==$selcategoryid) $selected=$count;				
-			print "<option value=\"".$category->getID()."\">" . htmlspecialchars($category->getName());
-			$count++;
-		}
-?>
-			</select>
-			&nbsp;&nbsp;
-		</td>
-
-		<td id="keywords0" style="display : none;">	
-			<form action="../op/op.DefaultKeywords.php" method="post">
-  		<?php echo createHiddenFieldWithKey('addcategory'); ?>
-			<input type="Hidden" name="action" value="addcategory">
-			<?php printMLText("name");?>: <input type="text" name="name">
-			<input type="submit" value="<?php printMLText("new_default_keyword_category"); ?>">
-			</form>
-		</td>
-<?php
-		foreach ($categories as $category) {
-
-			$owner = $category->getOwner();
-			if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) continue;
-
-			print "<td id=\"keywords".$category->getID()."\" style=\"display : none;\">";	
-?>
-			<table>
-				<tr>
-					<td colspan="2">
-						<form action="../op/op.DefaultKeywords.php" method="post">
-  						<?php echo createHiddenFieldWithKey('removecategory'); ?>
-							<input type="Hidden" name="action" value="removecategory">
-							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<input value="<?php printMLText("rm_default_keyword_category");?>" type="submit" title="<?php echo getMLText("delete")?>">
-						</form>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<?php $this->contentSubHeading("");?>
-					</td>
-				</tr>				
-				<tr>
-					<td><?php echo getMLText("name")?>:</td>
-					<td>
-						<form action="../op/op.DefaultKeywords.php" method="post">
-  						<?php echo createHiddenFieldWithKey('editcategory'); ?>
-							<input type="hidden" name="action" value="editcategory">
-							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">&nbsp;
-							<input type="submit" value="<?php printMLText("save");?>">
-						</form>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<?php $this->contentSubHeading("");?>
-					</td>
-				</tr>
-				
-				<tr>
-					<td><?php echo getMLText("default_keywords")?>:</td>
-					<td>
-						<?php
-							$lists = $category->getKeywordLists();
-							if (count($lists) == 0)
-								print getMLText("no_default_keywords");
-							else
-								foreach ($lists as $list) {
-?>
-									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
-  								<?php echo createHiddenFieldWithKey('editkeywords'); ?>
-									<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
-									<input type="Hidden" name="action" value="editkeywords">
-									<input name="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<input name="action" value="editkeywords" type="Image" src="images/save.gif" title="<?php echo getMLText("save")?>" style="border: 0px;">
-									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
-									</form>
-									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
-  								<?php echo createHiddenFieldWithKey('removekeywords'); ?>
-									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
-									<input type="hidden" name="action" value="removekeywords">
-									<input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" style="border: 0px;">
-									</form>
-									<br>
-						<?php }  ?>
-					</td>
-				</tr>
-				<tr>
-					<form action="../op/op.DefaultKeywords.php" method="post">
-  				<?php echo createHiddenFieldWithKey('newkeywords'); ?>
-					<td><input type="Submit" value="<?php printMLText("new_default_keywords");?>"></td>
-					<td>
-						<input type="Hidden" name="action" value="newkeywords">
-						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<input type="text" name="keywords">
-					</td>
-					</form>
-				</tr>
-
-			</table>
-		</td>
-<?php } ?>
-	</tr></table>
-
-<script language="JavaScript">
-
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showKeywords(sel);
-
-</script>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.DocumentAccess.php b/views/blue/class.DocumentAccess.php
deleted file mode 100644
index 11977c24b..000000000
--- a/views/blue/class.DocumentAccess.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/**
- * Implementation of DocumentAccess view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for DocumentAccess view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_DocumentAccess extends SeedDMS_Blue_Style {
-
-	function printAccessModeSelection($defMode) { /* {{{ */
-		print "<select name=\"mode\">\n";
-		print "\t<option value=\"".M_NONE."\"" . (($defMode == M_NONE) ? " selected" : "") . ">" . getMLText("access_mode_none") . "</option>\n";
-		print "\t<option value=\"".M_READ."\"" . (($defMode == M_READ) ? " selected" : "") . ">" . getMLText("access_mode_read") . "</option>\n";
-		print "\t<option value=\"".M_READWRITE."\"" . (($defMode == M_READWRITE) ? " selected" : "") . ">" . getMLText("access_mode_readwrite") . "</option>\n";
-		print "\t<option value=\"".M_ALL."\"" . (($defMode == M_ALL) ? " selected" : "") . ">" . getMLText("access_mode_all") . "</option>\n";
-		print "</select>\n";
-	} /* }}} */
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$document = $this->params['document'];
-		$folder = $this->params['folder'];
-		$allUsers = $this->params['allusers'];
-		$allGroups = $this->params['allgroups'];
-
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-
-?>
-
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if ((document.form1.userid.options[document.form1.userid.selectedIndex].value == -1) && 
-		(document.form1.groupid.options[document.form1.groupid.selectedIndex].value == -1))
-			msg += "<?php printMLText("js_select_user_or_group");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-
-		$this->contentHeading(getMLText("edit_document_access"));
-		$this->contentContainerStart();
-
-		if ($user->isAdmin()) {
-
-			$this->contentSubHeading(getMLText("set_owner"));
-?>
-	<form action="../op/op.DocumentAccess.php">
-  <?php echo createHiddenFieldWithKey('documentaccess'); ?>
-	<input type="Hidden" name="action" value="setowner">
-	<input type="Hidden" name="documentid" value="<?php print $document->getId();?>">
-	<?php printMLText("owner");?> : <select name="ownerid">
-	<?php
-	$owner = $document->getOwner();
-	foreach ($allUsers as $currUser) {
-		if ($currUser->isGuest())
-			continue;
-		print "<option value=\"".$currUser->getID()."\"";
-		if ($currUser->getID() == $owner->getID())
-			print " selected";
-		print ">" . htmlspecialchars($currUser->getLogin() . " - " . $currUser->getFullname()) . "</option>\n";
-	}
-	?>
-	</select>
-	<input type="submit" value="<?php printMLText("save")?>">
-	</form>
-<?php
-
-}
-		$this->contentSubHeading(getMLText("access_inheritance"));
-
-		if ($document->inheritsAccess()) {
-			printMLText("inherits_access_msg");
-?>
-  <p>
-	<form action="../op/op.DocumentAccess.php" style="display: inline-block;">
-  <?php echo createHiddenFieldWithKey('documentaccess'); ?>
-	<input type="hidden" name="documentid" value="<?php print $document->getId();?>">
-	<input type="hidden" name="action" value="notinherit">
-	<input type="hidden" name="mode" value="copy">
-	<input type="submit" value="<?php printMLText("inherits_access_copy_msg")?>">
-	</form>
-	<form action="../op/op.DocumentAccess.php" style="display: inline-block;">
-  <?php echo createHiddenFieldWithKey('documentaccess'); ?>
-	<input type="hidden" name="documentid" value="<?php print $document->getId();?>">
-	<input type="hidden" name="action" value="notinherit">
-	<input type="hidden" name="mode" value="empty">
-	<input type="submit" value="<?php printMLText("inherits_access_empty_msg")?>">
-	</form>
-	</p>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-		return;
-}
-?>
-	<form action="../op/op.DocumentAccess.php">
-  <?php echo createHiddenFieldWithKey('documentaccess'); ?>
-	<input type="hidden" name="documentid" value="<?php print $document->getId();?>">
-	<input type="hidden" name="action" value="inherit">
-	<input type="submit" value="<?php printMLText("does_not_inherit_access_msg")?>">
-	</form>
-<?php
-	$accessList = $document->getAccessList();
-
-	$this->contentSubHeading(getMLText("default_access"));
-?>
-<form action="../op/op.DocumentAccess.php">
-  <?php echo createHiddenFieldWithKey('documentaccess'); ?>
-	<input type="Hidden" name="documentid" value="<?php print $document->getId();?>">
-	<input type="Hidden" name="action" value="setdefault">
-	<?php $this->printAccessModeSelection($document->getDefaultAccess()); ?>
-	<input type="Submit" value="<?php printMLText("save");?>">
-</form>
-
-<?php
-
-		$this->contentSubHeading(getMLText("edit_existing_access"));
-
-		/* memorїze users with access rights */
-		$memusers = array();
-		/* memorize groups with access rights */
-		$memgroups = array();
-		if (count($accessList["users"]) != 0 || count($accessList["groups"]) != 0) {
-
-			print "<table class=\"defaultView\">";
-
-			foreach ($accessList["users"] as $userAccess) {
-				$userObj = $userAccess->getUser();
-				$memusers[] = $userObj->getID();
-				print "<tr>\n";
-				print "<td><img src=\"images/usericon.gif\" class=\"mimeicon\"></td>\n";
-				print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
-				print "<form action=\"../op/op.DocumentAccess.php\">\n";
-				print "<td>\n";
-				$this->printAccessModeSelection($userAccess->getMode());
-				print "</td>\n";
-				print "<td><span class=\"actions\">\n";
-				echo createHiddenFieldWithKey('documentaccess')."\n";
-				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
-				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">\n";
-				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/save.gif\">".getMLText("save")." ";
-				print "</span></td>\n";
-				print "</form>\n";
-				print "<form action=\"../op/op.DocumentAccess.php\">\n";
-				print "<td><span class=\"actions\">\n";
-				echo createHiddenFieldWithKey('documentaccess')."\n";
-				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
-				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
-				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/del.gif\">".getMLText("delete")." ";
-				print "<span></td>\n";
-				print "</form>\n";
-				print "</tr>\n";
-			}
-
-			foreach ($accessList["groups"] as $groupAccess) {
-				$groupObj = $groupAccess->getGroup();
-				$memgroups[] = $groupObj->getID();
-				$mode = $groupAccess->getMode();
-				print "<tr>";
-				print "<td><img src=\"images/groupicon.gif\" class=\"mimeicon\"></td>";
-				print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
-				print "<form action=\"../op/op.DocumentAccess.php\">";
-				print "<td>";
-				$this->printAccessModeSelection($groupAccess->getMode());
-				print "</td>\n";
-				print "<td><span class=\"actions\">\n";
-				echo createHiddenFieldWithKey('documentaccess')."\n";
-				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">";
-				print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">";
-				print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
-				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/save.gif\">".getMLText("save")." ";
-				print "</span></td>\n";
-				print "</form>";
-				print "<td><span class=\"actions\">\n";
-				print "<form action=\"../op/op.DocumentAccess.php\">\n";
-				echo createHiddenFieldWithKey('documentaccess')."\n";
-				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
-				print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n";
-				print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
-				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/del.gif\">".getMLText("delete")." ";
-				print "</form>";
-				print "</span></td>\n";
-				print "</tr>\n";
-			}
-			
-			print "</table><br>";
-		}
-?>
-<form action="../op/op.DocumentAccess.php" name="form1" onsubmit="return checkForm();">
-<?php echo createHiddenFieldWithKey('documentaccess'); ?>
-<input type="Hidden" name="documentid" value="<?php print $document->getId()?>">
-<input type="Hidden" name="action" value="addaccess">
-<table>
-<tr>
-<td><?php printMLText("user");?>:</td>
-<td>
-<select name="userid">
-<option value="-1"><?php printMLText("select_one");?></option>
-<?php
-		foreach ($allUsers as $userObj) {
-			if ($userObj->isGuest() || in_array($userObj->getID(), $memusers)) {
-				continue;
-			}
-			print "<option value=\"".$userObj->getID()."\">" . htmlspecialchars($userObj->getLogin() . " - " . $userObj->getFullName()) . "</option>\n";
-		}
-?>
-</select>
-</td>
-</tr>
-<tr>
-<td><?php printMLText("group");?>:</td>
-<td>
-<select name="groupid">
-<option value="-1"><?php printMLText("select_one");?></option>
-<?php
-		foreach ($allGroups as $groupObj) {
-			if(in_array($groupObj->getID(), $memgroups))
-				continue;
-			print "<option value=\"".$groupObj->getID()."\">" . htmlspecialchars($groupObj->getName()) . "</option>\n";
-		}
-?>
-</select>
-</td>
-</tr>
-<tr>
-<td><?php printMLText("access_mode");?>:</td>
-<td>
-<?php
-		$this->printAccessModeSelection(M_READ);
-?>
-</td>
-</tr>
-<tr>
-<td colspan="2"><input type="submit" value="<?php printMLText("add");?>"></td>
-</tr>
-</table>
-</form>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.DocumentChooser.php b/views/blue/class.DocumentChooser.php
deleted file mode 100644
index ee807dcdb..000000000
--- a/views/blue/class.DocumentChooser.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Implementation of DocumentChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for DocumentChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_DocumentChooser extends SeedDMS_Blue_Style {
-	var $user;
-	var $form;
-
-	function printTree($path, $level = 0) { /* {{{ */
-		$folder = $path[$level];
-		$subFolders = SeedDMS_Core_DMS::filterAccess($folder->getSubFolders(), $this->user, M_READ);
-		$documents  = SeedDMS_Core_DMS::filterAccess($folder->getDocuments(), $this->user, M_READ);
-		
-		if ($level+1 < count($path))
-			$nextFolderID = $path[$level+1]->getID();
-		else
-			$nextFolderID = -1;
-
-		if ($level == 0) {
-			print "<ul style='list-style-type: none;'>\n";
-		}
-		print "  <li>\n";
-		print "<img class='treeicon' src=\"";
-		if ($level == 0) $this->printImgPath("minus.png");
-		else if (count($subFolders) + count($documents) > 0) $this->printImgPath("minus.png");
-		else $this->printImgPath("blank.png");
-		print "\" border=0>\n";
-		if ($folder->getAccessMode($this->user) >= M_READ) {
-			print "<img src=\"".$this->getImgPath("folder_opened.gif")."\" border=0>".htmlspecialchars($folder->getName())."\n";
-		}
-		else
-			print "<img src=\"".$this->getImgPath("folder_opened.gif")."\" width=18 height=18 border=0>".htmlspecialchars($folder->getName())."\n";
-		print "  </li>\n";
-
-		print "<ul style='list-style-type: none;'>";
-
-		for ($i = 0; $i < count($subFolders); $i++) {
-			if ($subFolders[$i]->getID() == $nextFolderID)
-				$this->printTree($path, $level+1);
-			else {
-				print "<li>\n";
-				$subFolders_ = SeedDMS_Core_DMS::filterAccess($subFolders[$i]->getSubFolders(), $this->user, M_READ);
-				$documents_  = SeedDMS_Core_DMS::filterAccess($subFolders[$i]->getDocuments(), $this->user, M_READ);
-				
-				if (count($subFolders_) + count($documents_) > 0)
-					print "<a href=\"out.DocumentChooser.php?form=".$this->form."&folderid=".$subFolders[$i]->getID()."\"><img class='treeicon' src=\"".$this->getImgPath("plus.png")."\" border=0></a>";
-				else
-					print "<img class='treeicon' src=\"".$this->getImgPath("blank.png")."\">";
-				print "<img src=\"".$this->getImgPath("folder_closed.gif")."\" border=0>".htmlspecialchars($subFolders[$i]->getName())."\n";
-				print "</li>";
-			}
-		}
-		for ($i = 0; $i < count($documents); $i++) {
-			print "<li>\n";
-			print "<img class='treeicon' src=\"images/blank.png\">";
-			print "<a  class=\"foldertree_selectable\" href=\"javascript:documentSelected(".$documents[$i]->getID().",'".str_replace("'", "\\'", htmlspecialchars($documents[$i]->getName()))."');\"><img src=\"images/file.gif\" border=0>".htmlspecialchars($documents[$i]->getName())."</a>";
-			print "</li>";
-		}
-
-		print "</ul>\n";
-		if ($level == 0) {
-			print "</ul>\n";
-		}
-		
-	} /* }}} */
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$this->user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$this->form = $this->params['form'];
-
-		$this->htmlStartPage(getMLText("choose_target_document"));
-		$this->globalBanner();
-		$this->pageNavigation(getMLText("choose_target_document"));
-?>
-
-<script language="JavaScript">
-var targetName;
-var targetID;
-
-function documentSelected(id, name) {
-	targetName.value = name;
-	targetID.value = id;
-	window.close();
-	return true;
-}
-</script>
-
-<?php
-		echo "<input type=\"text\" class=\"autocomplete\" />";
-		$this->contentContainerStart();
-		echo "<div id=\"resultautocomplete\"></div>";
-		$this->contentContainerEnd();
-		$this->contentContainerStart();
-		$this->printTree($folder->getPath());
-		$this->contentContainerEnd();
-?>
-
-<script language="JavaScript">
-targetName = opener.document.<?php echo $this->form?>.docname<?php print $this->form ?>;
-targetID   = opener.document.<?php echo $this->form?>.docid<?php print $this->form ?>;
-</script>
-
-<?php
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.DocumentNotify.php b/views/blue/class.DocumentNotify.php
deleted file mode 100644
index 004c67d47..000000000
--- a/views/blue/class.DocumentNotify.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Implementation of DocumentNotify view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for DocumentNotify view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_DocumentNotify extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$sortusersinlist = $this->params['sortusersinlist'];
-
-		$notifyList = $document->getNotifyList();
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if ((document.form1.userid.options[document.form1.userid.selectedIndex].value == -1) && 
-		(document.form1.groupid.options[document.form1.groupid.selectedIndex].value == -1))
-			msg += "<?php printMLText("js_select_user_or_group");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-		$this->contentHeading(getMLText("edit_existing_notify"));
-		$this->contentContainerStart();
-
-		$userNotifyIDs = array();
-		$groupNotifyIDs = array();
-
-		print "<table class=\"defaultView\">\n";
-		if ((count($notifyList["users"]) == 0) && (count($notifyList["groups"]) == 0)) {
-			print "<tr><td>".getMLText("empty_notify_list")."</td></tr>";
-		}
-		else {
-			foreach ($notifyList["users"] as $userNotify) {
-				print "<tr>";
-				print "<td><img src=\"images/usericon.gif\" class=\"mimeicon\"></td>";
-				print "<td>" . htmlspecialchars($userNotify->getLogin() . " - " . $userNotify->getFullName()) . "</td>";
-				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
-					print "<td><a href=\"../op/op.DocumentNotify.php?documentid=". $document->getID() . "&action=delnotify&userid=".$userNotify->getID()."\"><img src=\"images/del.gif\" class=\"mimeicon\"></a>".getMLText("delete")."</td>";
-				}else print "<td></td>";
-				print "</tr>";
-				$userNotifyIDs[] = $userNotify->getID();
-			}
-			foreach ($notifyList["groups"] as $groupNotify) {
-				print "<tr>";
-				print "<td><img src=\"images/groupicon.gif\" width=16 height=16 border=0></td>";
-				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
-				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
-					print "<td><a href=\"../op/op.DocumentNotify.php?documentid=". $document->getID() . "&action=delnotify&groupid=".$groupNotify->getID()."\"><img src=\"images/del.gif\" class=\"mimeicon\"></a>".getMLText("delete")."</td>";
-				}else print "<td></td>";
-				print "</tr>";
-				$groupNotifyIDs[] = $groupNotify->getID();
-			}
-		}
-		print "</table>\n";
-
-?>
-<br>
-
-<form action="../op/op.DocumentNotify.php" name="form1" onsubmit="return checkForm();">
-<input type="hidden" name="documentid" value="<?php print $document->getID()?>">
-<input type="hidden" name="action" value="addnotify">
-<table>
-	<tr>
-		<td><?php printMLText("user");?>:</td>
-		<td>
-			<select name="userid">
-				<option value="-1"><?php printMLText("select_one");?>
-				<?php
-					if ($user->isAdmin()) {
-						$allUsers = $dms->getAllUsers($sortusersinlist);
-						foreach ($allUsers as $userObj) {
-							if (!$userObj->isGuest() && ($document->getAccessMode($userObj) >= M_READ) && !in_array($userObj->getID(), $userNotifyIDs))
-								print "<option value=\"".$userObj->getID()."\">" . htmlspecialchars($userObj->getLogin() . " - " . $userObj->getFullName()) . "\n";
-						}
-					}
-					elseif (!$user->isGuest() && !in_array($user->getID(), $userNotifyIDs)) {
-						print "<option value=\"".$user->getID()."\">" . htmlspecialchars($user->getLogin() . " - " . $user->getFullName()) . "\n";
-					}
-				?>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td><?php printMLText("group");?>:</td>
-		<td>
-			<select name="groupid">
-				<option value="-1"><?php printMLText("select_one");?>
-				<?php
-					$allGroups = $dms->getAllGroups();
-					foreach ($allGroups as $groupObj) {
-						if (($user->isAdmin() || $groupObj->isMember($user,true)) && $document->getGroupAccessMode($groupObj) >= M_READ && !in_array($groupObj->getID(), $groupNotifyIDs)) {
-							print "<option value=\"".$groupObj->getID()."\">" . htmlspecialchars($groupObj->getName()) . "\n";
-						}
-					}
-				?>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2"><input type="Submit" value="<?php printMLText("add") ?>"></td>
-	</tr>
-</table>
-</form>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.DocumentVersionDetail.php b/views/blue/class.DocumentVersionDetail.php
deleted file mode 100644
index 64fef68c5..000000000
--- a/views/blue/class.DocumentVersionDetail.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * Implementation of DocumentVersionDetail view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for DocumentVersionDetail view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$version = $this->params['version'];
-		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
-		$enableversionmodification = $this->params['enableversionmodification'];
-
-		$latestContent = $document->getLatestContent();
-		$status = $version->getStatus();
-		$reviewStatus = $version->getReviewStatus();
-		$approvalStatus = $version->getApprovalStatus();
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("document_infos"));
-		$this->contentContainerStart();
-
-?>
-<table>
-<tr>
-<td><?php printMLText("owner");?>:</td>
-<td>
-<?php
-		$owner = $document->getOwner();
-		print "<a class=\"infos\" href=\"mailto:".$owner->getEmail()."\">".htmlspecialchars($owner->getFullName())."</a>";
-?>
-</td>
-</tr>
-<tr>
-<td><?php printMLText("comment");?>:</td>
-<td><?php print htmlspecialchars($document->getComment());?></td>
-</tr>
-<tr>
-<td><?php printMLText("creation_date");?>:</td>
-<td><?php print getLongReadableDate($document->getDate()); ?></td>
-</tr>
-<tr>
-<td><?php printMLText("keywords");?>:</td>
-<td><?php print htmlspecialchars($document->getKeywords());?></td>
-</tr>
-<?php
-		if ($document->isLocked()) {
-			$lockingUser = $document->getLockingUser();
-?>
-<tr>
-	<td><?php printMLText("lock_status");?>:</td>
-	<td><?php printMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName())));?></td>
-</tr>
-<?php
-		}
-?>
-</tr>
-</table>
-<?php
-		$this->contentContainerEnd();
-
-		// verify if file exists
-		$file_exists=file_exists($dms->contentDir . $version->getPath());
-
-		$this->contentHeading(getMLText("details_version", array ("version" => $version->getVersion())));
-		$this->contentContainerStart();
-		print "<table class=\"folderView\">";
-		print "<thead>\n<tr>\n";
-		print "<th width='10%'></th>\n";
-		print "<th width='10%'>".getMLText("version")."</th>\n";
-		print "<th width='20%'>".getMLText("file")."</th>\n";
-		print "<th width='25%'>".getMLText("comment")."</th>\n";
-		print "<th width='15%'>".getMLText("status")."</th>\n";
-		print "<th width='20%'></th>\n";
-		print "</tr>\n</thead>\n<tbody>\n";
-		print "<tr>\n";
-		print "<td><ul class=\"actions\">";
-
-		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\"> ".getMLText("download")."</a>";
-			if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><img src=\"images/view.gif\" class=\"mimeicon\">" . getMLText("view_online") . "</a>";
-		}else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\"> ";
-
-		print "</ul></td>\n";
-		print "<td class=\"center\">".$version->getVersion()."</td>\n";
-
-		print "<td><ul class=\"documentDetail\">\n";
-		print "<li>".$version->getOriginalFileName()."</li>\n";
-
-		if ($file_exists) print "<li>". formatted_size(filesize($dms->contentDir . $version->getPath())) ." ".htmlspecialchars($version->getMimeType())."</li>";
-		else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>";
-
-		$updatingUser = $version->getUser();
-		print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
-		print "<li>".getLongReadableDate($version->getDate())."</li>";
-		print "</ul></td>\n";
-
-		print "<td>".htmlspecialchars($version->getComment())."</td>";
-		print "<td>".getOverallStatusText($status["status"])."</td>";
-		print "<td>";
-
-		//if (($document->getAccessMode($user) >= M_READWRITE)) {
-		print "<ul class=\"actions\">";
-		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
-			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\">".getMLText("rm_version")."</a></li>";
-		}
-		if (($enableversionmodification && ($document->getAccessMode($user) == M_ALL)) || $user->isAdmin()) {
-			if ( $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE ){
-				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'>".getMLText("change_status")."</a></li>";
-			}
-		}
-		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
-			if($status["status"] != S_OBSOLETE)
-				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\">".getMLText("edit_comment")."</a></li>";
-			if ( $status["status"] == S_DRAFT_REV){
-				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">".getMLText("edit_attributes")."</a></li>";
-		}
-			print "</ul>";
-		}
-		else {
-			print "&nbsp;";
-		}
-
-		echo "</td>";
-		print "</tr></tbody>\n</table>\n";
-
-
-		print "<table class=\"folderView\">\n";
-
-		if (is_array($reviewStatus) && count($reviewStatus)>0) {
-
-			print "<tr><td colspan=4>\n";
-			$this->contentSubHeading(getMLText("reviewers"));
-			print "</td></tr>\n";
-			
-			print "<tr>\n";
-			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
-			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";
-			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
-			print "<td width='35%'><b>".getMLText("status")."</b></td>\n";
-			print "</tr>\n";
-
-			foreach ($reviewStatus as $r) {
-				$required = null;
-				switch ($r["type"]) {
-					case 0: // Reviewer is an individual.
-						$required = $dms->getUser($r["required"]);
-						if (!is_object($required)) {
-							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
-						}
-						else {
-							$reqName = htmlspecialchars($required->getFullName());
-						}
-						break;
-					case 1: // Reviewer is a group.
-						$required = $dms->getGroup($r["required"]);
-						if (!is_object($required)) {
-							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
-						}
-						else {
-							$reqName = htmlspecialchars($required->getName());
-						}
-						break;
-				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"documentDetail\"><li>".$r["date"]."</li>";
-				$updateUser = $dms->getUser($r["userID"]);
-				print "<li>".(is_object($updateUser) ? $updateUser->getFullName() : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
-				print "<td>".$r["comment"]."</td>\n";
-				print "<td>".getReviewStatusText($r["status"])."</td>\n";
-				print "</tr>\n";
-			}
-		}
-
-		if (is_array($approvalStatus) && count($approvalStatus)>0) {
-
-			print "<tr><td colspan=4>\n";
-			$this->contentSubHeading(getMLText("approvers"));
-			print "</td></tr>\n";
-				
-			print "<tr>\n";
-			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
-			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";
-			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
-			print "<td width='35%'><b>".getMLText("status")."</b></td>\n";
-			print "</tr>\n";
-
-			foreach ($approvalStatus as $a) {
-				$required = null;
-				switch ($a["type"]) {
-					case 0: // Approver is an individual.
-						$required = $dms->getUser($a["required"]);
-						if (!is_object($required)) {
-							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
-						}
-						else {
-							$reqName = htmlspecialchars($required->getFullName());
-						}
-						break;
-					case 1: // Approver is a group.
-						$required = $dms->getGroup($a["required"]);
-						if (!is_object($required)) {
-							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
-						}
-						else {
-							$reqName = htmlspecialchars($required->getName());
-						}
-						break;
-				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"documentDetail\"><li>".$a["date"]."</li>";
-				$updateUser = $dms->getUser($a["userID"]);
-				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()) : "unknown user id '".$a["userID"]."'")."</li></ul></td>";
-				print "<td>".$a["comment"]."</td>\n";
-				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
-				print "</tr>\n";
-			}
-		}
-
-		print "</table>\n";
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.DropFolderChooser.php b/views/blue/class.DropFolderChooser.php
deleted file mode 100644
index 295a10e14..000000000
--- a/views/blue/class.DropFolderChooser.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Implementation of CategoryChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for CategoryChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_DropFolderChooser extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$dropfolderfile = $this->params['dropfolderfile'];
-		$form = $this->params['form'];
-		$dropfolderdir = $this->params['dropfolderdir'];
-
-		$this->htmlStartPage(getMLText("choose_target_file"));
-		$this->globalBanner();
-		$this->pageNavigation(getMLText("choose_target_file"));
-?>
-
-<script language="JavaScript">
-var targetName = opener.document.<?php echo $form?>.dropfolderfile<?php print $form ?>;
-</script>
-<?php
-		$this->contentContainerStart();
-
-		$dir = $dropfolderdir.'/'.$user->getLogin();
-		/* Check if we are still looking in the configured directory and
-		 * not somewhere else, e.g. if the login was '../test'
-		 */
-		if(dirname($dir) == $dropfolderdir) {
-			if(is_dir($dir)) {
-				$d = dir($dir);
-				echo "<table>\n";
-				while (false !== ($entry = $d->read())) {
-					if($entry != '..' && $entry != '.') {
-						if(!is_dir($entry)) {
-							echo "<tr><td><span style=\"cursor: pointer;\" onClick=\"targetName.value = '".$entry."'; window.close();\">".$entry."</span></td><td align=\"right\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."</td></tr>\n";
-						}
-					}
-				}
-				echo "</table>\n";
-			}
-		}
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.EditAttributes.php b/views/blue/class.EditAttributes.php
deleted file mode 100644
index a2075bc69..000000000
--- a/views/blue/class.EditAttributes.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Implementation of EditAttributes view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for EditAttributes view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_EditAttributes extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$version = $this->params['version'];
-		$attrdefs = $this->params['attrdefs'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-
-		$this->contentHeading(getMLText("edit_attributes"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.EditAttributes.php" name="form1" method="POST">
-	<?php echo createHiddenFieldWithKey('editattributes'); ?>
-	<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
-	<input type="Hidden" name="version" value="<?php print $version->getVersion();?>">
-	<table cellpadding="3">
-<?php
-			if($attrdefs) {
-				foreach($attrdefs as $attrdef) {
-?>
-<tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-	<td><?php $this->printAttributeEditField($attrdef, $version->getAttributeValue($attrdef)) ?></td>
-</tr>
-<?php
-				}
-			}
-?>
-		<tr>
-			<td colspan="2"><br><input type="submit" value="<?php printMLText("save") ?>"></td>
-		</tr>
-	</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.EditComment.php b/views/blue/class.EditComment.php
deleted file mode 100644
index 60a77f5ad..000000000
--- a/views/blue/class.EditComment.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Implementation of EditComment view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for EditComment view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_EditComment extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$version = $this->params['version'];
-		$strictformcheck = $this->params['strictformcheck'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-<?php
-		if ($strictformcheck) {
-?>
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-<?php
-		}
-?>
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else return true;
-}
-</script>
-
-<?php
-		$this->contentHeading(getMLText("edit_comment"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.EditComment.php" name="form1" onsubmit="return checkForm();" method="POST">
-	<?php echo createHiddenFieldWithKey('editcomment'); ?>
-	<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
-	<input type="Hidden" name="version" value="<?php print $version->getVersion();?>">
-	<table cellpadding="3">
-		<tr>
-			<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($version->getComment());?></textarea></td>
-		</tr>
-		<tr>
-			<td colspan="2"><br><input type="Submit" value="<?php printMLText("save") ?>"></td>
-		</tr>
-	</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.EditDocument.php b/views/blue/class.EditDocument.php
deleted file mode 100644
index c0058739b..000000000
--- a/views/blue/class.EditDocument.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Implementation of EditDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for EditDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_EditDocument extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$attrdefs = $this->params['attrdefs'];
-		$strictformcheck = $this->params['strictformcheck'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if (document.form1.name.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-<?php
-	if ($strictformcheck) {
-	?>
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (document.form1.keywords.value == "") msg += "<?php printMLText("js_no_keywords");?>\n";
-<?php
-	}
-?>
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-		$this->contentHeading(getMLText("edit_document_props"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.EditDocument.php" name="form1" onsubmit="return checkForm();" method="POST">
-	<input type="hidden" name="documentid" value="<?php echo $document->getID() ?>">
-	<table cellpadding="3">
-		<tr>
-			<td class="inputDescription"><?php printMLText("name");?>:</td>
-			<td><input name="name" value="<?php print htmlspecialchars($document->getName());?>" size="60"></td>
-		</tr>
-		<tr>
-			<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($document->getComment());?></textarea></td>
-		</tr>
-		<tr>
-			<td valign="top" class="inputDescription"><?php printMLText("keywords");?>:</td>
-			<td class="standardText">
-				<textarea name="keywords" rows="2" cols="80"><?php print htmlspecialchars($document->getKeywords());?></textarea><br>
-				<a href="javascript:chooseKeywords('form1.keywords');"><?php printMLText("use_default_keywords");?></a>
-				<script language="JavaScript">
-					var openDlg;
-					
-					function chooseKeywords(target) {
-						openDlg = open("out.KeywordChooser.php?target="+target, "openDlg", "width=500,height=400,scrollbars=yes,resizable=yes");
-					}
-				</script>
-			</td>
-		</tr>
-		<tr>
-			<td><?php printMLText("categories")?>:</td>
-			<td><?php $this->printCategoryChooser("form1", $document->getCategories());?></td>
-		</tr>
-<?php
-		if ($folder->getAccessMode($user) > M_READ) {
-			print "<tr>";
-			print "<td class=\"inputDescription\">" . getMLText("sequence") . ":</td>";
-			print "<td>";
-			$this->printSequenceChooser($folder->getDocuments(), $document->getID());
-			print "</td></tr>";
-		}
-		if($attrdefs) {
-			foreach($attrdefs as $attrdef) {
-?>
-		<tr>
-			<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-			<td><?php $this->printAttributeEditField($attrdef, $document->getAttributeValue($attrdef)) ?></td>
-		</tr>
-<?php
-			}
-		}
-?>
-		<tr>
-			<td colspan="2"><br><input type="Submit" value="<?php printMLText("save") ?>"></td>
-		</tr>
-	</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.EditEvent.php b/views/blue/class.EditEvent.php
deleted file mode 100644
index a5b13c8a0..000000000
--- a/views/blue/class.EditEvent.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Implementation of EditEvent view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for EditEvent view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_EditEvent extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$event = $this->params['event'];
-		$strictformcheck = $this->params['strictformcheck'];
-
-		$this->htmlStartPage(getMLText("calendar"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("calendar"), "calendar");
-
-		$this->contentHeading(getMLText("edit_event"));
-		$this->contentContainerStart();
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if (document.form1.name.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-<?php
-	if ($strictformcheck) {
-	?>
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-<?php
-	}
-?>
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<form action="../op/op.EditEvent.php" name="form1" onsubmit="return checkForm();" method="POST">
-  <?php echo createHiddenFieldWithKey('editevent'); ?>
-
-	<input type="Hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>">
-
-	<table>
-		<tr>
-			<td><?php printMLText("from");?>:</td>
-			<td><?php $this->printDateChooser($event["start"], "from");?></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("to");?>:</td>
-			<td><?php $this->printDateChooser($event["stop"], "to");?></td>
-		</tr>
-		<tr>
-			<td class="inputDescription"><?php printMLText("name");?>:</td>
-			<td><input name="name" value="<?php echo htmlspecialchars($event["name"]);?>" size="60"></td>
-		</tr>
-		<tr>
-			<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="80"><?php echo htmlspecialchars($event["comment"])?></textarea></td>
-		</tr>
-		<tr>
-			<td colspan="2"><br><input type="Submit" value="<?php printMLText("edit_event");?>"></td>
-		</tr>
-	</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.EditFolder.php b/views/blue/class.EditFolder.php
deleted file mode 100644
index 142389903..000000000
--- a/views/blue/class.EditFolder.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Implementation of EditFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for EditFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_EditFolder extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$attrdefs = $this->params['attrdefs'];
-		$rootfolderid = $this->params['rootfolderid'];
-		$strictformcheck = $this->params['strictformcheck'];
-
-		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "view_folder", $folder);
-?>
-
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if (document.form1.name.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-<?php
-	if ($strictformcheck) {
-	?>
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-<?php
-	}
-?>
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-		$this->contentHeading(getMLText("edit_folder_props"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.EditFolder.php" name="form1" onsubmit="return checkForm();" method="POST">
-<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
-<input type="Hidden" name="showtree" value="<?php echo showtree();?>">
-<table>
-<tr>
-<td><?php printMLText("name");?>:</td>
-<td><input type="text" name="name" value="<?php print htmlspecialchars($folder->getName());?>" size="60"></td>
-</tr>
-<tr>
-<td><?php printMLText("comment");?>:</td>
-<td><textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($folder->getComment());?></textarea></td>
-</tr>
-<?php
-		$parent = ($folder->getID() == $rootfolderid) ? false : $folder->getParent();
-		if ($parent && $parent->getAccessMode($user) > M_READ) {
-			print "<tr>";
-			print "<td>" . getMLText("sequence") . ":</td>";
-			print "<td>";
-			$this->printSequenceChooser($parent->getSubFolders(), $folder->getID());
-			print "</td></tr>\n";
-		}
-
-		if($attrdefs) {
-			foreach($attrdefs as $attrdef) {
-?>
-<tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-	<td><?php $this->printAttributeEditField($attrdef, $folder->getAttributeValue($attrdef)) ?></td>
-</tr>
-<?php
-			}
-		}
-?>
-<tr>
-<td colspan="2"><input type="submit" value="<?php printMLText("save"); ?>"></td>
-</tr>
-</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.EditUserData.php b/views/blue/class.EditUserData.php
deleted file mode 100644
index 8118cdf45..000000000
--- a/views/blue/class.EditUserData.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * Implementation of EditUserData view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for EditUserData view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_EditUserData extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$enableuserimage = $this->params['enableuserimage'];
-		$passwordstrength = $this->params['passwordstrength'];
-		$httproot = $this->params['httproot'];
-
-		$this->htmlStartPage(getMLText("edit_user_details"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("my_account"), "my_account");
-
-?>
-
-<script language="JavaScript">
-
-function checkForm()
-{
-	msg = "";
-	if (document.form1.pwd.value != document.form1.pwdconf.value) msg += "<?php printMLText("js_pwd_not_conf");?>\n";
-	if (document.form1.fullname.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-	if (document.form1.email.value == "") msg += "<?php printMLText("js_no_email");?>\n";
-//	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-		$this->contentHeading(getMLText("edit_user_details"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" name="form1" onsubmit="return checkForm();">
-<table>
-	<tr>
-		<td><?php printMLText("current_password");?>:</td>
-		<td><input id="currentpwd" type="password" name="currentpwd" size="30"></td>
-	</tr>
-	<tr>
-		<td><?php printMLText("new_password");?>:</td>
-		<td><input class="pwd" rel="outerstrength" type="password" name="pwd" size="30"> <div id="outerstrength" style="min-width: 100px; height: 14px; display: inline-block; border: 1px solid black; padding: 1px;"><div id="innerstrength" style="width: 0px; height: 14px; display: inline-block; border: 0px; padding: 0px; background-color: red;">&nbsp;</div> <div id="strength" style="display: inline-block;"></div></div></td>
-	</tr>
-	<tr>
-		<td><?php printMLText("confirm_pwd");?>:</td>
-		<td><input id="pwdconf" type="Password" name="pwdconf" size="30"></td>
-	</tr>
-	<tr>
-		<td><?php printMLText("name");?>:</td>
-		<td><input type="text" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"></td>
-	</tr>
-	<tr>
-		<td><?php printMLText("email");?>:</td>
-		<td><input type="text" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"></td>
-	</tr>
-	<tr>
-		<td><?php printMLText("comment");?>:</td>
-		<td><textarea name="comment" rows="4" cols="80"><?php print htmlspecialchars($user->getComment());?></textarea></td>
-	</tr>
-
-<?php	
-		if ($enableuserimage){	
-?>	
-	<tr>
-		<td><?php printMLText("user_image");?>:</td>
-		<td>
-<?php
-			if ($user->hasImage())
-				print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$user->getId()."\">";
-			else printMLText("no_user_image");
-?>
-		</td>
-	</tr>
-	<tr>
-		<td><?php printMLText("new_user_image");?>:</td>
-		<td><input type="file" name="userfile" accept="image/jpeg" size="30"></td>
-	</tr>
-	<tr>
-		<td><?php printMLText("language");?>:</td>
-		<td>
-			<select name="language">
-<?php
-			$languages = getLanguages();
-			foreach ($languages as $currLang) {
-				print "<option value=\"".$currLang."\" ".(($user->getLanguage()==$currLang) ? "selected" : "").">".getMLText($currLang)."</option>";
-			}
-?>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td><?php printMLText("theme");?>:</td>
-		<td>
-			<select name="theme">
-<?php
-			$themes = UI::getStyles();
-			foreach ($themes as $currTheme) {
-				print "<option value=\"".$currTheme."\" ".(($user->getTheme()==$currTheme) ? "selected" : "").">".$currTheme."</option>";
-			}
-?>
-			</select>
-		</td>
-	</tr>
-<?php	} ?>
-
-	<tr>
-		<td colspan="2"><input type="submit" value="<?php printMLText("submit_userinfo") ?>"></td>
-	</tr>
-</table>
-</form>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ErrorDlg.php b/views/blue/class.ErrorDlg.php
deleted file mode 100644
index 5956a3b9e..000000000
--- a/views/blue/class.ErrorDlg.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Implementation of ErrorDlg view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ErrorDlg view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ErrorDlg extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.FolderAccess.php b/views/blue/class.FolderAccess.php
deleted file mode 100644
index 92d746c52..000000000
--- a/views/blue/class.FolderAccess.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/**
- * Implementation of FolderAccess view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for FolderAccess view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_FolderAccess extends SeedDMS_Blue_Style {
-	function printAccessModeSelection($defMode) { /* {{{ */
-		print "<select name=\"mode\">\n";
-		print "\t<option value=\"".M_NONE."\"" . (($defMode == M_NONE) ? " selected" : "") . ">" . getMLText("access_mode_none") . "\n";
-		print "\t<option value=\"".M_READ."\"" . (($defMode == M_READ) ? " selected" : "") . ">" . getMLText("access_mode_read") . "\n";
-		print "\t<option value=\"".M_READWRITE."\"" . (($defMode == M_READWRITE) ? " selected" : "") . ">" . getMLText("access_mode_readwrite") . "\n";
-		print "\t<option value=\"".M_ALL."\"" . (($defMode == M_ALL) ? " selected" : "") . ">" . getMLText("access_mode_all") . "\n";
-		print "</select>\n";
-	} /* }}} */
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$allUsers = $this->params['allusers'];
-		$allGroups = $this->params['allgroups'];
-		$rootfolderid = $this->params['rootfolderid'];
-
-		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "view_folder", $folder);
-?>
-
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if ((document.form1.userid.options[document.form1.userid.selectedIndex].value == -1) && 
-		(document.form1.groupid.options[document.form1.groupid.selectedIndex].value == -1))
-			msg += "<?php printMLText("js_select_user_or_group");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-		$this->contentHeading(getMLText("edit_folder_access"));
-		$this->contentContainerStart();
-
-		if ($user->isAdmin()) {
-
-			$this->contentSubHeading(getMLText("set_owner"));
-?>
-	<form action="../op/op.FolderAccess.php">
-	<?php echo createHiddenFieldWithKey('folderaccess'); ?>
-	<input type="Hidden" name="action" value="setowner">
-	<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
-	<?php printMLText("owner");?> : <select name="ownerid">
-<?php
-			$owner = $folder->getOwner();
-			foreach ($allUsers as $currUser) {
-				if ($currUser->isGuest())
-					continue;
-				print "<option value=\"".$currUser->getID()."\"";
-				if ($currUser->getID() == $owner->getID())
-					print " selected";
-				print ">" . htmlspecialchars($currUser->getLogin() . " - " . $currUser->getFullname()) . "</option>\n";
-			}
-?>
-	</select>
-	<input type="submit" value="<?php printMLText("save")?>">
-	</form>
-	<?php
-		}
-
-		if ($folder->getID() != $rootfolderid && $folder->getParent()){
-
-			$this->contentSubHeading(getMLText("access_inheritance"));
-			
-			if ($folder->inheritsAccess()) {
-				printMLText("inherits_access_msg");
-?>
-  <p>
-	<form action="../op/op.FolderAccess.php" style="display: inline-block;">
-  <?php echo createHiddenFieldWithKey('folderaccess'); ?>
-	<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
-	<input type="hidden" name="action" value="notinherit">
-	<input type="hidden" name="mode" value="copy">
-	<input type="submit" value="<?php printMLText("inherits_access_copy_msg")?>">
-	</form>
-	<form action="../op/op.FolderAccess.php" style="display: inline-block;">
-  <?php echo createHiddenFieldWithKey('folderaccess'); ?>
-	<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
-	<input type="hidden" name="action" value="notinherit">
-	<input type="hidden" name="mode" value="empty">
-	<input type="submit" value="<?php printMLText("inherits_access_empty_msg")?>">
-	</form>
-	</p>
-<?php
-				$this->contentContainerEnd();
-				$this->htmlEndPage();
-				return;
-			}
-?>
-	<form action="../op/op.FolderAccess.php">
-  <?php echo createHiddenFieldWithKey('folderaccess'); ?>
-	<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
-	<input type="hidden" name="action" value="inherit">
-	<input type="submit" value="<?php printMLText("does_not_inherit_access_msg")?>">
-	</form>
-<?php
-		}
-
-		$accessList = $folder->getAccessList();
-
-		$this->contentSubHeading(getMLText("default_access"));
-?>
-<form action="../op/op.FolderAccess.php">
-  <?php echo createHiddenFieldWithKey('folderaccess'); ?>
-	<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
-	<input type="Hidden" name="action" value="setdefault">
-	<?php $this->printAccessModeSelection($folder->getDefaultAccess()); ?>
-	<input type="submit" value="<?php printMLText("save");?>">
-</form>
-
-<?php
-
-		$this->contentSubHeading(getMLText("edit_existing_access"));
-
-		if ((count($accessList["users"]) != 0) || (count($accessList["groups"]) != 0)) {
-
-			print "<table class=\"defaultView\">";
-
-			foreach ($accessList["users"] as $userAccess) {
-				$userObj = $userAccess->getUser();
-				print "<tr>\n";
-				print "<td><img src=\"images/usericon.gif\" class=\"mimeicon\"></td>\n";
-				print "<td>". htmlspecialchars($userObj->getFullName()) . "</td>\n";
-				print "<form action=\"../op/op.FolderAccess.php\">\n";
-				echo createHiddenFieldWithKey('folderaccess')."\n";
-				print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-				print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">\n";
-				print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<td>\n";
-				$this->printAccessModeSelection($userAccess->getMode());
-				print "</td>\n";
-				print "<td><span class=\"actions\">\n";
-				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/save.gif\">".getMLText("save")." ";
-				print "</span></td>\n";
-				print "</form>\n";
-				print "<td><span class=\"actions\">\n";
-				print "<form action=\"../op/op.FolderAccess.php\">\n";
-				echo createHiddenFieldWithKey('folderaccess')."\n";
-				print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-				print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n";
-				print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
-				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/del.gif\">".getMLText("delete")." ";
-				print "</form>\n";
-				print "<span></td>\n";
-				print "</tr>\n";
-			}
-
-			foreach ($accessList["groups"] as $groupAccess) {
-				$groupObj = $groupAccess->getGroup();
-				$mode = $groupAccess->getMode();
-				print "<tr>";
-				print "<td><img src=\"images/groupicon.gif\" class=\"mimeicon\"></td>";
-				print "<td>". htmlspecialchars($groupObj->getName()) . "</td>";
-				print "<form action=\"../op/op.FolderAccess.php\">";
-				echo createHiddenFieldWithKey('folderaccess')."\n";
-				print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">";
-				print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">";
-				print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
-				print "<td>";
-				$this->printAccessModeSelection($groupAccess->getMode());
-				print "</td>\n";
-				print "<td><span class=\"actions\">\n";
-				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/save.gif\">".getMLText("save")." ";
-				print "</span></td>\n";
-				print "</form>";
-				print "<form action=\"../op/op.FolderAccess.php\">\n";
-				print "<td><span class=\"actions\">\n";
-				echo createHiddenFieldWithKey('folderaccess')."\n";
-				print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-				print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n";
-				print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
-				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/del.gif\">".getMLText("delete")." ";
-				print "</span></td>\n";
-				print "</form>";
-				print "</tr>\n";
-			}
-			
-			print "</table><br>";
-		}
-?>
-<form action="../op/op.FolderAccess.php" name="form1" onsubmit="return checkForm();">
-<?php echo createHiddenFieldWithKey('folderaccess'); ?>
-<input type="Hidden" name="folderid" value="<?php print $folder->getID()?>">
-<input type="Hidden" name="action" value="addaccess">
-<table>
-<tr>
-<td><?php printMLText("user");?>:</td>
-<td>
-<select name="userid">
-<option value="-1"><?php printMLText("select_one");?>
-<?php
-		foreach ($allUsers as $userObj) {
-			if ($userObj->isGuest()) {
-				continue;
-			}
-			print "<option value=\"".$userObj->getID()."\">" . htmlspecialchars($userObj->getLogin() . " - " . $userObj->getFullName()) . "</option>\n";
-		}
-?>
-</select>
-</td>
-</tr>
-<tr>
-<td class="inputDescription"><?php printMLText("group");?>:</td>
-<td>
-<select name="groupid">
-<option value="-1"><?php printMLText("select_one");?>
-<?php
-		foreach ($allGroups as $groupObj) {
-			print "<option value=\"".$groupObj->getID()."\">" . htmlspecialchars($groupObj->getName()) . "\n";
-		}
-?>
-</select>
-</td>
-</tr>
-<tr>
-<td class="inputDescription"><?php printMLText("access_mode");?>:</td>
-<td>
-<?php
-		$this->printAccessModeSelection(M_READ);
-?>
-</td>
-</tr>
-<tr>
-<td colspan="2"><input type="submit" value="<?php printMLText("add");?>"></td>
-</tr>
-</table>
-</form>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.FolderChooser.php b/views/blue/class.FolderChooser.php
deleted file mode 100644
index d37073368..000000000
--- a/views/blue/class.FolderChooser.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Implementation of FolderChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for FolderChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_FolderChooser extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$mode = $this->params['mode'];
-		$exclude = $this->params['exclude'];
-		$form = $this->params['form'];
-		$rootfolderid = $this->params['rootfolderid'];
-
-		$this->htmlStartPage(getMLText("choose_target_folder"));
-		$this->globalBanner();
-		$this->pageNavigation(getMLText("choose_target_folder"));
-?>
-
-<script language="JavaScript">
-function toggleTree(id){
-	obj = document.getElementById("tree" + id);
-	if ( obj.style.display == "none" ) obj.style.display = "";
-	else obj.style.display = "none";
-}
-
-var targetName;
-var targetID;
-
-function folderSelected(id, name) {
-	targetName.value = name;
-	targetID.value = id;
-	window.close();
-	return true;
-}
-</script>
-
-
-<?php
-		$this->contentContainerStart();
-		$this->printFoldersTree($mode, $exclude, $rootfolderid);
-		$this->contentContainerEnd();
-?>
-
-
-<script language="JavaScript">
-targetName = opener.document.<?php echo $form?>.targetname<?php print $form ?>;
-targetID   = opener.document.<?php echo $form?>.targetid<?php print $form ?>;
-</script>
-
-<?php
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.FolderNotify.php b/views/blue/class.FolderNotify.php
deleted file mode 100644
index 9ce2da441..000000000
--- a/views/blue/class.FolderNotify.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Implementation of FolderNotify view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for FolderNotify view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_FolderNotify extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$allUsers = $this->params['allusers'];
-		$allGroups = $this->params['allgroups'];
-		$strictformcheck = $this->params['strictformcheck'];
-
-		$notifyList = $folder->getNotifyList();
-
-		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "view_folder", $folder);
-
-?>
-
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if ((document.form1.userid.options[document.form1.userid.selectedIndex].value == -1) && 
-		(document.form1.groupid.options[document.form1.groupid.selectedIndex].value == -1))
-			msg += "<?php printMLText("js_select_user_or_group");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-		$this->contentHeading(getMLText("edit_existing_notify"));
-		$this->contentContainerStart();
-
-		$userNotifyIDs = array();
-		$groupNotifyIDs = array();
-
-		print "<table class=\"defaultView\">\n";
-		if (empty($notifyList["users"]) && empty($notifyList["groups"])) {
-			print "<tr><td>".getMLText("empty_notify_list")."</td></tr>";
-		}
-		else {
-			foreach ($notifyList["users"] as $userNotify) {
-				print "<tr>";
-				print "<td><img src=\"images/usericon.gif\" class=\"mimeicon\"></td>";
-				print "<td>" . htmlspecialchars($userNotify->getFullName()) . "</td>";
-				if ($user->isAdmin() || $user->getID() == $userNotify->getID()) {
-					print "<td>";
-					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
-					echo createHiddenFieldWithKey('foldernotify')."\n";
-					print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
-					print "<input type=\"Hidden\" name=\"userid\" value=\"".$userNotify->getID()."\">\n";
-					print "<input type=\"Image\" class=\"mimeicon\" src=\"images/del.gif\">".getMLText("delete")." ";
-					print "</form>\n";
-					print "</td>";
-				}else print "<td></td>";
-				print "</tr>";
-				$userNotifyIDs[] = $userNotify->getID();
-			}
-
-			foreach ($notifyList["groups"] as $groupNotify) {
-				print "<tr>";
-				print "<td><img src=\"images/groupicon.gif\" class=\"mimeicon\"></td>";
-				print "<td>" . htmlspecialchars($groupNotify->getName()) . "</td>";
-				if ($user->isAdmin() || $groupNotify->isMember($user,true)) {
-					print "<td>";
-					print "<form action=\"../op/op.FolderNotify.php\" method=\"post\">\n";
-					echo createHiddenFieldWithKey('foldernotify')."\n";
-					print "<input type=\"Hidden\" name=\"folderid\" value=\"".$folder->getID()."\">\n";
-					print "<input type=\"Hidden\" name=\"action\" value=\"delnotify\">\n";
-					print "<input type=\"Hidden\" name=\"groupid\" value=\"".$groupNotify->getID()."\">\n";
-					print "<input type=\"Image\" class=\"mimeicon\" src=\"images/del.gif\">".getMLText("delete")." ";
-					print "</form>\n";
-					print "</td>";
-				}else print "<td></td>";
-				print "</tr>";
-				$groupNotifyIDs[] = $groupNotify->getID();
-			}
-		}
-		print "</table>\n";
-
-?>
-<br>
-<form action="../op/op.FolderNotify.php" method="post" name="form1" onsubmit="return checkForm();">
-<?php	echo createHiddenFieldWithKey('foldernotify'); ?>
-<input type="Hidden" name="folderid" value="<?php print $folder->getID()?>">
-<input type="Hidden" name="action" value="addnotify">
-<table>
-	<tr>
-		<td><?php printMLText("user");?>:</td>
-		<td>
-			<select name="userid">
-				<option value="-1"><?php printMLText("select_one");?>
-				<?php
-					if ($user->isAdmin()) {
-						foreach ($allUsers as $userObj) {
-							if (!$userObj->isGuest() && ($folder->getAccessMode($userObj) >= M_READ) && !in_array($userObj->getID(), $userNotifyIDs))
-								print "<option value=\"".$userObj->getID()."\">" . htmlspecialchars($userObj->getFullName()) . "\n";
-						}
-					}
-					elseif (!$user->isGuest() && !in_array($user->getID(), $userNotifyIDs)) {
-						print "<option value=\"".$user->getID()."\">" . htmlspecialchars($user->getFullName()) . "\n";
-					}
-				?>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td><?php printMLText("group");?>:</td>
-		<td>
-			<select name="groupid">
-				<option value="-1"><?php printMLText("select_one");?>
-				<?php
-					foreach ($allGroups as $groupObj) {
-						if (($user->isAdmin() || $groupObj->isMember($user,true)) && $folder->getGroupAccessMode($groupObj) >= M_READ && !in_array($groupObj->getID(), $groupNotifyIDs)) {
-							print "<option value=\"".$groupObj->getID()."\">" . htmlspecialchars($groupObj->getName()) . "\n";
-						}
-					}
-				?>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2"><input type="Submit" value="<?php printMLText("add") ?>"></td>
-	</tr>
-</table>
-</form>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ForcePasswordChange.php b/views/blue/class.ForcePasswordChange.php
deleted file mode 100644
index eefca407c..000000000
--- a/views/blue/class.ForcePasswordChange.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Implementation of ForcePasswordChange view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ForcePasswordChange view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ForcePasswordChange extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$passwordstrength = $this->params['passwordstrength'];
-
-		$this->htmlStartPage(getMLText("sign_in"), "login");
-		$this->globalBanner();
-		echo "<h3>".getMLText('password_expiration')."</h3>";
-		echo "<p>".getMLText('password_expiration_text')."</p>";
-		$this->contentContainerStart();
-?>
-<form action="../op/op.EditUserData.php" method="post" name="form1" onsubmit="return checkForm();">
-<table>
-	<tr>
-		<td><?php printMLText("current_password");?>:</td>
-		<td><input id="currentpwd" type="Password" name="currentpwd" size="30"></td>
-	</tr>
-	<tr>
-		<td><?php printMLText("password");?>:</td>
-		<td><input class="pwd" type="Password" name="pwd" size="30"> <div id="outerstrength" style="min-width: 100px; height: 14px; display: inline-block; border: 1px solid black; padding: 1px;"><div id="innerstrength" style="width: 0px; height: 14px; display: inline-block; border: 0px; padding: 0px; background-color: red;">&nbsp;</div> <div id="strength" style="display: inline-block;"></div></div></td>
-	</tr>
-	<tr>
-		<td><?php printMLText("confirm_pwd");?>:</td>
-		<td><input id="pwdconf" type="Password" name="pwdconf" size="30"></td>
-	</tr>
-	<tr>
-		<td colspan="2"><input type="Submit" value="<?php printMLText("submit_userinfo") ?>"></td>
-	</tr>
-</table>
-<input type="hidden" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" />
-<input type="hidden" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" />
-<input type="hidden" name="comment" value="<?php print htmlspecialchars($user->getComment());?>" />
-</form>
-
-<?php
-		$this->contentContainerEnd();
-		$tmpfoot = array();
-		$tmpfoot[] = "<a href=\"../op/op.Logout.php\">" . getMLText("logout") . "</a>\n";
-		print "<p>";
-		print implode(' | ', $tmpfoot);
-		print "</p>\n";
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.GroupMgr.php b/views/blue/class.GroupMgr.php
deleted file mode 100644
index adcd7d287..000000000
--- a/views/blue/class.GroupMgr.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/**
- * Implementation of GroupMgr view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for GroupMgr view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_GroupMgr extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$selgroup = $this->params['selgroup'];
-		$allUsers = $this->params['allusers'];
-		$allGroups = $this->params['allgroups'];
-		$strictformcheck = $this->params['strictformcheck'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-
-?>
-<script language="JavaScript">
-
-function checkForm1(num) {
-	msg = "";
-	eval("var formObj = document.form" + num + "_1;");
-	
-	if (formObj.name.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-<?php
-	if ($strictformcheck) {
-	?>
-	if (formObj.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-<?php
-	}
-?>
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-
-function checkForm2(num) {
-	msg = "";
-	eval("var formObj = document.form" + num + "_2;");
-	
-	if (formObj.userid.options[formObj.userid.selectedIndex].value == -1) msg += "<?php printMLText("js_select_user");?>\n";
-
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-
-obj = -1;
-function showUser(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-	
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-	
-	obj = document.getElementById("keywords" + id);
-	obj.style.display = "";
-}
-</script>
-<?php
-		$this->contentHeading(getMLText("group_management"));
-		$this->contentContainerStart();
-?>
-
-<table>
-<tr>
-<td>
-
-<?php echo getMLText("selection")?>:<select onchange="showUser(this)" id="selector">
-<option value="-1"><?php echo getMLText("choose_group")?>
-<option value="0"><?php echo getMLText("add_group")?>
-<?php
-		$selected=0;
-		$count=2;
-		foreach ($allGroups as $group) {
-			if ($selgroup && $group->getID()==$selgroup->getID()) $selected=$count;
-			print "<option value=\"".$group->getID()."\">" . htmlspecialchars($group->getName());
-			$count++;
-		}
-?>
-</select>
-&nbsp;&nbsp;
-</td>
-
-	<td id="keywords0" style="display : none;">
-	
-	<form action="../op/op.GroupMgr.php" name="form0_1" method="post" onsubmit="return checkForm1('0');">
-  <?php echo createHiddenFieldWithKey('addgroup'); ?>
-	<input type="Hidden" name="action" value="addgroup">
-	<table>
-		<tr>
-			<td><?php printMLText("name");?>:</td>
-			<td><input name="name"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="50"></textarea></td>
-		</tr>
-		<tr>
-			<td colspan="2"><input type="submit" value="<?php printMLText("add_group");?>"></td>
-		</tr>
-	</table>
-	</form>	
-	
-	</td>
-	
-<?php	
-		foreach ($allGroups as $group) {
-			print "<td id=\"keywords".$group->getID()."\" style=\"display : none;\">";
-			$this->contentSubHeading(getMLText("group")." : ".htmlspecialchars($group->getName()));
-?>
-	<a href="../out/out.RemoveGroup.php?groupid=<?php print $group->getID();?>"><img src="images/del.gif" width="15" height="15" border="0" align="absmiddle" alt=""> <?php printMLText("rm_group");?></a>
-	<?php	$this->contentSubHeading(getMLText("edit_group"));?>
-	<form action="../op/op.GroupMgr.php" name="form<?php print $group->getID();?>_1" method="post" onsubmit="return checkForm1('<?php print $group->getID();?>');">
-	<?php echo createHiddenFieldWithKey('editgroup'); ?>
-	<input type="Hidden" name="groupid" value="<?php print $group->getID();?>">
-	<input type="Hidden" name="action" value="editgroup">
-	<table>
-		<tr>
-			<td><?php printMLText("name");?>:</td>
-			<td><input name="name" value="<?php print htmlspecialchars($group->getName());?>"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="50"><?php print htmlspecialchars($group->getComment());?></textarea></td>
-		</tr>
-		<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("save");?>"></td>
-		</tr>
-	</table>
-	</form>
-<?php
-			$this->contentSubHeading(getMLText("group_members"));
-?>
-		<table class="folderView">
-<?php
-			$members = $group->getUsers();
-			if (count($members) == 0)
-				print "<tr><td>".getMLText("no_group_members")."</td></tr>";
-			else {
-			
-				foreach ($members as $member) {
-				
-					print "<tr>";
-					print "<td><img src=\"images/usericon.gif\" width=16 height=16></td>";
-					print "<td>" . htmlspecialchars($member->getFullName()) . "</td>";
-					print "<td>" . ($group->isMember($member,true)?getMLText("manager"):"&nbsp;") . "</td>";
-					print "<td align=\"right\"><ul class=\"actions\">";
-					print "<li><form action=\"../op/op.GroupMgr.php\" method=\"post\"><input type=\"hidden\" name=\"action\" value=\"rmmember\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('rmmember')."<input type=\"submit\" value=\"".getMLText("delete")."\" /></form>";
-					print "<li><form action=\"../op/op.GroupMgr.php\" method=\"post\"><input type=\"hidden\" name=\"groupid\" value=\"".$group->getID()."\" /><input type=\"hidden\" name=\"action\" value=\"tmanager\" /><input type=\"hidden\" name=\"userid\" value=\"".$member->getID()."\" />".createHiddenFieldWithKey('tmanager')."<input type=\"submit\" value=\"".getMLText("toggle_manager")."\" /></form>";
-					print "</td></tr>";
-				}
-			}
-?>
-		</table>
-		
-<?php
-			$this->contentSubHeading(getMLText("add_member"));
-?>
-		
-		<form action="../op/op.GroupMgr.php" method="POST" name="form<?php print $group->getID();?>_2" onsubmit="return checkForm2('<?php print $group->getID();?>');">
-		<?php echo createHiddenFieldWithKey('addmember'); ?>
-		<input type="Hidden" name="action" value="addmember">
-		<input type="Hidden" name="groupid" value="<?php print $group->getID();?>">
-		<table width="100%">
-			<tr>
-				<td>
-					<select name="userid">
-						<option value="-1"><?php printMLText("select_one");?>
-						<?php
-							foreach ($allUsers as $currUser)
-								if (!$group->isMember($currUser))
-									print "<option value=\"".$currUser->getID()."\">" . htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName()) . "\n";
-						?>
-					</select>
-				</td>
-				<td>
-					<input type="checkbox" name="manager" value="1"><?php printMLText("manager");?>
-				</td>
-				<td align="right">
-					<input type="Submit" value="<?php printMLText("add");?>">
-				</td>
-			</tr>
-		</table>
-		</form>
-	</td>
-<?php  } ?>
-
-</tr>
-</table>
-
-<script language="JavaScript">
-
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showUser(sel);
-
-</script>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.GroupView.php b/views/blue/class.GroupView.php
deleted file mode 100644
index ed3c3cd76..000000000
--- a/views/blue/class.GroupView.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Implementation of GroupView view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for GroupView view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_GroupView extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$allGroups = $this->params['allgroups'];
-		$allUsers = $this->params['allusers'];
-
-		$this->htmlStartPage(getMLText("my_account"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("my_account"), "my_account");
-
-		$this->contentHeading(getMLText("groups"));
-		$this->contentContainerStart();
-
-		echo "<ul class=\"groupView\">\n";
-
-		foreach ($allGroups as $group){
-
-			$members = $group->getUsers();
-			$managers = $group->getManagers();
-			$ismanager = false; /* set to true if current user is manager */
-
-			echo "<li>".htmlspecialchars($group->getName());
-			if($group->getComment())
-				echo " : ".htmlspecialchars($group->getComment());
-			foreach($managers as $manager)
-				if($manager->getId() == $user->getId()) {
-					echo " : ".getMLText("manager_of_group");
-					$ismanager = true;
-				}
-			echo "</li>";
-
-			echo "<ul>\n";
-			$memberids = array();
-			foreach ($members as $member) {
-				$memberids[] = $member->getId();
-
-				echo "<li>".htmlspecialchars($member->getFullName());
-				if ($member->getEmail()!="")
-					echo " (<a href=\"mailto:".htmlspecialchars($member->getEmail())."\">".htmlspecialchars($member->getEmail())."</a>)";
-				foreach($managers as $manager)
-					if($manager->getId() == $member->getId())
-						echo ", ".getMLText("manager");
-				if($ismanager) {
-					echo ' <a href="../op/op.GroupView.php?action=del&groupid='.$group->getId().'&userid='.$member->getId().'"><img src="images/del.gif" width="15" height="15" border="0" align="absmiddle" alt=""> '.getMLText("rm_user").'</a>';
-				}
-				echo "</li>";
-			}
-			if($ismanager) {
-				echo "<li>".getMLText("add_user_to_group").":";
-				echo "<form action=\"../op/op.GroupView.php\">";
-				echo "<input type=\"hidden\" name=\"action\" value=\"add\" /><input type=\"hidden\" name=\"groupid\" value=\"".$group->getId()."\" />";
-				echo "<select name=\"userid\" onChange=\"javascript: submit();\">";
-				echo "<option value=\"\"></option>";
-				foreach($allUsers as $u) {
-					if(!$u->isAdmin() && !$u->isGuest() && !in_array($u->getId(), $memberids))
-						echo "<option value=\"".$u->getId()."\">".htmlspecialchars($u->getFullName())."</option>";
-				}
-				echo "</select>";
-				echo "</form>";
-				echo "</li>";
-			}
-			echo "</ul>\n";
-		}
-		echo "</ul>\n";
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.Help.php b/views/blue/class.Help.php
deleted file mode 100644
index 232607c57..000000000
--- a/views/blue/class.Help.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Implementation of Help view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Help view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_Help extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-
-		$this->htmlStartPage(getMLText("help"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("help"), "");
-
-		$this->contentContainerStart();
-
-		readfile("../languages/".$user->getLanguage()."/help.htm");
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.IndexInfo.php b/views/blue/class.IndexInfo.php
deleted file mode 100644
index 0350105a5..000000000
--- a/views/blue/class.IndexInfo.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Implementation of IndexInfo view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for IndexInfo view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_IndexInfo extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$luceneclassdir = $this->params['luceneclassdir'];
-		$lucenedir = $this->params['lucenedir'];
-		$index = $this->params['index'];
-
-		$this->htmlStartPage(getMLText('fulltext_info'));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText('fulltext_info'));
-		$this->contentContainerStart();
-
-		$numDocs = $index->count();
-		echo "<pre>";
-		for ($id = 0; $id < $numDocs; $id++) {
-			if (!$index->isDeleted($id)) {
-				$hit = $index->getDocument($id);
-				echo $hit->document_id.": ".htmlspecialchars($hit->title)."\n";
-			}
-		}
-		echo "</pre>";
-
-		$terms = $index->terms();
-		echo "<p>".count($terms)." Terms</p>";
-		echo "<pre>";
-		foreach($terms as $term) {
-			echo htmlspecialchars($term->field).":".htmlspecialchars($term->text)."\n";
-		}
-		echo "</pre>";
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.Indexer.php b/views/blue/class.Indexer.php
deleted file mode 100644
index f65836f16..000000000
--- a/views/blue/class.Indexer.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Implementation of Indexer view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Indexer view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_Indexer extends SeedDMS_Blue_Style {
-
-	function tree($dms, $index, $folder, $indent='') { /* {{{ */
-		echo $indent."D ".htmlspecialchars($folder->getName())."\n";
-		$subfolders = $folder->getSubFolders();
-		foreach($subfolders as $subfolder) {
-			$this->tree($dms, $index, $subfolder, $indent.'  ');
-		}
-		$documents = $folder->getDocuments();
-		foreach($documents as $document) {
-			echo $indent."  ".$document->getId().":".htmlspecialchars($document->getName())." ";
-			/* If the document wasn't indexed before then just add it */
-			if(!($hits = $index->find('document_id:'.$document->getId()))) {
-				$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, $this->converters ? $this->converters : null));
-				echo "(document added)";
-			} else {
-				$hit = $hits[0];
-				/* Check if the attribute created is set or has a value older
-				 * than the lasted content. Documents without such an attribute
-				 * where added when a new document was added to the dms. In such
-				 * a case the document content  wasn't indexed.
-				 */
-				try {
-					$created = (int) $hit->getDocument()->getFieldValue('created');
-				} catch (Zend_Search_Lucene_Exception $e) {
-					$created = 0;
-				}
-				$content = $document->getLatestContent();
-				if($created >= $content->getDate()) {
-					echo $indent."(document unchanged)";
-				} else {
-					if($index->delete($hit->id)) {
-						$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, $this->converters ? $this->converters : null));
-					}
-					echo $indent."(document updated)";
-				}
-			}
-			echo "\n";
-		}
-	} /* }}} */
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$index = $this->params['index'];
-		$recreate = $this->params['recreate'];
-		$folder = $this->params['folder'];
-		$this->converters = $this->params['converters'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText('admin_tools'), 'admin_tools');
-		$this->contentHeading(getMLText("update_fulltext_index"));
-		$this->contentContainerStart();
-
-		echo "<pre>";
-		$this->tree($dms, $index, $folder);
-		echo "</pre>";
-
-		$index->commit();
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.Info.php b/views/blue/class.Info.php
deleted file mode 100644
index ee4150009..000000000
--- a/views/blue/class.Info.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Implementation of Info view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Info view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_Info extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$version = $this->params['version'];
-
-		$this->htmlStartPage($version->banner());
-		$this->globalNavigation();
-		$this->pageNavigation($version->banner());
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.KeywordChooser.php b/views/blue/class.KeywordChooser.php
deleted file mode 100644
index 126e9d4b9..000000000
--- a/views/blue/class.KeywordChooser.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * Implementation of KeywordChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for KeywordChooser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_KeywordChooser extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$categories = $this->params['categories'];
-		$target = $this->params['form'];
-
-		$this->htmlStartPage(getMLText("use_default_keywords"));
-?>
-<script language="JavaScript">
-var targetObj = opener.document.<?php echo $target ?>;
-var myTA;
-
-function insertKeywords(keywords) {
-
-	if (navigator.appName == "Microsoft Internet Explorer") {
-		myTA.value += " " + keywords;
-	}
-	//assuming Mozilla
-	else {
-		selStart = myTA.selectionStart;
-		
-		myTA.value = myTA.value.substring(0,myTA.selectionStart) + " " 
-			+ keywords
-			+ myTA.value.substring(myTA.selectionStart,myTA.value.length);
-		
-		myTA.selectionStart = selStart + keywords.length+1;
-		myTA.selectionEnd = selStart + keywords.length+1;
-	}				  
-	myTA.focus();
-}
-
-function cancel() {
-	window.close();
-	return true;
-}
-
-function acceptKeywords() {
-	targetObj.value = myTA.value;
-	window.close();
-	return true;
-}
-
-obj = new Array();
-obj[0] = -1;
-obj[1] = -1;
-function showKeywords(which) {
-	if (obj[which] != -1)
-		obj[which].style.display = "none";
-	
-	list = document.getElementById("categories" + which);
-	
-	id = list.options[list.selectedIndex].value;
-	if (id == -1)
-		return;
-	
-	obj[which] = document.getElementById("keywords" + id);
-	obj[which].style.display = "";
-}
-</script>
-
-<div>
-<?php
-		$this->contentHeading(getMLText("use_default_keywords"));
-		$this->contentContainerStart();
-?>
-
-<table>
-
-	<tr>
-		<td valign="top" class="inputDescription"><?php echo getMLText("keywords")?>:</td>
-		<td><textarea id="keywordta" rows="5" cols="30"></textarea></td>
-	</tr>
-	
-	<tr>
-		<td colspan="2"><hr></td>
-	</tr>
-	
-
-	<tr>
-		<td class="inputDescription"><?php echo getMLText("global_default_keywords")?>:</td>
-		<td>
-			<select onchange="showKeywords(0)" id="categories0">
-				<option value="-1"><?php echo getMLText("choose_category")?>
-<?php
-				foreach ($categories as $category) {
-					$owner = $category->getOwner();
-					if (!$owner->isAdmin())
-						continue;
-					
-					print "<option value=\"".$category->getID()."\">" . htmlspecialchars($category->getName());
-				}
-?>
-			</select>
-		</td>
-	</tr>
-<?php
-	foreach ($categories as $category) {
-		$owner = $category->getOwner();
-		if (!$owner->isAdmin())
-			continue;
-?>
-	<tr id="keywords<?php echo $category->getID()?>" style="display : none;">
-		<td valign="top" class="inputDescription"><?php echo getMLText("default_keywords")?>:</td>
-		<td>
-			<?php
-				$lists = $category->getKeywordLists();
-				
-				if (count($lists) == 0) print getMLText("no_default_keywords");
-				else {	
-					print "<ul>";
-					foreach ($lists as $list) {
-						print "<li><a href='javascript:insertKeywords(\"".htmlspecialchars($list["keywords"])."\");'>".htmlspecialchars($list["keywords"])."</a></li>";
-					}
-					print "</ul>";
-				}
-			?>
-		</td>
-	</tr>
-<?php } ?>
-	<tr>
-		<td colspan="2"><hr></td>
-	</tr>
-	<tr>
-		<td class="inputDescription"><?php echo getMLText("personal_default_keywords")?>:</td>
-		<td>
-			<select onchange="showKeywords(1)" id="categories1">
-				<option value="-1"><?php echo getMLText("choose_category")?>
-<?php
-				foreach ($categories as $category) {
-					$owner = $category->getOwner();
-					if ($owner->isAdmin())
-						continue;
-					
-					print "<option value=\"".$category->getID()."\">" . htmlspecialchars($category->getName());
-				}
-?>
-			</select>
-		</td>
-	</tr>
-<?php
-		foreach ($categories as $category) {
-			$owner = $category->getOwner();
-			if ($owner->isAdmin())
-				continue;
-?>
-		<tr id="keywords<?php echo $category->getID()?>" style="display : none;">
-			<td valign="top" class="inputDescription"><?php echo getMLText("default_keywords")?>:</td>
-			<td class="standardText">
-<?php
-					$lists = $category->getKeywordLists();				
-					if (count($lists) == 0) print getMLText("no_default_keywords");
-					else {	
-						print "<ul>";
-						foreach ($lists as $list) {
-							print "<li><a href='javascript:insertKeywords(\"".htmlspecialchars($list["keywords"])."\");'>".htmlspecialchars($list["keywords"])."</a></li>";
-						}
-						print "</ul>";
-					}
-?>
-		</td>
-	</tr>
-<?php } ?>
-	<tr>
-		<td colspan="2"><hr></td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<br>
-			<input type="Button" onclick="acceptKeywords();" value="<?php echo getMLText("accept")?>"> &nbsp;&nbsp;
-			<input type="Button" onclick="cancel();" value="<?php echo getMLText("cancel")?>">
-		</td>
-	</tr>
-</table>
-
-<?php
-		$this->contentContainerEnd();
-?>
-<script language="JavaScript">
-myTA = document.getElementById("keywordta");
-myTA.value = targetObj.value;
-myTA.focus();
-</script>
-<?php
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.LogManagement.php b/views/blue/class.LogManagement.php
deleted file mode 100644
index f22dcad5c..000000000
--- a/views/blue/class.LogManagement.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Implementation of LogManagement view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for LogManagement view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_LogManagement extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$contentdir = $this->params['contentdir'];
-		$logname = $this->params['logname'];
-
-		$this->htmlStartPage(getMLText("backup_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-
-		$this->contentHeading(getMLText("log_management"));
-		$this->contentContainerStart();
-
-		$print_header=true;
-
-		$handle = opendir($contentdir);
-		$entries = array();
-		while ($e = readdir($handle)){
-			if (is_dir($contentdir.$e)) continue;
-			if (strpos($e,".log")==FALSE) continue;
-			if (strcmp($e,"current.log")==0) continue;
-			$entries[] = $e;
-		}
-		closedir($handle);
-
-		sort($entries);
-		$entries = array_reverse($entries);
-
-		foreach ($entries as $entry){
-			
-			if ($print_header){
-				print "<table class=\"folderView\">\n";
-				print "<thead>\n<tr>\n";
-				print "<th>".getMLText("name")."</th>\n";
-				print "<th>".getMLText("creation_date")."</th>\n";
-				print "<th>".getMLText("file_size")."</th>\n";
-				print "<th></th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-				$print_header=false;
-			}
-					
-			print "<tr>\n";
-			print "<td><a href=\"out.LogManagement.php?logname=".$entry."\">".$entry."</a></td>\n";
-			print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-			print "<td>".formatted_size(filesize($contentdir.$entry))."</td>\n";
-			print "<td><ul class=\"actions\">";
-			
-			print "<li><a href=\"out.RemoveLog.php?logname=".$entry."\">".getMLText("rm_file")."</a></li>";
-			
-			print "<li><a href=\"../op/op.Download.php?logname=".$entry."\">".getMLText("download")."</a></li>";
-				
-			print "</ul></td>\n";	
-			print "</tr>\n";
-		}
-
-		if ($print_header) printMLText("empty_notify_list");
-		else print "</table>\n";
-
-		$this->contentContainerEnd();
-
-		if ($logname && file_exists($contentdir.$logname)){
-
-			$this->contentHeading(" ");
-			$this->contentContainerStart();
-			
-			$this->contentSubHeading(sanitizeString($logname));
-
-			echo "<div class=\"logview\">";
-			echo "<pre>\n";
-			readfile($contentdir.$logname);
-			echo "</pre>\n";
-			echo "</div>";
-
-			$this->contentContainerEnd();
-		}
-
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.Login.php b/views/blue/class.Login.php
deleted file mode 100644
index 91527a986..000000000
--- a/views/blue/class.Login.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Implementation of Login view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Login view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_Login extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$enableguestlogin = $this->params['enableguestlogin'];
-		$enablepasswordforgotten = $this->params['enablepasswordforgotten'];
-		$refer = $this->params['referrer'];
-		$themes = $this->params['themes'];
-
-		$this->htmlStartPage(getMLText("sign_in"), "login");
-		$this->globalBanner();
-		$this->pageNavigation(getMLText("sign_in"));
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if (document.form1.login.value == "") msg += "<?php printMLText("js_no_login");?>\n";
-	if (document.form1.pwd.value == "") msg += "<?php printMLText("js_no_pwd");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-
-function guestLogin()
-{
-	url = "../op/op.Login.php?login=guest" + 
-		"&sesstheme=" + document.form1.sesstheme.options[document.form1.sesstheme.options.selectedIndex].value +
-		"&lang=" + document.form1.lang.options[document.form1.lang.options.selectedIndex].value;
-	if (document.form1.referuri) {
-		url += "&referuri=" + escape(document.form1.referuri.value);
-	}
-	document.location.href = url;
-}
-
-</script>
-<?php $this->contentContainerStart(); ?>
-<form action="../op/op.Login.php" method="post" name="form1" onsubmit="return checkForm();">
-<?php
-		if ($refer) {
-			echo "<input type='hidden' name='referuri' value='".sanitizeString($refer)."'/>";
-		}
-?>
-	<table border="0">
-		<tr>
-			<td><?php printMLText("user_login");?></td>
-			<td><input name="login" id="login"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("password");?></td>
-			<td><input name="pwd" type="Password"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("language");?></td>
-			<td>
-<?php
-			print "<select name=\"lang\">";
-			print "<option value=\"\">-";
-			$languages = getLanguages();
-			foreach ($languages as $currLang) {
-				print "<option value=\"".$currLang."\">".getMLText($currLang)."</option>";
-			}
-			print "</select>";
-?>
-			</td>
-		</tr>
-		<tr>
-			<td><?php printMLText("theme");?></td>
-		<td>
-<?php
-			print "<select name=\"sesstheme\">";
-			print "<option value=\"\">-";
-			foreach ($themes as $currTheme) {
-				print "<option value=\"".$currTheme."\">".$currTheme;
-			}
-			print "</select>";
-?>
-		</td>
-		</tr>
-		<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("submit_login") ?>"></td>
-		</tr>
-	</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$tmpfoot = array();
-		if ($enableguestlogin)
-			$tmpfoot[] = "<a href=\"javascript:guestLogin()\">" . getMLText("guest_login") . "</a>\n";
-		if ($enablepasswordforgotten)
-			$tmpfoot[] = "<a href=\"../out/out.PasswordForgotten.php\">" . getMLText("password_forgotten") . "</a>\n";
-		if($tmpfoot) {
-			print "<p>";
-			print implode(' | ', $tmpfoot);
-			print "</p>\n";
-		}
-?>
-<script language="JavaScript">document.form1.login.focus();</script>
-<?php
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ManageNotify.php b/views/blue/class.ManageNotify.php
deleted file mode 100644
index d2dcc5ed5..000000000
--- a/views/blue/class.ManageNotify.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Implementation of ManageNotify view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ManageNotify view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ManageNotify extends SeedDMS_Blue_Style {
-
-	// Get list of subscriptions for documents or folders for user or groups
-	function getNotificationList($as_group, $folders) { /* {{{ */
-
-		// First, get the list of groups of which the user is a member.
-		if ($as_group){
-		
-			$groups = $this->user->getGroups();
-			
-			if (count($groups)==0) return NULL;
-			
-			$grpList = "";
-			foreach ($groups as $group) {
-				$grpList .= (strlen($grpList)==0 ? "" : ", ") . $group->getID();
-			}
-			
-			$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
-			 "WHERE `tblNotify`.`groupID` IN (". $grpList .")";
-					
-		} else {
-			$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
-				"WHERE `tblNotify`.`userID` = '". $this->user->getID()."'" ;
-		}
-		
-		$resArr = $this->db->getResultArray($queryStr);
-		
-		$ret=array();
-			
-		foreach ($resArr as $res){
-			
-			if (($res["targetType"] == T_DOCUMENT)&&(!$folders)) $ret[]=$res["target"];
-			if (($res["targetType"] == T_FOLDER)&&($folders)) $ret[]=$res["target"];
-		}
-		
-		return $ret;
-	} /* }}} */
-
-	function printFolderNotificationList($ret,$deleteaction=true) { /* {{{ */
-		if (count($ret)==0) {
-			printMLText("empty_notify_list");
-		}
-		else {
-
-			print "<table class=\"folderView\">";
-			print "<thead><tr>\n";
-			print "<th></th>\n";
-			print "<th>".getMLText("name")."</th>\n";
-			print "<th>".getMLText("owner")."</th>\n";
-			print "<th>".getMLText("actions")."</th>\n";
-			print "</tr></thead>\n<tbody>\n";
-			foreach($ret as $ID) {
-				$fld = $this->dms->getFolder($ID);
-				if (is_object($fld)) {
-					$owner = $fld->getOwner();
-					print "<tr class=\"folder\">";
-					print "<td><img src=\"images/folder_closed.gif\" width=18 height=18 border=0></td>";
-					print "<td><a href=\"../out/out.ViewFolder.php?folderid=".$ID."\">" . htmlspecialchars($fld->getName()) . "</a></td>\n";
-					print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-					print "<td><ul class=\"actions\">";
-					if ($deleteaction) print "<li><a href='../op/op.ManageNotify.php?id=".$ID."&type=folder&action=del'>".getMLText("delete")."</a>";
-					else print "<li><a href='../out/out.FolderNotify.php?folderid=".$ID."'>".getMLText("edit")."</a>";
-					print "</ul></td></tr>";
-				}
-			}
-			print "</tbody></table>";
-		}
-	} /* }}} */
-
-	function printDocumentNotificationList($ret,$deleteaction=true) { /* {{{ */
-
-		if (count($ret)==0) {
-			printMLText("empty_notify_list");
-		}
-		else {
-			print "<table class=\"folderView\">";
-			print "<thead>\n<tr>\n";
-			print "<th></th>\n";
-			print "<th>".getMLText("name")."</th>\n";
-			print "<th>".getMLText("owner")."</th>\n";
-			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("version")."</th>\n";
-			print "<th>".getMLText("actions")."</th>\n";
-			print "</tr></thead>\n<tbody>\n";
-			foreach ($ret as $ID) {
-				$doc = $this->dms->getDocument($ID);
-				if (is_object($doc)) {
-					$owner = $doc->getOwner();
-					$latest = $doc->getLatestContent();
-					$status = $latest->getStatus();
-					print "<tr>\n";
-					print "<td><img src=\"images/file.gif\" width=18 height=18 border=0></td>";
-					print "<td><a href=\"../out/out.ViewDocument.php?documentid=".$ID."\">" . htmlspecialchars($doc->getName()) . "</a></td>\n";
-					print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-					print "<td>".getOverallStatusText($status["status"])."</td>";
-					print "<td class=\"center\">".$latest->getVersion()."</td>";
-					print "<td><ul class=\"actions\">";
-					if ($deleteaction) print "<li><a href='../op/op.ManageNotify.php?id=".$ID."&type=document&action=del'>".getMLText("delete")."</a>";
-					else print "<li><a href='../out/out.DocumentNotify.php?documentid=".$ID."'>".getMLText("edit")."</a>";
-					print "</ul></td></tr>\n";
-				}
-			}
-			print "</tbody></table>";
-		}
-	} /* }}} */
-
-	function show() { /* {{{ */
-		$this->dms = $this->params['dms'];
-		$this->user = $this->params['user'];
-		$this->db = $this->dms->getDB();
-
-		$this->htmlStartPage(getMLText("my_account"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("my_account"), "my_account");
-
-		$this->contentHeading(getMLText("edit_existing_notify"));
-		$this->contentContainerStart();
-
-		print "<form method=POST action=\"../op/op.ManageNotify.php?type=folder&action=add\" name=\"form1\">";
-		$this->contentSubHeading(getMLText("choose_target_folder"));
-		$this->printFolderChooser("form1",M_READ);
-		print "<input type=\"checkbox\" name=\"recursefolder\" value=\"1\">";
-		print getMLText("include_subdirectories");
-		print "<input type=\"checkbox\" name=\"recursedoc\" value=\"1\">";
-		print getMLText("include_documents");
-		print "&nbsp;&nbsp;<input type='submit' name='' value='".getMLText("add")."'/>";
-		print "</form>";
-
-		print "<form method=POST action=\"../op/op.ManageNotify.php?type=document&action=add\" name=\"form2\">";
-		$this->contentSubHeading(getMLText("choose_target_document"));
-		$this->printDocumentChooser("form2");
-		print "&nbsp;&nbsp;<input type=\"Submit\" value=\"".getMLText("add")."\">";
-		print "</form>";
-
-		$this->contentContainerEnd();
-
-
-		//
-		// Display the results.
-		//
-		$this->contentHeading(getMLText("edit_folder_notify"));
-		$this->contentContainerStart();
-		$this->contentSubHeading(getMLText("user"));
-		$ret=$this->getNotificationList(false,true);
-		$this->printFolderNotificationList($ret);
-		$this->contentSubHeading(getMLText("group"));
-		$ret=$this->getNotificationList(true,true);
-		$this->printFolderNotificationList($ret,false);
-		$this->contentContainerEnd();
-
-		$this->contentHeading(getMLText("edit_document_notify"));
-		$this->contentContainerStart();
-		$this->contentSubHeading(getMLText("user"));
-		$ret=$this->getNotificationList(false,false);
-		$this->printDocumentNotificationList($ret);
-		$this->contentSubHeading(getMLText("group"));
-		$ret=$this->getNotificationList(true,false);
-		$this->printDocumentNotificationList($ret,false);
-		$this->contentContainerEnd();
-
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.MoveDocument.php b/views/blue/class.MoveDocument.php
deleted file mode 100644
index b3bcb5124..000000000
--- a/views/blue/class.MoveDocument.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Implementation of MoveDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for MoveDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_MoveDocument extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("move_document"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.MoveDocument.php" name="form1">
-	<input type="hidden" name="documentid" value="<?php print $document->getID();?>">
-	<table>
-		<tr>
-			<td><?php printMLText("choose_target_folder");?>:</td>
-			<td><?php $this->printFolderChooser("form1", M_READWRITE);?></td>
-		</tr>
-		<tr>
-			<td colspan="2"><br><input type="submit" value="<?php printMLText("move");?>"></td>
-		</tr>
-	</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.MoveFolder.php b/views/blue/class.MoveFolder.php
deleted file mode 100644
index b71521875..000000000
--- a/views/blue/class.MoveFolder.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Implementation of MoveFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for MoveFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_MoveFolder extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-
-		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "view_folder", $folder);
-		$this->contentHeading(getMLText("move_folder"));
-		$this->contentContainerStart();
-
-?>
-<form action="../op/op.MoveFolder.php" name="form1">
-	<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
-	<input type="Hidden" name="showtree" value="<?php echo showtree();?>">
-	<table>
-		<tr>
-			<td><?php printMLText("choose_target_folder");?>:</td>
-			<td><?php $this->printFolderChooser("form1", M_READWRITE, $folder->getID());?></td>
-		</tr>
-		<tr>
-			<td colspan="2"><input type="submit" value="<?php printMLText("move_folder"); ?>"></td>
-		</tr>
-	</table>
-	</form>
-
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.MyAccount.php b/views/blue/class.MyAccount.php
deleted file mode 100644
index f49ebdb4b..000000000
--- a/views/blue/class.MyAccount.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Implementation of MyAccount view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for MyAccount view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_MyAccount extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$enableuserimage = $this->params['enableuserimage'];
-		$passwordexpiration = $this->params['passwordexpiration'];
-		$httproot = $this->params['httproot'];
-
-		$this->htmlStartPage(getMLText("my_account"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("my_account"), "my_account");
-
-		$this->contentHeading(getMLText("user_info"));
-		$this->contentContainerStart();
-
-		print "<table>\n";
-
-		if ($enableuserimage){
-			print "<tr>\n";
-			print "<td rowspan=5 id=\"userImage\">".($user->hasImage() ? "<img class=\"userImage\" src=\"".$httproot . "out/out.UserImage.php?userid=".$user->getId()."\">" : getMLText("no_user_image"))."</td>\n";
-			print "</tr>\n";
-		}
-
-		print "<tr>\n";
-		print "<td>".getMLText("name")." : </td>\n";
-		print "<td>".htmlspecialchars($user->getFullName()).($user->isAdmin() ? " (".getMLText("admin").")" : "")."</td>\n";
-		print "</tr>\n<tr>\n";
-		print "<td>".getMLText("user_login")." : </td>\n";
-		print "<td>".$user->getLogin()."</td>\n";
-		print "</tr>\n<tr>\n";
-		print "<td>".getMLText("email")." : </td>\n";
-		print "<td>".htmlspecialchars($user->getEmail())."</td>\n";
-		print "</tr>\n<tr>\n";
-		print "<td>".getMLText("comment")." : </td>\n";
-		print "<td>".htmlspecialchars($user->getComment())."</td>\n";
-		print "</tr>\n";
-		if($passwordexpiration > 0) {
-			print "<tr>\n";
-			print "<td>".getMLText("password_expiration")." : </td>\n";
-			print "<td>".htmlspecialchars($user->getPwdExpiration())."</td>\n";
-			print "</tr>\n";
-		}
-		print "<tr>\n";
-		print "<td>".getMLText("quota")." : </td>\n";
-		print "<td>".SeedDMS_Core_File::format_filesize($user->getQuota())."</td>\n";
-		print "</tr>\n";
-		print "<tr>\n";
-		print "<td>".getMLText("used_discspace")." : </td>\n";
-		print "<td>".SeedDMS_Core_File::format_filesize($user->getUsedDiskSpace())."</td>\n";
-		print "</tr>\n";
-		print "</table>\n";
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.MyDocuments.php b/views/blue/class.MyDocuments.php
deleted file mode 100644
index 2cb06a3ac..000000000
--- a/views/blue/class.MyDocuments.php
+++ /dev/null
@@ -1,489 +0,0 @@
-<?php
-/**
- * Implementation of MyDocuments view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for MyDocuments view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_MyDocuments extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$orderby = $this->params['orderby'];
-		$showInProcess = $this->params['showinprocess'];
-
-		$db = $dms->getDB();
-
-		$this->htmlStartPage(getMLText("my_documents"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("my_documents"), "my_documents");
-
-		if ($showInProcess){
-
-			if (!$db->createTemporaryTable("ttstatid") || !$db->createTemporaryTable("ttcontentid")) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-
-			// Get document list for the current user.
-			$reviewStatus = $user->getReviewStatus();
-			$approvalStatus = $user->getApprovalStatus();
-			
-			// Create a comma separated list of all the documentIDs whose information is
-			// required.
-			$dList = array();
-			foreach ($reviewStatus["indstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
-					$dList[] = $st["documentID"];
-				}
-			}
-			foreach ($reviewStatus["grpstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
-					$dList[] = $st["documentID"];
-				}
-			}
-			foreach ($approvalStatus["indstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
-					$dList[] = $st["documentID"];
-				}
-			}
-			foreach ($approvalStatus["grpstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
-					$dList[] = $st["documentID"];
-				}
-			}
-			$docCSV = "";
-			foreach ($dList as $d) {
-				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
-			}
-			
-			if (strlen($docCSV)>0) {
-				// Get the document information.
-				$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-					"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-					"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-					"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-					"FROM `tblDocumentContent` ".
-					"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-					"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-					"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-					"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-					"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-					"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-					"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-					"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-					"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-					"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-					"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.", ".S_EXPIRED.") ".
-					"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
-					"ORDER BY `statusDate` DESC";
-
-				$resArr = $db->getResultArray($queryStr);
-				if (is_bool($resArr) && !$resArr) {
-					$this->contentHeading(getMLText("warning"));
-					$this->contentContainer(getMLText("internal_error_exit"));
-					$this->htmlEndPage();
-					exit;
-				}
-				
-				// Create an array to hold all of these results, and index the array by
-				// document id. This makes it easier to retrieve document ID information
-				// later on and saves us having to repeatedly poll the database every time
-				// new document information is required.
-				$docIdx = array();
-				foreach ($resArr as $res) {
-					
-					// verify expiry
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-							$res["status"]=S_EXPIRED;
-						}
-					}
-
-					$docIdx[$res["id"]][$res["version"]] = $res;
-				}
-
-				// List the documents where a review has been requested.
-				$this->contentHeading(getMLText("documents_to_review"));
-				$this->contentContainerStart();
-				$printheader=true;
-				$iRev = array();
-				$dList = array();
-				foreach ($reviewStatus["indstatus"] as $st) {
-				
-					if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
-						$dList[] = $st["documentID"];
-					
-						if ($printheader){
-							print "<table class=\"folderView\">";
-							print "<thead>\n<tr>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("version")."</th>\n";
-							print "<th>".getMLText("last_update")."</th>\n";
-							print "<th>".getMLText("expires")."</th>\n";
-							print "</tr>\n</thead>\n<tbody>\n";
-							$printheader=false;
-						}
-					
-						print "<tr>\n";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
-					}
-				}
-				foreach ($reviewStatus["grpstatus"] as $st) {
-				
-					if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
-						$dList[] = $st["documentID"];
-
-						if ($printheader){
-							print "<table class=\"folderView\">";
-							print "<thead>\n<tr>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("version")."</th>\n";
-							print "<th>".getMLText("last_update")."</th>\n";
-							print "<th>".getMLText("expires")."</th>\n";
-							print "</tr>\n</thead>\n<tbody>\n";
-							$printheader=false;
-						}
-
-						print "<tr>\n";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
-					}
-				}
-				if (!$printheader){
-					echo "</tbody>\n</table>";
-				}else{
-					printMLText("no_docs_to_review");
-				}
-				$this->contentContainerEnd();
-
-				// List the documents where an approval has been requested.
-				$this->contentHeading(getMLText("documents_to_approve"));
-				$this->contentContainerStart();
-				$printheader=true;
-				
-				foreach ($approvalStatus["indstatus"] as $st) {
-				
-					if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]])) {
-					
-						if ($printheader){
-							print "<table class=\"folderView\">";
-							print "<thead>\n<tr>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("version")."</th>\n";
-							print "<th>".getMLText("last_update")."</th>\n";
-							print "<th>".getMLText("expires")."</th>\n";
-							print "</tr>\n</thead>\n<tbody>\n";
-							$printheader=false;
-						}
-						print "<tr>\n";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";					
-						print "</tr>\n";
-					}
-				}
-				foreach ($approvalStatus["grpstatus"] as $st) {
-				
-					if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
-						if ($printheader){
-							print "<table class=\"folderView\">";
-							print "<thead>\n<tr>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("version")."</th>\n";
-							print "<th>".getMLText("last_update")."</th>\n";
-							print "<th>".getMLText("expires")."</th>\n";
-							print "</tr>\n</thead>\n<tbody>\n";
-							$printheader=false;
-						}
-						print "<tr>\n";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";				
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
-					}
-				}
-				if (!$printheader){
-					echo "</tbody>\n</table>\n";
-				 }else{
-					printMLText("no_docs_to_approve");
-				 }
-				$this->contentContainerEnd();
-			}
-			else {
-			
-				$this->contentHeading(getMLText("documents_to_review"));
-				$this->contentContainerStart();
-				printMLText("no_review_needed");
-				$this->contentContainerEnd();
-				$this->contentHeading(getMLText("documents_to_approve"));
-				$this->contentContainerStart();
-				printMLText("no_approval_needed");
-				$this->contentContainerEnd();
-			}
-
-			// Get list of documents owned by current user that are pending review or
-			// pending approval.
-			$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-				"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-				"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-				"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-				"FROM `tblDocumentContent` ".
-				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-				"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-				"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-				"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-				"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-				"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-				"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-				"AND `tblDocuments`.`owner` = '".$user->getID()."' ".
-				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ".
-				"ORDER BY `statusDate` DESC";
-
-			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && !$resArr) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer("Internal error. Unable to complete request. Exiting.");
-				$this->htmlEndPage();
-				exit;
-			}
-
-			$this->contentHeading(getMLText("documents_user_requiring_attention"));
-			$this->contentContainerStart();
-			if (count($resArr)>0) {
-
-				print "<table class=\"folderView\">";
-				print "<thead>\n<tr>\n";
-				print "<th>".getMLText("name")."</th>\n";
-				print "<th>".getMLText("status")."</th>\n";
-				print "<th>".getMLText("version")."</th>\n";
-				print "<th>".getMLText("last_update")."</th>\n";
-				print "<th>".getMLText("expires")."</th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-
-				foreach ($resArr as $res) {
-				
-					// verify expiry
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-							$res["status"]=S_EXPIRED;
-						}
-					}
-				
-					print "<tr>\n";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
-				}		
-				print "</tbody></table>";	
-				
-			}
-			else printMLText("no_docs_to_look_at");
-			
-			$this->contentContainerEnd();
-			
-			
-			// Get list of documents locked by current user 
-			$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-				"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-				"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-				"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-				"FROM `tblDocumentContent` ".
-				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-				"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-				"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-				"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-				"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-				"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-				"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-				"AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ".
-				"ORDER BY `statusDate` DESC";
-
-			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && !$resArr) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer("Internal error. Unable to complete request. Exiting.");
-				$this->htmlEndPage();
-				exit;
-			}
-
-			$this->contentHeading(getMLText("documents_locked_by_you"));
-			$this->contentContainerStart();
-			if (count($resArr)>0) {
-
-				print "<table class=\"folderView\">";
-				print "<thead>\n<tr>\n";
-				print "<th>".getMLText("name")."</th>\n";
-				print "<th>".getMLText("status")."</th>\n";
-				print "<th>".getMLText("version")."</th>\n";
-				print "<th>".getMLText("last_update")."</th>\n";
-				print "<th>".getMLText("expires")."</th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-
-				foreach ($resArr as $res) {
-				
-					// verify expiry
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-							$res["status"]=S_EXPIRED;
-						}
-					}
-				
-					print "<tr>\n";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
-				}		
-				print "</tbody></table>";	
-				
-			}
-			else printMLText("no_docs_locked");
-			
-			$this->contentContainerEnd();
-			
-		}
-		else {
-
-			// Get list of documents owned by current user
-			if (!$db->createTemporaryTable("ttstatid")) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-
-			if (!$db->createTemporaryTable("ttcontentid")) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-			$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-				"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-				"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-				"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-				"FROM `tblDocumentContent` ".
-				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-				"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-				"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-				"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-				"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-				"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-				"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-				"AND `tblDocuments`.`owner` = '".$user->getID()."' ";
-				
-			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
-			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
-			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
-			else $queryStr .= "ORDER BY `name`";
-
-			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && !$resArr) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-			
-			$this->contentHeading(getMLText("all_documents"));
-			$this->contentContainerStart();
-
-			if (count($resArr)>0) {
-
-				print "<table class=\"folderView\">";
-				print "<thead>\n<tr>\n";
-				print "<th><a href=\"../out/out.MyDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
-				print "<th><a href=\"../out/out.MyDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
-				print "<th>".getMLText("version")."</th>\n";
-				print "<th><a href=\"../out/out.MyDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n";
-				print "<th><a href=\"../out/out.MyDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-
-				foreach ($resArr as $res) {
-				
-					// verify expiry
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-							$res["status"]=S_EXPIRED;
-						}
-					}
-				
-					print "<tr>\n";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ". htmlspecialchars($res["statusName"])."</td>";
-					//print "<td>".(!$res["expires"] ? getMLText("does_not_expire"):getReadableDate($res["expires"]))."</td>";				
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
-				}
-				print "</tbody></table>";
-			}
-			else printMLText("empty_notify_list");
-			
-			$this->contentContainerEnd();
-		}
-
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ObjectCheck.php b/views/blue/class.ObjectCheck.php
deleted file mode 100644
index 6a9eb098e..000000000
--- a/views/blue/class.ObjectCheck.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- * Implementation of ObjectCheck view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ObjectCheck view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ObjectCheck extends SeedDMS_Blue_Style {
-
-	function tree($dms, $folder, $repair, $path=':', $indent='') { /* {{{ */
-
-		/* Don't do folderlist check for root folder */
-		if($path != ':') {
-			$folderList = $folder->getFolderList();
-			/* Check the folder */
-			if($folderList != $path) {
-				print "<tr>\n";
-				$this->needsrepair = true;
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"../out/images/folder_closed.gif\" width=18 height=18 border=0></a></td>";
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
-				$tmppath = $folder->getPath();
-				for ($i = 1; $i  < count($tmppath); $i++) {
-					print "/".htmlspecialchars($tmppath[$i]->getName());
-				}
-				print $folder->getName();
-				print "</a></td>";
-				
-				$owner = $folder->getOwner();
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>Folderlist is '".$folderList."', should be '".$path."'</td>";
-				if($repair) {
-					$folder->repair();
-					print "<td><span class=\"success\">Repaired</span></td>\n";
-				} else {
-					print "<td></td>\n";
-				}
-				print "</tr>\n";
-			}
-		}
-
-		$subfolders = $folder->getSubFolders();
-		foreach($subfolders as $subfolder) {
-			$this->tree($dms, $subfolder, $repair, $path.$folder->getId().':', $indent.'  ');
-		}
-		$path .= $folder->getId().':';
-		$documents = $folder->getDocuments();
-		foreach($documents as $document) {
-			/* Check the folder list of the document */
-			$folderList = $document->getFolderList();
-			if($folderList != $path) {
-				print "<tr>\n";
-				$this->needsrepair = true;
-				$lc = $document->getLatestContent();
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><img class=\"mimeicon\" src=\"../out/images/icons/".UI::getMimeIcon($lc->getFileType())."\" title=\"".$lc->getMimeType()."\"></a></td>";
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
-				$folder = $document->getFolder();
-				$tmppath = $folder->getPath();
-				for ($i = 1; $i  < count($tmppath); $i++) {
-					print htmlspecialchars($tmppath[$i]->getName())."/";
-				}
-				print htmlspecialchars($document->getName());
-				print "</a></td>";
-				$owner = $document->getOwner();
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>Folderlist is '".$folderList."', should be '".$path."'</td>";
-				if($repair) {
-					$document->repair();
-					print "<td><span class=\"success\">Repaired</span></td>\n";
-				} else {
-					print "<td></td>\n";
-				}
-				print "</tr>\n";
-			}
-
-			/* Check if the content is available */
-			$versions = $document->getContent();
-			if($versions) {
-				foreach($versions as $version) {
-					$filepath = $dms->contentDir . $version->getPath();
-					if(!file_exists($filepath)) {
-					print "<tr>\n";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><img class=\"mimeicon\" src=\"../out/images/icons/".UI::getMimeIcon($version->getFileType())."\" title=\"".$version->getMimeType()."\"></a></td>";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
-					$folder = $document->getFolder();
-					$tmppath = $folder->getPath();
-					for ($i = 1; $i  < count($tmppath); $i++) {
-						print htmlspecialchars($tmppath[$i]->getName())."/";
-					}
-					print htmlspecialchars($document->getName());
-					print "</a></td>";
-					$owner = $document->getOwner();
-					print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-					print "<td>Document content of version ".$version->getVersion()." is missing ('".$path."')</td>";
-					if($repair) {
-						print "<td><span class=\"warning\">Cannot repaired</span></td>\n";
-					} else {
-						print "<td></td>\n";
-					}
-					print "</tr>\n";
-					}
-				}
-			} else {
-				print "<tr>\n";
-				print "<td></td>\n";
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
-				$folder = $document->getFolder();
-				$tmppath = $folder->getPath();
-				for ($i = 1; $i  < count($tmppath); $i++) {
-					print htmlspecialchars($tmppath[$i]->getName())."/";
-				}
-				print htmlspecialchars($document->getName());
-				print "</a></td>";
-				$owner = $document->getOwner();
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>Document has no content! Delete the document manually.</td>";
-				print "</tr>\n";
-			}
-		}
-	} /* }}} */
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$unlinkedversions = $this->params['unlinkedcontent'];
-		$nofilesizeversions = $this->params['nofilesizeversions'];
-		$nochecksumversions = $this->params['nochecksumversions'];
-		$repair = $this->params['repair'];
-		$unlink = $this->params['unlink'];
-		$setfilesize = $this->params['setfilesize'];
-		$setchecksum = $this->params['setchecksum'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("objectcheck"));
-		$this->contentContainerStart();
-
-		if($repair) {
-			echo "<p>".getMLText('repairing_objects')."</p>";
-		}
-		print "<table class=\"folderView\">";
-		print "<thead>\n<tr>\n";
-		print "<th></th>\n";
-		print "<th>".getMLText("name")."</th>\n";
-		print "<th>".getMLText("owner")."</th>\n";
-		print "<th>".getMLText("error")."</th>\n";
-		print "<th></th>\n";
-		print "</tr>\n</thead>\n<tbody>\n";
-		$this->needsrepair = false;
-		$this->tree($dms, $folder, $repair);
-		print "</tbody></table>\n";
-
-		if($this->needsrepair && $repair == 0) {
-			echo '<p><a href="out.ObjectCheck.php?repair=1">'.getMLText('do_object_repair').'</a></p>';
-		}
-		$this->contentContainerEnd();
-
-		$this->contentHeading(getMLText("unlinked_content"));
-		$this->contentContainerStart();
-		if($unlink) {
-			echo "<p>".getMLText('unlinking_objects')."</p>";
-		}
-
-		if($unlinkedversions) {
-			print "<table class=\"folderView\">";
-			print "<thead>\n<tr>\n";
-			print "<th>".getMLText("document")."</th>\n";
-			print "<th>".getMLText("version")."</th>\n";
-			print "<th>".getMLText("original_filename")."</th>\n";
-			print "<th>".getMLText("mimetype")."</th>\n";
-			print "<th></th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-			foreach($unlinkedversions as $version) {
-				$doc = $version->getDocument();
-				print "<tr><td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td>";
-				if($unlink) {
-					$doc->removeContent($version);
-				}
-				print "</tr>\n";
-			}
-			print "</tbody></table>\n";
-			if($unlink == 0) {
-				echo '<p><a href="out.ObjectCheck.php?unlink=1">'.getMLText('do_object_unlink').'</a></p>';
-			}
-		}
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.OverrideContentStatus.php b/views/blue/class.OverrideContentStatus.php
deleted file mode 100644
index 3259da4f4..000000000
--- a/views/blue/class.OverrideContentStatus.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Implementation of OverrideContentStatus view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for OverrideContentStatus view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_OverrideContentStatus extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$content = $this->params['version'];
-
-		$overallStatus = $content->getStatus();
-		$reviewStatus = $content->getReviewStatus();
-		$approvalStatus = $content->getApprovalStatus();
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-
-		$this->contentHeading(getMLText("change_status"));
-
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if (document.form1.overrideStatus.value == "") msg += "<?php printMLText("js_no_override_status");?>\n";
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-<?php
-
-		$this->contentContainerStart();
-
-// Display the Review form.
-?>
-<form method="post" action="../op/op.OverrideContentStatus.php" name="form1" onsubmit="return checkForm();">
-<table>
-<tr><td><?php echo(printMLText("comment")); ?>:</td>
-<td><textarea name="comment" cols="40" rows="4"></textarea>
-</td></tr>
-<tr><td><?php echo(printMLText("status")); ?>:</td>
-<td><select name="overrideStatus">
-<option value=''></option>
-<?php
-
-		if ($overallStatus["status"] == S_OBSOLETE) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
-		if ($overallStatus["status"] == S_RELEASED) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
-
-?>
-</select>
-</td></tr><tr><td></td><td>
-<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-<input type='submit' name='overrideContentStatus' value='<?php echo(printMLText("update")); ?>'/>
-</td></tr></table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.PasswordForgotten.php b/views/blue/class.PasswordForgotten.php
deleted file mode 100644
index d9e9ffd99..000000000
--- a/views/blue/class.PasswordForgotten.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Implementation of PasswordForgotten view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for PasswordForgotten view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_PasswordForgotten extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$referrer = $this->params['referrer'];
-
-		$this->htmlStartPage(getMLText("password_forgotten"), "login");
-		$this->globalBanner();
-		$this->pageNavigation(getMLText("password_forgotten"));
-?>
-
-<?php $this->contentContainerStart(); ?>
-<form action="../op/op.PasswordForgotten.php" method="post" name="form1" onsubmit="return checkForm();">
-<?php
-		if ($referrer) {
-			echo "<input type='hidden' name='referuri' value='".$referrer."'/>";
-		}
-?>
-  <p><?php printMLText("password_forgotten_text"); ?></p>
-	<table border="0">
-		<tr>
-			<td><?php printMLText("login");?>:</td>
-			<td><input type="text" name="login" id="login"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("email");?>:</td>
-			<td><input type="text" name="email" id="email"></td>
-		</tr>
-		<tr>
-			<td colspan="2"><input type="submit" value="<?php printMLText("submit_password_forgotten") ?>"></td>
-		</tr>
-	</table>
-</form>
-<?php $this->contentContainerEnd(); ?>
-<script language="JavaScript">document.form1.email.focus();</script>
-<p><a href="../out/out.Login.php"><?php echo getMLText("login"); ?></a></p>
-<?php
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveArchive.php b/views/blue/class.RemoveArchive.php
deleted file mode 100644
index 5e990a5c7..000000000
--- a/views/blue/class.RemoveArchive.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Implementation of RemoveArchive view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveArchive view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveArchive extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$arkname = $this->params['archive'];
-
-		$this->htmlStartPage(getMLText("backup_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("backup_remove"));
-		$this->contentContainerStart();
-
-?>
-<form action="../op/op.RemoveArchive.php" name="form1" method="post">
-	<input type="hidden" name="arkname" value="<?php echo htmlspecialchars($arkname); ?>">
-  <?php echo createHiddenFieldWithKey('removearchive'); ?>
-	<p><?php printMLText("confirm_rm_backup", array ("arkname" => htmlspecialchars($arkname)));?></p>
-	<input type="submit" value="<?php printMLText("backup_remove");?>">
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveDocument.php b/views/blue/class.RemoveDocument.php
deleted file mode 100644
index 5df57bdb2..000000000
--- a/views/blue/class.RemoveDocument.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Implementation of RemoveDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveDocument extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("rm_document"));
-		$this->contentContainerStart();
-
-?>
-<form action="../op/op.RemoveDocument.php" name="form1" method="post">
-<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
-<?php echo createHiddenFieldWithKey('removedocument'); ?>
-<p>
-<?php printMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName())));?>
-</p>
-<p><input type="submit" value="<?php printMLText("rm_document");?>"></p>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveDocumentFile.php b/views/blue/class.RemoveDocumentFile.php
deleted file mode 100644
index f194d1a9d..000000000
--- a/views/blue/class.RemoveDocumentFile.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Implementation of RemoveDocumentFile view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveDocumentFile view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$file = $this->params['file'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("rm_file"));
-		$this->contentContainerStart();
-
-?>
-<form action="../op/op.RemoveDocumentFile.php" name="form1" method="post">
-  <?php echo createHiddenFieldWithKey('removedocumentfile'); ?>
-	<input type="Hidden" name="documentid" value="<?php echo $document->getID()?>">
-	<input type="Hidden" name="fileid" value="<?php echo $file->getID()?>">
-	<p><?php printMLText("confirm_rm_file", array ("documentname" => htmlspecialchars($document->getName()), "name" => htmlspecialchars($file->getName())));?></p>
-	<input type="submit" value="<?php printMLText("rm_file");?>">
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveDump.php b/views/blue/class.RemoveDump.php
deleted file mode 100644
index e0ce18ae1..000000000
--- a/views/blue/class.RemoveDump.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Implementation of RemoveDump view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveDump view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveDump extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$dumpname = $this->params['dumpfile'];
-
-		$this->htmlStartPage(getMLText("backup_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("dump_remove"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.RemoveDump.php" name="form1" method="post">
-	<input type="Hidden" name="dumpname" value="<?php echo htmlspecialchars($dumpname); ?>">
-  <?php echo createHiddenFieldWithKey('removedump'); ?>
-	<p><?php printMLText("confirm_rm_dump", array ("dumpname" => htmlspecialchars($dumpname)));?></p>
-	<input type="submit" value="<?php printMLText("dump_remove");?>">
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveEvent.php b/views/blue/class.RemoveEvent.php
deleted file mode 100644
index 3d0092afd..000000000
--- a/views/blue/class.RemoveEvent.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Implementation of RemoveEvent view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveEvent view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveEvent extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$event = $this->params['event'];
-
-		$this->htmlStartPage(getMLText("calendar"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("calendar"), "calendar");
-
-		$this->contentHeading(getMLText("edit_event"));
-		$this->contentContainerStart();
-
-?>
-<form action="../op/op.RemoveEvent.php" name="form1" method="post">
-  <?php echo createHiddenFieldWithKey('removeevent'); ?>
-	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
-	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<input type="submit" value="<?php printMLText("delete");?>">
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveFolder.php b/views/blue/class.RemoveFolder.php
deleted file mode 100644
index 4cb631940..000000000
--- a/views/blue/class.RemoveFolder.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Implementation of RemoveFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveFolder extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-
-		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "view_folder", $folder);
-		$this->contentHeading(getMLText("rm_folder"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.RemoveFolder.php" method="post" name="form1">
-	<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
-	<input type="Hidden" name="showtree" value="<?php echo showtree();?>">
-  <?php echo createHiddenFieldWithKey('removefolder'); ?>
-	<p>
-	<?php printMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName())));?>
-	</p>
-	<p><input type="submit" value="<?php printMLText("rm_folder");?>"></p>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveFolderFiles.php b/views/blue/class.RemoveFolderFiles.php
deleted file mode 100644
index b70aa8409..000000000
--- a/views/blue/class.RemoveFolderFiles.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Implementation of RemoveFolderFiles view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveFolderFiles view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveFolderFiles extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-
-		$this->htmlStartPage(getMLText("files_deletion"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-
-		$this->contentHeading(getMLText("files_deletion"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.RemoveFolderFiles.php" name="form1" method="post">
-  <?php echo createHiddenFieldWithKey('removefolderfiles'); ?>
-	<input type="hidden" name="folderid" value="<?php echo $folder->getID()?>">
-	<p><?php printMLText("confirm_rm_folder_files", array ("foldername" => htmlspecialchars($folder->getName())));?></p>
-	<input type="submit" value="<?php printMLText("accept");?>">
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveGroup.php b/views/blue/class.RemoveGroup.php
deleted file mode 100644
index 165cc44ba..000000000
--- a/views/blue/class.RemoveGroup.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Implementation of RemoveGroup view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveGroup view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveGroup extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$group = $this->params['group'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("rm_group"));
-		$this->contentContainerStart();
-
-?>
-<form action="../op/op.GroupMgr.php" name="form1" method="post">
-<input type="hidden" name="groupid" value="<?php print $group->getID();?>">
-<input type="hidden" name="action" value="removegroup">
-<?php echo createHiddenFieldWithKey('removegroup'); ?>
-<p>
-<?php printMLText("confirm_rm_group", array ("groupname" => htmlspecialchars($group->getName())));?>
-</p>
-<p><input type="submit" value="<?php printMLText("rm_group");?>"></p>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveLog.php b/views/blue/class.RemoveLog.php
deleted file mode 100644
index 650b93af1..000000000
--- a/views/blue/class.RemoveLog.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Implementation of RemoveLog view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveLog view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveLog extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$lognames = $this->params['lognames'];
-
-		$this->htmlStartPage(getMLText("backup_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("rm_file"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.RemoveLog.php" name="form1" method="post">
-  <?php echo createHiddenFieldWithKey('removelog'); ?>
-<?php
-		foreach($lognames as $logname) {
-			echo "<input type=\"hidden\" name=\"lognames[]\" value=\"".$logname."\">\n";
-
-		}
-?>
-	<p><?php printMLText("confirm_rm_log", array ("logname" => implode(', ', $lognames)));?></p>
-	<input type="submit" value="<?php printMLText("rm_file");?>">
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveUser.php b/views/blue/class.RemoveUser.php
deleted file mode 100644
index 46dc42105..000000000
--- a/views/blue/class.RemoveUser.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Implementation of RemoveUser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveUser view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveUser extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$rmuser = $this->params['rmuser'];
-		$allusers = $this->params['allusers'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("rm_user"));
-		$this->contentContainerStart();
-
-?>
-<form action="../op/op.UsrMgr.php" name="form1" method="post">
-<input type="hidden" name="userid" value="<?php print $rmuser->getID();?>">
-<input type="hidden" name="action" value="removeuser">
-<?php echo createHiddenFieldWithKey('removeuser'); ?>
-<p>
-<?php printMLText("confirm_rm_user", array ("username" => htmlspecialchars($rmuser->getFullName())));?>
-</p>
-
-<p>
-<?php printMLText("assign_user_property_to"); ?>:
-<select name="assignTo">
-<?php
-		foreach ($allusers as $currUser) {
-			if ($currUser->isGuest() || ($currUser->getID() == $rmuser->getID()) )
-				continue;
-
-			if ($rmuser && $currUser->getID()==$rmuser->getID()) $selected=$count;
-			print "<option value=\"".$currUser->getID()."\">" . htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName());
-		}
-?>
-</select>
-</p>
-
-<p><input type="submit" value="<?php printMLText("rm_user");?>"></p>
-
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.RemoveVersion.php b/views/blue/class.RemoveVersion.php
deleted file mode 100644
index 016759e3d..000000000
--- a/views/blue/class.RemoveVersion.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Implementation of RemoveVersion view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for RemoveVersion view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_RemoveVersion extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$version = $this->params['version'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("rm_version"));
-		$this->contentContainerStart();
-?>
-<form action="../op/op.RemoveVersion.php" name="form1" method="post">
-	<?php echo createHiddenFieldWithKey('removeversion'); ?>
-	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
-	<input type="hidden" name="version" value="<?php echo $version->getVersion()?>">
-	<p><?php printMLText("confirm_rm_version", array ("documentname" => htmlspecialchars($document->getName()), "version" => $version->getVersion()));?></p>
-	<input type="submit" value="<?php printMLText("rm_version");?>">
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ReviewDocument.php b/views/blue/class.ReviewDocument.php
deleted file mode 100644
index 546d3003f..000000000
--- a/views/blue/class.ReviewDocument.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/**
- * Implementation of ReviewDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ReviewDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ReviewDocument extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$content = $this->params['version'];
-
-		$reviews = $content->getReviewStatus();
-		foreach($reviews as $review) {
-			if($review['reviewID'] == $_GET['reviewid']) {
-				$reviewStatus = $review;
-				break;
-			}
-		}
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("submit_review"));
-?>
-<script language="JavaScript">
-function checkIndForm()
-{
-	msg = "";
-	if (document.form1.reviewStatus.value == "") msg += "<?php printMLText("js_no_review_status");?>\n";
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-function checkGrpForm()
-{
-	msg = "";
-	if (document.form1.reviewGroup.value == "") msg += "<?php printMLText("js_no_review_group");?>\n";
-	if (document.form1.reviewStatus.value == "") msg += "<?php printMLText("js_no_review_status");?>\n";
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-		$this->contentContainerStart();
-
-		// Display the Review form.
-		if ($reviewStatus['type'] == 0) {
-			if($reviewStatus["status"]!=0) {
-
-				print "<table class=\"folderView\"><thead><tr>";
-				print "<th>".getMLText("status")."</th>";
-				print "<th>".getMLText("comment")."</th>";
-				print "<th>".getMLText("last_update")."</th>";
-				print "</tr></thead><tbody><tr>";
-				print "<td>";
-				printReviewStatusText($reviewStatus["status"]);
-				print "</td>";
-				print "<td>".htmlspecialchars($reviewStatus["comment"])."</td>";
-				$indUser = $dms->getUser($reviewStatus["userID"]);
-				print "<td>".$reviewStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
-				print "</tr></tbody></table><br>";
-			}
-?>
-	<form method="post" action="../op/op.ReviewDocument.php" name="form1" onsubmit="return checkIndForm();">
-	<?php echo createHiddenFieldWithKey('reviewdocument'); ?>
-	<table>
-	<tr><td class='infos' valign='top'><?php printMLText("comment")?>:</td>
-	<td class='infos' valign='top'><textarea name="comment" cols="80" rows="4"></textarea>
-	</td></tr>
-	<tr><td><?php printMLText("review_status")?></td>
-	<td><select name="reviewStatus">
-<?php if($reviewStatus['status'] != 1) { ?>
-	<option value='1'><?php printMLText("status_reviewed")?></option>
-<?php } ?>
-<?php if($reviewStatus['status'] != -1) { ?>
-	<option value='-1'><?php printMLText("rejected")?></option>
-<?php } ?>
-	</select>
-	</td></tr><tr><td></td><td>
-	<input type='hidden' name='reviewType' value='ind'/>
-	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-	<input type='submit' name='indReview' value='<?php printMLText("submit_review")?>'/>
-	</td></tr></table>
-	</form>
-<?php
-		}
-		else if ($reviewStatus['type'] == 1) {
-
-			if($reviewStatus["status"]!=0) {
-
-				print "<table class=\"folderView\"><thead><tr>";
-				print "<th>".getMLText("status")."</th>";
-				print "<th>".getMLText("comment")."</th>";
-				print "<th>".getMLText("last_update")."</th>";
-				print "</tr></thead><tbody><tr>";
-				print "<td>";
-				printReviewStatusText($reviewStatus["status"]);
-				print "</td>";
-				print "<td>".htmlspecialchars($reviewStatus["comment"])."</td>";
-				$indUser = $dms->getUser($reviewStatus["userID"]);
-				print "<td>".$reviewStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
-				print "</tr></tbody></table><br>\n";
-			}
-
-?>
-	<form method="post" action="../op/op.ReviewDocument.php" name="form1" onsubmit="return checkGrpForm();">
-	<table>
-	<tr><td><?php printMLText("comment")?>:</td>
-	<td><textarea name="comment" cols="80" rows="4"></textarea>
-	</td></tr>
-	<tr><td><?php printMLText("review_status")?>:</td>
-	<td>
-	<select name="reviewStatus">
-<?php if($reviewStatus['status'] != 1) { ?>
-	<option value='1'><?php printMLText("status_reviewed")?></option>
-<?php } ?>
-<?php if($reviewStatus['status'] != -1) { ?>
-	<option value='-1'><?php printMLText("rejected")?></option>
-<?php } ?>
-	</select>
-	</td></tr>
-	<tr><td></td><td>
-	<input type='hidden' name='reviewType' value='grp'/>
-	<input type='hidden' name='reviewGroup' value='<?php echo $reviewStatus['required']; ?>'/>
-	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-	<input type='submit' name='groupReview' value='<?php printMLText("submit_review")?>'/></td></tr>
-	</table>
-	</form>
-<?php
-		}
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ReviewSummary.php b/views/blue/class.ReviewSummary.php
deleted file mode 100644
index e11165793..000000000
--- a/views/blue/class.ReviewSummary.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Implementation of ReviewSummary view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ReviewSummary view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ReviewSummary extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-
-		if (!$db->createTemporaryTable("ttstatid")) {
-			UI::exitError(getMLText("review_summary"),getMLText("internal_error_exit"));
-		}
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.Search.php b/views/blue/class.Search.php
deleted file mode 100644
index cd1a3296e..000000000
--- a/views/blue/class.Search.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Implementation of Search result view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Search result view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_Search extends SeedDMS_Blue_Style {
-
-	function markQuery($str, $tag = "b") {
-		$querywords = preg_split("/ /", $this->query);
-		
-		foreach ($querywords as $queryword)
-			$str = str_ireplace("($queryword)", "<" . $tag . ">\\1</" . $tag . ">", $str);
-		
-		return $str;
-	}
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$this->query = $this->params['query'];
-		$entries = $this->params['searchhits'];
-		$totalpages = $this->params['totalpages'];
-		$pageNumber = $this->params['pagenumber'];
-		$searchTime = $this->params['searchtime'];
-		$urlparams = $this->params['urlparams'];
-		$searchin = $this->params['searchin'];
-
-		$this->htmlStartPage(getMLText("search_results"));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "");
-		$this->contentHeading(getMLText("search_results"));
-		$this->contentContainerStart();
-		$this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $urlparams);
-
-		print "<table class=\"folderView\">";
-		print "<thead>\n<tr>\n";
-		print "<th></th>\n";
-		print "<th>".getMLText("name")."</th>\n";
-		print "<th>".getMLText("attributes")."</th>\n";
-		print "<th>".getMLText("owner")."</th>\n";
-		print "<th>".getMLText("status")."</th>\n";
-		print "<th>".getMLText("version")."</th>\n";
-		print "<th>".getMLText("comment")."</th>\n";
-		//print "<th>".getMLText("reviewers")."</th>\n";
-		//print "<th>".getMLText("approvers")."</th>\n";
-		print "</tr>\n</thead>\n<tbody>\n";
-
-		$resultsFilteredByAccess = false;
-		$foldercount = $doccount = 0;
-		foreach ($entries as $entry) {
-			if(get_class($entry) == 'SeedDMS_Core_Document') {
-				$document = $entry;
-					$doccount++;
-					$lc = $document->getLatestContent();
-					print "<tr>";
-					//print "<td><img src=\"../out/images/file.gif\" class=\"mimeicon\"></td>";
-					if (in_array(2, $searchin)) {
-						$docName = $this->markQuery(htmlspecialchars($document->getName()), "i");
-					} else {
-						$docName = htmlspecialchars($document->getName());
-					}
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><img class=\"mimeicon\" src=\"../out/images/icons/".$this->getMimeIcon($lc->getFileType())."\" title=\"".$lc->getMimeType()."\"></a></td>";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
-					$folder = $document->getFolder();
-					$path = $folder->getPath();
-					for ($i = 1; $i  < count($path); $i++) {
-						print htmlspecialchars($path[$i]->getName())."/";
-					}
-					print $docName;
-					print "</a></td>";
-
-					$attributes = $lc->getAttributes();
-					print "<td>";
-					print "<ul class=\"documentDetail\">\n";
-					$attributes = $lc->getAttributes();
-					if($attributes) {
-						foreach($attributes as $attribute) {
-							$attrdef = $attribute->getAttributeDefinition();
-							print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars($attribute->getValue())."</li>\n";
-						}
-					}
-					print "</ul>\n";
-					print "</td>";
-
-					$owner = $document->getOwner();
-					print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-					$display_status=$lc->getStatus();
-					print "<td>".getOverallStatusText($display_status["status"]). "</td>";
-
-					print "<td class=\"center\">".$lc->getVersion()."</td>";
-					
-					if (in_array(3, $searchin)) $comment = $this->markQuery(htmlspecialchars($document->getComment()));
-					else $comment = htmlspecialchars($document->getComment());
-					if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "...";
-					print "<td>".$comment."</td>";
-					print "</tr>\n";
-			} elseif(get_class($entry) == 'SeedDMS_Core_Folder') {
-				$folder = $entry;
-					$foldercount++;
-					if (in_array(2, $searchin)) {
-						$folderName = $this->markQuery(htmlspecialchars($folder->getName()), "i");
-					} else {
-						$folderName = htmlspecialchars($folder->getName());
-					}
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"../out/images/folder_closed.gif\" width=18 height=18 border=0></a></td>";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
-					$path = $folder->getPath();
-					print "/";
-					for ($i = 1; $i  < count($path)-1; $i++) {
-						print htmlspecialchars($path[$i]->getName())."/";
-					}
-					print $folderName;
-					print "</a></td>";
-					print "<td></td>";
-					
-					$owner = $folder->getOwner();
-					print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-					print "<td></td>";
-					print "<td></td>";
-					if (in_array(3, $searchin)) $comment = $this->markQuery(htmlspecialchars($folder->getComment()));
-					else $comment = htmlspecialchars($folder->getComment());
-					if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "...";
-					print "<td>".$comment."</td>";
-					print "</tr>\n";
-			}
-		}
-		if (0 && $resultsFilteredByAccess) {
-			print "<tr><td colspan=\"7\">". getMLText("search_results_access_filtered") . "</td></tr>";
-		}
-
-		print "</tbody></table>\n";
-		$numResults = $doccount + $foldercount;
-		if ($numResults == 0) {
-			print "<p>".getMLText("search_no_results")."</p>";
-		} else {
-		//	print "<p>".getMLText("search_report", array("doccount" => $doccount, "foldercount" => $foldercount, 'searchtime'=>$searchTime))."</p>";
-		}
-
-		$this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $_GET);
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
-
diff --git a/views/blue/class.SearchForm.php b/views/blue/class.SearchForm.php
deleted file mode 100644
index 6285c3fe7..000000000
--- a/views/blue/class.SearchForm.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/**
- * Implementation of SearchForm view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for SearchForm view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_SearchForm extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$attrdefs = $this->params['attrdefs'];
-		$allCats = $this->params['allcategories'];
-		$allUsers = $this->params['allusers'];
-		$enablefullsearch = $this->params['enablefullsearch'];
-
-		$this->htmlStartPage(getMLText("search"));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "", $folder);
-?>
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-	if (document.form1.query.value == "")
-	{
-		if (!document.form1.creationdate.checked && !document.form1.lastupdate.checked &&
-				!document.form1.pendingReview.checked && !document.form1.pendingApproval.checked)
-			msg += "<?php printMLText("js_no_query");?>\n";
-	}
-	
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-<?php
-		$this->contentHeading(getMLText("search"));
-		$this->contentContainerStart();
-?>
-<?php
-	if($enablefullsearch) {
-?>
-<div style="width: 35%; float: left;">
-<?php
-	}
-?>
-<h2><?php echo getMLText('databasesearch') ?></h2>
-<form action="../op/op.Search.php" name="form1" onsubmit="return checkForm();">
-<table class="searchform">
-<tr>
-<td><?php printMLText("search_query");?>:</td>
-<td>
-<input name="query">
-<select name="mode">
-<option value="1" selected><?php printMLText("search_mode_and");?><br>
-<option value="0"><?php printMLText("search_mode_or");?>
-</select>
-<br />
-<a href="javascript:chooseKeywords('form1.query');"><?php printMLText("use_default_keywords");?></a>
-<script language="JavaScript">
-var openDlg;
-
-function chooseKeywords(target) {
-	openDlg = open("out.KeywordChooser.php?target="+target, "openDlg", "width=500,height=400,scrollbars=yes,resizable=yes");
-}
-</script>
-</td>
-</tr>
-<tr>
-<td><?php printMLText("search_in");?>:</td>
-<td><ul class="actions">
-<li class="first"><input type="checkbox" id="keywords" name="searchin[]" value="1"><label for="keywords"><?php printMLText("keywords");?></label> (<?php printMLText('documents_only'); ?>)</li>
-<li><input type="checkbox" name="searchin[]" id="searchName" value="2"><label for="searchName"><?php printMLText("name");?></label></li>
-<li><input type="checkbox" name="searchin[]" id="comment" value="3"><label for="comment"><?php printMLText("comment");?></label></li>
-<li><input type="checkbox" name="searchin[]" id="attributes" value="4"><label for="attributes"><?php printMLText("attributes");?></label></li>
-</ul>
-</td>
-</tr>
-<?php
-		if($attrdefs) {
-			foreach($attrdefs as $attrdef) {
-?>
-<tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-	<td><?php $this->printAttributeEditField($attrdef, '') ?></td>
-</tr>
-<?php
-			}
-		}
-?>
-<tr>
-<td><?php printMLText("category");?>:<br />(<?php printMLText('documents_only'); ?>)</td>
-<td>
-<select name="categoryids[]" multiple>
-<option value="-1"><?php printMLText("all_categories");?>
-<?php
-		foreach ($allCats as $catObj) {
-			print "<option value=\"".$catObj->getID()."\">" . htmlspecialchars($catObj->getName()) . "\n";
-		}
-?>
-</select>
-</td>
-</tr>
-<tr>
-<td><?php printMLText("status");?>:<br />(<?php printMLText('documents_only'); ?>)</td>
-<td>
-<ul class="actions">
-<li class="first"><input type="checkbox" id="pendingReview" name="pendingReview" value="1"><label for='pendingReview'><?php printOverallStatusText(S_DRAFT_REV);?></label></li>
-<li><input type="checkbox" id="pendingApproval" name="pendingApproval" value="1"><label for='pendingApproval'><?php printOverallStatusText(S_DRAFT_APP);?></label></li>
-<li><input type="checkbox" id="released" name="released" value="1"><label for='released'><?php printOverallStatusText(S_RELEASED);?></label></li>
-<li><input type="checkbox" id="rejected" name="rejected" value="1"><label for='rejected'><?php printOverallStatusText(S_REJECTED);?></label></li>
-<li><input type="checkbox" id="obsolete" name="obsolete" value="1"><label for='obsolete'><?php printOverallStatusText(S_OBSOLETE);?></label></li>
-<li><input type="checkbox" id="expired" name="expired" value="1"><label for='expired'><?php printOverallStatusText(S_EXPIRED);?></label></li>
-</ul>
-</td>
-</tr>
-<tr>
-<td><?php printMLText("owner");?>:</td>
-<td>
-<select name="ownerid">
-<option value="-1"><?php printMLText("all_users");?>
-<?php
-		foreach ($allUsers as $userObj) {
-			if ($userObj->isGuest())
-				continue;
-			print "<option value=\"".$userObj->getID()."\">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "\n";
-		}
-?>
-</select>
-</td>
-</tr>
-<tr>
-<td><?php printMLText("under_folder")?>:</td>
-<td><?php $this->printFolderChooser("form1", M_READ, -1, $folder);?></td>
-</tr>
-<tr>
-<td><?php printMLText("creation_date");?>:</td>
-<td>
-<input type="Checkbox" name="creationdate" value="true">
-<?php
-		printMLText("between");
-		print "&nbsp;&nbsp;";
-		$this->printDateChooser(-1, "createstart");
-		print "&nbsp;&nbsp;";
-		printMLText("and");
-		print "&nbsp;&nbsp;";
-		$this->printDateChooser(-1, "createend");
-?>
-</td>
-</tr>
-<?php
-/*
-echo "<tr>\n<td>".getMLText("last_update").":</td>\n";
-echo "<td><input type=\"Checkbox\" name=\"lastupdate\" value=\"true\">";
-printMLText("between");
-print "&nbsp;&nbsp;";
-$this->printDateChooser(-1, "updatestart");
-print "&nbsp;&nbsp;";
-printMLText("and");
-print "&nbsp;&nbsp;";
-$this->printDateChooser(-1, "updateend");
-echo "</td>\n</tr>\n";
-*/
-?>
-<tr>
-<td colspan="2"><input type="Submit" value="<?php printMLText("search"); ?>"></td>
-</tr>
-
-</table>
-
-</form>
-<?php
-			if($enablefullsearch) {
-?>
-</div>
-<div style="width: 35%; float: left; margin-left: 20px;">
-<form action="../op/op.SearchFulltext.php" name="form2" onsubmit="return checkForm();">
-<table class="searchform">
-<h2><?php echo getMLText('fullsearch') ?></h2>
-<tr>
-<td><?php printMLText("search_query");?>:</td>
-<td>
-<input name="query">
-<!--
-<select name="mode">
-<option value="1" selected><?php printMLText("search_mode_and");?><br>
-<option value="0"><?php printMLText("search_mode_or");?>
-</select>
--->
-</td>
-</tr>
-<tr>
-<td><?php printMLText("category_filter");?>:</td>
-<td>
-<select name="categoryids[]" multiple>
-<!--
-<option value="-1"><?php printMLText("all_categories");?>
--->
-<?php
-			$allCats = $dms->getDocumentCategories();
-			foreach ($allCats as $catObj) {
-				print "<option value=\"".$catObj->getID()."\">" . htmlspecialchars($catObj->getName()) . "\n";
-			}
-?>
-</select>
-</td>
-</tr>
-<tr>
-<td><?php printMLText("owner");?>:</td>
-<td>
-<select name="ownerid">
-<option value="-1"><?php printMLText("all_users");?>
-<?php
-			foreach ($allUsers as $userObj) {
-				if ($userObj->isGuest())
-					continue;
-				print "<option value=\"".$userObj->getID()."\">" . htmlspecialchars($userObj->getLogin()." - ".$userObj->getFullName()) . "\n";
-			}
-?>
-</select>
-</td>
-</tr>
-<tr>
-<td colspan="2"><input type="submit" value="<?php printMLText("search"); ?>"></td>
-</tr>
-</table>
-
-</form>
-</div>
-<div style="clear: both"></div>
-<?php
-		}
-?>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.SearchFulltext.php b/views/blue/class.SearchFulltext.php
deleted file mode 100644
index e9ec22407..000000000
--- a/views/blue/class.SearchFulltext.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Implementation of Search result view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Search result view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_SearchFulltext extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$entries = $this->params['searchhits'];
-		$totalpages = $this->params['totalpages'];
-		$totaldocs = $this->params['totaldocs'];
-		$pageNumber = $this->params['pagenumber'];
-		$urlparams = $this->params['urlparams'];
-		$searchTime = $this->params['searchtime'];
-
-		$this->htmlStartPage(getMLText("search_results"));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true), "", $folder);
-		$this->contentHeading(getMLText("search_results"));
-
-		$this->contentContainerStart();
-?>
-<table width="100%" style="border-collapse: collapse;">
-<tr>
-<td align="left" style="padding:0; margin:0;">
-<?php
-		$numResults = $totaldocs;
-		if ($numResults == 0) {
-			printMLText("search_no_results");
-		}
-		else {
-			printMLText("search_report_fulltext", array("doccount" => $totaldocs));
-		}
-?>
-</td>
-<td align="right"><?php printMLText("search_time", array("time" => $searchTime));?></td>
-</tr>
-</table>
-
-<?php
-		if ($numResults == 0) {
-			$this->contentContainerEnd();
-			$this->htmlEndPage();
-			exit;
-		}
-
-		$this->pageList($pageNumber, $totalpages, "../op/op.SearchFulltext.php", $_GET);
-
-		print "<table class=\"folderView\">";
-		print "<thead>\n<tr>\n";
-		//print "<th></th>\n";
-		print "<th>".getMLText("name")."</th>\n";
-		print "<th>".getMLText("owner")."</th>\n";
-		print "<th>".getMLText("status")."</th>\n";
-		print "<th>".getMLText("version")."</th>\n";
-		print "<th>".getMLText("comment")."</th>\n";
-		//print "<th>".getMLText("reviewers")."</th>\n";
-		//print "<th>".getMLText("approvers")."</th>\n";
-		print "</tr>\n</thead>\n<tbody>\n";
-
-		$resultsFilteredByAccess = false;
-		foreach ($entries as $document) {
-			if ($document->getAccessMode($user) < M_READ) {
-				$resultsFilteredByAccess = true;
-			}
-			else {
-				$lc = $document->getLatestContent();
-				print "<tr>";
-				$docName = htmlspecialchars($document->getName());
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
-				$folder = $document->getFolder();
-				$path = $folder->getPath();
-				for ($i = 1; $i  < count($path); $i++) {
-					print htmlspecialchars($path[$i]->getName())."/";
-				}
-				print $docName;
-				print "</a></td>";
-				
-				$owner = $document->getOwner();
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				$display_status=$lc->getStatus();
-				print "<td>".getOverallStatusText($display_status["status"]). "</td>";
-
-				print "<td class=\"center\">".$lc->getVersion()."</td>";
-				
-				$comment = htmlspecialchars($document->getComment());
-				if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "...";
-				print "<td>".$comment."</td>";
-				print "</tr>\n";
-			}
-		}
-		if ($resultsFilteredByAccess) {
-			print "<tr><td colspan=\"7\">". getMLText("search_results_access_filtered") . "</td></tr>";
-		}
-		print "</tbody></table>\n";
-
-		$this->pageList($pageNumber, $totalpages, "../op/op.Search.php", $_GET);
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
-
diff --git a/views/blue/class.SetExpires.php b/views/blue/class.SetExpires.php
deleted file mode 100644
index d93773309..000000000
--- a/views/blue/class.SetExpires.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Implementation of SetExpires view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for SetExpires view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_SetExpires extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("set_expiry"));
-		$this->contentContainerStart();
-?>
-
-<form action="../op/op.SetExpires.php" method="post">
-<input type="hidden" name="documentid" value="<?php print $document->getID();?>">
-	
-<table>
-<tr>
-	<td><?php printMLText("expires");?>:</td>
-	<td>
-	<input type="radio" name="expires" value="false" <?php echo ($document->expires()?"":"checked") ?> ><?php printMLText("does_not_expire");?><br>
-	<input type="radio" name="expires" value="true"  <?php echo ($document->expires()?"checked":"") ?> ><?php $this->printDateChooser(($document->expires()?$document->getExpires():-1), "exp");?>
-	</td>
-</tr>
-</table>
-
-<p>
-<input type="submit" value="<?php printMLText("update");?>">
-</p>
-	
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.SetReviewersApprovers.php b/views/blue/class.SetReviewersApprovers.php
deleted file mode 100644
index c7e64274a..000000000
--- a/views/blue/class.SetReviewersApprovers.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/**
- * Implementation of SetReviewersApprovers view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for SetReviewersApprovers view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$content = $this->params['version'];
-		$enableadminrevapp = $this->params['enableadminrevapp'];
-		$enableownerrevapp = $this->params['enableownerrevapp'];
-		$enableselfrevapp = $this->params['enableselfrevapp'];
-
-		$overallStatus = $content->getStatus();
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("change_assignments"));
-
-		// Retrieve a list of all users and groups that have review / approve privileges.
-		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
-
-		// Retrieve list of currently assigned reviewers and approvers, along with
-		// their latest status.
-		$reviewStatus = $content->getReviewStatus();
-		$approvalStatus = $content->getApprovalStatus();
-
-		// Index the review results for easy cross-reference with the Approvers List.
-		$reviewIndex = array("i"=>array(), "g"=>array());
-		foreach ($reviewStatus as $i=>$rs) {
-			if ($rs["type"]==0) {
-				$reviewIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
-			} elseif ($rs["type"]==1) {
-				$reviewIndex["g"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
-			}
-		}
-
-		// Index the approval results for easy cross-reference with the Approvers List.
-		$approvalIndex = array("i"=>array(), "g"=>array());
-		foreach ($approvalStatus as $i=>$rs) {
-			if ($rs["type"]==0) {
-				$approvalIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
-			} elseif ($rs["type"]==1) {
-				$approvalIndex["g"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
-			}
-		}
-?>
-
-<?php $this->contentContainerStart(); ?>
-
-<form action="../op/op.SetReviewersApprovers.php" method="post" name="form1">
-
-<?php $this->contentSubHeading(getMLText("update_reviewers"));?>
-
-<div class="cbSelectTitle cbSelectMargin"><?php printMLText("individuals")?>:</div>
-<div class="cbSelectContainer cbSelectMargin">
-<ul class="cbSelectList">
-<?php
-
-		$res=$user->getMandatoryReviewers();
-		foreach ($docAccess["users"] as $usr) {
-			$mandatory=false;
-			foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
-			
-			if ($mandatory){
-
-				print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())." &lt;".$usr->getEmail()."&gt;";
-				print "<input id='revInd".$usr->getID()."' type='hidden' name='indReviewers[]' value='". $usr->getID() ."'>";
-
-			} elseif (isset($reviewIndex["i"][$usr->getID()])) {
-
-				switch ($reviewIndex["i"][$usr->getID()]["status"]) {
-					case 0:
-						print "<li class=\"cbSelectItem\"><input id='revInd".$usr->getID()."' type='checkbox' name='indReviewers[]' value='". $usr->getID() ."' checked='checked'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-						break;
-					case -2:
-						print "<li class=\"cbSelectItem\"><input id='revInd".$usr->getID()."' type='checkbox' name='indReviewers[]' value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-						break;
-					default:
-						print "<li class=\"cbSelectItem\"><input id='revInd".$usr->getID()."' type='checkbox' name='indReviewers[]' value='". $usr->getID() ."' disabled='disabled'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-						break;
-				}
-			} else {
-				if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
-				print "<li class=\"cbSelectItem\"><input id='revInd".$usr->getID()."' type='checkbox' name='indReviewers[]' value='". $usr->getID() ."'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-			}
-		}
-?>
-</ul>
-</div>
-<div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
-<div class="cbSelectContainer">
-<ul class="cbSelectList">
-<?php
-		foreach ($docAccess["groups"] as $group) {
-
-			$mandatory=false;
-			foreach ($res as $r) if ($r['reviewerGroupID']==$group->getID()) $mandatory=true;
-			
-			if ($mandatory){
-
-				print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>".htmlspecialchars($group->getName());
-				print "<input id='revGrp".$group->getID()."' type='hidden' name='grpReviewers[]' value='". $group->getID() ."'>";
-
-			} elseif (isset($reviewIndex["g"][$group->getID()])) {
-
-				switch ($reviewIndex["g"][$group->getID()]["status"]) {
-					case 0:
-						print "<li class=\"cbSelectItem\"><input id='revGrp".$group->getID()."' type='checkbox' name='grpReviewers[]' value='". $group->getID() ."' checked='checked'>".htmlspecialchars($group->getName());
-						break;
-					case -2:
-						print "<li class=\"cbSelectItem\"><input id='revGrp".$group->getID()."' type='checkbox' name='grpReviewers[]' value='". $group->getID() ."'>".htmlspecialchars($group->getName());
-						break;
-					default:
-						print "<li class=\"cbSelectItem\"><input id='revGrp".$group->getID()."' type='checkbox' name='grpReviewers[]' value='". $group->getID() ."' disabled='disabled'>".htmlspecialchars($group->getName());
-						break;
-				}
-			}
-			else {
-				print "<li class=\"cbSelectItem\"><input id='revGrp".$group->getID()."' type='checkbox' name='grpReviewers[]' value='". $group->getID() ."'>".htmlspecialchars($group->getName());
-			}
-		}
-?>
-</ul>
-</div>
-
-<?php $this->contentSubHeading(getMLText("update_approvers"));?>
-
-<div class="cbSelectTitle cbSelectMargin"><?php printMLText("individuals")?>:</div>
-<div class="cbSelectContainer cbSelectMargin">
-<ul class="cbSelectList">
-<?php
-
-		$res=$user->getMandatoryApprovers();
-
-		foreach ($docAccess["users"] as $usr) {
-
-			$mandatory=false;
-			foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
-
-			if ($mandatory){
-			
-				print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())." &lt;".$usr->getEmail()."&gt;";
-				print "<input id='appInd".$usr->getID()."' type='hidden' name='indApprovers[]' value='". $usr->getID() ."'>";
-
-			} elseif (isset($approvalIndex["i"][$usr->getID()])) {
-			
-				switch ($approvalIndex["i"][$usr->getID()]["status"]) {
-					case 0:
-						print "<li class=\"cbSelectItem\"><input id='appInd".$usr->getID()."' type='checkbox' name='indApprovers[]' value='". $usr->getID() ."' checked='checked'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-						break;
-					case -2:
-						print "<li class=\"cbSelectItem\"><input id='appInd".$usr->getID()."' type='checkbox' name='indApprovers[]' value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-						break;
-					default:
-						print "<li class=\"cbSelectItem\"><input id='appInd".$usr->getID()."' type='checkbox' name='indApprovers[]' value='". $usr->getID() ."' disabled='disabled'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-						break;
-				}
-			} else {
-				if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
-				print "<li class=\"cbSelectItem\"><input id='appInd".$usr->getID()."' type='checkbox' name='indApprovers[]' value='". $usr->getID() ."'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName());
-			}
-		}
-?>
-</ul>
-</div>
-<div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
-<div class="cbSelectContainer">
-<ul class="cbSelectList">
-<?php
-		foreach ($docAccess["groups"] as $group) {
-
-			$mandatory=false;
-			foreach ($res as $r) if ($r['approverGroupID']==$group->getID()) $mandatory=true;
-
-			if ($mandatory){
-
-				print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>".htmlspecialchars($group->getName());
-				print "<input id='appGrp".$group->getID()."' type='hidden' name='grpApprovers[]' value='". $group->getID() ."'>";
-
-			} elseif (isset($approvalIndex["g"][$group->getID()])) {
-
-				switch ($approvalIndex["g"][$group->getID()]["status"]) {
-					case 0:
-						print "<li class=\"cbSelectItem\"><input id='appGrp".$group->getID()."' type='checkbox' name='grpApprovers[]' value='". $group->getID() ."' checked='checked'>".htmlspecialchars($group->getName());
-						break;
-					case -2:
-						print "<li class=\"cbSelectItem\"><input id='appGrp".$group->getID()."' type='checkbox' name='grpApprovers[]' value='". $group->getID() ."'>".htmlspecialchars($group->getName());
-						break;
-					default:
-						print "<li class=\"cbSelectItem\"><input id='appGrp".$group->getID()."' type='checkbox' name='grpApprovers[]' value='". $group->getID() ."' disabled='disabled'>".htmlspecialchars($group->getName());
-						break;
-				}
-			}
-			else {
-				print "<li class=\"cbSelectItem\"><input id='appGrp".$group->getID()."' type='checkbox' name='grpApprovers[]' value='". $group->getID() ."'>".htmlspecialchars($group->getName());
-			}
-		}
-?>
-</ul>
-</div>
-
-<p>
-<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-<input type="submit" value="<?php printMLText("update");?>">
-</p>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.Settings.php b/views/blue/class.Settings.php
deleted file mode 100644
index d88861404..000000000
--- a/views/blue/class.Settings.php
+++ /dev/null
@@ -1,523 +0,0 @@
-<?php
-/**
- * Implementation of Settings view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Settings view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_Settings extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$settings = $this->params['settings'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("settings"));
-		$this->contentContainerStart();
-
-?>
-
-<script language="JavaScript">
-function ShowHide(strId)
-{
-
-  var objDiv = document.getElementById(strId);
-
-  if (objDiv)
-  {
-
-    if(objDiv.style.display == 'block')
-    {
-      objDiv.style.display = 'none';
-    }
-    else
-    {
-      objDiv.style.display = 'block';
-    }
-  }
-}
-</script>
-
-  <form action="../op/op.Settings.php" method="post" enctype="multipart/form-data" name="form0" >
-  <input type="hidden" name="action" value="saveSettings" />
-<?php
-if(!is_writeable($settings->_configFilePath)) {
-	echo "<p>".getMLText("settings_notwritable")."</p>";
-} else {
-?>
-  <input type="Submit" value="<?php printMLText("save");?>" />
-<?php
-}
-?>
-
-
-  <div class="contentHeading" onClick="ShowHide('siteID')" style="cursor:pointer">+ <?php printMLText("settings_Site");?></div>
-  <div id="siteID" style="display:block">
-    <table>
-      <!--
-        -- SETTINGS - SITE - DISPLAY
-      -->
-      <tr ><td><b> <?php printMLText("settings_Display");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_siteName_desc");?>">
-        <td><?php printMLText("settings_siteName");?>:</td>
-        <td><input type="text" name="siteName" value="<?php echo $settings->_siteName ?>"/></td>
-      </tr>
-      <tr title="<?php printMLText("settings_footNote_desc");?>">
-        <td><?php printMLText("settings_footNote");?>:</td>
-        <td><input type="text" name="footNote" value="<?php echo $settings->_footNote ?>" size="100"/></td>
-      </tr>
-      <tr title="<?php printMLText("settings_printDisclaimer_desc");?>">
-        <td><?php printMLText("settings_printDisclaimer");?>:</td>
-        <td><input name="printDisclaimer" type="checkbox" <?php if ($settings->_printDisclaimer) echo "checked" ?> /></td>
-      </tr>
-       <tr title="<?php printMLText("settings_language_desc");?>">
-        <td><?php printMLText("settings_language");?>:</td>
-        <td>
-         <SELECT name="language">
-            <?php
-              $languages = getLanguages();
-              foreach($languages as $language)
-              {
-                echo '<option value="' . $language . '" ';
-                 if ($settings->_language==$language)
-                   echo "selected";
-                echo '>' . getMLText($language) . '</option>';
-             }
-            ?>
-          </SELECT>
-        </td>
-      </tr>
-      <tr title="<?php printMLText("settings_theme_desc");?>">
-        <td><?php printMLText("settings_theme");?>:</td>
-        <td>
-         <SELECT name="theme">
-            <?php
-              $themes = UI::getStyles();
-              foreach($themes as $theme)
-              {
-                echo '<option value="' . $theme . '" ';
-                 if ($settings->_theme==$theme)
-                   echo "selected";
-                echo '>' . $theme . '</option>';
-             }
-            ?>
-          </SELECT>
-        </td>
-      </tr>
-
-      <!--
-        -- SETTINGS - SITE - EDITION
-      -->
-      <tr><td></td></tr><tr ><td><b> <?php printMLText("settings_Edition");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_strictFormCheck_desc");?>">
-        <td><?php printMLText("settings_strictFormCheck");?>:</td>
-        <td><input name="strictFormCheck" type="checkbox" <?php if ($settings->_strictFormCheck) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_viewOnlineFileTypes_desc");?>">
-        <td><?php printMLText("settings_viewOnlineFileTypes");?>:</td>
-        <td><input type="text" name="viewOnlineFileTypes" value="<?php echo $settings->getViewOnlineFileTypesToString() ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableConverting_desc");?>">
-        <td><?php printMLText("settings_enableConverting");?>:</td>
-        <td><input name="enableConverting" type="checkbox" <?php if ($settings->_enableConverting) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableEmail_desc");?>">
-        <td><?php printMLText("settings_enableEmail");?>:</td>
-        <td><input name="enableEmail" type="checkbox" <?php if ($settings->_enableEmail) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableUsersView_desc");?>">
-        <td><?php printMLText("settings_enableUsersView");?>:</td>
-        <td><input name="enableUsersView" type="checkbox" <?php if ($settings->_enableUsersView) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableFullSearch_desc");?>">
-        <td><?php printMLText("settings_enableFullSearch");?>:</td>
-        <td><input name="enableFullSearch" type="checkbox" <?php if ($settings->_enableFullSearch) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_stopWordsFile_desc");?>">
-        <td><?php printMLText("settings_stopWordsFile");?>:</td>
-        <td><input type="text" name="stopWordsFile" value="<?php echo $settings->_stopWordsFile; ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableFolderTree_desc");?>">
-        <td><?php printMLText("settings_enableFolderTree");?>:</td>
-        <td><input name="enableFolderTree" type="checkbox" <?php if ($settings->_enableFolderTree) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_expandFolderTree_desc");?>">
-        <td><?php printMLText("settings_expandFolderTree");?>:</td>
-        <td>
-          <SELECT name="expandFolderTree">
-            <OPTION VALUE="0" <?php if ($settings->_expandFolderTree==0) echo "SELECTED" ?> ><?php printMLText("settings_expandFolderTree_val0");?></OPTION>
-            <OPTION VALUE="1" <?php if ($settings->_expandFolderTree==1) echo "SELECTED" ?> ><?php printMLText("settings_expandFolderTree_val1");?></OPTION>
-            <OPTION VALUE="2" <?php if ($settings->_expandFolderTree==2) echo "SELECTED" ?> ><?php printMLText("settings_expandFolderTree_val2");?></OPTION>
-          </SELECT>
-      </tr>
-      <tr title="<?php printMLText("settings_sortUsersInList_desc");?>">
-        <td><?php printMLText("settings_sortUsersInList");?>:</td>
-        <td>
-          <SELECT name="sortUsersInList">
-            <OPTION VALUE="" <?php if ($settings->_sortUsersInList=='') echo "SELECTED" ?> ><?php printMLText("settings_sortUsersInList_val_login");?></OPTION>
-            <OPTION VALUE="fullname" <?php if ($settings->_sortUsersInList=='fullname') echo "SELECTED" ?> ><?php printMLText("settings_sortUsersInList_val_fullname");?></OPTION>
-          </SELECT>
-      </tr>
-
-      <!--
-        -- SETTINGS - SITE - CALENDAR
-      -->
-     <tr><td></td></tr><tr ><td><b> <?php printMLText("settings_Calendar");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_enableCalendar_desc");?>">
-        <td><?php printMLText("settings_enableCalendar");?>:</td>
-        <td><input name="enableCalendar" type="checkbox" <?php if ($settings->_enableCalendar) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_calendarDefaultView_desc");?>">
-        <td><?php printMLText("settings_calendarDefaultView");?>:</td>
-        <td>
-          <SELECT name="calendarDefaultView">
-            <OPTION VALUE="w" <?php if ($settings->_calendarDefaultView=="w") echo "SELECTED" ?> ><?php printMLText("week_view");?></OPTION>
-            <OPTION VALUE="m" <?php if ($settings->_calendarDefaultView=="m") echo "SELECTED" ?> ><?php printMLText("month_view");?></OPTION>
-            <OPTION VALUE="y" <?php if ($settings->_calendarDefaultView=="y") echo "SELECTED" ?> ><?php printMLText("year_view");?></OPTION>
-          </SELECT>
-      </tr>
-     <tr title="<?php printMLText("settings_firstDayOfWeek_desc");?>">
-        <td><?php printMLText("settings_firstDayOfWeek");?>:</td>
-        <td>
-          <SELECT name="firstDayOfWeek">
-            <OPTION VALUE="0" <?php if ($settings->_firstDayOfWeek=="0") echo "SELECTED" ?> ><?php printMLText("sunday");?></OPTION>
-            <OPTION VALUE="1" <?php if ($settings->_firstDayOfWeek=="1") echo "SELECTED" ?> ><?php printMLText("monday");?></OPTION>
-            <OPTION VALUE="2" <?php if ($settings->_firstDayOfWeek=="2") echo "SELECTED" ?> ><?php printMLText("tuesday");?></OPTION>
-            <OPTION VALUE="3" <?php if ($settings->_firstDayOfWeek=="3") echo "SELECTED" ?> ><?php printMLText("wednesday");?></OPTION>
-            <OPTION VALUE="4" <?php if ($settings->_firstDayOfWeek=="4") echo "SELECTED" ?> ><?php printMLText("thursday");?></OPTION>
-            <OPTION VALUE="5" <?php if ($settings->_firstDayOfWeek=="5") echo "SELECTED" ?> ><?php printMLText("friday");?></OPTION>
-            <OPTION VALUE="6" <?php if ($settings->_firstDayOfWeek=="6") echo "SELECTED" ?> ><?php printMLText("saturday");?></OPTION>
-          </SELECT>
-      </tr>
-    </table>
-  </div>
-  <br>
-  <div class="contentHeading" onClick="ShowHide('systemID')" style="cursor:pointer">+ <?php printMLText("settings_System");?></div>
-  <div id="systemID" style="display:block">
-    <table>
-     <!--
-        -- SETTINGS - SYSTEM - SERVER
-      -->
-      <tr ><td><b> <?php printMLText("settings_Server");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_rootDir_desc");?>">
-        <td><?php printMLText("settings_rootDir");?>:</td>
-        <td><input type="text" name="rootDir" value="<?php echo $settings->_rootDir ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_httpRoot_desc");?>">
-        <td><?php printMLText("settings_httpRoot");?>:</td>
-        <td><input type="text" name="httpRoot" value="<?php echo $settings->_httpRoot ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_contentDir_desc");?>">
-        <td><?php printMLText("settings_contentDir");?>:</td>
-        <td><input type="text" name="contentDir" value="<?php echo $settings->_contentDir ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_stagingDir_desc");?>">
-        <td><?php printMLText("settings_stagingDir");?>:</td>
-        <td><input type="text" name="stagingDir" value="<?php echo $settings->_stagingDir ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_cacheDir_desc");?>">
-        <td><?php printMLText("settings_cacheDir");?>:</td>
-        <td><input type="text" name="cacheDir" value="<?php echo $settings->_cacheDir ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_luceneDir_desc");?>">
-        <td><?php printMLText("settings_luceneDir");?>:</td>
-        <td><input type="text" name="luceneDir" value="<?php echo $settings->_luceneDir ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_dropFolderDir_desc");?>">
-        <td><?php printMLText("settings_dropFolderDir");?>:</td>
-        <td><input type="text" name="dropFolderDir" value="<?php echo $settings->_dropFolderDir ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_logFileEnable_desc");?>">
-        <td><?php printMLText("settings_logFileEnable");?>:</td>
-        <td><input name="logFileEnable" type="checkbox" <?php if ($settings->_logFileEnable) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_logFileRotation_desc");?>">
-        <td><?php printMLText("settings_logFileRotation");?>:</td>
-        <td>
-          <SELECT name="logFileRotation">
-            <OPTION VALUE="h" <?php if ($settings->_logFileRotation=="h") echo "SELECTED" ?> ><?php printMLText("hourly");?></OPTION>
-            <OPTION VALUE="d" <?php if ($settings->_logFileRotation=="d") echo "SELECTED" ?> ><?php printMLText("daily");?></OPTION>
-            <OPTION VALUE="m" <?php if ($settings->_logFileRotation=="m") echo "SELECTED" ?> ><?php printMLText("monthly");?></OPTION>
-          </SELECT>
-      </tr>
-      <tr title="<?php printMLText("settings_enableLargeFileUpload_desc");?>">
-        <td><?php printMLText("settings_enableLargeFileUpload");?>:</td>
-        <td><input name="enableLargeFileUpload" type="checkbox" <?php if ($settings->_enableLargeFileUpload) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_partitionSize_desc");?>">
-        <td><?php printMLText("settings_partitionSize");?>:</td>
-        <td><input type="text" name="partitionSize" value="<?php echo $settings->_partitionSize ?>" size="100" /></td>
-      </tr>
-      <!--
-        -- SETTINGS - SYSTEM - AUTHENTICATION
-      -->
-      <tr ><td><b> <?php printMLText("settings_Authentication");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_enableGuestLogin_desc");?>">
-        <td><?php printMLText("settings_enableGuestLogin");?>:</td>
-        <td><input name="enableGuestLogin" type="checkbox" <?php if ($settings->_enableGuestLogin) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_restricted_desc");?>">
-        <td><?php printMLText("settings_restricted");?>:</td>
-        <td><input name="restricted" type="checkbox" <?php if ($settings->_restricted) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableUserImage_desc");?>">
-        <td><?php printMLText("settings_enableUserImage");?>:</td>
-        <td><input name="enableUserImage" type="checkbox" <?php if ($settings->_enableUserImage) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_disableSelfEdit_desc");?>">
-        <td><?php printMLText("settings_disableSelfEdit");?>:</td>
-        <td><input name="disableSelfEdit" type="checkbox" <?php if ($settings->_disableSelfEdit) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enablePasswordForgotten_desc");?>">
-        <td><?php printMLText("settings_enablePasswordForgotten");?>:</td>
-        <td><input name="enablePasswordForgotten" type="checkbox" <?php if ($settings->_enablePasswordForgotten) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_passwordЅtrength_desc");?>">
-        <td><?php printMLText("settings_passwordStrength");?>:</td>
-        <td><input type="text" name="passwordStrength" value="<?php echo $settings->_passwordStrength; ?>" size="2" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_passwordStrengthAlgorithm_desc");?>">
-        <td><?php printMLText("settings_passwordStrengthAlgorithm");?>:</td>
-        <td>
-				  <select name="passwordStrengthAlgorithm">
-					  <option value="simple" <?php if ($settings->_passwordStrengthAlgorithm=='simple') echo "selected" ?>><?php printMLText("settings_passwordStrengthAlgorithm_valsimple");?></option>
-						<option value="advanced" <?php if ($settings->_passwordStrengthAlgorithm=='advanced') echo "selected" ?>><?php printMLText("settings_passwordStrengthAlgorithm_valadvanced");?></option>
-					</select>
-				</td>
-      </tr>
-      <tr title="<?php printMLText("settings_passwordExpiration_desc");?>">
-        <td><?php printMLText("settings_passwordExpiration");?>:</td>
-        <td><input name="passwordExpiration" value="<?php echo $settings->_passwordExpiration; ?>" size="3" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_passwordHistory_desc");?>">
-        <td><?php printMLText("settings_passwordHistory");?>:</td>
-        <td><input name="passwordHistory" value="<?php echo $settings->_passwordHistory; ?>" size="2" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_loginFailure_desc");?>">
-        <td><?php printMLText("settings_loginFailure");?>:</td>
-        <td><input name="loginFailure" value="<?php echo $settings->_loginFailure; ?>" size="2" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_quota_desc");?>">
-        <td><?php printMLText("settings_quota");?>:</td>
-        <td><input type="text" name="quota" value="<?php echo $settings->_quota; ?>" size="2" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_encryptionKey_desc");?>">
-        <td><?php printMLText("settings_encryptionKey");?>:</td>
-        <td><input type="text" name="encryptionKey" value="<?php echo $settings->_encryptionKey; ?>" size="32" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_cookieLifetime_desc");?>">
-        <td><?php printMLText("settings_cookieLifetime");?>:</td>
-        <td><input type="text" name="cookieLifetime" value="<?php echo $settings->_cookieLifetime; ?>" size="32" /></td>
-      </tr>
-
-      <!-- TODO Connectors -->
-
-     <!--
-        -- SETTINGS - SYSTEM - DATABASE
-      -->
-      <tr ><td><b> <?php printMLText("settings_Database");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_dbDriver_desc");?>">
-        <td><?php printMLText("settings_dbDriver");?>:</td>
-        <td><input type="text" name="dbDriver" value="<?php echo $settings->_dbDriver ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_dbHostname_desc");?>">
-        <td><?php printMLText("settings_dbHostname");?>:</td>
-        <td><input type="text" name="dbHostname" value="<?php echo $settings->_dbHostname ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_dbDatabase_desc");?>">
-        <td><?php printMLText("settings_dbDatabase");?>:</td>
-        <td><input type="text" name="dbDatabase" value="<?php echo $settings->_dbDatabase ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_dbUser_desc");?>">
-        <td><?php printMLText("settings_dbUser");?>:</td>
-        <td><input type="text" name="dbUser" value="<?php echo $settings->_dbUser ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_dbPass_desc");?>">
-        <td><?php printMLText("settings_dbPass");?>:</td>
-        <td><input type="text" name="dbPass" value="<?php echo $settings->_dbPass ?>" type="password" /></td>
-      </tr>
-
-     <!--
-        -- SETTINGS - SYSTEM - SMTP
-      -->
-      <tr ><td><b> <?php printMLText("settings_SMTP");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_smtpServer_desc");?>">
-        <td><?php printMLText("settings_smtpServer");?>:</td>
-        <td><input type="text" name="smtpServer" value="<?php echo $settings->_smtpServer ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_smtpPort_desc");?>">
-        <td><?php printMLText("settings_smtpPort");?>:</td>
-        <td><input type="text" name="smtpPort" value="<?php echo $settings->_smtpPort ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_smtpSendFrom_desc");?>">
-        <td><?php printMLText("settings_smtpSendFrom");?>:</td>
-        <td><input type="text" name="smtpSendFrom" value="<?php echo $settings->_smtpSendFrom ?>" /></td>
-      </tr>
-
-    </table>
-  </div>
-
-  <br>
-  <div class="contentHeading" onClick="ShowHide('advancedID')" style="cursor:pointer">+ <?php printMLText("settings_Advanced");?></div>
-  <div id="advancedID" style="display:none">
-    <table>
-      <!--
-        -- SETTINGS - ADVANCED - DISPLAY
-      -->
-      <tr ><td><b> <?php printMLText("settings_Display");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_siteDefaultPage_desc");?>">
-        <td><?php printMLText("settings_siteDefaultPage");?>:</td>
-        <td><input type="text" name="siteDefaultPage" value="<?php echo $settings->_siteDefaultPage ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_rootFolderID_desc");?>">
-        <td><?php printMLText("settings_rootFolderID");?>:</td>
-        <td><input type="text" name="rootFolderID" value="<?php echo $settings->_rootFolderID ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_titleDisplayHack_desc");?>">
-        <td><?php printMLText("settings_titleDisplayHack");?>:</td>
-        <td><input name="titleDisplayHack" type="checkbox" <?php if ($settings->_titleDisplayHack) echo "checked" ?> /></td>
-      </tr>
-
-      <!--
-        -- SETTINGS - ADVANCED - AUTHENTICATION
-      -->
-      <tr ><td><b> <?php printMLText("settings_Authentication");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_guestID_desc");?>">
-        <td><?php printMLText("settings_guestID");?>:</td>
-        <td><input type="text" name="guestID" value="<?php echo $settings->_guestID ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_adminIP_desc");?>">
-        <td><?php printMLText("settings_adminIP");?>:</td>
-        <td><input type="text" name="adminIP" value="<?php echo $settings->_adminIP ?>" /></td>
-      </tr>
-
-      <!--
-        -- SETTINGS - ADVANCED - EDITION
-      -->
-      <tr ><td><b> <?php printMLText("settings_Edition");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_workflowMode_desc");?>">
-        <td><?php printMLText("settings_workflowMode");?>:</td>
-        <td>
-				  <select name="workflowMode">
-					  <option value="traditional" <?php if ($settings->_workflowMode=='traditional') echo "selected" ?>><?php printMLText("settings_workflowMode_valtraditional");?></option>
-						<option value="advanced" <?php if ($settings->_workflowMode=='advanced') echo "selected" ?>><?php printMLText("settings_workflowMode_valadvanced");?></option>
-					</select>
-				</td>
-      </tr>
-      <tr title="<?php printMLText("settings_versioningFileName_desc");?>">
-        <td><?php printMLText("settings_versioningFileName");?>:</td>
-        <td><input type="text" name="versioningFileName" value="<?php echo $settings->_versioningFileName ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableAdminRevApp_desc");?>">
-        <td><?php printMLText("settings_enableAdminRevApp");?>:</td>
-        <td><input name="enableAdminRevApp" type="checkbox" <?php if ($settings->_enableAdminRevApp) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableVersionDeletion_desc");?>">
-        <td><?php printMLText("settings_enableVersionDeletion");?>:</td>
-        <td><input name="enableVersionDeletion" type="checkbox" <?php if ($settings->_enableVersionDeletion) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableVersionModification_desc");?>">
-        <td><?php printMLText("settings_enableVersionModification");?>:</td>
-        <td><input name="enableVersionModification" type="checkbox" <?php if ($settings->_enableVersionModification) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableDuplicateDocNames_desc");?>">
-        <td><?php printMLText("settings_enableDuplicateDocNames");?>:</td>
-        <td><input name="enableDuplicateDocNames" type="checkbox" <?php if ($settings->_enableDuplicateDocNames) echo "checked" ?> /></td>
-      </tr>
-
-      <!--
-        -- SETTINGS - ADVANCED - NOTIFICATION
-      -->
-      <tr ><td><b> <?php printMLText("settings_Notification");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_enableOwnerNotification_desc");?>">
-        <td><?php printMLText("settings_enableOwnerNotification");?>:</td>
-        <td><input name="enableOwnerNotification" type="checkbox" <?php if ($settings->_enableOwnerNotification) echo "checked" ?> /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_enableNotificationAppRev_desc");?>">
-        <td><?php printMLText("settings_enableNotificationAppRev");?>:</td>
-        <td><input name="enableNotificationAppRev" type="checkbox" <?php if ($settings->_enableNotificationAppRev) echo "checked" ?> /></td>
-      </tr>
-
-      <!--
-        -- SETTINGS - ADVANCED - SERVER
-      -->
-      <tr ><td><b> <?php printMLText("settings_Server");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_coreDir_desc");?>">
-        <td><?php printMLText("settings_coreDir");?>:</td>
-        <td><input type="text" name="coreDir" value="<?php echo $settings->_coreDir ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_luceneClassDir_desc");?>">
-        <td><?php printMLText("settings_luceneClassDir");?>:</td>
-        <td><input type="text" name="luceneClassDir" value="<?php echo $settings->_luceneClassDir ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_extraPath_desc");?>">
-        <td><?php printMLText("settings_extraPath");?>:</td>
-        <td><input type="text" name="extraPath" value="<?php echo $settings->_extraPath ?>" size="100" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_contentOffsetDir_desc");?>">
-        <td><?php printMLText("settings_contentOffsetDir");?>:</td>
-        <td><input type="text" name="contentOffsetDir" value="<?php echo $settings->_contentOffsetDir ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_maxDirID_desc");?>">
-        <td><?php printMLText("settings_maxDirID");?>:</td>
-        <td><input type="text" name="maxDirID" value="<?php echo $settings->_maxDirID ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_updateNotifyTime_desc");?>">
-        <td><?php printMLText("settings_updateNotifyTime");?>:</td>
-        <td><input type="text" name="updateNotifyTime" value="<?php echo $settings->_updateNotifyTime ?>" /></td>
-      </tr>
-      <tr title="<?php printMLText("settings_maxExecutionTime_desc");?>">
-        <td><?php printMLText("settings_maxExecutionTime");?>:</td>
-        <td><input type="text" name="maxExecutionTime" value="<?php echo $settings->_maxExecutionTime ?>" /></td>
-      </tr>
-
-      <tr ><td><b> <?php printMLText("index_converters");?></b></td> </tr>
-<?php
-	foreach($settings->_converters as $mimetype=>$cmd) {
-?>
-      <tr title="<?php echo $mimetype;?>">
-        <td><?php echo $mimetype;?>:</td>
-        <td><input type="text" name="converters[<?php echo $mimetype;?>]" value="<?php echo $cmd ?>" size="100" /></td>
-      </tr>
-<?php
-	}
-?>
-    </table>
-  </div>
-
-	</form>
-
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.Statistic.php b/views/blue/class.Statistic.php
deleted file mode 100644
index d9596f937..000000000
--- a/views/blue/class.Statistic.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/**
- * Implementation of Statistic view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for Statistic view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_Statistic extends SeedDMS_Blue_Style {
-		var $dms;
-		var $folder_count;
-		var $document_count;
-		var $file_count;
-		var $storage_size;
-
-	function getAccessColor($mode) { /* {{{ */
-		if ($mode == M_NONE)
-			return "gray";
-		else if ($mode == M_READ)
-			return "green";
-		else if ($mode == M_READWRITE)
-			return "blue";
-		else // if ($mode == M_ALL)
-			return "red";
-	} /* }}} */
-
-	function printFolder($folder) { /* {{{ */
-		$this->folder_count++;
-		$folder_size=0;
-		$doc_count=0;
-
-		$color = $folder->inheritsAccess() ? "black" : $this->getAccessColor($folder->getDefaultAccess());
-
-		print "<li class=\"folderClass\">";
-		print "<a style=\"color: $color\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."\">".htmlspecialchars($folder->getName()) ."</a>";
-
-		$owner = $folder->getOwner();
-		$color = $this->getAccessColor(M_ALL);
-		print " [<span style=\"color: $color\">".htmlspecialchars($owner->getFullName())."</span>] ";
-
-		if (! $folder->inheritsAccess())
-			$this->printAccessList($folder);
-
-		$subFolders = $folder->getSubFolders();
-		$documents = $folder->getDocuments();
-
-		print "<ul>";
-
-		foreach ($subFolders as $sub) $folder_size += $this->printFolder($sub);
-		foreach ($documents as $document){
-			$doc_count++;
-			$folder_size += $this->printDocument($document);
-		}
-
-		print "</ul>";
-
-		print "<small>".SeedDMS_Core_File::format_filesize($folder_size).", ".$doc_count." ".getMLText("documents")."</small>\n";
-
-		print "</li>";
-
-		return $folder_size;
-	} /* }}} */
-
-	function printDocument($document) { /* {{{ */
-		$this->document_count++;
-
-		$local_file_count=0;
-		$folder_size=0;
-
-		if (file_exists($this->dms->contentDir.$document->getDir())) {
-			$handle = opendir($this->dms->contentDir.$document->getDir());
-			while ($entry = readdir($handle) ) {
-				if (is_dir($this->dms->contentDir.$document->getDir().$entry)) continue;
-				else{
-					$local_file_count++;
-					$folder_size += filesize($this->dms->contentDir.$document->getDir().$entry);
-				}
-
-			}
-			closedir($handle);
-		}
-		$this->storage_size += $folder_size;
-
-		$color = $document->inheritsAccess() ? "black" : $this->getAccessColor($document->getDefaultAccess());
-		print "<li class=\"documentClass\">";
-		print "<a style=\"color: $color\" href=\"out.ViewDocument.php?documentid=".$document->getID()."\">".htmlspecialchars($document->getName())."</a>";
-
-		$owner = $document->getOwner();
-		$color = $this->getAccessColor(M_ALL);
-		print " [<span style=\"color: $color\">".htmlspecialchars($owner->getFullName())."</span>] ";
-
-		if (! $document->inheritsAccess()) $this->printAccessList($document);
-
-		print "<small>".SeedDMS_Core_File::format_filesize($folder_size).", ".$local_file_count." ".getMLText("files")."</small>\n";
-
-		print "</li>";
-
-		$this->file_count += $local_file_count;
-		return $folder_size;
-	} /* }}} */
-
-	function printAccessList($obj) { /* {{{ */
-		$accessList = $obj->getAccessList();
-		if (count($accessList["users"]) == 0 && count($accessList["groups"]) == 0)
-			return;
-
-		print " <span>(";
-
-		for ($i = 0; $i < count($accessList["groups"]); $i++)
-		{
-			$group = $accessList["groups"][$i]->getGroup();
-			$color = $this->getAccessColor($accessList["groups"][$i]->getMode());
-			print "<span style=\"color: $color\">".htmlspecialchars($group->getName())."</span>";
-			if ($i+1 < count($accessList["groups"]) || count($accessList["users"]) > 0)
-				print ", ";
-		}
-		for ($i = 0; $i < count($accessList["users"]); $i++)
-		{
-			$user = $accessList["users"][$i]->getUser();
-			$color = $this->getAccessColor($accessList["users"][$i]->getMode());
-			print "<span style=\"color: $color\">".htmlspecialchars($user->getFullName())."</span>";
-			if ($i+1 < count($accessList["users"]))
-				print ", ";
-		}
-		print ")</span>";
-	} /* }}} */
-
-	function show() { /* {{{ */
-		$this->dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$rootfolder = $this->params['rootfolder'];
-
-		$this->htmlStartPage(getMLText("folders_and_documents_statistic"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-
-		$this->folder_count=0;
-		$this->document_count=0;
-		$this->file_count=0;
-		$this->storage_size=0;
-?>
-<style type="text/css">
-.folderClass {
-	list-style-image : url(<?php $this->printImgPath("folder_closed.gif");?>);
-	list-style : url(<?php $this->printImgPath("folder_closed.gif");?>);
-}
-
-.documentClass {
-	list-style-image : url(<?php $this->printImgPath("file.gif");?>);
-	list-style : url(<?php $this->printImgPath("file.gif");?>);
-}
-</style>
-
-<script language="JavaScript">
-
-function showDocument(id) {
-	url = "out.DetailedStatistic.php?documentid=" + id;
-	alert(url);
-}
-
-function showFolder(id) {
-	url = "out.DetailedStatistic.php?folderid=" + id;
-	alert(url);
-}
-
-</script>
-
-<?php
-
-$this->contentHeading(getMLText("folders_and_documents_statistic"));
-$this->contentContainerStart();
-
-print "<table><tr><td>\n";
-
-print "<ul class=\"legend\">\n";
-print "<li><span style=\"color:black\">".getMLText("access_inheritance")." </span></li>";
-print "<li><span style=\"color:".$this->getAccessColor(M_ALL)."\">".getMLText("access_mode_all")." </span></li>";
-print "<li><span style=\"color:".$this->getAccessColor(M_READWRITE)."\">".getMLText("access_mode_readwrite")." </span></li>";
-print "<li><span style=\"color:".$this->getAccessColor(M_READ)."\">".getMLText("access_mode_read")." </span></li>";
-print "<li><span style=\"color:".$this->getAccessColor(M_NONE)."\">".getMLText("access_mode_none")." </span></li>";
-print "</ul>\n";
-
-print "</td><td>\n";
-
-print "<ul>\n";
-$this->printFolder($rootfolder);
-print "</ul>\n";
-
-print "</td></tr>";
-
-print "<tr><td colspan=\"2\">";
-
-print "<ul class=\"legend\">\n";
-print "<li>".getMLText("folders").": ".$this->folder_count."</li>\n";
-print "<li>".getMLText("documents").": ".$this->document_count."</li>\n";
-print "<li>".getMLText("files").": ".$this->file_count."</li>\n";
-print "<li>".getMLText("storage_size").": ".formatted_size($this->storage_size)."</li>\n";
-
-print "</ul>\n";
-
-print "</td></tr>";
-
-print "</table>\n";
-
-$this->contentContainerEnd();
-$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.UpdateDocument.php b/views/blue/class.UpdateDocument.php
deleted file mode 100644
index a1ed9f22b..000000000
--- a/views/blue/class.UpdateDocument.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/**
- * Implementation of UpdateDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for UpdateDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_UpdateDocument extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$strictformcheck = $this->params['strictformcheck'];
-		$enablelargefileupload = $this->params['enablelargefileupload'];
-		$dropfolderdir = $this->params['dropfolderdir'];
-		$documentid = $document->getId();
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-?>
-
-<script language="JavaScript">
-function checkForm()
-{
-	msg = "";
-<?php if($dropfolderdir) { ?>
-	if (document.form1.userfile.value == "" && document.form1.dropfolderfileform1.value == "") msg += "<?php printMLText("js_no_file");?>\n";
-<?php } else { ?>
-	if (document.form1.userfile.value == "") msg += "<?php printMLText("js_no_file");?>\n";
-<?php } ?>
-<?php
-	if ($strictformcheck) {
-	?>
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-<?php
-	}
-?>
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
-		$this->contentHeading(getMLText("update_document"));
-		$this->contentContainerStart();
-
-		if ($document->isLocked()) {
-
-			$lockingUser = $document->getLockingUser();
-
-			print "<table><tr><td class=\"warning\">";
-			
-			printMLText("update_locked_msg", array("username" => htmlspecialchars($lockingUser->getFullName()), "email" => $lockingUser->getEmail()));
-			
-			if ($lockingUser->getID() == $user->getID())
-				printMLText("unlock_cause_locking_user");
-			else if ($document->getAccessMode($user) == M_ALL)
-				printMLText("unlock_cause_access_mode_all");
-			else
-			{
-				printMLText("no_update_cause_locked");
-				print "</td></tr></table>";
-				$this->contentContainerEnd();
-				$this->htmlEndPage();
-				exit;
-			}
-
-			print "</td></tr></table><br>";
-		}
-
-		// Retrieve a list of all users and groups that have review / approve
-		// privileges.
-		$docAccess = $document->getApproversList();
-?>
-
-<table>
-<tr>
-	<td class="warning"><?php echo getMLText("max_upload_size")." : ".ini_get( "upload_max_filesize"); ?></td>
-</tr>
-<?php
-	if($enablelargefileupload) {
-?>
-<tr>
-  <td><?php printf(getMLText('link_alt_updatedocument'), "out.UpdateDocument2.php?documentid=".$document->getID()); ?></td>
-</tr>
-<?php
-	}
-?>
-</table><br>
-
-
-<form action="../op/op.UpdateDocument.php" enctype="multipart/form-data" method="post" name="form1" onsubmit="return checkForm();">
-	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
-	<table>
-	
-		<tr>
-			<td><?php printMLText("local_file");?>:</td>
-			<td><input type="File" name="userfile" size="60"></td>
-		</tr>
-<?php if($dropfolderdir) { ?>
-		<tr>
-			<td><?php printMLText("dropfolder_file");?>:</td>
-			<td><?php $this->printDropFolderChooser("form1");?></td>
-		</tr>
-<?php } ?>
-		<tr>
-			<td><?php printMLText("comment");?>:</td>
-			<td class="standardText">
-				<textarea name="comment" rows="4" cols="80"></textarea>
-			</td>
-		</tr>
-		<tr>
-			<td><?php printMLText("expires");?>:</td>
-			<td class="standardText">
-				<input type="radio" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
-				<input type="radio" name="expires" value="true"<?php if ($document->expires()) print " checked";?>><?php $this->printDateChooser(-1, "exp");?>
-			</td>
-		</tr>
-<?php
-	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
-	if($attrdefs) {
-		foreach($attrdefs as $attrdef) {
-?>
-    <tr>
-	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	    <td><?php $this->printAttributeEditField($attrdef, '') ?></td>
-    </tr>
-<?php
-		}
-	}
-?>
-		<tr>
-			<td colspan=2>
-				<?php $this->contentSubHeading(getMLText("assign_reviewers")); ?>
-
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-				<div class="cbSelectContainer cbSelectMargin">
-				<ul class="cbSelectList">
-<?php
-				$res=$user->getMandatoryReviewers();
-				foreach ($docAccess["users"] as $usr) {
-					if ($usr->getID()==$user->getID()) continue;
-					$mandatory=false;
-					foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
-
-					if ($mandatory) print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>". htmlspecialchars($usr->getFullName())."</li>";
-					else print "<li class=\"cbSelectItem\"><input id='revInd".$usr->getID()."' type='checkbox' name='indReviewers[]' value='". $usr->getID() ."'>". htmlspecialchars($usr->getFullName())."</li>";
-				}
-?>
-				</ul>
-				</div>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList">
-<?php
-				foreach ($docAccess["groups"] as $grp) {
-				
-					$mandatory=false;
-					foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $mandatory=true;	
-
-					if ($mandatory) print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>".htmlspecialchars($grp->getName())."</li>";
-					else print "<li class=\"cbSelectItem\"><input id='revGrp".$grp->getID()."' type='checkbox' name='grpReviewers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName())."</li>";
-				}
-?>
-				</ul>
-				</div>
-					
-				<?php $this->contentSubHeading(getMLText("assign_approvers")); ?>	
-				
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-				<div class="cbSelectContainer cbSelectMargin">
-				<ul class="cbSelectList">
-<?php
-				$res=$user->getMandatoryApprovers();
-				foreach ($docAccess["users"] as $usr) {
-					if ($usr->getID()==$user->getID()) continue; 
-
-					$mandatory=false;
-					foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
-					
-					if ($mandatory) print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>". htmlspecialchars($usr->getFullName())."</li>";
-					else print "<li class=\"cbSelectItem\"><input id='appInd".$usr->getID()."' type='checkbox' name='indApprovers[]' value='". $usr->getID() ."'>". htmlspecialchars($usr->getFullName())."</li>";
-				}
-?>
-				</ul>
-				</div>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList">
-<?php
-				foreach ($docAccess["groups"] as $grp) {
-				
-					$mandatory=false;
-					foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $mandatory=true;	
-
-					if ($mandatory) print "<li class=\"cbSelectItem\"><input type='checkbox' checked='checked' disabled='disabled'>".htmlspecialchars($grp->getName());
-					else print "<li class=\"cbSelectItem\"><input id='appGrp".$grp->getID()."' type='checkbox' name='grpApprovers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName());
-
-				}
-?>
-				</ul>
-				</div>
-			</td>
-			</tr>
-		<tr>
-			<td colspan="2"><?php printMLText("add_doc_reviewer_approver_warning")?></td>
-		</tr>
-		<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("update_document")?>"></td>
-		</tr>
-	</table>
-</form>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.UpdateDocument2.php b/views/blue/class.UpdateDocument2.php
deleted file mode 100644
index 375edee86..000000000
--- a/views/blue/class.UpdateDocument2.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Implementation of UpdateDocument2 view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for UpdateDocument2 view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_UpdateDocument2 extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-
-		$this->contentHeading(getMLText("update_document") . ": " . htmlspecialchars($document->getName()));
-		$this->contentContainerStart();
-
-		if ($document->isLocked()) {
-
-			$lockingUser = $document->getLockingUser();
-			
-			print "<table><tr><td class=\"warning\">";
-			
-			printMLText("update_locked_msg", array("username" => htmlspecialchars($lockingUser->getFullName()), "email" => htmlspecialchars($lockingUser->getEmail())));
-			
-			if ($lockingUser->getID() == $user->getID())
-				printMLText("unlock_cause_locking_user");
-			else if ($document->getAccessMode($user) == M_ALL)
-				printMLText("unlock_cause_access_mode_all");
-			else
-			{
-				printMLText("no_update_cause_locked");
-				print "</td></tr></table>";
-				$this->contentContainerEnd();
-				$this->htmlEndPage();
-				exit;
-			}
-
-			print "</td></tr></table><br>";
-		}
-
-		// Retrieve a list of all users and groups that have review / approve
-		// privileges.
-		$docAccess = $document->getApproversList();
-
-		$this->printUploadApplet('../op/op.UpdateDocument2.php', array('folderid'=>$folder->getId(), 'documentid'=>$document->getId()), 1, array('version_comment'=>1));
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.UserDefaultKeywords.php b/views/blue/class.UserDefaultKeywords.php
deleted file mode 100644
index 3024ad4fb..000000000
--- a/views/blue/class.UserDefaultKeywords.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/**
- * Implementation of UserDefaultKeywords view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for UserDefaultKeywords view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_UserDefaultKeywords extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$categories = $this->params['categories'];
-
-		$this->htmlStartPage(getMLText("edit_default_keywords"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("my_account"), "my_account");
-?>
-<script language="JavaScript">
-obj = -1;
-function showKeywords(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-
-	obj = document.getElementById("keywords" + id);
-	obj.style.display = "";
-}
-</script>
-<?php
-		$this->contentHeading(getMLText("edit_default_keywords"));
-		$this->contentContainerStart();
-?>
-	<table>
-	<tr>
-		<td><?php echo getMLText("selection")?>:</td>
-		<td>
-			<select onchange="showKeywords(this)" id="selector">
-				<option value="-1"><?php echo getMLText("choose_category")?>
-				<option value="0"><?php echo getMLText("new_default_keyword_category")?>
-				<?php
-
-				$selected=0;
-				$count=2;
-				foreach ($categories as $category) {
-
-					$owner = $category->getOwner();
-					if ($owner->getID() != $user->getID()) continue;
-
-					if (isset($_GET["categoryid"]) && $category->getID()==$_GET["categoryid"]) $selected=$count;
-					print "<option value=\"".$category->getID()."\">" . htmlspecialchars($category->getName());
-					$count++;
-				}
-				?>
-			</select>
-			&nbsp;&nbsp;
-		</td>
-
-		<td id="keywords0" style="display : none;">
-			<form action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory">
-			<input type="hidden" name="action" value="addcategory">
-			<?php printMLText("name");?> : <input type="text" name="name">
-			<input type="Submit" value="<?php printMLText("new_default_keyword_category"); ?>">
-			</form>
-		</td>
-<?php
-		foreach ($categories as $category) {
-			$owner = $category->getOwner();
-			if ($owner->getID() != $user->getID()) continue;
-
-			print "<td id=\"keywords".$category->getID()."\" style=\"display : none;\">";
-?>
-			<table>
-				<tr>
-					<td colspan="2">
-						<a href="../op/op.UserDefaultKeywords.php?categoryid=<?php print $category->getID();?>&action=removecategory"><img src="images/del.gif" border="0"><?php printMLText("rm_default_keyword_category");?></a>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<?php $this->contentSubHeading("");?>
-					</td>
-				</tr>
-				<tr>
-					<td><?php echo getMLText("name")?>:</td>
-					<td>
-						<form action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo "category".$category->getID()?>">
-							<input type="hidden" name="action" value="editcategory">
-							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<input name="name" value="<?php echo htmlspecialchars($category->getName())?>">
-							<input type="submit" value="<?php printMLText("save");?>">
-						</form>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<?php $this->contentSubHeading("");?>
-					</td>
-				</tr>
-				<tr>
-					<td><?php echo getMLText("default_keywords")?>:</td>
-					<td>
-						<?php
-							$lists = $category->getKeywordLists();
-							if (count($lists) == 0)
-								print getMLText("no_default_keywords");
-							else
-								foreach ($lists as $list) {
-?>
-									<form action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo "cat".$category->getID().".".$list["id"]?>">
-									<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
-									<input type="Hidden" name="action" value="editkeywords">
-									<input type="text" name="keywords" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<input name="action" value="editkeywords" type="Image" src="images/save.gif" title="<?php echo getMLText("save")?>" border="0">
-									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
-									<a href="../op/op.UserDefaultKeywords.php?categoryid=<?php echo $category->getID()?>&keywordsid=<?php echo $list["id"]?>&action=removekeywords"><img src="images/del.gif" title="<?php echo getMLText("delete")?>" border=0></a>
-									</form>
-									<br>
-						<?php }  ?>
-					</td>
-				</tr>
-				<tr>
-					<form action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo $category->getID().".add"?>">
-					<td><input type="Submit" value="<?php printMLText("new_default_keywords");?>"></td>
-					<td>
-						<input type="hidden" name="action" value="newkeywords">
-						<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<input type="text" name="keywords">
-					</td>
-					</form>
-				</tr>
-			</table>
-		</td>
-<?php } ?>
-	</tr></table>
-
-<script language="JavaScript">
-
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showKeywords(sel);
-
-</script>
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.UserImage.php b/views/blue/class.UserImage.php
deleted file mode 100644
index a00be75f6..000000000
--- a/views/blue/class.UserImage.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Implementation of UserImage view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for UserImage view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_UserImage extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.UserList.php b/views/blue/class.UserList.php
deleted file mode 100644
index 688bd5f63..000000000
--- a/views/blue/class.UserList.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Implementation of UserList view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for UserList view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_UserList extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$allUsers = $this->params['allusers'];
-		$httproot = $this->params['httproot'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("user_list"));
-		$this->contentContainerStart();
-
-		foreach ($allUsers as $currUser) {
-			if ($currUser->isGuest())
-				continue;
-
-			$this->contentSubHeading(getMLText("user") . ": \"" . $currUser->getFullName() . "\"");
-?>
-	<table border="0">
-		<tr>
-			<td><?php printMLText("user_login");?>:</td>
-			<td><?php print $currUser->getLogin();?></td>
-		</tr>
-	<tr>
-			<td><?php printMLText("user_name");?>:</td>
-			<td><?php print $currUser->getFullName();?></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("email");?>:</td>
-			<td><a href="mailto:<?php print $currUser->getEmail();?>"><?php print $currUser->getEmail();?></a></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("comment");?>:</td>
-			<td><?php print $currUser->getComment();?></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("groups");?>:</td>
-			<td>
-				<?php
-					$groups = $currUser->getGroups();
-					if (count($groups) == 0) {
-						printMLText("no_groups");
-					}
-					else {
-						for ($j = 0; $j < count($groups); $j++)	{
-							print $groups[$j]->getName();
-							if ($j +1 < count($groups))
-								print ", ";
-						}
-					}
-				?>
-			</td>
-		</tr>
-		<tr>
-			<td><?php printMLText("user_image");?>:</td>
-			<td>
-				<?php
-					if ($currUser->hasImage())
-						print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
-					else
-						printMLText("no_user_image");
-				?>
-			</td>
-		</tr>
-	</table>
-<?php
-		}
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.UsrMgr.php b/views/blue/class.UsrMgr.php
deleted file mode 100644
index dbb94e533..000000000
--- a/views/blue/class.UsrMgr.php
+++ /dev/null
@@ -1,423 +0,0 @@
-<?php
-/**
- * Implementation of UsrMgr view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for UsrMgr view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_UsrMgr extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$seluser = $this->params['seluser'];
-		$users = $this->params['allusers'];
-		$groups = $this->params['allgroups'];
-		$passwordstrength = $this->params['passwordstrength'];
-		$passwordexpiration = $this->params['passwordexpiration'];
-		$httproot = $this->params['httproot'];
-		$enableuserimage = $this->params['enableuserimage'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-
-?>
-<script language="JavaScript">
-
-function checkForm(num)
-{
-	msg = "";
-	eval("var formObj = document.form" + num + ";");
-
-	if (formObj.login.value == "") msg += "<?php printMLText("js_no_login");?>\n";
-	if ((num == '0') && (formObj.pwd.value == "")) msg += "<?php printMLText("js_no_pwd");?>\n";
-	if ((formObj.pwd.value != formObj.pwdconf.value)&&(formObj.pwd.value != "" )&&(formObj.pwd.value != "" )) msg += "<?php printMLText("js_pwd_not_conf");?>\n";
-	if (formObj.name.value == "") msg += "<?php printMLText("js_no_name");?>\n";
-	if (formObj.email.value == "") msg += "<?php printMLText("js_no_email");?>\n";
-	//if (formObj.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-
-
-obj = -1;
-function showUser(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-
-	obj = document.getElementById("keywords" + id);
-	obj.style.display = "";
-}
-</script>
-<?php
-		$this->contentHeading(getMLText("user_management"));
-		$this->contentContainerStart();
-?>
-<table><tr>
-
-<td><?php echo getMLText("selection")?>:
-<select onchange="showUser(this)" id="selector">
-<option value="-1"><?php echo getMLText("choose_user")?>
-<option value="0"><?php echo getMLText("add_user")?>
-<?php
-		$selected=0;
-		$count=2;
-		foreach ($users as $currUser) {
-			if ($seluser && $currUser->getID()==$seluser->getID()) $selected=$count;
-			print "<option value=\"".$currUser->getID()."\">" . htmlspecialchars($currUser->getLogin() . " - ". $currUser->getFullName());
-			$count++;
-		}
-?>
-</select>
-&nbsp;&nbsp;
-</td>
-
-<td id="keywords0" style="display : none;">
-
-	<form action="../op/op.UsrMgr.php" method="post" enctype="multipart/form-data" name="form0" onsubmit="return checkForm('0');">
-  <?php echo createHiddenFieldWithKey('adduser'); ?>
-	<input type="Hidden" name="action" value="adduser">
-	<table>
-		<tr>
-			<td><?php printMLText("user_login");?>:</td>
-			<td><input type="text" name="login"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("password");?>:</td>
-			<td><input class="pwd" name="pwd" rel="outerstrength" type="Password"> <div id="outerstrength" style="min-width: 100px; height: 14px; display: inline-block; border: 1px solid black; padding: 1px;"><div id="innerstrength" style="width: 0px; height: 14px; display: inline-block; border: 0px; padding: 0px; background-color: red;">&nbsp;</div> <div id="strength" style="display: inline-block;"></div></div></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("confirm_pwd");?>:</td>
-			<td><input type="password" name="pwdconf"></td>
-		</tr>
-<?php
-		if($passwordexpiration > 0) {
-?>
-		<tr>
-			<td><?php printMLText("password_expiration");?>:</td>
-			<td><select name="pwdexpiration"><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option></select></td>
-		</tr>
-<?php
-		}
-?>
-		<tr>
-			<td><?php printMLText("user_name");?>:</td>
-			<td><input type="text" name="name"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("email");?>:</td>
-			<td><input type="text" name="email"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="50"></textarea></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("role");?>:</td>
-			<td><select name="role"><option value="<?php echo SeedDMS_Core_User::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_User::role_admin ?>"><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_User::role_guest ?>"><?php printMLText("role_guest"); ?></option></select></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("is_hidden");?>:</td>
-			<td><input type="checkbox" name="ishidden" value="1"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("is_disabled");?>:</td>
-			<td><input type="checkbox" name="isdisabled" value="1"></td>
-		</tr>
-
-<?php if ($enableuserimage){ ?>
-
-		<tr>
-			<td><?php printMLText("user_image");?>:</td>
-			<td><input type="File" name="userfile"></td>
-		</tr>
-
-<?php } ?>
-
-		<tr>
-			<td><?php printMLText("reviewers");?>:</td>
-			<td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList"><?php
-				foreach ($users as $usr) {
-
-					if ($usr->isGuest()) continue;
-
-					print "<li class=\"cbSelectItem\"><input id='revUsr".$usr->getID()."' type='checkbox' name='usrReviewers[]' value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin());
-				}
-?>
-				</ul>
-				</div>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList">
-<?php
-				foreach ($groups as $grp) {
-
-					print "<li class=\"cbSelectItem\"><input id='revGrp".$grp->getID()."' type='checkbox' name='grpReviewers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName());
-				}
-?>
-				</ul>
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td><?php printMLText("approvers");?>:</td>
-			<td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList">
-<?php
-				foreach ($users as $usr) {
-
-					if ($usr->isGuest()) continue;
-
-					print "<li class=\"cbSelectItem\"><input id='appUsr".$usr->getID()."' type='checkbox' name='usrApprovers[]' value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin());
-				}
-?>
-				</ul>
-				</div>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList">
-<?php
-				foreach ($groups as $grp) {
-
-					print "<li class=\"cbSelectItem\"><input id='revGrp".$grp->getID()."' type='checkbox' name='grpApprovers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName());
-				}
-?>
-				</ul>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("add_user");?>"></td>
-		</tr>
-	</table>
-	</form>
-
-</td>
-
-
-<?php
-		foreach ($users as $currUser) {
-
-			print "<td id=\"keywords".$currUser->getID()."\" style=\"display : none;\">";
-
-			$this->contentSubHeading(getMLText("user")." : ".htmlspecialchars($currUser->getLogin()));
-?>
-
-	<a class="standardText" href="../out/out.RemoveUser.php?userid=<?php print $currUser->getID();?>"><img src="images/del.gif" width="15" height="15" border="0" align="absmiddle" alt=""> <?php printMLText("rm_user");?></a>
-
-	<?php	$this->contentSubHeading(getMLText("edit_user"));?>
-
-	<form action="../op/op.UsrMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $currUser->getID();?>" onsubmit="return checkForm('<?php print $currUser->getID();?>');">
-	<?php echo createHiddenFieldWithKey('edituser'); ?>
-	<input type="hidden" name="userid" value="<?php print $currUser->getID();?>">
-	<input type="hidden" name="action" value="edituser">
-	<table>
-		<tr>
-			<td><?php printMLText("user_login");?>:</td>
-			<td><input type="text" name="login" value="<?php print htmlspecialchars($currUser->getLogin());?>"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("password");?>:</td>
-			<td><input type="password" class="pwd" rel="outerstrength<?php echo $currUser->getID(); ?>" name="pwd"> <div id="outerstrength<?php echo $currUser->getID(); ?>" style="min-width: 100px; height: 14px; display: inline-block; border: 1px solid black; padding: 1px;"><div id="innerstrength" style="width: 0px; height: 14px; display: inline-block; border: 0px; padding: 0px; background-color: red;">&nbsp;</div> <div id="strength" style="display: inline-block;"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("confirm_pwd");?>:</td>
-			<td><input type="Password" name="pwdconf"></td>
-		</tr>
-<?php
-	if($passwordexpiration > 0) {
-?>
-		<tr>
-			<td><?php printMLText("password_expiration");?>:</td>
-			<td><select name="pwdexpiration"><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option></select> <?php echo $currUser->getPwdExpiration(); ?></td>
-		</tr>
-<?php
-	}
-?>
-		<tr>
-			<td><?php printMLText("user_name");?>:</td>
-			<td><input type="text" name="name" value="<?php print htmlspecialchars($currUser->getFullName());?>"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("email");?>:</td>
-			<td><input type="text" name="email" value="<?php print htmlspecialchars($currUser->getEmail()) ;?>"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="50"><?php print htmlspecialchars($currUser->getComment());?></textarea></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("role");?>:</td>
-			<td><select name="role"><option value="<?php echo SeedDMS_Core_User::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_User::role_admin ?>" <?php if($currUser->getRole() == SeedDMS_Core_User::role_admin) echo "selected"; ?>><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_User::role_guest ?>" <?php if($currUser->getRole() == SeedDMS_Core_User::role_guest) echo "selected"; ?>><?php printMLText("role_guest"); ?></option></select></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("is_hidden");?>:</td>
-			<td><input type="checkbox" name="ishidden" value="1"<?php print ($currUser->isHidden() ? " checked='checked'" : "");?>></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("is_disabled");?>:</td>
-			<td><input type="checkbox" name="isdisabled" value="1"<?php print ($currUser->isDisabled() ? " checked='checked'" : "");?>></td>
-		</tr>
-
-<?php if ($enableuserimage){ ?>
-
-		<tr>
-			<td><?php printMLText("user_image");?>:</td>
-			<td>
-<?php
-					if ($currUser->hasImage())
-						print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
-					else
-						printMLText("no_user_image");
-?>
-			</td>
-		</tr>
-		<tr>
-			<td><?php printMLText("new_user_image");?>:</td>
-			<td><input type="file" name="userfile" accept="image/jpeg"></td>
-		</tr>
-
-<?php } ?>
-
-
-		<tr>
-			<td><?php printMLText("reviewers");?>:</td>
-			<td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList">
-				<?php
-
-				$res=$currUser->getMandatoryReviewers();
-
-				foreach ($users as $usr) {
-
-					if ($usr->isGuest() || ($usr->getID() == $currUser->getID()))
-						continue;
-
-					$checked=false;
-					foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $checked=true;
-
-					print "<li class=\"cbSelectItem\"><input id='revUsr".$usr->getID()."' type='checkbox' ".($checked?"checked='checked' ":"")."name='usrReviewers[]' value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin())."</li>\n";
-				}
-?>
-				</ul>
-				</div>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList">
-				<?php
-				foreach ($groups as $grp) {
-
-					$checked=false;
-					foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $checked=true;
-
-					print "<li class=\"cbSelectItem\"><input id='revGrp".$grp->getID()."' type='checkbox' ".($checked?"checked='checked' ":"")."name='grpReviewers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName())."</li>\n";
-				}
-?>
-				</ul>
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td><?php printMLText("approvers");?>:</td>
-			<td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList">
-<?php
-				$res=$currUser->getMandatoryApprovers();
-				foreach ($users as $usr) {
-					if ($usr->isGuest() || ($usr->getID() == $currUser->getID()))
-						continue;
-
-					$checked=false;
-					foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $checked=true;
-
-					print "<li class=\"cbSelectItem\"><input id='appUsr".$usr->getID()."' type='checkbox' ".($checked?"checked='checked' ":"")."name='usrApprovers[]' value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin())."</li>\n";
-				}
-?>
-				</ul>
-				</div>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-				<div class="cbSelectContainer">
-				<ul class="cbSelectList">
-<?php
-				foreach ($groups as $grp) {
-
-					$checked=false;
-					foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $checked=true;
-
-					print "<li class=\"cbSelectItem\"><input id='revGrp".$grp->getID()."' type='checkbox' ".($checked?"checked='checked' ":"")."name='grpApprovers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName())."</li>\n";
-				}
-?>
-				</ul>
-				</div>
-			</td>
-		</tr>
-
-		<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("save");?>"></td>
-		</tr>
-	</table>
-	</form>
-</td>
-<?php  } ?>
-</tr></table>
-
-<script language="JavaScript">
-
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showUser(sel);
-
-</script>
-
-
-<?php
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.UsrView.php b/views/blue/class.UsrView.php
deleted file mode 100644
index 6f554e9c7..000000000
--- a/views/blue/class.UsrView.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Implementation of UsrView view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for UsrView view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_UsrView extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$users = $this->params['allusers'];
-		$enableuserimage = $this->params['enableuserimage'];
-		$httproot = $this->params['httproot'];
-
-		$this->htmlStartPage(getMLText("my_account"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("my_account"), "my_account");
-
-		$this->contentHeading(getMLText("users"));
-		$this->contentContainerStart();
-
-		echo "<table class=\"userView\">\n";
-		echo "<thead>\n<tr>\n";
-		echo "<th>".getMLText("name")."</th>\n";
-		echo "<th>".getMLText("email")."</th>\n";
-		echo "<th>".getMLText("comment")."</th>\n";
-		if ($enableuserimage) echo "<th>".getMLText("user_image")."</th>\n";
-		echo "</tr>\n</thead>\n";
-
-		foreach ($users as $currUser) {
-
-			if ($currUser->isGuest())
-				continue;
-				
-			if ($currUser->isHidden()=="1") continue;
-				
-			echo "<tr>\n";
-			
-			print "<td>".htmlspecialchars($currUser->getFullName())."</td>";
-			
-			print "<td><a href=\"mailto:".htmlspecialchars($currUser->getEmail())."\">".htmlspecialchars($currUser->getEmail())."</a></td>";
-			print "<td>".htmlspecialchars($currUser->getComment())."</td>";
-			
-			if ($enableuserimage){
-				print "<td>";
-				if ($currUser->hasImage()) print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
-				else printMLText("no_user_image");
-				print "</td>";	
-			}
-			
-			echo "</tr>\n";
-		}
-
-		echo "</table>\n";
-
-		$this->contentContainerEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ViewDocument.php b/views/blue/class.ViewDocument.php
deleted file mode 100644
index 5f98e5951..000000000
--- a/views/blue/class.ViewDocument.php
+++ /dev/null
@@ -1,547 +0,0 @@
-<?php
-/**
- * Implementation of ViewDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ViewDocument view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ViewDocument extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$document = $this->params['document'];
-		$accessop = $this->params['accessobject'];
-		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
-		$documentid = $document->getId();
-
-		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
-		$this->globalNavigation($folder);
-		$this->contentStart();
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
-		$this->contentHeading(getMLText("document_infos"));
-		$this->contentContainerStart();
-
-		?>
-		<table>
-		<?php
-		if ($document->isLocked()) {
-			$lockingUser = $document->getLockingUser();
-		?>
-		<tr>
-			<td class="warning" colspan=2><?php printMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName())));?></td>
-		</tr>
-		<?php
-		}
-		?>
-		<tr>
-		<td><?php printMLText("owner");?>:</td>
-		<td>
-		<?php
-		$owner = $document->getOwner();
-		print "<a class=\"infos\" href=\"mailto:".$owner->getEmail()."\">".htmlspecialchars($owner->getFullName())."</a>";
-		?>
-		</td>
-		</tr>
-		<tr>
-		<td><?php printMLText("comment");?>:</td>
-		<td><?php print htmlspecialchars($document->getComment());?></td>
-		</tr>
-		<tr>
-		<td><?php printMLText("creation_date");?>:</td>
-		<td><?php print getLongReadableDate($document->getDate()); ?></td>
-		</tr>
-		<tr>
-		<td><?php printMLText("keywords");?>:</td>
-		<td><?php print htmlspecialchars($document->getKeywords());?></td>
-		</tr>
-		<tr>
-		<td><?php printMLText("categories");?>:</td>
-		<td>
-		<?php
-			$cats = $document->getCategories();
-			$ct = array();
-			foreach($cats as $cat)
-				$ct[] = htmlspecialchars($cat->getName());
-			echo implode(', ', $ct);
-		?>
-		</td>
-		</tr>
-		<?php
-		$attributes = $document->getAttributes();
-		if($attributes) {
-			foreach($attributes as $attribute) {
-				$attrdef = $attribute->getAttributeDefinition();
-		?>
-				<tr>
-					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td><?php echo htmlspecialchars($attribute->getValue()); ?></td>
-				</tr>
-		<?php
-			}
-		}
-		?>
-		</table>
-		<?php
-		$this->contentContainerEnd();
-
-		$versions = $document->getContent();
-		if(!$latestContent = $document->getLatestContent()) {
-			$this->contentHeading(getMLText("current_version"));
-			$this->contentContainerStart();
-			print getMLText('document_content_missing');
-			$this->contentContainerEnd();
-			$this->htmlEndPage();
-			exit;
-		}
-
-		$status = $latestContent->getStatus();
-		$reviewStatus = $latestContent->getReviewStatus();
-		$approvalStatus = $latestContent->getApprovalStatus();
-
-		// verify if file exists
-		$file_exists=file_exists($dms->contentDir . $latestContent->getPath());
-
-		$this->contentHeading(getMLText("current_version"));
-		$this->contentContainerStart();
-		print "<table class=\"folderView\">";
-		print "<thead>\n<tr>\n";
-		print "<th width='10%'></th>\n";
-		print "<th width='10%'>".getMLText("version")."</th>\n";
-		print "<th width='20%'>".getMLText("file")."</th>\n";
-		print "<th width='25%'>".getMLText("comment")."</th>\n";
-		print "<th width='15%'>".getMLText("status")."</th>\n";
-		print "<th width='20%'></th>\n";
-		print "</tr></thead><tbody>\n";
-		print "<tr>\n";
-		print "<td><ul class=\"actions\">";
-
-		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">".getMLText("download")."</a></li>";
-			if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\"><img src=\"images/view.gif\" class=\"mimeicon\">" . getMLText("view_online") . "</a></li>";
-		}else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></li>";
-
-		print "</ul></td>\n";
-		print "<td>".$latestContent->getVersion()."</td>\n";
-
-		print "<td><ul class=\"documentDetail\">\n";
-		print "<li>".$latestContent->getOriginalFileName() ."</li>\n";
-
-		if ($file_exists)
-			print "<li>". formatted_size(filesize($dms->contentDir . $latestContent->getPath())) ." ".htmlspecialchars($latestContent->getMimeType())."</li>";
-		else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>";
-
-		$updatingUser = $latestContent->getUser();
-		print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
-		print "<li>".getLongReadableDate($latestContent->getDate())."</li>";
-
-		print "</ul>\n";
-		print "<ul class=\"documentDetail\">\n";
-		$attributes = $latestContent->getAttributes();
-		if($attributes) {
-			foreach($attributes as $attribute) {
-				$attrdef = $attribute->getAttributeDefinition();
-				print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars($attribute->getValue())."</li>\n";
-			}
-		}
-		print "</ul>\n";
-
-		print "<td>".htmlspecialchars($latestContent->getComment())."</td>";
-
-		print "<td width='10%'>".getOverallStatusText($status["status"]);
-		if ( $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP || $status["status"]==S_EXPIRED ){
-			print "<br><span".($document->hasExpired()?" class=\"warning\" ":"").">".(!$document->getExpires() ? getMLText("does_not_expire") : getMLText("expires").": ".getReadableDate($document->getExpires()))."</span>";
-		}
-		print "</td>";
-
-		print "<td>";
-
-		print "<ul class=\"actions\">";
-		/* Only admin has the right to remove version in any case or a regular
-		 * user if enableVersionDeletion is on
-		 */
-		if($accessop->mayRemoveVersion()) {
-			print "<li><a href=\"out.RemoveVersion.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\">".getMLText("rm_version")."</a></li>";
-		}
-		if($accessop->mayOverwriteStatus()) {
-			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'>".getMLText("change_status")."</a></li>";
-		}
-		// Allow changing reviewers/approvals only if not reviewed
-		if($accessop->maySetReviewersApprovers()) {
-			print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'>".getMLText("change_assignments")."</a></li>";
-		}
-		if($accessop->maySetExpires()) {
-			print "<li><a href='../out/out.SetExpires.php?documentid=".$documentid."'>".getMLText("set_expiry")."</a></li>";
-		}
-		if($accessop->mayEditComment()) {
-			print "<li><a href=\"out.EditComment.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\">".getMLText("edit_comment")."</a></li>";
-		}
-		if($accessop->mayEditAttributes()) {
-			print "<li><a href=\"out.EditAttributes.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\">".getMLText("edit_attributes")."</a></li>";
-		}
-
-		print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&vfile=1\">".getMLText("versioning_info")."</a></li>";	
-
-		print "</ul>";
-		echo "</td>";
-		print "</tr></tbody>\n</table>\n";
-
-		print "<table class=\"folderView\">\n";
-
-		if (is_array($reviewStatus) && count($reviewStatus)>0) {
-
-			print "<tr><td colspan=5>\n";
-			$this->contentSubHeading(getMLText("reviewers"));
-			print "</tr>";
-			
-			print "<tr>\n";
-			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
-			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";
-			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
-			print "<td width='15%'><b>".getMLText("status")."</b></td>\n";
-			print "<td width='20%'></td>\n";
-			print "</tr>\n";
-
-			foreach ($reviewStatus as $r) {
-				$required = null;
-				$is_reviewer = false;
-				switch ($r["type"]) {
-					case 0: // Reviewer is an individual.
-						$required = $dms->getUser($r["required"]);
-						if (!is_object($required)) {
-							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
-						}
-						else {
-							$reqName = htmlspecialchars($required->getFullName());
-						}
-						if($r["required"] == $user->getId())
-							$is_reviewer = true;
-						break;
-					case 1: // Reviewer is a group.
-						$required = $dms->getGroup($r["required"]);
-						if (!is_object($required)) {
-							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
-						}
-						else {
-							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-							if($required->isMember($user) && ($user->getId() != $owner->getId()))
-								$is_reviewer = true;
-						}
-						break;
-				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"documentDetail\"><li>".$r["date"]."</li>";
-				/* $updateUser is the user who has done the review */
-				$updateUser = $dms->getUser($r["userID"]);
-				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()) : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
-				print "<td>".htmlspecialchars($r["comment"])."</td>\n";
-				print "<td>".getReviewStatusText($r["status"])."</td>\n";
-				print "<td><ul class=\"actions\">";
-
-				if($accessop->mayReview()) {
-					if ($is_reviewer && $r["status"]==0) {
-						print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\">".getMLText("submit_review")."</a></li>";
-					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-						print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\">".getMLText("edit")."</a></li>";
-					}
-				}
-				
-				print "</ul></td>\n";	
-				print "</td>\n</tr>\n";
-			}
-		}
-
-		if (is_array($approvalStatus) && count($approvalStatus)>0) {
-
-			print "<tr><td colspan=5>\n";
-			$this->contentSubHeading(getMLText("approvers"));
-			print "</tr>";
-
-			print "<tr>\n";
-			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
-			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";	
-			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
-			print "<td width='15%'><b>".getMLText("status")."</b></td>\n";
-			print "<td width='20%'></td>\n";
-			print "</tr>\n";
-
-			foreach ($approvalStatus as $a) {
-				$required = null;
-				$is_approver = false;
-				switch ($a["type"]) {
-					case 0: // Approver is an individual.
-						$required = $dms->getUser($a["required"]);
-						if (!is_object($required)) {
-							$reqName = getMLText("unknown_user")." '".$a["required"]."'";
-						}
-						else {
-							$reqName = htmlspecialchars($required->getFullName());
-						}
-						if($a["required"] == $user->getId())
-							$is_approver = true;
-						break;
-					case 1: // Approver is a group.
-						$required = $dms->getGroup($a["required"]);
-						if (!is_object($required)) {
-							$reqName = getMLText("unknown_group")." '".$a["required"]."'";
-						}
-						else {
-							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-						}
-						if($required->isMember($user) && ($user->getId() != $owner->getId()))
-							$is_approver = true;
-						break;
-				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"documentDetail\"><li>".$a["date"]."</li>";
-				/* $updateUser is the user who has done the approval */
-				$updateUser = $dms->getUser($a["userID"]);
-				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()) : "unknown user id '".$a["userID"]."'")."</li></ul></td>";	
-				print "<td>".htmlspecialchars($a["comment"])."</td>\n";
-				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
-				print "<td><ul class=\"actions\">";
-			
-				if($accessop->mayApprove()) {
-					if ($is_approver && $status["status"]==S_DRAFT_APP) {
-						print "<li><a href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("submit_approval")."</a></li>";
-					}else if (($updateUser==$user)&&(($a["status"]==1)||($a["status"]==-1))&&(!$document->hasExpired())){
-						print "<li><a href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."</a></li>";
-					}
-				}
-				
-				print "</ul></td>\n";	
-				print "</td>\n</tr>\n";
-			}
-		}
-
-		print "</table>\n";
-
-		$this->contentContainerEnd();
-
-		$this->contentHeading(getMLText("previous_versions"));
-		$this->contentContainerStart();
-
-		if (count($versions)>1) {
-
-			print "<table class=\"folderView\">";
-			print "<thead>\n<tr>\n";
-			print "<th width='10%'></th>\n";
-			print "<th width='10%'>".getMLText("version")."</th>\n";
-			print "<th width='20%'>".getMLText("file")."</th>\n";
-			print "<th width='25%'>".getMLText("comment")."</th>\n";
-			print "<th width='15%'>".getMLText("status")."</th>\n";
-			print "<th width='20%'></th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			for ($i = count($versions)-2; $i >= 0; $i--) {
-				$version = $versions[$i];
-				$vstat = $version->getStatus();
-				
-				// verify if file exists
-				$file_exists=file_exists($dms->contentDir . $version->getPath());
-				
-				print "<tr>\n";
-				print "<td><ul class=\"actions\">";
-				if ($file_exists){
-					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\"><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">".getMLText("download")."</a>";
-					if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes))
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\"><img src=\"images/view.gif\" class=\"mimeicon\">" . getMLText("view_online") . "</a>";
-				}else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				
-				print "</ul></td>\n";
-				print "<td>".$version->getVersion()."</td>\n";
-				print "<td><ul class=\"documentDetail\">\n";
-				print "<li>".$version->getOriginalFileName()."</li>\n";
-				if ($file_exists) print "<li>". formatted_size(filesize($dms->contentDir . $version->getPath())) ." ".htmlspecialchars($version->getMimeType())."</li>";
-				else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>";
-				$updatingUser = $version->getUser();
-				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
-				print "<li>".getLongReadableDate($version->getDate())."</li>";
-				print "</ul>\n";
-				print "<ul class=\"documentDetail\">\n";
-				$attributes = $version->getAttributes();
-				if($attributes) {
-					foreach($attributes as $attribute) {
-						$attrdef = $attribute->getAttributeDefinition();
-						print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars($attribute->getValue())."</li>\n";
-					}
-				}
-				print "</ul>\n";
-				print "<td>".htmlspecialchars($version->getComment())."</td>";
-				print "<td>".getOverallStatusText($vstat["status"])."</td>";
-				print "<td>";
-				print "<ul class=\"actions\">";
-				/* Only admin has the right to remove version in any case or a regular
-				 * user if enableVersionDeletion is on
-				 */
-				if($accessop->mayRemoveVersion()) {
-					print "<li><a href=\"out.RemoveVersion.php?documentid=".$documentid."&version=".$version->getVersion()."\">".getMLText("rm_version")."</a></li>";
-				}
-				print "<li><a href='../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version->getVersion()."'>".getMLText("details")."</a></li>";
-				print "</ul>";
-				print "</td>\n</tr>\n";
-			}
-			print "</tbody>\n</table>\n";
-		}
-		else printMLText("no_previous_versions");
-
-		$this->contentContainerEnd();
-
-		$this->contentHeading(getMLText("linked_files"));
-		$this->contentContainerStart();
-
-		$files = $document->getDocumentFiles();
-
-		if (count($files) > 0) {
-
-			print "<table class=\"folderView\">";
-			print "<thead>\n<tr>\n";
-			print "<th width='20%'></th>\n";
-			print "<th width='20%'>".getMLText("file")."</th>\n";
-			print "<th width='40%'>".getMLText("comment")."</th>\n";
-			print "<th width='20%'></th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			foreach($files as $file) {
-
-				$file_exists=file_exists($dms->contentDir . $file->getPath());
-				
-				$responsibleUser = $file->getUser();
-
-				print "<tr>";
-				print "<td><ul class=\"actions\">";
-				if ($file_exists) {
-					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">".htmlspecialchars($file->getName())."</a>";
-					if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes))
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">" . getMLText("view_online") . "</a></li>";
-				} else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
-				print "</ul></td>";
-				
-				print "<td><ul class=\"documentDetail\">\n";
-				print "<li>".$file->getOriginalFileName() ."</li>\n";
-				if ($file_exists)
-					print "<li>". filesize($dms->contentDir . $file->getPath()) ." bytes ".htmlspecialchars($file->getMimeType())."</li>";
-				else print "<li>".htmlspecialchars($file->getMimeType())." - <span class=\"warning\">".getMLText("document_deleted")."</span></li>";
-
-				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$responsibleUser->getEmail()."\">".htmlspecialchars($responsibleUser->getFullName())."</a></li>";
-				print "<li>".getLongReadableDate($file->getDate())."</li>";
-
-				print "<td>".htmlspecialchars($file->getComment())."</td>";
-			
-				print "<td><span class=\"actions\">";
-				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID()))
-					print "<form action=\"../out/out.RemoveDocumentFile.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"fileid\" value=\"".$file->getID()."\" /><input type=\"submit\" value=\"".getMLText("delete")."\" /></form>";
-				print "</span></td>";		
-				
-				print "</tr>";
-			}
-			print "</tbody>\n</table>\n";	
-
-		}
-		else printMLText("no_attached_files");
-
-		if ($document->getAccessMode($user) >= M_READWRITE){
-			print "<br>";
-			print "<ul class=\"actions\"><li><a href=\"../out/out.AddFile.php?documentid=".$documentid."\">".getMLText("add")."</a></ul>\n";
-		}
-		$this->contentContainerEnd();
-
-
-		$this->contentHeading(getMLText("linked_documents"));
-		$this->contentContainerStart();
-		$links = $document->getDocumentLinks();
-		$links = SeedDMS_Core_DMS::filterDocumentLinks($user, $links);
-
-		if (count($links) > 0) {
-
-			print "<table class=\"folderView\">";
-			print "<thead>\n<tr>\n";
-			print "<th width='40%'></th>\n";
-			print "<th width='25%'>".getMLText("comment")."</th>\n";
-			print "<th width='15%'>".getMLText("document_link_by")."</th>\n";
-			print "<th width='20%'></th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			foreach($links as $link) {
-				$responsibleUser = $link->getUser();
-				$targetDoc = $link->getTarget();
-
-				print "<tr>";
-				print "<td><a href=\"out.ViewDocument.php?documentid=".$targetDoc->getID()."\" class=\"linklist\">".htmlspecialchars($targetDoc->getName())."</a></td>";
-				print "<td>".htmlspecialchars($targetDoc->getComment())."</td>";
-				print "<td>".htmlspecialchars($responsibleUser->getFullName());
-				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<br>".getMLText("document_link_public").":".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
-				print "</td>";
-				print "<td><span class=\"actions\">";
-				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><input type=\"submit\" value=\"".getMLText("delete")."\" /></form>";
-				print "</span></td>";
-				print "</tr>";
-			}
-			print "</tbody>\n</table>\n";
-		}
-		else printMLText("no_linked_files");
-
-		if (!$user->isGuest()){
-		?>
-			<br>
-			<form action="../op/op.AddDocumentLink.php" name="form1">
-			<input type="Hidden" name="documentid" value="<?php print $documentid;?>">
-			<table>
-			<tr>
-			<td><?php printMLText("add_document_link");?>:</td>
-			<td><?php $this->printDocumentChooser("form1");?></td>
-			</tr>
-			<?php
-			if ($document->getAccessMode($user) >= M_READWRITE) {
-				print "<tr><td>".getMLText("document_link_public")."</td>";
-				print "<td><ul class=\"actions\">";
-				print "<li><input type=\"Radio\" name=\"public\" value=\"true\" checked>" . getMLText("yes")."</li>";
-				print "<li><input type=\"Radio\" name=\"public\" value=\"false\">" . getMLText("no")."</li>";
-				print "</ul></td></tr>";
-			}
-			?>
-			<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("update");?>"></td>
-			</tr>
-			</table>
-			</form>
-		<?php
-		}
-		$this->contentContainerEnd();
-
-		$this->contentEnd();
-		$this->htmlEndPage();
-
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ViewEvent.php b/views/blue/class.ViewEvent.php
deleted file mode 100644
index 87d048a25..000000000
--- a/views/blue/class.ViewEvent.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Implementation of ViewEvent view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ViewEvent view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ViewEvent extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$event = $this->params['event'];
-
-		$this->htmlStartPage(getMLText("calendar"));
-		$this->globalNavigation();
-		$this->pageNavigation(getMLText("calendar"), "calendar");
-
-		$this->contentHeading(getMLText("event_details"));
-		$this->contentContainerStart();
-
-		$u=$dms->getUser($event["userID"]);
-
-		echo "<table>";
-
-		echo "<tr>";
-		echo "<td>".getMLText("name").": </td>";
-		echo "<td>".htmlspecialchars($event["name"])."</td>";
-		echo "</tr>";
-
-		echo "<tr>";
-		echo "<td>".getMLText("comment").": </td>";
-		echo "<td>".htmlspecialchars($event["comment"])."</td>";
-		echo "</tr>";
-
-		echo "<tr>";
-		echo "<td>".getMLText("from").": </td>";
-		echo "<td>".getReadableDate($event["start"])."</td>";
-		echo "</tr>";
-
-		echo "<tr>";
-		echo "<td>".getMLText("to").": </td>";
-		echo "<td>".getReadableDate($event["stop"])."</td>";
-		echo "</tr>";
-
-		echo "<tr>";
-		echo "<td>".getMLText("last_update").": </td>";
-		echo "<td>".getLongReadableDate($event["date"])."</td>";
-		echo "</tr>";
-
-		echo "<tr>";
-		echo "<td>".getMLText("user").": </td>";
-		echo "<td>".(is_object($u)?htmlspecialchars($u->getFullName()):getMLText("unknown_user"))."</td>";
-		echo "</tr>";
-
-		echo "</table>";
-
-		$this->contentContainerEnd();
-
-		if (($user->getID()==$event["userID"])||($user->isAdmin())){
-
-			$this->contentHeading(getMLText("edit"));
-			$this->contentContainerStart();
-
-			print "<ul class=\"actions\">";
-			print "<li><a href=\"../out/out.RemoveEvent.php?id=".$event["id"]."\">".getMLText("delete")."</a>";
-			print "<li><a href=\"../out/out.EditEvent.php?id=".$event["id"]."\">".getMLText("edit")."</a>";
-			print "</ul>";
-			
-			$this->contentContainerEnd();
-		}
-
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>
diff --git a/views/blue/class.ViewFolder.php b/views/blue/class.ViewFolder.php
deleted file mode 100644
index 19f2c9a97..000000000
--- a/views/blue/class.ViewFolder.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Implementation of ViewFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.BlueStyle.php");
-
-/**
- * Class which outputs the html page for ViewFolder view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_ViewFolder extends SeedDMS_Blue_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-		$orderby = $this->params['orderby'];
-		$enableFolderTree = $this->params['enableFolderTree'];
-		$showtree = $this->params['showtree'];
-
-		$folderid = $folder->getId();
-
-		$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
-
-		$this->globalNavigation($folder);
-		$this->contentStart();
-		$this->pageNavigation(getFolderPathHTML($folder), "view_folder", $folder);
-
-		if ($enableFolderTree) $this->printTreeNavigation($folderid,$showtree);
-
-		$this->contentHeading(getMLText("folder_infos"));
-
-		$owner = $folder->getOwner();
-		$this->contentContainerStart();
-		print "<table>\n<tr>\n".
-					"<td>".getMLText("owner").":</td>\n".
-					"<td><a class=\"infos\" href=\"mailto:".htmlspecialchars($owner->getEmail())."\">".htmlspecialchars($owner->getFullName())."</a>".
-					"</td>\n</tr>\n<tr>\n".
-					"<td>".getMLText("comment").":</td>\n".
-					"<td>".htmlspecialchars($folder->getComment())."</td>\n</tr>\n";
-		$attributes = $folder->getAttributes();
-		if($attributes) {
-			foreach($attributes as $attribute) {
-				$attrdef = $attribute->getAttributeDefinition();
-		?>
-				<tr>
-					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td><?php echo htmlspecialchars($attribute->getValue()); ?></td>
-				</tr>
-		<?php
-			}
-		}
-		echo "</table>\n";
-		$this->contentContainerEnd();
-
-		$this->contentHeading(getMLText("folder_contents"));
-		$this->contentContainerStart();
-
-		$subFolders = $folder->getSubFolders($orderby);
-		$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
-		$documents = $folder->getDocuments($orderby);
-		$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
-
-		if ((count($subFolders) > 0)||(count($documents) > 0)){
-			print "<table class=\"folderView\">";
-			print "<thead>\n<tr>\n";
-			print "<th></th>\n";	
-			print "<th><a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"?"":"&orderby=n")."\">".getMLText("name")."</a></th>\n";
-			print "<th>".getMLText("owner")."</th>\n";
-			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("version")."</th>\n";
-			print "<th>".getMLText("comment")."</th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-		}
-		else printMLText("empty_notify_list");
-
-
-		foreach($subFolders as $subFolder) {
-
-			$owner = $subFolder->getOwner();
-			$comment = $subFolder->getComment();
-			if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "...";
-			$subsub = $subFolder->getSubFolders();
-			$subsub = SeedDMS_Core_DMS::filterAccess($subsub, $user, M_READ);
-			$subdoc = $subFolder->getDocuments();
-			$subdoc = SeedDMS_Core_DMS::filterAccess($subdoc, $user, M_READ);
-			
-			print "<tr class=\"folder\">";
-		//	print "<td><img src=\"images/folder_closed.gif\" width=18 height=18 border=0></td>";
-			print "<td><a href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img src=\"images/folder_closed.gif\" width=18 height=18 border=0></a></td>\n";
-			print "<td><a href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a></td>\n";
-			print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-			print "<td colspan=\"1\"><small>".count($subsub)." ".getMLText("folders").", ".count($subdoc)." ".getMLText("documents")."</small></td>";
-			print "<td></td>";
-			print "<td>".htmlspecialchars($comment)."</td>";
-			print "</tr>\n";
-		}
-
-		foreach($documents as $document) {
-
-			$owner = $document->getOwner();
-			$comment = $document->getComment();
-			if (strlen($comment) > 50) $comment = substr($comment, 0, 47) . "...";
-			$docID = $document->getID();
-			if($latestContent = $document->getLatestContent()) {
-				$version = $latestContent->getVersion();
-				$status = $latestContent->getStatus();
-				
-				print "<tr>";
-
-				if (file_exists($dms->contentDir . $latestContent->getPath()))
-					print "<td><a href=\"../op/op.Download.php?documentid=".$docID."&version=".$version."\"><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></a></td>";
-				else print "<td><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
-				
-				print "<td><a href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>";
-				if ( $document->isLocked() ) {
-					print "<img src=\"".$this->getImgPath("lock.png")."\" title=\"". getMLText("locked_by").": ".htmlspecialchars($document->getLockingUser()->getFullName())."\"> ";
-				}
-				print getOverallStatusText($status["status"])."</td>";
-				print "<td>".$version."</td>";
-				print "<td>".htmlspecialchars($comment)."</td>";
-				print "</tr>\n";
-			}
-		}
-
-		if ((count($subFolders) > 0)||(count($documents) > 0)) echo "</tbody>\n</table>\n";
-
-		$this->contentContainerEnd();
-
-		if ($enableFolderTree) print "</td></tr></table>";
-
-		$this->contentEnd();
-
-		$this->htmlEndPage();
-	} /* }}} */
-}
-
-?>

From 87eb1e0dc9eec83be60df2b0c94d61acc5af91f2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 08:39:44 +0200
Subject: [PATCH 0145/2006] turn off by default

---
 ext/example/conf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/example/conf.php b/ext/example/conf.php
index 6f9f09827..c6fd2ce56 100644
--- a/ext/example/conf.php
+++ b/ext/example/conf.php
@@ -2,7 +2,7 @@
 $EXT_CONF['example'] = array(
 	'title' => 'Example Extension',
 	'description' => 'This sample extension demonstrate the use of various hooks',
-	'disable' => false,
+	'disable' => true,
 	'version' => '1.0.0',
 	'releasedate' => '2013-05-03',
 	'author' => array('name'=>'Uwe Steinmann', 'email'=>'uwe@steinmann.cx', 'company'=>'MMK GmbH'),

From 68e3045da2dae5efcde17e0bb1c91821d6c541de Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 08:40:03 +0200
Subject: [PATCH 0146/2006] make table condensed to save some space

---
 views/bootstrap/class.ViewFolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index feed7f3bd..d54c58a76 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -248,7 +248,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			if(is_string($txt))
 				echo $txt;
 			else {
-				print "<table id=\"viewfolder-table\" class=\"table\">";
+				print "<table id=\"viewfolder-table\" class=\"table table-condensed\">";
 				print "<thead>\n<tr>\n";
 				print "<th></th>\n";	
 				print "<th><a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"?"&orderby=s":"&orderby=n")."\">".getMLText("name")."</a></th>\n";

From 4e15fee3fb5e70ec12624f8148809b2805f51084 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 14:01:02 +0200
Subject: [PATCH 0147/2006] set url for notifaction mail

---
 op/op.ReviewDocument.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 84054723e..082ea758f 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -110,6 +110,7 @@ if ($_POST["reviewType"] == "ind" || $_POST["reviewType"] == "grp") {
 		$params['status'] = getReviewStatusText($_POST["reviewStatus"]);
 		$params['comment'] = strip_tags($_POST['comment']);
 		$params['username'] = $user->getFullName();
+		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
 		$notifier->toList($user, $nl["users"], $subject, $message, $params);
@@ -133,6 +134,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['status'] = getReviewStatusText(S_REJECTED);
 		$params['username'] = $user->getFullName();
+		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
 		$notifier->toList($user, $nl["users"], $subject, $message, $params);

From ed5a5bb069d6ac67c0ed3798ed7871730cf09daf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 14:01:23 +0200
Subject: [PATCH 0148/2006] fix typo in variable name

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 07a608ef6..8bb5863b6 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3820,7 +3820,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$indstatus = array_pop($revisionStatus[$field]);
 
 		/* check if revision workflow has been started already */
-		if($indstatusi['status'] == S_LOG_SLEEPING && ($status == S_LOG_REJECTED || $status == S_LOG_ACCEPTED))
+		if($indstatus['status'] == S_LOG_SLEEPING && ($status == S_LOG_REJECTED || $status == S_LOG_ACCEPTED))
 			return -5;
 
 		if ($indstatus["status"] == -2) {

From 34bd22f40eebe462f318fe86d711cea785e6c542 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 14:01:56 +0200
Subject: [PATCH 0149/2006] separate busines logic into controller

---
 controllers/class.ReviseDocument.php | 112 ++++++++++++++++++++
 op/op.ReviseDocument.php             | 149 ++++++++-------------------
 2 files changed, 153 insertions(+), 108 deletions(-)
 create mode 100644 controllers/class.ReviseDocument.php

diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php
new file mode 100644
index 000000000..a064db329
--- /dev/null
+++ b/controllers/class.ReviseDocument.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Implementation of ReviseDocument controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for downloading a document
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$document = $this->params['document'];
+		$content = $this->params['content'];
+		$revisionstatus = $this->params['revisionstatus'];
+		$revisiontype = $this->params['revisiontype'];
+		$group = $this->params['group'];
+		$comment = $this->params['comment'];
+
+		/* Get the document id and name before removing the document */
+		$docname = $document->getName();
+		$documentid = $document->getID();
+
+		if(!$this->callHook('preReviseDocument', $document)) {
+		}
+
+		$result = $this->callHook('reviseDocument', $document);
+		if($result === null) {
+
+			if ($revisiontype == "ind") {
+				if(0 > $content->setRevision($user, $user, $revisionstatus, $comment)) {
+					$this->error = 1;
+					$this->errormsg = "revision_update_failed";
+					return false;
+				}
+			} elseif ($revisiontype == "grp") {
+				if(0 > $content->setRevision($group, $user, $revisionstatus, $comment)) {
+					$this->error = 1;
+					$this->errormsg = "revision_update_failed";
+					return false;
+				}
+			}
+		}
+
+		/* Check to see if the overall status for the document version needs to be
+		 * updated.
+		 */
+		$result = $this->callHook('reviseUpdateDocumentStatus', $document);
+		if($result === null) {
+			if ($revisionstatus == -1){
+				if($content->setStatus(S_REJECTED,$comment,$user)) {
+					$this->error = 1;
+					$this->errormsg = "revision_update_failed";
+					return false;
+				}
+			} else {
+				$docRevisionStatus = $content->getRevisionStatus();
+				if (is_bool($docRevisionStatus) && !$docRevisionStatus) {
+					$this->error = 1;
+					$this->errormsg = "cannot_retrieve_revision_snapshot";
+					return false;
+				}
+				$revisionCT = 0;
+				$revisionTotal = 0;
+				foreach ($docRevisionStatus as $drstat) {
+					if ($drstat["status"] == 1) {
+						$revisionCT++;
+					}
+					if ($drstat["status"] != -2) {
+						$revisionTotal++;
+					}
+				}
+				// If all revisions have been received and there are no rejections,
+				// then release the document otherwise put it back into revision workflow
+				if ($revisionCT == $revisionTotal) {
+					$newStatus=S_RELEASED;
+					if ($content->finishRevision($user, $newStatus, '', getMLText("automatic_status_update"))) {
+					}
+				} else {
+					$newStatus=S_IN_REVISION;
+					if($content->setStatus($newStatus,$comment,$user)) {
+						$this->error = 1;
+						$this->errormsg = "revision_update_failed";
+						return false;
+					}
+				}
+			}
+		}
+
+		if(!$this->callHook('postReviseDocument', $document)) {
+		}
+
+		return true;
+	}
+}
+
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index ec035177a..2ef633378 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -28,6 +28,10 @@ include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('revisedocument')) {
@@ -45,6 +49,8 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+$folder = $document->getFolder();
+
 if ($document->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
@@ -66,6 +72,7 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
+$olddocstatus = $content->getStatus();
 // verify if document has expired
 if ($document->hasExpired()){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
@@ -76,23 +83,24 @@ if (!isset($_POST["revisionStatus"]) || !is_numeric($_POST["revisionStatus"]) ||
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_revision_status"));
 }
 
-if ($_POST["revisionType"] == "ind") {
-	$comment = $_POST["comment"];
-	$revisionLogID = $latestContent->setRevision($user, $user, $_POST["revisionStatus"], $comment);
-} elseif ($_POST["revisionType"] == "grp") {
-	$comment = $_POST["comment"];
+$controller->setParam('document', $document);
+$controller->setParam('content', $latestContent);
+$controller->setParam('revisionstatus', $_POST["revisionStatus"]);
+$controller->setParam('revisiontype', $_POST["revisionType"]);
+if ($_POST["revisionType"] == "grp") {
 	$group = $dms->getGroup($_POST['revisionGroup']);
-	$revisionLogID = $latestContent->setRevision($group, $user, $_POST["revisionStatus"], $comment);
+} else {
+	$group = null;
+}
+$controller->setParam('group', $group);
+$controller->setParam('comment', $_POST["comment"]);
+if(!$controller->run()) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
 
-if(0 > $revisionLogID) {
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("revision_update_failed"));
-} else {
-	// Send an email notification to the document updater.
+if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
 	if($notifier) {
 		$nl=$document->getNotifyList();
-		$folder = $document->getFolder();
-
 		$subject = "revision_submit_email_subject";
 		$message = "revision_submit_email_body";
 		$params = array();
@@ -100,7 +108,7 @@ if(0 > $revisionLogID) {
 		$params['version'] = $version;
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['status'] = getRevisionStatusText($_POST["revisionStatus"]);
-		$params['comment'] = $comment;
+		$params['comment'] = strip_tags($_POST['comment']);
 		$params['username'] = $user->getFullName();
 		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
@@ -113,102 +121,27 @@ if(0 > $revisionLogID) {
 	}
 }
 
-/* Check to see if the overall status for the document version needs
- * to be updated.
- */
-if ($_POST["revisionStatus"] == -1){
-
-	if($content->setStatus(S_REJECTED,$comment,$user)) {
-		// Send notification to subscribers.
-		if($notifier) {
-			$nl=$document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_status_changed_email_subject";
-			$message = "document_status_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getRevisionStatusText(S_REJECTED);
-			$params['username'] = $user->getFullName();
-			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $nl["users"], $subject, $message, $params);
-			foreach ($nl["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
-			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
-		}
-	}
-
-} else {
-
-	$docRevisionStatus = $content->getRevisionStatus();
-	if (is_bool($docRevisionStatus) && !$docRevisionStatus) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_retrieve_revision_snapshot"));
-	}
-	$revisionCT = 0;
-	$revisionTotal = 0;
-	foreach ($docRevisionStatus as $drstat) {
-		if ($drstat["status"] == 1) {
-			$revisionCT++;
-		}
-		if ($drstat["status"] != -2) {
-			$revisionTotal++;
-		}
-	}
-	// If all revisions have been received and there are no rejections,
-	// then release the document otherwise put it back into revision workflow
-	if ($revisionCT == $revisionTotal) {
-		$newStatus=S_RELEASED;
-		if ($content->finishRevision($user, $newStatus, '', getMLText("automatic_status_update"))) {
-			// Send notification to subscribers.
-			if($notifier) {
-				$nl=$document->getNotifyList();
-				$folder = $document->getFolder();
-				$subject = "document_status_changed_email_subject";
-				$message = "document_status_changed_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['status'] = getRevisionStatusText($newStatus);
-				$params['username'] = $user->getFullName();
-				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-				$notifier->toList($user, $nl["users"], $subject, $message, $params);
-				foreach ($nl["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
-				}
-			}
-		}
-	} else {
-		/* Setting the status to S_IN_REVISION though it is already in that
-		 * status doesn't harm, as setStatus() will catch it.
-		 */
-		$newStatus=S_IN_REVISION;
-		if($content->setStatus($newStatus,$comment,$user)) {
-			// Send notification to subscribers.
-			if($notifier) {
-				$nl=$document->getNotifyList();
-				$folder = $document->getFolder();
-				$subject = "document_status_changed_email_subject";
-				$message = "document_status_changed_email_body";
-				$params = array();
-				$params['name'] = $document->getName();
-				$params['folder_path'] = $folder->getFolderPathPlain();
-				$params['status'] = getRevisionStatusText($newStatus);
-				$params['username'] = $user->getFullName();
-				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-				$params['sitename'] = $settings->_siteName;
-				$params['http_root'] = $settings->_httpRoot;
-				$notifier->toList($user, $nl["users"], $subject, $message, $params);
-				foreach ($nl["groups"] as $grp) {
-					$notifier->toGroup($user, $grp, $subject, $message, $params);
-				}
-				$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
-			}
+/* Send notification about status change only if status has actually changed */
+$newdocstatus = $content->getStatus();
+if($olddocstatus['status'] != $newdocstatus['status']) {
+	// Send notification to subscribers.
+	if($notifier) {
+		$nl=$document->getNotifyList();
+		$subject = "document_status_changed_email_subject";
+		$message = "document_status_changed_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getRevisionStatusText(S_REJECTED);
+		$params['username'] = $user->getFullName();
+		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params);
 		}
+		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
 	}
 }
 

From 45d3ebab3d745e448374511d082cc3e82957a5c1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 16:05:03 +0200
Subject: [PATCH 0150/2006] place business login into controller class

---
 controllers/class.ReceiptDocument.php | 67 +++++++++++++++++++++++++++
 op/op.ReceiptDocument.php             | 31 +++++++------
 2 files changed, 85 insertions(+), 13 deletions(-)
 create mode 100644 controllers/class.ReceiptDocument.php

diff --git a/controllers/class.ReceiptDocument.php b/controllers/class.ReceiptDocument.php
new file mode 100644
index 000000000..60b4d5c34
--- /dev/null
+++ b/controllers/class.ReceiptDocument.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Implementation of ReceiptDocument controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for downloading a document
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_ReceiptDocument extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$document = $this->params['document'];
+		$content = $this->params['content'];
+		$receiptstatus = $this->params['receiptstatus'];
+		$receipttype = $this->params['receipttype'];
+		$group = $this->params['group'];
+		$comment = $this->params['comment'];
+
+		/* Get the document id and name before removing the document */
+		$docname = $document->getName();
+		$documentid = $document->getID();
+
+		if(!$this->callHook('preReceiptDocument', $document)) {
+		}
+
+		$result = $this->callHook('receiptDocument', $document);
+		if($result === null) {
+
+			if ($receipttype == "ind") {
+				if(0 > $content->setReceiptByInd($user, $user, $receiptstatus, $comment)) {
+					$this->error = 1;
+					$this->errormsg = "receipt_update_failed";
+					return false;
+				}
+			} elseif ($receipttype == "grp") {
+				if(0 > $content->setReceiptByGrp($group, $user, $receiptstatus, $comment)) {
+					$this->error = 1;
+					$this->errormsg = "receipt_update_failed";
+					return false;
+				}
+			}
+		}
+
+		if(!$this->callHook('postReceiptDocument', $document)) {
+		}
+
+		return true;
+	}
+}
+
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index 7b408bf94..509e3938c 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -28,6 +28,10 @@ include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('receiptdocument')) {
@@ -45,6 +49,8 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+$folder = $document->getFolder();
+
 if ($document->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
@@ -76,20 +82,19 @@ if (!isset($_POST["receiptStatus"]) || !is_numeric($_POST["receiptStatus"]) ||
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_receipt_status"));
 }
 
-if ($_POST["receiptType"] == "ind") {
-
-	$comment = $_POST["comment"];
-	$receiptLogID = $latestContent->setReceiptByInd($user, $user, $_POST["receiptStatus"], $comment);
-	if(0 > $receiptLogID) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("receipt_update_failed"));
-	}
-} elseif ($_POST["receiptType"] == "grp") {
-	$comment = $_POST["comment"];
+$controller->setParam('document', $document);
+$controller->setParam('content', $latestContent);
+$controller->setParam('receiptstatus', $_POST["receiptStatus"]);
+$controller->setParam('receipttype', $_POST["receiptType"]);
+if ($_POST["receiptType"] == "grp") {
 	$group = $dms->getGroup($_POST['receiptGroup']);
-	$receiptLogID = $latestContent->setReceiptByGrp($group, $user, $_POST["receiptStatus"], $comment);
-	if(0 > $receiptLogID) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("receipt_update_failed"));
-	}
+} else {
+	$group = null;
+}
+$controller->setParam('group', $group);
+$controller->setParam('comment', $_POST["comment"]);
+if(!$controller->run()) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
 
 header("Location:../out/out.ViewDocument.php?documentid=".$documentid);

From 312e619fa6d43c2aa487feeda6a01bf667e5486b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 17:33:12 +0200
Subject: [PATCH 0151/2006] take out echo, remove $limit parameter from
 getStatus()

The $limit parameter has not been used and if if was used, the
method would have returned false in many cases because the number
records would have been > 1
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 8bb5863b6..17ab05cec 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2514,7 +2514,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$queryStr = "UPDATE tblDocumentContent SET revisiondate = CURRENT_TIMESTAMP WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
 		else
 			$queryStr = "UPDATE tblDocumentContent SET revisiondate = ".$db->qstr($date)." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
-		echo $queryStr;
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -2675,8 +2674,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * then its status is set to S_RELEASED immediately. Any change of
 	 * the status is monitored in the table tblDocumentStatusLog. This
 	 * function will always return the latest entry for the content.
+	 *
+	 * @return array latest record from tblDocumentStatusLog
 	 */
-	function getStatus($limit=1) { /* {{{ */
+	function getStatus() { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		if (!is_numeric($limit)) return false;
@@ -2684,20 +2685,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		// Retrieve the current overall status of the content represented by
 		// this object.
 		if (!isset($this->_status)) {
-		/*
-			if (!$db->createTemporaryTable("ttstatid", $forceTemporaryTable)) {
-				return false;
-			}
-			$queryStr="SELECT `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-				"`tblDocumentStatusLog`.`comment`, `tblDocumentStatusLog`.`date`, ".
-				"`tblDocumentStatusLog`.`userID` ".
-				"FROM `tblDocumentStatus` ".
-				"LEFT JOIN `tblDocumentStatusLog` USING (`statusID`) ".
-				"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-				"AND `tblDocumentStatus`.`documentID` = '". $this->_document->getID() ."' ".
-				"AND `tblDocumentStatus`.`version` = '". $this->_version ."' ";
-		*/
 			$queryStr=
 				"SELECT `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
 				"`tblDocumentStatusLog`.`comment`, `tblDocumentStatusLog`.`date`, ".
@@ -2706,7 +2693,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				"LEFT JOIN `tblDocumentStatusLog` USING (`statusID`) ".
 				"WHERE `tblDocumentStatus`.`documentID` = '". $this->_document->getID() ."' ".
 				"AND `tblDocumentStatus`.`version` = '". $this->_version ."' ".
-				"ORDER BY `tblDocumentStatusLog`.`statusLogID` DESC LIMIT ".(int) $limit;
+				"ORDER BY `tblDocumentStatusLog`.`statusLogID` DESC LIMIT 1";
 
 			$res = $db->getResultArray($queryStr);
 			if (is_bool($res) && !$res)

From c460c9e6742b082f9bab3f2316ec63515ab9c39c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 17:34:52 +0200
Subject: [PATCH 0152/2006] pass content not document to hooks

---
 controllers/class.ApproveDocument.php | 8 ++++----
 controllers/class.ReceiptDocument.php | 6 +++---
 controllers/class.ReviewDocument.php  | 8 ++++----
 controllers/class.ReviseDocument.php  | 8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/controllers/class.ApproveDocument.php b/controllers/class.ApproveDocument.php
index c101ba9c6..5296b6d5f 100644
--- a/controllers/class.ApproveDocument.php
+++ b/controllers/class.ApproveDocument.php
@@ -37,10 +37,10 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
 		$docname = $document->getName();
 		$documentid = $document->getID();
 
-		if(!$this->callHook('preApproveDocument', $document)) {
+		if(!$this->callHook('preApproveDocument', $content)) {
 		}
 
-		$result = $this->callHook('approveDocument', $document);
+		$result = $this->callHook('approveDocument', $content);
 		if($result === null) {
 			if ($approvaltype == "ind") {
 				if(0 > $content->setApprovalByInd($user, $user, $approvalstatus, $comment)) {
@@ -60,7 +60,7 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
 		/* Check to see if the overall status for the document version needs to be
 		 * updated.
 		 */
-		$result = $this->callHook('approveUpdateDocumentStatus', $document);
+		$result = $this->callHook('approveUpdateDocumentStatus', $content);
 		if($result === null) {
 			/* If document was rejected, set the document status to S_REJECTED right away */
 			if ($approvalstatus == -1){
@@ -94,7 +94,7 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
 			}
 		}
 
-		if(!$this->callHook('postApproveDocument', $document)) {
+		if(!$this->callHook('postApproveDocument', $content)) {
 		}
 
 		return true;
diff --git a/controllers/class.ReceiptDocument.php b/controllers/class.ReceiptDocument.php
index 60b4d5c34..83cc8deea 100644
--- a/controllers/class.ReceiptDocument.php
+++ b/controllers/class.ReceiptDocument.php
@@ -37,10 +37,10 @@ class SeedDMS_Controller_ReceiptDocument extends SeedDMS_Controller_Common {
 		$docname = $document->getName();
 		$documentid = $document->getID();
 
-		if(!$this->callHook('preReceiptDocument', $document)) {
+		if(!$this->callHook('preReceiptDocument', $content)) {
 		}
 
-		$result = $this->callHook('receiptDocument', $document);
+		$result = $this->callHook('receiptDocument', $content);
 		if($result === null) {
 
 			if ($receipttype == "ind") {
@@ -58,7 +58,7 @@ class SeedDMS_Controller_ReceiptDocument extends SeedDMS_Controller_Common {
 			}
 		}
 
-		if(!$this->callHook('postReceiptDocument', $document)) {
+		if(!$this->callHook('postReceiptDocument', $content)) {
 		}
 
 		return true;
diff --git a/controllers/class.ReviewDocument.php b/controllers/class.ReviewDocument.php
index aec1e7667..936503679 100644
--- a/controllers/class.ReviewDocument.php
+++ b/controllers/class.ReviewDocument.php
@@ -37,10 +37,10 @@ class SeedDMS_Controller_ReviewDocument extends SeedDMS_Controller_Common {
 		$docname = $document->getName();
 		$documentid = $document->getID();
 
-		if(!$this->callHook('preReviewDocument', $document)) {
+		if(!$this->callHook('preReviewDocument', $content)) {
 		}
 
-		$result = $this->callHook('reviewDocument', $document);
+		$result = $this->callHook('reviewDocument', $content);
 		if($result === null) {
 
 			if ($reviewtype == "ind") {
@@ -61,7 +61,7 @@ class SeedDMS_Controller_ReviewDocument extends SeedDMS_Controller_Common {
 		/* Check to see if the overall status for the document version needs to be
 		 * updated.
 		 */
-		$result = $this->callHook('reviewUpdateDocumentStatus', $document);
+		$result = $this->callHook('reviewUpdateDocumentStatus', $content);
 		if($result === null) {
 			if ($reviewstatus == -1){
 				if($content->setStatus(S_REJECTED,$comment,$user)) {
@@ -119,7 +119,7 @@ class SeedDMS_Controller_ReviewDocument extends SeedDMS_Controller_Common {
 			}
 		}
 
-		if(!$this->callHook('postReviewDocument', $document)) {
+		if(!$this->callHook('postReviewDocument', $content)) {
 		}
 
 		return true;
diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php
index a064db329..1720b270f 100644
--- a/controllers/class.ReviseDocument.php
+++ b/controllers/class.ReviseDocument.php
@@ -37,10 +37,10 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 		$docname = $document->getName();
 		$documentid = $document->getID();
 
-		if(!$this->callHook('preReviseDocument', $document)) {
+		if(!$this->callHook('preReviseDocument', $content)) {
 		}
 
-		$result = $this->callHook('reviseDocument', $document);
+		$result = $this->callHook('reviseDocument', $content);
 		if($result === null) {
 
 			if ($revisiontype == "ind") {
@@ -61,7 +61,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 		/* Check to see if the overall status for the document version needs to be
 		 * updated.
 		 */
-		$result = $this->callHook('reviseUpdateDocumentStatus', $document);
+		$result = $this->callHook('reviseUpdateDocumentStatus', $content);
 		if($result === null) {
 			if ($revisionstatus == -1){
 				if($content->setStatus(S_REJECTED,$comment,$user)) {
@@ -103,7 +103,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 			}
 		}
 
-		if(!$this->callHook('postReviseDocument', $document)) {
+		if(!$this->callHook('postReviseDocument', $content)) {
 		}
 
 		return true;

From 596a577529779b5758e97179ff3d6e2d130b2095 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 17:35:25 +0200
Subject: [PATCH 0153/2006] show link to revise document even if still in
 workflow

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 08174df6c..ed550e6d9 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -138,7 +138,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_EXPIRED)) {
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
 				return true;
 			}
 		}

From 142af5c218755ba018b5c378ba4e598c63d8e2ee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jun 2015 22:32:15 +0200
Subject: [PATCH 0154/2006] add several new phrases, some cleanup

---
 languages/ar_EG/lang.inc | 11 +++++++++--
 languages/bg_BG/lang.inc | 11 +++++++++--
 languages/ca_ES/lang.inc | 11 +++++++++--
 languages/cs_CZ/lang.inc | 15 +++++++++++----
 languages/de_DE/lang.inc | 27 +++++++++++++++++----------
 languages/en_GB/lang.inc | 27 +++++++++++++++++----------
 languages/es_ES/lang.inc | 17 ++++++++++++-----
 languages/fr_FR/lang.inc | 11 +++++++++--
 languages/hu_HU/lang.inc | 11 +++++++++--
 languages/it_IT/lang.inc | 11 +++++++++--
 languages/nl_NL/lang.inc | 11 +++++++++--
 languages/pl_PL/lang.inc | 11 +++++++++--
 languages/pt_BR/lang.inc | 11 +++++++++--
 languages/ro_RO/lang.inc | 11 +++++++++--
 languages/ru_RU/lang.inc | 11 +++++++++--
 languages/sk_SK/lang.inc | 11 +++++++++--
 languages/sv_SE/lang.inc | 11 +++++++++--
 languages/tr_TR/lang.inc | 11 +++++++++--
 languages/zh_CN/lang.inc | 11 +++++++++--
 languages/zh_TW/lang.inc | 11 +++++++++--
 20 files changed, 201 insertions(+), 61 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index a925d277c..96b389225 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -524,6 +524,7 @@ URL: [url]',
 'lastaccess' => '',
 'last_update' => 'اخر تحديث',
 'legend' => 'دليل',
+'librarydoc' => '',
 'linked_documents' => 'مستندات متعلقة',
 'linked_files' => 'ملحقات',
 'link_alt_updatedocument' => 'اذا كنت تود تحميل ملفات اكبر من حجم الملفات المتاحة حاليا, من فضلك استخدم البديل <a href="%s">صفحة التحميل</a>.',
@@ -645,6 +646,7 @@ URL: [url]',
 'no_linked_files' => 'لايوجد ملفات مرتبطة',
 'no_previous_versions' => 'لايوجد اصدارات سابقة',
 'no_review_needed' => 'لايوجد مراجعات في الانتظار',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'لايمكنك تعديل المستند. قم بمخاطبة المستخدم الذي قام بحمايته من التعديل',
 'no_user_image' => 'لا يوجد صورة متاحة',
 'no_version_check' => '',
@@ -762,6 +764,7 @@ URL: [url]',
 'review_update_failed' => 'خطأ في تحديث حالة المراجعة. التحديث فشل.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -851,8 +854,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Activate PHP extension',
 'settings_adminIP' => 'Admin IP',
 'settings_adminIP_desc' => '',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'متقدم',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => '',
@@ -897,6 +898,8 @@ URL: [url]',
 'settings_dropFolderDir' => '',
 'settings_dropFolderDir_desc' => '',
 'settings_Edition' => 'اعدادات التحرير',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => '',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '',
@@ -933,6 +936,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
@@ -974,6 +979,8 @@ URL: [url]',
 'settings_install_zendframework' => '',
 'settings_language' => '',
 'settings_language_desc' => '',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => '',
 'settings_logFileEnable_desc' => '',
 'settings_logFileRotation' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index f2dcbe896..fcfab086a 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -455,6 +455,7 @@ $text = array(
 'lastaccess' => '',
 'last_update' => 'Последно обновление',
 'legend' => 'легенда',
+'librarydoc' => '',
 'linked_documents' => 'Свързани документи',
 'linked_files' => 'Приложения',
 'link_alt_updatedocument' => 'Ако искате да качите файлове над текущия лимит, използвайте друг <a href="%s">начин</a>.',
@@ -552,6 +553,7 @@ $text = array(
 'no_linked_files' => 'Няма свързани файлове',
 'no_previous_versions' => 'Няма други версии',
 'no_review_needed' => 'Рецензия не е нужна',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Вие не можете да обновите документа. Свържете се с блокирщия го потребител.',
 'no_user_image' => 'Изображение не е намерено',
 'no_version_check' => '',
@@ -640,6 +642,7 @@ $text = array(
 'review_update_failed' => 'грешка при обновяване статуса на рецензията',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -716,8 +719,6 @@ $text = array(
 'settings_activate_php_extension' => 'Активирай разширение на PHP',
 'settings_adminIP' => 'Админско IP',
 'settings_adminIP_desc' => 'Ако е сложено, то админа ще може да влиза само от това IP. Оставете празно за да избегнем апокалипсиса. Не работи с LDAP',
-'settings_ADOdbPath' => 'Път към ADOdb',
-'settings_ADOdbPath_desc' => 'Папка съдържаща ПАПКА ADOdb',
 'settings_Advanced' => 'Допълнително',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Настройки на автентификацията',
@@ -762,6 +763,8 @@ $text = array(
 'settings_dropFolderDir' => 'Директория за папката -пускане-',
 'settings_dropFolderDir_desc' => 'Тази папка може да се ползва за -пускане- на файлове във файловата система на сървъра и импортиране от там вместо качване през браузър. Папката трябва да съдържа под-паки за всеки потребител който има права да работи по този начин.',
 'settings_Edition' => 'Настройки редакция',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Разреши Admin Rev App',
 'settings_enableAdminRevApp_desc' => 'Изключи, за да скрия админа от списъка с рецензиращи/утвърждаващи',
 'settings_enableCalendar' => 'Включи календаря',
@@ -798,6 +801,8 @@ $text = array(
 'settings_enablePasswordForgotten_desc' => 'Ако е включено, разрешава на потребителите да си възстанавяват паролата на email.',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
@@ -839,6 +844,8 @@ $text = array(
 'settings_install_zendframework' => 'Инсталирайте Zend Framework, ако ще използвате пълнотекстово търсене',
 'settings_language' => 'Език по подразбиране',
 'settings_language_desc' => 'Език по подразбиране (име на подпапката в папка "languages")',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Включи лог-файл',
 'settings_logFileEnable_desc' => 'Включи/изключи лог',
 'settings_logFileRotation' => 'Превъртане на лога',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 9a59ab64f..c387b51f2 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -460,6 +460,7 @@ URL: [url]',
 'lastaccess' => '',
 'last_update' => 'Última modificació',
 'legend' => '',
+'librarydoc' => '',
 'linked_documents' => 'Documents relacionats',
 'linked_files' => 'Adjunts',
 'link_alt_updatedocument' => '',
@@ -557,6 +558,7 @@ URL: [url]',
 'no_linked_files' => 'No hi ha fitxers enllaçats',
 'no_previous_versions' => 'No s\'han trobat altres versions',
 'no_review_needed' => 'No hi ha revisions pendents.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Aquest document no es pot actualitzar. Si us plau, contacteu amb l\'usuari que l\'ha bloquejat.',
 'no_user_image' => 'No es troba la imatge',
 'no_version_check' => '',
@@ -645,6 +647,7 @@ URL: [url]',
 'review_update_failed' => 'Error actualitzant l\'estat de la revisió. L\'actualizació ha fallat.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -721,8 +724,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Activate PHP extension',
 'settings_adminIP' => 'Admin IP',
 'settings_adminIP_desc' => '',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => '',
@@ -767,6 +768,8 @@ URL: [url]',
 'settings_dropFolderDir' => '',
 'settings_dropFolderDir_desc' => '',
 'settings_Edition' => 'Edition settings',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => '',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '',
@@ -803,6 +806,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
@@ -844,6 +849,8 @@ URL: [url]',
 'settings_install_zendframework' => '',
 'settings_language' => '',
 'settings_language_desc' => '',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => '',
 'settings_logFileEnable_desc' => 'Enable/disable log file',
 'settings_logFileRotation' => 'Log File Rotation',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 84b3cc6d0..6f03b9096 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (682), kreml (455)
+//    Translators: Admin (683), kreml (455)
 
 $text = array(
 'accept' => 'Přijmout',
@@ -531,6 +531,7 @@ URL: [url]',
 'lastaccess' => 'Poslední přístup',
 'last_update' => 'Naposledy aktualizoval',
 'legend' => 'Popisek',
+'librarydoc' => '',
 'linked_documents' => 'Související dokumenty',
 'linked_files' => 'Přílohy',
 'link_alt_updatedocument' => 'Hodláte-li nahrát soubory větší než je maximální velikost pro nahrávání, použijte prosím <a href="%s">alternativní stránku</a>.',
@@ -652,6 +653,7 @@ URL: [url]',
 'no_linked_files' => 'Žádné propojené soubory',
 'no_previous_versions' => 'Nebyly nalezeny žádné jiné verze',
 'no_review_needed' => 'Nic nečeká k revizi.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Proto nemůžete aktualizovat tento dokument. Prosím, kontaktujte uživatele, který ho zamknul.',
 'no_user_image' => 'nebyl nalezen žádný obrázek',
 'no_version_check' => 'Chyba při kontrole nové verze SeedDMS. Může to být způsobeno nastavením allow_url_fopen na 0 ve vaší php konfiguraci.',
@@ -771,6 +773,7 @@ URL: [url]',
 'review_update_failed' => 'Chyba při aktualizaci stavu kontroly. Aktualizace selhala.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -860,8 +863,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Activate PHP extension',
 'settings_adminIP' => 'Admin IP',
 'settings_adminIP_desc' => 'Pokud je nastaveno, admin se může přihlásit pouze z uvedené IP adresy. Ponechejte prázdné k udržení přístupu. Pozn: pracuje pouze s lokálním ověřováním (ne LDAP)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Advanced',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authentication settings',
@@ -906,6 +907,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Adresář pro přetažení složky',
 'settings_dropFolderDir_desc' => 'Tento adresář může být použit k ukládání souborů do souborového systému serveru a jejich importování odtud, místo natahování přes prohlížeč. Adresář musí obsahovat podadresář pro každého uživatele, kterému je povoleno importovat soubory touto cestou.',
 'settings_Edition' => '',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => '',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '',
@@ -942,6 +945,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => 'Povolit rekurzivní počítání dokumentů/složek',
 'settings_enableRecursiveCount_desc' => 'Při zapnutí je počet dokumentů a složek v zobrazení složek určen počítáním všech objektů při rekurzivním zpracování složek a počítáním těch dokumentů a složek, ke kterým má uživatel přístup.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Povolit posouzení/schválení pro přihlášeného uživatele',
 'settings_enableSelfRevApp_desc' => 'Povolte, pokud chcete aktuálně přihlášeného uvést jako posuzovatele/schvalovatele a pro přechody pracovního postupu',
 'settings_enableThemeSelector' => 'Volba tématu',
@@ -983,6 +988,8 @@ URL: [url]',
 'settings_install_zendframework' => '',
 'settings_language' => 'Default language',
 'settings_language_desc' => '',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => '',
 'settings_logFileEnable_desc' => '',
 'settings_logFileRotation' => '',
@@ -1230,7 +1237,7 @@ URL: [url]',
 'update_fulltext_index' => 'Aktualizovat fulltext index',
 'update_info' => 'Aktualizovat informace',
 'update_locked_msg' => 'Tento dokument je zamčený.',
-'update_recipients' => 'Update list of recipients',
+'update_recipients' => '',
 'update_reviewers' => 'Aktualizovat seznam kontrolorů',
 'update_revisors' => '',
 'update_transmittalitem' => '',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index b678144ea..4909a2539 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2051), dgrutsch (18)
+//    Translators: Admin (2067), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -536,6 +536,7 @@ URL: [url]',
 'lastaccess' => 'Letzter Zugriff',
 'last_update' => 'Letzte Aktualisierung',
 'legend' => 'Legende',
+'librarydoc' => 'Dokument aus Bibliothek',
 'linked_documents' => 'verknüpfte Dokumente',
 'linked_files' => 'Anhänge',
 'link_alt_updatedocument' => 'Wenn Sie ein Dokument hochladen möchten, das größer als die maximale Dateigröße ist, dann benutzen Sie bitte die alternative <a href="%s">Upload-Seite</a>.',
@@ -646,7 +647,7 @@ URL: [url]',
 'no_docs_locked' => 'Keine Dokumente gesperrt.',
 'no_docs_to_approve' => 'Es gibt zur Zeit keine Dokumente, die eine Freigabe erfordern.',
 'no_docs_to_look_at' => 'Keine Dokumente, nach denen geschaut werden müsste.',
-'no_docs_to_receipt' => '',
+'no_docs_to_receipt' => 'Keine Dokumentenempfangsbestätigung erforderlich',
 'no_docs_to_review' => 'Es gibt zur Zeit keine Dokumente, die eine Prüfung erfordern.',
 'no_docs_to_revise' => 'Es gibt zur Zeit keine Dokumente, die erneut geprüft werden müssen.',
 'no_email_or_login' => 'Login und E-Mail müssen eingegeben werden',
@@ -656,6 +657,7 @@ URL: [url]',
 'no_linked_files' => 'Keine verknüpften Dokumente',
 'no_previous_versions' => 'Keine anderen Versionen gefunden',
 'no_review_needed' => 'Keine offenen Prüfungen.',
+'no_revision_planed' => 'Keine Wiederholungsprüfung des Dokuments eingeplant.',
 'no_update_cause_locked' => 'Sie können daher im Moment diese Datei nicht aktualisieren. Wenden Sie sich an den Benutzer, der die Sperrung eingerichtet hat',
 'no_user_image' => 'Kein Bild vorhanden',
 'no_version_check' => 'Ein Check auf neuere Versionen von SeedDMS ist fehlgeschlagen. Dies könnte daran liegen, dass allow_url_fopen in der PHP-Konfiguration auf 0 gesetzt ist.',
@@ -790,11 +792,12 @@ URL: [url]',
 'review_summary' => 'Übersicht Prüfungen',
 'review_update_failed' => 'Störung bei Aktualisierung des Prüfstatus. Aktualisierung gescheitert.',
 'revise_document' => 'Dokument überprüfen',
-'revise_document_on' => '',
+'revise_document_on' => 'Nächste Überprüfung des Dokuments am [date]',
+'revision_date' => 'Datum der Wiederholungsprüfung',
 'revision_log' => 'Protokoll der erneuten Prüfung',
 'revisors' => 'Überprüfer',
-'revisor_already_assigned' => '',
-'revisor_already_removed' => '',
+'revisor_already_assigned' => 'Benutzer bereits als Wiederholungsprüfer eingetragen.',
+'revisor_already_removed' => 'Wiederholungsprüfer wurde bereits vom Prozess ausgeschlossen oder hat das Dokument bereits geprüft.',
 'rewind_workflow' => 'Zurück zum Anfangszustand',
 'rewind_workflow_email_body' => 'Workflow wurde zurückgestellt
 Dokument: [name]
@@ -860,12 +863,12 @@ URL: [url]',
 'select_grp_notification' => 'Klicken zur Auswahl einer Beobachtergruppe',
 'select_grp_recipients' => 'Klicken zur Auswahl einer Empfängergruppe',
 'select_grp_reviewers' => 'Klicken zur Auswahl einer Prüfgruppe',
-'select_grp_revisors' => '',
+'select_grp_revisors' => 'Klicken, um Wiederholungsprüfgruppen auszuwählen',
 'select_ind_approvers' => 'Klicken zur Auswahl eines Freigebers',
 'select_ind_notification' => 'Klicken zur Auswahl eines Beobachters',
-'select_ind_recipients' => 'Click to select individual recipients',
+'select_ind_recipients' => 'Klicken, um Empfänger auszuwählen',
 'select_ind_reviewers' => 'Klicken zur Auswahl eines Prüfers',
-'select_ind_revisors' => '',
+'select_ind_revisors' => 'Klicken, um Wiederholungsprüfer auszuwählen',
 'select_one' => 'Bitte wählen',
 'select_users' => 'Klicken zur Auswahl eines Benutzers',
 'select_workflow' => 'Workflow auswählen',
@@ -880,8 +883,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'PHP-Erweiterung aktivieren',
 'settings_adminIP' => 'Admin IP',
 'settings_adminIP_desc' => 'Wenn hier eine IP-Nummer eingetragen wird, kann eine Anmeldung als Administrator nur von dieser Adresse erfolgen. Funktioniert nur mit Anmeldung über die Datenbank (nicht LDAP)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Erweitert',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authentifikations-Einstellungen',
@@ -926,6 +927,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Verzeichnis für Ablageordner',
 'settings_dropFolderDir_desc' => 'Dieses Verzeichnis kann dazu benutzt werden Dokumente auf dem Server abzulegen und von dort zu importieren anstatt sie über den Browser hochzuladen. Das Verzeichnis muss ein Unterverzeichnis mit dem Login-Namen des angemeldeten Benutzers beinhalten.',
 'settings_Edition' => 'Funktions-Einstellungen',
+'settings_enableAcknowledgeWorkflow' => 'Ermögliche Bestätigung des Dokumentenempfang',
+'settings_enableAcknowledgeWorkflow_desc' => 'Anwählen, um den Workflow zur Kenntnisnahme von Dokumenten einzuschalten',
 'settings_enableAdminRevApp' => 'Admin darf freigeben/prüfen',
 'settings_enableAdminRevApp_desc' => 'Anwählen, um Administratoren in der Liste der Prüfer und Freigeber auszugeben',
 'settings_enableCalendar' => 'Kalender einschalten',
@@ -962,6 +965,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Setzen Sie diese Option, wenn Benutzer ein neues Password per E-Mail anfordern dürfen.',
 'settings_enableRecursiveCount' => 'Rekursive Dokumenten-/Ordner-Zählung',
 'settings_enableRecursiveCount_desc' => 'Wenn diese Option eingeschaltet ist, wird die Anzahl der Dokumente und Ordner in der Ordner-Ansicht rekursiv, unter Berücksichtigung der Zugriffsrechte ermittelt.',
+'settings_enableRevisionWorkflow' => 'Ermögliche Wiederholungsprüfung von Dokumenten',
+'settings_enableRevisionWorkflow_desc' => 'Anwählen, um den Workflow der Wiederholungsprüfung von Dokumenten nach einer einstellbaren Zeit zu ermöglichen.',
 'settings_enableSelfRevApp' => 'Erlaube Prüfung/Freigabe durch angemeldeten Benutzer',
 'settings_enableSelfRevApp_desc' => 'Anwählen, um den aktuell angemeldeten Benutzer in der Liste der Prüfer/Freigeber und für Workflow-Aktionen auswählbar zu machen.',
 'settings_enableThemeSelector' => 'Auswahl des Themas',
@@ -1003,6 +1008,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Installiere Zend Framework, wenn Sie die Volltextsuche einsetzen möchten.',
 'settings_language' => 'Voreingestellte Sprache',
 'settings_language_desc' => 'Voreingestellte Sprache (entspricht dem Unterverzeichnis im Verzeichnis \'languages\')',
+'settings_libraryFolder' => 'Bibliotheksordner',
+'settings_libraryFolder_desc' => 'Ordner aus dem Dokumente für neue Dokumente kopiert werden können.',
 'settings_logFileEnable' => 'Log-Datei ein-/ausschalten',
 'settings_logFileEnable_desc' => 'Anwählen, um alle Aktionen in einer Log-Datei im Datenverzeichnis zu speichern.',
 'settings_logFileRotation' => 'Rotation der Log-Datei',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 2fdf94747..01d01ff8e 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1179), dgrutsch (3), netixw (14)
+//    Translators: Admin (1195), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -536,6 +536,7 @@ URL: [url]',
 'lastaccess' => 'Last access',
 'last_update' => 'Last Update',
 'legend' => 'Legend',
+'librarydoc' => 'Document from library',
 'linked_documents' => 'Related Documents',
 'linked_files' => 'Attachments',
 'link_alt_updatedocument' => 'If you would like to upload files bigger than the current maximum upload size, please use the alternative <a href="%s">upload page</a>.',
@@ -656,6 +657,7 @@ URL: [url]',
 'no_linked_files' => 'No linked files',
 'no_previous_versions' => 'No other versions found',
 'no_review_needed' => 'No review pending.',
+'no_revision_planed' => 'No revision of document scheduled',
 'no_update_cause_locked' => 'You can therefore not update this document. Please contact the locking user.',
 'no_user_image' => 'No image found',
 'no_version_check' => 'Checking for a new version of SeedDMS has failed! This could be caused by allow_url_fopen being set to 0 in your php configuration.',
@@ -728,7 +730,7 @@ URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Removed attachment',
 'removed_recipient' => 'has been removed from the list of recipients.',
 'removed_reviewer' => 'has been removed from the list of reviewers.',
-'removed_revispr' => 'has been removed from the list of resubmitter.',
+'removed_revispr' => 'has been removed from the list of revisors.',
 'removed_workflow_email_body' => 'Removed workflow from document version
 Document: [name]
 Version: [version]
@@ -798,10 +800,11 @@ URL: [url]',
 'review_update_failed' => 'Error updating review status. Update failed.',
 'revise_document' => 'Revise document',
 'revise_document_on' => 'Next revision of document version on [date]',
+'revision_date' => 'Date of revision',
 'revision_log' => 'Revision log',
 'revisors' => 'Revisors',
-'revisor_already_assigned' => 'User is already assigned as an resubmitter.',
-'revisor_already_removed' => 'Resubmitter has already been removed from revision process or has already revised the document.',
+'revisor_already_assigned' => 'User is already assigned as an revisor.',
+'revisor_already_removed' => 'Revisor has already been removed from revision process or has already revised the document.',
 'rewind_workflow' => 'Rewind workflow',
 'rewind_workflow_email_body' => 'Workflow was rewinded
 Document: [name]
@@ -867,12 +870,12 @@ URL: [url]',
 'select_grp_notification' => 'Click to select group notification',
 'select_grp_recipients' => 'Click to select group of recipients',
 'select_grp_reviewers' => 'Click to select group reviewer',
-'select_grp_revisors' => 'Click to select group of resubmitters',
+'select_grp_revisors' => 'Click to select group of revisors',
 'select_ind_approvers' => 'Click to select individual approver',
 'select_ind_notification' => 'Click to select individual notification',
-'select_ind_recipients' => '',
+'select_ind_recipients' => 'Click to select individual recipients',
 'select_ind_reviewers' => 'Click to select individual reviewer',
-'select_ind_revisors' => 'Click to select individual resubmitters',
+'select_ind_revisors' => 'Click to select individual revisors',
 'select_one' => 'Select one',
 'select_users' => 'Click to select users',
 'select_workflow' => 'Select workflow',
@@ -887,8 +890,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Activate PHP extension',
 'settings_adminIP' => 'Admin IP',
 'settings_adminIP_desc' => 'If set, admin can login only by specified IP address. Leave empty to avoid lose of access. NOTE: works only with local autentication (no LDAP)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Advanced',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authentication settings',
@@ -933,6 +934,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Directory for drop folder',
 'settings_dropFolderDir_desc' => 'This directory can be used for dropping files on the server\'s file system and importing them from there instead of uploading via the browser. The directory must contain a sub directory for each user who is allowed to import files this way.',
 'settings_Edition' => 'Edition settings',
+'settings_enableAcknowledgeWorkflow' => 'Enable acknowledge of document reception',
+'settings_enableAcknowledgeWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.',
 'settings_enableAdminRevApp' => 'Allow review/approval for admins',
 'settings_enableAdminRevApp_desc' => 'Enable this if you want administrators to be listed as reviewers/approvers and for workflow transitions.',
 'settings_enableCalendar' => 'Enable Calendar',
@@ -969,6 +972,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'If you want to allow user to set a new password and send it by mail, check this option.',
 'settings_enableRecursiveCount' => 'Enable recursive document/folder count',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
+'settings_enableRevisionWorkflow' => 'Enable revision of documents',
+'settings_enableRevisionWorkflow_desc' => 'Enable, to be able to run the workflow for revising a document after a given period of time.',
 'settings_enableSelfRevApp' => 'Allow review/approval for logged in user',
 'settings_enableSelfRevApp_desc' => 'Enable this if you want the currently logged in user to be listed as reviewers/approvers and for workflow transitions.',
 'settings_enableThemeSelector' => 'Theme selection',
@@ -1010,6 +1015,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Install Zend Framework, if you intend to use the full text search engine',
 'settings_language' => 'Default language',
 'settings_language_desc' => 'Default language (name of a subfolder in folder "languages")',
+'settings_libraryFolder' => 'Library folder',
+'settings_libraryFolder_desc' => 'Folder where documents can be copied to create new documents.',
 'settings_logFileEnable' => 'Log File Enable',
 'settings_logFileEnable_desc' => 'Enable/disable log file',
 'settings_logFileRotation' => 'Log File Rotation',
@@ -1257,7 +1264,7 @@ URL: [url]',
 'update_fulltext_index' => 'Update fulltext index',
 'update_info' => 'Update Information',
 'update_locked_msg' => 'This document is locked.',
-'update_recipients' => '',
+'update_recipients' => 'Update list of recipients',
 'update_reviewers' => 'Update List of Reviewers',
 'update_revisors' => 'Update list of resubmitters',
 'update_transmittalitem' => 'Update to latest document version',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 70a567149..045f2fb88 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (938), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (940), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -531,6 +531,7 @@ URL: [url]',
 'lastaccess' => 'Último acceso',
 'last_update' => 'Última modificación',
 'legend' => 'Leyenda',
+'librarydoc' => '',
 'linked_documents' => 'Documentos relacionados',
 'linked_files' => 'Adjuntos',
 'link_alt_updatedocument' => 'Si desea subir archivos mayores que el tamaño máximo actualmente permitido, por favor, utilice la <a href="%s">página de subida</a> alternativa.',
@@ -642,7 +643,7 @@ URL: [url]',
 'no_docs_locked' => 'No hay documentos bloqueados.',
 'no_docs_to_approve' => 'Actualmente no hay documentos que necesiten aprobación.',
 'no_docs_to_look_at' => 'No hay documentos que necesiten atención.',
-'no_docs_to_receipt' => 'Keine Dokumentenempfangsbestätigung erforderlich',
+'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Actualmente no hay documentos que necesiten revisión.',
 'no_docs_to_revise' => '',
 'no_email_or_login' => 'Debe ingresar el usuario o e-mail',
@@ -652,6 +653,7 @@ URL: [url]',
 'no_linked_files' => 'No hay ficheros vinculados',
 'no_previous_versions' => 'No se han encontrado otras versiones',
 'no_review_needed' => 'No hay revisiones pendientes.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'No puede actualizar este documento. Contacte con el usuario que lo bloqueó.',
 'no_user_image' => 'No se encontró imagen',
 'no_version_check' => 'Ha fallado la comprobación de nuevas versiones. En su configuración de PHP, revise que allow_url_fopen no esté en 0',
@@ -776,7 +778,8 @@ URL: [url]',
 'review_summary' => 'Resumen de revisión',
 'review_update_failed' => 'Error actualizando el estado de la revisión. La actualización ha fallado.',
 'revise_document' => '',
-'revise_document_on' => 'Nächste Überprüfung des Dokuments am [date]',
+'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -866,8 +869,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Activar extensión PHP',
 'settings_adminIP' => 'IP de administración',
 'settings_adminIP_desc' => 'Si establece que el administrador solo puede conectar desde una dirección IP específica, deje en blanco para evitar el control. NOTA: funciona únicamente con autenticación local (no LDAP).',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Avanzado',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Reescritura',
 'settings_Authentication' => 'Configuración de autenticación',
@@ -912,6 +913,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Carpeta para dejar ficheros',
 'settings_dropFolderDir_desc' => 'Esta carpeta puede ser usada para dejar ficheros en el sistema de archivos del servidor e importarlos desde ahí en lugar de subirlos vía navegador. La carpeta debe contener un subdirectorio para cada usuario que tenga permiso para importar ficheros de esta forma.',
 'settings_Edition' => 'Configuración de edición',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Habilitar Administrador Rev Apr',
 'settings_enableAdminRevApp_desc' => 'Deseleccione para no mostrar al administrador como revisor/aprobador',
 'settings_enableCalendar' => 'Habilitar calendario',
@@ -948,6 +951,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Si quiere permitir a los usuarios fijar una nueva contraseña recibiendo un correo electrónico, active esta opción.',
 'settings_enableRecursiveCount' => 'Habilitar cuenta de documento/carpeta recursivo',
 'settings_enableRecursiveCount_desc' => 'Si cambia a activado, el número de documentos y carpetas en la carpeta será determinado por la cuenta de todos los objetos recursivos procesados de la carpeta y una vez contados el usuarios tendrá permiso para acceder.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Permitir al usuario identificado revisar/aprobar.',
 'settings_enableSelfRevApp_desc' => 'Habilitar esto si quiere que el usuario identificado sea listado como revisor/aprobador y para las transiciones del flujo de trabajo.',
 'settings_enableThemeSelector' => 'Selección de temas (skins)',
@@ -989,6 +994,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Instale Zend Framework, si quiere usar el sistema de búsqueda de texto completo',
 'settings_language' => 'Idioma por defecto',
 'settings_language_desc' => 'Idioma por defecto (nombre de una subcarpeta en la carpeta "languages")',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Archivo de registro habilitado',
 'settings_logFileEnable_desc' => 'Habilitar/Deshabilitar archivo de registro',
 'settings_logFileRotation' => 'Rotación del archivo de registro',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 16e37485e..95400cfa0 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -531,6 +531,7 @@ URL: [url]',
 'lastaccess' => 'Dernière connexion',
 'last_update' => 'Dernière modification',
 'legend' => 'Légende',
+'librarydoc' => '',
 'linked_documents' => 'Documents liés',
 'linked_files' => 'Fichiers attachés',
 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la <a href="%s">page d\'ajout multiple</a>.',
@@ -651,6 +652,7 @@ URL: [url]',
 'no_linked_files' => 'Aucun fichier lié',
 'no_previous_versions' => 'Aucune autre version trouvée',
 'no_review_needed' => 'Aucune correction en attente',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Vous ne pouvez actuellement pas mettre à jour ce document. Contactez l\'utilisateur qui l\'a verrouillé.',
 'no_user_image' => 'Aucune image trouvée',
 'no_version_check' => '',
@@ -766,6 +768,7 @@ URL: [url]',
 'review_update_failed' => 'Erreur lors de la mise à jour de la correction. Echec de la mise à jour.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -842,8 +845,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Activez l\'extension PHP',
 'settings_adminIP' => 'Admin IP',
 'settings_adminIP_desc' => 'Si activé l\'administrateur ne peut se connecter que par l\'adresse IP spécifiées, laisser vide pour éviter le contrôle. NOTE: fonctionne uniquement avec autentication locale (sans LDAP)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Avancé',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Paramètres d\'authentification',
@@ -888,6 +889,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Répertoire de dépôt de fichier sur le serveur',
 'settings_dropFolderDir_desc' => 'Ce répertoire peut être utilisé pour déposer des fichiers sur le serveur et les importer à partir d\'ici au lieu de les charger à partir du navigateur. Le répertoire doit avoir un sous-répertoire pour chaque utilisateur autorisé à importer des fichiers de cette manière.',
 'settings_Edition' => 'Paramètres d’édition',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Activer Admin Rev App',
 'settings_enableAdminRevApp_desc' => 'Décochez pour ne pas lister l\'administrateur à titre de correcteur/approbateur',
 'settings_enableCalendar' => 'Activer agenda',
@@ -924,6 +927,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Si vous voulez permettre à l\'utilisateur de définir un nouveau mot de passe et l\'envoyer par mail, cochez cette option.',
 'settings_enableRecursiveCount' => 'Décompte de documents/répertoires recursif',
 'settings_enableRecursiveCount_desc' => 'Si activé, le nombre de documents et répertoires dans un répertoire est calculé en comptant récursivement le contenu des sous-répertoires auxquels l\'utilisateur a accès.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Autoriser correction/approbbation pour l\'utilisateur actuel',
 'settings_enableSelfRevApp_desc' => 'A autoriser pour avoir l\'utilisateur actuel désigné correcteur/approbateur et pour les transitions de workflow.',
 'settings_enableThemeSelector' => 'Sélection du thème',
@@ -965,6 +970,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Installer le Framework Zend, si vous avez l\'intention d\'utiliser le moteur de recherche texte complète',
 'settings_language' => 'Langue par défaut',
 'settings_language_desc' => 'Langue par défaut (nom d\'un sous-dossier dans le dossier "languages")',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Fichier journal activé',
 'settings_logFileEnable_desc' => 'Activer/désactiver le fichier journal',
 'settings_logFileRotation' => 'Rotation fichier journal',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index a43338903..8ca503c5c 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -531,6 +531,7 @@ URL: [url]',
 'lastaccess' => 'Utolsó hozzáférés',
 'last_update' => 'Utolsó frissítés',
 'legend' => 'Jelmagyarázat',
+'librarydoc' => '',
 'linked_documents' => 'Kapcsolódó dokumentumok',
 'linked_files' => 'Mellékletek',
 'link_alt_updatedocument' => 'Ha a jelenlegi maximális feltöltési méretnél nagyobb állományokat szeretne feltölteni, akkor használja az alternatív <a href="%s">feltöltő oldalt</a>.',
@@ -652,6 +653,7 @@ URL: [url]',
 'no_linked_files' => 'Nincsenek hivatkozott állományok',
 'no_previous_versions' => 'Nem találhatók más változatok',
 'no_review_needed' => 'Nincs folyamatban lévő felülvizsgálat.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Emiatt nem módosíthatja a dokumentumot. Kérjük lépjen kapcsolatba a zároló felhasználóval.',
 'no_user_image' => 'Kép nem található',
 'no_version_check' => 'A SeedDMS új verziójának ellenőrzése hibára futott! Ennek oka lehet, hogy az allow_url_fopen 0-ra van állítva a php konfigurációjában.',
@@ -777,6 +779,7 @@ URL: [url]',
 'review_update_failed' => 'Hiba a felülvizsgálat állapot frissítése során. Frissítés sikertelen.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -865,8 +868,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'PHP kiterjesztés aktiválása',
 'settings_adminIP' => 'Adminisztációs IP',
 'settings_adminIP_desc' => 'Amennyiben beállítja az adminisztrátor csak a megadott IP címről tud bejelentkezni. Hagyja üresen az ellenőrzés elkerüléséhez. MEGJEGYZÉS: csak helyi azonosítás esetén működik (LDAP használatakor nem)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Részletek',
 'settings_apache_mod_rewrite' => 'Apache - Rewrite modul',
 'settings_Authentication' => 'Hitelesítési beállítások',
@@ -911,6 +912,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Drop mappa könyvtára',
 'settings_dropFolderDir_desc' => 'Ez a könyvtár használható az importálandó állományok elhelyezésére a fájlrendszeren a böngészővel történő feltöltés helyett. A könyvtárnak tartalmaznia kell alkönyvtárakat minden felhasználóhoz akinek engedélyezett az állományok ilyen módon történő importálása.',
 'settings_Edition' => 'Kiadás beállítások',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Engedélyezi a felülvizsgálatot/jóváhagyást az adminisztrátorok számára',
 'settings_enableAdminRevApp_desc' => 'Engedélyezze, ha szeretné, hogy az adminisztrátorok listázva legyenek a felülvizsgálóknál/jóváhagyóknál és a munkamenet átmeneteknél.',
 'settings_enableCalendar' => 'Naptár engedélyezése',
@@ -947,6 +950,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Ha azt szeretné, hogy a felhasználó megadhasson új jelszót és elküldhesse azt emailben, engedélyezze ezt a lehetőséget.',
 'settings_enableRecursiveCount' => 'Engedélyezi a rekurzív dokumentum/mappa számot',
 'settings_enableRecursiveCount_desc' => 'Ha be van kapcsolva a mappa nézetben a dokumentumok és mappák száma minden objektum rekurzív feldolgozásával kerül meghatározásra és a dokumentumok és mappák száma a felhasználó számára engedélyezett.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Engedélyezi a felülvizsgálatot/jóváhagyást a bejelentkezett felhasználó számára',
 'settings_enableSelfRevApp_desc' => 'Engedélyezze, a azt szeretné, hogy a bejelentkezett felhasználó listázásra kerüljön felülvizsgálóként/jóváhagyóként és a munkamenet átmeneteknél.',
 'settings_enableThemeSelector' => 'Téma választása',
@@ -988,6 +993,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Zend Framework telepítése, ha használni szeretné a teljes szöveges keresőt',
 'settings_language' => 'Alapértelmezett nyelv',
 'settings_language_desc' => 'Alapértelmezett nyelv (a "languages" mappa alatt található almappa neve)',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Naplóállomány engedélyezése',
 'settings_logFileEnable_desc' => 'Naplóállomány engedélyezése/tiltása',
 'settings_logFileRotation' => 'Naplóállomány forgatása',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index df9cf7c6a..c0a69c01f 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -536,6 +536,7 @@ URL: [url]',
 'lastaccess' => 'Ultimo accesso',
 'last_update' => 'Ultima modifica',
 'legend' => 'Legenda',
+'librarydoc' => '',
 'linked_documents' => 'Documenti collegati',
 'linked_files' => 'Allegati',
 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la <a href="%s">pagina alternativa di upload</a>.',
@@ -657,6 +658,7 @@ URL: [url]',
 'no_linked_files' => 'Nessun file collegato',
 'no_previous_versions' => 'Nessun\'altra versione trovata',
 'no_review_needed' => 'Nessuna revisione in sospeso.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Non è quindi possible aggiornare il documento. Prego contattare l\'utente che l\'ha bloccato.',
 'no_user_image' => 'Nessuna immagine trovata',
 'no_version_check' => 'Il controllo per una nuova versione di SeedDMS è fallito! Questo può essere causato da allow_url_fopen settato a 0 nella tua configurazione php.',
@@ -799,6 +801,7 @@ URL: [url]',
 'review_update_failed' => 'Errore nella variazione dello stato di revisione. Aggiornamento fallito.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -888,8 +891,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Attivazione estensione PHP',
 'settings_adminIP' => 'IP Amministratore',
 'settings_adminIP_desc' => 'Se attivato l\'Amministratore si può collegare solo da un IP specifico; lasciare vuoto per evitare il controllo. NOTA: funziona solo con autenticazione locale (no LDAP)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Avanzate',
 'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite',
 'settings_Authentication' => 'Impostazioni di Autenticazione',
@@ -934,6 +935,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Cartella per il drop',
 'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per rilasciare (drop) files sul server per importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare files in questo modo.',
 'settings_Edition' => 'Impostazioni di edizione',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Permetti la revisione/approvazione da parte degli amministratori',
 'settings_enableAdminRevApp_desc' => 'Abilita per elencare gli amministratori tra i revisori/approvatori e per le transizioni del flusso di lavoro',
 'settings_enableCalendar' => 'Abilita calendario',
@@ -970,6 +973,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Spuntare nel caso si desideri permettere all\'utente di re-impostare la password inviata per email.',
 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle',
 'settings_enableRecursiveCount_desc' => 'Se selezionato il numero di documenti e sottocartelle accessibili all\'utente sarà calcolato con un conteggio ricursivo di tutti gli oggetti contenuti nella cartella.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Permetti revisione/approvazione all\'utente registrato',
 'settings_enableSelfRevApp_desc' => 'Abilitare se si desidera aggiungere l\'utente attualmente registrato alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.',
 'settings_enableThemeSelector' => 'Selezione tema grafico',
@@ -1011,6 +1016,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Installare il framework Zend, se si intende usufruire del motore di ricerca fulltext.',
 'settings_language' => 'Lingua di default',
 'settings_language_desc' => 'Lingua di default (nome della sottocartella corrispondente nella cartella "languages")',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Abilita il file di registro',
 'settings_logFileEnable_desc' => 'Abilita/disabilita il file di registro',
 'settings_logFileRotation' => 'Rotazione del file di registro',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index c427e3059..31ea66445 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -524,6 +524,7 @@ URL: [url]',
 'lastaccess' => '',
 'last_update' => 'Laatste Update',
 'legend' => 'Legenda',
+'librarydoc' => '',
 'linked_documents' => 'Gerelateerde Documenten',
 'linked_files' => 'Bijlagen',
 'link_alt_updatedocument' => 'Als u bestanden wilt uploaden groter dan het huidige maximum, gebruik aub de alternatieve <a href="%s">upload pagina</a>.',
@@ -644,6 +645,7 @@ URL: [url]',
 'no_linked_files' => 'Geen gekoppelde bestanden',
 'no_previous_versions' => 'Geen andere versie(s) gevonden',
 'no_review_needed' => 'Geen review bezig.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'U kunt daarom dit document niet bijwerken. Neem contact op met de persoon die het document heeft geblokkeerd.',
 'no_user_image' => 'Geen afbeelding(en) gevonden',
 'no_version_check' => 'Controle op een nieuwe versie van SeedDMS is mislukt! Dit kan komen omdat allow_url_fopen is ingesteld op 0 in uw PHP configuratie.',
@@ -768,6 +770,7 @@ URL: [url',
 'review_update_failed' => 'Foutmelding: fout bij bijwerken [Controle] Status. Bijwerken mislukt.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -857,8 +860,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Activeer PHP uitbreiding',
 'settings_adminIP' => 'Beheer IP',
 'settings_adminIP_desc' => 'Indien ingesteld kan de beheerder alleen vanaf het ingestelde IP adres inloggen. Leeg laten om controle te vermijden. Opmerking: Werkt alleen met lokale authenticatie (Geen LDAP)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Uitgebreid',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authenticatie instellingen',
@@ -903,6 +904,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Pad voor drop folder',
 'settings_dropFolderDir_desc' => 'Dit pad kan gebruikt worden voor dropfiles op de server en hier vanaf te importeren in plaats van uploaden via de browser.',
 'settings_Edition' => 'Uitgave instellingen',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Inschakelen Beheer Contr/Beoord',
 'settings_enableAdminRevApp_desc' => 'Uitvinken om beheerder niet te tonen als controleerder/beoordeler',
 'settings_enableCalendar' => 'Inschakelen Kalendar',
@@ -939,6 +942,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Inschakelen om een wachtwoord via mail te versturen als de gebruiker een nieuw wachtwoord heeft ingesteld.',
 'settings_enableRecursiveCount' => 'Document/ map teller herhalen toestaan',
 'settings_enableRecursiveCount_desc' => 'If turned on, the number of documents and folders in the folder view will be determined by counting all objects by recursively processing the folders and counting those documents and folders the user is allowed to access.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Beoordeling/ goedkeuring toestaan voor ingelogde gebruikers',
 'settings_enableSelfRevApp_desc' => 'Schakel in indien the huidig ingelogde gebruiker wordt toegewezen als goedkeurder/ beoordelaar en voor workflow overgangen.',
 'settings_enableThemeSelector' => 'Selecteer thema',
@@ -980,6 +985,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Installeer Zend Framework, als u volledigetekst zoekmechanisme wilt gebruiken',
 'settings_language' => 'Standaard taal',
 'settings_language_desc' => 'Standaard taal (naam van de submap in map "languages")',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Inschakelen Logbestand',
 'settings_logFileEnable_desc' => 'Inschakelen/uitschakelen logbestand',
 'settings_logFileRotation' => 'Logbestand Rotering',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 3b4970eeb..33c9d62d9 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -524,6 +524,7 @@ URL: [url]',
 'lastaccess' => 'Ostatni dostęp',
 'last_update' => 'Ostatnia aktualizacja',
 'legend' => 'Legenda',
+'librarydoc' => '',
 'linked_documents' => 'Powiązane dokumenty',
 'linked_files' => 'Załączniki',
 'link_alt_updatedocument' => 'Jeśli chcesz wczytać pliki większe niż bieżące maksimum, użyj alternatywnej <a href="%s">strony wczytywania</a>.',
@@ -645,6 +646,7 @@ URL: [url]',
 'no_linked_files' => 'Brak powiązanych dokumentów',
 'no_previous_versions' => 'Nie znaleziono poprzednich wersji',
 'no_review_needed' => 'Brak dokumentów w trakcie opiniowania.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Nie możesz zaktualizować tego dokumentu. Proszę skontaktuj się z osobą która go blokuje.',
 'no_user_image' => 'Nie znaleziono obrazu',
 'no_version_check' => 'Poszukiwanie nowej wersji DeedDMS nie powiodło się! To może być spowodowane ustawieniem opcji \'allow_url_fopen = 0\' w twojej konfiguracji PHP.',
@@ -756,6 +758,7 @@ URL: [url]',
 'review_update_failed' => 'Błąd podczas aktualizowania statusu recenzji. Aktualizacja nie powiodła się.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -845,8 +848,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Aktywuj rozszerzenie PHP',
 'settings_adminIP' => 'Adres IP Administratora',
 'settings_adminIP_desc' => 'Wprowadzenie tego adresu IP spowoduje, że administrator będzie mógł się logować tylko z tego adresu. Zostaw puste aby tego nie kontrolować. Uwaga! Działa tylko z autentykacją lokalną (nie w LDAP-ie)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Zaawansowane',
 'settings_apache_mod_rewrite' => 'Apache - Moduł Rewrite',
 'settings_Authentication' => 'Ustawienia uwierzytelniania',
@@ -891,6 +892,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Katalog dla folderu rozwijanego',
 'settings_dropFolderDir_desc' => 'Ten katalog służy do kopiowania plików, przeznaczonych do zaimportowania, bezpośrednio do serwera i z pominięciem przeglądarki. W tym katalogu muszą się znajdować podfoldery dla wszystkich użytkowników, którzy posiadają uprawnienia do tego typu importu.',
 'settings_Edition' => 'Ustawienia edycji',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Dołącz Administratora do recenzji/rewizji',
 'settings_enableAdminRevApp_desc' => 'Odznacz aby usunąć Administratora z listy zatwierdzających/recenzentów',
 'settings_enableCalendar' => 'Włącz kalendarz',
@@ -927,6 +930,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Jeśli chcesz zezwolić użytkownikom na zmianę własnego hasła i wysyłanie go emailem, zaznacz tę opcję.',
 'settings_enableRecursiveCount' => 'Włącz licznik rekurencji dokumentu/folderu',
 'settings_enableRecursiveCount_desc' => 'Jeżeli jest włączone, to liczba dokumentów i folderów w widoku będzie ustalona poprzez zliczenie wszystkich obiektów przez rekurencyjnie przetwarzane foldery i policzenia tych dokumentów i folderów do których użytkownik ma dostęp',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Pozwalaj przeglądać/zatwierdzać dla zalogowanych użytkowników',
 'settings_enableSelfRevApp_desc' => 'Włącz tę opcję jeżeli zalogowany użytkownik ma prawo do recenzowania/zatwierdzania oraz do przepływu procesu',
 'settings_enableThemeSelector' => '',
@@ -968,6 +973,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Zainstaluj Zend Framework, jeśli zamierzasz używać przeszukiwania pełnotekstowego',
 'settings_language' => 'Domyślny język',
 'settings_language_desc' => 'Domyślny język (nazwa podkatalogu w katalogu "languages")',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Włącz plik dziennika',
 'settings_logFileEnable_desc' => 'Włącz/Wyłącz plik dziennika',
 'settings_logFileRotation' => 'Rotowanie pliku dziennika',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 7d13e5453..2fddbdb57 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -530,6 +530,7 @@ URL: [url]',
 'lastaccess' => 'Último acesso',
 'last_update' => 'última versão',
 'legend' => 'Legenda',
+'librarydoc' => '',
 'linked_documents' => 'Documentos relacionados',
 'linked_files' => 'Arquivos anexados',
 'link_alt_updatedocument' => 'Se você gostaria de fazer envio de arquivos maiores que o tamanho permitido, por favor use a página alternativa de <a href="%s">envio</a>.',
@@ -650,6 +651,7 @@ URL: [url]',
 'no_linked_files' => 'Não há arquivos vinculados',
 'no_previous_versions' => 'No other versions found',
 'no_review_needed' => 'Nenhuma revisão pendente.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Por isso você não pode atualizar este documento. Por favor contacte usuário que poáui a trava.',
 'no_user_image' => 'não foi encontrado imagem de perfil',
 'no_version_check' => 'Verificação de uma nova versão do SeedDMS falhou! Isso pode ser causado por allow_url_fopen configurado para 0 na sua configuração do PHP.',
@@ -774,6 +776,7 @@ URL: [url]',
 'review_update_failed' => 'Error updating review status. Update failed.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -863,8 +866,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Ativar extensão PHP',
 'settings_adminIP' => 'IP Administrador',
 'settings_adminIP_desc' => 'Se definido administrador pode entrar apenas por endereço IP especificado, deixe em branco para evitar o controle. NOTA: só funciona com Autenticação local (não LDAP)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Avançado',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Rewrite',
 'settings_Authentication' => 'Definições de autenticação',
@@ -909,6 +910,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Diretório para pasta suspensa',
 'settings_dropFolderDir_desc' => 'Este diretório pode ser usado para soltar arquivos no sistema de arquivos do servidor e importá-los de lá, em vez de fazer o upload através do browser. O diretório deve conter um sub-diretório para cada usuário que tem permissão para importar arquivos desta forma.',
 'settings_Edition' => 'Configurações Edição',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Permitir revisão/aprovação para administradores',
 'settings_enableAdminRevApp_desc' => 'Ative esta opção se quiser que os administradores sejam listados como revisores/aprovadores e para transições de fluxo de trabalho.',
 'settings_enableCalendar' => 'Habilitar Calendário',
@@ -945,6 +948,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Se você quiser permitir o usuário definir uma nova senha e enviá-la por e-mail, marque esta opção.',
 'settings_enableRecursiveCount' => 'Ativar contagem de documentos/pasta recursiva',
 'settings_enableRecursiveCount_desc' => 'Se estiver ativado, o número de documentos e pastas na exibição de pasta será determinada pela contagem de todos os objetos de forma recursiva proceáando as pastas e contando eáes documentos e pastas que o usuário tem permissão de acesso.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Permitir revisão/aprovação para usuário conectado',
 'settings_enableSelfRevApp_desc' => 'Habilite esta opção se quiser que o usuário conectado no momento seja listado como revisores/aprovadores e para transições de fluxo de trabalho.',
 'settings_enableThemeSelector' => 'Seleção de tema',
@@ -986,6 +991,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Instalar Zend Framework, se você pretende usar o motor de pesquisa de texto completo',
 'settings_language' => 'Idioma padrão',
 'settings_language_desc' => 'Idioma Padrão (nome de uma subpasta na pasta "languages")',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Ativar Log File',
 'settings_logFileEnable_desc' => 'Ativar/Dasativar arquivo log',
 'settings_logFileRotation' => 'Rotação do Arquivo Log',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index ce68ed3be..d06e2ed46 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -536,6 +536,7 @@ URL: [url]',
 'lastaccess' => 'Ultima accesare',
 'last_update' => 'Ultima actualizare',
 'legend' => 'Legendă',
+'librarydoc' => '',
 'linked_documents' => 'Documente relationate',
 'linked_files' => 'Atașamente',
 'link_alt_updatedocument' => 'Dacă doriți să încărcați fișiere mai mari decât dimensiunea maximă curentă de încărcare, vă rugăm să folosiți alternativa <a href="%s">pagină de încărcare</a>.',
@@ -657,6 +658,7 @@ URL: [url]',
 'no_linked_files' => 'Nici un fișiere asociate',
 'no_previous_versions' => 'Nu sunt alte versiuni gasite',
 'no_review_needed' => 'Nici o revizuire în așteptare.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Deci, nu puteti sa actualizati acest document. Vă rugăm să contactați administratorul.',
 'no_user_image' => 'Nu au fost găsite imagini',
 'no_version_check' => 'Verificarea pentru o noua versiune SeedDMS a reușit! Acest lucru ar putea fi cauzat de setarea allow_url_fopen=0 în configurația php-ului dumneavoastră.',
@@ -799,6 +801,7 @@ URL: [url]',
 'review_update_failed' => 'Eroare actualizarea status revizuire. Actualizarea a eșuat.',
 'revise_document' => 'Revizuiti documentul',
 'revise_document_on' => 'Urmatoarea revizuire a versiunii document pe [data]',
+'revision_date' => '',
 'revision_log' => 'Log revizuire',
 'revisors' => 'Revizuitori',
 'revisor_already_assigned' => 'Utilizatorul este deja asignat ca retrimitor.',
@@ -888,8 +891,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Activați extensia PHP',
 'settings_adminIP' => 'IP Admin',
 'settings_adminIP_desc' => 'Dacă este setat, adminul se poate autentifica numai de la adresa IP specificată, lăsați gol pentru a evita controlul. NOTĂ:  funcționează numai cu autentificarea locală (pe LDAP)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Avansat',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Setări de autentificare',
@@ -934,6 +935,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Director pentru plasare folder(drop folder)',
 'settings_dropFolderDir_desc' => 'Acest director poate fi utilizat pentru plasarea fișierelor pe sistemul de fișiere al serverului și importul acestora de acolo în loc să mai fie încărcate prin intermediul browser-ului. Directorul trebuie să conțină un subdirector pentru fiecare utilizator care are permisiunea de a importa fișiere în acest fel.',
 'settings_Edition' => 'Setările Editiei',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Permite revizuirea/aprobarea pentru admini',
 'settings_enableAdminRevApp_desc' => 'Activați această opțiune dacă doriți ca administratorii să fie listati ca revizuitori/aprobatori sau in tranzițiile workflow-ului.',
 'settings_enableCalendar' => 'Activare Calendar',
@@ -970,6 +973,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Dacă doriți să permiteti utilizatorilor să stabilească o nouă parolă și să le fie trimisă prin e-mail, bifați această opțiune.',
 'settings_enableRecursiveCount' => 'Activați numararea recursiva pentru documente/foldere',
 'settings_enableRecursiveCount_desc' => 'Dacă este activată, numărul de documente și foldere din vizualizarea unui director va fi determinat prin numărarea tuturor obiectelor recursiv din folderele unde accesul utilizatorului este permis.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Permite revizuirea/aprobarea pentru utilizatorul autentificat',
 'settings_enableSelfRevApp_desc' => 'Activați această opțiune dacă doriți ca utilizatorul autentificat să fie listat ca revizuitor/aprobator sau in tranzițiile workflow-ului.',
 'settings_enableThemeSelector' => 'Selecție Temă',
@@ -1011,6 +1016,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Instalați Zend Framework, dacă intenționați să utilizați căutare completă pe tot de textul',
 'settings_language' => 'Limba implicită',
 'settings_language_desc' => 'Limba implicită (numele subfolder-ului din folderul "language")',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Activare Log fișiser',
 'settings_logFileEnable_desc' => 'Activare/dezactivare log fișier',
 'settings_logFileRotation' => 'Rotire Log fișiser',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index e37603124..09b0a6cc8 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -524,6 +524,7 @@ URL: [url]',
 'lastaccess' => '',
 'last_update' => 'Последнее обновление',
 'legend' => 'Обозначения',
+'librarydoc' => '',
 'linked_documents' => 'Связанные документы',
 'linked_files' => 'Приложения',
 'link_alt_updatedocument' => 'Для загрузки файлов, превышающих ограничение размера, используйте <a href="%s">другой способ</a>.',
@@ -644,6 +645,7 @@ URL: [url]',
 'no_linked_files' => 'Нет связанных документов',
 'no_previous_versions' => 'Нет предыдущих версий',
 'no_review_needed' => 'Рецензия не требуется',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Вы не можете обновить документ. Свяжитесь с заблокировавшим его пользователем.',
 'no_user_image' => 'Изображение не найдено',
 'no_version_check' => '',
@@ -767,6 +769,7 @@ URL: [url]',
 'review_update_failed' => 'Ошибка обновления статуса рецензии',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -856,8 +859,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Активировать расширение PHP',
 'settings_adminIP' => 'Администраторский IP',
 'settings_adminIP_desc' => 'Если установлено, то администратор сможет зайти только с этого IP-адреса. Оставьте пустым, если это не требуется. Не работает с LDAP.',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Дополнительно',
 'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
 'settings_Authentication' => 'Настройки авторизации',
@@ -902,6 +903,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Размещение проходного каталога',
 'settings_dropFolderDir_desc' => 'Этот каталог используется для размещения файлов на сервере и их импорта вместо загрузки через браузер. Каталог должен содержать подкаталог для каждого пользователя, которому разрешён импорт файлов таким способом.',
 'settings_Edition' => 'Настройки версий',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Администратор как<br/>рецензирующий и утверждающий',
 'settings_enableAdminRevApp_desc' => 'Если отключено, администратор не отображается в списке рецензирующих и утверждающих.',
 'settings_enableCalendar' => 'Включить календарь',
@@ -938,6 +941,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Если включено, разрешает пользователям восстанавливать пароль через e-mail.',
 'settings_enableRecursiveCount' => 'Рекурсивно подсчитывать<br/>документы и каталоги',
 'settings_enableRecursiveCount_desc' => 'Если включено, количество документов и каталогов в виде каталога будет определятся рекурсивным подсчётом всех документов и каталогов разрешённых для доступа пользователя.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Разрешить рецензию/утверждение<br/>пользователями вошедшими в систему',
 'settings_enableSelfRevApp_desc' => 'Включите для того, чтобы пользователи, в настоящее время выполнившие вход в систему, были в списке рецензентов/утверждающих и в изменении процесса.',
 'settings_enableThemeSelector' => 'Выбор темы',
@@ -979,6 +984,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Установите Zend Framework, если собираетесь использовать полнотекстовый поиск',
 'settings_language' => 'Язык по умолчанию',
 'settings_language_desc' => 'Язык по умолчанию (каталог в «languages»).',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Включить журнал',
 'settings_logFileEnable_desc' => 'Включить/отключить журнал.',
 'settings_logFileRotation' => 'Ротация журнала',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 6aa0b24b1..77e8bafde 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -455,6 +455,7 @@ $text = array(
 'lastaccess' => '',
 'last_update' => 'Posledná aktualizácia',
 'legend' => '',
+'librarydoc' => '',
 'linked_documents' => 'Súvisiace dokumenty',
 'linked_files' => 'Prílohy',
 'link_alt_updatedocument' => '',
@@ -552,6 +553,7 @@ $text = array(
 'no_linked_files' => 'No linked files',
 'no_previous_versions' => 'Neboli nájdené žiadne iné verzie',
 'no_review_needed' => 'No review pending.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Preto nemôžete aktualizovať tento dokument. Prosím, kontaktujte používateľa, ktorý ho zamkol.',
 'no_user_image' => 'nebol nájdený žiadny obrázok',
 'no_version_check' => '',
@@ -640,6 +642,7 @@ $text = array(
 'review_update_failed' => 'Chyba pri aktualizácii stavu kontroly. Aktualizácia zlyhala.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -716,8 +719,6 @@ $text = array(
 'settings_activate_php_extension' => '',
 'settings_adminIP' => '',
 'settings_adminIP_desc' => '',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => '',
 'settings_apache_mod_rewrite' => '',
 'settings_Authentication' => '',
@@ -762,6 +763,8 @@ $text = array(
 'settings_dropFolderDir' => '',
 'settings_dropFolderDir_desc' => '',
 'settings_Edition' => '',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => '',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '',
@@ -798,6 +801,8 @@ $text = array(
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
@@ -839,6 +844,8 @@ $text = array(
 'settings_install_zendframework' => '',
 'settings_language' => '',
 'settings_language_desc' => '',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => '',
 'settings_logFileEnable_desc' => '',
 'settings_logFileRotation' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 486d6ebb3..f5293e3dd 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -524,6 +524,7 @@ URL: [url]',
 'lastaccess' => '',
 'last_update' => 'Senast uppdaterat',
 'legend' => 'Förteckning',
+'librarydoc' => '',
 'linked_documents' => 'Relaterade dokument',
 'linked_files' => 'Bilagor',
 'link_alt_updatedocument' => 'Om du vill ladda upp filer som är större än den aktuella största tillåtna storleken, använd dig av den alternativa metoden att ladda upp filer <a href="%s">Alternativ uppladdning</a>.',
@@ -645,6 +646,7 @@ URL: [url]',
 'no_linked_files' => 'Inga länkade dokumenter',
 'no_previous_versions' => 'Inga andra versioner hittades.',
 'no_review_needed' => 'Det finns inga dokument som du behöver granska.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Därför kan du inte uppdatera detta dokument. Ta kontakt med användaren som låst dokumentet.',
 'no_user_image' => 'Ingen bild hittades',
 'no_version_check' => 'Fel vid sökning efter ny version av SeedDMS! Ursaken kan vara att allow_url_fopen i din php konfiguration är satt till 0.',
@@ -762,6 +764,7 @@ URL: [url]',
 'review_update_failed' => 'Fel vid uppdatering av granskningsstatus. Kunde inte uppdatera.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -851,8 +854,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'Aktivera PHP-extension',
 'settings_adminIP' => 'Admin-IP',
 'settings_adminIP_desc' => 'Om den har satts, kan administratören bara logga in från den angivna IP-adressen. Lämna detta fält tomt för att undvika begränsningar. OBS! Fungerar bara med lokal autentisering (ingen LDAP).',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Avancerat',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Autentiseringsinställningar',
@@ -897,6 +898,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Mapp för mellanlagring av filer',
 'settings_dropFolderDir_desc' => 'Denna mapp kan användas för att mellanlagra filer på serverns filsystem och den kan importeras därifrån istället för att filen laddas upp via webbläsaren. Mappen måste innehålla en undermapp för varje användare som har tillstånd att importera filer denna vägen.',
 'settings_Edition' => 'Redigeringsinställningar',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Visa Admin i listan granska/godkänna',
 'settings_enableAdminRevApp_desc' => 'Ta bort utval, så att administratören inte kan väljas som person som kan granska/godkänna',
 'settings_enableCalendar' => 'Aktivera kalendern',
@@ -933,6 +936,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Om du vill tillåta att användare kan få nytt lösenord genom att skicka e-post, aktivera denna option.',
 'settings_enableRecursiveCount' => 'Aktivera rekursiv räkning av dokument/katalog',
 'settings_enableRecursiveCount_desc' => 'Om detta sätts på, kommer antal dokument och kataloger i katalogvyn fastställas genom att räkna alla objekter via rekursiv hantering av alla kataloger och räkna dessa dokument och kataloger som användaren har rättigheter till.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Tillåt granskning/godkänning av inloggad användare',
 'settings_enableSelfRevApp_desc' => 'Aktivera om du vill att aktuell inloggad användare visas i listan för personer som granskar/godkänner dokument och i övergång på arbetsflöden.',
 'settings_enableThemeSelector' => 'Tema urval',
@@ -974,6 +979,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Installera Zend Framework, om du tänker använda fulltext-sökningen',
 'settings_language' => 'Standardspråk',
 'settings_language_desc' => 'Standardspråk (namn på sub-mappen i mappen "languages")',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Aktivera loggfil',
 'settings_logFileEnable_desc' => 'Aktivera/Inaktivera loggfil',
 'settings_logFileRotation' => 'Loggfils-rotation',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 5c66a19ca..abaa57591 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -530,6 +530,7 @@ URL: [url]',
 'lastaccess' => 'Son erişim',
 'last_update' => 'Son Güncelleme',
 'legend' => 'Lejand',
+'librarydoc' => '',
 'linked_documents' => 'İlgili Dokümanlar',
 'linked_files' => 'Ekler',
 'link_alt_updatedocument' => 'Mevcut maksimum yükleme boyutundan daha büyük dosya yüklemek istiyorsanız <a href="%s">alternatif yükleme sayfası için tıklayın</a>.',
@@ -651,6 +652,7 @@ URL: [url]',
 'no_linked_files' => 'Link verilmiş dosya yok',
 'no_previous_versions' => 'Başka versiyon yok',
 'no_review_needed' => 'Bekleyen kontrol yok.',
+'no_revision_planed' => '',
 'no_update_cause_locked' => 'Bu doküman kilitli olduğundan güncellenemez. Lütfen kilitleyen kullanıcıyla görüşünüz.',
 'no_user_image' => 'Resim bulunamadı',
 'no_version_check' => 'SeedDMS yeni versiyon kontrolü başarısız oldu! Bunun sebebi php konfigürasyonunuzdaki allow_url_fopen parametresinin 0 olarak ayarlanması olabilir.',
@@ -778,6 +780,7 @@ URL: [url]',
 'review_update_failed' => 'Kontrol güncelleme durumu hatalı. Güncelleme başarısız.',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -867,8 +870,6 @@ URL: [url]',
 'settings_activate_php_extension' => 'PHP uzantısını etkinleştir',
 'settings_adminIP' => 'Admin IP',
 'settings_adminIP_desc' => 'Yöneticinin sadece belli bir IP adresinden erişmesini istiyorsanız IP adresini giriniz. Kontrolü kaybetme riski olduğunu düşünüyorsanız boş bırakınız. NOT: sadece yerel yetkilendirme ile çalışır (LDAP ile çalışmaz)',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => 'Gelişmiş ayarlar',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Yetkilendirme ayarları',
@@ -913,6 +914,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Sürükleme klasörü dizini',
 'settings_dropFolderDir_desc' => 'Bu dizin, tarayıcı üzerinden dosya göndermek yerine dosyaları sürükleyip bırakmak için kullanılacak dizindir. Bu işi yapmaya yetkili kılınmış her bir kullanıcı için alt dizin içermelidir.',
 'settings_Edition' => 'Düzenleme ayarları',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => 'Yöneticilere kontrol/onay izni ver',
 'settings_enableAdminRevApp_desc' => 'Yöneticilerin kontrol/onay listesine eklenmesi ve iş akış süreçlerini yapabilmeleri için bu ayarı etkinleştirin.',
 'settings_enableCalendar' => 'Takvimi Etkinleştir',
@@ -949,6 +952,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Kullanıcının unuttuğu parolayı kendisine gönderilecek e-posta ile sıfırlamasına izin vermek için bu seçeneği etkinleştirebilirsiniz.',
 'settings_enableRecursiveCount' => 'Özyinelenen doküman/klasör sayımını etkinleştir',
 'settings_enableRecursiveCount_desc' => 'Aktif hale getirildiğinde, klasör içindeki dokümanlar ve diğer klasörlerin sayısı kullanıcının erişim hakkı olan tüm nesnelerin özyinelemeli olarak sayılması yolu ile bulunur.',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => 'Giriş yapmış kullanıcılar için kontrol/onay izni ver',
 'settings_enableSelfRevApp_desc' => 'O an giriş yapmış olan kullanıcıları kontrol eden/onaylayan olarak listelemek ve iş akışına dahil etmek için bunu seçebilirsiniz.',
 'settings_enableThemeSelector' => 'Tema seçimini aç/kapat',
@@ -990,6 +995,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Tam metin arama motorundan faydalanmak isterseniz Zend Framework kurmalısınız.',
 'settings_language' => 'Varsayılan dil',
 'settings_language_desc' => 'Varsayılan dil ("languages" klasörü içindeki dil klasörü)',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => 'Log Dosyası Etkin',
 'settings_logFileEnable_desc' => 'Log dosyasını etkinleştir/devredışı bırak',
 'settings_logFileRotation' => 'Log Dosyası rotasyonu',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index d23a3dc2f..b909b66f1 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -461,6 +461,7 @@ URL: [url]',
 'lastaccess' => '',
 'last_update' => '上次更新',
 'legend' => '',
+'librarydoc' => '',
 'linked_documents' => '相关文档',
 'linked_files' => '附件',
 'link_alt_updatedocument' => '超过20M大文件，请选择<a href="%s">上传大文件</a>.',
@@ -558,6 +559,7 @@ URL: [url]',
 'no_linked_files' => '无链接文件',
 'no_previous_versions' => '无其它版本',
 'no_review_needed' => '无待校对的文件',
+'no_revision_planed' => '',
 'no_update_cause_locked' => '您不能更新此文档，请联系该文档锁定人',
 'no_user_image' => '无图片',
 'no_version_check' => '',
@@ -646,6 +648,7 @@ URL: [url]',
 'review_update_failed' => '错误 更新校对状态.更新失败',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -722,8 +725,6 @@ URL: [url]',
 'settings_activate_php_extension' => '',
 'settings_adminIP' => '',
 'settings_adminIP_desc' => '',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => '高级设置',
 'settings_apache_mod_rewrite' => '',
 'settings_Authentication' => '',
@@ -768,6 +769,8 @@ URL: [url]',
 'settings_dropFolderDir' => '',
 'settings_dropFolderDir_desc' => '',
 'settings_Edition' => '',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => '',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '',
@@ -804,6 +807,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
@@ -845,6 +850,8 @@ URL: [url]',
 'settings_install_zendframework' => '',
 'settings_language' => '语言设置',
 'settings_language_desc' => '默认语言（“语言”文件夹的一个子文件夹的名字',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => '',
 'settings_logFileEnable_desc' => '',
 'settings_logFileRotation' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 551059c73..0ee03b05f 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -459,6 +459,7 @@ URL: [url]',
 'lastaccess' => '',
 'last_update' => '上次更新',
 'legend' => '',
+'librarydoc' => '',
 'linked_documents' => '相關文檔',
 'linked_files' => '附件',
 'link_alt_updatedocument' => '超過20M大檔，請選擇<a href="%s">上傳大檔</a>.',
@@ -556,6 +557,7 @@ URL: [url]',
 'no_linked_files' => '無連結檔',
 'no_previous_versions' => '無其它版本',
 'no_review_needed' => '無待校對的文件',
+'no_revision_planed' => '',
 'no_update_cause_locked' => '您不能更新此文檔，請聯繫該文檔鎖定人',
 'no_user_image' => '無圖片',
 'no_version_check' => '',
@@ -644,6 +646,7 @@ URL: [url]',
 'review_update_failed' => '錯誤 更新校對狀態.更新失敗',
 'revise_document' => '',
 'revise_document_on' => '',
+'revision_date' => '',
 'revision_log' => '',
 'revisors' => '',
 'revisor_already_assigned' => '',
@@ -720,8 +723,6 @@ URL: [url]',
 'settings_activate_php_extension' => '',
 'settings_adminIP' => '',
 'settings_adminIP_desc' => '',
-'settings_ADOdbPath' => '',
-'settings_ADOdbPath_desc' => '',
 'settings_Advanced' => '',
 'settings_apache_mod_rewrite' => '',
 'settings_Authentication' => '',
@@ -766,6 +767,8 @@ URL: [url]',
 'settings_dropFolderDir' => '',
 'settings_dropFolderDir_desc' => '',
 'settings_Edition' => '',
+'settings_enableAcknowledgeWorkflow' => '',
+'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminRevApp' => '',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '',
@@ -802,6 +805,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => '',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
+'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
 'settings_enableThemeSelector' => '',
@@ -843,6 +848,8 @@ URL: [url]',
 'settings_install_zendframework' => '',
 'settings_language' => '',
 'settings_language_desc' => '',
+'settings_libraryFolder' => '',
+'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => '',
 'settings_logFileEnable_desc' => '',
 'settings_logFileRotation' => '',

From 9de1ff7cf459b1c259da0072686fba44737004e7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 08:52:03 +0200
Subject: [PATCH 0155/2006] add translations for search form

---
 languages/ar_EG/lang.inc |  4 ++++
 languages/bg_BG/lang.inc |  4 ++++
 languages/ca_ES/lang.inc |  4 ++++
 languages/cs_CZ/lang.inc |  4 ++++
 languages/de_DE/lang.inc |  6 +++++-
 languages/en_GB/lang.inc |  6 +++++-
 languages/es_ES/lang.inc |  4 ++++
 languages/fr_FR/lang.inc |  4 ++++
 languages/hu_HU/lang.inc |  4 ++++
 languages/it_IT/lang.inc |  4 ++++
 languages/nl_NL/lang.inc |  4 ++++
 languages/pl_PL/lang.inc |  4 ++++
 languages/pt_BR/lang.inc |  4 ++++
 languages/ro_RO/lang.inc |  4 ++++
 languages/ru_RU/lang.inc |  4 ++++
 languages/sk_SK/lang.inc |  4 ++++
 languages/sv_SE/lang.inc |  4 ++++
 languages/tr_TR/lang.inc |  4 ++++
 languages/zh_CN/lang.inc | 10 +++++++---
 languages/zh_TW/lang.inc |  4 ++++
 20 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 96b389225..de0f0ef10 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -818,11 +818,15 @@ URL: [url]',
 'search_fulltext' => 'بحث في النص الكامل',
 'search_in' => 'بحث في',
 'search_mode_and' => 'كل الكلمات',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'على الاقل كلمة واحدة',
 'search_no_results' => 'لا يوجد مستند مطابق للبحث',
 'search_query' => 'بحث عن',
 'search_report' => 'وجد [doccount] مستند و [foldercount] مجلد في [searchtime] ثانية.',
 'search_report_fulltext' => 'وجد [doccount] مستندات',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'نتائج البحث',
 'search_results_access_filtered' => 'نتائج البحث من الممكن ان تحتوى بعد المستندات التى ليس لديك صلاحية اليها',
 'search_time' => 'الوقت المتبقي: [time] sec.',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index fcfab086a..b30e81d7c 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -683,11 +683,15 @@ $text = array(
 'search_fulltext' => 'Пълнотекстово търсене',
 'search_in' => 'Търси в',
 'search_mode_and' => 'всички думи',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'поне една дума',
 'search_no_results' => 'Няма документи, отговарящи на запитването',
 'search_query' => 'Търси!',
 'search_report' => 'Намерени са [doccount] документа и [foldercount] папки',
 'search_report_fulltext' => 'Намерени са [doccount] документа',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Результати от търсенето',
 'search_results_access_filtered' => 'Резултатите от търсенето могат да съдържат объекти за които нямате достъп',
 'search_time' => 'Изминаха: [time] sec.',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index c387b51f2..205666a31 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -688,11 +688,15 @@ URL: [url]',
 'search_fulltext' => 'Search in fulltext',
 'search_in' => 'Buscar a',
 'search_mode_and' => 'tots els mots',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'si més no, un mot',
 'search_no_results' => 'No hi ha documents que coincideixn amb la seva cerca',
 'search_query' => 'Cercar',
 'search_report' => 'Trobats [count] documents',
 'search_report_fulltext' => '',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Resultats de la cerca',
 'search_results_access_filtered' => 'Els resultats de la cerca podrien incloure continguts amb l\'accés denegat.',
 'search_time' => 'Temps transcorregut: [time] seg.',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 6f03b9096..d0f787f4c 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -827,11 +827,15 @@ URL: [url]',
 'search_fulltext' => 'Vyhledat fulltextově',
 'search_in' => 'Prohledávat',
 'search_mode_and' => 'všechna slova',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'alespoň jedno ze slov',
 'search_no_results' => 'Vašemu dotazu nevyhovují žádné dokumenty',
 'search_query' => 'Hledat',
 'search_report' => 'Nalezených [count] dokumentů odpovídajících dotazu',
 'search_report_fulltext' => 'Found [doccount] documents',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Výsledky hledání',
 'search_results_access_filtered' => 'Výsledky hledání můžou obsahovat obsah, ke kterému byl zamítnut přístup.',
 'search_time' => 'Uplynulý čas: [time] sek',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 4909a2539..50dfb619c 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2067), dgrutsch (18)
+//    Translators: Admin (2071), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -847,11 +847,15 @@ URL: [url]',
 'search_fulltext' => 'Suche im Volltext',
 'search_in' => 'Suchen in',
 'search_mode_and' => 'alle Begriffe',
+'search_mode_documents' => 'Nur Dokumente',
+'search_mode_folders' => 'Nur Ordner',
 'search_mode_or' => 'min. ein Begriff',
 'search_no_results' => 'Die Suche lieferte leider keine Treffer.',
 'search_query' => 'Suchbegriffe',
 'search_report' => 'Die Suche lieferte [doccount] Dokumente und [foldercount] Ordner in [searchtime] Sek.',
 'search_report_fulltext' => 'Die Suche lieferte [doccount] Dokumente',
+'search_resultmode' => 'Ergebnis',
+'search_resultmode_both' => 'Dokumente und Ordner',
 'search_results' => 'Suchergebnis',
 'search_results_access_filtered' => 'Suchresultate können Inhalte enthalten, zu welchen der Zugang verweigert wurde.',
 'search_time' => 'Dauer: [time] sek.',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 01d01ff8e..358d9df5d 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1195), dgrutsch (3), netixw (14)
+//    Translators: Admin (1199), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -854,11 +854,15 @@ URL: [url]',
 'search_fulltext' => 'Search in fulltext',
 'search_in' => 'Search in',
 'search_mode_and' => 'all words',
+'search_mode_documents' => 'Documents only',
+'search_mode_folders' => 'Folders only',
 'search_mode_or' => 'at least one word',
 'search_no_results' => 'There are no documents that match your search',
 'search_query' => 'Search for',
 'search_report' => 'Found [doccount] documents and [foldercount] folders in [searchtime] sec.',
 'search_report_fulltext' => 'Found [doccount] documents',
+'search_resultmode' => 'Search result',
+'search_resultmode_both' => 'Documents and folders',
 'search_results' => 'Search results',
 'search_results_access_filtered' => 'Search results may contain content to which access has been denied.',
 'search_time' => 'Elapsed time: [time] sec.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 045f2fb88..3084d8072 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -833,11 +833,15 @@ URL: [url]',
 'search_fulltext' => 'Buscar en texto completo',
 'search_in' => 'Buscar en',
 'search_mode_and' => 'todas las palabras',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'al menos una palabra',
 'search_no_results' => 'No hay documentos que coincidan con su búsqueda',
 'search_query' => 'Buscar',
 'search_report' => 'Encontrados [doccount] documentos y [foldercount] carpetas en [searchtime] s.',
 'search_report_fulltext' => 'Encontrados [doccount] documentos',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Resultados de la búsqueda',
 'search_results_access_filtered' => 'Los resultados de la búsqueda podrían incluir contenidos cuyo acceso ha sido denegado.',
 'search_time' => 'Tiempo transcurrido: [time] seg.',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 95400cfa0..9c22f496a 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -809,11 +809,15 @@ URL: [url]',
 'search_fulltext' => 'Rechercher dans le texte',
 'search_in' => 'Rechercher dans',
 'search_mode_and' => 'tous les mots',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'au moins un mot',
 'search_no_results' => 'Aucun document ne correspond à la recherche',
 'search_query' => 'Rechercher',
 'search_report' => '[doccount] documents trouvé(s) et [foldercount] dossiers en [searchtime] sec.',
 'search_report_fulltext' => '[doccount] documents trouvé(s)',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Résultats de recherche',
 'search_results_access_filtered' => 'L\'accès à certains résultats de la recherche pourrait être refusé.',
 'search_time' => 'Temps écoulé: [time] sec.',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 8ca503c5c..f4f329b7d 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -832,11 +832,15 @@ URL: [url]',
 'search_fulltext' => 'Keresés a teljes szövegben',
 'search_in' => 'Keresés ebben a könyvtárban',
 'search_mode_and' => 'egyezés minden szóra',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'egyezés legalább egy szóra',
 'search_no_results' => 'Nem található a keresett kifejezésnek megfelelő dokumentum',
 'search_query' => 'Keresés erre',
 'search_report' => '[searchtime] másodperc alatt [doccount] dokumentumot és [foldercount] mappát találtunk.',
 'search_report_fulltext' => '[doccount] dokumentum található',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Találatok',
 'search_results_access_filtered' => 'Search results may contain content to which access has been denied.',
 'search_time' => 'Felhasznßlt id: [time] mßsodperc.',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index c0a69c01f..fa4cfd8c1 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -855,11 +855,15 @@ URL: [url]',
 'search_fulltext' => 'Ricerca fulltext',
 'search_in' => 'Cerca in',
 'search_mode_and' => 'tutte le parole',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'almeno una parola',
 'search_no_results' => 'Non ci sono documenti che soddisfino la vostra ricerca',
 'search_query' => 'Cerca per',
 'search_report' => 'Trovati [doccount] documenti e [foldercount] cartelle in [searchtime] secondi.',
 'search_report_fulltext' => 'Trovati [doccount] documenti',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Risultato ricerca',
 'search_results_access_filtered' => 'La ricerca può produrre risultati al cui contenuto è negato l\'accesso.',
 'search_time' => 'Tempo trascorso: [time] secondi.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 31ea66445..192e7981d 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -824,11 +824,15 @@ URL: [url]',
 'search_fulltext' => 'Zoek in volledige tekst',
 'search_in' => 'Zoek in',
 'search_mode_and' => 'alle woorden',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'tenminste 1 woord',
 'search_no_results' => 'Er zijn geen documenten gevonden die aan uw zoekvraag voldoen',
 'search_query' => 'Zoeken naar',
 'search_report' => '[count] documenten en [foldercount] mappen gevonden in [searchtime] sec.',
 'search_report_fulltext' => '[doccount] documenten gevonden',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Zoekresultaten',
 'search_results_access_filtered' => 'Zoekresultaten kunnen inhoud bevatten waar U geen toegang toe heeft.',
 'search_time' => 'Verstreken tijd: [time] sec.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 33c9d62d9..c58fb77d2 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -812,11 +812,15 @@ URL: [url]',
 'search_fulltext' => 'Przeszukaj całe teksty',
 'search_in' => 'Szukaj w',
 'search_mode_and' => 'wszystkie słowa',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'conajmnej jedno słowo',
 'search_no_results' => 'Nie znaleziono dokumentów spełniających kryteria wyszukiwania.',
 'search_query' => 'Wyszukaj',
 'search_report' => 'Znaleziono [doccount] dokumentów i [foldercount] katalogów w [searchtime] sec.',
 'search_report_fulltext' => 'Znaleziono [doccount] dokumentów',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Wyniki wyszukiwania',
 'search_results_access_filtered' => 'Wyniki wyszukiwania mogą zawierać treści, do których dostęp jest zabroniony.',
 'search_time' => 'Upływający czas: [time] sec.',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 2fddbdb57..ab59d4b10 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -830,11 +830,15 @@ URL: [url]',
 'search_fulltext' => 'Pesquisa em texto completo',
 'search_in' => 'Busca em',
 'search_mode_and' => 'todas as palavras',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'at least one word',
 'search_no_results' => 'não há documento que satisfaçam sua busca',
 'search_query' => 'Busca por',
 'search_report' => 'Encontrados [count] documentos',
 'search_report_fulltext' => 'Encontrados [doccount] documentos',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Resultados da busca',
 'search_results_access_filtered' => 'Search results may contain content to which access has been denied.',
 'search_time' => 'Tempo decorrido: [time] sec.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index d06e2ed46..6118a184e 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -855,11 +855,15 @@ URL: [url]',
 'search_fulltext' => 'Caută în tot textul',
 'search_in' => 'Caută în',
 'search_mode_and' => 'toate cuvintele',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'cel putin un cuvant',
 'search_no_results' => 'Nu există documente care corespund căutarii dumneavoastră',
 'search_query' => 'Caută după',
 'search_report' => 'S-au găsit [doccount] documente și [foldercount] foldere în [searchtime] sec.',
 'search_report_fulltext' => 'S-au găsit [doccount] documente',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Rezultatele căutării',
 'search_results_access_filtered' => 'Rezultatele căutării pot cuprinde conținut la care accesul a fost interzis.',
 'search_time' => 'Timp scurs: [time] sec.',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 09b0a6cc8..6526a5704 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -823,11 +823,15 @@ URL: [url]',
 'search_fulltext' => 'Полнотекстовый поиск',
 'search_in' => 'Поиск',
 'search_mode_and' => 'Все слова',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'Хотя бы одно слово',
 'search_no_results' => 'Нет документов, соответствующих запросу',
 'search_query' => 'Искать',
 'search_report' => 'Найдено документов: [doccount] и каталогов: [foldercount]',
 'search_report_fulltext' => 'Найдено документов: [doccount]',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Результаты поиска',
 'search_results_access_filtered' => 'Результаты поиска могут содержать объекты к которым у вас нет доступа',
 'search_time' => 'Прошло: [time] с',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 77e8bafde..590278896 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -683,11 +683,15 @@ $text = array(
 'search_fulltext' => '',
 'search_in' => 'Prehľadávať',
 'search_mode_and' => 'všetky slová',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'aspoň jedno zo slov',
 'search_no_results' => 'Vašej požiadavke nevyhovujú žiadne dokumenty',
 'search_query' => 'Hľadať',
 'search_report' => 'Nájdených [count] dokumentov',
 'search_report_fulltext' => '',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Výsledky hľadania',
 'search_results_access_filtered' => 'Výsledky hľadania môžu obsahovať obsah, ku ktorému bol zamietnutý prístup.',
 'search_time' => 'Uplynulý čas: [time] sek',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index f5293e3dd..6593ad7bf 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -818,11 +818,15 @@ URL: [url]',
 'search_fulltext' => 'Fulltext-sökning',
 'search_in' => 'Sök i',
 'search_mode_and' => 'alla ord',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'minst ett ord',
 'search_no_results' => 'Det finns inga dokument som matchar din sökning',
 'search_query' => 'Sök efter',
 'search_report' => 'Hittat [doccount] dokument och [foldercount] kataloger',
 'search_report_fulltext' => 'Hittat [doccount] dokument',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Sökresultat',
 'search_results_access_filtered' => 'Sökresultatet kan innehålla filer/dokument som du inte har behörighet att öppna.',
 'search_time' => 'Förfluten tid: [time] sek',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index abaa57591..b3979f21e 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -834,11 +834,15 @@ URL: [url]',
 'search_fulltext' => 'Tam metinde ara',
 'search_in' => 'Şurada ara',
 'search_mode_and' => 'tüm sözcükler',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => 'en az bir sözcük',
 'search_no_results' => 'Arama kriterinize uyan bir doküman bulunamadı',
 'search_query' => 'Arama sorgusu',
 'search_report' => '[doccount] adet dosya ve [foldercount] adet klasör [searchtime] saniye içinde bulundu',
 'search_report_fulltext' => '[doccount] adet doküman bulundu',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => 'Arama sonucu',
 'search_results_access_filtered' => 'Arama sonuçları içerisinde erişimin kısıtlandığı içerik bulunabilir.',
 'search_time' => 'Arama süresi: [time] sn.',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index b909b66f1..11b6e228b 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (576), fengjohn (5)
+//    Translators: Admin (578), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -174,10 +174,10 @@ URL: [url]',
 'change_revisors' => '',
 'change_status' => '变更状态',
 'charts' => '图表',
-'chart_docsaccumulated_title' => '',
+'chart_docsaccumulated_title' => '文档数量',
 'chart_docspercategory_title' => '',
 'chart_docspermimetype_title' => '',
-'chart_docspermonth_title' => '',
+'chart_docspermonth_title' => '每月创建的新文档',
 'chart_docsperstatus_title' => '',
 'chart_docsperuser_title' => '',
 'chart_selection' => '',
@@ -689,11 +689,15 @@ URL: [url]',
 'search_fulltext' => '',
 'search_in' => '搜索于',
 'search_mode_and' => '与模式',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => '或模式',
 'search_no_results' => '没有找到与您搜索添加相匹配的文件',
 'search_query' => '搜索',
 'search_report' => '找到 [count] 个文档',
 'search_report_fulltext' => '',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => '搜索结果',
 'search_results_access_filtered' => '搜索到得结果中可能包含受限访问的文档',
 'search_time' => '耗时:[time]秒',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 0ee03b05f..4bc6e605e 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -687,11 +687,15 @@ URL: [url]',
 'search_fulltext' => '',
 'search_in' => '搜索於',
 'search_mode_and' => '與模式',
+'search_mode_documents' => '',
+'search_mode_folders' => '',
 'search_mode_or' => '或模式',
 'search_no_results' => '沒有找到與您搜索添加相匹配的檔',
 'search_query' => '搜索',
 'search_report' => '找到 [count] 個文檔',
 'search_report_fulltext' => '',
+'search_resultmode' => '',
+'search_resultmode_both' => '',
 'search_results' => '搜索結果',
 'search_results_access_filtered' => '搜索到得結果中可能包含受限訪問的文檔',
 'search_time' => '耗時:[time]秒',

From bd08e9b125ee876cdf9588a77dc3a532ebc17bd7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 08:52:36 +0200
Subject: [PATCH 0156/2006] search for documents/folders only

---
 op/op.Search.php                 |  3 +++
 views/bootstrap/class.Search.php | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/op/op.Search.php b/op/op.Search.php
index f3809faa3..6677c64bb 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -195,6 +195,9 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 	 * are found
 	 */
 	$resultmode = 0x03;
+	if (isset($_GET["resultmode"]) && is_numeric($_GET["resultmode"])) {
+			$resultmode = $_GET['resultmode'];
+	}
 
 	$mode = "AND";
 	if (isset($_GET["mode"]) && is_numeric($_GET["mode"]) && $_GET["mode"]==0) {
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 248e6d3a9..c004ab91f 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -143,6 +143,16 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 </td>
 </tr>
 <tr>
+<td><?php printMLText("search_resultmode");?>:</td>
+<td>
+<select name="resultmode">
+<option value="3" <?php echo ($resultmode=='3') ? "selected" : ""; ?>><?php printMLText("search_resultmode_both");?>
+<option value="2"<?php echo ($resultmode=='2') ? "selected" : ""; ?>><?php printMLText("search_mode_folders");?>
+<option value="1"<?php echo ($resultmode=='1') ? "selected" : ""; ?>><?php printMLText("search_mode_documents");?>
+</select>
+</td>
+</tr>
+<tr>
 <td><?php printMLText("under_folder")?>:</td>
 <td><?php $this->printFolderChooser("form1", M_READ, -1, $startfolder);?></td>
 </tr>

From 325b91933d6c079c1ae09a82804c31dcaa9d226d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 10:00:15 +0200
Subject: [PATCH 0157/2006] new document status S_DRAFT, initial doc status can
 set

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 17ab05cec..35679017a 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -46,6 +46,14 @@ define("S_IN_WORKFLOW",  3);
  */
 define("S_IN_REVISION",  4);
 
+/*
+ * Document is in draft status. Being in draft means that the document
+ * is still worked on. This status is mainly for uploading documents
+ * which aren't fully complete but needs to accessible for the public,
+ * e.g. in order to colaborate on them.
+ */
+define("S_DRAFT",  5);
+
 /*
  * Document was rejected. A document is in rejected state when
  * the review failed or approval was not given.
@@ -1443,7 +1451,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * @param object $workflow
 	 * @return bool/array false in case of an error or a result set
 	 */
-	function addContent($comment, $user, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null) { /* {{{ */
+	function addContent($comment, $user, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null, $initstate=S_RELEASED) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		// the doc path is id/version.filetype
@@ -1573,6 +1581,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		elseif($workflow) {
 			$status = S_IN_WORKFLOW;
 			$comment = ", workflow: ".$workflow->getName();
+		} elseif($initstate == S_DRAFT) {
+			$status = $initstate;
+			$comment = "";
 		} else {
 			$status = S_RELEASED;
 			$comment = "";
@@ -2680,8 +2691,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	function getStatus() { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
-		if (!is_numeric($limit)) return false;
-
 		// Retrieve the current overall status of the content represented by
 		// this object.
 		if (!isset($this->_status)) {
@@ -2757,7 +2766,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		// If the supplied value lies outside of the accepted range, return an
 		// error.
-		if ($status < -3 || $status > 4) {
+		if ($status < -3 || $status > 5) {
 			return false;
 		}
 

From 3a99d005b1b928dc4ff67321bde0b2ad551c4bfd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 10:01:08 +0200
Subject: [PATCH 0158/2006] new parameter initialstate for addDocument()

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 5af747db9..c97cd2be9 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -751,11 +751,14 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 *        must be the id of the attribute definition.
 	 * @param array $version_attributes list of document version attributes.
 	 *        The element key must be the id of the attribute definition.
+	 * @param object $workflow
+	 * @param integer $initstate initial document state (only S_RELEASED and
+	 *        S_DRAFT are allowed)
 	 * @return array/boolean false in case of error, otherwise an array
 	 *        containing two elements. The first one is the new document, the
 	 *        second one is the result set returned when inserting the content.
 	 */
-	function addDocument($name, $comment, $expires, $owner, $keywords, $categories, $tmpFile, $orgFileName, $fileType, $mimeType, $sequence, $reviewers=array(), $approvers=array(),$reqversion=0,$version_comment="", $attributes=array(), $version_attributes=array(), $workflow=null) { /* {{{ */
+	function addDocument($name, $comment, $expires, $owner, $keywords, $categories, $tmpFile, $orgFileName, $fileType, $mimeType, $sequence, $reviewers=array(), $approvers=array(),$reqversion=0,$version_comment="", $attributes=array(), $version_attributes=array(), $workflow=null, $initstate=S_RELEASED) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$expires = (!$expires) ? 0 : $expires;
@@ -782,7 +785,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$document = $this->_dms->getDocument($db->getInsertID());
 
 //		if ($version_comment!="")
-			$res = $document->addContent($version_comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers, $reqversion, $version_attributes, $workflow);
+			$res = $document->addContent($version_comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers, $reqversion, $version_attributes, $workflow, $initstate);
 //		else $res = $document->addContent($comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers,$reqversion, $version_attributes, $workflow);
 
 		if (is_bool($res) && !$res) {

From 86f641c3b0f2e4fcd42e9fa16d6a0268cf2afede Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 10:02:02 +0200
Subject: [PATCH 0159/2006] new status in getOverallStatusText()

---
 inc/inc.Language.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index 4baae226a..bb13c30f0 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -307,6 +307,9 @@ function getOverallStatusText($status) { /* {{{ */
 			case S_IN_REVISION:
 				return getMLText("in_revision");
 				break;
+			case S_DRAFT:
+				return getMLText("draft");
+				break;
 			default:
 				return getMLText("status_unknown");
 				break;

From d9d4d89a27727a1fa246d668a74e9879cbe5118d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 10:02:46 +0200
Subject: [PATCH 0160/2006] set initial document status

---
 inc/inc.ClassSettings.php          | 5 ++++-
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index b770d8d9c..975eb05d0 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -136,6 +136,8 @@ class Settings { /* {{{ */
 	var $_enableNotificationWorkflow = false;
 	// preset expiration date
 	var $_presetExpirationDate = "";
+	// initial document status
+	var $_initialDocumentStatus = S_RELEASED;
 	// the name of the versioning info file created by the backup tool
 	var $_versioningFileName = "versioning_info.txt";
 	// the mode of workflow
@@ -499,6 +501,7 @@ class Settings { /* {{{ */
 		$this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]);
 		$this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]);
 		$this->_presetExpirationDate = strval($tab["presetExpirationDate"]);
+		$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]);
 		$this->_versioningFileName = strval($tab["versioningFileName"]);
 		$this->_workflowMode = strval($tab["workflowMode"]);
 		$this->_enableAcknowledgeWorkflow = strval($tab["enableAcknowledgeWorkflow"]);
@@ -774,8 +777,8 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp);
     $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp);
     $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);
+    $this->setXMLAttributValue($node, "initialDocumentStatus", $this->_initialDocumentStatus);
     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
-    $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);
     $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
     $this->setXMLAttributValue($node, "enableAcknowledgeWorkflow", $this->_enableAcknowledgeWorkflow);
     $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 8d6aa0695..34bac533e 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -148,6 +148,7 @@ if ($action == "saveSettings")
   // SETTINGS - ADVANCED - EDITION
   $settings->_versioningFileName = $_POST["versioningFileName"];
   $settings->_presetExpirationDate = $_POST["presetExpirationDate"];
+  $settings->_initialDocumentStatus = $_POST["initialDocumentStatus"];
   $settings->_workflowMode = $_POST["workflowMode"];
   $settings->_enableAcknowledgeWorkflow = $_POST["enableAcknowledgeWorkflow"];
   $settings->_enableRevisionWorkflow = $_POST["enableRevisionWorkflow"];
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 6fc9ace1e..2bcb53478 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -512,6 +512,15 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_presetExpirationDate");?>:</td>
         <td><input name="presetExpirationDate" type="text" value="<?php echo $settings->_presetExpirationDate; ?>" /></td>
       </tr>
+      <tr title="<?php printMLText("settings_initialDocumentStatus_desc");?>">
+        <td><?php printMLText("settings_initialDocumentStatus");?>:</td>
+				<td>
+					<select name="initialDocumentStatus" value="<?php echo $settings->_initialDocumentStatus; ?>" />
+						<option value="<?php echo S_RELEASED; ?>" <?php if ($settings->_initialDocumentStatus==S_RELEASED) echo "selected" ?>><?php printMLText("settings_initialDocumentStatus_released");?></option>
+						<option value="<?php echo S_DRAFT; ?>" <?php if ($settings->_initialDocumentStatus==S_DRAFT) echo "selected" ?>><?php printMLText("settings_initialDocumentStatus_draft");?></option>
+					</select>
+				</td>
+      </tr>
       <tr title="<?php printMLText("settings_enableAdminRevApp_desc");?>">
         <td><?php printMLText("settings_enableAdminRevApp");?>:</td>
         <td><input name="enableAdminRevApp" type="checkbox" <?php if ($settings->_enableAdminRevApp) echo "checked" ?> /></td>

From 944b059abed55fc57f77152dde3d2ab62ec2f63d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 10:03:09 +0200
Subject: [PATCH 0161/2006] set initial document status

---
 controllers/class.AddDocument.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 3217ba9dc..f856a4989 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -56,6 +56,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 		$workflow = $this->getParam('workflow');
 		$notificationgroups = $this->getParam('notificationgroups');
 		$notificationusers = $this->getParam('notificationusers');
+		$initialdocumentstatus = $this->getParam('initialdocumentstatus');
 
 		$result = $this->callHook('addDocument');
 		if($result === null) {
@@ -63,7 +64,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 															$cats, $userfiletmp, basename($userfilename),
 	                            $filetype, $userfiletype, $sequence,
 	                            $reviewers, $approvers, $reqversion,
-	                            $version_comment, $attributes, $attributes_version, $workflow);
+	                            $version_comment, $attributes, $attributes_version, $workflow, $initialdocumentstatus);
 
 			if (is_bool($res) && !$res) {
 				$this->errormsg = "error_occured";

From 5a29cde314bd2c98135154e07e715fea0b62d6dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 10:03:34 +0200
Subject: [PATCH 0162/2006] set initial document status

---
 op/op.AddDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 2d639170e..50e9b9421 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -359,6 +359,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	$controller->setParam('workflow', $workflow);
 	$controller->setParam('notificationgroups', $notgroups);
 	$controller->setParam('notificationusers', $notusers);
+	$controller->setParam('initialdocumentstatus', $settings->_initialDocumentStatus);
 
 	if(!$document = $controller->run()) {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText($controller->getErrorMsg()));

From 1bc5e6116c8837dd2a9aec7b7bba0ee5b010b0eb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 10:04:01 +0200
Subject: [PATCH 0163/2006] document status S_DRAFT can be set

---
 op/op.OverrideContentStatus.php                 | 2 +-
 views/bootstrap/class.OverrideContentStatus.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php
index d1c429eb6..080692d11 100644
--- a/op/op.OverrideContentStatus.php
+++ b/op/op.OverrideContentStatus.php
@@ -54,7 +54,7 @@ if (!is_object($content)) {
 }
 
 if (!isset($_POST["overrideStatus"]) || !is_numeric($_POST["overrideStatus"]) ||
-		(intval($_POST["overrideStatus"])<-3 && intval($_POST["overrideStatus"])>2)) {
+		(intval($_POST["overrideStatus"]) != S_RELEASED && intval($_POST["overrideStatus"]) != S_OBSOLETE && intval($_POST["overrideStatus"]) != S_DRAFT)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_status"));
 }
 
diff --git a/views/bootstrap/class.OverrideContentStatus.php b/views/bootstrap/class.OverrideContentStatus.php
index 26c30d68d..709875bf2 100644
--- a/views/bootstrap/class.OverrideContentStatus.php
+++ b/views/bootstrap/class.OverrideContentStatus.php
@@ -87,8 +87,9 @@ function checkForm()
 <option value=''></option>
 <?php
 
-		if ($overallStatus["status"] == S_OBSOLETE) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
-		if ($overallStatus["status"] == S_RELEASED) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
+		if ($overallStatus["status"] != S_RELEASED) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
+		if ($overallStatus["status"] != S_OBSOLETE) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
+		if ($overallStatus["status"] != S_DRAFT) echo "<option value='".S_DRAFT."'>".getOverallStatusText(S_DRAFT)."</option>";
 
 ?>
 </select>

From 1123611371dda1284f1e2f86cb92829722a173a9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 10:04:35 +0200
Subject: [PATCH 0164/2006] rename mayOverwriteStatus() to mayOverrideStatus()

---
 inc/inc.ClassAccessOperation.php       | 4 ++--
 views/bootstrap/class.ViewDocument.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index ed550e6d9..2a88af8df 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -74,11 +74,11 @@ class SeedDMS_AccessOperation {
 	 * The admin may even modify the status
 	 * even if is disallowed in the settings.
 	 */
-	function mayOverwriteStatus() { /* {{{ */
+	function mayOverrideStatus() { /* {{{ */
 		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE )) {
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE)) {
 				return true;
 			}
 		}
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 9848f9e02..8bc24643d 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -544,7 +544,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($accessop->mayRemoveVersion()) {
 			print "<li><a href=\"out.RemoveVersion.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
 		}
-		if($accessop->mayOverwriteStatus()) {
+		if($accessop->mayOverrideStatus()) {
 			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
 		}
 		if($accessop->maySetRecipients()) {

From ec78639d9488ed4133de9f7bce23d727d2e29db4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 10:18:37 +0200
Subject: [PATCH 0165/2006] do not hide review if workflow mode is
 traditional_only_approve

otherwise old documents which are still in review can't be reviewed
anymore
---
 views/bootstrap/class.ViewDocument.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8bc24643d..aa47a82b1 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -636,7 +636,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerstart();
 		print "<table class=\"table-condensed\">\n";
 
-		if ($workflowmode != 'traditional_only_approval' && is_array($reviewStatus) && count($reviewStatus)>0) {
+		/* Just check fo an exting reviewStatus, even workflow mode is set
+		 * to traditional_only_approval. There may be old documents which
+		 * are still in S_DRAFT_REV.
+		 */
+		if (/*$workflowmode != 'traditional_only_approval' &&*/ is_array($reviewStatus) && count($reviewStatus)>0) {
 
 			print "<tr><td colspan=5>\n";
 			$this->contentSubHeading(getMLText("reviewers"));
@@ -772,7 +776,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 			<div class="row-fluid">
 <?php
-			if($workflowmode != 'traditional_only_approval') {
+			/* Check for an existing review log, even if the workflowmode
+			 * is set to traditional_only_approval. There may be old documents
+			 * that still have a review log if the workflow mode has been
+			 * changed afterwards.
+			 */
+			if($latestContent->getReviewStatus(10) /*$workflowmode != 'traditional_only_approval'*/) {
 ?>
 				<div class="span6">
 				<?php $this->printProtocol($latestContent, 'review'); ?>

From dea874de02d2082055443750b2f049af588bdbfe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 17:26:41 +0200
Subject: [PATCH 0166/2006] set $_initialDocumentStatus to 2 instead of
 S_RELEASED

the constant S_RELEASED isn't know at that time
---
 inc/inc.ClassSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 975eb05d0..faaa56f0b 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -137,7 +137,7 @@ class Settings { /* {{{ */
 	// preset expiration date
 	var $_presetExpirationDate = "";
 	// initial document status
-	var $_initialDocumentStatus = S_RELEASED;
+	var $_initialDocumentStatus = 2; //S_RELEASED;
 	// the name of the versioning info file created by the backup tool
 	var $_versioningFileName = "versioning_info.txt";
 	// the mode of workflow

From a6085279c94744acc45632f18f1a50449160eb9c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 17:27:35 +0200
Subject: [PATCH 0167/2006] add class for downloading a bunch of document
 versions

---
 inc/inc.ClassDownloadMgr.php | 69 ++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 inc/inc.ClassDownloadMgr.php

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
new file mode 100644
index 000000000..598375cab
--- /dev/null
+++ b/inc/inc.ClassDownloadMgr.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Implementation of a download management.
+ *
+ * This class handles downloading of document lists.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2015 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class to represent an download manager
+ *
+ * This class provides some very basic methods to download document lists.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2015 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Download_Mgr {
+	/**
+	 * @var string $tmpdir directory where download archive is temp. created
+	 * @access protected
+	 */
+	protected $tmpdir;
+
+	/**
+	 * @var array $items list of document content items
+	 * @access protected
+	 */
+	protected $items;
+
+	function __construct($tmpdir = '') {
+		$this->tmpdir = $tmpdir;
+		$this->items = array();
+	}
+
+	public function addItem($item) { /* {{{ */
+		$this->items[$item->getID()] = $item;
+	} /* }}} */
+
+	public function createArchive($filename) { /* {{{ */
+		if(!$this->items) {
+			return false;
+		}
+
+		$zip = new ZipArchive();
+		$prefixdir = date('Y-m-d', time());
+
+		if($zip->open($filename, ZipArchive::CREATE) !== TRUE) {
+			return false;
+		}
+
+		foreach($this->items as $item) {
+			$document = $item->getDocument();
+			$dms = $document->_dms;
+
+			$zip->addFile($dms->contentDir.$item->getPath(), $prefixdir."/".$document->getID()."-".$item->getOriginalFileName());
+		}
+		$zip->close();
+	} /* }}} */
+}

From 11bac92d2f34688169ad091a1da9f2986d70a50e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 17:28:09 +0200
Subject: [PATCH 0168/2006] if $_GE['export'] is set the search result will be
 downloaded as a zipfile

---
 op/op.Search.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/op/op.Search.php b/op/op.Search.php
index 6677c64bb..4659270f1 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -414,6 +414,27 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 			}
 		}
 	}
+	if($_GET['export']) {
+		include("../inc/inc.ClassDownloadMgr.php");
+		$downmgr = new SeedDMS_Download_Mgr();
+		foreach($entries as $entry) {
+			if(get_class($entry) == $dms->getClassname('document')) {
+				$downmgr->addItem($entry->getLatestContent());
+			}
+		}
+		$filename = tempnam('/tmp', '');
+		$downmgr->createArchive($filename);
+		header("Content-Transfer-Encoding: binary");
+		header("Content-Length: " . filesize($filename));
+		header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
+		header("Content-Type: application/zip");
+		header("Cache-Control: must-revalidate");
+
+		readfile($filename);
+		unlink($filename);
+		exit;
+	}
+
 	$totalPages = (int) (count($entries)/$limit);
 	if(count($entries)%$limit)
 		$totalPages++;

From 13a977f84f44537f17e0f27bb95608cd169b714d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Jun 2015 17:29:33 +0200
Subject: [PATCH 0169/2006] add export button if search returned documents

---
 views/bootstrap/class.Search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index c004ab91f..50f90fd2e 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -192,7 +192,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 ?>
 
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
+<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button> <?php if($totaldocs): ?><a class="btn" href="<?= $_SERVER['REQUEST_URI']."&export=1" ?>"><i class="icon-download"></i> Export</a><?php endif; ?></td>
 </tr>
 
 </table>
@@ -406,6 +406,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 </tr>
 <tr>
 <td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
+			";
 </tr>
 </table>
 

From 94744862a54ffce136e04af80988279ccf62dcd6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jun 2015 09:06:59 +0200
Subject: [PATCH 0170/2006] create excel file with meta data for for files in
 zip archive

---
 inc/inc.ClassDownloadMgr.php | 93 ++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 598375cab..8b8ee4e16 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -13,6 +13,8 @@
  * @version    Release: @package_version@
  */
 
+require_once("PHPExcel.php");
+
 /**
  * Class to represent an download manager
  *
@@ -58,12 +60,103 @@ class SeedDMS_Download_Mgr {
 			return false;
 		}
 
+		$objPHPExcel = new PHPExcel();
+		$objPHPExcel->getProperties()->setCreator("MMK GmbH, Hagen, Germany")->setTitle("Metadata");
+		$sheet = $objPHPExcel->setActiveSheetIndex(0);
+
+		$i = 1;
+		$sheet->setCellValueByColumnAndRow(0, $i, 'Dokumenten-Nr.');
+		$sheet->setCellValueByColumnAndRow(1, $i, 'Dateiname');
+		$sheet->setCellValueByColumnAndRow(2, $i, 'Status');
+		$sheet->setCellValueByColumnAndRow(3, $i, 'Int. Version');
+		$sheet->setCellValueByColumnAndRow(4, $i, 'Prüfer');
+		$sheet->setCellValueByColumnAndRow(5, $i, 'Prüfdatum');
+		$sheet->setCellValueByColumnAndRow(6, $i, 'Prüfkommentar');
+		$sheet->setCellValueByColumnAndRow(7, $i, 'Prüfstatus');
+		$sheet->setCellValueByColumnAndRow(8, $i, 'Freigeber');
+		$sheet->setCellValueByColumnAndRow(9, $i, 'Freigabedatum');
+		$sheet->setCellValueByColumnAndRow(10, $i, 'Freigabekommentar');
+		$sheet->setCellValueByColumnAndRow(11, $i, 'Freigabestatus');
+		$i++;
 		foreach($this->items as $item) {
 			$document = $item->getDocument();
 			$dms = $document->_dms;
+			$status = $item->getStatus();
+			$reviewStatus = $item->getReviewStatus();
+			$approvalStatus = $item->getApprovalStatus();
 
 			$zip->addFile($dms->contentDir.$item->getPath(), $prefixdir."/".$document->getID()."-".$item->getOriginalFileName());
+			$sheet->setCellValueByColumnAndRow(0, $i, $document->getID());
+			$sheet->setCellValueByColumnAndRow(1, $i, $document->getID()."-".$item->getOriginalFileName());
+			$sheet->setCellValueByColumnAndRow(2, $i, getOverallStatusText($status['status']));
+			$sheet->setCellValueByColumnAndRow(3, $i, $item->getVersion());
+			$l = $i;
+			$k = $i;
+			if($reviewStatus) {
+				foreach ($reviewStatus as $r) {
+					switch ($r["type"]) {
+						case 0: // Reviewer is an individual.
+							$required = $dms->getUser($r["required"]);
+							if (!is_object($required)) {
+								$reqName = getMLText("unknown_user")." '".$r["required"]."'";
+							} else {
+								$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							}
+							break;
+						case 1: // Reviewer is a group.
+							$required = $dms->getGroup($r["required"]);
+							if (!is_object($required)) {
+								$reqName = getMLText("unknown_group")." '".$r["required"]."'";
+							} else {
+								$reqName = htmlspecialchars($required->getName());
+							}
+							break;
+					}
+					$sheet->setCellValueByColumnAndRow(4, $l, $reqName);
+					$sheet->setCellValueByColumnAndRow(5, $l, $r['date']);
+					$sheet->setCellValueByColumnAndRow(6, $l, $r['comment']);
+					$sheet->setCellValueByColumnAndRow(7, $l, getReviewStatusText($r["status"]));
+					$l++;
+				}
+				$l--;
+			}
+			if($approvalStatus) {
+				foreach ($approvalStatus as $r) {
+					switch ($r["type"]) {
+						case 0: // Reviewer is an individual.
+							$required = $dms->getUser($r["required"]);
+							if (!is_object($required)) {
+								$reqName = getMLText("unknown_user")." '".$r["required"]."'";
+							} else {
+								$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							}
+							break;
+						case 1: // Reviewer is a group.
+							$required = $dms->getGroup($r["required"]);
+							if (!is_object($required)) {
+								$reqName = getMLText("unknown_group")." '".$r["required"]."'";
+							} else {
+								$reqName = htmlspecialchars($required->getName());
+							}
+							break;
+					}
+					$sheet->setCellValueByColumnAndRow(8, $k, $reqName);
+					$sheet->setCellValueByColumnAndRow(9, $k, $r['date']);
+					$sheet->setCellValueByColumnAndRow(10, $k, $r['comment']);
+					$sheet->setCellValueByColumnAndRow(11, $k, getReviewStatusText($r["status"]));
+					$k++;
+				}
+				$k--;
+			}
+			$i = max($l, $k);
+			$i++;
 		}
+
+		$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
+		$file = tempnam("/tmp", "export-list-");
+		$objWriter->save($file);
+		$zip->addFile($file, $prefixdir."/metadata.xls");
 		$zip->close();
+		unlink($file);
 	} /* }}} */
 }

From f7c8d39b5da21551e755319c6009b03e8f1cf24b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jun 2015 09:08:32 +0200
Subject: [PATCH 0171/2006] pass resultmode to view

---
 op/op.Search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/op/op.Search.php b/op/op.Search.php
index 4659270f1..9c7ca3731 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -414,7 +414,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 			}
 		}
 	}
-	if($_GET['export']) {
+	if(isset($_GET['export']) && $_GET['export']) {
 		include("../inc/inc.ClassDownloadMgr.php");
 		$downmgr = new SeedDMS_Download_Mgr();
 		foreach($entries as $entry) {
@@ -462,6 +462,7 @@ if(count($entries) == 1) {
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
 		$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"]) ? true : false);
 		$view->setParam('mode', isset($mode) ? $mode : '');
+		$view->setParam('resultmode', isset($resultmode) ? $resultmode : '');
 		$view->setParam('searchin', isset($searchin) ? $searchin : array());
 		$view->setParam('startfolder', isset($startFolder) ? $startFolder : null);
 		$view->setParam('owner', $owner);

From 4b23765042235ba8e27769c9a3bb8d3ae46cf192 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jun 2015 09:09:03 +0200
Subject: [PATCH 0172/2006] show button to approve document if status is null

was only shown if the status of the document was S_APP_DRAFT
---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index aa47a82b1..744121070 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -756,7 +756,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td><ul class=\"unstyled\">";
 
 				if($accessop->mayApprove()) {
-					if ($is_approver && $status["status"]==S_DRAFT_APP) {
+					if ($is_approver && $r['status'] == 0 /*$status["status"]==S_DRAFT_APP*/) {
 						print "<li><a class=\"btn btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."</a></li>";
 					}else if (($updateUser==$user)&&(($a["status"]==1)||($a["status"]==-1))&&(!$document->hasExpired())){
 						print "<li><a class=\"btn btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."</a></li>";

From c2e2b1e9be2716a09e7f5b834924f7843c513997 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jun 2015 09:10:34 +0200
Subject: [PATCH 0173/2006] take resultmode from view parameters

---
 views/bootstrap/class.Search.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 50f90fd2e..ce0d86ae4 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -57,6 +57,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$allCats = $this->params['allcategories'];
 		$allUsers = $this->params['allusers'];
 		$mode = $this->params['mode'];
+		$resultmode = $this->params['resultmode'];
 		$workflowmode = $this->params['workflowmode'];
 		$enablefullsearch = $this->params['enablefullsearch'];
 		$enableclipboard = $this->params['enableclipboard'];

From da0b3e71b3783a64678bafdb00faf759a673b278 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jun 2015 21:58:17 +0200
Subject: [PATCH 0174/2006] approval can be added again

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 744121070..1ff85f0d3 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -756,7 +756,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td><ul class=\"unstyled\">";
 
 				if($accessop->mayApprove()) {
-					if ($is_approver && $r['status'] == 0 /*$status["status"]==S_DRAFT_APP*/) {
+					if ($is_approver && $a['status'] == 0 /*$status["status"]==S_DRAFT_APP*/) {
 						print "<li><a class=\"btn btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."</a></li>";
 					}else if (($updateUser==$user)&&(($a["status"]==1)||($a["status"]==-1))&&(!$document->hasExpired())){
 						print "<li><a class=\"btn btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."</a></li>";

From 46dc4ea6e30d4dac311b308db3ef4fcfa1d5fde0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jun 2015 21:59:56 +0200
Subject: [PATCH 0175/2006] add code for downloading file into contoller

---
 controllers/class.Download.php | 19 ++++++++++++++++++-
 op/op.Download.php             | 16 +++-------------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index 36d7b8186..577db2740 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -25,10 +25,10 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 	public function run() {
 		$dms = $this->params['dms'];
 		$type = $this->params['type'];
-		$content = $this->params['content'];
 
 		switch($type) {
 			case "version":
+				$content = $this->params['content'];
 
 				if(!$this->callHook('version')) {
 					header("Content-Transfer-Encoding: binary");
@@ -40,6 +40,23 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 					readfile($dms->contentDir . $content->getPath());
 				}
 				break;
+			case "file":
+				$file = $this->params['file'];
+
+				if(!$this->callHook('file')) {
+					header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
+					header("Content-Transfer-Encoding: binary");
+					header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));
+					header("Content-Disposition: attachment; filename=\"" . $file->getOriginalFileName() . "\"");
+					//header("Expires: 0");
+					header("Content-Type: " . $file->getMimeType());
+					//header("Cache-Control: no-cache, must-revalidate");
+					header("Cache-Control: must-revalidate");
+					//header("Pragma: no-cache");
+
+					readfile($dms->contentDir . $file->getPath());
+				}
+				break;
 		}
 	}
 }
diff --git a/op/op.Download.php b/op/op.Download.php
index 483a8e427..3d5453873 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -100,19 +100,9 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_file_id"));
 	}
 
-	header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
-	header("Content-Transfer-Encoding: binary");
-	header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));
-	header("Content-Disposition: attachment; filename=\"" . $file->getOriginalFileName() . "\"");
-	//header("Expires: 0");
-	header("Content-Type: " . $file->getMimeType());
-	//header("Cache-Control: no-cache, must-revalidate");
-	header("Cache-Control: must-revalidate");
-	//header("Pragma: no-cache");
-
-	ob_clean();
-	readfile($dms->contentDir . $file->getPath());
-
+	$controller->setParam('file', $file);
+	$controller->setParam('type', 'file');
+	$controller->run();
 } elseif (isset($_GET["arkname"])) {
 	$filename = basename($_GET["arkname"]);
 

From 20f28bb7dfc1117e1987ae256118766580016c27 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jun 2015 22:00:27 +0200
Subject: [PATCH 0176/2006] use /tmp for tempnam()

---
 op/op.AddDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 50e9b9421..6bdb2bebb 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -256,7 +256,7 @@ if($settings->_libraryFolder) {
 		if($clonedoc = $dms->getDocument($_POST["librarydoc"])) {
 			if($content = $clonedoc->getLatestContent()) {
 				$docsource = 'library';
-				$fullfile = tempnam('', '');
+				$fullfile = tempnam('/tmp', '');
 				if(SeedDMS_Core_File::copyFile($dms->contentDir . $content->getPath(), $fullfile)) {
 					/* Check if a local file is uploaded as well */
 					if(isset($_FILES["userfile"]['error'][0])) {

From fb2e7dfe1272a41c64cd7997c802923ef9b742c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jun 2015 22:03:08 +0200
Subject: [PATCH 0177/2006] utf8_decode file name in zip file

---
 inc/inc.ClassDownloadMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 8b8ee4e16..005d0ffa4 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -85,7 +85,7 @@ class SeedDMS_Download_Mgr {
 			$reviewStatus = $item->getReviewStatus();
 			$approvalStatus = $item->getApprovalStatus();
 
-			$zip->addFile($dms->contentDir.$item->getPath(), $prefixdir."/".$document->getID()."-".$item->getOriginalFileName());
+			$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($prefixdir."/".$document->getID()."-".$item->getOriginalFileName()));
 			$sheet->setCellValueByColumnAndRow(0, $i, $document->getID());
 			$sheet->setCellValueByColumnAndRow(1, $i, $document->getID()."-".$item->getOriginalFileName());
 			$sheet->setCellValueByColumnAndRow(2, $i, getOverallStatusText($status['status']));

From 15bb6177d8604b9fe4558616d9a0083ddd5a94aa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 07:00:06 +0200
Subject: [PATCH 0178/2006] pass version to url checking for new versions

---
 out/out.Info.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Info.php b/out/out.Info.php
index db7bd15d1..3fdc51744 100644
--- a/out/out.Info.php
+++ b/out/out.Info.php
@@ -34,7 +34,7 @@ if (!$user->isAdmin()) {
 $v = new SeedDMS_Version;
 $versions = array();
 if(@ini_get('allow_url_fopen') == '1') {
-	$lines = @file('http://www.seeddms.org/latest', FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
+	$lines = @file('http://www.seeddms.org/latest?version='.$v->version(), FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
 	if($lines) {
 		foreach($lines as $line) {
 			$versions[] = explode(':', $line);

From bd85c0c25aa2fb401aff7a94b8a39dc96191bcce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 07:15:18 +0200
Subject: [PATCH 0179/2006] set missing parameter [url] in email notification

---
 op/op.SetReviewersApprovers.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php
index c905ab87c..54efefe83 100644
--- a/op/op.SetReviewersApprovers.php
+++ b/op/op.SetReviewersApprovers.php
@@ -448,6 +448,7 @@ foreach ($pGrpApp as $p) {
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
 								$params['username'] = $user->getFullName();
+								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 

From 380ac2f1bdcd5478b75cf8ac6177874082a6f15a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 08:59:25 +0200
Subject: [PATCH 0180/2006] add currenttab to link when redirecting to
 out/out.ViewDocument.php

---
 op/op.AddDocumentLink.php    | 2 +-
 op/op.AddFile.php            | 2 +-
 op/op.ApproveDocument.php    | 2 +-
 op/op.ReceiptDocument.php    | 2 +-
 op/op.RemoveDocumentFile.php | 2 +-
 op/op.RemoveDocumentLink.php | 2 +-
 op/op.RemoveVersion.php      | 2 +-
 op/op.ReviewDocument.php     | 2 +-
 op/op.ReviseDocument.php     | 2 +-
 op/op.RewindWorkflow.php     | 2 +-
 op/op.RunSubWorkflow.php     | 2 +-
 op/op.TriggerWorkflow.php    | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/op/op.AddDocumentLink.php b/op/op.AddDocumentLink.php
index ca72f07be..40cfed21e 100644
--- a/op/op.AddDocumentLink.php
+++ b/op/op.AddDocumentLink.php
@@ -66,6 +66,6 @@ if (!$document->addDocumentLink($docid, $user->getID(), $public)){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 }
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=links");
 
 ?>
diff --git a/op/op.AddFile.php b/op/op.AddFile.php
index bc4a5788f..8dfe3f4e1 100644
--- a/op/op.AddFile.php
+++ b/op/op.AddFile.php
@@ -108,7 +108,7 @@ if (is_bool($res) && !$res) {
 
 add_log_line("?name=".$name."&documentid=".$documentid);
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=attachments");
 
 
 ?>
diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 989b9d97f..cee6769de 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -154,6 +154,6 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 	// TODO: if user os not owner send notification to owner
 }
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=revapp");
 
 ?>
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index 509e3938c..76f578833 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -97,6 +97,6 @@ if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=recipients");
 
 ?>
diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php
index f4726e4ff..fd9e61661 100644
--- a/op/op.RemoveDocumentFile.php
+++ b/op/op.RemoveDocumentFile.php
@@ -95,6 +95,6 @@ if (!$document->removeDocumentFile($fileid)) {
 
 add_log_line("?documentid=".$documentid."&fileid=".$fileid);
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=attachments");
 
 ?>
diff --git a/op/op.RemoveDocumentLink.php b/op/op.RemoveDocumentLink.php
index 435104258..359a9518d 100644
--- a/op/op.RemoveDocumentLink.php
+++ b/op/op.RemoveDocumentLink.php
@@ -70,6 +70,6 @@ if (!$document->removeDocumentLink($linkid)) {
 
 add_log_line("?documentid=".$documentid."&linkid=".$linkid);
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=links");
 
 ?>
diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index c4945ad6b..946eccaa8 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -191,6 +191,6 @@ else {
 
 add_log_line("?documentid=".$documentid."&version".$version_num);
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=previous");
 
 ?>
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 082ea758f..dc401c1e7 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -176,6 +176,6 @@ if ($newStatus == S_DRAFT_APP) {
 	}
 }
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=revapp");
 
 ?>
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index 2ef633378..7b22e1cda 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -145,6 +145,6 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 	}
 }
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=revision");
 
 ?>
diff --git a/op/op.RewindWorkflow.php b/op/op.RewindWorkflow.php
index 5147ee094..ccf6c4d9b 100644
--- a/op/op.RewindWorkflow.php
+++ b/op/op.RewindWorkflow.php
@@ -94,5 +94,5 @@ if($version->rewindWorkflow()) {
 
 add_log_line("?documentid=".$documentid."&version".$version_num);
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=workflow");
 ?>
diff --git a/op/op.RunSubWorkflow.php b/op/op.RunSubWorkflow.php
index a0e8dfb74..c0225cc25 100644
--- a/op/op.RunSubWorkflow.php
+++ b/op/op.RunSubWorkflow.php
@@ -103,5 +103,5 @@ if($version->runSubWorkflow($subworkflow)) {
 
 add_log_line("?documentid=".$documentid."&version".$version_num);
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=workflow");
 ?>
diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php
index 724d7ce78..6d01b1f8f 100644
--- a/op/op.TriggerWorkflow.php
+++ b/op/op.TriggerWorkflow.php
@@ -135,5 +135,5 @@ if($version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 
 add_log_line("?documentid=".$documentid."&version".$version_num);
 
-header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=workflow");
 ?>

From 82190c7d0e106392dc4446c19f4d869e2289ee39 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 09:00:22 +0200
Subject: [PATCH 0181/2006] check for current tab

---
 out/out.ViewDocument.php               |  1 +
 views/bootstrap/class.ViewDocument.php | 33 +++++++++++++-------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 091c2b496..527201038 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -85,6 +85,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
 	$view->setParam('checkOutDir', $settings->_checkOutDir);
+	$view->setParam('currenttab', isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '');
 	$view->show();
 	exit;
 }
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 1ff85f0d3..3b7a82b16 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -212,6 +212,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$previewwidthdetail = $this->params['previewWidthDetail'];
 		$checkoutdir = $this->params['checkOutDir'];
 		$documentid = $document->getId();
+		$currenttab = $this->params['currenttab'];
 
 		$versions = $document->getContent();
 
@@ -403,41 +404,41 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 </div>
 <div class="span9">
     <ul class="nav nav-tabs" id="docinfotab">
-		  <li class="active"><a data-target="#docinfo" data-toggle="tab"><?php printMLText('current_version'); ?></a></li>
+		  <li class="<?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>"><a data-target="#docinfo" data-toggle="tab"><?php printMLText('current_version'); ?></a></li>
 			<?php if (count($versions)>1) { ?>
-		  <li><a data-target="#previous" data-toggle="tab"><?php printMLText('previous_versions'); ?></a></li>
+		  <li class="<?php if($currenttab == 'previous') echo 'active'; ?>"><a data-target="#previous" data-toggle="tab"><?php printMLText('previous_versions'); ?></a></li>
 <?php
 			}
 			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 				if((is_array($reviewStatus) && count($reviewStatus)>0) ||
 					(is_array($approvalStatus) && count($approvalStatus)>0)) {
 ?>
-		  <li><a data-target="#revapp" data-toggle="tab"><?php if($workflowmode == 'traditional') echo getMLText('reviewers')."/"; echo getMLText('approvers'); ?></a></li>
+		  <li class="<?php if($currenttab == 'revapp') echo 'active'; ?>"><a data-target="#revapp" data-toggle="tab"><?php if($workflowmode == 'traditional') echo getMLText('reviewers')."/"; echo getMLText('approvers'); ?></a></li>
 <?php
 				}
 			} else {
 				if($workflow) {
 ?>
-		  <li><a data-target="#workflow" data-toggle="tab"><?php echo getMLText('workflow'); ?></a></li>
+		  <li class="<?php if($currenttab == 'workflow') echo 'active'; ?>"><a data-target="#workflow" data-toggle="tab"><?php echo getMLText('workflow'); ?></a></li>
 <?php
 				}
 			}
 			if(is_array($receiptStatus) && count($receiptStatus)>0) {
 ?>
-		  <li><a data-target="#recipients" data-toggle="tab"><?php echo getMLText('recipients'); ?></a></li>
+		  <li class="<?php if($currenttab == 'recipients') echo 'active'; ?>"><a data-target="#recipients" data-toggle="tab"><?php echo getMLText('recipients'); ?></a></li>
 <?php
 			}
 			if(is_array($revisionStatus) && count($revisionStatus)>0) {
 ?>
-		  <li><a data-target="#revision" data-toggle="tab"><?php echo getMLText('revise_document'); ?></a></li>
+		  <li class="<?php if($currenttab == 'revision') echo 'active'; ?>"><a data-target="#revision" data-toggle="tab"><?php echo getMLText('revise_document'); ?></a></li>
 <?php
 			}
 ?>
-		  <li><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
-		  <li><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
+		  <li class="<?php if($currenttab == 'attachments') echo 'active'; ?>"><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
+		  <li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
 		</ul>
 		<div class="tab-content">
-		  <div class="tab-pane active" id="docinfo">
+		  <div class="tab-pane <?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>" id="docinfo">
 <?php
 		if(!$latestContent) {
 			$this->contentContainerStart();
@@ -631,7 +632,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			if((is_array($reviewStatus) && count($reviewStatus)>0) ||
 				(is_array($approvalStatus) && count($approvalStatus)>0)) {
 ?>
-		  <div class="tab-pane" id="revapp">
+		  <div class="tab-pane <?php if($currenttab == 'revapp') echo 'active'; ?>" id="revapp">
 <?php
 		$this->contentContainerstart();
 		print "<table class=\"table-condensed\">\n";
@@ -802,7 +803,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		} else {
 			if($workflow) {
 ?>
-		  <div class="tab-pane" id="workflow">
+		  <div class="tab-pane <?php if($currenttab == 'workflow') echo 'active'; ?>" id="workflow">
 <?php
 			$this->contentContainerStart();
 			if($user->isAdmin()) {
@@ -983,7 +984,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		if(is_array($receiptStatus) && count($receiptStatus)>0) {
 ?>
-		  <div class="tab-pane" id="recipients">
+		  <div class="tab-pane <?php if($currenttab == 'recipients') echo 'active'; ?>" id="recipients">
 <?php
 			$this->contentContainerStart();
 			print "<table class=\"table-condensed\">\n";
@@ -1070,7 +1071,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		if(is_array($revisionStatus) && count($revisionStatus)>0) {
 ?>
-			<div class="tab-pane" id="revision">
+			<div class="tab-pane <?php if($currenttab == 'revision') echo 'active'; ?>" id="revision">
 <?php
 			if($status['status'] == S_RELEASED) {
 				if($latestContent->getRevisionDate()) {
@@ -1171,7 +1172,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		if (count($versions)>1) {
 ?>
-		  <div class="tab-pane" id="previous">
+		  <div class="tab-pane <?php if($currenttab == 'previous') echo 'active'; ?>" id="previous">
 <?php
 			$this->contentContainerStart();
 
@@ -1269,7 +1270,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 		}
 ?>
-		  <div class="tab-pane" id="attachments">
+		  <div class="tab-pane <?php if($currenttab == 'attachments') echo 'active'; ?>" id="attachments">
 <?php
 
 		$this->contentContainerStart();
@@ -1345,7 +1346,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerEnd();
 ?>
 		  </div>
-		  <div class="tab-pane" id="links">
+		  <div class="tab-pane <?php if($currenttab == 'links') echo 'active'; ?>" id="links">
 <?php
 		$this->contentContainerStart();
 		if (count($links) > 0) {

From 7791ae1b0d37f269889c859a68a9ce20a2724c37 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 11:18:08 +0200
Subject: [PATCH 0182/2006] open the right tab when jumping to ViewDocument

---
 views/bootstrap/class.MyDocuments.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 32429b2e9..b3b86fd02 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -119,7 +119,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 								}
 								print "</a></td>";
-								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
 								print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
 								print "<td>".$st["version"]."</td>";
 								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
@@ -156,7 +156,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 								}
 								print "</a></td>";
-								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
 								print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
 								print "<td>".$st["version"]."</td>";
 								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
@@ -205,7 +205,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 							}
 							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
 							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
 							print "<td>".$st["version"]."</td>";
 							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
@@ -239,7 +239,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 							}
 							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
 							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
 							print "<td>".$st["version"]."</td>";				
 							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
@@ -424,7 +424,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 						}
 						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
 						print "<td>".getOverallStatusText($res["status"])."</td>";
 						print "<td>".$res["version"]."</td>";
 						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";

From d7f7a40f0623930af8b39c88bfbea1e292c753d2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 13:50:00 +0200
Subject: [PATCH 0183/2006] add phrases for initial document status and new
 document status

---
 languages/ar_EG/lang.inc | 5 +++++
 languages/bg_BG/lang.inc | 5 +++++
 languages/ca_ES/lang.inc | 5 +++++
 languages/cs_CZ/lang.inc | 5 +++++
 languages/de_DE/lang.inc | 7 ++++++-
 languages/en_GB/lang.inc | 7 ++++++-
 languages/es_ES/lang.inc | 5 +++++
 languages/fr_FR/lang.inc | 5 +++++
 languages/hu_HU/lang.inc | 5 +++++
 languages/it_IT/lang.inc | 5 +++++
 languages/nl_NL/lang.inc | 5 +++++
 languages/pl_PL/lang.inc | 5 +++++
 languages/pt_BR/lang.inc | 5 +++++
 languages/ro_RO/lang.inc | 5 +++++
 languages/ru_RU/lang.inc | 5 +++++
 languages/sk_SK/lang.inc | 5 +++++
 languages/sv_SE/lang.inc | 5 +++++
 languages/tr_TR/lang.inc | 5 +++++
 languages/zh_CN/lang.inc | 5 +++++
 languages/zh_TW/lang.inc | 5 +++++
 20 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index de0f0ef10..682a52866 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -334,6 +334,7 @@ URL: [url]',
 'do_object_setchecksum' => 'تحديد فحص اخطاء',
 'do_object_setfilesize' => 'تحديد حجم الملف',
 'do_object_unlink' => 'مسح اصدار مستند',
+'draft' => '',
 'draft_pending_approval' => 'مسودة - قيد الموافقة',
 'draft_pending_review' => 'مسودة - قيد المراجعة',
 'drag_icon_here' => 'قم بسحب ايقونة المستند او المجلد الى هنا!',
@@ -973,6 +974,10 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => '',
 'settings_install_disabled' => '',
 'settings_install_pear_package_log' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index b30e81d7c..db7b61717 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -289,6 +289,7 @@ $text = array(
 'do_object_setchecksum' => 'Установи контролна сума',
 'do_object_setfilesize' => 'Установи размер на файла',
 'do_object_unlink' => '',
+'draft' => '',
 'draft_pending_approval' => 'Чернова - очаква утвърждаване',
 'draft_pending_review' => 'Чернова - очаква рецензия',
 'drag_icon_here' => 'Провлачи икона или папка, или документ ТУК!',
@@ -838,6 +839,10 @@ $text = array(
 'settings_guestID_desc' => 'Идентификатор за гост (може да не се променя)',
 'settings_httpRoot' => 'Корен Http',
 'settings_httpRoot_desc' => 'Относителен път в URL, след доменната част. Без http://. Например ако пълния URL http://www.example.com/letodms/, то трябва да укажем \'/letodms/\'. Ако URL http://www.example.com/, то \'/\'',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Инсталирай ADOdb',
 'settings_install_disabled' => 'ENABLE_INSTALL_TOOL изтрит. Сега може да влезете за последваща конфигурация на системата.',
 'settings_install_pear_package_log' => 'Инсталирай пакета Pear \'Log\'',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 205666a31..e41ff3d26 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -294,6 +294,7 @@ URL: [url]',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '',
 'do_object_unlink' => '',
+'draft' => '',
 'draft_pending_approval' => 'Esborrany - pendent d\'aprovació',
 'draft_pending_review' => 'Esborrany - pendent de revisió',
 'drag_icon_here' => '',
@@ -843,6 +844,10 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Install ADOdb',
 'settings_install_disabled' => '',
 'settings_install_pear_package_log' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index d0f787f4c..dcb6ccdda 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Nastavit kontrolní součet',
 'do_object_setfilesize' => 'Nastavit velikost souboru',
 'do_object_unlink' => 'Smazat verzi dokumentu',
+'draft' => '',
 'draft_pending_approval' => 'Návrh - čeká na schválení',
 'draft_pending_review' => 'Návrh - čeká na kontrolu',
 'drag_icon_here' => 'Přetáhnout ikonu složky nebo dokumentu sem!',
@@ -982,6 +983,10 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Install ADOdb',
 'settings_install_disabled' => '',
 'settings_install_pear_package_log' => 'Install Pear package \'Log\'',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 50dfb619c..b2d5907bd 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2071), dgrutsch (18)
+//    Translators: Admin (2075), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -346,6 +346,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Setze Check-Summe',
 'do_object_setfilesize' => 'Setze Dateigröße',
 'do_object_unlink' => 'Lösche Dokumentenversion',
+'draft' => 'Entwurf',
 'draft_pending_approval' => 'Entwurf - bevorstehende Freigabe',
 'draft_pending_review' => 'Entwurf - bevorstehende Prüfung',
 'drag_icon_here' => 'Icon eines Ordners oder Dokuments hier hin ziehen!',
@@ -1002,6 +1003,10 @@ URL: [url]',
 'settings_guestID_desc' => 'Id des Gast-Benutzers, wenn man sich als \'guest\' anmeldet.',
 'settings_httpRoot' => 'HTTP Wurzelverzeichnis',
 'settings_httpRoot_desc' => 'Der relative Pfad in der URL nach der Domain, also ohne http:// und den hostnamen. z.B. wenn die komplette URL http://www.example.com/seeddms/ ist, dann setzen Sie diesen Wert auf \'/seeddms/\'. Wenn die URL http://www.example.com/ ist, tragen Sie \'/\' ein.',
+'settings_initialDocumentStatus' => 'Initialer Dokumentenstatus',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => 'Entwurf',
+'settings_initialDocumentStatus_released' => 'freigegeben',
 'settings_installADOdb' => 'Installieren Sie ADOdb',
 'settings_install_disabled' => 'Datei ENABLE_INSTALL_TOOL wurde gelöscht. Sie können sich nun bei SeedDMS anmeldung und mit der Konfiguration fortfahren.',
 'settings_install_pear_package_log' => 'Installiere Pear package \'Log\'',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 358d9df5d..deb425168 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1199), dgrutsch (3), netixw (14)
+//    Translators: Admin (1203), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -346,6 +346,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Set checksum',
 'do_object_setfilesize' => 'Set file size',
 'do_object_unlink' => 'Delete document version',
+'draft' => 'Draft',
 'draft_pending_approval' => 'Draft - pending approval',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Drag icon of folder or document here!',
@@ -1009,6 +1010,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID of guest-user used when logged in as guest (mostly no need to change)',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'The relative path in the URL, after the domain part. Do not include the http:// prefix or the web host name. e.g. If the full URL is http://www.example.com/seeddms/, set \'/seeddms/\'. If the URL is http://www.example.com/, set \'/\'',
+'settings_initialDocumentStatus' => 'Initial document status',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => 'Draft',
+'settings_initialDocumentStatus_released' => 'released',
 'settings_installADOdb' => 'Install ADOdb',
 'settings_install_disabled' => 'File ENABLE_INSTALL_TOOL was deleted. You can now log into SeedDMS and do further configuration.',
 'settings_install_pear_package_log' => 'Install Pear package \'Log\'',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 3084d8072..b93a6d367 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Set checksum',
 'do_object_setfilesize' => 'Asignar tamaño de fichero',
 'do_object_unlink' => 'Borrar versión del documento',
+'draft' => '',
 'draft_pending_approval' => 'Borador - pendiente de aprobación',
 'draft_pending_review' => 'Borrador - pendiente de revisión',
 'drag_icon_here' => 'Arrastre carpeta o documento aquí!',
@@ -988,6 +989,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID del usuario invitado cuando se conecta como invitado (mayormente no necesita cambiarlo)',
 'settings_httpRoot' => 'Raíz Http',
 'settings_httpRoot_desc' => 'La ruta relativa de la URL, después de la parte del servidor. No incluir el prefijo http:// o el nombre del servidor. Por ejemplo, si la URL completa es http://www.example.com/seeddms/, configure «/seeddms/». Si la URL completa es http://www.example.com/, configure «/»',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Instalar ADOdb',
 'settings_install_disabled' => 'El archivo ENABLE_INSTALL_TOOL ha sido eliminado. Ahora puede conectarse a SeedDMS y seguir con la configuración.',
 'settings_install_pear_package_log' => 'Instale el paquete Pear \'Log\'',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 9c22f496a..83813e21b 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Définir checksum',
 'do_object_setfilesize' => 'Définir la taille du fichier',
 'do_object_unlink' => 'Supprimer la version du document',
+'draft' => '',
 'draft_pending_approval' => 'Ebauche - En cours d\'approbation',
 'draft_pending_review' => 'Ebauche - En cours de correction',
 'drag_icon_here' => 'Glisser/déposer le fichier ou document ici!',
@@ -964,6 +965,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID de l\'invité utilisé lorsque vous êtes connecté en tant qu\'invité (la plupart du temps pas besoin de changer)',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Le chemin relatif dans l\'URL, après le nom de domaine. Ne pas inclure le préfixe http:// ou le nom d\'hôte Internet. Par exemple Si l\'URL complète est http://www.example.com/letodms/, mettez \'/letodms/\'. Si l\'URL est http://www.example.com/, mettez \'/\'',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Installer ADOdb',
 'settings_install_disabled' => 'Le fichier ENABLE_INSTALL_TOOL a été supprimé. ous pouvez maintenant vous connecter à SeedDMS et poursuivre la configuration.',
 'settings_install_pear_package_log' => 'Installer le paquet Pear \'Log\'',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index f4f329b7d..2f27f7c29 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Ellenőrző összeg beállítása',
 'do_object_setfilesize' => 'Állomány méret beállítása',
 'do_object_unlink' => 'Dokumentum verzió törlése',
+'draft' => '',
 'draft_pending_approval' => 'Piszkozat - jóváhagyás folyamatban',
 'draft_pending_review' => 'Piszkozat - felülvizsgálat folyamatban',
 'drag_icon_here' => 'Húzza a mappa vagy dokumentum ikonját ide!',
@@ -987,6 +988,10 @@ URL: [url]',
 'settings_guestID_desc' => 'A vendég felhasználó azonosítója ami a vendégként történő bejelentkezéskor lesz használva (általában nem szükséges módosítani)',
 'settings_httpRoot' => 'Http gyökér',
 'settings_httpRoot_desc' => 'A relatív elérési út az URL-ben a tartomány rész után. Ne tartalmazza a http:// előtagot vag a web szerver nevét. Pl.: ha a teljes URL http://www.example.com/seeddms/, adja meg \'/seeddms/\'. Ha az URL http://www.example.com/, adja meg \'/\'',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'ADOdb telepítése',
 'settings_install_disabled' => 'Az ENABLE_INSTALL_TOOL állomány törölve lett. Bejelentkezhet a SeedDMS alkalmazásba és elvégezheti a további konfigurációt.',
 'settings_install_pear_package_log' => 'PEAR csomag \'Log\' telepítése',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index fa4cfd8c1..a732a1f36 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -346,6 +346,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Imposta il checksum',
 'do_object_setfilesize' => 'Imposta la dimensione del file',
 'do_object_unlink' => 'Cancella la versione del documento',
+'draft' => '',
 'draft_pending_approval' => 'Bozza - in approvazione',
 'draft_pending_review' => 'Bozza - in revisione',
 'drag_icon_here' => 'Trascina qui l\'icona della cartella o del documento',
@@ -1010,6 +1011,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID o utenza ospite utilizzata quando collegati al sito come ospite (da cambiare solo in casi eccezionali).',
 'settings_httpRoot' => 'Cartella web principale',
 'settings_httpRoot_desc' => 'Percorso relativo nell\'URL dopo il dominio e senza il prefisso \'http://\'. Es: se l\'URL completo è http://www.esempio.com/SeedDMS/, impostare \'/SeedDMS/\'; se invece l\'URL è http://www.esempio.com/, impostare \'/\'',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Installa ADOdb',
 'settings_install_disabled' => 'Il file ENABLE_INSTALL_TOOL è stato cancellato. Ora puoi effettuare il login in SeedDMS e fare ulteriori configurazioni.',
 'settings_install_pear_package_log' => 'Installa il registro del pacchetto Pear',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 192e7981d..cc94f6db3 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -334,6 +334,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Set checksum',
 'do_object_setfilesize' => 'Voer bestandgrootte in',
 'do_object_unlink' => 'Verwijdere documentversie',
+'draft' => '',
 'draft_pending_approval' => 'Draft - in afwachting van goedkeuring',
 'draft_pending_review' => 'Draft - in afwachting van controle',
 'drag_icon_here' => 'Versleep icoon van de folder of bestand hier!',
@@ -979,6 +980,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID van gastgebruiker gebruikt indien ingelogd als gast (meestal geen wijziging nodig)',
 'settings_httpRoot' => 'Http Basis',
 'settings_httpRoot_desc' => 'Het relatieve pad in de URL, na het domeindeel. Voeg geen http:// toe aan het begin of de websysteemnaam. Bijv: Als de volledige URL http://www.example.com/letodms/ is, voer \'/letodms/\' in. Als de URL http://www.example.com/ is, voer \'/\' in',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Installeer ADOdb',
 'settings_install_disabled' => 'Bestand ENABLE_INSTALL_TOOL is verwijderd. U kunt nu inloggen in SeedDMS en verdere configuratie uitvoeren.',
 'settings_install_pear_package_log' => 'Installeer Pear package \'Log\'',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index c58fb77d2..a540743d2 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -334,6 +334,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Ustaw sumę kontrolną',
 'do_object_setfilesize' => 'Podaj rozmiar pliku',
 'do_object_unlink' => 'Usuń wersję dokumentu',
+'draft' => '',
 'draft_pending_approval' => 'Szkic - w oczekiwaniu na akceptację',
 'draft_pending_review' => 'Szkic - w oczekiwaniu na opinię',
 'drag_icon_here' => 'Przeciągnij ikonę folderu lub dokumentu tutaj!',
@@ -967,6 +968,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID gościa używane kiedy gość jest zalogowany (zazwyczaj nie wymaga zmiany)',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Relatywna ścieżka w URL, część za domeną. Nie dołączaj przedrostka http:// ani nazwy hosta. Np. Jeśli cały URL to http://www.example.com/letodms/, wpisz \'/letodms/\'. Jeśli URL to http://www.example.com/, set \'/\'',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Zainstaluj ADOdb',
 'settings_install_disabled' => 'Plik ENABLE_INSTALL_TOOL został usunięty. Możesz teraz zalogować się do LetoDMS i przeprowadzić dalszą konfigurację.',
 'settings_install_pear_package_log' => 'Zainstaluj pakiet Pear \'Log\'',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index ab59d4b10..9552b1c81 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -340,6 +340,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Defina soma de verificação',
 'do_object_setfilesize' => 'Defina o tamanho do arquivo',
 'do_object_unlink' => 'Excluir versão do documento',
+'draft' => '',
 'draft_pending_approval' => '',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Arraste ícone de pasta ou documento para aqui!',
@@ -985,6 +986,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID do usuário-convidado  usada quando conectado como convidado (na maioria das vezes não há necessidade de mudar)',
 'settings_httpRoot' => 'Raiz Http',
 'settings_httpRoot_desc' => 'O caminho relativo na URL, após a parte do domínio. Não inclua o prefixo http:// ou o nome do host. por exemplo Se a URL completa é http://www.example.com/seeddms/, definir \'/seeddms/\'. Se a URL é http://www.example.com/, definir \'/\'',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Instalar ADOdb',
 'settings_install_disabled' => 'O arquivo ENABLE_INSTALL_TOOL foi excluído. Agora você pode entrar em SeedDMS e fazer outras configurações.',
 'settings_install_pear_package_log' => 'Instalar o Pacote pear \'Log\'',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 6118a184e..97a57b903 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -346,6 +346,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Setare sumă de control(checksum)',
 'do_object_setfilesize' => 'Setare dimensiune fișier',
 'do_object_unlink' => 'Sterge versiune document',
+'draft' => '',
 'draft_pending_approval' => 'Proiect - în așteptarea aprobarii',
 'draft_pending_review' => 'Proiect - în așteptarea revizuirii',
 'drag_icon_here' => 'Trageți iconul de folder sau document aici!',
@@ -1010,6 +1011,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID-ul utilizatorului oaspete folosit când la Logarea ca oaspete (de cele mai multe ori nu este nevoie să se schimbe)',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Calea relativă în URL-ul, după partea domeniului. Nu includeți prefixul http:// sau numele host-ului. (ex: Dacă URL-ul complet este http://www.example.com/seeddms/, setați \'/seeddms/\'. Dacă URL-ul complet este http://www.example.com/, setați \'/\')',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Instalați ADOdb',
 'settings_install_disabled' => 'Fișierul ENABLE_INSTALL_TOOL a fost șters. Vă puteți conecta acum în SeedDMS și puteți trece la configurările ulterioare.',
 'settings_install_pear_package_log' => 'Instalați pachetul Pear \'Log\'',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 6526a5704..9ada8e022 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -334,6 +334,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Установить контрольную сумму',
 'do_object_setfilesize' => 'Установить размер файла',
 'do_object_unlink' => 'Удалить версию документа',
+'draft' => '',
 'draft_pending_approval' => '<b>Черновик</b> — ожидает утверждения',
 'draft_pending_review' => '<b>Черновик</b> — ожидает рецензии',
 'drag_icon_here' => 'Перетащите сюда значок каталога или документа.',
@@ -978,6 +979,10 @@ URL: [url]',
 'settings_guestID_desc' => 'Идентификатор гостя (можно не изменять).',
 'settings_httpRoot' => 'Корень http',
 'settings_httpRoot_desc' => 'Относительный путь в URL, после доменной части. Без http://. Например, если полный URL http://www.example.com/seeddms/, то нужно указать «/seeddms/». Если URL http://www.example.com/, то «/».',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Установить ADOdb',
 'settings_install_disabled' => 'ENABLE_INSTALL_TOOL удалён. Теперь можно войти для дальнейшей настройки системы.',
 'settings_install_pear_package_log' => 'Установите пакет Pear \'Log\'',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 590278896..fd1747659 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -289,6 +289,7 @@ $text = array(
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '',
 'do_object_unlink' => '',
+'draft' => '',
 'draft_pending_approval' => 'Návrh - čaká na schválenie',
 'draft_pending_review' => 'Návrh - čaká na kontrolu',
 'drag_icon_here' => 'Sem myšou pretiahnite ikonu, zložku alebo dokument',
@@ -838,6 +839,10 @@ $text = array(
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => '',
 'settings_install_disabled' => '',
 'settings_install_pear_package_log' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 6593ad7bf..5e2a47cb4 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -334,6 +334,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Lägg till checksumma',
 'do_object_setfilesize' => 'Ange filstorlek',
 'do_object_unlink' => 'Ta bort dokument version',
+'draft' => '',
 'draft_pending_approval' => 'Utkast: väntar på godkännande',
 'draft_pending_review' => 'Utkast: väntar på granskning',
 'drag_icon_here' => 'Dra ikon av mappen eller dokument hit!',
@@ -973,6 +974,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID som används för inloggad gästanvändare (behöver oftast inte ändras)',
 'settings_httpRoot' => 'Http-Root',
 'settings_httpRoot_desc' => 'Den relativa sökvägen i URL, efter domänen. Ta inte med http:// eller web host-namnet. t.ex. om hela URLen är http://www.example.com/letodms/, sätt \'/letodms/\'. Om URLen är http://www.example.com/, sätt \'/\'',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'Installera ADOdb',
 'settings_install_disabled' => 'Filen ENABLE_INSTALL_TOOL har tagits bort. Du kan nu logga in till LetoDMS och göra ytterligare inställningar.',
 'settings_install_pear_package_log' => 'Installera Pear-paketet \'Log\'',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index b3979f21e..6d0981539 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -340,6 +340,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Sağlama (checksum) ayarla',
 'do_object_setfilesize' => 'Dosya boyutu ayarla',
 'do_object_unlink' => 'Doküman versiyonunu sil',
+'draft' => '',
 'draft_pending_approval' => 'Taslak - onay bekliyor',
 'draft_pending_review' => 'Taslak - kontrol bekliyor',
 'drag_icon_here' => 'Klasör veya dokümanın ikonunu buraya sürükleyin!',
@@ -989,6 +990,10 @@ URL: [url]',
 'settings_guestID_desc' => 'Misafir kullanıcı için ID (genelde değiştirmek gerekmez)',
 'settings_httpRoot' => 'Http Kök dizini',
 'settings_httpRoot_desc' => 'Domainden sonraki yol. http:// ve domain yazmadan domainden sonraki bölüm yazılacak. Örneğin tam URL http://www.ornek.com/seeddms/ ise sadece \'seeddms\' olarak ayarlayın. Eğer URL http://www.ornek.com/ ise sadece \'/\' koymanız yeterli',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => 'ADOdb yükle',
 'settings_install_disabled' => 'ENABLE_INSTALL_TOOL silindi. SeedDMS\'e giriş yaparak diğer ayarları yapabilirsiniz.',
 'settings_install_pear_package_log' => 'Pear package \'Log\' yükleyin',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 11b6e228b..d9c4b3668 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -295,6 +295,7 @@ URL: [url]',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '设置文件大小',
 'do_object_unlink' => '',
+'draft' => '',
 'draft_pending_approval' => '待审核',
 'draft_pending_review' => '待校对',
 'drag_icon_here' => '拖动图标到这里',
@@ -844,6 +845,10 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => '',
 'settings_install_disabled' => '',
 'settings_install_pear_package_log' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 4bc6e605e..e2f1163c5 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -293,6 +293,7 @@ URL: [url]',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '',
 'do_object_unlink' => '',
+'draft' => '',
 'draft_pending_approval' => '待審核',
 'draft_pending_review' => '待校對',
 'drag_icon_here' => '拖動圖示到這裡',
@@ -842,6 +843,10 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
 'settings_installADOdb' => '',
 'settings_install_disabled' => '',
 'settings_install_pear_package_log' => '',

From a178ab9bc01af8e3dfd076954ad35fd069342ae3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 13:53:16 +0200
Subject: [PATCH 0184/2006] add missing translations

---
 languages/de_DE/lang.inc | 4 ++--
 languages/en_GB/lang.inc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index b2d5907bd..8d5b00b7f 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2075), dgrutsch (18)
+//    Translators: Admin (2076), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -1004,7 +1004,7 @@ URL: [url]',
 'settings_httpRoot' => 'HTTP Wurzelverzeichnis',
 'settings_httpRoot_desc' => 'Der relative Pfad in der URL nach der Domain, also ohne http:// und den hostnamen. z.B. wenn die komplette URL http://www.example.com/seeddms/ ist, dann setzen Sie diesen Wert auf \'/seeddms/\'. Wenn die URL http://www.example.com/ ist, tragen Sie \'/\' ein.',
 'settings_initialDocumentStatus' => 'Initialer Dokumentenstatus',
-'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_desc' => 'Dieser STatus wird bei Dokumenten gesetzt, die neu hinzugefügt wurden.',
 'settings_initialDocumentStatus_draft' => 'Entwurf',
 'settings_initialDocumentStatus_released' => 'freigegeben',
 'settings_installADOdb' => 'Installieren Sie ADOdb',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index deb425168..d3fdac120 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1203), dgrutsch (3), netixw (14)
+//    Translators: Admin (1204), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -1011,7 +1011,7 @@ URL: [url]',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'The relative path in the URL, after the domain part. Do not include the http:// prefix or the web host name. e.g. If the full URL is http://www.example.com/seeddms/, set \'/seeddms/\'. If the URL is http://www.example.com/, set \'/\'',
 'settings_initialDocumentStatus' => 'Initial document status',
-'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_desc' => 'This status will be set when a document is added.',
 'settings_initialDocumentStatus_draft' => 'Draft',
 'settings_initialDocumentStatus_released' => 'released',
 'settings_installADOdb' => 'Install ADOdb',

From 394a23fa57b5f78962d3597f9093dbd8248197f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 21:31:13 +0200
Subject: [PATCH 0185/2006] add download of documents

---
 controllers/class.TransmittalDownload.php | 27 ++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/controllers/class.TransmittalDownload.php b/controllers/class.TransmittalDownload.php
index 73ade9f50..37ff3f29d 100644
--- a/controllers/class.TransmittalDownload.php
+++ b/controllers/class.TransmittalDownload.php
@@ -28,12 +28,29 @@ class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
 		$transmittal = $this->params['transmittal'];
 
 		$items = $transmittal->getItems();
-		foreach($items as $item) {
-			$content = $item->getContent();
-			$document = $content->getDocument();
-			if ($document->getAccessMode($user) >= M_READ) {
-				echo $document->getName();
+		if($items) {
+			include("../inc/inc.ClassDownloadMgr.php");
+			$downmgr = new SeedDMS_Download_Mgr();
+
+			foreach($items as $item) {
+				$content = $item->getContent();
+				$document = $content->getDocument();
+				if ($document->getAccessMode($user) >= M_READ) {
+					$downmgr->addItem($content);
+				}
 			}
+
+			$filename = tempnam('/tmp', '');
+			$downmgr->createArchive($filename);
+			header("Content-Transfer-Encoding: binary");
+			header("Content-Length: " . filesize($filename));
+			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
+			header("Content-Type: application/zip");
+			header("Cache-Control: must-revalidate");
+
+			readfile($filename);
+			unlink($filename);
+			exit;
 		}
 	}
 }

From 6a7b9c8a6591f9a0cdea22fba1c43a005242eefc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 21:33:08 +0200
Subject: [PATCH 0186/2006] mayRecipients() and mayRevision() return only true
 if document ist released

---
 inc/inc.ClassAccessOperation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 2a88af8df..b7d7f7235 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -118,7 +118,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin())) {
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED)) {
 				return true;
 			}
 		}
@@ -138,7 +138,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
 				return true;
 			}
 		}

From 0c053d410c6e0030e11b9f056489b81edd65d8bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 21:34:07 +0200
Subject: [PATCH 0187/2006] put creation of excel file into its own method

---
 inc/inc.ClassDownloadMgr.php | 48 ++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 005d0ffa4..ffeb332a2 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -48,20 +48,9 @@ class SeedDMS_Download_Mgr {
 		$this->items[$item->getID()] = $item;
 	} /* }}} */
 
-	public function createArchive($filename) { /* {{{ */
-		if(!$this->items) {
-			return false;
-		}
-
-		$zip = new ZipArchive();
-		$prefixdir = date('Y-m-d', time());
-
-		if($zip->open($filename, ZipArchive::CREATE) !== TRUE) {
-			return false;
-		}
-
+	public function createToc($file, $items) { /* {{{ */
 		$objPHPExcel = new PHPExcel();
-		$objPHPExcel->getProperties()->setCreator("MMK GmbH, Hagen, Germany")->setTitle("Metadata");
+		$objPHPExcel->getProperties()->setCreator("SeedDMS")->setTitle("Metadata");
 		$sheet = $objPHPExcel->setActiveSheetIndex(0);
 
 		$i = 1;
@@ -78,14 +67,13 @@ class SeedDMS_Download_Mgr {
 		$sheet->setCellValueByColumnAndRow(10, $i, 'Freigabekommentar');
 		$sheet->setCellValueByColumnAndRow(11, $i, 'Freigabestatus');
 		$i++;
-		foreach($this->items as $item) {
+		foreach($items as $item) {
 			$document = $item->getDocument();
 			$dms = $document->_dms;
 			$status = $item->getStatus();
 			$reviewStatus = $item->getReviewStatus();
 			$approvalStatus = $item->getApprovalStatus();
 
-			$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($prefixdir."/".$document->getID()."-".$item->getOriginalFileName()));
 			$sheet->setCellValueByColumnAndRow(0, $i, $document->getID());
 			$sheet->setCellValueByColumnAndRow(1, $i, $document->getID()."-".$item->getOriginalFileName());
 			$sheet->setCellValueByColumnAndRow(2, $i, getOverallStatusText($status['status']));
@@ -113,7 +101,7 @@ class SeedDMS_Download_Mgr {
 							break;
 					}
 					$sheet->setCellValueByColumnAndRow(4, $l, $reqName);
-					$sheet->setCellValueByColumnAndRow(5, $l, $r['date']);
+					$sheet->setCellValueByColumnAndRow(5, $l, ($r['status']==1 || $r['status']==-1) ? $r['date'] : "");
 					$sheet->setCellValueByColumnAndRow(6, $l, $r['comment']);
 					$sheet->setCellValueByColumnAndRow(7, $l, getReviewStatusText($r["status"]));
 					$l++;
@@ -141,7 +129,7 @@ class SeedDMS_Download_Mgr {
 							break;
 					}
 					$sheet->setCellValueByColumnAndRow(8, $k, $reqName);
-					$sheet->setCellValueByColumnAndRow(9, $k, $r['date']);
+					$sheet->setCellValueByColumnAndRow(9, $k, ($r['status']==1 || $r['status']==-1) ?$r['date'] : "");
 					$sheet->setCellValueByColumnAndRow(10, $k, $r['comment']);
 					$sheet->setCellValueByColumnAndRow(11, $k, getReviewStatusText($r["status"]));
 					$k++;
@@ -153,8 +141,32 @@ class SeedDMS_Download_Mgr {
 		}
 
 		$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
-		$file = tempnam("/tmp", "export-list-");
 		$objWriter->save($file);
+
+		return true;
+	} /* }}} */
+
+	public function createArchive($filename) { /* {{{ */
+		if(!$this->items) {
+			return false;
+		}
+
+		$file = tempnam("/tmp", "export-list-");
+		$this->createToc($file, $this->items);
+
+		$zip = new ZipArchive();
+		$prefixdir = date('Y-m-d', time());
+
+		if($zip->open($filename, ZipArchive::CREATE) !== TRUE) {
+			return false;
+		}
+
+		foreach($this->items as $item) {
+			$document = $item->getDocument();
+			$dms = $document->_dms;
+			$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($prefixdir."/".$document->getID()."-".$item->getOriginalFileName()));
+		}
+
 		$zip->addFile($file, $prefixdir."/metadata.xls");
 		$zip->close();
 		unlink($file);

From 68096452567be9e8555d210f7b0dd31d4c251a51 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 21:35:10 +0200
Subject: [PATCH 0188/2006] take out download of version info, take out next
 revision unless document is released

---
 views/bootstrap/class.ViewDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 3b7a82b16..41520ab96 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -581,7 +581,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<li><a href=\"out.EditAttributes.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
 		}
 
-		print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&vfile=1\"><i class=\"icon-info-sign\"></i>".getMLText("versioning_info")."</a></li>";	
+		// print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&vfile=1\"><i class=\"icon-info-sign\"></i>".getMLText("versioning_info")."</a></li>";	
 
 		print "</ul>";
 		echo "</td>";
@@ -1083,11 +1083,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				</div>
 <?php
 				}
-			} elseif($status['status'] != S_IN_REVISION) {
+			} /*elseif($status['status'] != S_IN_REVISION) {
 ?>
 				<div class="alert alert-info"><?= getMLText('no_revision_planed') ?></div>
 <?php
-			}
+				} */
 			$this->contentContainerStart();
 			print "<table class=\"table-condensed\">\n";
 

From 4cc1704915be4d2ac952c5824518e051d635ef56 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 21:36:06 +0200
Subject: [PATCH 0189/2006] add table tblCachedAccess (not used)

---
 install/create_tables-innodb.sql | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 8440c2927..4f5ac4cb2 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -831,6 +831,22 @@ CREATE TABLE `tblTransmittalItems` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for cached read access
+-- 
+
+CREATE TABLE `tblCachedAccess` (
+  `id` int(11) NOT NULL auto_increment,
+  `document` int(11) default NULL,
+  `user` int(11) default null,
+  `mode` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY (`id`),
+  CONSTRAINT `tblCachedAccess_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblCachedAccess_user` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for access request objects
 -- 
@@ -842,6 +858,7 @@ CREATE TABLE `tblAros` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
 
 -- 
 -- Table structure for access control objects

From f2a7811f0c3c23c98df477968bbfadfcab6af522 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jun 2015 21:50:32 +0200
Subject: [PATCH 0190/2006] use SeedDMS_Core_DMS::getClassname() to check for
 propper class

---
 inc/inc.ClassSession.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php
index c29eeed9e..d67532521 100644
--- a/inc/inc.ClassSession.php
+++ b/inc/inc.ClassSession.php
@@ -285,10 +285,11 @@ class SeedDMS_Session {
 	function addToClipboard($object) { /* {{{ */
 		/* id is only set if load() was called before */
 		if($this->id) {
-			if(get_class($object) == 'SeedDMS_Core_Document') {
+			$dms = $object->_dms;
+			if(get_class($object) == $dms->getClassname('document')) {
 				if(!in_array($object->getID(), $this->data['clipboard']['docs']))
 					array_push($this->data['clipboard']['docs'], $object->getID());
-			} elseif(get_class($object) == 'SeedDMS_Core_Folder') {
+			} elseif(get_class($object) == $dms->getClassname('folder')) {
 				if(!in_array($object->getID(), $this->data['clipboard']['folders']))
 					array_push($this->data['clipboard']['folders'], $object->getID());
 			}
@@ -307,11 +308,12 @@ class SeedDMS_Session {
 	function removeFromClipboard($object) { /* {{{ */
 		/* id is only set if load() was called before */
 		if($this->id) {
-			if(get_class($object) == 'SeedDMS_Core_Document') {
+			$dms = $object->_dms;
+			if(get_class($object) == $dms->getClassname('document')) {
 				$key = array_search($object->getID(), $this->data['clipboard']['docs']);
 				if($key !== false)
 					unset($this->data['clipboard']['docs'][$key]);
-			} elseif(get_class($object) == 'SeedDMS_Core_Folder') {
+			} elseif(get_class($object) == $dms->getClassname('folder')) {
 				$key = array_search($object->getID(), $this->data['clipboard']['folders']);
 				if($key !== false)
 					unset($this->data['clipboard']['folders'][$key]);

From 2cd37d90b157bf7429047c77586f1550b4c4543b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Jun 2015 19:14:07 +0200
Subject: [PATCH 0191/2006] send end date to end of day

---
 op/op.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Search.php b/op/op.Search.php
index 9c7ca3731..d2b75aef3 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -274,7 +274,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 	}
 	if(isset($_GET["createend"])) {
 		$tmp = explode("-", $_GET["createend"]);
-		$stopdate = array('year'=>(int)$tmp[2], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[0], 'hour'=>0, 'minute'=>0, 'second'=>0);
+		$stopdate = array('year'=>(int)$tmp[2], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[0], 'hour'=>23, 'minute'=>59, 'second'=>59);
 	} else {
 		if(isset($_GET["createendyear"]))
 			$stopdate = array('year'=>$_GET["createendyear"], 'month'=>$_GET["createendmonth"], 'day'=>$_GET["createendday"], 'hour'=>23, 'minute'=>59, 'second'=>59);

From 0e8a385b6d1d0b386de7b7ba8c2e0654df27aaa2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Jun 2015 06:41:49 +0200
Subject: [PATCH 0192/2006] allow context sensitive help files

---
 out/out.Help.php                    | 10 +++++++++-
 views/bootstrap/class.Bootstrap.php |  3 ++-
 views/bootstrap/class.Help.php      |  9 +++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/out/out.Help.php b/out/out.Help.php
index b5204478a..f535764d3 100644
--- a/out/out.Help.php
+++ b/out/out.Help.php
@@ -25,8 +25,16 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$view = UI::factory($theme, $tmp[1]);
+
+if(isset($_GET['context']))
+	$context = $_GET['context'];
+else
+	$context = '';
 if($view) {
+	$view->setParam('dms', $dms);
+	$view->setParam('user', $user);
+	$view->setParam('context', $context);
 	$view->show();
 	exit;
 }
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 8f9eb9857..e1980e67a 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -314,7 +314,8 @@ $(document).ready(function () {
 	//		echo "    <li><a href=\"../out/out.SearchForm.php?folderid=".$this->params['rootfolderid']."\">".getMLText("search")."</a></li>\n";
 			if ($this->params['enablecalendar']) echo "    <li><a href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
 			if ($this->params['user']->isAdmin()) echo "    <li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
-			echo "    <li><a href=\"../out/out.Help.php\">".getMLText("help")."</a></li>\n";
+			$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+			echo "    <li><a href=\"../out/out.Help.php?context=".$tmp[1]."\">".getMLText("help")."</a></li>\n";
 			echo "   </ul>\n";
 			echo "     <form action=\"../op/op.Search.php\" class=\"form-inline navbar-search pull-left\" autocomplete=\"off\">";
 			if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) {
diff --git a/views/bootstrap/class.Help.php b/views/bootstrap/class.Help.php
index 96864e17b..5a209068e 100644
--- a/views/bootstrap/class.Help.php
+++ b/views/bootstrap/class.Help.php
@@ -34,15 +34,20 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$context = $this->params['context'];
 
 		$this->htmlStartPage(getMLText("help"));
 		$this->globalNavigation();
 		$this->contentStart();
-		$this->pageNavigation(getMLText("help"), "");
+		$this->pageNavigation(getMLText("help").": ".getMLText('help_'.strtolower($context), array(), $context), "");
 
 		$this->contentContainerStart();
 
-		readfile("../languages/".$this->params['session']->getLanguage()."/help.htm");
+		$helpfile = "../languages/".$this->params['session']->getLanguage()."/help/".$context.".html";
+		if(file_exists($helpfile))
+			readfile($helpfile);
+		else
+			readfile("../languages/".$this->params['session']->getLanguage()."/help.htm");
 
 		$this->contentContainerEnd();
 		$this->htmlEndPage();

From 5bc915f487dbf809864cfb68bbcbd54bfd4ce480 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Jun 2015 06:53:31 +0200
Subject: [PATCH 0193/2006] add directory for help files

---
 languages/ar_EG/help/README | 1 +
 languages/bg_BG/help/README | 1 +
 languages/ca_ES/help/README | 1 +
 languages/cs_CZ/help/README | 1 +
 languages/de_DE/help/README | 1 +
 languages/en_GB/help/README | 1 +
 languages/es_ES/help/README | 1 +
 languages/fr_FR/help/README | 1 +
 languages/hu_HU/help/README | 1 +
 languages/it_IT/help/README | 1 +
 languages/nl_NL/help/README | 1 +
 languages/pl_PL/help/README | 1 +
 languages/pt_BR/help/README | 1 +
 languages/ro_RO/help/README | 1 +
 languages/ru_RU/help/README | 1 +
 languages/sk_SK/help/README | 1 +
 languages/sv_SE/help/README | 1 +
 languages/tr_TR/help/README | 1 +
 languages/zh_CN/help/README | 1 +
 languages/zh_TW/help/README | 1 +
 20 files changed, 20 insertions(+)
 create mode 100644 languages/ar_EG/help/README
 create mode 100644 languages/bg_BG/help/README
 create mode 100644 languages/ca_ES/help/README
 create mode 100644 languages/cs_CZ/help/README
 create mode 100644 languages/de_DE/help/README
 create mode 100644 languages/en_GB/help/README
 create mode 100644 languages/es_ES/help/README
 create mode 100644 languages/fr_FR/help/README
 create mode 100644 languages/hu_HU/help/README
 create mode 100644 languages/it_IT/help/README
 create mode 100644 languages/nl_NL/help/README
 create mode 100644 languages/pl_PL/help/README
 create mode 100644 languages/pt_BR/help/README
 create mode 100644 languages/ro_RO/help/README
 create mode 100644 languages/ru_RU/help/README
 create mode 100644 languages/sk_SK/help/README
 create mode 100644 languages/sv_SE/help/README
 create mode 100644 languages/tr_TR/help/README
 create mode 100644 languages/zh_CN/help/README
 create mode 100644 languages/zh_TW/help/README

diff --git a/languages/ar_EG/help/README b/languages/ar_EG/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/ar_EG/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/bg_BG/help/README b/languages/bg_BG/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/bg_BG/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/ca_ES/help/README b/languages/ca_ES/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/ca_ES/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/cs_CZ/help/README b/languages/cs_CZ/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/cs_CZ/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/de_DE/help/README b/languages/de_DE/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/de_DE/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/en_GB/help/README b/languages/en_GB/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/en_GB/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/es_ES/help/README b/languages/es_ES/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/es_ES/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/fr_FR/help/README b/languages/fr_FR/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/fr_FR/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/hu_HU/help/README b/languages/hu_HU/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/hu_HU/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/it_IT/help/README b/languages/it_IT/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/it_IT/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/nl_NL/help/README b/languages/nl_NL/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/nl_NL/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/pl_PL/help/README b/languages/pl_PL/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/pl_PL/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/pt_BR/help/README b/languages/pt_BR/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/pt_BR/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/ro_RO/help/README b/languages/ro_RO/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/ro_RO/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/ru_RU/help/README b/languages/ru_RU/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/ru_RU/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/sk_SK/help/README b/languages/sk_SK/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/sk_SK/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/sv_SE/help/README b/languages/sv_SE/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/sv_SE/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/tr_TR/help/README b/languages/tr_TR/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/tr_TR/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/zh_CN/help/README b/languages/zh_CN/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/zh_CN/help/README
@@ -0,0 +1 @@
+place help files in here
diff --git a/languages/zh_TW/help/README b/languages/zh_TW/help/README
new file mode 100644
index 000000000..e3763b503
--- /dev/null
+++ b/languages/zh_TW/help/README
@@ -0,0 +1 @@
+place help files in here

From 2fceade3a29ac4b49e555ed0f71aec5d121e5ac9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Jun 2015 11:25:14 +0200
Subject: [PATCH 0194/2006] show docs in root folder of document chooser

---
 views/bootstrap/class.Bootstrap.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e1980e67a..2fcf1bb8e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1247,6 +1247,14 @@ function clearFilename<?php print $formName ?>() {
 				}
 			} else {
 				$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby);
+				if($showdocs) {
+					$documents = $folder->getDocuments($orderby);
+					$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
+					foreach($documents as $document) {
+						$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
+						$node['children'][] = $node2;
+					}
+				}
 			}
 			/* Nasty hack to remove the highest folder */
 			if(isset($this->params['remove_root_from_tree']) && $this->params['remove_root_from_tree']) {

From 01ce03ca5cc31c54bc26181cd1a387990f07cd98 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Jun 2015 14:09:50 +0200
Subject: [PATCH 0195/2006] redirect relative to http_root

---
 op/op.Login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Login.php b/op/op.Login.php
index 7cafc7427..4014a73e1 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -332,7 +332,7 @@ if (isset($referuri) && strlen($referuri)>0) {
 	header("Location: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'] . $referuri);
 }
 else {
-	header("Location: ../".(isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php?folderid=".($user->getHomeFolder() ? $user->getHomeFolder() : $settings->_rootFolderID)));
+	header("Location: ".$settings->_httpRoot.(isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php?folderid=".($user->getHomeFolder() ? $user->getHomeFolder() : $settings->_rootFolderID)));
 }
 
 //_printMessage(getMLText("login_ok"),

From 5bac2e9a4ec3e90b343bc3126d26a08ebb50a4a8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Jun 2015 21:28:04 +0200
Subject: [PATCH 0196/2006] manage file uploaded with review or approval

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 74 +++++++++++++++++++++----
 1 file changed, 62 insertions(+), 12 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 35679017a..551e031ae 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1794,6 +1794,17 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$stList = "";
 		foreach ($status as $st) {
 			$stList .= (strlen($stList)==0 ? "" : ", "). "'".$st["reviewID"]."'";
+			$queryStr = "SELECT * FROM tblDocumentReviewLog WHERE reviewID = " . $st['reviewID'];
+			$resArr = $db->getResultArray($queryStr);
+			if ((is_bool($resArr) && !$resArr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			foreach($resArr as $res) {
+				$file = $this->_dms->contentDir . $this->getDir().'r'.$res['reviewLogID'];
+				if(file_exists($file))
+					SeedDMS_Core_File::removeFile($file);
+			}
 			if ($st["status"]==0 && !in_array($st["required"], $emailList)) {
 				$emailList[] = $st["required"];
 			}
@@ -1815,10 +1826,22 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$stList = "";
 		foreach ($status as $st) {
 			$stList .= (strlen($stList)==0 ? "" : ", "). "'".$st["approveID"]."'";
+			$queryStr = "SELECT * FROM tblDocumentApproveLog WHERE approveID = " . $st['approveID'];
+			$resArr = $db->getResultArray($queryStr);
+			if ((is_bool($resArr) && !$resArr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			foreach($resArr as $res) {
+				$file = $this->_dms->contentDir . $this->getDir().'a'.$res['approveLogID'];
+				if(file_exists($file))
+					SeedDMS_Core_File::removeFile($file);
+			}
 			if ($st["status"]==0 && !in_array($st["required"], $emailList)) {
 				$emailList[] = $st["required"];
 			}
 		}
+
 		if (strlen($stList)>0) {
 			$queryStr = "DELETE FROM `tblDocumentApproveLog` WHERE `tblDocumentApproveLog`.`approveID` IN (".$stList.")";
 			if (!$db->getResult($queryStr)) {
@@ -2865,6 +2888,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 						unset($this->_reviewStatus);
 						return false;
 					}
+					foreach($res as &$t) {
+						$filename = $this->_dms->contentDir . $this->_document->getDir().'r'.$t['reviewLogID'];
+						if(file_exists($filename))
+							$t['file'] = $filename;
+						else
+							$t['file'] = '';
+					}
 					$this->_reviewStatus = array_merge($this->_reviewStatus, $res);
 				}
 			}
@@ -2900,7 +2930,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if($recs) {
 				foreach($recs as $rec) {
 					$queryStr=
-						"SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`status`, ".
+						"SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`approveLogId`, `tblDocumentApproveLog`.`status`, ".
 						"`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ".
 						"`tblDocumentApproveLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` AS `groupName` ".
 						"FROM `tblDocumentApprovers` ".
@@ -2915,6 +2945,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 						unset($this->_approvalStatus);
 						return false;
 					}
+					foreach($res as &$t) {
+						$filename = $this->_dms->contentDir . $this->_document->getDir().'a'.$t['approveLogId'];
+						if(file_exists($filename))
+							$t['file'] = $filename;
+						else
+							$t['file'] = '';
+					}
 					$this->_approvalStatus = array_merge($this->_approvalStatus, $res);
 				}
 			}
@@ -3155,7 +3192,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * @param string $comment comment for review
 	 * @return integer new review log id
 	 */
-	function setReviewByInd($user, $requestUser, $status, $comment) { /* {{{ */
+	function setReviewByInd($user, $requestUser, $status, $comment, $file='') { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		// Check to see if the user can be removed from the review list.
@@ -3185,10 +3222,12 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$res=$db->getResult($queryStr);
 		if (is_bool($res) && !$res)
 			return -1;
-		else {
-			$reviewLogID = $db->getInsertID();
-			return $reviewLogID;
+
+		$reviewLogID = $db->getInsertID();
+		if($file) {
+			SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'r' . $reviewLogID);
 		}
+		return $reviewLogID;
  } /* }}} */
 
 	/**
@@ -3205,7 +3244,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * @param string $comment comment for review
 	 * @return integer new review log id
 	 */
-	function setReviewByGrp($group, $requestUser, $status, $comment) { /* {{{ */
+	function setReviewByGrp($group, $requestUser, $status, $comment, $file='') { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		// Check to see if the user can be removed from the review list.
@@ -3237,6 +3276,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return -1;
 		else {
 			$reviewLogID = $db->getInsertID();
+			if($file) {
+				SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'r' . $reviewLogID);
+			}
 			return $reviewLogID;
 		}
  } /* }}} */
@@ -3372,7 +3414,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * @param string $comment approval comment
 	 * @return integer 0 on success, < 0 in case of an error
 	 */
-	function setApprovalByInd($user, $requestUser, $status, $comment) { /* {{{ */
+	function setApprovalByInd($user, $requestUser, $status, $comment, $file='') { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		// Check to see if the user can be removed from the approval list.
@@ -3402,8 +3444,12 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$res=$db->getResult($queryStr);
 		if (is_bool($res) && !$res)
 			return -1;
-		else
-			return 0;
+
+		$approveLogID = $db->getInsertID();
+		if($file) {
+			SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID);
+		}
+		return $approveLogId;
  } /* }}} */
 
 	/**
@@ -3412,7 +3458,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * {link SeedDMS_Core_DocumentContent::setApprovalByInd} but does it for
 	 * group instead of a user
 	 */
-	function setApprovalByGrp($group, $requestUser, $status, $comment) { /* {{{ */
+	function setApprovalByGrp($group, $requestUser, $status, $comment, $file='') { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		// Check to see if the user can be removed from the approval list.
@@ -3442,8 +3488,12 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$res=$db->getResult($queryStr);
 		if (is_bool($res) && !$res)
 			return -1;
-		else
-			return 0;
+
+		$approveLogID = $db->getInsertID();
+		if($file) {
+			SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID);
+		}
+		return $approveLogId;
  } /* }}} */
 
 	function addIndRecipient($user, $requestUser) { /* {{{ */

From fcddfb016229b306cf07f4d5e6eec068fa8ae838 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Jun 2015 21:30:56 +0200
Subject: [PATCH 0197/2006] allow to upload a file with each review/approval

Conflicts:
	op/op.ApproveDocument.php
	op/op.ReviewDocument.php
---
 op/op.ApproveDocument.php                 | 11 +++++++++++
 op/op.ReviewDocument.php                  | 11 +++++++++++
 views/bootstrap/class.ApproveDocument.php | 17 +++++++++++++----
 views/bootstrap/class.ReviewDocument.php  | 10 +++++++++-
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index cee6769de..5d84b477b 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -84,6 +84,12 @@ if (!isset($_POST["approvalStatus"]) || !is_numeric($_POST["approvalStatus"]) ||
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_approval_status"));
 }
 
+if($_FILES["approvalfile"]["tmp_name"]) {
+	if (is_uploaded_file($_FILES["approvalfile"]["tmp_name"]) && $_FILES['approvalfile']['error']!=0){
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("uploading_failed"));
+	}
+}
+
 $controller->setParam('document', $document);
 $controller->setParam('content', $latestContent);
 $controller->setParam('approvalstatus', $_POST["approvalStatus"]);
@@ -93,8 +99,13 @@ if ($_POST["approvalType"] == "grp") {
 } else {
 	$group = null;
 }
+if($_FILES["approvalfile"]["tmp_name"])
+	$file = $_FILES["approvalfile"]["tmp_name"];
+else
+	$file = '';
 $controller->setParam('group', $group);
 $controller->setParam('comment', $_POST["comment"]);
+$controller->setParam('file', $file);
 if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index dc401c1e7..9a57c39e8 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -83,6 +83,12 @@ if (!isset($_POST["reviewStatus"]) || !is_numeric($_POST["reviewStatus"]) ||
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_review_status"));
 }
 
+if($_FILES["reviewfile"]["tmp_name"]) {
+	if (is_uploaded_file($_FILES["reviewfile"]["tmp_name"]) && $_FILES['reviewfile']['error']!=0){
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("uploading_failed"));
+	}
+}
+
 $controller->setParam('document', $document);
 $controller->setParam('content', $latestContent);
 $controller->setParam('reviewstatus', $_POST["reviewStatus"]);
@@ -92,8 +98,13 @@ if ($_POST["reviewType"] == "grp") {
 } else {
 	$group = null;
 }
+if($_FILES["reviewfile"]["tmp_name"])
+	$file = $_FILES["reviewfile"]["tmp_name"];
+else
+	$file = '';
 $controller->setParam('group', $group);
 $controller->setParam('comment', $_POST["comment"]);
+$controller->setParam('file', $file);
 if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
diff --git a/views/bootstrap/class.ApproveDocument.php b/views/bootstrap/class.ApproveDocument.php
index 4d3eb7934..16e6d3523 100644
--- a/views/bootstrap/class.ApproveDocument.php
+++ b/views/bootstrap/class.ApproveDocument.php
@@ -118,12 +118,21 @@ function checkGrpForm()
 				print "</tr></tbody></table><br>\n";
 			}
 ?>
-	<form method="post" action="../op/op.ApproveDocument.php" name="form1" onsubmit="return checkIndForm();">
+	<form method="post" action="../op/op.ApproveDocument.php" name="form1" enctype="multipart/form-data" onsubmit="return checkIndForm();">
 	<?php echo createHiddenFieldWithKey('approvedocument'); ?>
 	<table>
-	<tr><td><?php printMLText("comment")?>:</td>
-	<td><textarea name="comment" cols="80" rows="4"></textarea>
-	</td></tr>
+		<tr>
+			<td><?php printMLText("comment")?>:</td>
+			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
+		</tr>
+		<tr>
+			<td><?php printMLText("approval_file")?>:</td>
+			<td>
+<?php
+	$this->printFileChooser('approvalfile', false);
+?>
+			</td>
+		</tr>
 	<tr><td><?php printMLText("approval_status")?>:</td>
 	<td><select name="approvalStatus">
 <?php if($approvalStatus['status'] != 1) { ?>
diff --git a/views/bootstrap/class.ReviewDocument.php b/views/bootstrap/class.ReviewDocument.php
index 2159bde0f..aa6a1f669 100644
--- a/views/bootstrap/class.ReviewDocument.php
+++ b/views/bootstrap/class.ReviewDocument.php
@@ -109,13 +109,21 @@ function checkGrpForm()
 				print "</tr></tbody></table><br>";
 			}
 ?>
-	<form method="post" action="../op/op.ReviewDocument.php" name="form1" onsubmit="return checkIndForm();">
+	<form method="post" action="../op/op.ReviewDocument.php" name="form1" enctype="multipart/form-data" onsubmit="return checkIndForm();">
 	<?php echo createHiddenFieldWithKey('reviewdocument'); ?>
 	<table class="table-condensed">
 		<tr>
 			<td><?php printMLText("comment")?>:</td>
 			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
 		</tr>
+		<tr>
+			<td><?php printMLText("review_file")?>:</td>
+			<td>
+<?php
+	$this->printFileChooser('reviewfile', false);
+?>
+			</td>
+		</tr>
 		<tr>
 			<td><?php printMLText("review_status")?></td>
 			<td>

From b3c9cb2728f2d4d6932770d70633211f0f9728fa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Jun 2015 08:59:05 +0200
Subject: [PATCH 0198/2006] add function get_extension()

returns file extension by mimetype

Conflicts:
	inc/inc.Utils.php
---
 inc/inc.Utils.php | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index ae34ed5c1..eabfe1787 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -503,4 +503,45 @@ function decryptData($key, $value){
   return trim($decrypttext);
 }
 
+/**
+ * Return file extension for a give mimetype
+ *
+ * @param string $mimetype Mime-Type
+ * @return string file extension including leading dot
+ */
+function get_extension($mimetype) { /* {{{ */
+	if(empty($mimetype)) return false;
+	switch($mimetype) {
+		case 'image/bmp': return '.bmp';
+		case 'image/cis-cod': return '.cod';
+		case 'image/gif': return '.gif';
+		case 'image/ief': return '.ief';
+		case 'image/jpeg': return '.jpg';
+		case 'image/pipeg': return '.jfif';
+		case 'image/tiff': return '.tif';
+		case 'image/x-cmu-raster': return '.ras';
+		case 'image/x-cmx': return '.cmx';
+		case 'image/x-icon': return '.ico';
+		case 'image/x-portable-anymap': return '.pnm';
+		case 'image/x-portable-bitmap': return '.pbm';
+		case 'image/x-portable-graymap': return '.pgm';
+		case 'image/x-portable-pixmap': return '.ppm';
+		case 'image/x-rgb': return '.rgb';
+		case 'image/x-xbitmap': return '.xbm';
+		case 'image/x-xpixmap': return '.xpm';
+		case 'image/x-xwindowdump': return '.xwd';
+		case 'image/png': return '.png';
+		case 'image/x-jps': return '.jps';
+		case 'image/x-freehand': return '.fh';
+		case 'image/svg+xml': return '.svg';
+		case 'application/zip': return '.zip';
+		case 'application/x-rar': return '.rar';
+		case 'application/pdf': return '.pdf';
+		case 'application/postscript': return '.ps';
+		case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': return '.docx';
+		case 'text/plain': return '.txt';
+		case 'text/csv': return '.csv';
+		default: return false;
+	}
+} /* }}} */
 ?>

From 77794294b152d4f548568e8bc3329f2e37887dc1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Jun 2015 08:59:36 +0200
Subject: [PATCH 0199/2006] download review/approval files

---
 op/op.Download.php | 62 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/op/op.Download.php b/op/op.Download.php
index 3d5453873..822c531ea 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -210,6 +210,68 @@ if (isset($_GET["version"])) {
 	
 	ob_clean();
 	readfile($settings->_contentDir .$filename );
+} elseif (isset($_GET["reviewlogid"])) {
+	if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
+		UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+	}
+
+	if (!isset($_GET["reviewlogid"]) || !is_numeric($_GET["reviewlogid"]) || intval($_GET["reviewlogid"])<1) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_reviewlog_id"));
+	}
+
+	$documentid = $_GET["documentid"];
+	$document = $dms->getDocument($documentid);
+	if (!is_object($document)) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_doc_id"));
+	}
+
+	if ($document->getAccessMode($user) < M_READ) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+	}
+
+	$filename = $dms->contentDir . $document->getDir().'r'.(int) $_GET['reviewlogid'];
+	if(file_exists($filename)) {
+		$finfo = finfo_open(FILEINFO_MIME_TYPE);
+		$mimetype = finfo_file($finfo, $filename);
+
+		header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+		header("Content-Transfer-Encoding: binary");
+		header("Content-Length: " . filesize($filename ));
+		header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+		header("Cache-Control: must-revalidate");
+		readfile($filename);
+	}
+} elseif (isset($_GET["approvelogid"])) {
+	if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
+		UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+	}
+
+	if (!isset($_GET["approvelogid"]) || !is_numeric($_GET["approvelogid"]) || intval($_GET["approvelogid"])<1) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_approvelog_id"));
+	}
+
+	$documentid = $_GET["documentid"];
+	$document = $dms->getDocument($documentid);
+	if (!is_object($document)) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_doc_id"));
+	}
+
+	if ($document->getAccessMode($user) < M_READ) {
+		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+	}
+
+	$filename = $dms->contentDir . $document->getDir().'a'.(int) $_GET['approvelogid'];
+	if(file_exists($filename)) {
+		$finfo = finfo_open(FILEINFO_MIME_TYPE);
+		$mimetype = finfo_file($finfo, $filename);
+
+		header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+		header("Content-Transfer-Encoding: binary");
+		header("Content-Length: " . filesize($filename ));
+		header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+		header("Cache-Control: must-revalidate");
+		readfile($filename);
+	}
 }
 
 add_log_line();

From 42d822a48d4fca8ec4d72dc53d15f4adb282a23b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Jun 2015 11:23:44 +0200
Subject: [PATCH 0200/2006] output link to approval/review file

---
 views/bootstrap/class.ViewDocument.php | 28 ++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 41520ab96..5553b3286 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -172,6 +172,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			echo "</i>";
 			if($rec['comment'])
 				echo "<br />".htmlspecialchars($rec['comment']);
+			switch($type) {
+			case "review":
+				if($rec['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+				}
+				break;
+			case "approval":
+				if($rec['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogId']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+				}
+				break;
+			}
 			echo "</td>";
 			echo "<td>";
 			switch($type) {
@@ -688,7 +702,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				/* $updateUser is the user who has done the review */
 				$updateUser = $dms->getUser($r["userID"]);
 				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
-				print "<td>".htmlspecialchars($r["comment"])."</td>\n";
+				print "<td>".htmlspecialchars($r["comment"]);
+				if($r['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+				}
+				print "</td>\n";
 				print "<td>".getReviewStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 
@@ -752,7 +771,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				/* $updateUser is the user who has done the approval */
 				$updateUser = $dms->getUser($a["userID"]);
 				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</li></ul></td>";	
-				print "<td>".htmlspecialchars($a["comment"])."</td>\n";
+				print "<td>".htmlspecialchars($a["comment"]);
+				if($a['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogId']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+				}
+				echo "</td>\n";
 				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 

From 34a7df9180e7be17e7e2151075f6ced6b6372dcb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Jun 2015 12:43:54 +0200
Subject: [PATCH 0201/2006] rename approveLogId to approveLogID

Conflicts:
	views/bootstrap/class.ViewDocument.php
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 10 +++++-----
 views/bootstrap/class.ViewDocument.php  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 551e031ae..58c6b7cdf 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2930,7 +2930,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if($recs) {
 				foreach($recs as $rec) {
 					$queryStr=
-						"SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`approveLogId`, `tblDocumentApproveLog`.`status`, ".
+						"SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`approveLogID`, `tblDocumentApproveLog`.`status`, ".
 						"`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ".
 						"`tblDocumentApproveLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` AS `groupName` ".
 						"FROM `tblDocumentApprovers` ".
@@ -2938,7 +2938,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 						"LEFT JOIN `tblUsers` on `tblUsers`.`id` = `tblDocumentApprovers`.`required` ".
 						"LEFT JOIN `tblGroups` on `tblGroups`.`id` = `tblDocumentApprovers`.`required`".
 						"WHERE `tblDocumentApprovers`.`approveID` = '". $rec['approveID'] ."' ".
-						"ORDER BY `tblDocumentApproveLog`.`approveLogId` DESC LIMIT ".(int) $limit;
+						"ORDER BY `tblDocumentApproveLog`.`approveLogID` DESC LIMIT ".(int) $limit;
 
 					$res = $db->getResultArray($queryStr);
 					if (is_bool($res) && !$res) {
@@ -2946,7 +2946,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 						return false;
 					}
 					foreach($res as &$t) {
-						$filename = $this->_dms->contentDir . $this->_document->getDir().'a'.$t['approveLogId'];
+						$filename = $this->_dms->contentDir . $this->_document->getDir().'a'.$t['approveLogID'];
 						if(file_exists($filename))
 							$t['file'] = $filename;
 						else
@@ -3449,7 +3449,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if($file) {
 			SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID);
 		}
-		return $approveLogId;
+		return $approveLogID;
  } /* }}} */
 
 	/**
@@ -3493,7 +3493,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if($file) {
 			SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID);
 		}
-		return $approveLogId;
+		return $approveLogID;
  } /* }}} */
 
 	function addIndRecipient($user, $requestUser) { /* {{{ */
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 5553b3286..9e5cadf43 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -182,7 +182,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			case "approval":
 				if($rec['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogId']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
 				}
 				break;
 			}
@@ -774,7 +774,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".htmlspecialchars($a["comment"]);
 				if($a['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogId']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
 				}
 				echo "</td>\n";
 				print "<td>".getApprovalStatusText($a["status"])."</td>\n";

From da7c04d250372b37b393cbb2cbe7fc6ad28bb69b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Jun 2015 12:56:17 +0200
Subject: [PATCH 0202/2006] actually use uploaded file

---
 controllers/class.ApproveDocument.php | 5 +++--
 controllers/class.ReviewDocument.php  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/controllers/class.ApproveDocument.php b/controllers/class.ApproveDocument.php
index 5296b6d5f..ec0caf8ed 100644
--- a/controllers/class.ApproveDocument.php
+++ b/controllers/class.ApproveDocument.php
@@ -32,6 +32,7 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
 		$approvaltype = $this->params['approvaltype'];
 		$group = $this->params['group'];
 		$comment = $this->params['comment'];
+		$file = $this->params['file'];
 
 		/* Get the document id and name before removing the document */
 		$docname = $document->getName();
@@ -43,13 +44,13 @@ class SeedDMS_Controller_ApproveDocument extends SeedDMS_Controller_Common {
 		$result = $this->callHook('approveDocument', $content);
 		if($result === null) {
 			if ($approvaltype == "ind") {
-				if(0 > $content->setApprovalByInd($user, $user, $approvalstatus, $comment)) {
+				if(0 > $content->setApprovalByInd($user, $user, $approvalstatus, $comment, $file)) {
 					$this->error = 1;
 					$this->errormsg = "approval_update_failed";
 					return false;
 				}
 			} elseif ($approvaltype == "grp") {
-				if(0 > $content->setApprovalByGrp($group, $user, $approvalstatus, $comment)) {
+				if(0 > $content->setApprovalByGrp($group, $user, $approvalstatus, $comment, $file)) {
 					$this->error = 1;
 					$this->errormsg = "approval_update_failed";
 					return false;
diff --git a/controllers/class.ReviewDocument.php b/controllers/class.ReviewDocument.php
index 936503679..8139f6663 100644
--- a/controllers/class.ReviewDocument.php
+++ b/controllers/class.ReviewDocument.php
@@ -32,6 +32,7 @@ class SeedDMS_Controller_ReviewDocument extends SeedDMS_Controller_Common {
 		$reviewtype = $this->params['reviewtype'];
 		$group = $this->params['group'];
 		$comment = $this->params['comment'];
+		$file = $this->params['file'];
 
 		/* Get the document id and name before removing the document */
 		$docname = $document->getName();
@@ -44,13 +45,13 @@ class SeedDMS_Controller_ReviewDocument extends SeedDMS_Controller_Common {
 		if($result === null) {
 
 			if ($reviewtype == "ind") {
-				if(0 > $content->setReviewByInd($user, $user, $reviewstatus, $comment)) {
+				if(0 > $content->setReviewByInd($user, $user, $reviewstatus, $comment, $file)) {
 					$this->error = 1;
 					$this->errormsg = "review_update_failed";
 					return false;
 				}
 			} elseif ($reviewtype == "grp") {
-				if(0 > $content->setReviewByGrp($group, $user, $reviewstatus, $comment)) {
+				if(0 > $content->setReviewByGrp($group, $user, $reviewstatus, $comment, $file)) {
 					$this->error = 1;
 					$this->errormsg = "review_update_failed";
 					return false;

From ecafa39d1e587eb5751dfb4b5d4eb38bb1669fd2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 08:53:39 +0200
Subject: [PATCH 0203/2006] mayApprove() checks if document is in review

---
 inc/inc.ClassAccessOperation.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index b7d7f7235..c430b13dc 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -251,14 +251,15 @@ class SeedDMS_AccessOperation {
 	 * Check if document content may be approved
 	 *
 	 * Approving a document content is only allowed if the document was not
-	 * obsoleted. There are other requirements which are not taken into
+	 * obsoleted and the document is not in review status.
+	 * There are other requirements which are not taken into
 	 * account here.
 	 */
 	function mayApprove() { /* {{{ */
 		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ($status["status"]!=S_OBSOLETE) {
+			if ($status["status"]!=S_OBSOLETE && $status["status"]!=S_DRAFT_REV) {
 				return true;
 			}
 		}

From 15a708fbf25682120d8e5fad9730b1d58d566f16 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 08:55:20 +0200
Subject: [PATCH 0204/2006] use access operation to check if approval is
 allowed

Conflicts:
	op/op.ApproveDocument.php

Conflicts:
	op/op.ApproveDocument.php
---
 op/op.ApproveDocument.php   | 8 ++++++--
 out/out.ApproveDocument.php | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 5d84b477b..08f980201 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -27,6 +27,7 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
@@ -73,9 +74,12 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
 $olddocstatus = $content->getStatus();
-// verify if document has expired
-if ($document->hasExpired()){
+// verify if document may be approved
+if ($accessop->mayApprove()){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/out/out.ApproveDocument.php b/out/out.ApproveDocument.php
index dc343eb95..4b9efa878 100644
--- a/out/out.ApproveDocument.php
+++ b/out/out.ApproveDocument.php
@@ -61,8 +61,9 @@ $latestContent = $document->getLatestContent();
 if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
-// verify if document has expired
-if ($document->hasExpired()){
+
+// verify if document may be approved
+if ($accessop->mayApprove()){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 

From 03d8d6c247a9fad8a4784c375813b4861d2905da Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 08:53:39 +0200
Subject: [PATCH 0205/2006] mayApprove() checks if document is in review


From 67d10d10ae1b3aaca7acb1d7cec9abde07a3fa65 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 09:05:20 +0200
Subject: [PATCH 0206/2006] use access operation to check if document may be
 reviewed

---
 op/op.ReviewDocument.php   |  7 +++++--
 out/out.ReviewDocument.php | 11 ++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 9a57c39e8..1726a1952 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -72,9 +72,12 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
 $olddocstatus = $content->getStatus();
-// verify if document has expired
-if ($document->hasExpired()){
+// verify if document may be reviewed
+if ($accessop->mayReview()){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/out/out.ReviewDocument.php b/out/out.ReviewDocument.php
index 7580f2ac3..298b89a79 100644
--- a/out/out.ReviewDocument.php
+++ b/out/out.ReviewDocument.php
@@ -58,8 +58,12 @@ $latestContent = $document->getLatestContent();
 if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
-// verify if document has expired
-if ($document->hasExpired()){
+
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+// verify if document may be reviewed
+if ($accessop->mayReview()){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
@@ -68,9 +72,6 @@ if(!$reviews) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_action"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
 if($view) {

From e7ed3f77899ceebefebda26fbf76526c5fd14b80 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 09:20:33 +0200
Subject: [PATCH 0207/2006] add optional parameter class to
 contentContainerStart()

---
 views/bootstrap/class.Bootstrap.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 2fcf1bb8e..53bfd1d6e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -716,10 +716,8 @@ $(document).ready(function () {
 		return;
 	} /* }}} */
 
-	function contentContainerStart($type='info') { /* {{{ */
-
-		//echo "<div class=\"alert alert-".$type."\">\n";
-		echo "<div class=\"well\">\n";
+	function contentContainerStart($class='') { /* {{{ */
+		echo "<div class=\"well".($class ? " ".$class : "")."\">\n";
 		return;
 	} /* }}} */
 

From d8df11367693695ef9835c4f1263864d4f3c5d6c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 09:24:25 +0200
Subject: [PATCH 0208/2006] add class 'help'

---
 styles/bootstrap/application.css | 12 ++++++++++++
 views/bootstrap/class.Help.php   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index 1cd0f7dba..4ddbe25bd 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -111,6 +111,18 @@ div.statusbar a.btn {
 	height: 20px;
 }
 
+div.help h1 {
+	font-size: 24px;
+}
+
+div.help h2 {
+	font-size: 18px;
+}
+
+div.help h3 {
+	font-size: 16px;
+}
+
 @media (max-width: 480px) { 
     .nav-tabs > li {
         float:none;
diff --git a/views/bootstrap/class.Help.php b/views/bootstrap/class.Help.php
index 5a209068e..3dbeceb4a 100644
--- a/views/bootstrap/class.Help.php
+++ b/views/bootstrap/class.Help.php
@@ -41,7 +41,7 @@ class SeedDMS_View_Help extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("help").": ".getMLText('help_'.strtolower($context), array(), $context), "");
 
-		$this->contentContainerStart();
+		$this->contentContainerStart('help');
 
 		$helpfile = "../languages/".$this->params['session']->getLanguage()."/help/".$context.".html";
 		if(file_exists($helpfile))

From d12f9993ddfbc11363d3556b9eba86b576c6ffd3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 14:13:38 +0200
Subject: [PATCH 0209/2006] add mayReceipt()

---
 inc/inc.ClassAccessOperation.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index c430b13dc..9d7e4de3f 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -138,7 +138,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) /* && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)*/) {
 				return true;
 			}
 		}
@@ -266,6 +266,24 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if document content may be receipted
+	 *
+	 * Reviewing a document content is only allowed if the document was not
+	 * obsoleted. There are other requirements which are not taken into
+	 * account here.
+	 */
+	function mayReceipt() { /* {{{ */
+		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
+			$latestContent = $this->obj->getLatestContent();
+			$status = $latestContent->getStatus();
+			if ($status["status"]!=S_OBSOLETE) {
+				return true;
+			}
+		}
+		return false;
+	} /* }}} */
+
 	/**
 	 * Check if document content may be revised
 	 *

From 80a49262f44d71c8efbb9f5013bd2b97ca897ac2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 14:14:31 +0200
Subject: [PATCH 0210/2006] propperly check for sufficient access rights

---
 op/op.ApproveDocument.php   |  2 +-
 op/op.ReceiptDocument.php   |  8 ++++++--
 op/op.ReviewDocument.php    |  3 ++-
 op/op.ReviseDocument.php    |  8 ++++++--
 out/out.ApproveDocument.php |  2 +-
 out/out.ReceiptDocument.php | 10 +++++-----
 out/out.ReviewDocument.php  |  2 +-
 out/out.ReviseDocument.php  | 11 ++++++-----
 8 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 08f980201..65d5e62a2 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -79,7 +79,7 @@ $accessop = new SeedDMS_AccessOperation($document, $user, $settings);
 
 $olddocstatus = $content->getStatus();
 // verify if document may be approved
-if ($accessop->mayApprove()){
+if (!$accessop->mayApprove()){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index 76f578833..2b365bce9 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -26,6 +26,7 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
@@ -72,8 +73,11 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
-// verify if document has expired
-if ($document->hasExpired()){
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+// verify if document may be receіpted
+if (!$accessop->mayReceipt()){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 1726a1952..b14faa160 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -26,6 +26,7 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
@@ -77,7 +78,7 @@ $accessop = new SeedDMS_AccessOperation($document, $user, $settings);
 
 $olddocstatus = $content->getStatus();
 // verify if document may be reviewed
-if ($accessop->mayReview()){
+if (!$accessop->mayReview()){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index 7b22e1cda..d302a6195 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -26,6 +26,7 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
@@ -72,9 +73,12 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
 $olddocstatus = $content->getStatus();
-// verify if document has expired
-if ($document->hasExpired()){
+// verify if document maybe revised
+if (!$document->mayRevise()){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/out/out.ApproveDocument.php b/out/out.ApproveDocument.php
index 4b9efa878..f891a589f 100644
--- a/out/out.ApproveDocument.php
+++ b/out/out.ApproveDocument.php
@@ -63,7 +63,7 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 // verify if document may be approved
-if ($accessop->mayApprove()){
+if (!$accessop->mayApprove()){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php
index c115b4eac..ca3498ae9 100644
--- a/out/out.ReceiptDocument.php
+++ b/out/out.ReceiptDocument.php
@@ -58,8 +58,11 @@ $latestContent = $document->getLatestContent();
 if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
-// verify if document has expired
-if ($document->hasExpired()){
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+// verify if document may be receipted
+if (!$accessop->mayReceipt()){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
@@ -68,9 +71,6 @@ if(!$receipts) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_action"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
 if($view) {
diff --git a/out/out.ReviewDocument.php b/out/out.ReviewDocument.php
index 298b89a79..9059ca291 100644
--- a/out/out.ReviewDocument.php
+++ b/out/out.ReviewDocument.php
@@ -63,7 +63,7 @@ if ($latestContent->getVersion()!=$version) {
 $accessop = new SeedDMS_AccessOperation($document, $user, $settings);
 
 // verify if document may be reviewed
-if ($accessop->mayReview()){
+if (!$accessop->mayReview()){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
diff --git a/out/out.ReviseDocument.php b/out/out.ReviseDocument.php
index a07f4b312..d0fd6d197 100644
--- a/out/out.ReviseDocument.php
+++ b/out/out.ReviseDocument.php
@@ -58,8 +58,12 @@ $latestContent = $document->getLatestContent();
 if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
-// verify if document has expired
-if ($document->hasExpired()){
+
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+
+// verify if document maybe revised
+if (!$document->mayRevise()){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
@@ -68,9 +72,6 @@ if(!$revisions) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_action"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content, 'revisionid'=>(int) $_GET['revisionid']));
 if($view) {

From 9eb9114eceb6e1e66cd740339508dee44a925421 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 14:15:04 +0200
Subject: [PATCH 0211/2006] receipt protocol just contains last entry,
 propperly check for access on receiping  a version

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 9e5cadf43..95c1ae2c2 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -133,7 +133,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$statusList = $latestContent->getRevisionStatus(10);
 			break;
 		case "receipt":
-			$statusList = $latestContent->getReceiptStatus(10);
+			$statusList = $latestContent->getReceiptStatus(1);
 			break;
 		default:
 			$statusList = array();
@@ -1062,7 +1062,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".getReceiptStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 
-				if($accessop->mayReview()) {
+				if($accessop->mayReceipt()) {
 					if ($is_recipient && $r["status"]==0) {
 						print "<li><a href=\"../out/out.ReceiptDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("add_receipt")."</a></li>";
 					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){

From 5b03c3dcc30e392e5de60d16135fe7d293e41aab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Jun 2015 15:28:25 +0200
Subject: [PATCH 0212/2006] show link to Indexer only if fulltext is enabled

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 53bfd1d6e..bf3f7a83f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -438,7 +438,7 @@ $(document).ready(function () {
 			}
 			echo "<li><a href=\"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("edit_existing_notify")."</a></li>\n";
 		}
-		if ($this->params['user']->isAdmin()) {
+		if ($this->params['user']->isAdmin() && $this->params['enablefullsearch']) {
 			echo "<li><a href=\"../out/out.Indexer.php?folderid=". $folderID ."\">".getMLText("index_folder")."</a></li>\n";
 		}
 		echo "</ul>\n";

From 5d5d9540773c5dd2490034396c3b225759b7a560 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Jun 2015 07:59:06 +0200
Subject: [PATCH 0213/2006] createToc() uses self::items, use counter for
 columns

---
 inc/inc.ClassDownloadMgr.php | 61 +++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index ffeb332a2..cfc2e02e2 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -48,24 +48,27 @@ class SeedDMS_Download_Mgr {
 		$this->items[$item->getID()] = $item;
 	} /* }}} */
 
-	public function createToc($file, $items) { /* {{{ */
+	public function createToc($file) { /* {{{ */
+		$items = $this->items;
 		$objPHPExcel = new PHPExcel();
 		$objPHPExcel->getProperties()->setCreator("SeedDMS")->setTitle("Metadata");
 		$sheet = $objPHPExcel->setActiveSheetIndex(0);
 
 		$i = 1;
-		$sheet->setCellValueByColumnAndRow(0, $i, 'Dokumenten-Nr.');
-		$sheet->setCellValueByColumnAndRow(1, $i, 'Dateiname');
-		$sheet->setCellValueByColumnAndRow(2, $i, 'Status');
-		$sheet->setCellValueByColumnAndRow(3, $i, 'Int. Version');
-		$sheet->setCellValueByColumnAndRow(4, $i, 'Prüfer');
-		$sheet->setCellValueByColumnAndRow(5, $i, 'Prüfdatum');
-		$sheet->setCellValueByColumnAndRow(6, $i, 'Prüfkommentar');
-		$sheet->setCellValueByColumnAndRow(7, $i, 'Prüfstatus');
-		$sheet->setCellValueByColumnAndRow(8, $i, 'Freigeber');
-		$sheet->setCellValueByColumnAndRow(9, $i, 'Freigabedatum');
-		$sheet->setCellValueByColumnAndRow(10, $i, 'Freigabekommentar');
-		$sheet->setCellValueByColumnAndRow(11, $i, 'Freigabestatus');
+		$col = 0;
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Dokumenten-Nr.');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Dokumentenname');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Dateiname');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Status');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Int. Version');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Prüfer');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Prüfdatum');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Prüfkommentar');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Prüfstatus');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Freigeber');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Freigabedatum');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Freigabekommentar');
+		$sheet->setCellValueByColumnAndRow($col++, $i, 'Freigabestatus');
 		$i++;
 		foreach($items as $item) {
 			$document = $item->getDocument();
@@ -74,10 +77,12 @@ class SeedDMS_Download_Mgr {
 			$reviewStatus = $item->getReviewStatus();
 			$approvalStatus = $item->getApprovalStatus();
 
-			$sheet->setCellValueByColumnAndRow(0, $i, $document->getID());
-			$sheet->setCellValueByColumnAndRow(1, $i, $document->getID()."-".$item->getOriginalFileName());
-			$sheet->setCellValueByColumnAndRow(2, $i, getOverallStatusText($status['status']));
-			$sheet->setCellValueByColumnAndRow(3, $i, $item->getVersion());
+			$col = 0;
+			$sheet->setCellValueByColumnAndRow($col++, $i, $document->getID());
+			$sheet->setCellValueByColumnAndRow($col++, $i, $document->getName());
+			$sheet->setCellValueByColumnAndRow($col++, $i, $document->getID()."-".$item->getOriginalFileName());
+			$sheet->setCellValueByColumnAndRow($col++, $i, getOverallStatusText($status['status']));
+			$sheet->setCellValueByColumnAndRow($col++, $i, $item->getVersion());
 			$l = $i;
 			$k = $i;
 			if($reviewStatus) {
@@ -100,12 +105,14 @@ class SeedDMS_Download_Mgr {
 							}
 							break;
 					}
-					$sheet->setCellValueByColumnAndRow(4, $l, $reqName);
-					$sheet->setCellValueByColumnAndRow(5, $l, ($r['status']==1 || $r['status']==-1) ? $r['date'] : "");
-					$sheet->setCellValueByColumnAndRow(6, $l, $r['comment']);
-					$sheet->setCellValueByColumnAndRow(7, $l, getReviewStatusText($r["status"]));
+					$tcol = $col;
+					$sheet->setCellValueByColumnAndRow($tcol++, $l, $reqName);
+					$sheet->setCellValueByColumnAndRow($tcol++, $l, ($r['status']==1 || $r['status']==-1) ? $r['date'] : "");
+					$sheet->setCellValueByColumnAndRow($tcol++, $l, $r['comment']);
+					$sheet->setCellValueByColumnAndRow($tcol++, $l, getReviewStatusText($r["status"]));
 					$l++;
 				}
+				$col = $tcol;
 				$l--;
 			}
 			if($approvalStatus) {
@@ -128,12 +135,14 @@ class SeedDMS_Download_Mgr {
 							}
 							break;
 					}
-					$sheet->setCellValueByColumnAndRow(8, $k, $reqName);
-					$sheet->setCellValueByColumnAndRow(9, $k, ($r['status']==1 || $r['status']==-1) ?$r['date'] : "");
-					$sheet->setCellValueByColumnAndRow(10, $k, $r['comment']);
-					$sheet->setCellValueByColumnAndRow(11, $k, getReviewStatusText($r["status"]));
+					$tcol = $col;
+					$sheet->setCellValueByColumnAndRow($tcol++, $k, $reqName);
+					$sheet->setCellValueByColumnAndRow($tcol++, $k, ($r['status']==1 || $r['status']==-1) ?$r['date'] : "");
+					$sheet->setCellValueByColumnAndRow($tcol++, $k, $r['comment']);
+					$sheet->setCellValueByColumnAndRow($tcol++, $k, getApprovalStatusText($r["status"]));
 					$k++;
 				}
+				$col = $tcol;
 				$k--;
 			}
 			$i = max($l, $k);
@@ -152,7 +161,7 @@ class SeedDMS_Download_Mgr {
 		}
 
 		$file = tempnam("/tmp", "export-list-");
-		$this->createToc($file, $this->items);
+		$this->createToc($file);
 
 		$zip = new ZipArchive();
 		$prefixdir = date('Y-m-d', time());

From 1a179c7dcacab81fe5f6b695eee4a60b7f5298ea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Jun 2015 08:34:15 +0200
Subject: [PATCH 0214/2006] check if includecontent is set

if not set only the excel file is delivered
---
 op/op.Search.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/op/op.Search.php b/op/op.Search.php
index d2b75aef3..75dbd4b44 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -423,12 +423,21 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 			}
 		}
 		$filename = tempnam('/tmp', '');
-		$downmgr->createArchive($filename);
-		header("Content-Transfer-Encoding: binary");
-		header("Content-Length: " . filesize($filename));
-		header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
-		header("Content-Type: application/zip");
-		header("Cache-Control: must-revalidate");
+		if(isset($_GET['includecontent']) && $_GET['includecontent']) {
+			$downmgr->createArchive($filename);
+			header("Content-Transfer-Encoding: binary");
+			header("Content-Length: " . filesize($filename));
+			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
+			header("Content-Type: application/zip");
+			header("Cache-Control: must-revalidate");
+		} else {
+			$downmgr->createToc($filename);
+			header("Content-Transfer-Encoding: binary");
+			header("Content-Length: " . filesize($filename));
+			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".xls\"");
+			header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml. sheet");
+			header("Cache-Control: must-revalidate");
+		}
 
 		readfile($filename);
 		unlink($filename);

From dbf31053c9284828a5bf316846d2f19ef0199987 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Jun 2015 08:35:10 +0200
Subject: [PATCH 0215/2006] put export button into arcodion

---
 views/bootstrap/class.Search.php | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index ce0d86ae4..27b772e50 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -193,14 +193,38 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 ?>
 
 <tr>
-<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button> <?php if($totaldocs): ?><a class="btn" href="<?= $_SERVER['REQUEST_URI']."&export=1" ?>"><i class="icon-download"></i> Export</a><?php endif; ?></td>
+<td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
 </tr>
 
 </table>
 <?php
 		$this->contentContainerEnd();
 // }}}
-
+?>
+<?php if($totaldocs): ?>
+<div class="accordion" id="accordion1">
+  <div class="accordion-group">
+    <div class="accordion-heading">
+      <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapseFolder">
+        <?php printMLText('export'); ?>
+      </a>
+    </div>
+    <div id="collapseFolder" class="accordion-body <?php if(!$openfilterdlg) echo "collapse";?>" style="_height: 0px;">
+      <div class="accordion-inner">
+<table class="table-condensed">
+<tr>
+<td><?= getMLText('content') ?></td><td><input type="checkbox" name="includecontent"> <?php printMLText("include_content"); ?></td>
+</tr>
+<tr>
+<td></td><td><a class="btn" href="<?= $_SERVER['REQUEST_URI']."&export=1" ?>"><i class="icon-download"></i> Export</a></td>
+</tr>
+</table>
+      </div>
+    </div>
+  </div>
+</div>
+<?php endif; ?>
+<?php
 		/* First check if any of the folder filters are set. If it is,
 		 * open the accordion.
 		 */

From b981f87d38fecc982ad3c171da226224622c8eff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Jun 2015 11:17:27 +0200
Subject: [PATCH 0216/2006] add new phrases

---
 languages/ar_EG/lang.inc |  4 ++++
 languages/bg_BG/lang.inc |  4 ++++
 languages/ca_ES/lang.inc |  4 ++++
 languages/cs_CZ/lang.inc |  4 ++++
 languages/de_DE/lang.inc |  6 +++++-
 languages/en_GB/lang.inc |  6 +++++-
 languages/es_ES/lang.inc | 10 +++++++---
 languages/fr_FR/lang.inc |  4 ++++
 languages/hu_HU/lang.inc |  4 ++++
 languages/it_IT/lang.inc |  4 ++++
 languages/nl_NL/lang.inc |  4 ++++
 languages/pl_PL/lang.inc |  4 ++++
 languages/pt_BR/lang.inc |  4 ++++
 languages/ro_RO/lang.inc |  4 ++++
 languages/ru_RU/lang.inc |  4 ++++
 languages/sk_SK/lang.inc | 14 +++++++++-----
 languages/sv_SE/lang.inc |  4 ++++
 languages/tr_TR/lang.inc |  8 ++++++--
 languages/zh_CN/lang.inc |  4 ++++
 languages/zh_TW/lang.inc |  4 ++++
 20 files changed, 92 insertions(+), 12 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 682a52866..5e9f636c9 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'طلب الموافقة تم الغاؤه',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'مجموعة الموافقة',
 'approval_log' => 'ﺲﺠﻟ ﺎﻠﻣﻭﺎﻔﻗﺓ',
 'approval_request_email' => 'طلب الموافقة',
@@ -386,6 +387,7 @@ Parent folder: [folder_path]
 المستخدم: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - تم تغيير تاريخ الصلاحية',
+'export' => '',
 'extension_manager' => '',
 'february' => 'فبراير',
 'file' => 'ملف',
@@ -464,6 +466,7 @@ URL: [url]',
 'hu_HU' => 'مجرية',
 'id' => 'معرف',
 'identical_version' => 'الاصدار الجديد مماثل للاصدار الحالي.',
+'include_content' => '',
 'include_documents' => 'اشمل مستندات',
 'include_subdirectories' => 'اشمل مجلدات فرعية',
 'index_converters' => 'فهرس تحويل المستند',
@@ -745,6 +748,7 @@ URL: [url]',
 'review_deletion_email' => 'طلب المراجعة تم مسحه',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'مجموعة المراجعة',
 'review_log' => 'ﺲﺠﻟ ﺎﻠﻣﺭﺎﺠﻋﺓ',
 'review_request_email' => 'طلب مراجعة',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index db7b61717..7364e0958 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -80,6 +80,7 @@ $text = array(
 'approval_deletion_email' => 'Запитване за утвърждаване за изтрит',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Утвърждаваща група',
 'approval_log' => '',
 'approval_request_email' => 'Запитване за утвърждаване',
@@ -337,6 +338,7 @@ $text = array(
 'expiry_changed_email' => 'Датата на изтичане променена',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'export' => '',
 'extension_manager' => '',
 'february' => 'Февруари',
 'file' => 'Файл',
@@ -395,6 +397,7 @@ $text = array(
 'hu_HU' => '',
 'id' => 'ID',
 'identical_version' => 'Новата версия е идентична с текущата.',
+'include_content' => '',
 'include_documents' => 'Включи документи',
 'include_subdirectories' => 'Включи под-папки',
 'index_converters' => 'Index document conversion',
@@ -630,6 +633,7 @@ $text = array(
 'review_deletion_email' => 'Запитване за рецензия премахнато',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Рецензираща група',
 'review_log' => '',
 'review_request_email' => 'Запитване за рецензия',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index e41ff3d26..4418ce6a7 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -80,6 +80,7 @@ $text = array(
 'approval_deletion_email' => 'Demanda d\'aprovació esborrada',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Grup aprovador',
 'approval_log' => '',
 'approval_request_email' => 'Petició d\'aprovació',
@@ -342,6 +343,7 @@ URL: [url]',
 'expiry_changed_email' => 'Data de caducitat modificada',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'export' => '',
 'extension_manager' => '',
 'february' => 'Febrer',
 'file' => 'Fitxer',
@@ -400,6 +402,7 @@ URL: [url]',
 'hu_HU' => '',
 'id' => 'ID',
 'identical_version' => '',
+'include_content' => '',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
 'index_converters' => '',
@@ -635,6 +638,7 @@ URL: [url]',
 'review_deletion_email' => 'Petició de revisió eliminada',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Grup de revisió',
 'review_log' => '',
 'review_request_email' => 'Petició de revisió',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index dcb6ccdda..bc5ca04b0 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'Zrušení schválení požadavku',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Skupina schválení',
 'approval_log' => 'Log schvalování',
 'approval_request_email' => 'Schválení požadavku',
@@ -393,6 +394,7 @@ Nadřazená složka: [folder_path]
 Uživatel: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Datum ukončení platnosti změněn',
+'export' => '',
 'extension_manager' => 'Správa rozšíření',
 'february' => 'Únor',
 'file' => 'Soubor',
@@ -471,6 +473,7 @@ URL: [url]',
 'hu_HU' => 'Maďarština',
 'id' => 'ID',
 'identical_version' => 'Nová verze je identická s verzí současnou',
+'include_content' => '',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
 'index_converters' => 'Index konverze dokumentu',
@@ -755,6 +758,7 @@ URL: [url]',
 'review_deletion_email' => 'Žádost na revizi odstraněn',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Skupina kontroly',
 'review_log' => 'Přezkum logu',
 'review_request_email' => 'Požadavek na kontrolu',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 8d5b00b7f..6345a58b6 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2076), dgrutsch (18)
+//    Translators: Admin (2080), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -89,6 +89,7 @@ Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
 'approval_deletion_email_subject' => '[sitename]: [name] - Freigabeaufforderung gelöscht',
+'approval_file' => 'Datei',
 'approval_group' => 'Berechtigungsgruppe',
 'approval_log' => 'Freigabeprotokoll',
 'approval_request_email' => 'Aufforderung zur Freigabe',
@@ -398,6 +399,7 @@ Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Ablaufdatum geändert',
+'export' => 'Export',
 'extension_manager' => 'Erweiterungen verwalten',
 'february' => 'Februar',
 'file' => 'Datei',
@@ -476,6 +478,7 @@ URL: [url]',
 'hu_HU' => 'Ungarisch',
 'id' => 'ID',
 'identical_version' => 'Neue Version ist identisch zu aktueller Version.',
+'include_content' => 'Inhalte mit exportieren',
 'include_documents' => 'Dokumente miteinbeziehen',
 'include_subdirectories' => 'Unterverzeichnisse miteinbeziehen',
 'index_converters' => 'Index Dokumentenumwandlung',
@@ -769,6 +772,7 @@ Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
 'review_deletion_email_subject' => '[sitename]: [name] - Prüfungsaufforderung gelöscht',
+'review_file' => 'Datei',
 'review_group' => 'Gruppe: prüfen',
 'review_log' => 'Prüfungsprotokoll',
 'review_request_email' => 'Aufforderung zur Prüfung',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index d3fdac120..68fca393c 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1204), dgrutsch (3), netixw (14)
+//    Translators: Admin (1208), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -89,6 +89,7 @@ Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
 'approval_deletion_email_subject' => '[sitename]: [name] - Approval request deleted',
+'approval_file' => 'File',
 'approval_group' => 'Approval Group',
 'approval_log' => 'Approval Log',
 'approval_request_email' => 'Approval request',
@@ -398,6 +399,7 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Expiry date changed',
+'export' => 'Export',
 'extension_manager' => 'Manage extensions',
 'february' => 'February',
 'file' => 'File',
@@ -476,6 +478,7 @@ URL: [url]',
 'hu_HU' => 'Hungarian',
 'id' => 'ID',
 'identical_version' => 'New version is identical to current version.',
+'include_content' => 'Include content',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
 'index_converters' => 'Index document conversion',
@@ -776,6 +779,7 @@ Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
 'review_deletion_email_subject' => '[sitename]: [name] - Review request deleted',
+'review_file' => 'File',
 'review_group' => 'Review group',
 'review_log' => 'Review log',
 'review_request_email' => 'Review request',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index b93a6d367..e50f0bb5d 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (940), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (942), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'Petición de aprobación eliminada',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Grupo aprobador',
 'approval_log' => 'Traza de aprovación',
 'approval_request_email' => 'Petición de aprobación',
@@ -393,6 +394,7 @@ Carpeta principal: [folder_path]
 Usuario: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Fecha de caducidad modificada',
+'export' => '',
 'extension_manager' => 'Administrar extensiones',
 'february' => 'Febrero',
 'file' => 'Fichero',
@@ -471,6 +473,7 @@ URL: [url]',
 'hu_HU' => 'Hungaro',
 'id' => 'ID',
 'identical_version' => 'La nueva versión es idéntica a la actual.',
+'include_content' => '',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
 'index_converters' => 'Conversión de índice de documentos',
@@ -760,6 +763,7 @@ nURL: [url]',
 'review_deletion_email' => 'Petición de revisión eliminada',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Grupo de revisión',
 'review_log' => 'Traza de revisión',
 'review_request_email' => 'Petición de revisión',
@@ -946,8 +950,8 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Si se habilita, la carga de ficheros también estará disponible a través de un applet java llamado jumploader, sin límite de tamaño de fichero fijado por el navegador. También permite la carga de múltiples ficheros de una sola vez.',
 'settings_enableNotificationAppRev' => 'Habilitar notificación a revisor/aprobador',
 'settings_enableNotificationAppRev_desc' => 'Habilitar para enviar notificación a revisor/aprobador cuando se añade una nueva versión de documento',
-'settings_enableNotificationWorkflow' => '',
-'settings_enableNotificationWorkflow_desc' => '',
+'settings_enableNotificationWorkflow' => 'Enviar notificación a los usuarios en la siguiente transacción del flujo.',
+'settings_enableNotificationWorkflow_desc' => 'Si esta opción esta activa, los usuarios y grupos  que deban tomar una acción en la siguiente transacción del flujo, serán notificados. Incluso si ellos no han adicionado una notificación al documento.',
 'settings_enableOwnerNotification' => 'Habilitar notificación al propietario por defecto',
 'settings_enableOwnerNotification_desc' => 'Marcar para añadir una notificación al propietario del documento cuando es añadido.',
 'settings_enableOwnerRevApp' => 'Permitir al propietario revisar/aprobar',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 83813e21b..dca8ea389 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'Demande d\'approbation supprimée',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Groupe d\'approbation',
 'approval_log' => 'Journal des approbations',
 'approval_request_email' => 'Demande d\'approbation',
@@ -393,6 +394,7 @@ Dossier parent: [folder_path]
 Utilisateur: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Date d\'expiration modifiée',
+'export' => '',
 'extension_manager' => 'Gestionnaire d\'extensions',
 'february' => 'Février',
 'file' => 'Fichier',
@@ -471,6 +473,7 @@ URL: [url]',
 'hu_HU' => 'Hongrois',
 'id' => 'ID',
 'identical_version' => 'Nouvelle version identique à l\'actuelle.',
+'include_content' => '',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
 'index_converters' => 'Conversion de document Index',
@@ -749,6 +752,7 @@ URL: [url]',
 'review_deletion_email' => 'Demande de correction supprimée',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Groupe de correction',
 'review_log' => '',
 'review_request_email' => 'Demande de correction',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 2f27f7c29..9647100ec 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'Jóváhagyási kérelem törölve',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Jóváhagyó csoport',
 'approval_log' => 'Jóváhagyási napló',
 'approval_request_email' => 'Jóváhagyási kérelem',
@@ -393,6 +394,7 @@ Szülő mappa: [folder_path]
 Felhasználó: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Lejárati dátum módosítva',
+'export' => '',
 'extension_manager' => 'Bővítmények kezelése',
 'february' => 'Február',
 'file' => 'Állomány',
@@ -471,6 +473,7 @@ URL: [url]',
 'hu_HU' => 'Magyar',
 'id' => 'ID',
 'identical_version' => 'Az új verzió megegyezik az eredetivel.',
+'include_content' => '',
 'include_documents' => 'Tartalmazó dokumentumok',
 'include_subdirectories' => 'Tartalmazó alkönyvtárak',
 'index_converters' => 'Index dokumentum konverzió',
@@ -760,6 +763,7 @@ URL: [url]',
 'review_deletion_email' => 'Felülvizsgálat kérés törölve',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Felülvizsgáló csoport',
 'review_log' => 'Felülvizsgálati napló',
 'review_request_email' => 'Felülvizsgálat kérés',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index a732a1f36..1a74bbd83 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -89,6 +89,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'approval_deletion_email_subject' => '[sitename]: [name] - Richiesta di approvazione cancellata',
+'approval_file' => '',
 'approval_group' => 'Gruppo di approvazione',
 'approval_log' => 'Registro delle approvazioni',
 'approval_request_email' => 'Richiesta di approvazione',
@@ -398,6 +399,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Scadenza cambiata',
+'export' => '',
 'extension_manager' => 'Gestisci le estensioni dei files',
 'february' => 'Febbraio',
 'file' => 'File',
@@ -476,6 +478,7 @@ URL: [url]',
 'hu_HU' => 'Ungherese',
 'id' => 'ID',
 'identical_version' => 'La nuova versione è identica a quella attuale.',
+'include_content' => '',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
 'index_converters' => 'Indice di conversione documenti',
@@ -777,6 +780,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'review_deletion_email_subject' => '[sitename]: [name] - Richiesta di revisione cancellata',
+'review_file' => '',
 'review_group' => 'Gruppo revisori',
 'review_log' => 'Rivedi log',
 'review_request_email' => 'Richiesta di revisione',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index cc94f6db3..67363428d 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'Goedkeuring verzoek verwijderd',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Goedkeuring Groep',
 'approval_log' => 'Goedkeuring overzicht',
 'approval_request_email' => 'Goedkeuring verzoek',
@@ -386,6 +387,7 @@ Bovenliggende map: [folder_path]
 Gebruiker: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Vervaldatum gewijzigd',
+'export' => '',
 'extension_manager' => 'Beheer uitbreidingen',
 'february' => 'februari',
 'file' => 'Bestand',
@@ -464,6 +466,7 @@ URL: [url]',
 'hu_HU' => 'Hongaars',
 'id' => 'ID',
 'identical_version' => 'Nieuwe versie is identiek aan de huidige versie',
+'include_content' => '',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
 'index_converters' => 'Index document conversie',
@@ -752,6 +755,7 @@ URL: [url]',
 'review_deletion_email' => 'Controle verzoek gewijzigd',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => '[Controle] Groep',
 'review_log' => 'Reviseer overzicht',
 'review_request_email' => 'Controle verzoek',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index a540743d2..9950b4dc4 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'Prośba o akceptację została usunięta',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Grupa akceptująca',
 'approval_log' => 'Zatwierdź log',
 'approval_request_email' => 'Prośba o akceptację',
@@ -386,6 +387,7 @@ Folder nadrzędny: [folder_path]
 Użytkownik: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Zmiana daty wygaśnięcia',
+'export' => '',
 'extension_manager' => '',
 'february' => 'Luty',
 'file' => 'Plik',
@@ -464,6 +466,7 @@ URL: [url]',
 'hu_HU' => 'Węgierski',
 'id' => 'ID',
 'identical_version' => 'Nowa wersja jest identyczna z obecną',
+'include_content' => '',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
 'index_converters' => 'Konwersja indeksu dokumentów',
@@ -746,6 +749,7 @@ URL: [url]',
 'review_deletion_email' => 'Prośba o recenzję usunięta',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Grupa recenzentów',
 'review_log' => 'Zobacz log',
 'review_request_email' => 'Prośba i recenzję',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 9552b1c81..3e38cb147 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'Solicitação de Aprovação eliminada',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Approval Group',
 'approval_log' => 'Log de Aprovação',
 'approval_request_email' => 'Solicitação de aprovação',
@@ -392,6 +393,7 @@ Pasta mãe: [folder_path]
 Usuário: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Data de validade mudou',
+'export' => '',
 'extension_manager' => 'Gerenciar extensões',
 'february' => 'February',
 'file' => 'Arquivo',
@@ -470,6 +472,7 @@ URL: [url]',
 'hu_HU' => 'Húngaro',
 'id' => 'ID',
 'identical_version' => 'Nova versão é idêntica à versão atual.',
+'include_content' => '',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
 'index_converters' => 'Índice de conversão de documentos',
@@ -758,6 +761,7 @@ URL: [url]',
 'review_deletion_email' => 'Pedido de revisão eliminado',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Review Group',
 'review_log' => 'Log de Revisão',
 'review_request_email' => 'Pedido de revisão',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 97a57b903..73ed5b942 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -89,6 +89,7 @@ Folder parinte: [folder_path]
 Utilizator: [username]
 URL: [url]',
 'approval_deletion_email_subject' => '[sitename]: [name] - Cerere aprobare stearsa',
+'approval_file' => '',
 'approval_group' => 'Grup aprobare',
 'approval_log' => 'Log aprobare',
 'approval_request_email' => 'Cerere aprobare',
@@ -398,6 +399,7 @@ Folder parinte: [folder_path]
 Utilizator: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Data de expirare schimbată',
+'export' => '',
 'extension_manager' => 'Gestionați extensiile',
 'february' => 'Februarie',
 'file' => 'Fișier',
@@ -476,6 +478,7 @@ URL: [url]',
 'hu_HU' => 'Ungureste',
 'id' => 'ID',
 'identical_version' => 'Noua versiune este identică cu versiunea curentă.',
+'include_content' => '',
 'include_documents' => 'Include documente',
 'include_subdirectories' => 'Include subfoldere',
 'index_converters' => 'Indexare conversie documente',
@@ -777,6 +780,7 @@ Folder parinte: [folder_path]
 Utilizator: [username]
 URL: [url]',
 'review_deletion_email_subject' => '[sitename]: [name] - Cerere de revizuire eliminata',
+'review_file' => '',
 'review_group' => 'Grup revizuire',
 'review_log' => 'Log revizuire',
 'review_request_email' => 'Cerere de revizuire',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 9ada8e022..97c5f5657 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'Запрос на утверждение удалён',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Утверждающая группа',
 'approval_log' => '',
 'approval_request_email' => 'Запрос на утверждение',
@@ -386,6 +387,7 @@ URL: [url]',
 Пользователь: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: изменена дата истечения для «[name]»',
+'export' => '',
 'extension_manager' => 'Управление расширениями',
 'february' => 'Февраль',
 'file' => 'Файл',
@@ -464,6 +466,7 @@ URL: [url]',
 'hu_HU' => 'Hungarian',
 'id' => 'Идентификатор',
 'identical_version' => 'Новая версия идентична текущей.',
+'include_content' => '',
 'include_documents' => 'Включая документы',
 'include_subdirectories' => 'Включая подкаталоги',
 'index_converters' => 'Индексирование документов',
@@ -750,6 +753,7 @@ URL: [url]',
 'review_deletion_email' => 'Запрос на рецензию удалён',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Рецензирующая группа',
 'review_log' => '',
 'review_request_email' => 'Запрос на рецензию',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index fd1747659..e0170cca5 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (458)
+//    Translators: Admin (462)
 
 $text = array(
 'accept' => 'Prijať',
@@ -80,6 +80,7 @@ $text = array(
 'approval_deletion_email' => 'Poziadavka na schvalenie zmazana',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Skupina schválenia',
 'approval_log' => '',
 'approval_request_email' => 'Poziadavka na schvalenie',
@@ -143,7 +144,7 @@ $text = array(
 'backup_remove' => 'Odstrániť zálohu',
 'backup_tools' => 'Zálohovacie nástroje',
 'between' => 'medzi',
-'bg_BG' => '',
+'bg_BG' => 'Bulharsky',
 'browse' => '',
 'calendar' => 'Kalendár',
 'calendar_week' => '',
@@ -337,6 +338,7 @@ $text = array(
 'expiry_changed_email' => 'Datum platnosti zmeneny',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'export' => '',
 'extension_manager' => '',
 'february' => 'Február',
 'file' => 'Súbor',
@@ -395,6 +397,7 @@ $text = array(
 'hu_HU' => 'Maďarčina',
 'id' => 'ID',
 'identical_version' => '',
+'include_content' => '',
 'include_documents' => 'Vrátane súborov',
 'include_subdirectories' => 'Vrátane podzložiek',
 'index_converters' => '',
@@ -613,7 +616,7 @@ $text = array(
 'removed_revispr' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
-'remove_marked_files' => '',
+'remove_marked_files' => 'Zrušiť označenie súborov',
 'repaired' => '',
 'repairing_objects' => '',
 'request_workflow_action_email_body' => '',
@@ -630,6 +633,7 @@ $text = array(
 'review_deletion_email' => 'Poziadavka na recenziu zmazana',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Skupina kontroly',
 'review_log' => '',
 'review_request_email' => 'Poziadavka na recenziu',
@@ -1107,7 +1111,7 @@ $text = array(
 'users_and_groups' => '',
 'users_done_work' => '',
 'user_exists' => 'Používateľ už existuje.',
-'user_group_management' => '',
+'user_group_management' => 'Správa užívateľov/skupín',
 'user_image' => 'Obrázok',
 'user_info' => 'Informácie o používateľovi',
 'user_list' => 'Zoznam používateľov',
@@ -1126,7 +1130,7 @@ $text = array(
 'version_deleted_email_body' => '',
 'version_deleted_email_subject' => '',
 'version_info' => 'Informácie o verzii',
-'view' => '',
+'view' => 'Zobraziť',
 'view_online' => 'Zobraziť online',
 'warning' => 'Upozornenie',
 'wednesday' => 'Streda',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 5e2a47cb4..bb760475d 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => 'Begäran om godkännande har raderats',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Grupp av personer som godkänner',
 'approval_log' => '',
 'approval_request_email' => 'Begäran om godkännande',
@@ -386,6 +387,7 @@ Dokument: [name]
 Användare: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Utgångsdatum ändrat',
+'export' => '',
 'extension_manager' => 'Förvalta tillägg',
 'february' => 'februari',
 'file' => 'Dokumentinformation',
@@ -464,6 +466,7 @@ URL: [url]',
 'hu_HU' => 'ungerska',
 'id' => 'ID',
 'identical_version' => 'Ny version är lika med den aktuella versionen.',
+'include_content' => '',
 'include_documents' => 'Inkludera dokument',
 'include_subdirectories' => 'Inkludera under-kataloger',
 'index_converters' => 'Omvandling av indexdokument',
@@ -745,6 +748,7 @@ URL: [url]',
 'review_deletion_email' => 'Förfrågan om granskning borttagen',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Grupp som granskar',
 'review_log' => '',
 'review_request_email' => 'Förfrågan om granskning',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 6d0981539..81afd8e3b 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1003), aydin (83)
+//    Translators: Admin (1004), aydin (83)
 
 $text = array(
 'accept' => 'Kabul',
@@ -83,6 +83,7 @@ URL: [url]',
 'approval_deletion_email' => 'Onay talebi silindi',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => 'Onay Grubu',
 'approval_log' => 'Onay Kayıtları',
 'approval_request_email' => 'Onay talebi',
@@ -164,7 +165,7 @@ URL: [url]',
 'backup_remove' => 'Yedek dosyasını sil',
 'backup_tools' => 'Yedekleme araçları',
 'between' => 'arasında',
-'bg_BG' => '',
+'bg_BG' => 'Bulgarca',
 'browse' => 'Tara',
 'calendar' => 'Takvim',
 'calendar_week' => 'Takvim haftası',
@@ -392,6 +393,7 @@ Doküman: [name]
 Kullanıcı: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Bitiş tarihi değişti',
+'export' => '',
 'extension_manager' => 'Uzantıları düzenle',
 'february' => 'Şubat',
 'file' => 'Dosya',
@@ -470,6 +472,7 @@ URL: [url]',
 'hu_HU' => 'Macarca',
 'id' => 'ID',
 'identical_version' => 'Yeni versiyon güncel versiyonla aynı.',
+'include_content' => '',
 'include_documents' => 'Dokümanları kapsa',
 'include_subdirectories' => 'Alt klasörleri kapsa',
 'index_converters' => 'Doküman dönüştürmeyi indeksle',
@@ -761,6 +764,7 @@ URL: [url]',
 'review_deletion_email' => 'Kontrol talebi silindi',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => 'Kontrol grubu',
 'review_log' => 'Kontrol kayıtları',
 'review_request_email' => 'Kontrol talebi',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index d9c4b3668..a1521bd43 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => '审核请求已被删除',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => '审核组',
 'approval_log' => '审批记录',
 'approval_request_email' => '审核请求',
@@ -343,6 +344,7 @@ URL: [url]',
 'expiry_changed_email' => '到期日子已改变',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'export' => '',
 'extension_manager' => '',
 'february' => '二 月',
 'file' => '文件',
@@ -401,6 +403,7 @@ URL: [url]',
 'hu_HU' => '匈牙利语',
 'id' => '序号',
 'identical_version' => '',
+'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
 'index_converters' => '索引文件转换',
@@ -636,6 +639,7 @@ URL: [url]',
 'review_deletion_email' => '校对请求被删除',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => '校对组',
 'review_log' => '审阅记录',
 'review_request_email' => '校对请求',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index e2f1163c5..2e161de9b 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -84,6 +84,7 @@ URL: [url]',
 'approval_deletion_email' => '審核請求已被刪除',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
+'approval_file' => '',
 'approval_group' => '審核組',
 'approval_log' => '審批記錄',
 'approval_request_email' => '審核請求',
@@ -341,6 +342,7 @@ URL: [url]',
 'expiry_changed_email' => '到期日子已改變',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
+'export' => '',
 'extension_manager' => '',
 'february' => '二 月',
 'file' => '文件',
@@ -399,6 +401,7 @@ URL: [url]',
 'hu_HU' => '匈牙利語',
 'id' => '序號',
 'identical_version' => '',
+'include_content' => '',
 'include_documents' => '包含文檔',
 'include_subdirectories' => '包含子目錄',
 'index_converters' => '索引檔轉換',
@@ -634,6 +637,7 @@ URL: [url]',
 'review_deletion_email' => '校對請求被刪除',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
+'review_file' => '',
 'review_group' => '校對組',
 'review_log' => '',
 'review_request_email' => '校對請求',

From 42ce9fa21bb2a582a45a9989c5e8b17f4b133360 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Jun 2015 11:32:46 +0200
Subject: [PATCH 0217/2006] add value to checkbox for exporting content

---
 views/bootstrap/class.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 27b772e50..99ec24bf5 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -213,7 +213,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
       <div class="accordion-inner">
 <table class="table-condensed">
 <tr>
-<td><?= getMLText('content') ?></td><td><input type="checkbox" name="includecontent"> <?php printMLText("include_content"); ?></td>
+<td><?= getMLText('content') ?></td><td><label class="checkbox inline"><input type="checkbox" name="includecontent" value="1"> <?php printMLText("include_content"); ?></label></td>
 </tr>
 <tr>
 <td></td><td><a class="btn" href="<?= $_SERVER['REQUEST_URI']."&export=1" ?>"><i class="icon-download"></i> Export</a></td>

From 3ed43b0a856b2402c3dd18cce942e78eb3bea787 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Jun 2015 12:21:25 +0200
Subject: [PATCH 0218/2006] fix take over of reviewer/approver from previous
 version

---
 views/bootstrap/class.CheckInDocument.php | 88 +++++++++++++----------
 1 file changed, 52 insertions(+), 36 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index daba7eb15..5fe891951 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -236,14 +236,18 @@ function checkForm()
 <?php
 				$tmp = array();
 				foreach($reviewStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 0 && $res) {
-						foreach ($res as $rr)
-							if ($rr['reviewerUserID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
+					if($r['type'] == 0) {
+					 	if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['reviewerUserID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
 							$tmp[] = $r['required'];
+						}
 					}
 				}
 				if($tmp) {
@@ -288,21 +292,6 @@ function checkForm()
       <td>
         <select id="GrpReviewer" class="chzn-select span9" name="grpReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
-				$tmp = array();
-				foreach($reviewStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 1 && $res) {
-						foreach ($res as $rr)
-							if ($rr['reviewerGroupID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
-							$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->__takeOverButton("GrpReviewer", $tmp);
-				}
 				foreach ($docAccess["groups"] as $grp) {
 				
 					$mandatory=false;
@@ -314,6 +303,25 @@ function checkForm()
 ?>
 			</select>
 <?php
+				$tmp = array();
+				foreach($reviewStatus as $r) {
+					if($r['type'] == 1) {
+						if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['reviewerGroupID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
+							$tmp[] = $r['required'];
+						}
+					}
+				}
+				if($tmp) {
+					$this->__takeOverButton("GrpReviewer", $tmp);
+				}
 				/* List all mandatory groups of reviewers */
 				if($res) {
 					$tmp = array();
@@ -375,14 +383,18 @@ function checkForm()
 <?php
 				$tmp = array();
 				foreach($approvalStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 0 && $res) {
-						foreach ($res as $rr)
-							if ($rr['approverUserID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
+					if($r['type'] == 0) {
+						if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['approverUserID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
 							$tmp[] = $r['required'];
+						}
 					}
 				}
 				if($tmp) {
@@ -441,14 +453,18 @@ function checkForm()
 <?php
 				$tmp = array();
 				foreach($approvalStatus as $r) {
-					$mandatory=false;
-					if($r['type'] == 1 && $res) {
-						foreach ($res as $rr)
-							if ($rr['approverGroupID']==$r['required']) {
-								$mandatory=true;
-							}
-						if(!$mandatory)
+					if($r['type'] == 1) {
+						if($res) {
+							$mandatory=false;
+							foreach ($res as $rr)
+								if ($rr['approverGroupID']==$r['required']) {
+									$mandatory=true;
+								}
+							if(!$mandatory)
+								$tmp[] = $r['required'];
+						} else {
 							$tmp[] = $r['required'];
+						}
 					}
 				}
 				if($tmp) {

From e513731455e451315c5125da8aad66380fba74a2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jun 2015 13:49:52 +0200
Subject: [PATCH 0219/2006] subfolders and documents can be order by date and
 direction can be set

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index c97cd2be9..3f677f7e4 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -432,9 +432,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 *
 	 * @param string $orderby if set to 'n' the list is ordered by name, otherwise
 	 *        it will be ordered by sequence
+	 * @param string $dir direction of sorting (asc or desc)
 	 * @return array list of folder objects or false in case of an error
 	 */
-	function getSubFolders($orderby="") { /* {{{ */
+	function getSubFolders($orderby="", $dir="asc") { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if (!isset($this->_subFolders)) {
@@ -442,6 +443,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 			if ($orderby=="n") $queryStr .= " ORDER BY name";
 			elseif ($orderby=="s") $queryStr .= " ORDER BY sequence";
+			elseif ($orderby=="d") $queryStr .= " ORDER BY date";
+			if($dir == 'desc')
+				$queryStr .= " DESC";
+
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr == false)
 				return false;
@@ -612,15 +617,19 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 *
 	 * @param string $orderby if set to 'n' the list is ordered by name, otherwise
 	 *        it will be ordered by sequence
+	 * @param string $dir direction of sorting (asc or desc)
 	 * @return array list of documents or false in case of an error
 	 */
-	function getDocuments($orderby="") { /* {{{ */
+	function getDocuments($orderby="", $dir="asc") { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if (!isset($this->_documents)) {
 			$queryStr = "SELECT * FROM tblDocuments WHERE folder = " . $this->_id;
 			if ($orderby=="n") $queryStr .= " ORDER BY name";
 			elseif($orderby=="s") $queryStr .= " ORDER BY sequence";
+			elseif($orderby=="d") $queryStr .= " ORDER BY date";
+			if($dir == 'desc')
+				$queryStr .= " DESC";
 
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$resArr)

From ab72bb9f8c4bba94438461e5c15d021adc69c420 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jun 2015 17:28:32 +0200
Subject: [PATCH 0220/2006] check if keywords, name, comment was posted

---
 op/op.EditDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index a90235ba0..3fd1a3805 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -53,9 +53,9 @@ if($document->isLocked()) {
 	}
 }
 
-$name =     $_POST["name"];
-$comment =  $_POST["comment"];
-$keywords = $_POST["keywords"];
+$name =     isset($_POST['name']) ? $_POST["name"] : "";
+$comment =  isset($_POST['comment']) ? $_POST["comment"] : "";
+$keywords = isset($_POST["keywords"]) ? $_POST["keywords"] : "";
 if(isset($_POST['categoryidform1'])) {
 	$categories = explode(',', preg_replace('/[^0-9,]+/', '', $_POST["categoryidform1"]));
 } elseif(isset($_POST["categories"])) { 

From b96d75b97dd1dd3021962a7ff8f932542ad2a5f3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jun 2015 17:31:56 +0200
Subject: [PATCH 0221/2006] check if expires and sequence is set

---
 op/op.EditDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 3fd1a3805..1d1d2ae67 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -63,7 +63,7 @@ if(isset($_POST['categoryidform1'])) {
 } else {
 	$categories = array();
 }
-$sequence = $_POST["sequence"];
+$sequence = isset($_POST["sequence"]) ? $_POST["sequence"] : "keep";
 $sequence = str_replace(',', '.', $_POST["sequence"]);
 if (!is_numeric($sequence)) {
 	$sequence="keep";
@@ -180,7 +180,7 @@ if (($oldcomment = $document->getComment()) != $comment) {
 }
 
 $expires = false;
-if ($_POST["expires"] != "false") {
+if (isset($_POST["expires"]) && $_POST["expires"] != "false") {
 	if($_POST["expdate"]) {
 		$tmp = explode('-', $_POST["expdate"]);
 		$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);

From a0d0790a3422fe24a2863c4485d83bf6d36142fd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jun 2015 17:36:47 +0200
Subject: [PATCH 0222/2006] initialize return array

---
 SeedDMS_Core/Core/inc.ClassUser.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 5b4ee1007..21655c602 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -1214,7 +1214,7 @@ class SeedDMS_Core_User { /* {{{ */
 	function getRevisionStatus($documentID=null, $version=null) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$status = array();
+		$status = array("indstatus"=>array(), "grpstatus"=>array());
 
 		// See if the user is assigned as an individual revisor.
 		$queryStr = "SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`status`, ".
@@ -1231,7 +1231,6 @@ class SeedDMS_Core_User { /* {{{ */
 		if (is_bool($resArr) && $resArr === false)
 			return false;
 		if (count($resArr)>0) {
-			$status['indstatus'] = array();
 			foreach ($resArr as $res) {
 				if($res['date']) {
 					if(isset($status["indstatus"][$res['documentID']])) {
@@ -1262,7 +1261,6 @@ class SeedDMS_Core_User { /* {{{ */
 		if (is_bool($resArr) && $resArr === false)
 			return false;
 		if (count($resArr)>0) {
-			$status['grpstatus'] = array();
 			foreach ($resArr as $res) {
 				if(isset($status["grpstatus"][$res['documentID']])) {
 					if($status["grpstatus"][$res['documentID']]['date'] < $res['date']) {

From 8ee6d74613ce9cf5ebfd54f19ffe7a99d1b4b214 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 19 Jun 2015 12:47:30 +0200
Subject: [PATCH 0223/2006] setDefaultAccess() cleanly removes als notifiers
 without read access

This failed because the first call of removeNotify() has invalidated
the list of notifiers
---
 SeedDMS_Core/Core/inc.ClassFolder.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 3f677f7e4..e58631c11 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -333,6 +333,14 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		return $this->_defaultAccess;
 	} /* }}} */
 
+	/**
+	 * Set default access mode
+	 *
+	 * This method sets the default access mode and also removes all notifiers which
+	 * will not have read access anymore.
+	 *
+	 * @param integer $mode access mode
+	 */
 	function setDefaultAccess($mode) { /* {{{ */
 		$db = $this->_dms->getDB();
 
@@ -346,12 +354,18 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		// remove their subscription.
 		if (empty($this->_notifyList))
 			$this->getNotifyList();
-		foreach ($this->_notifyList["users"] as $u) {
+
+		/* Make a copy of both notifier lists because removeNotify will empty
+		 * $this->_notifyList and the second foreach will not work anymore.
+		 */
+		$nusers = $this->_notifyList["users"];
+		$ngroups = $this->_notifyList["groups"];
+		foreach ($nusers as $u) {
 			if ($this->getAccessMode($u) < M_READ) {
 				$this->removeNotify($u->getID(), true);
 			}
 		}
-		foreach ($this->_notifyList["groups"] as $g) {
+		foreach ($ngroups as $g) {
 			if ($this->getGroupAccessMode($g) < M_READ) {
 				$this->removeNotify($g->getID(), false);
 			}

From 5a0a034be368abd36d291905f92b2bf674076c53 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 19 Jun 2015 12:47:30 +0200
Subject: [PATCH 0224/2006] setDefaultAccess() cleanly removes als notifiers
 without read access

This failed because the first call of removeNotify() has invalidated
the list of notifiers

From ee8ad500ce6ecc177879f2310eb8e9294fbf3329 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 19 Jun 2015 12:52:49 +0200
Subject: [PATCH 0225/2006] setDefaultAccess() propperly removes notifier
 without read access

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 32 +++++++++++++++++--------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 58c6b7cdf..213eceab2 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -486,6 +486,14 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_defaultAccess;
 	} /* }}} */
 
+	/**
+	 * Set default access mode
+	 *
+	 * This method sets the default access mode and also removes all notifiers which
+	 * will not have read access anymore.
+	 *
+	 * @param integer $mode access mode
+	 */
 	function setDefaultAccess($mode) { /* {{{ */
 		$db = $this->_dms->getDB();
 
@@ -497,18 +505,22 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		// If any of the notification subscribers no longer have read access,
 		// remove their subscription.
-		if(isset($this->_notifyList["users"])) {
-			foreach ($this->_notifyList["users"] as $u) {
-				if ($this->getAccessMode($u) < M_READ) {
-					$this->removeNotify($u->getID(), true);
-				}
+		if (empty($this->_notifyList))
+			$this->getNotifyList();
+
+		/* Make a copy of both notifier lists because removeNotify will empty
+		 * $this->_notifyList and the second foreach will not work anymore.
+		 */
+		$nusers = $this->_notifyList["users"];
+		$ngroups = $this->_notifyList["groups"];
+		foreach ($this->_notifyList["users"] as $u) {
+			if ($this->getAccessMode($u) < M_READ) {
+				$this->removeNotify($u->getID(), true);
 			}
 		}
-		if(isset($this->_notifyList["groups"])) {
-			foreach ($this->_notifyList["groups"] as $g) {
-				if ($this->getGroupAccessMode($g) < M_READ) {
-					$this->removeNotify($g->getID(), false);
-				}
+		foreach ($ngroups as $g) {
+			if ($this->getGroupAccessMode($g) < M_READ) {
+				$this->removeNotify($g->getID(), false);
 			}
 		}
 

From 75c8129185eac1fbff42a38667ec38890cb9f9a0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 19 Jun 2015 15:02:37 +0200
Subject: [PATCH 0226/2006] add cleanNotifyList() which removes users/groups
 with read access

also adds an optional parameter $noclean to setDefaultAccess and
setInheritAccess which keeps the methods from cleaning up the
notifier list
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 73 +++++++++++----------
 SeedDMS_Core/Core/inc.ClassFolder.php   | 84 ++++++++++++++-----------
 2 files changed, 83 insertions(+), 74 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 213eceab2..61de039c0 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -493,8 +493,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * will not have read access anymore.
 	 *
 	 * @param integer $mode access mode
+	 * @param boolean $noclean set to true if notifier list shall not be clean up
 	 */
-	function setDefaultAccess($mode) { /* {{{ */
+	function setDefaultAccess($mode, $noclean="false") { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "UPDATE tblDocuments set defaultAccess = " . (int) $mode . " WHERE id = " . $this->_id;
@@ -503,26 +504,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		$this->_defaultAccess = $mode;
 
-		// If any of the notification subscribers no longer have read access,
-		// remove their subscription.
-		if (empty($this->_notifyList))
-			$this->getNotifyList();
-
-		/* Make a copy of both notifier lists because removeNotify will empty
-		 * $this->_notifyList and the second foreach will not work anymore.
-		 */
-		$nusers = $this->_notifyList["users"];
-		$ngroups = $this->_notifyList["groups"];
-		foreach ($this->_notifyList["users"] as $u) {
-			if ($this->getAccessMode($u) < M_READ) {
-				$this->removeNotify($u->getID(), true);
-			}
-		}
-		foreach ($ngroups as $g) {
-			if ($this->getGroupAccessMode($g) < M_READ) {
-				$this->removeNotify($g->getID(), false);
-			}
-		}
+		if(!$noclean)
+			self::cleanNotifyList();
 
 		return true;
 	} /* }}} */
@@ -540,9 +523,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * @param boolean $inheritAccess set to true for setting and false for
 	 *        unsetting inherited access mode
+	 * @param boolean $noclean set to true if notifier list shall not be clean up
 	 * @return boolean true if operation was successful otherwise false
 	 */
-	function setInheritAccess($inheritAccess) { /* {{{ */
+	function setInheritAccess($inheritAccess, $noclean=false) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "UPDATE tblDocuments SET inheritAccess = " . ($inheritAccess ? "1" : "0") . " WHERE id = " . $this->_id;
@@ -551,22 +535,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		$this->_inheritAccess = ($inheritAccess ? "1" : "0");
 
-		// If any of the notification subscribers no longer have read access,
-		// remove their subscription.
-		if(isset($this->_notifyList["users"])) {
-			foreach ($this->_notifyList["users"] as $u) {
-				if ($this->getAccessMode($u) < M_READ) {
-					$this->removeNotify($u->getID(), true);
-				}
-			}
-		}
-		if(isset($this->_notifyList["groups"])) {
-			foreach ($this->_notifyList["groups"] as $g) {
-				if ($this->getGroupAccessMode($g) < M_READ) {
-					$this->removeNotify($g->getID(), false);
-				}
-			}
-		}
+		if(!$noclean)
+			self::cleanNotifyList();
 
 		return true;
 	} /* }}} */
@@ -1252,6 +1222,33 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_notifyList;
 	} /* }}} */
 
+	/**
+	 * Make sure only users/groups with read access are in the notify list
+	 *
+	 */
+	function cleanNotifyList() { /* {{{ */
+		// If any of the notification subscribers no longer have read access,
+		// remove their subscription.
+		if (empty($this->_notifyList))
+			$this->getNotifyList();
+
+		/* Make a copy of both notifier lists because removeNotify will empty
+		 * $this->_notifyList and the second foreach will not work anymore.
+		 */
+		$nusers = $this->_notifyList["users"];
+		$ngroups = $this->_notifyList["groups"];
+		foreach ($nusers as $u) {
+			if ($this->getAccessMode($u) < M_READ) {
+				$this->removeNotify($u->getID(), true);
+			}
+		}
+		foreach ($ngroups as $g) {
+			if ($this->getGroupAccessMode($g) < M_READ) {
+				$this->removeNotify($g->getID(), false);
+			}
+		}
+	} /* }}} */
+
 	/**
 	 * Add a user/group to the notification list
 	 * This function does not check if the currently logged in user
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index e58631c11..70651ca96 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -340,8 +340,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 * will not have read access anymore.
 	 *
 	 * @param integer $mode access mode
+	 * @param boolean $noclean set to true if notifier list shall not be clean up
 	 */
-	function setDefaultAccess($mode) { /* {{{ */
+	function setDefaultAccess($mode, $noclean=false) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "UPDATE tblFolders set defaultAccess = " . (int) $mode . " WHERE id = " . $this->_id;
@@ -350,33 +351,29 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		$this->_defaultAccess = $mode;
 
-		// If any of the notification subscribers no longer have read access,
-		// remove their subscription.
-		if (empty($this->_notifyList))
-			$this->getNotifyList();
-
-		/* Make a copy of both notifier lists because removeNotify will empty
-		 * $this->_notifyList and the second foreach will not work anymore.
-		 */
-		$nusers = $this->_notifyList["users"];
-		$ngroups = $this->_notifyList["groups"];
-		foreach ($nusers as $u) {
-			if ($this->getAccessMode($u) < M_READ) {
-				$this->removeNotify($u->getID(), true);
-			}
-		}
-		foreach ($ngroups as $g) {
-			if ($this->getGroupAccessMode($g) < M_READ) {
-				$this->removeNotify($g->getID(), false);
-			}
-		}
+		if(!$noclean)
+			self::cleanNotifyList();
 
 		return true;
 	} /* }}} */
 
 	function inheritsAccess() { return $this->_inheritAccess; }
 
-	function setInheritAccess($inheritAccess) { /* {{{ */
+	/**
+	 * Set inherited access mode
+	 * Setting inherited access mode will set or unset the internal flag which
+	 * controls if the access mode is inherited from the parent folder or not.
+	 * It will not modify the
+	 * access control list for the current object. It will remove all
+	 * notifications of users which do not even have read access anymore
+	 * after setting or unsetting inherited access.
+	 *
+	 * @param boolean $inheritAccess set to true for setting and false for
+	 *        unsetting inherited access mode
+	 * @param boolean $noclean set to true if notifier list shall not be clean up
+	 * @return boolean true if operation was successful otherwise false
+	 */
+	function setInheritAccess($inheritAccess, $noclean=false) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$inheritAccess = ($inheritAccess) ? "1" : "0";
@@ -387,20 +384,8 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		$this->_inheritAccess = $inheritAccess;
 
-		// If any of the notification subscribers no longer have read access,
-		// remove their subscription.
-		if (empty($this->_notifyList))
-			$this->getNotifyList();
-		foreach ($this->_notifyList["users"] as $u) {
-			if ($this->getAccessMode($u) < M_READ) {
-				$this->removeNotify($u->getID(), true);
-			}
-		}
-		foreach ($this->_notifyList["groups"] as $g) {
-			if ($this->getGroupAccessMode($g) < M_READ) {
-				$this->removeNotify($g->getID(), false);
-			}
-		}
+		if(!$noclean)
+			self::cleanNotifyList();
 
 		return true;
 	} /* }}} */
@@ -1187,6 +1172,33 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		return $this->_notifyList;
 	} /* }}} */
 
+	/**
+	 * Make sure only users/groups with read access are in the notify list
+	 *
+	 */
+	function cleanNotifyList() { /* {{{ */
+		// If any of the notification subscribers no longer have read access,
+		// remove their subscription.
+		if (empty($this->_notifyList))
+			$this->getNotifyList();
+
+		/* Make a copy of both notifier lists because removeNotify will empty
+		 * $this->_notifyList and the second foreach will not work anymore.
+		 */
+		$nusers = $this->_notifyList["users"];
+		$ngroups = $this->_notifyList["groups"];
+		foreach ($nusers as $u) {
+			if ($this->getAccessMode($u) < M_READ) {
+				$this->removeNotify($u->getID(), true);
+			}
+		}
+		foreach ($ngroups as $g) {
+			if ($this->getGroupAccessMode($g) < M_READ) {
+				$this->removeNotify($g->getID(), false);
+			}
+		}
+	} /* }}} */
+
 	/*
 	 * Add a user/group to the notification list
 	 * This function does not check if the currently logged in user

From 9643c12429541e9871d99851df3b41affec108ca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 19 Jun 2015 15:04:25 +0200
Subject: [PATCH 0227/2006] log id and name of folder

---
 op/op.RemoveFolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php
index 558492df2..3810e15b3 100644
--- a/op/op.RemoveFolder.php
+++ b/op/op.RemoveFolder.php
@@ -81,7 +81,7 @@ if ($notifier) {
 	}
 }
 
-add_log_line();
+add_log_line("?folderid=".$folderid."&name=".$foldername);
 
 header("Location:../out/out.ViewFolder.php?folderid=".$parent->getID()."&showtree=".$_POST["showtree"]);
 

From 905bc9c1409e298c13d0fc6f01b5c0e14ae5ffcf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 19 Jun 2015 15:24:19 +0200
Subject: [PATCH 0228/2006] add optional parameter cleasAccessList()

will turn off removal of notification
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 7 ++++++-
 SeedDMS_Core/Core/inc.ClassFolder.php   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 61de039c0..2cbe17c51 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -936,9 +936,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Delete all entries for this document from the access control list
 	 *
+	 * @param boolean $noclean set to true if notifier list shall not be clean up
 	 * @return boolean true if operation was successful otherwise false
 	 */
-	function clearAccessList() { /* {{{ */
+	function clearAccessList($noclean=false) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "DELETE FROM tblACLs WHERE targetType = " . T_DOCUMENT . " AND target = " . $this->_id;
@@ -946,6 +947,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 
 		unset($this->_accessList);
+
+		if(!$noclean)
+			self::cleanNotifyList();
+
 		return true;
 	} /* }}} */
 
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 70651ca96..6ce59d007 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -955,9 +955,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	/**
 	 * Delete all entries for this folder from the access control list
 	 *
+	 * @param boolean $noclean set to true if notifier list shall not be clean up
 	 * @return boolean true if operation was successful otherwise false
 	 */
-	function clearAccessList() { /* {{{ */
+	function clearAccessList($noclean=false) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "DELETE FROM tblACLs WHERE targetType = " . T_FOLDER . " AND target = " . $this->_id;
@@ -965,6 +966,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			return false;
 
 		unset($this->_accessList);
+
+		if(!$noclean)
+			self::cleanNotifyList();
+
 		return true;
 	} /* }}} */
 

From 28c39791dce6b02afed8c1ed034c6a808a11a3ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 07:02:15 +0200
Subject: [PATCH 0229/2006] finfo returns only mimetype

---
 op/op.AddDocument.php    | 6 +++---
 op/op.UpdateDocument.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 6bdb2bebb..23479e4ab 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -240,10 +240,10 @@ if($settings->_dropFolderDir) {
 				if($_FILES["userfile"]['error'][0] != 0)
 					$_FILES["userfile"] = array();
 			}
-			$finfo = finfo_open(FILEINFO_MIME);
-			$mimetype = explode(';', finfo_file($finfo, $fullfile));
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$mimetype = finfo_file($finfo, $fullfile);
 			$_FILES["userfile"]['tmp_name'][] = $fullfile;
-			$_FILES["userfile"]['type'][] = $mimetype[0];
+			$_FILES["userfile"]['type'][] = $mimetype;
 			$_FILES["userfile"]['name'][] = $_POST["dropfolderfileform1"];
 			$_FILES["userfile"]['size'][] = filesize($fullfile);
 			$_FILES["userfile"]['error'][] = 0;
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 9e0bb2c22..ddf0caf57 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -77,10 +77,10 @@ if ($_FILES['userfile']['error'] == 0) {
 	if($_POST['dropfolderfileform1']) {
 		$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"];
 		if(file_exists($fullfile)) {
-			$finfo = finfo_open(FILEINFO_MIME);
-			$mimetype = explode(';', finfo_file($finfo, $fullfile));
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$mimetype = finfo_file($finfo, $fullfile);
 			$userfiletmp = $fullfile;
-			$userfiletype = $mimetype[0];
+			$userfiletype = $mimetype;
 			$userfilename= $_POST["dropfolderfileform1"];
 		} else {
 			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));

From b95f7ed91a7c420ed99226e7b994bc212f26c296 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 07:44:47 +0200
Subject: [PATCH 0230/2006] new parameter overrideMimeType

---
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index faaa56f0b..f058b559d 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -127,6 +127,8 @@ class Settings { /* {{{ */
 	var $_enableVersionModification = false;
 	// enable/disable duplicate names of a document in a folder
 	var $_enableDuplicateDocNames = true;
+	// override mimetype set by browser when uploading a file
+	var $_overrideMimeType = false;
 	// enable/disable notification when added as a reviewer/approver
 	var $_enableNotificationAppRev = true;
 	// enable/disable notification of users/group who need to take action for
@@ -509,6 +511,7 @@ class Settings { /* {{{ */
 		$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
 		$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
 		$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
+		$this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]);
 
 		// XML Path: /configuration/advanced/notification
 		$node = $xml->xpath('/configuration/advanced/notification');
@@ -785,6 +788,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
     $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
+    $this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType);
 
     // XML Path: /configuration/advanced/notification
     $node = $this->getXMLNode($xml, '/configuration/advanced', 'notification');
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 34bac533e..32a7803ff 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -158,6 +158,7 @@ if ($action == "saveSettings")
   $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
+  $settings->_overrideMimeType = getBoolValue("overrideMimeType");
 
   // SETTINGS - ADVANCED - NOTIFICATION
   $settings->_enableOwnerNotification = getBoolValue("enableOwnerNotification");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 2bcb53478..282f92fc0 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -545,6 +545,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableDuplicateDocNames");?>:</td>
         <td><input name="enableDuplicateDocNames" type="checkbox" <?php if ($settings->_enableDuplicateDocNames) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_overrideMimeType_desc");?>">
+        <td><?php printMLText("settings_overrideMimeType");?>:</td>
+        <td><input name="overrideMimeType" type="checkbox" <?php if ($settings->_overrideMimeType) echo "checked" ?> /></td>
+      </tr>
 
       <!--
         -- SETTINGS - ADVANCED - NOTIFICATION

From db3d563e3f02f7393895ddae758d4eabceb7cd18 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 07:45:18 +0200
Subject: [PATCH 0231/2006] do not use mimetype delivered by server if
 overrideMimeType is set

---
 op/op.AddDocument.php      | 5 +++++
 op/op.AddFile.php          | 5 +++++
 op/op.AddFile2.php         | 5 +++++
 op/op.AddMultiDocument.php | 5 +++++
 op/op.Ajax.php             | 5 +++++
 op/op.UpdateDocument.php   | 5 +++++
 op/op.UpdateDocument2.php  | 5 +++++
 7 files changed, 35 insertions(+)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 23479e4ab..141342c0b 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -326,6 +326,11 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	
 	$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+	if($settings->_overrideMimeType) {
+		$finfo = finfo_open(FILEINFO_MIME_TYPE);
+		$userfiletype = finfo_file($finfo, $userfiletmp);
+	}
+
 	if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!=""))
 		$name = $_POST["name"];
 	else $name = basename($userfilename);
diff --git a/op/op.AddFile.php b/op/op.AddFile.php
index 8dfe3f4e1..7a6c5eeb9 100644
--- a/op/op.AddFile.php
+++ b/op/op.AddFile.php
@@ -61,6 +61,11 @@ $userfilename = $_FILES["userfile"]["name"];
 
 $fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+if($settings->_overrideMimeType) {
+	$finfo = finfo_open(FILEINFO_MIME_TYPE);
+	$userfiletype = finfo_file($finfo, $userfiletmp);
+}
+
 $res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
                                   basename($userfilename),$fileType, $userfiletype );
                                 
diff --git a/op/op.AddFile2.php b/op/op.AddFile2.php
index e7624a1ff..a811bb63a 100644
--- a/op/op.AddFile2.php
+++ b/op/op.AddFile2.php
@@ -72,6 +72,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 
 		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+		if($settings->_overrideMimeType) {
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$userfiletype = finfo_file($finfo, $userfiletmp);
+		}
+
 		$res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
 																			basename($userfilename),$fileType, $userfiletype );
 																		
diff --git a/op/op.AddMultiDocument.php b/op/op.AddMultiDocument.php
index 92857c4bb..9a157c2e6 100644
--- a/op/op.AddMultiDocument.php
+++ b/op/op.AddMultiDocument.php
@@ -176,6 +176,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 
 		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+		if($settings->_overrideMimeType) {
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$userfiletype = finfo_file($finfo, $userfiletmp);
+		}
+
 		if(isset($_POST["name"]) && $_POST["name"] != "")
 			$name = $_POST["name"];
 		else
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index b38a69302..527a8afcb 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -493,6 +493,11 @@ switch($command) {
 
 				$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+				if($settings->_overrideMimeType) {
+					$finfo = finfo_open(FILEINFO_MIME_TYPE);
+					$userfiletype = finfo_file($finfo, $userfiletmp);
+				}
+
 				if (!empty($_POST["name"]))
 					$name = $_POST["name"];
 				else
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index ddf0caf57..b04b47f2f 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -73,6 +73,11 @@ if ($_FILES['userfile']['error'] == 0) {
 	$userfiletmp = $_FILES["userfile"]["tmp_name"];
 	$userfiletype = $_FILES["userfile"]["type"];
 	$userfilename = $_FILES["userfile"]["name"];
+
+	if($settings->_overrideMimeType) {
+		$finfo = finfo_open(FILEINFO_MIME_TYPE);
+		$userfiletype = finfo_file($finfo, $userfiletmp);
+	}
 } elseif($settings->_dropFolderDir) {
 	if($_POST['dropfolderfileform1']) {
 		$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"];
diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php
index d4e0138c4..f6f9b6eec 100644
--- a/op/op.UpdateDocument2.php
+++ b/op/op.UpdateDocument2.php
@@ -75,6 +75,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 
 		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
+		if($settings->_overrideMimeType) {
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$userfiletype = finfo_file($finfo, $userfiletmp);
+		}
+
 		// Get the list of reviewers and approvers for this document.
 		$reviewers = array();
 		$approvers = array();

From 6fde8fe200eadf92a42a3936b8054df10e147ff3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 07:59:39 +0200
Subject: [PATCH 0232/2006] take out review and approval status

currently not needed
---
 op/op.OverrideContentStatus.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php
index 080692d11..dcae13321 100644
--- a/op/op.OverrideContentStatus.php
+++ b/op/op.OverrideContentStatus.php
@@ -65,8 +65,6 @@ if ($overallStatus["status"] == S_REJECTED || $overallStatus["status"] == S_EXPI
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("cannot_change_final_states"));
 }
 
-$reviewStatus = $content->getReviewStatus();
-$approvalStatus = $content->getApprovalStatus();
 $overrideStatus = $_POST["overrideStatus"];
 $comment = $_POST["comment"];
 

From 7cc3a0cf866a67ddb02b0dfc6509343727ce8a60 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 08:00:03 +0200
Subject: [PATCH 0233/2006] put icon before link to change status

---
 views/bootstrap/class.DocumentVersionDetail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index cb8cdb3e9..59a174a59 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -183,7 +183,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		}
 		if (($enableversionmodification && ($document->getAccessMode($user) == M_ALL)) || $user->isAdmin()) {
 			if ( $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE ){
-				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'>".getMLText("change_status")."</a></li>";
+				print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$document->getID()."&version=".$version->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
 			}
 		}
 		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {

From 88df1cee829961207209d79e66f837ea5c65305d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 09:53:14 +0200
Subject: [PATCH 0234/2006] move printProtocol() into class.Bootstrap.php

---
 views/bootstrap/class.Bootstrap.php    | 101 +++++++++++++++++++++++++
 views/bootstrap/class.ViewDocument.php | 101 -------------------------
 2 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index bf3f7a83f..cdd0df352 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1998,5 +1998,106 @@ mayscript>
 	function show(){ /* {{{ */
 		parent::show();
 	} /* }}} */
+
+	/**
+	 * Output a protocol
+	 *
+	 * @param object $attribute attribute
+	 */
+	protected function printProtocol($latestContent, $type="") { /* {{{ */
+		$dms = $this->params['dms'];
+?>
+		<legend><?php printMLText($type.'_log'); ?></legend>
+		<table class="table condensed">
+			<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('last_update'); ?>, <?php printMLText('comment'); ?></th><th><?php printMLText('status'); ?></th></tr>
+<?php
+		switch($type) {
+		case "review":
+			$statusList = $latestContent->getReviewStatus(10);
+			break;
+		case "approval":
+			$statusList = $latestContent->getApprovalStatus(10);
+			break;
+		case "revision":
+			$statusList = $latestContent->getRevisionStatus(10);
+			break;
+		case "receipt":
+			$statusList = $latestContent->getReceiptStatus(1);
+			break;
+		default:
+			$statusList = array();
+		}
+		foreach($statusList as $rec) {
+			echo "<tr>";
+			echo "<td>";
+			switch ($rec["type"]) {
+				case 0: // individual.
+					$required = $dms->getUser($rec["required"]);
+					if (!is_object($required)) {
+						$reqName = getMLText("unknown_user")." '".$rec["required"]."'";
+					} else {
+						$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+					}
+					break;
+				case 1: // Approver is a group.
+					$required = $dms->getGroup($rec["required"]);
+					if (!is_object($required)) {
+						$reqName = getMLText("unknown_group")." '".$rec["required"]."'";
+					}
+					else {
+						$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
+					}
+					break;
+			}
+			echo $reqName;
+			echo "</td>";
+			echo "<td>";
+			echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
+			$updateuser = $dms->getUser($rec["userID"]);
+			if(!is_object($required))
+				echo getMLText("unknown_user");
+			else
+				echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");
+			echo "</i>";
+			if($rec['comment'])
+				echo "<br />".htmlspecialchars($rec['comment']);
+			switch($type) {
+			case "review":
+				if($rec['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+				}
+				break;
+			case "approval":
+				if($rec['file']) {
+					echo "<br />";
+					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+				}
+				break;
+			}
+			echo "</td>";
+			echo "<td>";
+			switch($type) {
+			case "review":
+				echo getReviewStatusText($rec["status"]);
+				break;
+			case "approval":
+				echo getApprovalStatusText($rec["status"]);
+				break;
+			case "revision":
+				echo getRevisionStatusText($rec["status"]);
+				break;
+			case "receipt":
+				echo getReceiptStatusText($rec["status"]);
+				break;
+			default:
+			}
+			echo "</td>";
+			echo "</tr>";
+		}
+?>
+				</table>
+<?php
+	} /* }}} */
 }
 ?>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 95c1ae2c2..db4991ae7 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -110,107 +110,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 	
 	} /* }}} */
 
-	/**
-	 * Output a protocol
-	 *
-	 * @param object $attribute attribute
-	 */
-	protected function printProtocol($latestContent, $type="") { /* {{{ */
-		$dms = $this->params['dms'];
-?>
-		<legend><?php printMLText($type.'_log'); ?></legend>
-		<table class="table condensed">
-			<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('last_update'); ?>, <?php printMLText('comment'); ?></th><th><?php printMLText('status'); ?></th></tr>
-<?php
-		switch($type) {
-		case "review":
-			$statusList = $latestContent->getReviewStatus(10);
-			break;
-		case "approval":
-			$statusList = $latestContent->getApprovalStatus(10);
-			break;
-		case "revision":
-			$statusList = $latestContent->getRevisionStatus(10);
-			break;
-		case "receipt":
-			$statusList = $latestContent->getReceiptStatus(1);
-			break;
-		default:
-			$statusList = array();
-		}
-		foreach($statusList as $rec) {
-			echo "<tr>";
-			echo "<td>";
-			switch ($rec["type"]) {
-				case 0: // individual.
-					$required = $dms->getUser($rec["required"]);
-					if (!is_object($required)) {
-						$reqName = getMLText("unknown_user")." '".$rec["required"]."'";
-					} else {
-						$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
-					}
-					break;
-				case 1: // Approver is a group.
-					$required = $dms->getGroup($rec["required"]);
-					if (!is_object($required)) {
-						$reqName = getMLText("unknown_group")." '".$rec["required"]."'";
-					}
-					else {
-						$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-					}
-					break;
-			}
-			echo $reqName;
-			echo "</td>";
-			echo "<td>";
-			echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
-			$updateuser = $dms->getUser($rec["userID"]);
-			if(!is_object($required))
-				echo getMLText("unknown_user");
-			else
-				echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");
-			echo "</i>";
-			if($rec['comment'])
-				echo "<br />".htmlspecialchars($rec['comment']);
-			switch($type) {
-			case "review":
-				if($rec['file']) {
-					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
-				}
-				break;
-			case "approval":
-				if($rec['file']) {
-					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
-				}
-				break;
-			}
-			echo "</td>";
-			echo "<td>";
-			switch($type) {
-			case "review":
-				echo getReviewStatusText($rec["status"]);
-				break;
-			case "approval":
-				echo getApprovalStatusText($rec["status"]);
-				break;
-			case "revision":
-				echo getRevisionStatusText($rec["status"]);
-				break;
-			case "receipt":
-				echo getReceiptStatusText($rec["status"]);
-				break;
-			default:
-			}
-			echo "</td>";
-			echo "</tr>";
-		}
-?>
-				</table>
-<?php
-	} /* }}} */
-
 	function show() { /* {{{ */
 		parent::show();
 		$dms = $this->params['dms'];

From fd55efb3b90a0b78add72d55528ae20176b8a65e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 10:02:45 +0200
Subject: [PATCH 0235/2006] show review/approval protocol

---
 .../bootstrap/class.DocumentVersionDetail.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 59a174a59..760cb20cb 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -299,6 +299,34 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		print "</table>\n";
 
 		$this->contentContainerEnd();
+
+		if($user->isAdmin()) {
+?>
+			<div class="row-fluid">
+<?php
+			/* Check for an existing review log, even if the workflowmode
+			 * is set to traditional_only_approval. There may be old documents
+			 * that still have a review log if the workflow mode has been
+			 * changed afterwards.
+			 */
+			if($version->getReviewStatus(10)) {
+?>
+				<div class="span6">
+				<?php $this->printProtocol($version, 'review'); ?>
+				</div>
+<?php
+			}
+			if($version->getApprovalStatus(10)) {
+?>
+				<div class="span6">
+				<?php $this->printProtocol($version, 'approval'); ?>
+				</div>
+<?php
+			}
+?>
+			</div>
+<?php
+		}
 		$this->htmlEndPage();
 	} /* }}} */
 }

From 6487db064a37b4e06f08391c6f853c97136acebd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 10:14:33 +0200
Subject: [PATCH 0236/2006] use same icons and output for version information

Conflicts:
	views/bootstrap/class.ViewDocument.php
---
 views/bootstrap/class.DocumentVersionDetail.php | 6 ++++--
 views/bootstrap/class.ViewDocument.php          | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 760cb20cb..f39e03a9f 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -176,7 +176,9 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
 			if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes))
 				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i> " . getMLText("view_online") . "</a>";
-		}else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\"> ";
+			print "</ul>";
+			print "<ul class=\"actions unstyled\">";
+		}
 
 		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
 			print "<li><a href=\"out.RemoveVersion.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-remove\"></i> ".getMLText("rm_version")."</a></li>";
@@ -188,7 +190,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		}
 		if (($enableversionmodification && ($document->getAccessMode($user) >= M_READWRITE)) || $user->isAdmin()) {
 			if($status["status"] != S_OBSOLETE)
-				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-edit\"></i> ".getMLText("edit_comment")."</a></li>";
+				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-comment\"></i> ".getMLText("edit_comment")."</a></li>";
 			if ( $status["status"] == S_DRAFT_REV){
 				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
 		}
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index db4991ae7..9f8d9dd74 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -494,7 +494,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<li><a href=\"out.EditAttributes.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
 		}
 
-		// print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&vfile=1\"><i class=\"icon-info-sign\"></i>".getMLText("versioning_info")."</a></li>";	
+		//print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&vfile=1\"><i class=\"icon-info-sign\"></i>".getMLText("versioning_info")."</a></li>";	
 
 		print "</ul>";
 		echo "</td>";
@@ -1167,9 +1167,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a>";
 					if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes))
 						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a>";
+					print "</ul>";
+					print "<ul class=\"actions unstyled\">";
 				}
-				print "</ul>";
-				print "<ul class=\"actions unstyled\">";
 				/* Only admin has the right to remove version in any case or a regular
 				 * user if enableVersionDeletion is on
 				 */
@@ -1182,7 +1182,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($accessop->mayEditAttributes()) {
 					print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
 				}
-				//print "<li><a href='../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version->getVersion()."'><i class=\"icon-info-sign\"></i>".getMLText("details")."</a></li>";
+				print "<li><a href='../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version->getVersion()."'><i class=\"icon-info-sign\"></i>".getMLText("details")."</a></li>";
 				print "</ul>";
 				print "</td>\n</tr>\n";
 			}

From 7f2bb15d499955ecf69cbc12b50262f2e8e6b29d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jun 2015 19:10:14 +0200
Subject: [PATCH 0237/2006] remove some superflous chars

---
 views/bootstrap/class.Search.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 99ec24bf5..981102928 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -431,7 +431,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 </tr>
 <tr>
 <td></td><td><button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("search"); ?></button></td>
-			";
 </tr>
 </table>
 

From f78af97b4a10d285e91dbe6c716b5e09db806548 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jun 2015 12:26:08 +0200
Subject: [PATCH 0238/2006] check if library folder is readable, pass folder to
 view

---
 out/out.AddDocument.php               | 12 +++++++++++-
 views/bootstrap/class.AddDocument.php |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 4793dd6b8..3fb73d32d 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -47,8 +47,18 @@ if($settings->_quota > 0) {
 	}
 }
 
+$folderid = $_GET["folderid"];
+$libfolder = $dms->getFolder($settings->_libraryFolder);
+if (!is_object($libfolder)) {
+	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
+}
+
+if ($libfolder->getAccessMode($user) < M_READ) {
+	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($libfolder->getName()))), getMLText("access_denied"));
+}
+
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'libraryfolder'=>$dms->getFolder($settings->_libraryFolder), 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList, 'orderby'=>$settings->_sortFoldersDefault));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'libraryfolder'=>$dms->getFolder($libfolder), 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList, 'orderby'=>$settings->_sortFoldersDefault));
 if($view) {
 	$view->show();
 	exit;
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index b33edb532..97d789256 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -219,7 +219,7 @@ $(document).ready(function() {
 <?php if($libraryfolder) { ?>
 		<tr>
 			<td><?php printMLText("librarydoc");?>:</td>
-			<td><?php $this->printDocumentChooser("form1", M_READ, -1, null, 'librarydoc', $libraryfolder, 1);?></td>
+			<td><?php $this->printDocumentChooser("form1", M_READ, -1, null, 'librarydoc', $libraryfolder->getID(), 1);?></td>
 		</tr>
 <?php } ?>
 		<tr>

From e158a873f517396318ea99168317ab1270979e36 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jun 2015 12:41:26 +0200
Subject: [PATCH 0239/2006] add target apidoc

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 0438b2055..bd6225764 100644
--- a/Makefile
+++ b/Makefile
@@ -46,4 +46,7 @@ extensions: $(EXTENSIONS)
 doc:
 	$(PHPDOC) -d SeedDMS_Core --ignore 'getusers.php,getfoldertree.php,config.php,reverselookup.php' --force -t html
 
+apidoc:
+	apigen  generate -s SeedDMS_Core --exclude tests --skip-doc-prefix tests -d html
+
 .PHONY: webdav webapp

From 7ed7ae01ca6e14a674f29c39385821afa28c86ad Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jun 2015 17:28:17 +0200
Subject: [PATCH 0240/2006] set width of column for preview image to width of
 preview

---
 views/bootstrap/class.ViewDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 9f8d9dd74..b2f7bac06 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -367,14 +367,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		print "<table class=\"table\">";
 		print "<thead>\n<tr>\n";
-		print "<th width='*'></th>\n";
+		print "<th style=\"width:".$previewwidthdetail."px;\"></th>\n";
 		print "<th width='*'>".getMLText("file")."</th>\n";
 		print "<th width='25%'>".getMLText("comment")."</th>\n";
 		print "<th width='15%'>".getMLText("status")."</th>\n";
-		print "<th width='20%'></th>\n";
+		print "<th width='25%'></th>\n";
 		print "</tr></thead><tbody>\n";
 		print "<tr>\n";
-		print "<td>";
+		print "<td style=\"width:".$previewwidthdetail."px;\">";
 		/*
 		print "<ul class=\"actions unstyled\">";
 

From ac550a1ec1ebe0661d9bffa621d138725fc23f0d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jun 2015 17:28:55 +0200
Subject: [PATCH 0241/2006] =?UTF-8?q?=C3=A5llow=20to=20set=20review/approv?=
 =?UTF-8?q?er=20in=20status=20draft?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 9d7e4de3f..935947e7f 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -98,7 +98,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP && $this->settings->_workflowMode == 'traditional_only_approval')) {
+			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status['status']==S_DRAFT || $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP && $this->settings->_workflowMode == 'traditional_only_approval')) {
 				return true;
 			}
 		}

From 871ed870cc154163e1ed5e7015e5e98da33a6188 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jun 2015 20:34:40 +0200
Subject: [PATCH 0242/2006] add optional parameter $initstate to checkIn()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 2cbe17c51..e6456502c 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -808,13 +808,14 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * @param integer $version
 	 * @param array $attributes
 	 * @param object $workflow
+	 * @param integer $initstate intial document status
 	 * @return boolean|object false in case of error, true if no error occurs but
 	 * the document remains unchanged (because the checked out file has not
 	 * changed or it has disappeared and couldnt't be checked in), or
 	 * an instance of class SeedDMS_Core_AddContentResultSet if the document
 	 * was updated.
 	 */
-	function checkIn($comment, $user, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null) { /* {{{ */
+	function checkIn($comment, $user, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null, $initstate=S_RELEASED) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$info = self::getCheckOutInfo();
@@ -840,7 +841,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		/* Do not create a new version if the file was unchanged */
 		$checksum = SeedDMS_Core_File::checksum($info['filename']);
 		if($checksum != $lc->getChecksum()) {
-			$content = $this->addContent($comment, $user, $info['filename'], $lc->getOriginalFileName(), $lc->getFileType(), $lc->getMimeType(), $reviewers, $approvers, $version, $attributes, $workflow);
+			$content = $this->addContent($comment, $user, $info['filename'], $lc->getOriginalFileName(), $lc->getFileType(), $lc->getMimeType(), $reviewers, $approvers, $version, $attributes, $workflow, $initstate);
 			if($content) {
 				if(!$this->_dms->forceRename) {
 					SeedDMS_Core_File::removeFile($info['filename']);
@@ -1463,6 +1464,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * @param array $attributes list of version attributes. The element key
 	 *        must be the id of the attribute definition.
 	 * @param object $workflow
+	 * @param integer $initstate intial document status
 	 * @return bool/array false in case of an error or a result set
 	 */
 	function addContent($comment, $user, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null, $initstate=S_RELEASED) { /* {{{ */

From 3c2980dfdf5c9f3ffcf54b15a7c85a54a272e4de Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jun 2015 20:35:42 +0200
Subject: [PATCH 0243/2006] pass $settings->_initialDocumentStatus to checkIn()

---
 op/op.CheckInDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 4ce8bb7b7..46fdc4237 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -201,7 +201,7 @@ else
 		$attributes = array();
 	}
 
-	$contentResult=$document->checkIn($comment, $user, $reviewers, $approvers, $version=0, $attributes, $workflow);
+	$contentResult=$document->checkIn($comment, $user, $reviewers, $approvers, $version=0, $attributes, $workflow, $settings->_initialDocumentStatus);
 	if (is_bool($contentResult) && !$contentResult) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} elseif (is_bool($contentResult) && $contentResult) {

From 2feeb560d12000cc2fd3a3454caee8a30d1fcef2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jun 2015 21:25:24 +0200
Subject: [PATCH 0244/2006] pass $settings->_initialDocumentStatus to
 addContent()

---
 op/op.UpdateDocument.php  | 2 +-
 op/op.UpdateDocument2.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index b04b47f2f..e58bcf6d6 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -243,7 +243,7 @@ if ($_FILES['userfile']['error'] == 0) {
 		$attributes = array();
 	}
 
-	$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow);
+	$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow, $settings->_initialDocumentStatus);
 	if (is_bool($contentResult) && !$contentResult) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	}
diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php
index f6f9b6eec..1dc2d702e 100644
--- a/op/op.UpdateDocument2.php
+++ b/op/op.UpdateDocument2.php
@@ -154,7 +154,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 		}
 
 
-		$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers);
+		$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, null, null, $settings->_initialDocumentStatus);
 		unlink($userfiletmp);
 		if (is_bool($contentResult) && !$contentResult) {
 			echo getMLText("error_occured");

From 6b816f4d44dcd54b3840c6e0b8845ef9f64cd163 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jun 2015 21:25:53 +0200
Subject: [PATCH 0245/2006] better handling of converters, added converters for
 preview

commands can also be deleted
---
 inc/inc.ClassSettings.php          | 63 +++++++++++++++++++-----------
 op/op.Settings.php                 | 20 +++++++++-
 views/bootstrap/class.Settings.php | 21 ++++++++--
 3 files changed, 76 insertions(+), 28 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index f058b559d..c748927b2 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -537,6 +537,21 @@ class Settings { /* {{{ */
 			$this->_maxExecutionTime = ini_get("max_execution_time");
 
 		// XML Path: /configuration/system/advanced/converters
+		$convertergroups = $xml->xpath('/configuration/advanced/converters');
+		$this->_converters = array();
+		foreach($convertergroups as $convertergroup) {
+			$tabgroup = $convertergroup->attributes();
+			if(strval($tabgroup['target']))
+				$target = strval($tabgroup['target']);
+			else
+				$target = 'fulltext';
+			foreach($convertergroup as $converter) {
+				$tab = $converter->attributes();
+				$this->_converters[$target][trim(strval($tab['mimeType']))] = trim(strval($converter));
+			}
+		}
+
+		/*
 		$converters = $xml->xpath('/configuration/advanced/converters/converter');
 		$this->_converters = array();
 		foreach($converters as $converter) {
@@ -546,6 +561,7 @@ class Settings { /* {{{ */
 			else
 				$this->_converters[trim(strval($tab['target']))][trim(strval($tab['mimeType']))] = trim(strval($converter));
 		}
+		*/
 
 		// XML Path: /configuration/extensions
 		$extensions = $xml->xpath('/configuration/extensions/extension');
@@ -806,30 +822,31 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "updateNotifyTime", $this->_updateNotifyTime);
     $this->setXMLAttributValue($node, "maxExecutionTime", $this->_maxExecutionTime);
 
-    // XML Path: /configuration/advanced/converters
-    foreach($this->_converters['fulltext'] as $mimeType => $cmd)
-    {
-      // search XML node
-      $node = $xml->xpath('/configuration/advanced/converters/converter[@mimeType="'. $mimeType .'"]');
+		// XML Path: /configuration/advanced/converters
+		foreach($this->_converters as $type=>$converters) {
+			foreach($this->_converters[$type] as $mimeType => $cmd) {
+				// search XML node
+				$node = $xml->xpath('/configuration/advanced/converters[@target="'.$type.'"]/converter[@mimeType="'. $mimeType .'"]');
 
-      if (isset($node))
-      {
-        if (count($node)>0)
-        {
-          $node = $node[0];
-        }
-        else
-        {
-          $nodeParent = $xml->xpath('/configuration/advanced/converters');
-          $node = $nodeParent[0]->addChild("converter");
-        }
-
-				$node[0] = $cmd;
-        $this->setXMLAttributValue($node, 'mimeType', $mimeType);
-
-      } // isset($node)
-
-    } // foreach
+				if (count($node)>0) {
+					if(trim($cmd)) {
+						$node = $node[0];
+						$node[0] = $cmd;
+						$this->setXMLAttributValue($node, 'mimeType', $mimeType);
+					} else {
+						$node = $node[0];
+						unset($node[0]);
+					}
+				} else {
+					if(trim($cmd)) {
+						$nodeParent = $xml->xpath('/configuration/advanced/converters[@target="'.$type.'"]');
+						$node = $nodeParent[0]->addChild("converter");
+						$node[0] = $cmd;
+						$this->setXMLAttributValue($node, 'mimeType', $mimeType);
+					}
+				}
+			} // foreach
+		} // foreach
 
 
     // XML Path: /configuration/extensions
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 32a7803ff..f604887d8 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -173,8 +173,24 @@ if ($action == "saveSettings")
   $settings->_updateNotifyTime = intval($_POST["updateNotifyTime"]);
   $settings->_maxExecutionTime = intval($_POST["maxExecutionTime"]);
 
-  // SETTINGS - ADVANCED - INDEX CMD
-  $settings->_converters['fulltext'] = $_POST["converters"];
+	// SETTINGS - ADVANCED - INDEX CMD
+	if(isset($_POST["converters"]["fulltext"]))
+		$settings->_converters['fulltext'] = $_POST["converters"]["fulltext"];
+	else
+		$settings->_converters['fulltext'] = $_POST["converters"];
+	if(trim($settings->_converters['fulltext']['newmimetype']) &&
+		trim($settings->_converters['fulltext']['newcmd']))
+		$settings->_converters['fulltext'][$settings->_converters['fulltext']['newmimetype']] = trim($settings->_converters['fulltext']['newcmd']);
+	unset($settings->_converters['fulltext']['newmimetype']);
+	unset($settings->_converters['fulltext']['newcmd']);
+
+	if(isset($_POST["converters"]["preview"]))
+		$settings->_converters['preview'] = $_POST["converters"]["preview"];
+	if(trim($settings->_converters['preview']['newmimetype']) &&
+		trim($settings->_converters['preview']['newcmd']))
+		$settings->_converters['preview'][$settings->_converters['preview']['newmimetype']] = trim($settings->_converters['preview']['newcmd']);
+	unset($settings->_converters['preview']['newmimetype']);
+	unset($settings->_converters['preview']['newcmd']);
 
   // SETTINGS - EXTENSIONS
   $settings->_extensions = $_POST["extensions"];
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 282f92fc0..ced156c1d 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -606,14 +606,29 @@ if(!is_writeable($settings->_configFilePath)) {
 ?>
       <tr title="<?php echo $mimetype;?>">
         <td><?php echo $mimetype;?>:</td>
-        <td><input type="text" name="converters[<?php echo $mimetype;?>]" value="<?php echo htmlspecialchars($cmd) ?>" size="100" /></td>
+        <td><input type="text" name="converters[fulltext][<?php echo $mimetype;?>]" value="<?php echo htmlspecialchars($cmd) ?>" size="100" /></td>
       </tr>
 <?php
 	}
 ?>
       <tr title="">
-        <td><input type="text" name="converters_newmimetype" value="" />:</td>
-        <td><input type="text" name="converters_newcmd" value="" /></td>
+			<td><input type="text" name="converters[fulltext][newmimetype]" value="" placeholder="<?= getMLText('converter_new_mimetype') ?>"/>:</td>
+			<td><input type="text" name="converters[fulltext][newcmd]" value="" placeholder="<?= getMLText('converter_new_cmd') ?>"/></td>
+      </tr>
+      <tr ><td><b> <?php printMLText("preview_converters");?></b></td> </tr>
+<?php
+	foreach($settings->_converters['preview'] as $mimetype=>$cmd) {
+?>
+      <tr title="<?php echo $mimetype;?>">
+        <td><?php echo $mimetype;?>:</td>
+        <td><input type="text" name="converters[preview][<?php echo $mimetype;?>]" value="<?php echo htmlspecialchars($cmd) ?>" size="100" /></td>
+      </tr>
+<?php
+	}
+?>
+      <tr title="">
+			<td><input type="text" name="converters[preview][newmimetype]" value="" placeholder="<?= getMLText('converter_new_mimetype') ?>"/>:</td>
+			<td><input type="text" name="converters[preview][newcmd]" value="" placeholder="<?= getMLText('converter_new_cmd') ?>"/></td>
       </tr>
     </table>
 <?php		$this->contentContainerEnd(); ?>

From 5348905c2319bb12b63ff289a9d2b8531fa6350e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Jun 2015 19:50:10 +0200
Subject: [PATCH 0246/2006] check if content is still there when calculating
 size

---
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index 96e2acbac..d6e23104b 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -229,8 +229,9 @@ class SeedDMS_Core_Transmittal {
 
 		$size = 0;
 		foreach ($this->_items as $item) {
-			$content = $item->getContent();
-			$size += $content->getFileSize();
+			if($content = $item->getContent()) {
+				$size += $content->getFileSize();
+			}
 		}
 		return $size;
 	} /* }}} */

From 9269a74092013d29bd6d820ba452dfce03c0c747 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Jun 2015 19:50:47 +0200
Subject: [PATCH 0247/2006] make preview converters customizalbe

---
 SeedDMS_Preview/Preview/Previewer.php | 35 ++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index e275d8f1e..b993024c0 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -37,6 +37,13 @@ class SeedDMS_Preview_Previewer {
 	 */
 	protected $width;
 
+	/**
+	 * @var array $converters list of mimetypes and commands for converting
+	 * file into preview image
+	 * @access protected
+	 */
+	protected $converters;
+
 	function __construct($previewDir, $width=40) {
 		if(!is_dir($previewDir)) {
 			if (!SeedDMS_Core_File::makeDir($previewDir)) {
@@ -48,8 +55,29 @@ class SeedDMS_Preview_Previewer {
 			$this->previewDir = $previewDir;
 		}
 		$this->width = intval($width);
+		$this->converters = array(
+			'image/png' => "convert -resize %wx '%f' '%o'",
+			'image/gif' => "convert -resize %wx '%f' '%o'",
+			'image/jpg' => "convert -resize %wx '%f' '%o'",
+			'image/jpeg' => "convert -resize %wx '%f' '%o'",
+			'image/svg+xml' => "convert -resize %wx '%f' '%o'",
+			'text/plain' => "convert -resize %wx '%f' '%o'",
+			'application/pdf' => "convert -density 100 -resize %wx '%f[0]' '%o'",
+			'application/postscript' => "convert -density 100 -resize %wx '%f[0]' '%o'",
+			'application/x-compressed-tar' => "tar tzvf '%f' | convert -density 100 -resize %wx text:-[0] '%o",
+		);
 	}
 
+	/**
+	 * Set a list of converters
+	 *
+	 * @param array list of converters. The key of the array contains the mimetype
+	 * and the value is the command to be called for creating the preview
+	 */
+	function setConverters($arr) { /* {{{ */
+		$this->converters = array_merge($arr, $this->converters);
+	} /* }}} */
+
 	/**
 	 * Retrieve the physical filename of the preview image on disk
 	 *
@@ -57,7 +85,7 @@ class SeedDMS_Preview_Previewer {
 	 * @param integer $width width of preview image
 	 * @return string file name of preview image
 	 */
-	protected function getFileName($object, $width) { /* }}} */
+	protected function getFileName($object, $width) { /* {{{ */
 		$document = $object->getDocument();
 		$dir = $this->previewDir.'/'.$document->getDir();
 		switch(get_class($object)) {
@@ -93,6 +121,10 @@ class SeedDMS_Preview_Previewer {
 		$target = $this->getFileName($object, $width);
 		if($target !== false && (!file_exists($target) || filectime($target) < $object->getDate())) {
 			$cmd = '';
+			if(isset($this->converters[$object->getMimeType()])) {
+				$cmd = str_replace(array('%w', '%f', '%o'), array($width, $file, $target), $this->converters[$object->getMimeType()]);
+			}
+			/*
 			switch($object->getMimeType()) {
 				case "image/png":
 				case "image/gif":
@@ -112,6 +144,7 @@ class SeedDMS_Preview_Previewer {
 					$cmd = 'tar tzvf '.$file.' | convert -density 100 -resize '.$width.'x text:-[0] '.$target;
 					break;
 			}
+			 */
 			if($cmd) {
 				exec($cmd);
 			}

From 52559730d9d56e008b7129acef8d3a9ba383fd3f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Jun 2015 19:52:02 +0200
Subject: [PATCH 0248/2006] use new customizable preview converters

---
 op/op.Ajax.php                                |  5 +++-
 op/op.Preview.php                             |  1 +
 op/op.Search.php                              |  1 +
 out/out.DocumentVersionDetail.php             |  2 +-
 out/out.ManageNotify.php                      |  2 +-
 out/out.MyDocuments.php                       |  2 +-
 out/out.TransmittalMgr.php                    |  2 +-
 out/out.ViewDocument.php                      |  1 +
 out/out.ViewFolder.php                        |  1 +
 out/out.WorkflowSummary.php                   |  2 +-
 views/bootstrap/class.Bootstrap.php           |  7 +++--
 .../bootstrap/class.DocumentVersionDetail.php |  2 ++
 views/bootstrap/class.ManageNotify.php        |  2 ++
 views/bootstrap/class.MyDocuments.php         |  3 ++-
 views/bootstrap/class.Search.php              |  2 ++
 views/bootstrap/class.TransmittalMgr.php      | 27 ++++++++++++-------
 views/bootstrap/class.ViewDocument.php        |  2 ++
 views/bootstrap/class.ViewFolder.php          |  8 +++---
 views/bootstrap/class.WorkflowSummary.php     |  2 ++
 19 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 527a8afcb..ee4f2f201 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -425,13 +425,16 @@ switch($command) {
 				$content = $view->menuClipboard($session->getClipboard());
 				break;
 			case 'mainclipboard':
-				$content = $view->mainClipboard($session->getClipboard());
+				$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $settings->_previewWidthList);
+				$previewer->setConverters($settings->_converters['preview']);
+				$content = $view->mainClipboard($session->getClipboard(), $previewer);
 				break;
 			case 'documentlistrow':
 				$document = $dms->getDocument($_REQUEST['id']);
 				if($document) {
 					if ($document->getAccessMode($user) >= M_READ) {
 						$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $settings->_previewWidthList);
+						$previewer->setConverters($settings->_converters['preview']);
 						$view->setParam('previewWidthList', $settings->_previewWidthList);
 						$view->setParam('showtree', showtree());
 						$content = $view->documentListRow($document, $previewer, true);
diff --git a/op/op.Preview.php b/op/op.Preview.php
index 8eacdc31a..a3998c29d 100644
--- a/op/op.Preview.php
+++ b/op/op.Preview.php
@@ -73,6 +73,7 @@ if(!empty($_GET["width"]))
 	$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $_GET["width"]);
 else
 	$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+$previewer->setConverters($settings->_converters['preview']);
 if(!$previewer->hasPreview($object))
 	$previewer->createPreview($object);
 header('Content-Type: image/png');
diff --git a/op/op.Search.php b/op/op.Search.php
index 75dbd4b44..99131f3ad 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -493,6 +493,7 @@ if(count($entries) == 1) {
 		$view->setParam('workflowmode', $settings->_workflowMode);
 		$view->setParam('enablefullsearch', $settings->_enableFullSearch);
 		$view->setParam('previewWidthList', $settings->_previewWidthList);
+		$view->setParam('previewconverters', $settings->_converters['preview']);
 		$view->show();
 		exit;
 	}
diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index 6e3346967..d4d796287 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -70,7 +70,7 @@ $folder = $document->getFolder();
 $accessop = new SeedDMS_AccessOperation($document, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewwidthdetail'=>$settings->_previewWidthDetail, 'cachedir'=>$settings->_cacheDir));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewwidthdetail'=>$settings->_previewWidthDetail, 'previewconverters'=>$settings->_converters['preview'], 'cachedir'=>$settings->_cacheDir));
 if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->show();
diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php
index 4f9875cde..a3205239a 100644
--- a/out/out.ManageNotify.php
+++ b/out/out.ManageNotify.php
@@ -34,7 +34,7 @@ if ($user->isGuest()) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview']));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 2eadea3e1..6694d108d 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -48,7 +48,7 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'orderby'=>$orderby, 'showinprocess'=>$showInProcess, 'workflowmode'=>$settings->_workflowMode, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'orderby'=>$orderby, 'showinprocess'=>$showInProcess, 'workflowmode'=>$settings->_workflowMode, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview']));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index ea7265ccd..ad072c707 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -42,7 +42,7 @@ if(isset($_GET['transmittalid']) && $_GET['transmittalid']) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seltransmittal'=>$seltransmittal,  'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seltransmittal'=>$seltransmittal,  'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview']));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 527201038..06b098811 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -84,6 +84,7 @@ if($view) {
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('previewConverters', $settings->_converters['preview']);
 	$view->setParam('checkOutDir', $settings->_checkOutDir);
 	$view->setParam('currenttab', isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '');
 	$view->show();
diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index d7fc599f8..10f5700e0 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -68,6 +68,7 @@ if($view) {
 	$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
 	$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->show();
 	exit;
 }
diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php
index 1e59569c8..83d5f484c 100644
--- a/out/out.WorkflowSummary.php
+++ b/out/out.WorkflowSummary.php
@@ -37,7 +37,7 @@ if ($user->isGuest()) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview']));
 if($view) {
 	$view->show();
 	exit;
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index cdd0df352..ab79bd327 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1334,7 +1334,7 @@ $(function() {
 	 * @param array clipboard
 	 * @return string rendered html content
 	 */
-	function mainClipboard($clipboard){ /* {{{ */
+	function mainClipboard($clipboard, $previewer){ /* {{{ */
 		$dms = $this->params['dms'];
 		$content = '';
 		$foldercount = $doccount = 0;
@@ -1359,7 +1359,6 @@ $(function() {
 				}
 			}
 		}
-		$previewer = new SeedDMS_Preview_Previewer($this->params['cachedir'], 40);
 		if($clipboard['docs']) {
 			foreach($clipboard['docs'] as $docid) {
 				/* FIXME: check for access rights, which could have changed after adding the document to the clipboard */
@@ -1416,10 +1415,10 @@ $(function() {
 	 *
 	 * @param array clipboard
 	 */
-	function printClipboard($clipboard){ /* {{{ */
+	function printClipboard($clipboard, $previewer){ /* {{{ */
 		$this->contentHeading(getMLText("clipboard"), true);
 		echo "<div id=\"main-clipboard\" _class=\"well\" ondragover=\"allowDrop(event)\" _ondrop=\"onAddClipboard(event)\">\n";
-		echo $this->mainClipboard($clipboard);
+		echo $this->mainClipboard($clipboard, $previewer);
 		echo "</div>\n";
 	} /* }}} */
 
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index f39e03a9f..2e058f376 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -41,6 +41,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$enableversionmodification = $this->params['enableversionmodification'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidthdetail = $this->params['previewwidthdetail'];
+		$previewconverters = $this->params['previewconverters'];
 
 		$latestContent = $document->getLatestContent();
 		$status = $version->getStatus();
@@ -148,6 +149,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 
 		print "</ul>";
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+		$previewer->setConverters($previewconverters);
 		$previewer->createPreview($version);
 		if($previewer->hasPreview($version)) {
 			print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">");
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index e83c9d85c..8cc5d2538 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -105,6 +105,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		}
 		else {
 			$previewer = new SeedDMS_Preview_Previewer($this->cachedir, $this->previewwidth);
+			$previewer->setConverters($this->previewconverters);
 
 			print "<table class=\"table-condensed\">";
 			print "<thead>\n<tr>\n";
@@ -153,6 +154,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		$this->user = $this->params['user'];
 		$this->cachedir = $this->params['cachedir'];
 		$this->previewwidth = $this->params['previewWidthList'];
+		$this->previewconverters = $this->params['previewconverters'];
 		$this->db = $this->dms->getDB();
 
 		$this->htmlStartPage(getMLText("my_account"));
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index b3b86fd02..201e4d77c 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -39,9 +39,11 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 		$cachedir = $this->params['cachedir'];
 		$workflowmode = $this->params['workflowmode'];
 		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
 
 		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer->setConverters($previewconverters);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -690,7 +692,6 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				print "<th><a href=\"../out/out.MyDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
 
-				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
 				foreach ($resArr as $res) {
 					$document = $dms->getDocument($res["documentID"]);
 				
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 981102928..6ebd0a93b 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -81,6 +81,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$searchin = $this->params['searchin'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
 
 		$this->htmlStartPage(getMLText("search_results"));
 		$this->globalNavigation();
@@ -468,6 +469,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n</thead>\n<tbody>\n";
 
 			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+			$previewer->setConverters($previewconverters);
 			foreach ($entries as $entry) {
 				if(get_class($entry) == $dms->getClassname('document')) {
 					$txt = $this->callHook('documentListItem', $entry, $previewer);
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index ffcf0a4e8..aa7b6892e 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -215,9 +215,11 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
 		$seltransmittal = $this->params['seltransmittal'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
 
 		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer->setConverters($previewconverters);
 
 		$this->htmlStartPage(getMLText("my_transmittals"));
 		$this->globalNavigation();
@@ -278,17 +280,22 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
 				print "<th>".getMLText("action")."</th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
 				foreach($items as $item) {
-					$content = $item->getContent();
-					$document = $content->getDocument();
-					$latestcontent = $document->getLatestContent();
-					if ($document->getAccessMode($user) >= M_READ) {
+					if($content = $item->getContent()) {
+						$document = $content->getDocument();
+						$latestcontent = $document->getLatestContent();
+						if ($document->getAccessMode($user) >= M_READ) {
+							echo "<tr id=\"table-row-transmittalitem-".$item->getID()."\">";
+							echo $this->documentListRow($document, $previewer, true, $content->getVersion());
+							echo "<td><div class=\"list-action\">";
+							$this->printDeleteItemButton($item, getMLText('transmittalitem_removed'));
+							if($latestcontent->getVersion() != $content->getVersion())
+								$this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion())));
+							echo "</div></td>";
+							echo "</tr>";
+						}
+					} else {
 						echo "<tr id=\"table-row-transmittalitem-".$item->getID()."\">";
-						echo $this->documentListRow($document, $previewer, true, $content->getVersion());
-						echo "<td><div class=\"list-action\">";
-						$this->printDeleteItemButton($item, getMLText('transmittalitem_removed'));
-						if($latestcontent->getVersion() != $content->getVersion())
-							$this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion())));
-						echo "</div></td>";
+						echo "<td colspan=\"5\">content ist weg</td>";
 						echo "</tr>";
 					}
 				}
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index b2f7bac06..afe3cece4 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -123,6 +123,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$cachedir = $this->params['cachedir'];
 		$previewwidthlist = $this->params['previewWidthList'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
+		$previewconverters = $this->params['previewConverters'];
 		$checkoutdir = $this->params['checkOutDir'];
 		$documentid = $document->getId();
 		$currenttab = $this->params['currenttab'];
@@ -387,6 +388,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</ul>";
 		*/
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+		$previewer->setConverters($previewconverters);
 		$previewer->createPreview($latestContent);
 		if ($file_exists) {
 			if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes)) {
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index d54c58a76..85d444516 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -86,6 +86,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		$enableRecursiveCount = $this->params['enableRecursiveCount'];
 		$maxRecursiveCount = $this->params['maxRecursiveCount'];
 		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
 
 		$folderid = $folder->getId();
 
@@ -102,6 +103,9 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			$this->pageNavigation($this->getFolderPathHTML($folder), "view_folder", $folder);
 		}
 
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer->setConverters($previewconverters);
+
 		echo $this->callHook('preContent');
 
 		echo "<div class=\"row-fluid\">\n";
@@ -140,7 +144,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 
 			echo $this->callHook('leftContent');
 
-			if ($enableClipboard) $this->printClipboard($this->params['session']->getClipboard());
+			if ($enableClipboard) $this->printClipboard($this->params['session']->getClipboard(), $previewer);
 
 			echo "</div>\n";
 		}
@@ -271,8 +275,6 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			}
 		}
 
-
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
 		foreach($documents as $document) {
 			$txt = $this->callHook('documentListItem', $document, $previewer);
 			if(is_string($txt))
diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php
index 5fa086aa1..ab52db5f0 100644
--- a/views/bootstrap/class.WorkflowSummary.php
+++ b/views/bootstrap/class.WorkflowSummary.php
@@ -36,6 +36,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -49,6 +50,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 		$workflowStatus = $user->getWorkflowStatus();
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer->setConverters($previewconverters);
 
 		$printheader=true;
 		$iRev = array();

From 9841c571b683eab4c4537b12b61125bca2495729 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Jun 2015 19:54:44 +0200
Subject: [PATCH 0249/2006] new version 1.1.4

---
 SeedDMS_Preview/package.xml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 844178d9c..123aa130e 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -14,8 +14,8 @@
  <date>2015-02-13</date>
  <time>20:29:39</time>
  <version>
-  <release>1.1.3</release>
-  <api>1.1.0</api>
+  <release>1.1.4</release>
+  <api>1.1.4</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-preview images will also be recreated if the object this image belongs is of newer date than the image itself. This happens if versions are being deleted and than a new version is uploaded. Because the new version will get the version number of the old version, it will also take over the old preview image.Comparing the creation date of the image with the object detects this case.
+Converters to create preview images are no longer fixed. Those which has been hardcoded before remain the predefined converters, but they can also be changed.
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -115,5 +115,21 @@ add converters for .tar.gz, .ps, .txt
 create fixed width image with proportional height
    </notes>
   </release>
+  <release>
+   <date>2015-02-13</date>
+   <time>20:29:39</time>
+   <version>
+    <release>1.1.3</release>
+    <api>1.1.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+preview images will also be recreated if the object this image belongs is of newer date than the image itself. This happens if versions are being deleted and than a new version is uploaded. Because the new version will get the version number of the old version, it will also take over the old preview image.Comparing the creation date of the image with the object detects this case.
+   </notes>
+  </release>
  </changelog>
 </package>

From 2c63ab3caf148fd143f58cc304f37049750c3f08 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Jun 2015 21:48:46 +0200
Subject: [PATCH 0250/2006] add ukrainian

---
 languages/uk_UA/lang.inc | 1345 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 1345 insertions(+)
 create mode 100644 languages/uk_UA/lang.inc

diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
new file mode 100644
index 000000000..160f9c2ce
--- /dev/null
+++ b/languages/uk_UA/lang.inc
@@ -0,0 +1,1345 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2011-2013 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+//    Translators: Admin (1128)
+
+$text = array(
+'accept' => 'Прийняти',
+'access_denied' => 'Доступ заборонений',
+'access_inheritance' => 'Наслідування доступу',
+'access_mode' => 'Режим доступу',
+'access_mode_all' => 'Повний доступ',
+'access_mode_none' => 'Немає доступу',
+'access_mode_read' => 'Доступ для читання',
+'access_mode_readwrite' => 'Доступ для чтення и запису',
+'access_permission_changed_email' => 'Доступ змінено',
+'access_permission_changed_email_body' => 'Змінений доступ
+Назва: [name]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'access_permission_changed_email_subject' => '[sitename]: змінений доступ для «[name]»',
+'according_settings' => 'відповідні налаштування',
+'action' => 'Дія',
+'actions' => 'Дії',
+'action_approve' => 'Затвердити',
+'action_complete' => 'Завершити',
+'action_is_complete' => 'Завершено',
+'action_is_not_complete' => 'Не завершено',
+'action_reject' => 'Відхилити',
+'action_review' => 'Рецензувати',
+'action_revise' => 'На ревізію',
+'add' => 'Додати',
+'add_approval' => 'Затвердити',
+'add_document' => 'Додати документ',
+'add_document_link' => 'Додати ссилку',
+'add_document_notify' => 'Призначити сповіщення',
+'add_doc_reviewer_approver_warning' => 'Документ отримує статус <b>затверджений</b> автоматично, якщо не призначені ні рецензент, ні затверджувач.',
+'add_doc_workflow_warning' => '<b>Примітка:</b> документи затверджуються автоматично, якщо їм не призначений процес.',
+'add_event' => 'Додати подію',
+'add_group' => 'Додати групу',
+'add_member' => 'Додати члена',
+'add_multiple_documents' => 'Додати документи',
+'add_multiple_files' => 'Додати кілька файлів (назва файлу буде назвою документу)',
+'add_receipt' => 'Підтвердити отримання',
+'add_review' => 'Рецензувати',
+'add_revision' => 'Додати підтвердження',
+'add_subfolder' => 'Додати підкаталог',
+'add_to_clipboard' => 'Додати до буферу',
+'add_to_transmittal' => 'Додати до передачі',
+'add_transmittal' => 'Додати передачу',
+'add_user' => 'Додати користувача',
+'add_user_to_group' => 'Додати користувача до групи',
+'add_workflow' => 'Додати процес',
+'add_workflow_action' => 'Додати дію процесу',
+'add_workflow_state' => 'Додати статус процесу',
+'admin' => 'Адміністратор',
+'admin_tools' => 'Адміністрування',
+'all' => 'Всі',
+'all_categories' => 'Всі категорії',
+'all_documents' => 'Всі документи',
+'all_pages' => 'Всі сторінки',
+'all_users' => 'Всі користувачі',
+'already_subscribed' => 'Вже підписаний',
+'and' => 'і',
+'apply' => 'Застосувати',
+'approval_deletion_email' => 'Запит на підтвердження скасовано',
+'approval_deletion_email_body' => 'Запит на підтвердження скасовано
+Назва: [name]
+Версія: [version]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'approval_deletion_email_subject' => '[sitename]: [name] - Запит на підтвердження скасовано',
+'approval_file' => '',
+'approval_group' => 'Група затверджувачів',
+'approval_log' => 'Звіт затвердження',
+'approval_request_email' => 'Запит на затвердження',
+'approval_request_email_body' => 'Запит на затвердження
+Назва: [name]
+Версія: [version]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'approval_request_email_subject' => '[sitename]: запит на затвердження «[name]»',
+'approval_status' => 'Статус затвердження',
+'approval_submit_email' => 'Затверджено документ',
+'approval_submit_email_body' => 'Затвердження документу
+Назва: [name]
+Версія: [version]
+Батьківський каталог: [folder_path]
+Статус: [status]
+Коментар: [comment]
+Користувач: [username]
+URL: [url]',
+'approval_submit_email_subject' => '[sitename]: [name] - Затверджено',
+'approval_summary' => 'Підсумки затвердження',
+'approval_update_failed' => 'Виникла помилка при зміні статусу затвердження',
+'approvers' => 'Затверджувачі',
+'approver_already_assigned' => 'Користувач вже призначений затверджувачем',
+'approver_already_removed' => 'Користувач вже виключений з процесу затвердження або вже затвердив документ',
+'april' => 'Квітень',
+'archive_creation' => 'Створити архів',
+'archive_creation_warning' => 'Ця операція створить архів, який містить всі каталоги. Після створення архів буде збережений в каталозі даних сервера.<br><b>Увага:</b> архив, який створено в читабельному вигляді, буде непридатний в якості резервної копії для відновлення!',
+'ar_EG' => 'Arabic',
+'assign_approvers' => 'Призначити затверджувачів',
+'assign_reviewers' => 'Призначити рецензентів',
+'assign_user_property_to' => 'Призначити властивості користувача',
+'assumed_released' => 'Затверджено',
+'attrdef_exists' => 'Визначення атрибуту вже існує',
+'attrdef_in_use' => 'Визначення цього атрибуту вже використовується',
+'attrdef_management' => 'Керування визначенням атрибутів',
+'attrdef_maxvalues' => 'Макс. кількість значень',
+'attrdef_minvalues' => 'Мін. кількість значень',
+'attrdef_min_greater_max' => 'Мінімальна кількість значень більша за максимальну кількість значень',
+'attrdef_multiple' => 'Декілька значень',
+'attrdef_must_be_multiple' => 'Атрибут повинен мати кілька значень, але кілька значень не встановлено',
+'attrdef_name' => 'Назва',
+'attrdef_noname' => 'Відсутня назва для визначення атрибуту',
+'attrdef_objtype' => 'Тип об\'єкту',
+'attrdef_regex' => 'Регулярний вираз',
+'attrdef_type' => 'Тип',
+'attrdef_type_boolean' => 'Логічне',
+'attrdef_type_email' => 'Електронна пошта',
+'attrdef_type_float' => 'З плаваючою комою',
+'attrdef_type_int' => 'Ціле',
+'attrdef_type_string' => 'Текстовий рядок',
+'attrdef_type_url' => 'Ссилка',
+'attrdef_valueset' => 'Набір значень',
+'attributes' => 'Атрибути',
+'attribute_changed_email_body' => 'Змінено атрибут
+Документ: [name]
+Версія: [version]
+Атрибут: [attribute]
+Батьківський каталог: [folder_path]
+Пользователь: [username]
+URL: [url]',
+'attribute_changed_email_subject' => '[sitename]: змінено атрибут «[name]»',
+'attribute_count' => 'Використано разів',
+'attribute_value' => 'Значення атрибута',
+'attr_malformed_email' => 'Значення \'[value]\' атрибуту \'[attrname]\' не є правильною адресою email.',
+'attr_malformed_url' => 'Значення \'[value]\' атрибуту \'[attrname]\' не є правильним ULR',
+'attr_max_values' => 'Досягнуто максимальної кількості значенть атрибуту [attrname].',
+'attr_min_values' => 'Не досягнуто мінімальної кількості значень атрибуту [attrname]',
+'attr_no_regex_match' => 'Значення атрибуту не відповідає регулярному виразу',
+'at_least_n_users_of_group' => '[number_of_users] корист. групи [group]',
+'august' => 'Серпень',
+'authentication' => 'Авторизація',
+'author' => 'Автор',
+'automatic_status_update' => 'Автоматична зміна статусу',
+'back' => 'Назад',
+'backup_list' => 'Список резервних копій',
+'backup_log_management' => 'Резервні копії і журнали',
+'backup_remove' => 'Видалити резервну копію',
+'backup_tools' => 'Резервні копії',
+'between' => 'між',
+'bg_BG' => 'Bulgarian',
+'browse' => 'Вибрати',
+'calendar' => 'Календарь',
+'calendar_week' => 'Тиждень',
+'cancel' => 'Відміна',
+'cannot_assign_invalid_state' => 'Неможливо змінити застарілий чи відхилений документ',
+'cannot_change_final_states' => 'Не можна змінювати стату відхиленого, застарілого документа або документа, що очікує на рецензію чи затвердження',
+'cannot_delete_user' => 'Неможливо видалити користувача',
+'cannot_delete_yourself' => 'Не можна видалити себе',
+'cannot_move_root' => 'Не можна переміщати кореневий каталог',
+'cannot_retrieve_approval_snapshot' => 'Неможливо отримати знімок затвердження для цього документа',
+'cannot_retrieve_review_snapshot' => 'Неможливо отримати знімок рецензування для цього документа',
+'cannot_rm_root' => 'Не можна видаляти кореневий каталог',
+'categories' => 'Категорії',
+'category' => 'Категорія',
+'category_exists' => 'Категорія існує',
+'category_filter' => 'Лише категорії',
+'category_in_use' => 'Ця категорія використовується для документів',
+'category_noname' => 'Введіть назву категорії',
+'ca_ES' => 'Catalan',
+'change_assignments' => 'Змінити призначення',
+'change_password' => 'Змінити пароль',
+'change_password_message' => 'Пароль змінено',
+'change_recipients' => 'Змінити перелік одержувачів',
+'change_revisors' => 'Змінити перелік рецензентів',
+'change_status' => 'Змінити статус',
+'charts' => 'Діаграми',
+'chart_docsaccumulated_title' => 'Кількість документів',
+'chart_docspercategory_title' => 'Документів по категоріях',
+'chart_docspermimetype_title' => 'Документів по типах',
+'chart_docspermonth_title' => 'Документів на місяць',
+'chart_docsperstatus_title' => 'Документів за статусом',
+'chart_docsperuser_title' => 'Документы по користувачах',
+'chart_selection' => 'Виберіть діаграму',
+'chart_sizeperuser_title' => 'Зайнятого простору по користувачах',
+'checkedout_file_has_different_version' => 'Отримана версія документу не відповідає останній його версії. Завантаження не оновить документ.',
+'checkedout_file_has_disappeared' => 'Файл отримуваного документа не знайдено. Завантаження неможливе.',
+'checkedout_file_is_unchanged' => 'Документ не змінено. Завантаження неможливе',
+'checkin_document' => 'Отримання',
+'checkout_document' => 'Завантаження',
+'checkout_is_disabled' => 'Завантаження відключене',
+'choose_attrdef' => 'Виберіть атрибут',
+'choose_category' => 'Виберіть категорію',
+'choose_group' => 'Виберіть групу',
+'choose_target_category' => 'Виберіть категорію',
+'choose_target_document' => 'Виберіть групу',
+'choose_target_file' => 'Виберіть файл',
+'choose_target_folder' => 'Виберіть каталог',
+'choose_user' => 'Виберіть користувача',
+'choose_workflow' => 'Виберіть процес',
+'choose_workflow_action' => 'Виберіть дію процесу',
+'choose_workflow_state' => 'Виберіть статус процесу',
+'clear_clipboard' => 'Очистити буфер обміну',
+'clipboard' => 'Буфер обміну',
+'close' => 'Закрити',
+'comment' => 'Коментарій',
+'comment_changed_email' => 'Повідомлення про зміну коментаря',
+'comment_for_current_version' => 'Коментарій версії',
+'confirm_create_fulltext_index' => 'Так, перестворити повнотекстовий індекс!',
+'confirm_pwd' => 'Підтвердіть пароль',
+'confirm_rm_backup' => 'Видалити файл «[arkname]»?<br>Дія <b>необоротна</b>',
+'confirm_rm_document' => 'Видалити документ «[documentname]»?<br>Дія <b>необоротна</b>',
+'confirm_rm_dump' => 'Видалити файл «[dumpname]»?<br>Дія <b>необоротна</b>',
+'confirm_rm_event' => 'Видалити подію «[name]»?<br>Дія <b>необоротна</b>',
+'confirm_rm_file' => 'Видалити файл «[name]» документа «[documentname]»?<br>Дія <b>необоротна</b>',
+'confirm_rm_folder' => 'Видалити каталог «[foldername]» и его содержимое?<br>Дія <b>необоротна</b>',
+'confirm_rm_folder_files' => 'Видалити в каталозі «[foldername]» всі файли і підкаталоги?<br>Дія <b>необоротна</b>',
+'confirm_rm_group' => 'Видалити групу «[groupname]»?<br>Дія <b>необоротна</b>',
+'confirm_rm_log' => 'Видалити журнал «[logname]»?<br>Дія <b>необоротна</b>',
+'confirm_rm_transmittalitem' => 'Підтвердити видалення',
+'confirm_rm_user' => 'Видалити користувача «[username]»?<br>Дія <b>необоротна</b>',
+'confirm_rm_version' => 'Видалити версію [version] документа «[documentname]»?<br>Дія <b>необоротна</b>',
+'confirm_update_transmittalitem' => 'Підтвердити оновлення',
+'content' => 'Вміст',
+'continue' => 'Продовжити',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
+'copied_to_checkout_as' => 'Файл скопійовано в середовище скачування як',
+'create_fulltext_index' => 'Створити повнотекстовий індекс',
+'create_fulltext_index_warning' => 'Ви хочете перестворити повнотекстовий індекс. Це займе деякий час і знизить продуктивність. Продовжити?',
+'creation_date' => 'Створено',
+'cs_CZ' => 'Czech',
+'current_password' => 'Поточний пароль',
+'current_quota' => 'Поточна квота',
+'current_state' => 'Поточний стан',
+'current_version' => 'Поточна версія',
+'daily' => 'Щоденно',
+'databasesearch' => 'Пошук по БД',
+'date' => 'Дата',
+'days' => 'дні',
+'december' => 'Грудень',
+'default_access' => 'Доступ по замовчуванню',
+'default_keywords' => 'Доступні ключові слова',
+'definitions' => 'Визначення',
+'delete' => 'Видалити',
+'details' => 'Деталі',
+'details_version' => 'Датальна інформація про версію: [version]',
+'de_DE' => 'German',
+'disclaimer' => 'Авторизована зона. Несанкціонований доступ переслідується згідно національного законодавства.',
+'discspace' => 'Дисковий простір',
+'document' => 'Документ',
+'documents' => 'док.',
+'documents_checked_out_by_you' => 'Документи на Обробці у вас',
+'documents_in_process' => 'Документи в роботі',
+'documents_locked_by_you' => 'Документи, які ви заблокували',
+'documents_only' => 'лише документи',
+'documents_to_approve' => 'Докумети, які чекають вашого затвердження',
+'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
+'documents_to_review' => 'Документи, які чекають вашої рецензії',
+'documents_to_revise' => 'Документи для повторного розгляду',
+'documents_user_requiring_attention' => 'Ваші документи, які потребують уваги',
+'document_already_checkedout' => 'Цей документ вже на обробці',
+'document_already_locked' => 'Цей документ вже заблокований',
+'document_comment_changed_email' => 'Змінено коментар',
+'document_comment_changed_email_body' => 'Змінено коментар
+Документ: [name]
+Коментар: [new_comment]
+Попередній коментар: [old_comment]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'document_comment_changed_email_subject' => '[sitename]: змінено коментар «[name]»',
+'document_deleted' => 'Документ видалено',
+'document_deleted_email' => 'Документ видалено',
+'document_deleted_email_body' => 'Видалено докмент
+Документ: [name]
+Батьківський каталог: [folder_path]
+Користувач: [username]',
+'document_deleted_email_subject' => '[sitename]: видалено документ «[name]»',
+'document_duplicate_name' => 'Документ з такою назвою вже існує',
+'document_has_no_workflow' => 'Документові не призначено процес',
+'document_infos' => 'Інформація про документ',
+'document_is_checked_out' => 'Документ на опрацюванні',
+'document_is_not_locked' => 'Документ не заблокований',
+'document_link_by' => 'Пов\'язаний',
+'document_link_public' => 'Публічний',
+'document_moved_email' => 'Документ переміщено',
+'document_moved_email_body' => 'Переміщено документ
+Документ: [name]
+Новий каталог: [new_folder_path]
+Попередній каталог: [old_folder_path]
+Користувач: [username]
+URL: [url]',
+'document_moved_email_subject' => '[sitename]: переміщено документ «[name]»',
+'document_not_checkedout' => 'документ не на опрацюванні',
+'document_renamed_email' => 'Документ переназвано',
+'document_renamed_email_body' => 'Переназвано документ
+Документ: [name]
+Батьківський каталог: [folder_path]
+Попередня назва: [old_name]
+Користувач: [username]
+URL: [url]',
+'document_renamed_email_subject' => '[sitename]: переназвано документ «[name]»',
+'document_status_changed_email' => 'Статус документа змінено',
+'document_status_changed_email_body' => 'Змінено статус документа
+Документ: [name]
+Статус: [status]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'document_status_changed_email_subject' => '[sitename]: змінено статус документа «[name]»',
+'document_title' => 'Документ [documentname]',
+'document_updated_email' => 'Документ оновлено',
+'document_updated_email_body' => 'Оновлено документ
+Документ: [name]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+Коментарій: [comment]
+Коментарій версії: [version_comment]
+URL: [url]',
+'document_updated_email_subject' => '[sitename]: оновлено документ «[name]»',
+'does_not_expire' => 'Без терміну виконання',
+'does_not_inherit_access_msg' => 'Наслідувати рівень доступу',
+'download' => 'Завантажити',
+'do_object_repair' => 'Виправити всі каталоги і документи',
+'do_object_setchecksum' => 'Встановити контрольну суму',
+'do_object_setfilesize' => 'Встановити розмір файлу',
+'do_object_unlink' => 'Видалити версію документа',
+'draft' => '',
+'draft_pending_approval' => '<b>Чорнетка</b> — Очікує на затвердження',
+'draft_pending_review' => '<b>Чорнетка</b> — Очікує на рецензію',
+'drag_icon_here' => 'Перетягніть сюди значок документа чи каталога',
+'dropfolder_file' => 'Файл з прохідного каталога',
+'dropupload' => 'Швидке завантаження',
+'drop_files_here' => 'Перемістіть файли сюди',
+'dump_creation' => 'Створити дамп БД',
+'dump_creation_warning' => 'Ця операція створить дамп бази даних. Після створення файл буде збережено в каталозі даних сервера.',
+'dump_list' => 'Існуючі дампи',
+'dump_remove' => 'Видалити дамп',
+'duplicate_content' => '',
+'edit' => 'Змінити',
+'edit_attributes' => 'Змінити атрибути',
+'edit_comment' => 'Змінити коментар',
+'edit_default_keywords' => 'Змінити ключові слова',
+'edit_document_access' => 'Змінити доступ',
+'edit_document_notify' => 'Список сповіщення документа',
+'edit_document_props' => 'Змінити документ',
+'edit_event' => 'Змінити подію',
+'edit_existing_access' => 'Змінити доступ',
+'edit_existing_notify' => 'Змінити сповіщення',
+'edit_folder_access' => 'Змінити доступ',
+'edit_folder_notify' => 'Список сповіщення каталогу',
+'edit_folder_props' => 'Змінити каталог',
+'edit_group' => 'Змінити групу',
+'edit_transmittal_props' => 'Редагувати налаштування перенесення',
+'edit_user' => 'Редагувати користувача',
+'edit_user_details' => 'Змінити дані користувача',
+'email' => 'E-mail',
+'email_error_title' => 'Не вказано e-mail',
+'email_footer' => 'Ви можете змінити e-mail використовуючи меню «Мій обліковий запис».',
+'email_header' => 'Це автоматичне сповіщення сервера документообігу',
+'email_not_given' => 'Введіть справжній e-mail.',
+'empty_folder_list' => 'Немає документів або каталогів',
+'empty_notify_list' => 'Немає записів',
+'en_GB' => 'English (GB)',
+'equal_transition_states' => 'Однакові початковий і кінцевий статуси',
+'error' => 'Помилка',
+'error_no_document_selected' => 'Немає вибраних документів',
+'error_no_folder_selected' => 'Немає вибраних каталогів',
+'error_occured' => 'Виникла помилка',
+'es_ES' => 'Spanish',
+'event_details' => 'Інформація про подію',
+'expired' => 'Термін виконання вийшов',
+'expires' => 'Термін виконання виходить',
+'expiry_changed_email' => 'Дату терміну виконання змінено',
+'expiry_changed_email_body' => 'Змінено дату терміну виконання
+Документ: [name]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'expiry_changed_email_subject' => '[sitename]: зміна дати терміну виконання для «[name]»',
+'export' => '',
+'extension_manager' => 'Керування розширеннями',
+'february' => 'Лютий',
+'file' => 'Файл',
+'files' => 'Файли',
+'files_deletion' => 'Видалити файли',
+'files_deletion_warning' => 'Ця операція видалить всі файли у всіх каталогах. Інформація про версії залишиться доступною',
+'file_size' => 'Розмір',
+'filter_for_documents' => 'Додатковий фільтр по документах',
+'filter_for_folders' => 'Додатковий фільтр по каталогах',
+'folder' => 'Каталог',
+'folders' => 'кат.',
+'folders_and_documents_statistic' => 'Огляд вмісту',
+'folder_comment_changed_email' => 'Коментар змінено',
+'folder_comment_changed_email_body' => 'Змінено коментар каталога
+Каталог: [name]
+Коментар: [new_comment]
+Попередній коментар: [old_comment]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'folder_comment_changed_email_subject' => '[sitename]: змінено коментар каталога «[folder]»',
+'folder_contents' => 'Вміст каталога',
+'folder_deleted_email' => 'Каталог видалено',
+'folder_deleted_email_body' => 'Видалено каталог
+Каталог: [name]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'folder_deleted_email_subject' => '[sitename]: видалено каталог «[name]»',
+'folder_infos' => 'Інформація про каталог',
+'folder_moved_email' => 'Каталог переміщено',
+'folder_moved_email_body' => 'Переміщено каталог
+Каталог: [name]
+Нове розташування: [new_folder_path]
+Попереднє розташування: [old_folder_path]
+Користувач: [username]
+URL: [url]',
+'folder_moved_email_subject' => '[sitename]: переміщено каталог «[name]»',
+'folder_renamed_email' => 'Каталог перейменовано',
+'folder_renamed_email_body' => 'Каталог перейменовано
+Каталог: [name]
+Батьківський каталог: [folder_path]
+Попередня назва: [old_name]
+Користувач: [username]
+URL: [url]',
+'folder_renamed_email_subject' => '[sitename]: перейменовано каталог «[name]»',
+'folder_title' => 'Каталог [foldername]',
+'friday' => 'П\'ятниця',
+'friday_abbr' => 'Пт',
+'from' => 'Від',
+'fr_FR' => 'French',
+'fullsearch' => 'Повнотекстовий пошук',
+'fullsearch_hint' => 'Використовувати повнотекстовий індекс',
+'fulltext_info' => 'Інформація про повнотекстовий індекс',
+'global_attributedefinitions' => 'Атрибути',
+'global_default_keywords' => 'Глобальні ключові слова',
+'global_document_categories' => 'Категорії',
+'global_workflows' => 'Процеси',
+'global_workflow_actions' => 'Дії процесів',
+'global_workflow_states' => 'Статуси процесів',
+'group' => 'Група',
+'groups' => 'Групи',
+'group_approval_summary' => 'Підсумки затвердження групи',
+'group_exists' => 'Група вже існує',
+'group_management' => 'Керування групами',
+'group_members' => 'Члени групи',
+'group_receipt_summary' => 'Підсумки отримання групи',
+'group_review_summary' => 'Підсумки рецензування групи',
+'guest_login' => 'Увійти як гість',
+'guest_login_disabled' => 'Гостьовий вхід відключено',
+'help' => 'Допомога',
+'home_folder' => 'Домашній каталог',
+'hourly' => 'Щогодини',
+'hours' => 'години',
+'human_readable' => 'Зрозумілий людині архів',
+'hu_HU' => 'Hungarian',
+'id' => 'Ідентифікатор',
+'identical_version' => 'Нова версія ідентична поточній.',
+'include_content' => '',
+'include_documents' => 'Включно з документами',
+'include_subdirectories' => 'Включно з підкаталогами',
+'index_converters' => 'Індексування документів',
+'index_folder' => 'Каталог індексу',
+'individuals' => 'Користувачі',
+'inherited' => 'успадкований',
+'inherits_access_copy_msg' => 'Скопіювати успадкований список',
+'inherits_access_empty_msg' => 'Почати з порожнього списку доступу',
+'inherits_access_msg' => 'Доступ успадковано.',
+'internal_error' => 'Внутрішня помилка',
+'internal_error_exit' => 'Внутрішня помилка. Неможливо виконати запит. Завершення.',
+'invalid_access_mode' => 'Невірний рівень доступу',
+'invalid_action' => 'Невірна дія',
+'invalid_approval_status' => 'Невірний статус затвердження',
+'invalid_create_date_end' => 'Невірна кінцева дата діапазону дати створення',
+'invalid_create_date_start' => 'Невірна початкова дата діапазону дати створення',
+'invalid_doc_id' => 'Невірний ідентифікатор документа',
+'invalid_file_id' => 'Невірний ідентифікатор файлу',
+'invalid_folder_id' => 'Невірний ідентифікатор каталога',
+'invalid_group_id' => 'Невірний ідентифікатор групи',
+'invalid_link_id' => 'Невірний ідентифікатор ссилки',
+'invalid_request_token' => 'Невірне позначення запиту',
+'invalid_review_status' => 'Невірний статус рецензування',
+'invalid_sequence' => 'Невірне значення позиції',
+'invalid_status' => 'Невірний статус документа',
+'invalid_target_doc_id' => 'Невірний ідентифікатор цільового документа',
+'invalid_target_folder' => 'Невірний ідентифікатор цільового призначення',
+'invalid_user_id' => 'Невірний ідентифікатор користувача',
+'invalid_version' => 'Невірна версія документа',
+'in_revision' => 'В процесі ревізії',
+'in_workflow' => 'В процесі',
+'is_disabled' => 'Відключити обліковий запис',
+'is_hidden' => 'Не відображати в<br/>переліку користувачів',
+'it_IT' => 'Italian',
+'january' => 'Січень',
+'js_no_approval_group' => 'Виберіть групу затвердження',
+'js_no_approval_status' => 'Виберіть статус затвердження',
+'js_no_comment' => 'Немає коментаря',
+'js_no_email' => 'Введіть свій e-mail',
+'js_no_file' => 'Виберіть файл',
+'js_no_keywords' => 'Вкажіть ключові слова',
+'js_no_login' => 'Введіть логін',
+'js_no_name' => 'Введіть ім\'я',
+'js_no_override_status' => 'Виберіть новий [override] статус',
+'js_no_pwd' => 'Введіть пароль',
+'js_no_query' => 'Введіть запит',
+'js_no_review_group' => 'Виберіть групу рецензентів',
+'js_no_review_status' => 'Вибіріть статус рецензії',
+'js_pwd_not_conf' => 'Пароль і його підтвердження не співпадають',
+'js_select_user' => 'Виберіть користувача',
+'js_select_user_or_group' => 'Виберіть користувача або групу',
+'july' => 'Липень',
+'june' => 'Червень',
+'keep' => 'Не змінювати',
+'keep_doc_status' => 'Зберегти статус документа',
+'keywords' => 'Ключові слова',
+'keyword_exists' => 'Ключове слово існує',
+'language' => 'Мова',
+'lastaccess' => 'Останній доступ',
+'last_update' => 'Останнє оновлення',
+'legend' => 'Позначення',
+'librarydoc' => 'Документ з бібліотеки',
+'linked_documents' => 'Пов\'язані документи',
+'linked_files' => 'Пов\'язані файли',
+'link_alt_updatedocument' => 'Для завантаження файлів, які перевищують обмеження розміру, використовуйте <a href="%s">інший метод</a>.',
+'local_file' => 'Локальний файл',
+'locked_by' => 'Заблоковано',
+'lock_document' => 'Заблокувати',
+'lock_message' => 'Документ заблокував користувач <a href="mailto:[email]">[username]</a>. Тільки користувачі, які мають відповідні права, можуть його розблокувати.',
+'lock_status' => 'Статус',
+'login' => 'Логін',
+'login_disabled_text' => 'Ваш обліковий запис заблоковано, можливо, через кілька невдалих спроб входу.',
+'login_disabled_title' => 'Обліковий запис заблоковано',
+'login_error_text' => 'Помилка входу. Перевірте логін і пароль.',
+'login_error_title' => 'Помилка входу',
+'login_not_given' => 'Не вказано користувача',
+'login_ok' => 'Вхід успішний',
+'logout' => 'Вихід',
+'log_management' => 'Керування журналами',
+'manager' => 'Менеджер',
+'manager_of_group' => 'Менеджер групи',
+'mandatory_approvergroups' => 'Обов\'язкові групи затвержувачів',
+'mandatory_approvergroup_no_access' => 'Обов\'язкові групи затвержувачів «[group]» не має достатніх прав доступу.',
+'mandatory_approvers' => 'Обов\'язкові затвержувачі',
+'mandatory_approver_no_access' => 'Обов\'язковий затвержувач «[user]» не має достатніх прав доступу.',
+'mandatory_reviewergroups' => 'Обов\'язкові групи рецензентів',
+'mandatory_reviewergroup_no_access' => 'Обов\'язкова група рецензентів «[group]» не має достатніх прав доступу.',
+'mandatory_reviewers' => 'Обов\'язкові рецензенти',
+'mandatory_reviewer_no_access' => 'Обов\'язковий рецензент «[user]» не має достатніх прав доступу.',
+'march' => 'Березень',
+'max_upload_size' => 'Обмеження розміру файлу',
+'may' => 'Травень',
+'mimetype' => 'MIME-тип',
+'minutes' => 'хвилини',
+'misc' => 'Інше',
+'missing_checksum' => 'Відсутня контрольна сума',
+'missing_filesize' => 'Відсутній розмір файлу',
+'missing_transition_user_group' => 'Відсутній користувач/група для зміни.',
+'monday' => 'Понеділок',
+'monday_abbr' => 'Пн',
+'monthly' => 'Щомісяця',
+'month_view' => 'Місяць',
+'move' => 'Перемістити',
+'move_clipboard' => 'Перемістити буфер обміну',
+'move_document' => 'Перемістити документ',
+'move_folder' => 'Перемістити каталог',
+'my_account' => 'Мій обліковий запис',
+'my_documents' => 'Мої документи',
+'my_transmittals' => 'Мої перенесення',
+'name' => 'Назва',
+'needs_workflow_action' => 'Цей документ потребує вашої уваги. Див. вкладку «Процес».',
+'never' => 'ніколи',
+'new' => 'Новий',
+'new_attrdef' => 'Додати визначення атрибуту',
+'new_default_keywords' => 'Додати ключові слова',
+'new_default_keyword_category' => 'Додати категорію ключових слів',
+'new_document_category' => 'Додати категорію',
+'new_document_email' => 'Новий документ',
+'new_document_email_body' => 'Новий документ
+Документ: [name]
+Батьківський каталог: [folder_path]
+Коментар: [comment]
+Коментар версії: [version_comment]
+Користувач: [username]
+URL: [url]',
+'new_document_email_subject' => '[sitename]: новий документ в каталозі «[folder_name]»',
+'new_file_email' => 'Новий додаток',
+'new_file_email_body' => 'Новий додаток: [name]
+Документ: [document]
+Коментар: [comment]
+Користувач: [username]
+URL: [url]',
+'new_file_email_subject' => '[sitename]: новий додаток до документа «[document]»',
+'new_folder' => 'Новий каталог',
+'new_password' => 'Новий пароль',
+'new_subfolder_email' => 'Новий каталог',
+'new_subfolder_email_body' => 'Новий каталог
+Назва: [name]
+Батьківський каталог: [folder_path]
+Коментар: [comment]
+Користувач: [username]
+URL: [url]',
+'new_subfolder_email_subject' => '[sitename]: новий каталог «[name]»',
+'new_user_image' => 'Нове зображення',
+'next_state' => 'Новий стан',
+'nl_NL' => 'Dutch',
+'no' => 'Ні',
+'notify_added_email' => 'Вас додали до списку сповіщення',
+'notify_added_email_body' => 'Вас додали до списку сповіщення
+Назва: [name]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'notify_added_email_subject' => '[sitename]: вас додали до списку сповіщення для «[name]»',
+'notify_deleted_email' => 'Вас видалено зі списку сповіщення',
+'notify_deleted_email_body' => 'Вас видалено зі списку сповіщення
+Назва: [name]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'notify_deleted_email_subject' => '[sitename]: вас видалено зі списку сповіщення для «[name]»',
+'november' => 'Листопад',
+'now' => 'зараз',
+'no_action' => 'Дій не потрібно',
+'no_approval_needed' => 'Затвердження не потрібно',
+'no_attached_files' => 'Немає додатків',
+'no_current_version' => 'Ви використовуєте застарілу версію SeedDMS. Остання версія [latestversion].',
+'no_default_keywords' => 'Немає ключових слів',
+'no_docs_checked_out' => 'Немає документів на опрацюванні',
+'no_docs_locked' => 'Немає заблокованих документів',
+'no_docs_to_approve' => 'Немає документів, які потребують затвердження',
+'no_docs_to_look_at' => 'Немає документів, які потребують уваги',
+'no_docs_to_receipt' => 'Немає документів, які потребують підтвердження',
+'no_docs_to_review' => 'Немає документів, які потребують рецензії',
+'no_docs_to_revise' => 'Немає документів, які потребують повторного опрацювання',
+'no_email_or_login' => 'Немає електронної пошти або логіна',
+'no_fulltextindex' => 'Повнотекстовий індекс недоступний',
+'no_groups' => 'Немає груп',
+'no_group_members' => 'Група не має членів',
+'no_linked_files' => 'Немає пов\'язаних документів',
+'no_previous_versions' => 'Немає попередніх версій',
+'no_review_needed' => 'Рецензія не потрібна',
+'no_revision_planed' => 'Повторне опрацювання не заплановане',
+'no_update_cause_locked' => 'Ви не можете оновити документ. Зв\'яжіться з користувачем, який його заблокував.',
+'no_user_image' => 'Зображення не знайдено',
+'no_version_check' => 'Перевірка наявності нової версії SeedDMS не відбулася! Це може бути спричинено налаштуванням allow_url_fopen = 0 у конфігурації вашого php.',
+'no_workflow_available' => 'Немає доступних процесів',
+'objectcheck' => 'Перевірка каталога чи документа',
+'obsolete' => 'Застарів',
+'october' => 'Жовтень',
+'old' => 'Старий',
+'only_jpg_user_images' => 'Дозволені лише .jpg-зображення',
+'order_by_sequence_off' => 'Можливість ручного сортування відключена в налаштуваннях. Якщо ви хочете використовувати цю функцію, ви повинні знову її включити.',
+'original_filename' => 'Початкова назва файлу',
+'owner' => 'Власник',
+'ownership_changed_email' => 'Власника змінено',
+'ownership_changed_email_body' => 'Змінено власника
+Документ: [name]
+Каталог: [folder_path]
+Попередній власник: [old_owner]
+Новий власник: [new_owner]
+Користувач: [username]
+URL: [url]',
+'ownership_changed_email_subject' => '[sitename]: змінено власника «[name]»',
+'password' => 'Пароль',
+'password_already_used' => 'Пароль вже використовується',
+'password_expiration' => 'Термін використання паролю',
+'password_expiration_text' => 'Вийшов термін використання вашого паролю. Ви повинні вибрати новий пароль для того, щоб продовжити використовувати SeedDMS.',
+'password_expired' => 'Пароль протермінований',
+'password_expires_in_days' => 'Термін використання паролю виходить через',
+'password_forgotten' => 'Втрачено пароль',
+'password_forgotten_email_body' => 'Шановний користувач SeedDMS,
+ми отримали запит наз зміну вашого паролю.
+Щоб зробити це, перейдіть по ссилці:
+
+###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+
+Якщо ви і після цього не зможете зайти, зв\'яжіться з адміністратором',
+'password_forgotten_email_subject' => 'Втрачено пароль',
+'password_forgotten_send_hash' => 'Інструкції вислано на e-mail',
+'password_forgotten_text' => 'Заповніть форму і виконайте інструкції в листі',
+'password_forgotten_title' => 'Пароль вислано',
+'password_repeat' => 'Повторіть пароль',
+'password_send' => 'Пароль відіслано',
+'password_send_text' => 'Пароль відіслано.',
+'password_strength' => 'Надійність пароля',
+'password_strength_insuffient' => 'Недостатня надійність пароля',
+'password_wrong' => 'Невірний пароль',
+'personal_default_keywords' => 'Особистий список ключових слів',
+'pl_PL' => 'Polish',
+'possible_substitutes' => 'Підстановки',
+'preview_converters' => '',
+'previous_state' => 'Попередній стан',
+'previous_versions' => 'Попередні версії',
+'pt_BR' => 'Portugese (BR)',
+'quota' => 'Квота',
+'quota_exceeded' => 'Ваша дискова квота перевищена на [bytes].',
+'quota_is_disabled' => 'Квотування відключено',
+'quota_warning' => 'Ваша дискова квота перевищена на [bytes]. Видаліть непотрібні документи або їх попередні версії.',
+'receipt_log' => 'Лог отримання',
+'receipt_summary' => 'Підсумки отримання',
+'recipients' => 'Отримувачі',
+'refresh' => 'Оновити',
+'rejected' => 'Відхилений',
+'released' => 'Затверджений',
+'removed_approver' => 'видалено зі списку затверджувачів',
+'removed_file_email' => 'Видалити додаток',
+'removed_file_email_body' => 'Видалено додаток
+Документ: [document]
+Користувач: [username]
+URL: [url]',
+'removed_file_email_subject' => '[sitename]: видалено додаток до «[document]»',
+'removed_recipient' => 'видалено отримувача',
+'removed_reviewer' => 'видалено зі списку рецензентів',
+'removed_revispr' => 'видалено зі списку редакторів',
+'removed_workflow_email_body' => 'Видалено процес з версії документа
+Документ: [name]
+Версія: [version]
+Процес: [workflow]
+Каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'removed_workflow_email_subject' => '[sitename]: видалено процес з версії документа «[name]»',
+'remove_marked_files' => 'Видалити обрані файли',
+'repaired' => 'виправлено',
+'repairing_objects' => 'Відновлення каталогів і документів',
+'request_workflow_action_email_body' => 'Запит дії по процесу',
+'request_workflow_action_email_subject' => 'Запит дії для процесу',
+'reset_checkout' => 'Зняти стан опрацювання',
+'results_page' => 'Сторінка результатів',
+'return_from_subworkflow' => 'Вихід з підпроцесу',
+'return_from_subworkflow_email_body' => 'Вихід з підпроцесу
+Документ: [name]
+Версія: [version]
+Процес: [workflow]
+Підпроцес: [subworkflow]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'return_from_subworkflow_email_subject' => '[sitename]: вихід з підпроцесу «[name]»',
+'reverse_links' => 'Документи, які посилаються на цей документ',
+'reviewers' => 'Рецензенти',
+'reviewer_already_assigned' => 'вже призначений для рецензування',
+'reviewer_already_removed' => 'вже видалено зі списку рецензентів або вже лишив рецензію',
+'review_deletion_email' => 'Запит на редагування видалено',
+'review_deletion_email_body' => 'Запит на рецензування видалено
+Документ: [name]
+Версія: [version]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'review_deletion_email_subject' => '[sitename]: скасовано запит на рецензування для [name]',
+'review_file' => '',
+'review_group' => 'Група рецензентів',
+'review_log' => 'Лог рецензування',
+'review_request_email' => 'Запит на рецензування',
+'review_request_email_body' => 'Запит на рецензування
+Документ: [name]
+Версія: [version]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'review_request_email_subject' => 'Запит на рецензування',
+'review_status' => 'Статус рецензування',
+'review_submit_email' => 'Відправлено на рецензування',
+'review_submit_email_body' => 'Відправлено на рецензування
+Документ: [name]
+Версія: [version]
+Статус: [status]
+Коментар: [comment]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'review_submit_email_subject' => '[sitename]: відправлена рецензія «[name]»',
+'review_summary' => 'Підсумки рецензування',
+'review_update_failed' => 'Помилка оновлення статусу рецензії',
+'revise_document' => 'Ревізувати документ',
+'revise_document_on' => 'Наступна ревізія документу [date]',
+'revision_date' => 'Дата ревізії',
+'revision_log' => 'Лог ревізії',
+'revisors' => 'Ревізори',
+'revisor_already_assigned' => 'Ревізор вже призначений',
+'revisor_already_removed' => 'Ревізора вже видалено',
+'rewind_workflow' => 'Почати процес спочатку',
+'rewind_workflow_email_body' => 'Процес було перезапущено
+Документ: [name]
+Версія: [version]
+Процес: [workflow]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'rewind_workflow_email_subject' => '[sitename]: процес перезапущено для «[name]»',
+'rewind_workflow_warning' => 'Якщо ви почнете процес спочатку, то весь журнал процесу для цього процесу буде очищено і його неможливо буде відновити.',
+'rm_attrdef' => 'Видалити визначення атрибуту',
+'rm_default_keyword_category' => 'Видалити категорію',
+'rm_document' => 'Видалити документ',
+'rm_document_category' => 'Видалити категорію',
+'rm_file' => 'Видалити файл',
+'rm_folder' => 'Видалити каталог',
+'rm_from_clipboard' => 'Видалити з буферу обміну',
+'rm_group' => 'Видалити групу',
+'rm_transmittal' => 'Видалити передачу',
+'rm_transmittalitem' => 'Видалити елемент передачі',
+'rm_user' => 'Видалити користувача',
+'rm_version' => 'Видалити версію',
+'rm_workflow' => 'Видалити процес',
+'rm_workflow_action' => 'Видалити дію процесу',
+'rm_workflow_state' => 'Видалити статус процесу',
+'rm_workflow_warning' => 'Ви плануєте видалити процес для документа. Цю дію неможливо відмінити.',
+'role' => 'Роль',
+'role_admin' => 'Адміністратор',
+'role_guest' => 'Гість',
+'role_user' => 'Користувач',
+'ro_RO' => 'Romanian',
+'run_subworkflow' => 'Запустити підпроцес',
+'run_subworkflow_email_body' => 'Запущено підпроцес
+Документ: [name]
+Версія: [version]
+Процес: [workflow]
+Підпроцес: [subworkflow]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'run_subworkflow_email_subject' => '[sitename]: запущено підпроцес для «[name]»',
+'ru_RU' => 'Русский',
+'saturday' => 'Субота',
+'saturday_abbr' => 'Сб',
+'save' => 'Зберегти',
+'search' => 'Пошук',
+'search_fulltext' => 'Повнотекстовий пошук',
+'search_in' => 'Пошук',
+'search_mode_and' => 'Всі слова',
+'search_mode_documents' => 'Режим пошуку документів',
+'search_mode_folders' => 'Режим пошуку каталогів',
+'search_mode_or' => 'Хоча б одне слово',
+'search_no_results' => 'Немає документів, що відповідають запитові',
+'search_query' => 'Шукати',
+'search_report' => 'Знайдено документів: [doccount] і каталогів: [foldercount]',
+'search_report_fulltext' => 'Знайдено документів: [doccount]',
+'search_resultmode' => 'Результати пошуку',
+'search_resultmode_both' => 'Документи і каталоги',
+'search_results' => 'Результати пошуку',
+'search_results_access_filtered' => 'Результати пошуку можуть містити об\'єкти, до яких у вас немає доступу',
+'search_time' => 'Пройшло: [time] с',
+'seconds' => 'секунди',
+'selection' => 'Вибір',
+'select_category' => 'Виберіть категорію',
+'select_groups' => 'Виберіть групи',
+'select_grp_approvers' => 'Виберіть групу затверджувачів',
+'select_grp_notification' => 'Виберіть групу сповіщення',
+'select_grp_recipients' => 'Виберіть групу отримувачів',
+'select_grp_reviewers' => 'Виберіть групу рецензентів',
+'select_grp_revisors' => 'Виберіть групу ревізорів',
+'select_ind_approvers' => 'Виберіть індивідуального затверджувача',
+'select_ind_notification' => 'Виберіть індивідуального сповіщеного',
+'select_ind_recipients' => 'Виберіть індивідуального отримувача',
+'select_ind_reviewers' => 'Виберіть індивідуального рецензента',
+'select_ind_revisors' => 'Виберіть індивідуального ревізора',
+'select_one' => 'Виберіть',
+'select_users' => 'Виберіть користувачів',
+'select_workflow' => 'Виберіть процес',
+'september' => 'Вересень',
+'sequence' => 'Позиція',
+'seq_after' => 'Після «[prevname]»',
+'seq_end' => 'В кінці',
+'seq_keep' => 'Не змінювати',
+'seq_start' => 'На початку',
+'settings' => 'Налаштування',
+'settings_activate_module' => 'Активувати модуль',
+'settings_activate_php_extension' => 'Активувати розширення PHP',
+'settings_adminIP' => 'Адміністраторська IP',
+'settings_adminIP_desc' => 'Якщо встановлено, то адміністратор зможе зайти лише з цієї IP-адреси. Залиште порожнім, якщо це не потрібно. Не працює з LDAP.',
+'settings_Advanced' => 'Додатково',
+'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
+'settings_Authentication' => 'Налаштування авторизації',
+'settings_cacheDir' => 'Каталог кешу',
+'settings_cacheDir_desc' => 'Де зберігаються ескізи зображень (краще вибрати каталог, недоступний веб-серверові).',
+'settings_Calendar' => 'Налаштування календаря',
+'settings_calendarDefaultView' => 'Вид календаря по замовчуванню',
+'settings_calendarDefaultView_desc' => 'Вид календаря по замовчуванню.',
+'settings_cannot_disable' => 'Неможливо видалити ENABLE_INSTALL_TOOL',
+'settings_checkOutDir' => 'Каталог для документів на опрацюванні',
+'settings_checkOutDir_desc' => 'Це каталог, куди скопійовано останній вміст документу, якщо він на опрацюванні. Якщо ви зробите цей каталог доступний користувачам, вони зможуть редагувати файл і завантажувати його назад по завершенні роботи.',
+'settings_contentDir' => 'Каталог вмісту',
+'settings_contentDir_desc' => 'Куди зберігаються завантажені файли (краще вибрати каталог, недоступний веб-серверові).',
+'settings_contentOffsetDir' => 'Базовий початковий каталог',
+'settings_contentOffsetDir_desc' => 'Для уникнення проблем з файловою системою було введено структуру каталогів у каталозі вмісту. Необхідний базовий початковий каталог. Втім, залиште тут все, як є, 1048576, але може бути будь-яким числом чи рядком, якого ще немає в каталозі вмісту.',
+'settings_cookieLifetime' => 'Час життя куки',
+'settings_cookieLifetime_desc' => 'Час життя куки в секундах. Якщо встановлено 0, то куки будуть видалені при закритті браузера.',
+'settings_coreDir' => 'Каталог Core SeedDMS',
+'settings_coreDir_desc' => 'Шлях до SeedDMS_Core (не обов\'язково).',
+'settings_createCheckOutDir' => 'Каталог для документів на опрацюванні',
+'settings_createCheckOutDir_desc' => 'Версія документа буде скопійована сюди, коли документ відправляється на опрацювання.',
+'settings_createdatabase' => 'Створити таблиці бази даних',
+'settings_createdirectory' => 'Створити каталог',
+'settings_currentvalue' => 'Поточне значення',
+'settings_Database' => 'Налаштування бази даних',
+'settings_dbDatabase' => 'База даних (БД)',
+'settings_dbDatabase_desc' => 'Ім\'я бази даних (БД), введене при встановленні. Не змінювати без потреби, лише, наприклад, якщо БД переміщено.',
+'settings_dbDriver' => 'Тип БД',
+'settings_dbDriver_desc' => 'Тип БД, введений при встановленні. Не змінювати без потреби, лише, наприклад, якщо в БД змінено двигун. Драйвер adodb (див. настановву ADOdb).',
+'settings_dbHostname' => 'Хост',
+'settings_dbHostname_desc' => 'Хост БД, введений при встановленні. Не змінювати без потреби, лише, наприклад, якщо БД переміщено.',
+'settings_dbPass' => 'Пароль',
+'settings_dbPass_desc' => 'Пароль, введений при встановленні.',
+'settings_dbUser' => 'Логін',
+'settings_dbUser_desc' => 'Логін, введений при встановленні. Не змінюйте без потреби, наприклад, якщо БД було переміщено.',
+'settings_dbVersion' => 'Схема БД застаріла',
+'settings_delete_install_folder' => 'Видаліть ENABLE_INSTALL_TOOL в каталозі конфігурації для того, щоби почати використовувати систему',
+'settings_disableSelfEdit' => 'Відключити власне редагування',
+'settings_disableSelfEdit_desc' => 'Якщо ввімкнено, користувачі не зможуть змінювати інформацію про себе.',
+'settings_disable_install' => 'Видалити ENABLE_INSTALL_TOOL, якщо можливо',
+'settings_Display' => 'Налаштування відображення',
+'settings_dropFolderDir' => 'Розміщення проміжного каталогу',
+'settings_dropFolderDir_desc' => 'Цей каталог використовується для розміщення файлів на сервері і їх імпорту замість завантаження їх через браузер. Каталог повинен містити підкаталог для кожного користувача, якому дозволено імпорт файлів таким методом.',
+'settings_Edition' => 'Налаштування версій',
+'settings_enableAcknowledgeWorkflow' => 'Увімкнути підтвердження отримання документу',
+'settings_enableAcknowledgeWorkflow_desc' => 'Включіть для активації функції підтвердження отримання документу',
+'settings_enableAdminRevApp' => 'Адміністратор може бути<br/>рецензент і затверджувач',
+'settings_enableAdminRevApp_desc' => 'Якщо відключено, адміністратор не відображається у списку рецензентів і затверджувачів.',
+'settings_enableCalendar' => 'Увімкнути календар',
+'settings_enableCalendar_desc' => 'Увімкнути/вимкнути календар.',
+'settings_enableClipboard' => 'Увімкнути буфер обміну',
+'settings_enableClipboard_desc' => 'Увімкнути/вимкнути буфер обміну.',
+'settings_enableConverting' => 'Увімкнути перетворення',
+'settings_enableConverting_desc' => 'Увімкнути/вимкнути перетворення файлів.',
+'settings_enableDropUpload' => 'Увімкнути швидке завантаження',
+'settings_enableDropUpload_desc' => 'Увімкнути/вимкнути область в ""Перегляді каталогу"" для завантаження за допомогою Drag&Drop.',
+'settings_enableDuplicateDocNames' => 'Дозволити документи<br/>з однаковою назвою',
+'settings_enableDuplicateDocNames_desc' => 'Дозволити документи з однаковими назвами в каталозі.',
+'settings_enableEmail' => 'Увімкнути e-mail',
+'settings_enableEmail_desc' => 'Увімкнути/вимкнути автоматичне сповіщення по e-mail.',
+'settings_enableFolderTree' => 'Увімкнути дерево каталогів',
+'settings_enableFolderTree_desc' => 'Якщо відключено, дерево каталогів не буде відображене',
+'settings_enableFullSearch' => 'Увімкнути повнотекстовий пошук',
+'settings_enableFullSearch_desc' => 'Увімкнути/вимкнути повнотекстовий пошук.',
+'settings_enableGuestLogin' => 'Увімкнути гостьовий вхід',
+'settings_enableGuestLogin_desc' => 'Увімкніть цю опцію для дозволу гостьового входу. Гостьовий вхід повинен використовуватися лише у довіреному середовищі.',
+'settings_enableLanguageSelector' => 'Увімкнути вибір мови',
+'settings_enableLanguageSelector_desc' => 'Відображати меню вибору мови інтерфейсу користувача після входу в систему. Це не впливає на вибір мови на сторінці авторизації.',
+'settings_enableLargeFileUpload' => 'Увімкнути Java-завантажувач файлів',
+'settings_enableLargeFileUpload_desc' => 'Якщо увімкнено, завантаження файлів доступне такок через Java-аплет jumploader без обмеження розміру файлів. Це також дозволить завантажувати кілька файлів за раз.',
+'settings_enableNotificationAppRev' => 'Сповіщати рецензента і затверджувача',
+'settings_enableNotificationAppRev_desc' => 'Увімкніть для відправки сповіщення рецензенту чи затверджувачеві при додаванні нової версії документа.',
+'settings_enableNotificationWorkflow' => 'Відсилати сповіщення користувачам, задіяним в наступній стадії процесу',
+'settings_enableNotificationWorkflow_desc' => 'Якщо ця опція активована, користувачі і групи, які повинні виконати якісь дії для виконання наступної стадії процесу, отримуватимуть сповіщення. Навіть якщо вони не включені в список сповіщення.',
+'settings_enableOwnerNotification' => 'Сповіщати власника по замовчуванню',
+'settings_enableOwnerNotification_desc' => 'Увімкніть для відправлення сповіщення власникові при додаванні документа.',
+'settings_enableOwnerRevApp' => 'Дозволити рецензію/затвердження<br/>власником',
+'settings_enableOwnerRevApp_desc' => 'Увімкніть для того, щоб власник відображався в списку рецензентів/затверджувачів і для зміни процесу.',
+'settings_enablePasswordForgotten' => 'Включити відновлення паролю',
+'settings_enablePasswordForgotten_desc' => 'Якщо увімкнено, дозволяє користувачам відновлювати пароль через e-mail.',
+'settings_enableRecursiveCount' => 'Рекурсивно підраховувати<br/>документи і каталоги',
+'settings_enableRecursiveCount_desc' => 'Якщо увімкнено, кількість документів і каталогів при перегляді каталога буде підраховано рекурсивно для всіх документів до яких користувач має доступ.',
+'settings_enableRevisionWorkflow' => 'Увімкнути процес ревізії',
+'settings_enableRevisionWorkflow_desc' => 'Увімкніть для актвиації функції ревізії документа через певний час',
+'settings_enableSelfRevApp' => 'Дозволити рецензію/затвердження<br/>користувачами, авторизованими у системі',
+'settings_enableSelfRevApp_desc' => 'Увімкніть для того, щоб користувачі, в даний момент авторизовані у системі, були в списку рецензентів/затверджувачів і в зміні процесу.',
+'settings_enableThemeSelector' => 'Вибір темы',
+'settings_enableThemeSelector_desc' => 'Увімкнути/вимкнути можливість вибору теми на сторінці авторизації.',
+'settings_enableUserImage' => 'Увімкнути аватари',
+'settings_enableUserImage_desc' => 'Увімкнути аватари користувачів.',
+'settings_enableUsersView' => 'Увімкнути перегляд користувачів',
+'settings_enableUsersView_desc' => 'Увімкнути/вимкнути перегляд груп і користувачів для всіх користувачів.',
+'settings_enableVersionDeletion' => 'Дозволити видалення попередніх версій',
+'settings_enableVersionDeletion_desc' => 'Дозволити/заборонити звичайним користувачам видаляти попередні версії документів. Адміністратор завжди зможе видалити старі версії документів.',
+'settings_enableVersionModification' => 'Дозволити зміну версій',
+'settings_enableVersionModification_desc' => 'Дозволити/заборонити звичайним користувачам змінювати версію документів після завантаження їх на сервер. Адміністратор завжди зможе змінювати версії документів після завантаження їх на сервер.',
+'settings_encryptionKey' => 'Ключ шифрування',
+'settings_encryptionKey_desc' => 'Рядок використовується для створення унікального ідентифікатора, який додається як приховане поле до формулярів, для запобігання CSRF-атак.',
+'settings_error' => 'Помилка',
+'settings_expandFolderTree' => 'Розгортати дерево каталогів',
+'settings_expandFolderTree_desc' => 'Розгортати дерево каталогів.',
+'settings_expandFolderTree_val0' => 'Починати зі згорнутого дерева',
+'settings_expandFolderTree_val1' => 'Починати з розгорного дерева першого рівня',
+'settings_expandFolderTree_val2' => 'Починати з повністю розгорнутого дерева',
+'settings_Extensions' => 'Розширення',
+'settings_extraPath' => 'Додатковий шлях PHP',
+'settings_extraPath_desc' => 'Розміщення додаткового програмного забезпечення. Наприклад, каталог, що містить adodb або додаткові pear-пакеты.',
+'settings_firstDayOfWeek' => 'Перший день тижня',
+'settings_firstDayOfWeek_desc' => 'Перший день тижня.',
+'settings_footNote' => 'Нижній колонтитул',
+'settings_footNote_desc' => 'Повідомлення, яке відображається внизу кожної сторінки.',
+'settings_guestID' => 'Ідентифікатор гостя',
+'settings_guestID_desc' => 'Ідентифікатор гостя (можна не змінювати).',
+'settings_httpRoot' => 'Корінь http',
+'settings_httpRoot_desc' => 'Відносний шлях в URL, після доменної частини. Без http://. Наприклад, якщо повний URL http://www.example.com/seeddms/, треба вказати «/seeddms/». Якщо URL http://www.example.com/, то «/».',
+'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus_draft' => '',
+'settings_initialDocumentStatus_released' => '',
+'settings_installADOdb' => 'Встановити ADOdb',
+'settings_install_disabled' => 'ENABLE_INSTALL_TOOL видалений. Тепер можна увійти для подальшого налаштування системи.',
+'settings_install_pear_package_log' => 'Встановість пакет Pear \'Log\'',
+'settings_install_pear_package_webdav' => 'Встановіть пакет Pear \'HTTP_WebDAV_Server\', якщо плануєте використовувати цей протокол',
+'settings_install_success' => 'Установка успішно завершена.',
+'settings_install_welcome_text' => '<p>Перед тим як почати встановлення SeedDMS переконайтеся, що ви створили файл ENABLE_INSTALL_TOOL в каталозі конфігурації, інакше інсталятор не працюватиме. На UNIX-подібних системах це можна зробити за допомогою команди \'touch conf/ENABLE_INSTALL_TOOL\'. Після установки видаліть цей файл.</p><p>SeedDMS має мінімальні вимоги. Потрібна база даних (БД) MySQL або SQLite и веб-сервер з PHP. Для роботи повнотекстового пошуку lucene, Також необхідна інфраструктура Zend, встановлена там, де до неї має доступ PHP. Для сервера WebDAV вам знадобиться HTTP_WebDAV_Server. Шлях може бути вказаний пізніше під час встановлення.</p><p>Якщо ви хочете створити БД до початку встановлення, то створіть її вручну відомим вам інструментом, а також користувача БД з правами доступу до БД і імпортуйте один з дампів БД з каталога конфігурації. Інсталятор може зробити це сам, але потрібен доступ до БД з правами на створення БД.</p>',
+'settings_install_welcome_title' => 'Ласкаво просимо до встановлювача SeedDMS',
+'settings_install_zendframework' => 'Встановіть Zend Framework, якщо плануєте використовувати повнотекстовий пошук',
+'settings_language' => 'Мова по замовчуванню',
+'settings_language_desc' => 'Мова по замовчуванню (каталог в «languages»).',
+'settings_libraryFolder' => 'Каталог бібліотек',
+'settings_libraryFolder_desc' => 'Каталог, куди можна копіювати документи для створення нових документів',
+'settings_logFileEnable' => 'Увімкнути протоколювання (лог)',
+'settings_logFileEnable_desc' => 'Увімкнути/вимкнути протоколювання (лог).',
+'settings_logFileRotation' => 'Ротація журналу (протоколу)',
+'settings_logFileRotation_desc' => 'Ротація файлу журналу.',
+'settings_loginFailure' => 'Не вдалося увійти',
+'settings_loginFailure_desc' => 'Відключити обліковий запис після n невдалих спроб.',
+'settings_luceneClassDir' => 'Каталог Lucene SeedDMS',
+'settings_luceneClassDir_desc' => 'Шлях до SeedDMS_Lucene (не обов\'язково).',
+'settings_luceneDir' => 'Каталог повнотекстового індексу Lucene',
+'settings_luceneDir_desc' => 'Шлях, куди Lucene буде записувати свій індекс.',
+'settings_maxDirID' => 'Максимальний ID каталога',
+'settings_maxDirID_desc' => 'Максимум каталогів у батьківському каталозі. По замовчуванню 32700.',
+'settings_maxExecutionTime' => 'Максимальний час виконання, с',
+'settings_maxExecutionTime_desc' => 'Встановлює максимальний час виконання скрипта, перед тим як він буде завершений.',
+'settings_maxRecursiveCount' => 'Обмеження рекурсивного підрахунку<br/>документів і каталогів',
+'settings_maxRecursiveCount_desc' => 'Максимальна кількість документів і каталогів, які будуть перевірені на права доступу при рекурсивному підрахунку об\'єктів. При первищенні цієї кількості, буде оцінено кількість документів і каталогів у вигляді каталогу.',
+'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin',
+'settings_notfound' => 'Не знайдено',
+'settings_Notification' => 'Налаштування сповіщення',
+'settings_notwritable' => 'Конфігурація не може бути збережена, тому що файл налаштувань доступний лише на читання.',
+'settings_no_content_dir' => 'Каталог вмісту',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
+'settings_partitionSize' => 'Частковий розмір файлу',
+'settings_partitionSize_desc' => 'Розмір частинок файлів, які завантажуються через jumploader. Не встановлювати більше максимально дозволеного розміру, встановленого на сервері.',
+'settings_passwordExpiration' => 'Термін дії пароля',
+'settings_passwordExpiration_desc' => 'Кількість днів, після якої закінчується термін дії пароля і він повинен бути змінений. Значення 0 відключає функцію терміну дії пароля.',
+'settings_passwordHistory' => 'Історія паролів',
+'settings_passwordHistory_desc' => 'Кількість паролів, які повинен змінити користувач, перед повторним використанням пароля. Значення 0 відключає історію використання паролів.',
+'settings_passwordStrength' => 'Мінімальна складність пароля',
+'settings_passwordStrengthAlgorithm' => 'Алгоритм складності пароля',
+'settings_passwordStrengthAlgorithm_desc' => 'Алгоритм розрахунку складності пароля. «Простий» перевіряє, що довжина пароля не менше восьми символів, є літери верхнього і нижнього регістрів, цифри і спеціальні символи. Якщо ці умови виконані вважається 100 балів, інакше 0.',
+'settings_passwordStrengthAlgorithm_valadvanced' => 'посилений',
+'settings_passwordStrengthAlgorithm_valsimple' => 'простой',
+'settings_passwordStrength_desc' => 'Мінімальна складність пароля — це число від 0 до 100. При значенні 0 перевірка складності пароля буде відключена.',
+'settings_pear_log' => 'Пакет Pear : Log',
+'settings_pear_webdav' => 'Пакет Pear : HTTP_WebDAV_Server',
+'settings_perms' => 'Дозволи',
+'settings_php_dbDriver' => 'PHP extension : php_\'see current value\'',
+'settings_php_gd2' => 'PHP extension : php_gd2',
+'settings_php_mbstring' => 'PHP extension : php_mbstring',
+'settings_php_version' => 'Версія PHP',
+'settings_presetExpirationDate' => 'Термін затвердження документу по замовчуванню',
+'settings_presetExpirationDate_desc' => 'Всі нові завантажені документи матимуть термін виконання, встановлений за цим шаблоном. Дата може бути вказана в зрозумілому для функції PHP strtotime() вигляді, наприклад +5 weeks.',
+'settings_previewWidthDetail' => 'Ширина попереднього перегляду зображення (детально)',
+'settings_previewWidthDetail_desc' => 'Ширина зображення при перегляді на сторінці інформації',
+'settings_previewWidthList' => 'Ширина зображення при попередньому перегляді (список)',
+'settings_previewWidthList_desc' => 'Ширина зображення при попередньому перегляді і відображенні в режимі списку',
+'settings_printDisclaimer' => 'Виводити попередження',
+'settings_printDisclaimer_desc' => 'Якщо увімкнено, то попередження з lang.inc буде виводитися внизу кожної сторінки.',
+'settings_quota' => 'Квота користувача',
+'settings_quota_desc' => 'Максимальна кількість байт, Які користувач може використовувати на дисковому просторі. Значення 0 знімає обмеження на дисковий простір. Це значення може бути вказано окремо для кожного користувача в його профілі.',
+'settings_restricted' => 'Обмежений доступ',
+'settings_restricted_desc' => 'Дозволити вхід користувачам, тільки якщо в них є відповідний обліковий запис в БД (незалежно від успішного входу через LDAP).',
+'settings_rootDir' => 'Кореневий каталог',
+'settings_rootDir_desc' => 'Шлях до SeedDMS.',
+'settings_rootFolderID' => 'ID кореневого каталога',
+'settings_rootFolderID_desc' => 'ID кожного кореневого каталога (можна не змінювати).',
+'settings_SaveError' => 'Помилка при збереженні конфігурації',
+'settings_Server' => 'Налаштування сервера',
+'settings_showMissingTranslations' => 'Фрази, як потребують перекладу',
+'settings_showMissingTranslations_desc' => 'Відображати внизу сторінки фрази, як потребують перекладу',
+'settings_Site' => 'Сайт',
+'settings_siteDefaultPage' => 'Сторінка по замовчуванню',
+'settings_siteDefaultPage_desc' => 'Сторінка, яка відображається після авторизації. По замовчуванню: out/out.ViewFolder.php',
+'settings_siteName' => 'Назва сайту',
+'settings_siteName_desc' => 'Назва сайту, яка використовується в заголовках. По замовчуванню: SeedDMS',
+'settings_SMTP' => 'Налаштування SMTP',
+'settings_smtpPassword' => 'Пароль сервера SMTP',
+'settings_smtpPassword_desc' => 'Пароль сервера SMTP',
+'settings_smtpPort' => 'Порт SMTP',
+'settings_smtpPort_desc' => 'Порт сервера SMTP, по замовчуванню 25.',
+'settings_smtpSendFrom' => 'Від',
+'settings_smtpSendFrom_desc' => 'Відправляти із вказаної адреси.',
+'settings_smtpServer' => 'Хост SMTP',
+'settings_smtpServer_desc' => 'Хост сервера SMTP.',
+'settings_smtpUser' => 'Користувач сервера SMTP',
+'settings_smtpUser_desc' => 'Користувач сервера SMTP',
+'settings_sortFoldersDefault' => 'Метод сортування по замовчуванню',
+'settings_sortFoldersDefault_desc' => 'Встановити метод сортування файлів і каталогів при відображенні каталогу.',
+'settings_sortFoldersDefault_val_name' => 'по назві',
+'settings_sortFoldersDefault_val_sequence' => 'послідовно',
+'settings_sortFoldersDefault_val_unsorted' => 'не сортувати',
+'settings_sortUsersInList' => 'Сортувати користувачів',
+'settings_sortUsersInList_desc' => 'Визначає метод сортування користувачів в меню вибору.',
+'settings_sortUsersInList_val_fullname' => 'Сортувати за повним іменем',
+'settings_sortUsersInList_val_login' => 'Сортувати зо логіном',
+'settings_stagingDir' => 'Каталог для часткових завантажень',
+'settings_stagingDir_desc' => 'Розміщення файлів часткових завантажень.',
+'settings_start_install' => 'Почати встановлення',
+'settings_stopWordsFile' => 'Каталог файлу стоп-слів',
+'settings_stopWordsFile_desc' => 'Якщо увімкнено повнотекстовий пошук, то слова, вказані у файлі стоп-слов, не будуть індексуватися.',
+'settings_strictFormCheck' => 'Повна перевірка форм',
+'settings_strictFormCheck_desc' => 'Якщо увімкнено, то всі поля форм будуть перевірятися чи вони заповнені. Якщо вимкнено, то коментарі і ключові слова стануть необов\'язковими. Коментар завжди обов\'язковий при рецензуванні і зміні статусу.',
+'settings_suggestionvalue' => 'Запропоноване значення',
+'settings_System' => 'Система',
+'settings_theme' => 'Тема по замовчуванню',
+'settings_theme_desc' => 'Стиль по замовчуванню (каталог в «styles»).',
+'settings_titleDisplayHack' => 'Прийом для заголовків',
+'settings_titleDisplayHack_desc' => 'Використовувати прийом для заголовків, більших, ніж два рядки.',
+'settings_undelUserIds' => 'Ідентифікатори користувачів, які неможливо видалити',
+'settings_undelUserIds_desc' => 'Розділений комами перелік ідентифікаторів користувачів, яких неможливо видалити.',
+'settings_updateDatabase' => 'Запустити оновлення схеми БД',
+'settings_updateNotifyTime' => 'Період сповіщень про зміни',
+'settings_updateNotifyTime_desc' => 'Користувачі отримують сповіщення за вказані останні секунди.',
+'settings_upgrade_php' => 'Оновіть PHP до версії не нижче 5.2.0',
+'settings_versioningFileName' => 'Назва файлу версій',
+'settings_versioningFileName_desc' => 'Назва файлу версій, створеного інструментами резервного копіювання.',
+'settings_versiontolow' => 'Надто стара версія',
+'settings_viewOnlineFileTypes' => 'Типи файлів для перегляду онлайн',
+'settings_viewOnlineFileTypes_desc' => 'Файли з такими розширеннями можна переглядати онлайн (лише малі літери).',
+'settings_workflowMode' => 'Режим процесу',
+'settings_workflowMode_desc' => 'Покращений режим дозволяє вказати ваш власний процес для документа.',
+'settings_workflowMode_valadvanced' => 'покращений',
+'settings_workflowMode_valtraditional' => 'традиційний',
+'settings_workflowMode_valtraditional_only_approval' => 'традиційний (без рецензування)',
+'settings_zendframework' => 'Інфраструктура Zend',
+'set_expiry' => 'Встановити термін дії',
+'set_owner' => 'Призначити власника',
+'set_owner_error' => 'Помилка при призначенні власника',
+'set_password' => 'Встановити пароль',
+'set_workflow' => 'Вказати процес',
+'signed_in_as' => 'Користувач',
+'sign_in' => 'Увійти',
+'sign_out' => 'Вийти',
+'sign_out_user' => 'Вихід користувача',
+'sk_SK' => 'Slovak',
+'space_used_on_data_folder' => 'Розмір каталогу даних',
+'splash_added_to_clipboard' => 'Додано до буферу обміну',
+'splash_add_attribute' => 'Додано новий атрибут',
+'splash_add_group' => 'Додана нова група',
+'splash_add_group_member' => 'Додано нового члена групи',
+'splash_add_user' => 'Додано нового користувача',
+'splash_cleared_clipboard' => 'Буфер обміну очищено',
+'splash_document_added' => 'Додано документ',
+'splash_document_checkedout' => 'Документ відправлено на опрацювання',
+'splash_document_edited' => 'Документ збережено',
+'splash_document_locked' => 'Документ заблоковано',
+'splash_document_unlocked' => 'Документ розблоковано',
+'splash_edit_attribute' => 'Атрибут збережено',
+'splash_edit_group' => 'Групу збережено',
+'splash_edit_user' => 'Користувача збережено',
+'splash_folder_edited' => 'Зміни каталога збережено',
+'splash_invalid_folder_id' => 'Невірний ідентифікатор каталога',
+'splash_invalid_searchterm' => 'Невірний пошуковий запит',
+'splash_moved_clipboard' => 'Буфер обміну перенесено в поточний каталог',
+'splash_removed_from_clipboard' => 'Видалити з буферу обміну',
+'splash_rm_attribute' => 'Атрибут видалено',
+'splash_rm_document' => 'Документ видалено',
+'splash_rm_folder' => 'Папку видалено',
+'splash_rm_group' => 'Групу видалено',
+'splash_rm_group_member' => 'Члена групи видалено',
+'splash_rm_user' => 'Користувача видалено',
+'splash_settings_saved' => 'Налаштування збережено',
+'splash_substituted_user' => 'Користувача переключено',
+'splash_switched_back_user' => 'Переключено на початкового користувача',
+'splash_toogle_group_manager' => 'Змінено менеджера групи',
+'state_and_next_state' => 'Статус / наступний статус',
+'statistic' => 'Статистика',
+'status' => 'Статус',
+'status_approval_rejected' => 'Чорнетку відхилено',
+'status_approved' => 'Затверджено',
+'status_approver_removed' => 'Затверджувач видалений з процесу',
+'status_not_approved' => 'Не затверджено',
+'status_not_receipted' => 'Отримання не підтверджено',
+'status_not_reviewed' => 'Не рецензовано',
+'status_not_revised' => 'Не ревізовано',
+'status_receipted' => 'Отримано',
+'status_receipt_rejected' => 'Відхилено',
+'status_recipient_removed' => 'Видалено',
+'status_reviewed' => 'Рецензовано',
+'status_reviewer_rejected' => 'Чорнетка відхилена',
+'status_reviewer_removed' => 'Рецензента видалено зі списку',
+'status_revised' => 'Ревізовано',
+'status_revision_rejected' => 'Ревізію відхилено',
+'status_revision_sleeping' => 'Ревізію призупинено',
+'status_revisor_removed' => 'Ревізора видалено зі списку',
+'status_unknown' => 'Невідомий',
+'storage_size' => 'Розмір сховища',
+'submit_approval' => 'Затвердити',
+'submit_login' => 'Увійти',
+'submit_password' => 'Встановити новий пароль',
+'submit_password_forgotten' => 'Почати процес',
+'submit_receipt' => 'Підтвердження отримання',
+'submit_review' => 'Рецензувати',
+'submit_userinfo' => 'Відправити інформацію',
+'substitute_to_user' => 'Перемикнутися на \'[username]\'',
+'substitute_user' => 'Перемикнутися',
+'sunday' => 'Неділя',
+'sunday_abbr' => 'Нд',
+'sv_SE' => 'Swedish',
+'switched_to' => 'Переключено на',
+'takeOverGrpApprover' => 'Використати групу затверджувачів з попередньої версії',
+'takeOverGrpReviewer' => 'Використати групу рецензентів з попередньої версії',
+'takeOverIndApprover' => 'Використати затверджувачів з попередньої версії',
+'takeOverIndReviewer' => 'Використати рецензентів з попередньої версії',
+'testmail_body' => 'Це тестовий лист для перевірки налаштувань пошти SeedDMS',
+'testmail_subject' => 'Тестовий лист',
+'theme' => 'Тема',
+'thursday' => 'Четвер',
+'thursday_abbr' => 'Чт',
+'to' => 'До',
+'toggle_manager' => 'Змінити ознаку менеджера',
+'to_before_from' => 'Кінцева дата не може бути меншою початкової дати',
+'transition_triggered_email' => 'Змінено стан процесу',
+'transition_triggered_email_body' => 'Змінено стан процесу
+Документ: [name]
+Версія: [version]
+Коментар: [comment]
+Процес: [workflow]
+Поточний стан: [current_state]
+Попередній стан: [previous_state]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'transition_triggered_email_subject' => '[sitename]: змінено стан процесу для «[name]»',
+'transmittal' => 'Передача',
+'transmittalitem_removed' => 'Переданий елемент видалено',
+'transmittalitem_updated' => 'Переданий елемент оновлено',
+'transmittal_comment' => 'Коментар',
+'transmittal_name' => 'Назва',
+'transmittal_size' => 'Розмір',
+'trigger_workflow' => 'Процес',
+'tr_TR' => 'Turkish',
+'tuesday' => 'Вівторок',
+'tuesday_abbr' => 'Вв',
+'type_to_search' => 'Введіть запит',
+'uk_UA' => 'Українська',
+'under_folder' => 'В каталозі',
+'unknown_attrdef' => 'Невідоме визначення атрибуту',
+'unknown_command' => 'Команда не опізнана.',
+'unknown_document_category' => 'Невідома категорія',
+'unknown_group' => 'Невідомий ідентифікатор групи',
+'unknown_id' => 'невідомий ідентифікатор',
+'unknown_keyword_category' => 'Невідома категорія',
+'unknown_owner' => 'Невідомий ідентифікатор власника',
+'unknown_user' => 'Невідомий ідентифікатор користувача',
+'unlinked_content' => 'Віддалений вміст',
+'unlinked_documents' => 'Видалені документи',
+'unlinked_folders' => 'Видалені каталоги',
+'unlinking_objects' => 'Видалення вмісту',
+'unlock_cause_access_mode_all' => 'Ви все ще можете його оновлювати, тому що маєте рівень доступу «повний». Блокування буде автоматично зняте.',
+'unlock_cause_locking_user' => 'Ви все ще можете його оновлювати, тому що ви один з тих, хто його заблокував. Блокування буде автоматично зняте.',
+'unlock_document' => 'Розблокувати',
+'update' => 'Оновити',
+'update_approvers' => 'Оновити список затверджувачів',
+'update_document' => 'Оновити документ',
+'update_fulltext_index' => 'Оновити повнотекстовий пошук',
+'update_info' => 'Оновити інформацію',
+'update_locked_msg' => 'Цей документ заблоковано',
+'update_recipients' => 'Оновити список отримувачів',
+'update_reviewers' => 'Оновити список рецензентів',
+'update_revisors' => 'Оновити список ревізорів',
+'update_transmittalitem' => 'Оновити до останньої версії документа',
+'uploaded_by' => 'Завантажив(ла)',
+'uploading_failed' => 'Завантаження не успішне. Зв\'яжіться з адміністратором.',
+'uploading_maxsize' => 'Розмір завантаженого файлу перевищує максимально допустимий',
+'uploading_zerosize' => 'Відміна завантаження порожнього файлу.',
+'used_discspace' => 'Зайнятий дисковий простір',
+'user' => 'Користувач',
+'users' => 'Користувачі',
+'users_and_groups' => 'Користувачі / групи',
+'users_done_work' => 'Користувачі, які завершили процес',
+'user_exists' => 'Користувач існує',
+'user_group_management' => 'Користувачі і групи',
+'user_image' => 'Зображення',
+'user_info' => 'Інформація про користувача',
+'user_list' => 'Перелік користувачів',
+'user_login' => 'Користувач',
+'user_management' => 'Керування користувачами',
+'user_name' => 'Повне ім\'я',
+'use_comment_of_document' => 'Використовувати коментар документа',
+'use_default_categories' => 'Використовувати наперед визначені категорії',
+'use_default_keywords' => 'Використовувати наперед визначені ключові слова',
+'version' => 'Версія',
+'versioning_file_creation' => 'Створити файл версій',
+'versioning_file_creation_warning' => 'Ця операція створить файли версій для всього каталогу. Після створення файли версій будуть збережені в каталозі документів.',
+'versioning_info' => 'Информація про версії',
+'versiontolow' => 'Версія надто стара',
+'version_deleted_email' => 'Версію видалено',
+'version_deleted_email_body' => 'Версію видалено
+Документ: [name]
+Версія: [version]
+Батьківський каталог: [folder_path]
+Користувач: [username]
+URL: [url]',
+'version_deleted_email_subject' => '[sitename]: знищено версію «[name]»',
+'version_info' => 'Інформація про версію',
+'view' => 'Перегляд',
+'view_online' => 'Переглянути',
+'warning' => 'Увага',
+'wednesday' => 'Середа',
+'wednesday_abbr' => 'Ср',
+'weeks' => 'тижні',
+'week_view' => 'Тиждень',
+'workflow' => 'Процес',
+'workflow_actions_management' => 'Керування діями процесів',
+'workflow_action_in_use' => 'Ця дія використовується в процесах.',
+'workflow_action_name' => 'Назва',
+'workflow_editor' => 'Редактор процесу',
+'workflow_group_summary' => 'Підсумки по процесу групи',
+'workflow_initstate' => 'Початковий статус',
+'workflow_in_use' => 'Цей процес використовується в документах.',
+'workflow_management' => 'Керування процесами',
+'workflow_name' => 'Назва',
+'workflow_no_states' => 'Спочатку додайте статуси процесів.',
+'workflow_states_management' => 'Керування статусами процесів',
+'workflow_state_docstatus' => 'Статус документа',
+'workflow_state_in_use' => 'Цей статус використовується в процесах.',
+'workflow_state_name' => 'Назва',
+'workflow_summary' => 'Підсумки по процесу',
+'workflow_user_summary' => 'Підсумки по користввачу',
+'year_view' => 'Рік',
+'yes' => 'Так',
+'zh_CN' => 'Chinese (CN)',
+'zh_TW' => 'Chinese (TW)',
+);
+?>

From 370bef25ffaac43339bc0d36306970c8fd7f17f4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Jun 2015 21:49:19 +0200
Subject: [PATCH 0251/2006] some new keys

Conflicts:
	languages/de_DE/lang.inc
	languages/en_GB/lang.inc
---
 languages/ar_EG/lang.inc | 4 ++++
 languages/bg_BG/lang.inc | 4 ++++
 languages/ca_ES/lang.inc | 4 ++++
 languages/cs_CZ/lang.inc | 4 ++++
 languages/de_DE/lang.inc | 6 +++++-
 languages/en_GB/lang.inc | 8 ++++++--
 languages/es_ES/lang.inc | 4 ++++
 languages/fr_FR/lang.inc | 4 ++++
 languages/hu_HU/lang.inc | 4 ++++
 languages/it_IT/lang.inc | 4 ++++
 languages/nl_NL/lang.inc | 4 ++++
 languages/pl_PL/lang.inc | 4 ++++
 languages/pt_BR/lang.inc | 4 ++++
 languages/ro_RO/lang.inc | 4 ++++
 languages/ru_RU/lang.inc | 4 ++++
 languages/sk_SK/lang.inc | 4 ++++
 languages/sv_SE/lang.inc | 4 ++++
 languages/tr_TR/lang.inc | 4 ++++
 languages/zh_CN/lang.inc | 4 ++++
 languages/zh_TW/lang.inc | 4 ++++
 20 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 5e9f636c9..870dfaac3 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -234,6 +234,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'المحتوى',
 'continue' => 'استمرار',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'انشاء فهرس للنص الكامل',
 'create_fulltext_index_warning' => 'انت على وشك اعادة انشاء فهرس النص الكامل.هذا سيتطلب وقت كافي وسيؤثر بشكل عام على كفاءة النظام. اذا كنت حقا تود اعادة انشاء الفهرس، من فضلك قم بتاكيد العملية.',
@@ -693,6 +695,7 @@ URL: [url]',
 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية',
 'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'حالة سابقة',
 'previous_versions' => 'اصدارات سابقة',
 'pt_BR' => 'البرتغالية (BR)',
@@ -1219,6 +1222,7 @@ URL: [url]',
 'tuesday' => 'الثلاثاء',
 'tuesday_abbr' => 'ث',
 'type_to_search' => 'اكتب لتبحث',
+'uk_UA' => '',
 'under_folder' => 'في المجلد',
 'unknown_attrdef' => '',
 'unknown_command' => 'لم يتم التعرف على الأمر.',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 7364e0958..ddd4e0d2f 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -219,6 +219,8 @@ $text = array(
 'confirm_update_transmittalitem' => '',
 'content' => 'Съдържание',
 'continue' => 'Продължи',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Създай пълнотекстов индекс',
 'create_fulltext_index_warning' => 'Вие искате да пресъздадете пълнотекстов индекс. Това ще отнеме време и ще понижи производителността. Да продолжа ли?',
@@ -594,6 +596,7 @@ $text = array(
 'personal_default_keywords' => 'Личен списък с ключови думи',
 'pl_PL' => '',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Предишно състояние',
 'previous_versions' => 'Предишни версии',
 'pt_BR' => '',
@@ -1075,6 +1078,7 @@ $text = array(
 'tuesday' => 'вторник',
 'tuesday_abbr' => '',
 'type_to_search' => 'Тип за търсене',
+'uk_UA' => '',
 'under_folder' => 'В папка',
 'unknown_attrdef' => '',
 'unknown_command' => 'Командата не е позната.',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 4418ce6a7..5238bb72c 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -224,6 +224,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contingut',
 'continue' => 'Continuar',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => '',
 'create_fulltext_index_warning' => '',
@@ -599,6 +601,7 @@ URL: [url]',
 'personal_default_keywords' => 'Mots clau personals',
 'pl_PL' => '',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => '',
 'previous_versions' => 'Versions anteriors',
 'pt_BR' => '',
@@ -1080,6 +1083,7 @@ URL: [url]',
 'tuesday' => 'Dimarts',
 'tuesday_abbr' => '',
 'type_to_search' => '',
+'uk_UA' => '',
 'under_folder' => 'A carpeta',
 'unknown_attrdef' => '',
 'unknown_command' => 'Ordre no reconeguda.',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index bc5ca04b0..02f2ea65c 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -241,6 +241,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Domů',
 'continue' => 'Pokračovat',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Vytvořit fulltext index',
 'create_fulltext_index_warning' => 'Hodláte znovu vytvořit fulltext index. Může to trvat dlouho a zpomalit běh systému. Pokud víte, co děláte, potvďte operaci.',
@@ -704,6 +706,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'personal_default_keywords' => 'Osobní klíčová slova',
 'pl_PL' => 'Polština',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Předchozí stav',
 'previous_versions' => 'Předešlé verze',
 'pt_BR' => 'Portugalština (BR)',
@@ -1228,6 +1231,7 @@ URL: [url]',
 'tuesday' => 'Úterý',
 'tuesday_abbr' => 'Út',
 'type_to_search' => 'Zadejte hledaný výraz',
+'uk_UA' => '',
 'under_folder' => 'Ve složce',
 'unknown_attrdef' => 'Neznámá definice atributu',
 'unknown_command' => 'Příkaz nebyl rozpoznán.',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 6345a58b6..df26d27fd 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2080), dgrutsch (18)
+//    Translators: Admin (2087), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -246,6 +246,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => 'Aktualisierung bestätigen',
 'content' => 'Inhalt',
 'continue' => 'fortführen',
+'converter_new_cmd' => 'Kommando',
+'converter_new_mimetype' => 'Neuer Mime-Type',
 'copied_to_checkout_as' => 'Datei in den Checkout-Space als \'[filename]\' kopiert.',
 'create_fulltext_index' => 'Erzeuge Volltextindex',
 'create_fulltext_index_warning' => 'Sie möchten den Volltextindex neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.',
@@ -712,6 +714,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'personal_default_keywords' => 'Persönliche Stichwortlisten',
 'pl_PL' => 'Polnisch',
 'possible_substitutes' => 'Vertreter',
+'preview_converters' => 'Vorschau Dokumentenumwandlung',
 'previous_state' => 'Voriger Status',
 'previous_versions' => 'Vorhergehende Versionen',
 'pt_BR' => 'Portugiesisch (BR)',
@@ -1248,6 +1251,7 @@ URL: [url]',
 'tuesday' => 'Dienstag',
 'tuesday_abbr' => 'Di',
 'type_to_search' => 'Hier tippen zum Suchen',
+'uk_UA' => 'Ukrainisch',
 'under_folder' => 'In Ordner',
 'unknown_attrdef' => 'Unbekannte Attributdefinition',
 'unknown_command' => 'unbekannter Befehl',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 68fca393c..2002e99f1 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1208), dgrutsch (3), netixw (14)
+//    Translators: Admin (1216), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -246,6 +246,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => 'Confirm update',
 'content' => 'Content',
 'continue' => 'Continue',
+'converter_new_cmd' => 'Command',
+'converter_new_mimetype' => 'New mimetype',
 'copied_to_checkout_as' => 'File copied to checkout space as \'[filename]\'',
 'create_fulltext_index' => 'Create fulltext index',
 'create_fulltext_index_warning' => 'You are about to recreate the fulltext index. This can take a considerable amount of time and reduce your overall system performance. If you really want to recreate the index, please confirm your operation.',
@@ -712,6 +714,7 @@ If you have still problems to login, then please contact your administrator.',
 'personal_default_keywords' => 'Personal keywordlists',
 'pl_PL' => 'Polish',
 'possible_substitutes' => 'Substitutes',
+'preview_converters' => 'Preview document conversion',
 'previous_state' => 'Previous state',
 'previous_versions' => 'Previous versions',
 'pt_BR' => 'Portugese (BR)',
@@ -720,7 +723,7 @@ If you have still problems to login, then please contact your administrator.',
 'quota_is_disabled' => 'Quota support is currently disabled in the settings. Setting a user quota will have no effect until it is enabled again.',
 'quota_warning' => 'Your maximum disc usage is exceeded by [bytes]. Please remove documents or previous versions.',
 'receipt_log' => 'Reception Log',
-'receipt_summary' => '',
+'receipt_summary' => 'Receipt summary',
 'recipients' => 'Recipients',
 'refresh' => 'Refresh',
 'rejected' => 'Rejected',
@@ -1255,6 +1258,7 @@ URL: [url]',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => 'Tu',
 'type_to_search' => 'Type to search',
+'uk_UA' => 'Ukrainian',
 'under_folder' => 'In Folder',
 'unknown_attrdef' => 'Unknown attribute definition',
 'unknown_command' => 'Command not recognized.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index e50f0bb5d..eca5ed7b0 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -241,6 +241,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenido',
 'continue' => 'Continuar',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Crear índice de texto completo',
 'create_fulltext_index_warning' => 'Usted va a regenerar el índice te texto completo. Esto puede tardar un tiempo considerable y consumir capacidad de su equipo. Si realmente quiere regenerar el índice, por favor confirme la operación.',
@@ -708,6 +710,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'personal_default_keywords' => 'Listas de palabras clave personales',
 'pl_PL' => 'Polaco',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Estado anterior',
 'previous_versions' => 'Versiones anteriores',
 'pt_BR' => 'Portuges (BR)',
@@ -1234,6 +1237,7 @@ URL: [url]',
 'tuesday' => 'Martes',
 'tuesday_abbr' => 'M',
 'type_to_search' => 'Tipo de búsqueda',
+'uk_UA' => '',
 'under_folder' => 'En carpeta',
 'unknown_attrdef' => 'Definición de atributo desconocida',
 'unknown_command' => 'Orden no reconocida.',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index dca8ea389..1e7274a39 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -241,6 +241,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenu',
 'continue' => 'Continuer',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Créer un index de recherche plein texte',
 'create_fulltext_index_warning' => 'Vous allez recréer l\'index de texte intégral. Cela peut prendre une grande quantité de temps et réduire les performances de votre système dans son ensemble. Si vous voulez vraiment recréer l\'index, merci de confirmer votre opération.',
@@ -705,6 +707,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'personal_default_keywords' => 'Mots-clés personnels',
 'pl_PL' => 'Polonais',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Previous state',
 'previous_versions' => 'Versions précédentes',
 'pt_BR' => 'Portuguais (BR)',
@@ -1201,6 +1204,7 @@ URL: [url]',
 'tuesday' => 'Mardi',
 'tuesday_abbr' => 'Mar.',
 'type_to_search' => 'Effectuer une recherche',
+'uk_UA' => '',
 'under_folder' => 'Dans le dossier',
 'unknown_attrdef' => '',
 'unknown_command' => 'Commande non reconnue.',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 9647100ec..debd52606 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -241,6 +241,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Tartalom',
 'continue' => 'Folytatás',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Teljes szöveg index létrehozása',
 'create_fulltext_index_warning' => 'Ön a teljes szöveg index újraépítését kezdeményezte. Ez a művelet hosszú ideig eltarthat és jelentősen csökkentheti az egész rendszer teljesítményét. Ha biztosan újra kívánja építeni az indexet, kérjük erősítse meg a műveletet.',
@@ -708,6 +710,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'personal_default_keywords' => 'Személyes kulcsszó lista',
 'pl_PL' => 'Lengyel',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Előző állapot',
 'previous_versions' => 'Előző változatok',
 'pt_BR' => 'Portugál (BR)',
@@ -1233,6 +1236,7 @@ URL: [url]',
 'tuesday' => 'Kedd',
 'tuesday_abbr' => 'Ke',
 'type_to_search' => 'Adja meg a keresendő kifejezést',
+'uk_UA' => '',
 'under_folder' => 'Mappában',
 'unknown_attrdef' => 'Ismeretlen tulajdonság meghatározás',
 'unknown_command' => 'Parancs nem ismerhető fel.',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 1a74bbd83..8f2173cda 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -246,6 +246,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenuto',
 'continue' => 'Continua',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Crea indice fulltext',
 'create_fulltext_index_warning' => 'Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l\'indice? Prego conferma l\'operazione.',
@@ -713,6 +715,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'personal_default_keywords' => 'Parole-chiave personali',
 'pl_PL' => 'Polacco',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Stato precedente',
 'previous_versions' => 'Versioni precedenti',
 'pt_BR' => 'Portoghese (BR)',
@@ -1256,6 +1259,7 @@ URL: [url]',
 'tuesday' => 'Martedì',
 'tuesday_abbr' => 'Mar',
 'type_to_search' => 'Digitare per cercare',
+'uk_UA' => '',
 'under_folder' => 'Nella cartella',
 'unknown_attrdef' => 'Attributo sconosciuto',
 'unknown_command' => 'Comando non riconosciuto',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 67363428d..028517657 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -234,6 +234,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Welkomstpagina',
 'continue' => 'Doorgaan',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Creeer volledige tekst index',
 'create_fulltext_index_warning' => 'U staat op het punt de volledigetekst opnieuw te indexeren. Dit kan behoorlijk veel tijd en snelheid vergen van het systeem. Als u zeker bent om opnieuw te indexeren, bevestig deze actie.',
@@ -701,6 +703,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'personal_default_keywords' => 'Persoonlijke sleutelwoorden',
 'pl_PL' => 'Polen',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Vorige staat',
 'previous_versions' => 'Vorige versies',
 'pt_BR' => 'Portugees (BR)',
@@ -1225,6 +1228,7 @@ URL: [url]',
 'tuesday' => 'Dinsdag',
 'tuesday_abbr' => 'Tu',
 'type_to_search' => 'voer in om te zoeken',
+'uk_UA' => '',
 'under_folder' => 'In map',
 'unknown_attrdef' => 'Onbekende attribuut definitie',
 'unknown_command' => 'Opdracht niet herkend.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 9950b4dc4..c51c4b337 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -234,6 +234,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Zawartość',
 'continue' => 'Kontynuuj',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Utwórz indeks pełnotekstowy',
 'create_fulltext_index_warning' => 'Zamierzasz ponownie utworzyć indeks pełnotekstowy. To może zająć sporo czasu i ograniczyć ogólną wydajność systemu. Jeśli faktycznie chcesz to zrobić, proszę potwierdź tę operację.',
@@ -701,6 +703,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'personal_default_keywords' => 'Osobiste sława kluczowe',
 'pl_PL' => 'Polski',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Poprzedni stan',
 'previous_versions' => 'Poprzednie wersje',
 'pt_BR' => 'Portugalski(BR)',
@@ -1213,6 +1216,7 @@ URL: [url]',
 'tuesday' => 'Wtorek',
 'tuesday_abbr' => 'Wt',
 'type_to_search' => 'Wpisz wyszukiwane',
+'uk_UA' => '',
 'under_folder' => 'W folderze',
 'unknown_attrdef' => '',
 'unknown_command' => 'Polecenie nie rozpoznane.',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 3e38cb147..387fded47 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -241,6 +241,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Conteúdo',
 'continue' => 'Continue',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Criar índice de texto completo',
 'create_fulltext_index_warning' => 'Você está para recriar o índice de texto completo. Isso pode levar uma quantidade considerável de tempo e reduzir o desempenho geral do sistema. Se você realmente deseja recriar o índice, por favor confirme a operação.',
@@ -706,6 +708,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'personal_default_keywords' => 'palavras-chave pessoais',
 'pl_PL' => 'Polonês',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Estado anterior',
 'previous_versions' => 'Previous Versions',
 'pt_BR' => 'Português (BR)',
@@ -1231,6 +1234,7 @@ URL: [url]',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => 'Tu',
 'type_to_search' => 'Tipo de pesquisa',
+'uk_UA' => '',
 'under_folder' => 'Na pasta',
 'unknown_attrdef' => 'Definição de atributo desconhecido',
 'unknown_command' => 'Command not recognized.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 73ed5b942..89cbf7b7d 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -246,6 +246,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Conținut',
 'continue' => 'Continuă',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Creați indexul pentru tot textul',
 'create_fulltext_index_warning' => 'Sunteți pe cale sa recreați indexul pentru tot textul. Acest lucru poate dura o perioadă considerabilă de timp și poate reduce performanța sistemului în ansamblu. Dacă doriți cu adevărat să recreati indexul pentru tot textul, vă rugăm să confirmați operațiunea.',
@@ -713,6 +715,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'personal_default_keywords' => 'Liste de cuvinte cheie personale',
 'pl_PL' => 'Poloneză',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Stare precedentă',
 'previous_versions' => 'Versiune precedentă',
 'pt_BR' => 'Portugheză (BR)',
@@ -1256,6 +1259,7 @@ URL: [url]',
 'tuesday' => 'Marți',
 'tuesday_abbr' => 'Ma',
 'type_to_search' => 'Tastați pentru a căuta',
+'uk_UA' => '',
 'under_folder' => 'In Folder',
 'unknown_attrdef' => 'Definiție atribut necunoscută',
 'unknown_command' => 'Comandă nerecunoscută.',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 97c5f5657..35013d07a 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -234,6 +234,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Содержимое',
 'continue' => 'Продолжить',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Создать полнотекстовый индекс',
 'create_fulltext_index_warning' => 'Вы хотите пересоздать полнотекстовый индекс. Это займёт какое-то время и снизит производительность. Продолжить?',
@@ -698,6 +700,7 @@ URL: [url]',
 'personal_default_keywords' => 'Личный список меток',
 'pl_PL' => 'Polish',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Предыдущее состояние',
 'previous_versions' => 'Предыдущие версии',
 'pt_BR' => 'Portugese (BR)',
@@ -1224,6 +1227,7 @@ URL: [url]',
 'tuesday' => 'Вторник',
 'tuesday_abbr' => 'Вт',
 'type_to_search' => 'Введите запрос',
+'uk_UA' => '',
 'under_folder' => 'В каталоге',
 'unknown_attrdef' => '',
 'unknown_command' => 'Команда не опознана.',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index e0170cca5..0c6cf9e00 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -219,6 +219,8 @@ $text = array(
 'confirm_update_transmittalitem' => '',
 'content' => 'Obsah',
 'continue' => 'Pokračovať',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => '',
 'create_fulltext_index_warning' => '',
@@ -594,6 +596,7 @@ $text = array(
 'personal_default_keywords' => 'Osobné kľúčové slová',
 'pl_PL' => 'Polština',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => '',
 'previous_versions' => 'Predošlé verzie',
 'pt_BR' => 'Portugalčina',
@@ -1075,6 +1078,7 @@ $text = array(
 'tuesday' => 'Utorok',
 'tuesday_abbr' => '',
 'type_to_search' => '',
+'uk_UA' => '',
 'under_folder' => 'V zložke',
 'unknown_attrdef' => '',
 'unknown_command' => 'Príkaz nebol rozpoznaný.',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index bb760475d..4aedd2639 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -234,6 +234,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Innehåll',
 'continue' => 'Fortsätt',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Skapa fulltext-sökindex',
 'create_fulltext_index_warning' => 'Du håller på att skapa fulltext-sökindex. Detta kan ta mycket lång tid och sakta ner den allmänna systemprestandan. Om du verkligen vill skapa indexet, bekräfta åtgärden.',
@@ -693,6 +695,7 @@ URL: [url]',
 'personal_default_keywords' => 'Personlig nyckelordslista',
 'pl_PL' => 'polska',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Föregående status',
 'previous_versions' => 'Tidigare versioner',
 'pt_BR' => 'portugisiska (BR)',
@@ -1219,6 +1222,7 @@ URL: [url]',
 'tuesday' => 'tisdag',
 'tuesday_abbr' => 'ti',
 'type_to_search' => 'Skriv för att söka',
+'uk_UA' => '',
 'under_folder' => 'I katalogen',
 'unknown_attrdef' => 'Okännd attributdefinition',
 'unknown_command' => 'Okänt kommando.',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 81afd8e3b..9fdd39bb8 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -240,6 +240,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'İçerik',
 'continue' => 'Devam',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => 'Tam metin indeksi oluştur',
 'create_fulltext_index_warning' => 'Tam metin indeksi yeniden oluşturmak üzeresiniz. Bu işlem bir hayli uzun sürebilir ve sistem performansını olumsuz etkileyebilir. Buna rağmen indeksi oluşturmak istiyorsanız lütfen bu işlemi onaylayın.',
@@ -709,6 +711,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'personal_default_keywords' => 'Kişisel anahtar kelimeler',
 'pl_PL' => 'Polonyaca',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => 'Önceki durum',
 'previous_versions' => 'Önceki versiyonlar',
 'pt_BR' => 'Portekizce',
@@ -1235,6 +1238,7 @@ URL: [url]',
 'tuesday' => 'Salı',
 'tuesday_abbr' => 'Sa',
 'type_to_search' => 'Aranacak sözcük yazınız',
+'uk_UA' => '',
 'under_folder' => 'Klasörde',
 'unknown_attrdef' => 'Bilinmeyen nitelik tanımı',
 'unknown_command' => 'Komut anlaşılamadı.',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index a1521bd43..4278046fe 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -223,6 +223,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => '内容',
 'continue' => '继续',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => '创建全文索引',
 'create_fulltext_index_warning' => '你将重新创建全
@@ -600,6 +602,7 @@ URL: [url]',
 'personal_default_keywords' => '用户关键字',
 'pl_PL' => '波兰语',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => '',
 'previous_versions' => '先前版本',
 'pt_BR' => '葡萄牙语',
@@ -1081,6 +1084,7 @@ URL: [url]',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => '',
 'type_to_search' => '搜索类型',
+'uk_UA' => '',
 'under_folder' => '文件夹内',
 'unknown_attrdef' => '',
 'unknown_command' => '未知命令',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 2e161de9b..254ab6cf2 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -223,6 +223,8 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => '內容',
 'continue' => '繼續',
+'converter_new_cmd' => '',
+'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_fulltext_index' => '創建全文索引',
 'create_fulltext_index_warning' => '',
@@ -598,6 +600,7 @@ URL: [url]',
 'personal_default_keywords' => '用戶關鍵字',
 'pl_PL' => '波蘭語',
 'possible_substitutes' => '',
+'preview_converters' => '',
 'previous_state' => '',
 'previous_versions' => '先前版本',
 'pt_BR' => '葡萄牙語',
@@ -1079,6 +1082,7 @@ URL: [url]',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => '',
 'type_to_search' => '搜索類型',
+'uk_UA' => '',
 'under_folder' => '資料夾內',
 'unknown_attrdef' => '',
 'unknown_command' => '未知命令',

From 401e995df6436d8a6cea1a19b502a268737879c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 26 Jun 2015 12:21:48 +0200
Subject: [PATCH 0252/2006] removing a version will also remove all references

references in tblTransmittalItems, tblDocumentRevisions and
tblDocumentRecievers were not removed
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 73 ++++++++++++++++++++++---
 1 file changed, 64 insertions(+), 9 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index e6456502c..727ffdeb3 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1770,9 +1770,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function removeContent($version) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$emailList = array();
-		$emailList[] = $version->_userID;
-
 		if (file_exists( $this->_dms->contentDir.$version->getPath() ))
 			if (!SeedDMS_Core_File::removeFile( $this->_dms->contentDir.$version->getPath() ))
 				return false;
@@ -1794,6 +1791,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
+		$queryStr = "DELETE FROM `tblTransmittalItems` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
 		$queryStr = "DELETE FROM `tblDocumentStatusLog` WHERE `statusID` = '".$stID."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
@@ -1821,9 +1824,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				if(file_exists($file))
 					SeedDMS_Core_File::removeFile($file);
 			}
-			if ($st["status"]==0 && !in_array($st["required"], $emailList)) {
-				$emailList[] = $st["required"];
-			}
 		}
 
 		if (strlen($stList)>0) {
@@ -1853,9 +1853,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				if(file_exists($file))
 					SeedDMS_Core_File::removeFile($file);
 			}
-			if ($st["status"]==0 && !in_array($st["required"], $emailList)) {
-				$emailList[] = $st["required"];
-			}
 		}
 
 		if (strlen($stList)>0) {
@@ -1871,6 +1868,64 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
+		/* Remove all receipts of document version.
+		 * This implmentation is different from the above for removing approvals
+		 * and reviews. It doesn't use getReceiptStatus() but reads the database
+		 */
+		$queryStr = "SELECT * FROM tblDocumentRecipients WHERE documentID = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$resArr = $db->getResultArray($queryStr);
+		if ((is_bool($resArr) && !$resArr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		$stList = array();
+		foreach($resArr as $res) {
+			$stList[] = $res['receiptID'];
+		}
+
+		if ($stList) {
+			$queryStr = "DELETE FROM `tblDocumentReceiptLog` WHERE `receiptID` IN (".implode(',', $stList).")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$queryStr = "DELETE FROM `tblDocumentRecipients` WHERE `receiptID` IN (".implode(',', $stList).")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+		}
+
+		/* Remove all revisions of document version.
+		 * This implmentation is different from the above for removing approvals
+		 * and reviews. It doesn't use getRevisionStatus() but reads the database
+		 */
+		$queryStr = "SELECT * FROM tblDocumentRevisors WHERE documentID = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$resArr = $db->getResultArray($queryStr);
+		if ((is_bool($resArr) && !$resArr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		$stList = array();
+		foreach($resArr as $res) {
+			$stList[] = $res['revisionID'];
+		}
+
+		if ($stList) {
+			$queryStr = "DELETE FROM `tblDocumentRevisionLog` WHERE `revisionID` IN (".implode(',', $stList).")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$queryStr = "DELETE FROM `tblDocumentRevisors` WHERE `revisionID` IN (".implode(',', $stList).")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+		}
+
 		$queryStr = "DELETE FROM `tblWorkflowDocumentContent` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();

From d070f6da85f362737e81a9ddaa971f620c963101 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 26 Jun 2015 12:23:09 +0200
Subject: [PATCH 0253/2006] use access operations to check if operation is
 allowed

before, this was some own code which did not same the same
check as maySetReviewerApprover()
---
 out/out.SetReviewersApprovers.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/out/out.SetReviewersApprovers.php b/out/out.SetReviewersApprovers.php
index a9ee8a4fc..daeecb1f3 100644
--- a/out/out.SetReviewersApprovers.php
+++ b/out/out.SetReviewersApprovers.php
@@ -54,18 +54,14 @@ if(!$settings->_enableVersionModification) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_version_modification"));
 }
 
-// control for document state. Must correspond to check in
-// SeedDMS_AccessOperation::maySetReviewersApprovers()
-$overallStatus = $content->getStatus();
-if ($overallStatus["status"]!=S_DRAFT_REV && $overallStatus["status"]!=S_DRAFT_APP) {
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+if (!$accessop->maySetReviewersApprovers()) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("cannot_assign_invalid_state"));
 }
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp));
 if($view) {

From 5f46f97298ffdd024f8c8ed01852268cc4efdacc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 26 Jun 2015 16:17:02 +0200
Subject: [PATCH 0254/2006] new option -c to force recreation of index

---
 utils/indexer.php | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/utils/indexer.php b/utils/indexer.php
index 4d85614ff..e7b6de1f4 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -11,11 +11,12 @@ function usage() { /* {{{ */
 	echo "Options:\n";
 	echo "  -h, --help: print usage information and exit.\n";
 	echo "  -v, --version: print version and exit.\n";
+	echo "  -c: recreate index.\n";
 	echo "  --config: set alternative config file.\n";
 } /* }}} */
 
 $version = "0.0.1";
-$shortoptions = "hv";
+$shortoptions = "hvc";
 $longoptions = array('help', 'version', 'config:');
 if(false === ($options = getopt($shortoptions, $longoptions))) {
 	usage();
@@ -41,32 +42,45 @@ if(isset($options['config'])) {
 	$settings = new Settings();
 }
 
+/* recreate index */
+$recreate = false;
+if(isset($options['c'])) {
+	$recreate = true;
+}
+
 if(isset($settings->_extraPath))
 	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
 
 require_once("SeedDMS/Core.php");
 require_once("SeedDMS/Lucene.php");
 
-function tree($folder, $indent='') {
-	global $index, $dms, $settings;
+function tree($dms, $index, $folder, $indent='') {
+	global $settings;
 	echo $indent."D ".$folder->getName()."\n";
 	$subfolders = $folder->getSubFolders();
 	foreach($subfolders as $subfolder) {
-		tree($subfolder, $indent.'  ');
+		tree($dms, $index, $subfolder, $indent.'  ');
 	}
 	$documents = $folder->getDocuments();
 	foreach($documents as $document) {
-		echo $indent."  ".$document->getId().":".$document->getName()."\n";
+		echo $indent."  ".$document->getId().":".$document->getName()." ";
 		if(!($hits = $index->find('document_id:'.$document->getId()))) {
 			$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null));
+			echo " (Document added)\n";
 		} else {
 			$hit = $hits[0];
-			$created = (int) $hit->getDocument()->getFieldValue('created');
-			if($created >= $document->getDate()) {
-				echo $indent."    Document unchanged\n";
+			try {
+				$created = (int) $hit->getDocument()->getFieldValue('created');
+			} catch (Zend_Search_Lucene_Exception $e) {
+				$created = 0;
+			}
+			$content = $document->getLatestContent();
+			if($created >= $content->getDate()) {
+				echo " (Document unchanged)\n";
 			} else {
 				if($index->delete($hit->id)) {
 					$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, $settings->_converters['fulltext'] ? $settings->_converters['fulltext'] : null));
+					echo " (Document updated)\n";
 				}
 			}
 		}
@@ -84,11 +98,15 @@ if(!$dms->checkVersion()) {
 
 $dms->setRootFolderID($settings->_rootFolderID);
 
-$index = Zend_Search_Lucene::create($settings->_luceneDir);
+if($recreate)
+	$index = Zend_Search_Lucene::create($settings->_luceneDir);
+else
+	$index = Zend_Search_Lucene::open($settings->_luceneDir);
 SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
 
 $folder = $dms->getFolder($settings->_rootFolderID);
-tree($folder);
+tree($dms, $index, $folder);
 
 $index->commit();
+$index->optimize();
 ?>

From ad1edc8281daf5d99de5abf2808c19000582ce12 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 26 Jun 2015 16:41:36 +0200
Subject: [PATCH 0255/2006] actually use username from command line

---
 utils/adddoc.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index 2ad644b7d..7094bc5e9 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -147,9 +147,12 @@ $dms->setEnableConverting($settings->_enableConverting);
 $dms->setViewOnlineFileTypes($settings->_viewOnlineFileTypes);
 
 /* Create a global user object */
-if($username)
-	$user = $dms->getUserByLogin();
-else
+if($username) {
+	if(!($user = $dms->getUserByLogin($username))) {
+		echo "No such user '".$username."'.";
+		exit;
+	}
+} else
 	$user = $dms->getUser(1);
 
 if(is_readable($filename)) {

From 3a531462d9568291e8cbf27c96a7babee901f3b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Jun 2015 10:27:23 +0200
Subject: [PATCH 0256/2006] add static method mergeAccessLists()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 70 +++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index a48d28a4a..16880d97d 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -196,18 +196,23 @@ class SeedDMS_Core_DMS {
 	/**
 	 * Checks if a list of objects contains a single object 
 	 *
-	 * The regular php check done by '==' compares all attributes of
+	 * This function is only applicable on list containing objects which have
+	 * a method getID() because it is used to check if two objects are equal.
+	 * The regular php check on objects done by '==' compares all attributes of
 	 * two objects, which isn't required. The method will first check
 	 * if the objects are instances of the same class.
 	 *
+	 * The result of the function can be 0 which happens if the first element
+	 * of an indexed array matches.
+	 *
 	 * @param object $object1 object to look for (needle)
 	 * @param array $list list of objects (haystack)
-	 * @return boolean true if object was found, otherwise false
+	 * @return boolean/integer index in array if object was found, otherwise false
 	 */
 	static function inList($object, $list) { /* {{{ */
-		foreach($list as $item) {
+		foreach($list as $i=>$item) {
 			if(get_class($item) == get_class($object) && $item->getID() == $object->getID())
-				return true;
+				return $i;
 		}
 		return false;
 	} /* }}} */
@@ -258,7 +263,7 @@ class SeedDMS_Core_DMS {
 	 *
 	 * @param array $links list of objects of type SeedDMS_Core_DocumentLink
 	 * @param object $user user for which access is being checked
-	 * @return filtered list of links
+	 * @return array filtered list of links
 	 */
 	static function filterDocumentLinks($user, $links) { /* {{{ */
 		$tmp = array();
@@ -268,6 +273,61 @@ class SeedDMS_Core_DMS {
 		return $tmp;
 	} /* }}} */
 
+	/**
+	 * Merge access lists
+	 *
+	 * Merges two access lists. Objects of the second list will override objects
+	 * in the first list.
+	 *
+	 * @param array $first list of access rights as returned by
+	 * SeedDMS_Core_Document:: getAccessList() or SeedDMS_Core_Folder::getAccessList()
+	 * @param array $secont list of access rights
+	 * @return array merged list
+	 */
+	static function mergeAccessLists($first, $second) { /* {{{ */
+		if($first && !$second)
+			return $first;
+		if(!$first && $second)
+			return $second;
+
+		$tmp = array('users'=>array(), 'groups'=>array());
+		if(!isset($first['users']) || !isset($first['groups']) ||
+			!isset($second['users']) || !isset($second['groups']))
+			return false;
+
+		foreach ($first['users'] as $f) {
+			$new = $f;
+			foreach ($second['users'] as $i=>$s) {
+				if($f->getUserID() == $s->getUserID()) {
+					$new = $s;
+					unset($second['users'][$i]);
+					break;
+				}
+			}
+			array_push($tmp['users'], $new);
+		}
+		foreach ($seconf['users'] as $f) {
+			array_push($tmp['users'], $f);
+		}
+
+		foreach ($first['groups'] as $f) {
+			$new = $f;
+			foreach ($second['groups'] as $i=>$s) {
+				if($f->getGroupID() == $s->getGroupID()) {
+					$new = $s;
+					unset($second['groups'][$i]);
+					break;
+				}
+			}
+			array_push($tmp['groups'], $new);
+		}
+		foreach ($second['groups'] as $f) {
+			array_push($tmp['groups'], $f);
+		}
+
+		return $tmp;
+	} /* }}} */
+
 	/**
 	 * Create a new instance of the dms
 	 *

From f7d695c015b3017866975e1e489994ecb49401b3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Jun 2015 10:28:10 +0200
Subject: [PATCH 0257/2006] some initial code to recursively merge access list
 (not used yet)

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 12 ++++++++++--
 SeedDMS_Core/Core/inc.ClassFolder.php   |  8 ++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 727ffdeb3..58e016aa9 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -386,6 +386,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * @return object parent folder
 	 */
+	function getParent() { /* {{{ */
+		return self::getFolder();
+	} /* }}} */
+
 	function getFolder() { /* {{{ */
 		if (!isset($this->_folder))
 			$this->_folder = $this->_dms->getFolder($this->_folderID);
@@ -971,7 +975,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * 
 	 * @param integer $mode access mode (defaults to M_ANY)
 	 * @param integer $op operation (defaults to O_EQ)
-	 * @return array multi dimensional array
+	 * @return array multi dimensional array or false in case of an error
 	 */
 	function getAccessList($mode = M_ANY, $op = O_EQ) { /* {{{ */
 		$db = $this->_dms->getDB();
@@ -979,7 +983,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if ($this->inheritsAccess()) {
 			$res = $this->getFolder();
 			if (!$res) return false;
-			return $this->_folder->getAccessList($mode, $op);
+			$pacl = $res->getAccessList($mode, $op);
+			return $pacl;
+		} else {
+			$pacl = array("groups" => array(), "users" => array());
 		}
 
 		if (!isset($this->_accessList[$mode])) {
@@ -1006,6 +1013,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		return $this->_accessList[$mode];
+		return SeedDMS_Core_DMS::mergeAccessLists($pacl, $this->_accessList[$mode]);
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 6ce59d007..7fb9b28f1 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -915,7 +915,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 * 
 	 * @param integer $mode access mode (defaults to M_ANY)
 	 * @param integer $op operation (defaults to O_EQ)
-	 * @return array multi dimensional array
+	 * @return array multi dimensional array or false in case of an error
 	 */
 	function getAccessList($mode = M_ANY, $op = O_EQ) { /* {{{ */
 		$db = $this->_dms->getDB();
@@ -923,7 +923,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		if ($this->inheritsAccess()) {
 			$res = $this->getParent();
 			if (!$res) return false;
-			return $this->_parent->getAccessList($mode, $op);
+			$pacl = $res->getAccessList($mode, $op);
+			return $pacl;
+		} else {
+			$pacl = array("groups" => array(), "users" => array());
 		}
 
 		if (!isset($this->_accessList[$mode])) {
@@ -950,6 +953,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		}
 
 		return $this->_accessList[$mode];
+		return SeedDMS_Core_DMS::mergeAccessLists($pacl, $this->_accessList[$mode]);
 	} /* }}} */
 
 	/**

From 88739db6e72719ca165aa8d05546975298b25731 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Jun 2015 10:28:52 +0200
Subject: [PATCH 0258/2006] check if SeedDMS_Core_DMS::inList() returns boolean
 false

inList() used to return true of false. It returns the index in the
array insteaf of true
---
 op/op.EditDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 1d1d2ae67..8d1f11889 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -111,7 +111,7 @@ if (($oldname = $document->getName()) != $name) {
 
 			// if user is not owner send notification to owner
 			if ($user->getID() != $document->getOwner()->getID() &&
-				!SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
 				$notifyList['users'][] = $document->getOwner();
 			}
 			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
@@ -165,7 +165,7 @@ if (($oldcomment = $document->getComment()) != $comment) {
 
 			// if user is not owner send notification to owner
 			if ($user->getID() != $document->getOwner()->getID() &&
-				!SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
 				$notifyList['users'][] = $document->getOwner();
 			}
 			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
@@ -207,7 +207,7 @@ if ($expires != $document->getExpires()) {
 
 			// if user is not owner send notification to owner
 			if ($user->getID() != $document->getOwner()->getID() &&
-				!SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
 				$notifyList['users'][] = $document->getOwner();
 			}
 			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);

From f98aecaa590bd7e6267a8eaa84cba90fe88dbb46 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jun 2015 07:52:07 +0200
Subject: [PATCH 0259/2006] add configuration parameter to turn of database
 version check

---
 inc/inc.ClassSettings.php | 4 ++++
 inc/inc.DBInit.php        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index c748927b2..c6418cf26 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -199,6 +199,8 @@ class Settings { /* {{{ */
 	var $_showMissingTranslations = false;
 	// Extra Path to additional software, will be added to include path
 	var $_extraPath = null;
+	// do not check version of database
+	var $_doNotCheckDBVersion = false;
 	// DB-Driver used by adodb (see adodb-readme)
 	var $_dbDriver = "mysql";
 	// DB-Server
@@ -456,6 +458,7 @@ class Settings { /* {{{ */
 		$this->_dbDatabase = strval($tab["dbDatabase"]);
 		$this->_dbUser = strval($tab["dbUser"]);
 		$this->_dbPass = strval($tab["dbPass"]);
+		$this->_doNotCheckDBVersion = Settings::boolVal($tab["doNotCheckVersion"]);
 
 		// XML Path: /configuration/system/smtp
 		$node = $xml->xpath('/configuration/system/smtp');
@@ -768,6 +771,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "dbDatabase", $this->_dbDatabase);
     $this->setXMLAttributValue($node, "dbUser", $this->_dbUser);
     $this->setXMLAttributValue($node, "dbPass", $this->_dbPass);
+    $this->setXMLAttributValue($node, "doNotCheckVersion", $this->_doNotCheckVersion);
 
     // XML Path: /configuration/system/smtp
     $node = $this->getXMLNode($xml, '/configuration/system', 'smtp');
diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index c44c27854..1519dd4e0 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -47,7 +47,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 
 $dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 
-if(!$dms->checkVersion()) {
+if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
 	echo "Database update needed.";
 	exit;
 }

From 4ac3ea014c420cc2c84bfccc39da83fbe6fc4fd2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Jul 2015 16:57:01 +0200
Subject: [PATCH 0260/2006] set heading to add_approval

---
 views/bootstrap/class.ApproveDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ApproveDocument.php b/views/bootstrap/class.ApproveDocument.php
index 16e6d3523..04f104430 100644
--- a/views/bootstrap/class.ApproveDocument.php
+++ b/views/bootstrap/class.ApproveDocument.php
@@ -51,7 +51,7 @@ class SeedDMS_View_ApproveDocument extends SeedDMS_Bootstrap_Style {
 		$this->globalNavigation($folder);
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
-		$this->contentHeading(getMLText("submit_approval"));
+		$this->contentHeading(getMLText("add_approval"));
 ?>
 <script language="JavaScript">
 function checkIndForm()

From 85174c6f45599903983e9c64b689a16f740edbbd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Jul 2015 20:52:55 +0200
Subject: [PATCH 0261/2006] create list of rejected documents

---
 SeedDMS_Core/Core/inc.ClassDMS.php    |  6 +++
 views/bootstrap/class.MyDocuments.php | 57 +++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 16880d97d..47daf2ee6 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -817,6 +817,12 @@ class SeedDMS_Core_DMS {
 				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ".
 				"ORDER BY `statusDate` DESC";
 			break;
+		case 'RejectOwner': // Documents that has been rejected and I'm owning
+			$user = $param1;
+			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") ".
+				"ORDER BY `statusDate` DESC";
+			break;
 		case 'LockedByMe': // Documents locked by me
 			$user = $param1;
 			$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ".
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 201e4d77c..914fcdd83 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -441,6 +441,63 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				$this->contentContainerEnd();
 			}
 
+			/* Get list of documents owned by current user that has
+			 * been rejected.
+			 */
+			$resArr = $dms->getDocumentList('RejectOwner', $user);
+			if (is_bool($resArr) && !$resArr) {
+				$this->contentHeading(getMLText("warning"));
+				$this->contentContainer(getMLText("internal_error_exit"));
+				$this->htmlEndPage();
+				exit;
+			}
+
+			if (count($resArr)>0) {
+				$this->contentHeading(getMLText("documents_user_rejected"));
+				$this->contentContainerStart();
+
+				print "<table class=\"table table-condensed\">";
+				print "<thead>\n<tr>\n";
+				print "<th></th>";
+				print "<th>".getMLText("name")."</th>\n";
+				print "<th>".getMLText("status")."</th>\n";
+				print "<th>".getMLText("version")."</th>\n";
+				print "<th>".getMLText("last_update")."</th>\n";
+				print "<th>".getMLText("expires")."</th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["documentID"]);
+				
+					// verify expiry
+					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
+							$res["status"]=S_EXPIRED;
+						}
+					}
+				
+					print "<tr>\n";
+					$latestContent = $document->getLatestContent();
+					$previewer->createPreview($latestContent);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+					if($previewer->hasPreview($latestContent)) {
+						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					} else {
+						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					}
+					print "</a></td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+					print "<td>".getOverallStatusText($res["status"])."</td>";
+					print "<td>".$res["version"]."</td>";
+					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+					print "</tr>\n";
+				}		
+				print "</tbody></table>";	
+				
+				$this->contentContainerEnd();
+			}
+
 			$receiptStatus = $user->getReceiptStatus();
 			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
 			if (is_bool($resArr) && !$resArr) {

From 6b1124c23f1677783588962db1dbd3730a821f09 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 6 Jul 2015 16:09:25 +0200
Subject: [PATCH 0262/2006] pass folder object and not id to
 printDocumentChooser()

---
 views/bootstrap/class.AddDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 97d789256..b33edb532 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -219,7 +219,7 @@ $(document).ready(function() {
 <?php if($libraryfolder) { ?>
 		<tr>
 			<td><?php printMLText("librarydoc");?>:</td>
-			<td><?php $this->printDocumentChooser("form1", M_READ, -1, null, 'librarydoc', $libraryfolder->getID(), 1);?></td>
+			<td><?php $this->printDocumentChooser("form1", M_READ, -1, null, 'librarydoc', $libraryfolder, 1);?></td>
 		</tr>
 <?php } ?>
 		<tr>

From 51cae12fab61d8636ce39af48f005effb4160e72 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 6 Jul 2015 22:17:16 +0200
Subject: [PATCH 0263/2006] fix setting expire date (Closes: #225)

---
 op/op.EditDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 8d1f11889..9aed37e83 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -180,8 +180,8 @@ if (($oldcomment = $document->getComment()) != $comment) {
 }
 
 $expires = false;
-if (isset($_POST["expires"]) && $_POST["expires"] != "false") {
-	if($_POST["expdate"]) {
+if (!isset($_POST["expires"]) || $_POST["expires"] != "false") {
+	if(isset($_POST["expdate"]) && $_POST["expdate"]) {
 		$tmp = explode('-', $_POST["expdate"]);
 		$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
 	} else {

From 4ae913e307910f2facfe7ca47dc7477713043179 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 6 Jul 2015 21:54:03 +0200
Subject: [PATCH 0264/2006] make field for expired date larger

---
 views/bootstrap/class.SetExpires.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.SetExpires.php b/views/bootstrap/class.SetExpires.php
index 594e4837d..c6b840ae6 100644
--- a/views/bootstrap/class.SetExpires.php
+++ b/views/bootstrap/class.SetExpires.php
@@ -58,7 +58,7 @@ class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
 	<td><?php printMLText("expires");?>:</td>
 	<td>
     <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-      <input class="span4" size="16" name="expdate" type="text" value="<?php echo $expdate; ?>">
+      <input class="span6" name="expdate" type="text" value="<?php echo $expdate; ?>">
       <span class="add-on"><i class="icon-calendar"></i></span>
     </span><br />
     <label class="checkbox inline">

From 9ce168b4b638255c22c51ed41f4b6328e1f2473b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 06:51:15 +0200
Subject: [PATCH 0265/2006] list only documents to approve which have passed
 review

previously all documents that need to be approved some time were
listed. Even those documents which haven't passed review and cannot
be approved currently.
---
 views/bootstrap/class.MyDocuments.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 914fcdd83..1ce0cb9d7 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -181,7 +181,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					
 					foreach ($approvalStatus["indstatus"] as $st) {
 					
-						if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]])) {
+						if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP) {
 							$document = $dms->getDocument($st["documentID"]);
 						
 							if ($printheader){
@@ -217,7 +217,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					}
 					foreach ($approvalStatus["grpstatus"] as $st) {
 					
-						if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
+						if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
 							$document = $dms->getDocument($st["documentID"]);
 							if ($printheader){
 								print "<table class=\"table table-condensed\">";

From bab558cd5cda7f1971d9f134ee4ba103a6240cb6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 06:54:14 +0200
Subject: [PATCH 0266/2006] add entry for 4.3.20

Conflicts:
	CHANGELOG
---
 CHANGELOG | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d83f0fe06..afcb13cf9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,35 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.20
+--------------------------------------------------------------------------------
+- fix setting expire date when editing a document (Closes: #225)
+- MyDocumets: list only documents to approve which have passed review
+
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.19
+--------------------------------------------------------------------------------
+- end date in search form actually ends at the end of the day
+- allow context sensitive help
+- document chooser shows docs in root folder again
+- fixed regression from 4.3.18. Documents can not be approved if
+  review is still pending
+- polish page for document version details, add review/approval log
+- take out remaining link to old version info file
+- new configuration parameter for overriding the mimetype delivered
+  by the browser (Closes #195)
+- new option -c to force recreation of index (Closes #219)
+- username can be passed to utils/adddoc.php (Closes #214)
+
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.18
+--------------------------------------------------------------------------------
+- utils/indexer.php uses propper converter settings
+- search result can be restricted to folders or documents only
+- documents still in review can still be reviewed even if the workflow
+  mode changes to traditional_only_approval
+- approvals can be submitted, even if document was released/rejected
+- check for duplicate content on document/folder check page
+- open tab on ViewDocument page as specified in URL
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.17
 --------------------------------------------------------------------------------

From 26982d1da0a3fb6f4421f82f567dd56e010a85a7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 07:24:50 +0200
Subject: [PATCH 0267/2006] show preview image in list

---
 out/out.ApprovalSummary.php               |  7 +++++-
 out/out.ReviewSummary.php                 |  7 +++++-
 views/bootstrap/class.ApprovalSummary.php | 30 +++++++++++++++++++----
 views/bootstrap/class.ReviewSummary.php   | 28 ++++++++++++++++++---
 4 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php
index cc4b91b3a..be3b983f5 100644
--- a/out/out.ApprovalSummary.php
+++ b/out/out.ApprovalSummary.php
@@ -26,12 +26,17 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php
index 0a7bd144f..d0086c19a 100644
--- a/out/out.ReviewSummary.php
+++ b/out/out.ReviewSummary.php
@@ -27,12 +27,17 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
 if($view) {
 	$view->show();
 	exit;
diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 932b3fb7e..69bb71ff9 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -34,7 +34,10 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$db = $dms->getDB();
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
 
 		$this->htmlStartPage(getMLText("approval_summary"));
 		$this->globalNavigation();
@@ -54,8 +57,8 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$printheader = true;
 		foreach ($approvalStatus["indstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
-			if($document)
-				$version = $document->getContentByVersion($st['version']);
+			$version = $document->getContentByVersion($st['version']);
+			$previewer->createPreview($version);
 			$owner = $document->getOwner();
 			$moduser = $dms->getUser($st['required']);
 
@@ -64,6 +67,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"table-condensed\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -75,6 +79,14 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				}
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";
@@ -100,8 +112,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$printheader = true;
 		foreach ($approvalStatus["grpstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
-			if($document)
-				$version = $document->getContentByVersion($st['version']);
+			$version = $document->getContentByVersion($st['version']);
 			$owner = $document->getOwner();
 			$modgroup = $dms->getGroup($st['required']);
 
@@ -110,6 +121,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"table-condensed\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -121,6 +133,14 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 				}	
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 49001f7af..7ca1802a4 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -34,6 +34,10 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -56,8 +60,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$iRev = array();
 		foreach ($reviewStatus["indstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
-			if($document)
-				$version = $document->getContentByVersion($st['version']);
+			$version = $document->getContentByVersion($st['version']);
 			$owner = $document->getOwner();
 			$moduser = $dms->getUser($st['required']);
 
@@ -66,6 +69,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"table-condensed\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -77,6 +81,14 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				}
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";
@@ -102,8 +114,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$printheader=true;
 		foreach ($reviewStatus["grpstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
-			if($document)
-				$version = $document->getContentByVersion($st['version']);
+			$version = $document->getContentByVersion($st['version']);
 			$owner = $document->getOwner();
 			$modgroup = $dms->getGroup($st['required']);
 
@@ -112,6 +123,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"folderView\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -123,6 +135,14 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 				}		
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";

From 8e5daeb96055553f61f59207d70893f3b8e7093c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 07:25:41 +0200
Subject: [PATCH 0268/2006] add item for 4.3.20

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index afcb13cf9..c8c404277 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - fix setting expire date when editing a document (Closes: #225)
 - MyDocumets: list only documents to approve which have passed review
+- show preview image in Review/Approval summary
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.19

From 284f98778330354a75643eda993bc5b2d34874ff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 15:36:05 +0200
Subject: [PATCH 0269/2006] build tbs_template extension

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bd6225764..771ae7936 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ SRC=CHANGELOG inc conf utils index.php languages views op out controllers README
 EXTENSIONS := \
 	dynamic_content.tar.gz\
 	login_action.tar.gz\
-	example.tar.gz
+	example.tar.gz\
+	tbs_template.tar.gz
 
 PHPDOC=~/Downloads/phpDocumentor-2.8.1/bin/phpdoc
 
@@ -41,6 +42,9 @@ example.tar.gz: ext/example
 login_action.tar.gz: ext/login_action
 	tar czvf login_action.tar.gz ext/login_action
 
+tbs_template.tar.gz: ext/tbs_template
+	tar czvf tbs_template.tar.gz ext/tbs_template
+
 extensions: $(EXTENSIONS)
 
 doc:

From d146e04a13ca0e8642e43f85cc424d72e1289b22 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 15:37:37 +0200
Subject: [PATCH 0270/2006] some ul list for attributes of older versions

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index afe3cece4..60fd7da7a 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1147,7 +1147,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
 				print "<li>".getLongReadableDate($version->getDate())."</li>";
 				print "</ul>\n";
-				print "<ul class=\"documentDetail\">\n";
+				print "<ul class=\"actions unstyled\">\n";
 				$attributes = $version->getAttributes();
 				if($attributes) {
 					foreach($attributes as $attribute) {

From e4a568e6b9f6d10a39e18b36cd07cd94a38c7cff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 18:53:07 +0200
Subject: [PATCH 0271/2006] various updates and new phrases

---
 languages/ar_EG/lang.inc | 17 +++++++++----
 languages/bg_BG/lang.inc |  7 ++++++
 languages/ca_ES/lang.inc |  7 ++++++
 languages/cs_CZ/lang.inc |  7 ++++++
 languages/de_DE/lang.inc | 11 +++++++--
 languages/en_GB/lang.inc | 11 +++++++--
 languages/es_ES/lang.inc | 19 +++++++++-----
 languages/fr_FR/lang.inc | 15 +++++++++---
 languages/hu_HU/lang.inc |  7 ++++++
 languages/it_IT/lang.inc | 53 +++++++++++++++++++++++-----------------
 languages/nl_NL/lang.inc | 11 +++++++--
 languages/pl_PL/lang.inc | 11 +++++++--
 languages/pt_BR/lang.inc | 11 +++++++--
 languages/ro_RO/lang.inc |  7 ++++++
 languages/ru_RU/lang.inc | 23 +++++++++++------
 languages/sk_SK/lang.inc | 15 +++++++++---
 languages/sv_SE/lang.inc | 11 +++++++--
 languages/tr_TR/lang.inc |  7 ++++++
 languages/uk_UA/lang.inc |  4 +++
 languages/zh_CN/lang.inc | 23 +++++++++++------
 languages/zh_TW/lang.inc |  7 ++++++
 21 files changed, 214 insertions(+), 70 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 870dfaac3..4eef19485 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1247)
+//    Translators: Admin (1251)
 
 $text = array(
 'accept' => 'وافق',
@@ -51,7 +51,7 @@ URL: [url]',
 'add_approval' => 'ادخال موافقة',
 'add_document' => 'إضافة مستند',
 'add_document_link' => 'إضافة رابط',
-'add_document_notify' => '',
+'add_document_notify' => 'ﺖﺨﺼﻴﺻ ﺎﺸﻋﺍﺭ',
 'add_doc_reviewer_approver_warning' => 'ملاحظة : يتم اعتبار المستندات نهائية اذا لم يتم تعيين مراجع او موافق للمستند',
 'add_doc_workflow_warning' => 'ملاحظة : يتم اعتبار المستندات نهائية اذا لم يتم اختيار مسار عمل للمستند',
 'add_event' => 'إضافة حدث',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
 'document_already_checkedout' => '',
 'document_already_locked' => 'هذا المستند محمي ضد التعديل',
@@ -348,6 +349,7 @@ URL: [url]',
 'dump_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف مستخرج من محتوى قاعدة البيانات. بعد انشاء الملف المستخرج سيتم حفظه في مجلد البيانات الخاص بسيرفرك',
 'dump_list' => 'ملف مستخرج حالي',
 'dump_remove' => 'ازالة الملف المستخرج',
+'duplicate_content' => '',
 'edit' => 'تعديل',
 'edit_attributes' => 'تعديل السمات',
 'edit_comment' => 'تعديل تعليق',
@@ -651,7 +653,9 @@ URL: [url]',
 'no_group_members' => 'هذه المجموعة لايوجد بها اعضاء',
 'no_linked_files' => 'لايوجد ملفات مرتبطة',
 'no_previous_versions' => 'لايوجد اصدارات سابقة',
+'no_receipt_needed' => '',
 'no_review_needed' => 'لايوجد مراجعات في الانتظار',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'لايمكنك تعديل المستند. قم بمخاطبة المستخدم الذي قام بحمايته من التعديل',
 'no_user_image' => 'لا يوجد صورة متاحة',
@@ -843,12 +847,12 @@ URL: [url]',
 'select_category' => 'اضغط لاختيار قسم',
 'select_groups' => 'اضغط لاختيار مجموعة',
 'select_grp_approvers' => 'اضغط لاختيار مجموعة الموافقون',
-'select_grp_notification' => '',
+'select_grp_notification' => 'ﺎﻨﻗﺭ ﻼﺨﺘﻳﺍﺭ ﺍﻼﺸﻋﺍﺭ ﻞﻤﺠﻣﻮﻋﺓ',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'اضغط لاختيار مجموعة المراجعون',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'اضغط لاختيار موافق فردي',
-'select_ind_notification' => '',
+'select_ind_notification' => 'ﺎﻨﻗﺭ ﻼﺨﺘﻳﺍﺭ ﺍﻼﺸﻋﺍﺭ ﻞﺸﺨﺻ',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'اضغط لاختيار مراجع فردي',
 'select_ind_revisors' => '',
@@ -1018,6 +1022,8 @@ URL: [url]',
 'settings_Notification' => '',
 'settings_notwritable' => '',
 'settings_no_content_dir' => '',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
 'settings_passwordExpiration' => 'Password expiration',
@@ -1191,6 +1197,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'شكل',
@@ -1222,7 +1229,7 @@ URL: [url]',
 'tuesday' => 'الثلاثاء',
 'tuesday_abbr' => 'ث',
 'type_to_search' => 'اكتب لتبحث',
-'uk_UA' => '',
+'uk_UA' => 'ﺍﻮﻛﺭﺎﻨﻳ',
 'under_folder' => 'في المجلد',
 'unknown_attrdef' => '',
 'unknown_command' => 'لم يتم التعرف على الأمر.',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index ddd4e0d2f..473c31a0c 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -254,6 +254,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Документът е вече блокиран',
@@ -303,6 +304,7 @@ $text = array(
 'dump_creation_warning' => 'Тази операция шъ създаде дамп на базата данни. След създаването, файлът ще бъде съхранен в папката с данни на сървъра.',
 'dump_list' => 'Съществуващи дъмпове',
 'dump_remove' => 'Изтрий дъмп',
+'duplicate_content' => '',
 'edit' => 'Редактирай',
 'edit_attributes' => 'Редактирай атрибути',
 'edit_comment' => 'Редактирай коментар',
@@ -558,7 +560,9 @@ $text = array(
 'no_group_members' => 'Групата няма членове',
 'no_linked_files' => 'Няма свързани файлове',
 'no_previous_versions' => 'Няма други версии',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Рецензия не е нужна',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Вие не можете да обновите документа. Свържете се с блокирщия го потребител.',
 'no_user_image' => 'Изображение не е намерено',
@@ -883,6 +887,8 @@ $text = array(
 'settings_Notification' => 'Настройка за известяване',
 'settings_notwritable' => 'Конфигурацията не може да бъде съхранена, защото файлът на конфигурацията е само за четене.',
 'settings_no_content_dir' => 'Каталог със съдържанието',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Частичен размер на файла',
 'settings_partitionSize_desc' => 'Размер на частичните файлове в байтове, качвани чрез jumploader. Не установвявайте над максимално возможния размер, установен на сървъра.',
 'settings_passwordExpiration' => 'Валидност на парола',
@@ -1056,6 +1062,7 @@ $text = array(
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'Тема',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 5238bb72c..61578e517 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -259,6 +259,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Aquest document ja està bloquejat',
@@ -308,6 +309,7 @@ URL: [url]',
 'dump_creation_warning' => 'Amb aquesta operació es crearà un bolcat a fitxer del contingut de la base de dades. Després de la creació del bolcat, el fitxer es guardarà a la carpeta de dades del seu servidor.',
 'dump_list' => 'Fitxers de bolcat existents',
 'dump_remove' => 'Eliminar fitxer de bolcat',
+'duplicate_content' => '',
 'edit' => 'editar',
 'edit_attributes' => '',
 'edit_comment' => 'Editar comentari',
@@ -563,7 +565,9 @@ URL: [url]',
 'no_group_members' => 'Aquest grup no té membres',
 'no_linked_files' => 'No hi ha fitxers enllaçats',
 'no_previous_versions' => 'No s\'han trobat altres versions',
+'no_receipt_needed' => '',
 'no_review_needed' => 'No hi ha revisions pendents.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Aquest document no es pot actualitzar. Si us plau, contacteu amb l\'usuari que l\'ha bloquejat.',
 'no_user_image' => 'No es troba la imatge',
@@ -888,6 +892,8 @@ URL: [url]',
 'settings_Notification' => '',
 'settings_notwritable' => '',
 'settings_no_content_dir' => '',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
 'settings_passwordExpiration' => '',
@@ -1061,6 +1067,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'Tema gràfic',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 02f2ea65c..7ec45468b 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamčený',
@@ -355,6 +356,7 @@ URL: [url]',
 'dump_creation_warning' => 'Pomocí této operace můžete vytvořit soubor se zálohou databáze. Po vytvoření bude soubor zálohy uložen ve složce data vašeho serveru.',
 'dump_list' => 'Existující soubory záloh',
 'dump_remove' => 'Odstranit soubor zálohy',
+'duplicate_content' => '',
 'edit' => 'upravit',
 'edit_attributes' => 'Editovat atributy',
 'edit_comment' => 'Upravit komentář',
@@ -658,7 +660,9 @@ URL: [url]',
 'no_group_members' => 'Tato skupina nemá žádné členy',
 'no_linked_files' => 'Žádné propojené soubory',
 'no_previous_versions' => 'Nebyly nalezeny žádné jiné verze',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nic nečeká k revizi.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Proto nemůžete aktualizovat tento dokument. Prosím, kontaktujte uživatele, který ho zamknul.',
 'no_user_image' => 'nebyl nalezen žádný obrázek',
@@ -1027,6 +1031,8 @@ URL: [url]',
 'settings_Notification' => 'Nastavení upozornění',
 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.',
 'settings_no_content_dir' => 'Content directory',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Partial filesize',
 'settings_partitionSize_desc' => '',
 'settings_passwordExpiration' => 'Platnost hesla',
@@ -1200,6 +1206,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Tento mail slouží pouze pro test konfigurace SeedDMS',
 'testmail_subject' => 'Testovací mail',
 'theme' => 'Vzhled',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index df26d27fd..976828251 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2087), dgrutsch (18)
+//    Translators: Admin (2092), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -191,7 +191,7 @@ URL: [url]',
 'category_in_use' => 'Diese Kategorie wird zur Zeit von Dokumenten verwendet.',
 'category_noname' => 'Kein Kategoriename eingetragen.',
 'ca_ES' => 'Katalanisch',
-'change_assignments' => 'Zuweisungen ändern',
+'change_assignments' => 'Setze Prüfer/Freigeber',
 'change_password' => 'Passwort ändern',
 'change_password_message' => 'Ihr Passwort wurde geändert.',
 'change_recipients' => 'Empfängerliste ändern',
@@ -281,6 +281,7 @@ URL: [url]',
 'documents_to_receipt' => 'Dokumente deren Empfang bestätigt werden muss',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
+'documents_user_rejected' => 'Abgelehnte Dokumente',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
 'document_already_checkedout' => 'Dieses Dokument ist bereits ausgecheckt',
 'document_already_locked' => 'Dieses Dokument ist bereits gesperrt',
@@ -360,6 +361,7 @@ URL: [url]',
 'dump_creation_warning' => 'Mit dieser Operation können Sie einen Dump der Datenbank erzeugen. Nach der Erstellung wird der Dump im Datenordner Ihres Servers gespeichert.',
 'dump_list' => 'Vorhandene DB dumps',
 'dump_remove' => 'DB dump löschen',
+'duplicate_content' => 'Doppelte Dateien',
 'edit' => 'Bearbeiten',
 'edit_attributes' => 'Edit attributes',
 'edit_comment' => 'Kommentar bearbeiten',
@@ -662,7 +664,9 @@ URL: [url]',
 'no_group_members' => 'Diese Gruppe hat keine Mitglieder',
 'no_linked_files' => 'Keine verknüpften Dokumente',
 'no_previous_versions' => 'Keine anderen Versionen gefunden',
+'no_receipt_needed' => 'Es gibt zur Zeit keine Dokumente, die eine Empfangsbestätigung erfordern.',
 'no_review_needed' => 'Keine offenen Prüfungen.',
+'no_revision_needed' => 'Es gibt zur Zeit keine Dokumente, die eine erneute Prüfung erfordern.',
 'no_revision_planed' => 'Keine Wiederholungsprüfung des Dokuments eingeplant.',
 'no_update_cause_locked' => 'Sie können daher im Moment diese Datei nicht aktualisieren. Wenden Sie sich an den Benutzer, der die Sperrung eingerichtet hat',
 'no_user_image' => 'Kein Bild vorhanden',
@@ -1047,6 +1051,8 @@ URL: [url]',
 'settings_Notification' => 'Benachrichtigungen-Einstellungen',
 'settings_notwritable' => 'Die Konfiguration kann nicht gespeichert werden, weil die Konfigurationsdatei nicht schreibbar ist.',
 'settings_no_content_dir' => 'Content directory',
+'settings_overrideMimeType' => 'Überschreibe MimeType',
+'settings_overrideMimeType_desc' => 'Überschreibe den MimeType, der vom Browser beim Hochladen einer Datei übertragen wird. Der neue MimeType wird von SeedDMS selbst ermittelt.',
 'settings_partitionSize' => 'Partitionsgröße',
 'settings_partitionSize_desc' => 'Größe der partiellen Uploads in Bytes durch den Jumploader. Wählen Sie diesen Wert nicht größer als maximale Upload-Größe, die durch den Server vorgegeben ist.',
 'settings_passwordExpiration' => 'Passwortverfall',
@@ -1220,6 +1226,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Übernehme Gruppe von Prüfern von letzter Version.',
 'takeOverIndApprover' => 'Übernehme Einzelfreigebende von letzter Version.',
 'takeOverIndReviewer' => 'Übernehme die Einzelprüfer von der letzten Version.',
+'tasks' => 'Aufgaben',
 'testmail_body' => 'Diese Mail ist lediglich zum Test der Mail-Konfiguration von SeedDMS',
 'testmail_subject' => 'Test Mail',
 'theme' => 'Aussehen',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 2002e99f1..bc78e95d3 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1216), dgrutsch (3), netixw (14)
+//    Translators: Admin (1220), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -191,7 +191,7 @@ URL: [url]',
 'category_in_use' => 'This category is currently used by documents.',
 'category_noname' => 'No category name given.',
 'ca_ES' => 'Catalan',
-'change_assignments' => 'Change Assignments',
+'change_assignments' => 'Set reviewer/approver',
 'change_password' => 'Change password',
 'change_password_message' => 'Your password has been changed.',
 'change_recipients' => 'Change list of recipients',
@@ -281,6 +281,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents to revise',
+'documents_user_rejected' => 'Rejected documents',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
 'document_already_checkedout' => 'This document is already checked out',
 'document_already_locked' => 'This document is aleady locked',
@@ -360,6 +361,7 @@ URL: [url]',
 'dump_creation_warning' => 'With this operation you can create a dump file of your database content. After the creation the dump file will be saved in the data folder of your server.',
 'dump_list' => 'Existings dump files',
 'dump_remove' => 'Remove dump file',
+'duplicate_content' => 'Duplicate Content',
 'edit' => 'Edit',
 'edit_attributes' => 'Edit attributes',
 'edit_comment' => 'Edit comment',
@@ -662,7 +664,9 @@ URL: [url]',
 'no_group_members' => 'This group has no members',
 'no_linked_files' => 'No linked files',
 'no_previous_versions' => 'No other versions found',
+'no_receipt_needed' => '',
 'no_review_needed' => 'No review pending.',
+'no_revision_needed' => 'No revision pending.',
 'no_revision_planed' => 'No revision of document scheduled',
 'no_update_cause_locked' => 'You can therefore not update this document. Please contact the locking user.',
 'no_user_image' => 'No image found',
@@ -1054,6 +1058,8 @@ URL: [url]',
 'settings_Notification' => 'Notification settings',
 'settings_notwritable' => 'The configuration cannot be saved because the configuration file is not writable.',
 'settings_no_content_dir' => 'Content directory',
+'settings_overrideMimeType' => 'Override MimeType',
+'settings_overrideMimeType_desc' => 'Override the MimeType delivered by the browser, if a file is uploaded. The new MimeType is determined by SeedDMS itself.',
 'settings_partitionSize' => 'Partial filesize',
 'settings_partitionSize_desc' => 'Size of partial files in bytes, uploaded by jumploader. Do not set a value larger than the maximum upload size set by the server.',
 'settings_passwordExpiration' => 'Password expiration',
@@ -1227,6 +1233,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Take over group of reviewers from last version.',
 'takeOverIndApprover' => 'Take over individual approver from last version.',
 'takeOverIndReviewer' => 'Take over individual reviewer from last version.',
+'tasks' => 'Tasks',
 'testmail_body' => 'This mail is just for testing the mail configuration of SeedDMS',
 'testmail_subject' => 'Test mail',
 'theme' => 'Theme',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index eca5ed7b0..c20611613 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (942), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (948), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento ya está bloqueado',
@@ -355,6 +356,7 @@ URL: [url]',
 'dump_creation_warning' => 'Con esta operación se creará un volcado a fichero del contenido de la base de datos. Después de la creación del volcado el fichero se guardará en la carpeta de datos de su servidor.',
 'dump_list' => 'Ficheros de volcado existentes',
 'dump_remove' => 'Eliminar fichero de volcado',
+'duplicate_content' => 'Contenido duplicado',
 'edit' => 'editar',
 'edit_attributes' => 'Editar atributos',
 'edit_comment' => 'Editar comentario',
@@ -658,7 +660,9 @@ URL: [url]',
 'no_group_members' => 'Este grupo no tiene miembros',
 'no_linked_files' => 'No hay ficheros vinculados',
 'no_previous_versions' => 'No se han encontrado otras versiones',
+'no_receipt_needed' => '',
 'no_review_needed' => 'No hay revisiones pendientes.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'No puede actualizar este documento. Contacte con el usuario que lo bloqueó.',
 'no_user_image' => 'No se encontró imagen',
@@ -841,15 +845,15 @@ URL: [url]',
 'search_fulltext' => 'Buscar en texto completo',
 'search_in' => 'Buscar en',
 'search_mode_and' => 'todas las palabras',
-'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_documents' => 'Documentos sólo',
+'search_mode_folders' => 'Carpetas sólo',
 'search_mode_or' => 'al menos una palabra',
 'search_no_results' => 'No hay documentos que coincidan con su búsqueda',
 'search_query' => 'Buscar',
 'search_report' => 'Encontrados [doccount] documentos y [foldercount] carpetas en [searchtime] s.',
 'search_report_fulltext' => 'Encontrados [doccount] documentos',
-'search_resultmode' => '',
-'search_resultmode_both' => '',
+'search_resultmode' => 'Resultado de la búsqueda',
+'search_resultmode_both' => 'Documentos y carpetas',
 'search_results' => 'Resultados de la búsqueda',
 'search_results_access_filtered' => 'Los resultados de la búsqueda podrían incluir contenidos cuyo acceso ha sido denegado.',
 'search_time' => 'Tiempo transcurrido: [time] seg.',
@@ -1033,6 +1037,8 @@ URL: [url]',
 'settings_Notification' => 'Parámetros de notificación',
 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.',
 'settings_no_content_dir' => 'Carpeta de contenidos',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Tamaño de fichero parcial',
 'settings_partitionSize_desc' => 'Tamaño de ficheros parciales en bytes, subidos por jumploader. No configurar un valor mayor que el tamaño máximo de subida configurado en el servidor.',
 'settings_passwordExpiration' => 'Caducidad de contraseña',
@@ -1206,6 +1212,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'El propósito de este e-mail es probar la configuración del DMS',
 'testmail_subject' => 'E-mail de prueba',
 'theme' => 'Tema gráfico',
@@ -1237,7 +1244,7 @@ URL: [url]',
 'tuesday' => 'Martes',
 'tuesday_abbr' => 'M',
 'type_to_search' => 'Tipo de búsqueda',
-'uk_UA' => '',
+'uk_UA' => 'Ucraniano',
 'under_folder' => 'En carpeta',
 'unknown_attrdef' => 'Definición de atributo desconocida',
 'unknown_command' => 'Orden no reconocida.',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 1e7274a39..db6925dd8 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (965), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (968), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -51,7 +51,7 @@ URL: [url]',
 'add_approval' => 'Soumettre approbation',
 'add_document' => 'Ajouter un document',
 'add_document_link' => 'Ajouter un lien',
-'add_document_notify' => '',
+'add_document_notify' => 'Assigner une notification',
 'add_doc_reviewer_approver_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés si il n\'y a pas de correcteur ou d\'approbateur désigné.',
 'add_doc_workflow_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés si aucun workflow est désigné.',
 'add_event' => 'Ajouter un événement',
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en attente de correction',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents à surveiller',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ce document est déjà verrouillé',
@@ -355,6 +356,7 @@ URL: [url]',
 'dump_creation_warning' => 'Avec cette opération, vous pouvez créer une sauvegarde du contenu de votre base de données. Après la création, le fichier de sauvegarde sera sauvegardé dans le dossier de données de votre serveur.',
 'dump_list' => 'Fichiers de sauvegarde existants',
 'dump_remove' => 'Supprimer fichier de sauvegarde',
+'duplicate_content' => '',
 'edit' => 'Modifier',
 'edit_attributes' => 'Modifier les attributs',
 'edit_comment' => 'Modifier le commentaire',
@@ -657,7 +659,9 @@ URL: [url]',
 'no_group_members' => 'Ce groupe ne contient aucun membre',
 'no_linked_files' => 'Aucun fichier lié',
 'no_previous_versions' => 'Aucune autre version trouvée',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Aucune correction en attente',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Vous ne pouvez actuellement pas mettre à jour ce document. Contactez l\'utilisateur qui l\'a verrouillé.',
 'no_user_image' => 'Aucune image trouvée',
@@ -834,12 +838,12 @@ URL: [url]',
 'select_category' => 'Cliquer pour choisir une catégorie',
 'select_groups' => 'Cliquer pour choisir un groupe',
 'select_grp_approvers' => 'Cliquer pour choisir un groupe d\'approbateur',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Cliquer pour sélectionner une notification de groupe',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Cliquer pour choisir un groupe de correcteur',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Cliquer pour choisir un approbateur individuel',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Cliquer pour séleéctionner une notification individuelle',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Cliquer pour choisir un correcteur individuel',
 'select_ind_revisors' => '',
@@ -1009,6 +1013,8 @@ URL: [url]',
 'settings_Notification' => 'Notifications',
 'settings_notwritable' => 'La configuration ne peut pas être enregistré car le fichier de configuration n\'est pas accessible en écriture.',
 'settings_no_content_dir' => 'Répertoire de contenu',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Taille des fichiers partiels téléchargées par jumploader',
 'settings_partitionSize_desc' => 'Taille des fichiers partiels en octets, téléchargées par jumploader. Ne pas fixer une valeur plus grande que la taille de transfert maximale définie par le serveur.',
 'settings_passwordExpiration' => 'Expiration du mot de passe',
@@ -1182,6 +1188,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'Thème',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index debd52606..6b0e30e38 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ez a dokumentum már zárolt',
@@ -355,6 +356,7 @@ URL: [url]',
 'dump_creation_warning' => 'Ezzel a művelettel az adatbázis tartalmáról lehet adatbázis mentést készíteni. Az adatbázis mentés létrehozását követően a mentési állomány a kiszolgáló adat mappájába lesz mentve.',
 'dump_list' => 'Meglévő adatbázis metések',
 'dump_remove' => 'Adatbázis mentés eltávolítása',
+'duplicate_content' => '',
 'edit' => 'Szerkesztés',
 'edit_attributes' => 'Jellemzők szerkesztése',
 'edit_comment' => 'Megjegyzés szerkesztése',
@@ -658,7 +660,9 @@ URL: [url]',
 'no_group_members' => 'Ennek a csoportnak nincsenek tagjai',
 'no_linked_files' => 'Nincsenek hivatkozott állományok',
 'no_previous_versions' => 'Nem találhatók más változatok',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nincs folyamatban lévő felülvizsgálat.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Emiatt nem módosíthatja a dokumentumot. Kérjük lépjen kapcsolatba a zároló felhasználóval.',
 'no_user_image' => 'Kép nem található',
@@ -1032,6 +1036,8 @@ URL: [url]',
 'settings_Notification' => 'Értesítés beállításai',
 'settings_notwritable' => 'A konfiguráció nem menthető, mert a konfigurációs állomány nem írható.',
 'settings_no_content_dir' => 'Tartalom könyvtár',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Részleges fájlméret',
 'settings_partitionSize_desc' => 'A részleges állományok mérete, amelyek a jumploader segítségével lesznek feltöltve. Ne adjon meg magasabb értéket, mint a szerveren beállított legnagyobb feltölthető állomány méret.',
 'settings_passwordExpiration' => 'Jelszó lejárat',
@@ -1205,6 +1211,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Ez az üzenet a SeedDMS levelezési beállításainak tesztelésére szolgál',
 'testmail_subject' => 'Teszt üzenet',
 'theme' => 'Téma',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 8f2173cda..4d35773a1 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1361), s.pnt (26)
+//    Translators: Admin (1384), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -51,7 +51,7 @@ URL: [url]',
 'add_approval' => 'Invio approvazione',
 'add_document' => 'Aggiungi documento',
 'add_document_link' => 'Aggiungi collegamento',
-'add_document_notify' => '',
+'add_document_notify' => 'Notifica a',
 'add_doc_reviewer_approver_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come rilasciati se non è stato assegnato un revisore o un approvatore.',
 'add_doc_workflow_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come rilasciati se non è stato istituito un flusso di lavoro.',
 'add_event' => 'Aggiungi un evento',
@@ -118,7 +118,7 @@ URL: [url]',
 'approver_already_removed' => '',
 'april' => 'Aprile',
 'archive_creation' => 'Creazione archivi',
-'archive_creation_warning' => 'Con questa operazione è possibile creare archivi contenenti i file di intere cartelle del DMS. Dopo la creazione l\'archivio viene salvato nella cartella dati del server.<br>Attenzione: un archivio creato per uso esterno non è utilizzabile come backup del server.',
+'archive_creation_warning' => 'Con questa operazione è possibile creare archivi contenenti i file di intere cartelle del DMS. Dopo la creazione l\'archivio viene salvato nella cartella dati del server. Attenzione: un archivio creato per uso esterno non è utilizzabile come backup del server.',
 'ar_EG' => 'Arabo',
 'assign_approvers' => 'Assegna Approvatori',
 'assign_reviewers' => 'Assegna Revisori',
@@ -231,18 +231,18 @@ URL: [url]',
 'comment_for_current_version' => 'Commento per la versione',
 'confirm_create_fulltext_index' => 'Sì, desidero ricreare l\'indice fulltext!',
 'confirm_pwd' => 'Conferma la password',
-'confirm_rm_backup' => 'Vuoi davvero rimuovere il file "[arkname]"?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_document' => 'Vuoi veramente eliminare il documento "[documentname]"?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_dump' => 'Vuoi davvero rimuovere il file "[dumpname]"?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_event' => 'Vuoi davvero rimuovere l\'evento "[name]"?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_file' => 'Vuoi veramente eliminare il file "[name]" del documento "[documentname]"?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_folder' => 'Vuoi veramente eliminare la cartella "[foldername]" e tutto il suo contenuto?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_folder_files' => 'Vuoi davvero rimuovere tutti i file dalla cartella "[foldername]" e dalle sue sottocartelle?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_group' => 'Vuoi davvero rimuovere il gruppo "[groupname]"?<br>Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_backup' => 'Vuoi davvero rimuovere il file "[arkname]"? Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_document' => 'Vuoi veramente eliminare il documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_dump' => 'Vuoi davvero rimuovere il file "[dumpname]"? Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_event' => 'Vuoi davvero rimuovere l\'evento "[name]"? Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_file' => 'Vuoi veramente eliminare il file "[name]" del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_folder' => 'Vuoi veramente eliminare la cartella "[foldername]" e tutto il suo contenuto? Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_folder_files' => 'Vuoi davvero rimuovere tutti i file dalla cartella "[foldername]" e dalle sue sottocartelle? Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_group' => 'Vuoi davvero rimuovere il gruppo "[groupname]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_log' => 'Vuoi davvero rimuovere il file di log "[logname]"?<br>Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_transmittalitem' => '',
-'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"?<br>Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenuto',
 'continue' => 'Continua',
@@ -281,6 +281,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Questo documento è già bloccato',
@@ -360,6 +361,7 @@ URL: [url]',
 'dump_creation_warning' => 'Con questa operazione è possibile creare un file di dump del contenuto del database. Dopo la creazione il file viene salvato nella cartella dati del server.',
 'dump_list' => 'List dei dump presenti',
 'dump_remove' => 'Cancella il file di dump',
+'duplicate_content' => 'Contenuto Duplicato',
 'edit' => 'Modifica',
 'edit_attributes' => 'Modifica gli attributi',
 'edit_comment' => 'Modifica il commento',
@@ -551,7 +553,7 @@ URL: [url]',
 'lock_document' => 'Blocca',
 'lock_message' => 'Questo documento è bloccato da <a href="mailto:[email]">[username]</a>. Solo gli utenti autorizzati possono sbloccare questo documento.',
 'lock_status' => 'Stato bloccaggio',
-'login' => 'Login',
+'login' => 'Accesso',
 'login_disabled_text' => 'Il tuo account è stato disabilitato: troppi login falliti.',
 'login_disabled_title' => 'L\'Account è disabilitato',
 'login_error_text' => 'Errore nel login. ID utente o password errati.',
@@ -663,7 +665,9 @@ URL: [url]',
 'no_group_members' => 'Questo gruppo non ha membri',
 'no_linked_files' => 'Nessun file collegato',
 'no_previous_versions' => 'Nessun\'altra versione trovata',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nessuna revisione in sospeso.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Non è quindi possible aggiornare il documento. Prego contattare l\'utente che l\'ha bloccato.',
 'no_user_image' => 'Nessuna immagine trovata',
@@ -674,7 +678,7 @@ URL: [url]',
 'october' => 'Ottobre',
 'old' => 'Vecchio',
 'only_jpg_user_images' => 'Possono essere utilizzate solo immagini di tipo jpeg',
-'order_by_sequence_off' => '',
+'order_by_sequence_off' => 'Ordina in sequenza disabilitato',
 'original_filename' => 'Nome file originale',
 'owner' => 'Proprietario',
 'ownership_changed_email' => 'Proprietario cambiato',
@@ -863,15 +867,15 @@ URL: [url]',
 'search_fulltext' => 'Ricerca fulltext',
 'search_in' => 'Cerca in',
 'search_mode_and' => 'tutte le parole',
-'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_documents' => 'Solo Documenti',
+'search_mode_folders' => 'Solo Cartelle',
 'search_mode_or' => 'almeno una parola',
 'search_no_results' => 'Non ci sono documenti che soddisfino la vostra ricerca',
 'search_query' => 'Cerca per',
 'search_report' => 'Trovati [doccount] documenti e [foldercount] cartelle in [searchtime] secondi.',
 'search_report_fulltext' => 'Trovati [doccount] documenti',
-'search_resultmode' => '',
-'search_resultmode_both' => '',
+'search_resultmode' => 'Risultato Ricerca',
+'search_resultmode_both' => 'Documenti e Cartelle',
 'search_results' => 'Risultato ricerca',
 'search_results_access_filtered' => 'La ricerca può produrre risultati al cui contenuto è negato l\'accesso.',
 'search_time' => 'Tempo trascorso: [time] secondi.',
@@ -880,12 +884,12 @@ URL: [url]',
 'select_category' => 'Clicca per selezionare la categoria',
 'select_groups' => 'Clicca per selezionare i gruppi',
 'select_grp_approvers' => 'Seleziona gruppo approvatore',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Seleziona Gruppo',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Seleziona gruppo revisore',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Seleziona approvatore',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Seleziona Utente',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Seleziona revisore',
 'select_ind_revisors' => '',
@@ -1055,6 +1059,8 @@ URL: [url]',
 'settings_Notification' => 'Impostazioni di notifica',
 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.',
 'settings_no_content_dir' => 'Cartella contenitore',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Dimensione file parziale',
 'settings_partitionSize_desc' => 'Dimensione parziale dei files caricati da Jumploader in bytes. Non impostare un valore maggiore del massimo carico di upload attribuito dal server.',
 'settings_passwordExpiration' => 'Scadenza Password',
@@ -1155,7 +1161,7 @@ URL: [url]',
 'set_password' => 'Imposta Password',
 'set_workflow' => 'Imposta il flusso di lavoro',
 'signed_in_as' => 'Utente',
-'sign_in' => 'Registrati',
+'sign_in' => 'Accesso',
 'sign_out' => 'Disconnettiti',
 'sign_out_user' => 'Disconnetti l\'utente',
 'sk_SK' => 'Slovacco',
@@ -1228,6 +1234,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Riprendi il gruppo dei revisori dall\'ultima versione.',
 'takeOverIndApprover' => 'Riprendi l\'approvatore dall\'ultima versione.',
 'takeOverIndReviewer' => 'Riprendi il revisore dall\'ultima versione.',
+'tasks' => '',
 'testmail_body' => 'Questo messaggio di posta elettronica è solo un test per verificare la configurazione del repository',
 'testmail_subject' => 'Messaggio di test',
 'theme' => 'Tema',
@@ -1259,7 +1266,7 @@ URL: [url]',
 'tuesday' => 'Martedì',
 'tuesday_abbr' => 'Mar',
 'type_to_search' => 'Digitare per cercare',
-'uk_UA' => '',
+'uk_UA' => 'Ucraino',
 'under_folder' => 'Nella cartella',
 'unknown_attrdef' => 'Attributo sconosciuto',
 'unknown_command' => 'Comando non riconosciuto',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 028517657..21a7e2fa2 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (694), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (695), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 'accept' => 'Accept',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Dit document is al geblokkeerd',
@@ -348,6 +349,7 @@ URL: [url]',
 'dump_creation_warning' => 'M.b.v. deze functie maakt U een DB dump file. het bestand wordt opgeslagen in uw data-map op de Server',
 'dump_list' => 'Bestaande dump bestanden',
 'dump_remove' => 'Verwijder dump bestand',
+'duplicate_content' => '',
 'edit' => 'Wijzigen',
 'edit_attributes' => 'Bewerk attributen',
 'edit_comment' => 'Wijzig commentaar',
@@ -650,7 +652,9 @@ URL: [url]',
 'no_group_members' => 'Deze Groep heeft geen leden',
 'no_linked_files' => 'Geen gekoppelde bestanden',
 'no_previous_versions' => 'Geen andere versie(s) gevonden',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Geen review bezig.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'U kunt daarom dit document niet bijwerken. Neem contact op met de persoon die het document heeft geblokkeerd.',
 'no_user_image' => 'Geen afbeelding(en) gevonden',
@@ -1024,6 +1028,8 @@ URL: [url]',
 'settings_Notification' => 'Notificatie instellingen',
 'settings_notwritable' => 'De configuratie kan niet opgeslagen worden omdat het configuratiebestand niet beschrijfbaar is.',
 'settings_no_content_dir' => 'Inhoud map',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Bestandsdeel grootte',
 'settings_partitionSize_desc' => 'Grootte van bestandsdeel in bytes, geupload door jumploader. Zet de waarde niet hoger dan de maximum upload grootte van de server.',
 'settings_passwordExpiration' => 'Wachtwoord verloop',
@@ -1197,6 +1203,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Deze mail dient enkel voor het testen van de mail configuratie van SeedDMS',
 'testmail_subject' => 'Test mail',
 'theme' => 'Thema',
@@ -1228,7 +1235,7 @@ URL: [url]',
 'tuesday' => 'Dinsdag',
 'tuesday_abbr' => 'Tu',
 'type_to_search' => 'voer in om te zoeken',
-'uk_UA' => '',
+'uk_UA' => 'Oekraïne',
 'under_folder' => 'In map',
 'unknown_attrdef' => 'Onbekende attribuut definitie',
 'unknown_command' => 'Opdracht niet herkend.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index c51c4b337..f7d0dd4bb 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (707), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (708), netixw (84), romi (93), uGn (112)
 
 $text = array(
 'accept' => 'Akceptuj',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Ten dokument jest już zablokowany',
@@ -348,6 +349,7 @@ URL: [url]',
 'dump_creation_warning' => 'Ta operacja utworzy plik będący zrzutem zawartości bazy danych. Po utworzeniu plik zrzutu będzie się znajdował w folderze danych na serwerze.',
 'dump_list' => 'Istniejące pliki zrzutu',
 'dump_remove' => 'Usuń plik zrzutu',
+'duplicate_content' => '',
 'edit' => 'Edytuj',
 'edit_attributes' => 'Zmiana atrybutów',
 'edit_comment' => 'Edytuj komentarz',
@@ -651,7 +653,9 @@ URL: [url]',
 'no_group_members' => 'Ta grupa nie ma członków',
 'no_linked_files' => 'Brak powiązanych dokumentów',
 'no_previous_versions' => 'Nie znaleziono poprzednich wersji',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Brak dokumentów w trakcie opiniowania.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Nie możesz zaktualizować tego dokumentu. Proszę skontaktuj się z osobą która go blokuje.',
 'no_user_image' => 'Nie znaleziono obrazu',
@@ -1012,6 +1016,8 @@ URL: [url]',
 'settings_Notification' => 'Ustawienia powiadomień',
 'settings_notwritable' => 'Konfiguracja nie może zostać zapisana ponieważ plik konfiguracyjny nie jest zapisywalny.',
 'settings_no_content_dir' => 'Katalog treści',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Rozmiar części pliku',
 'settings_partitionSize_desc' => 'Rozmiar części pliku, w bajtach, wczytywane przez jumploader. Nie wpisuj wartości większej niż maksymalna wartość wczytywanego pliku ustawiona na serwerze.',
 'settings_passwordExpiration' => 'Wygaśnięcie hasła',
@@ -1185,6 +1191,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'To jest mail testowy SeedDMS',
 'testmail_subject' => 'Wiadomość testowa',
 'theme' => 'Wygląd',
@@ -1216,7 +1223,7 @@ URL: [url]',
 'tuesday' => 'Wtorek',
 'tuesday_abbr' => 'Wt',
 'type_to_search' => 'Wpisz wyszukiwane',
-'uk_UA' => '',
+'uk_UA' => 'Ukrainski',
 'under_folder' => 'W folderze',
 'unknown_attrdef' => '',
 'unknown_command' => 'Polecenie nie rozpoznane.',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 387fded47..a4ba1ec90 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (878), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (879), flaviove (627), lfcristofoli (352)
 
 $text = array(
 'accept' => 'Aceitar',
@@ -276,6 +276,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Este documento já está travado',
@@ -354,6 +355,7 @@ URL: [url]',
 'dump_creation_warning' => 'With this operation you can create a dump file of your database content. After the creation the dump file will be saved in the data folder of your server.',
 'dump_list' => 'Existings dump files',
 'dump_remove' => 'Remove dump file',
+'duplicate_content' => '',
 'edit' => 'editar',
 'edit_attributes' => 'Editar atributos',
 'edit_comment' => 'Editar comentário',
@@ -656,7 +658,9 @@ URL: [url]',
 'no_group_members' => 'Este grupo não tem membros',
 'no_linked_files' => 'Não há arquivos vinculados',
 'no_previous_versions' => 'No other versions found',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nenhuma revisão pendente.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Por isso você não pode atualizar este documento. Por favor contacte usuário que poáui a trava.',
 'no_user_image' => 'não foi encontrado imagem de perfil',
@@ -1030,6 +1034,8 @@ URL: [url]',
 'settings_Notification' => 'Configurações de notificação',
 'settings_notwritable' => 'A configuração não pode ser salva porque o arquivo de configuração não é gravável.',
 'settings_no_content_dir' => 'Diretório de conteúdo',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Tamanho de arquivo parcial',
 'settings_partitionSize_desc' => 'Tamanho dos arquivos parciais em bytes, enviados por jumploader. Não defina um valor maior do que o tamanho máximo de carregamento definido pelo servidor.',
 'settings_passwordExpiration' => 'Expiração de senha',
@@ -1122,7 +1128,7 @@ URL: [url]',
 'settings_workflowMode_desc' => 'O fluxo de trabalho avançado permite especificar seu próprio fluxo de trabalho de liberação de versões de documentos.',
 'settings_workflowMode_valadvanced' => 'avançado',
 'settings_workflowMode_valtraditional' => 'tradicional',
-'settings_workflowMode_valtraditional_only_approval' => '',
+'settings_workflowMode_valtraditional_only_approval' => 'tradicional (sem revisão)',
 'settings_zendframework' => 'Zend Framework',
 'set_expiry' => 'Configurar Expiração',
 'set_owner' => 'Define proprietário',
@@ -1203,6 +1209,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Este e-mail é apenas para testar a configuração de correio de SeedDMS',
 'testmail_subject' => 'Email Teste',
 'theme' => 'Tema',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 89cbf7b7d..0ea912613 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -281,6 +281,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_to_revise' => 'Documente de revizut',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
 'document_already_checkedout' => 'Acest document este deja verificat',
 'document_already_locked' => 'Acest document este deja blocat',
@@ -360,6 +361,7 @@ URL: [url]',
 'dump_creation_warning' => 'Cu această operațiune puteți crea un fișier de imagine a conținutului bazei de date. După crearea fișierului de imagine acesta va fi salvat în folderul de date a serverului.',
 'dump_list' => 'Fișiere imagine existente',
 'dump_remove' => 'Sterge fișier imagine',
+'duplicate_content' => '',
 'edit' => 'Editează',
 'edit_attributes' => 'Editează atribute',
 'edit_comment' => 'Editează comentariu',
@@ -663,7 +665,9 @@ URL: [url]',
 'no_group_members' => 'Acest grup nu are membri',
 'no_linked_files' => 'Nici un fișiere asociate',
 'no_previous_versions' => 'Nu sunt alte versiuni gasite',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Nici o revizuire în așteptare.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Deci, nu puteti sa actualizati acest document. Vă rugăm să contactați administratorul.',
 'no_user_image' => 'Nu au fost găsite imagini',
@@ -1055,6 +1059,8 @@ URL: [url]',
 'settings_Notification' => 'Setările de notificare',
 'settings_notwritable' => 'Configurația nu poate fi salvată deoarece fișierul de configurare nu poate fi scris.',
 'settings_no_content_dir' => 'Director conținut',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Dimensiune fișier parțială',
 'settings_partitionSize_desc' => 'Mărimea fișierelor parțiale în bytes, încărcate de jumploader. Nu setați o valoare mai mare decât dimensiunea maximă de încărcare stabilită de server.',
 'settings_passwordExpiration' => 'Expirare parolă',
@@ -1228,6 +1234,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Preia grupul de revizuitori din ultima versiune.',
 'takeOverIndApprover' => 'Preia aprobatorul individual din ultima versiune.',
 'takeOverIndReviewer' => 'Preia revizuitorul individual din ultima versiune.',
+'tasks' => '',
 'testmail_body' => 'Acest e-mail este doar pentru testarea configurarea email din SeedDMS',
 'testmail_subject' => 'Mail de test',
 'theme' => 'Temă',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 35013d07a..753672aa8 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1251)
+//    Translators: Admin (1258)
 
 $text = array(
 'accept' => 'Принять',
@@ -188,12 +188,12 @@ URL: [url]',
 'charts' => 'Диаграммы',
 'chart_docsaccumulated_title' => 'Количество документов',
 'chart_docspercategory_title' => '',
-'chart_docspermimetype_title' => '',
-'chart_docspermonth_title' => '',
-'chart_docsperstatus_title' => '',
+'chart_docspermimetype_title' => 'Документы по mime типам',
+'chart_docspermonth_title' => 'Новые документы за месяц',
+'chart_docsperstatus_title' => 'Документы по статусу',
 'chart_docsperuser_title' => 'Документы на пользователя',
-'chart_selection' => '',
-'chart_sizeperuser_title' => '',
+'chart_selection' => 'Выбор графика',
+'chart_sizeperuser_title' => 'Занятое дисковое пространство по пользователям',
 'checkedout_file_has_different_version' => '',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Документ уже заблокирован',
@@ -348,6 +349,7 @@ URL: [url]',
 'dump_creation_warning' => 'Эта операция создаст дамп базы данных. После создания, файл будет сохранен в каталоге данных сервера.',
 'dump_list' => 'Существующие дампы',
 'dump_remove' => 'Удалить дамп',
+'duplicate_content' => '',
 'edit' => 'Изменить',
 'edit_attributes' => 'Изменить атрибуты',
 'edit_comment' => 'Изменить комментарий',
@@ -650,7 +652,9 @@ URL: [url]',
 'no_group_members' => 'Группа не имеет членов',
 'no_linked_files' => 'Нет связанных документов',
 'no_previous_versions' => 'Нет предыдущих версий',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Рецензия не требуется',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Вы не можете обновить документ. Свяжитесь с заблокировавшим его пользователем.',
 'no_user_image' => 'Изображение не найдено',
@@ -1023,6 +1027,8 @@ URL: [url]',
 'settings_Notification' => 'Настройки извещения',
 'settings_notwritable' => 'Конфигурация не может быть сохранена, потому что файл конфигурации только для чтения.',
 'settings_no_content_dir' => 'Каталог содержимого',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Частичный размер файла',
 'settings_partitionSize_desc' => 'Размер частичных файлов в байтах, загружаемых через jumploader. Не устанавливать выше максимально возможного размера, установленного на сервере.',
 'settings_passwordExpiration' => 'Истечение пароля',
@@ -1044,10 +1050,10 @@ URL: [url]',
 'settings_php_version' => 'Версия PHP',
 'settings_presetExpirationDate' => '',
 'settings_presetExpirationDate_desc' => '',
-'settings_previewWidthDetail' => '',
+'settings_previewWidthDetail' => 'Ширина картинок предварительного просмотра (детально)',
 'settings_previewWidthDetail_desc' => 'Ширина изображения для предпросмотра на странице информации',
 'settings_previewWidthList' => 'Ширина изображения для предпросмотра (список)',
-'settings_previewWidthList_desc' => '',
+'settings_previewWidthList_desc' => 'Ширина картинок предварительного просмотра показана в списках',
 'settings_printDisclaimer' => 'Выводить предупреждение',
 'settings_printDisclaimer_desc' => 'Если включено, то предупреждение из lang.inc будет выводится внизу каждой страницы.',
 'settings_quota' => 'Квота пользователя',
@@ -1196,6 +1202,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Это тестовое письмо для проверки настроек почты SeedDMS',
 'testmail_subject' => 'Тестовое письмо',
 'theme' => 'Тема',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 0c6cf9e00..77453d4f7 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (462)
+//    Translators: Admin (465)
 
 $text = array(
 'accept' => 'Prijať',
@@ -254,6 +254,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Tento dokument je už zamknutý',
@@ -297,12 +298,13 @@ $text = array(
 'draft_pending_review' => 'Návrh - čaká na kontrolu',
 'drag_icon_here' => 'Sem myšou pretiahnite ikonu, zložku alebo dokument',
 'dropfolder_file' => '',
-'dropupload' => '',
+'dropupload' => 'Rýchlo nahraj',
 'drop_files_here' => 'Sem vložte súbory!',
 'dump_creation' => 'Vytvorenie výstupu DB',
 'dump_creation_warning' => 'Touto akciou môžete vytvoriť výstup obsahu Vašej databázy. Po vytvorení bude výstup uložený v dátovej zložke vášho servera.',
 'dump_list' => 'Existujúce výstupy',
 'dump_remove' => 'Odstrániť vystup',
+'duplicate_content' => '',
 'edit' => 'upraviť',
 'edit_attributes' => '',
 'edit_comment' => 'Upraviť komentár',
@@ -558,7 +560,9 @@ $text = array(
 'no_group_members' => 'Táto skupina nemá žiadnych členov',
 'no_linked_files' => 'No linked files',
 'no_previous_versions' => 'Neboli nájdené žiadne iné verzie',
+'no_receipt_needed' => '',
 'no_review_needed' => 'No review pending.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Preto nemôžete aktualizovať tento dokument. Prosím, kontaktujte používateľa, ktorý ho zamkol.',
 'no_user_image' => 'nebol nájdený žiadny obrázok',
@@ -705,7 +709,7 @@ $text = array(
 'search_time' => 'Uplynulý čas: [time] sek',
 'seconds' => '',
 'selection' => 'Výber',
-'select_category' => '',
+'select_category' => 'Vyber kategóriu',
 'select_groups' => '',
 'select_grp_approvers' => '',
 'select_grp_notification' => '',
@@ -883,6 +887,8 @@ $text = array(
 'settings_Notification' => '',
 'settings_notwritable' => '',
 'settings_no_content_dir' => '',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
 'settings_passwordExpiration' => '',
@@ -1056,6 +1062,7 @@ $text = array(
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => 'Vzhľad',
@@ -1082,7 +1089,7 @@ $text = array(
 'under_folder' => 'V zložke',
 'unknown_attrdef' => '',
 'unknown_command' => 'Príkaz nebol rozpoznaný.',
-'unknown_document_category' => '',
+'unknown_document_category' => 'Neznáma kategória',
 'unknown_group' => 'Neznámy ID skupiny',
 'unknown_id' => 'Neznáme ID',
 'unknown_keyword_category' => 'Neznáma kategória',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 4aedd2639..f69ecaa07 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1089), tmichelfelder (106)
+//    Translators: Admin (1091), tmichelfelder (106)
 
 $text = array(
 'accept' => 'Godkänn',
@@ -269,6 +269,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokument som du behöver granska/godkänna',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Detta dokument är redan låst',
@@ -348,6 +349,7 @@ URL: [url]',
 'dump_creation_warning' => 'Med denna funktion kan du skapa en dumpfil av innehållet i din databas. När dumpfilen har skapats, kommer den att sparas i datamappen på servern.',
 'dump_list' => 'Befintliga dumpfiler',
 'dump_remove' => 'Ta bort dumpfil',
+'duplicate_content' => 'Duplicera innehåll',
 'edit' => 'Ändra',
 'edit_attributes' => 'Ändra attribut',
 'edit_comment' => 'Ändra kommentar',
@@ -651,7 +653,9 @@ URL: [url]',
 'no_group_members' => 'Denna grupp har inga medlemmar',
 'no_linked_files' => 'Inga länkade dokumenter',
 'no_previous_versions' => 'Inga andra versioner hittades.',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Det finns inga dokument som du behöver granska.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Därför kan du inte uppdatera detta dokument. Ta kontakt med användaren som låst dokumentet.',
 'no_user_image' => 'Ingen bild hittades',
@@ -1018,6 +1022,8 @@ URL: [url]',
 'settings_Notification' => 'Meddelandeinställningar',
 'settings_notwritable' => 'Konfigurationen kunde inte sparas, eftersom konfigurationsfilen inte är skrivbar.',
 'settings_no_content_dir' => 'Mapp för innehåll',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Uppdelad filstorlek',
 'settings_partitionSize_desc' => 'Storlek hos uppdelade filer i bytes som laddades upp med jumploader. Sätt inte ett värde som är större än den högsta tillåtna storleken på servern.',
 'settings_passwordExpiration' => 'Lösenord utgångsdatum',
@@ -1191,6 +1197,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => 'Denna epost är bara till för att testa epost inställningarna av SeedDMS.',
 'testmail_subject' => 'Test epost',
 'theme' => 'Visningstema',
@@ -1222,7 +1229,7 @@ URL: [url]',
 'tuesday' => 'tisdag',
 'tuesday_abbr' => 'ti',
 'type_to_search' => 'Skriv för att söka',
-'uk_UA' => '',
+'uk_UA' => 'Ukrainska',
 'under_folder' => 'I katalogen',
 'unknown_attrdef' => 'Okännd attributdefinition',
 'unknown_command' => 'Okänt kommando.',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 9fdd39bb8..6b18cf2d6 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -275,6 +275,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
 'document_already_checkedout' => '',
 'document_already_locked' => 'Bu doküman zaten kilitli',
@@ -354,6 +355,7 @@ URL: [url]',
 'dump_creation_warning' => 'Bu işlemle veritabanınızın dump dosyasını oluşturabilirsiniz. Dump dosyası sunucunuzdaki data klasörüne kaydedilcektir.',
 'dump_list' => 'Mevcut dump dosyaları',
 'dump_remove' => 'Dump dosyasını sil',
+'duplicate_content' => '',
 'edit' => 'Düzenle',
 'edit_attributes' => 'Nitelikleri düzenle',
 'edit_comment' => 'Açıklamayı düzenle',
@@ -657,7 +659,9 @@ URL: [url]',
 'no_group_members' => 'Bu grubun hiç üyesi yok',
 'no_linked_files' => 'Link verilmiş dosya yok',
 'no_previous_versions' => 'Başka versiyon yok',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Bekleyen kontrol yok.',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Bu doküman kilitli olduğundan güncellenemez. Lütfen kilitleyen kullanıcıyla görüşünüz.',
 'no_user_image' => 'Resim bulunamadı',
@@ -1034,6 +1038,8 @@ URL: [url]',
 'settings_Notification' => 'Bildirim ayarları',
 'settings_notwritable' => 'Konfigürasyon dosyası yazılabilir olmadığından ayarlar kaydedilmeyecek.',
 'settings_no_content_dir' => 'İçerik dizini',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Kısmi dosya boyutu',
 'settings_partitionSize_desc' => 'Jumploader ile yüklenecek dosyaların byte cinsinden kısmi dosya boyutu. Sunucu tarafından tanımlanandan daha büyük bir değer girmeyiniz.',
 'settings_passwordExpiration' => 'Parola geçerlilik süresi',
@@ -1207,6 +1213,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Bir önceki versiyon kontrolünü yapan grubu al.',
 'takeOverIndApprover' => 'Bir önceki versiyonu onaylayanı al.',
 'takeOverIndReviewer' => 'Bir önceki versiyonu kontrol edeni al.',
+'tasks' => '',
 'testmail_body' => 'Bu mail SeedDMS mail sisteminin kontrolü amacıyla gönderilmiştir.',
 'testmail_subject' => 'Test e-posta',
 'theme' => 'Tema',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 160f9c2ce..b297723d4 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -281,6 +281,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваші документи, які потребують уваги',
 'document_already_checkedout' => 'Цей документ вже на обробці',
 'document_already_locked' => 'Цей документ вже заблокований',
@@ -663,7 +664,9 @@ URL: [url]',
 'no_group_members' => 'Група не має членів',
 'no_linked_files' => 'Немає пов\'язаних документів',
 'no_previous_versions' => 'Немає попередніх версій',
+'no_receipt_needed' => '',
 'no_review_needed' => 'Рецензія не потрібна',
+'no_revision_needed' => '',
 'no_revision_planed' => 'Повторне опрацювання не заплановане',
 'no_update_cause_locked' => 'Ви не можете оновити документ. Зв\'яжіться з користувачем, який його заблокував.',
 'no_user_image' => 'Зображення не знайдено',
@@ -1221,6 +1224,7 @@ URL: [url]',
 'takeOverGrpReviewer' => 'Використати групу рецензентів з попередньої версії',
 'takeOverIndApprover' => 'Використати затверджувачів з попередньої версії',
 'takeOverIndReviewer' => 'Використати рецензентів з попередньої версії',
+'tasks' => '',
 'testmail_body' => 'Це тестовий лист для перевірки налаштувань пошти SeedDMS',
 'testmail_subject' => 'Тестовий лист',
 'theme' => 'Тема',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 4278046fe..77f8db33c 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (578), fengjohn (5)
+//    Translators: Admin (585), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -260,6 +260,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您关注的文档',
 'document_already_checkedout' => '',
 'document_already_locked' => '该文档已被锁定',
@@ -309,6 +310,7 @@ URL: [url]',
 'dump_creation_warning' => '通过此操作，您可以创建一个您数据库的转储文件，之后可以将转储数据保存到您服务器所在的数据文件夹中',
 'dump_list' => '存在转储文件',
 'dump_remove' => '删除转储文件',
+'duplicate_content' => '',
 'edit' => '编辑',
 'edit_attributes' => '编辑属性',
 'edit_comment' => '编辑说明',
@@ -564,7 +566,9 @@ URL: [url]',
 'no_group_members' => '该组没有成员',
 'no_linked_files' => '无链接文件',
 'no_previous_versions' => '无其它版本',
+'no_receipt_needed' => '',
 'no_review_needed' => '无待校对的文件',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => '您不能更新此文档，请联系该文档锁定人',
 'no_user_image' => '无图片',
@@ -697,15 +701,15 @@ URL: [url]',
 'search_fulltext' => '',
 'search_in' => '搜索于',
 'search_mode_and' => '与模式',
-'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_documents' => '仅文档',
+'search_mode_folders' => '仅目录',
 'search_mode_or' => '或模式',
 'search_no_results' => '没有找到与您搜索添加相匹配的文件',
 'search_query' => '搜索',
 'search_report' => '找到 [count] 个文档',
 'search_report_fulltext' => '',
-'search_resultmode' => '',
-'search_resultmode_both' => '',
+'search_resultmode' => '搜索模式',
+'search_resultmode_both' => '文档和目录',
 'search_results' => '搜索结果',
 'search_results_access_filtered' => '搜索到得结果中可能包含受限访问的文档',
 'search_time' => '耗时:[time]秒',
@@ -716,12 +720,12 @@ URL: [url]',
 'select_grp_approvers' => '',
 'select_grp_notification' => '',
 'select_grp_recipients' => '',
-'select_grp_reviewers' => '',
+'select_grp_reviewers' => '点击选择审核群组',
 'select_grp_revisors' => '',
 'select_ind_approvers' => '',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
-'select_ind_reviewers' => '',
+'select_ind_reviewers' => '点击选择审核人',
 'select_ind_revisors' => '',
 'select_one' => '选择一个',
 'select_users' => '点击选择用户',
@@ -889,6 +893,8 @@ URL: [url]',
 'settings_Notification' => '通知设置',
 'settings_notwritable' => '设置_不可写',
 'settings_no_content_dir' => '',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
 'settings_passwordExpiration' => '',
@@ -1062,6 +1068,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => '主题',
@@ -1084,7 +1091,7 @@ URL: [url]',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => '',
 'type_to_search' => '搜索类型',
-'uk_UA' => '',
+'uk_UA' => '乌克兰语',
 'under_folder' => '文件夹内',
 'unknown_attrdef' => '',
 'unknown_command' => '未知命令',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 254ab6cf2..ecec9eaf5 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -258,6 +258,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
+'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您關注的文檔',
 'document_already_checkedout' => '',
 'document_already_locked' => '該文檔已被鎖定',
@@ -307,6 +308,7 @@ URL: [url]',
 'dump_creation_warning' => '通過此操作，您可以創建一個您資料庫的轉儲檔，之後可以將轉儲資料保存到您伺服器所在的資料檔案夾中',
 'dump_list' => '存在轉儲文件',
 'dump_remove' => '刪除轉儲檔',
+'duplicate_content' => '',
 'edit' => '編輯',
 'edit_attributes' => '編輯屬性',
 'edit_comment' => '編輯說明',
@@ -562,7 +564,9 @@ URL: [url]',
 'no_group_members' => '該組沒有成員',
 'no_linked_files' => '無連結檔',
 'no_previous_versions' => '無其它版本',
+'no_receipt_needed' => '',
 'no_review_needed' => '無待校對的文件',
+'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => '您不能更新此文檔，請聯繫該文檔鎖定人',
 'no_user_image' => '無圖片',
@@ -887,6 +891,8 @@ URL: [url]',
 'settings_Notification' => '通知設置',
 'settings_notwritable' => '',
 'settings_no_content_dir' => '',
+'settings_overrideMimeType' => '',
+'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
 'settings_passwordExpiration' => '',
@@ -1060,6 +1066,7 @@ URL: [url]',
 'takeOverGrpReviewer' => '',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
+'tasks' => '',
 'testmail_body' => '',
 'testmail_subject' => '',
 'theme' => '主題',

From 6b2f528624c5863582e6e0cdf5ba68a57384a6d7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 18:57:53 +0200
Subject: [PATCH 0272/2006] getDocumentList(AppRev) returns only untouched
 documents

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 47daf2ee6..362ed27d4 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -717,24 +717,25 @@ class SeedDMS_Core_DMS {
 			
 			// Create a comma separated list of all the documentIDs whose information is
 			// required.
+			// Take only those documents into account which hasn't be touched by the user
 			$dList = array();
 			foreach ($reviewStatus["indstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
+				if ($st["status"]==0 && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
 			foreach ($reviewStatus["grpstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
+				if ($st["status"]==0 && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
 			foreach ($approvalStatus["indstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
+				if ($st["status"]==0 && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
 			foreach ($approvalStatus["grpstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
+				if ($st["status"]==0 && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}

From 3583962085124e67e4d6be9e4657990d7c0f283e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 18:58:38 +0200
Subject: [PATCH 0273/2006] new task menutask in op/op.Ajax.php which calls
 menuTask()

---
 op/op.Ajax.php                      | 14 ++++++++++
 views/bootstrap/class.Bootstrap.php | 41 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index ee4f2f201..a4bca72e7 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -424,6 +424,20 @@ switch($command) {
 			case 'menuclipboard':
 				$content = $view->menuClipboard($session->getClipboard());
 				break;
+			case 'menutasks':
+				$resArr = $dms->getDocumentList('AppRevByMe', $user);
+				if($resArr) {
+					$reviews = array();
+					$approvals = array();
+					foreach ($resArr as $res) {
+						if($res["status"]==S_DRAFT_REV)
+							$reviews[] = $res['id'];
+						if($res["status"]==S_DRAFT_APP)
+							$approvals[] = $res['id'];
+					}
+				}
+				$content = $view->menuTasks(array('review'=>$reviews, 'approval'=>$approvals));
+				break;
 			case 'mainclipboard':
 				$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $settings->_previewWidthList);
 				$previewer->setConverters($settings->_converters['preview']);
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index ab79bd327..e8143e891 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -239,6 +239,39 @@ $(document).ready(function () {
 		return $content;
 	} /* }}} */
 
+	/**
+	 * Returns the html needed for the clipboard list in the menu
+	 *
+	 * This function renders the clipboard in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	function menuTasks($tasks) { /* {{{ */
+		$dms = $this->params['dms'];
+		$content = '';
+//		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
+//		$content .= "    <li class=\"dropdown\">\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['review'] as $t) {
+			$doc = $dms->getDocument($t);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+		}
+		foreach($tasks['approval'] as $t) {
+			$doc = $dms->getDocument($t);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+		}
+		$content .= "    <li class=\"divider\"></li>\n";
+		$content .= "    <li><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("my_documents")."</a></li>\n";
+		$content .= "     </ul>\n";
+//		$content .= "    </li>\n";
+//		$content .= "   </ul>\n";
+		return $content;
+	} /* }}} */
+
 	function globalNavigation($folder=null) { /* {{{ */
 		$dms = $this->params['dms'];
 		echo "<div class=\"navbar navbar-inverse navbar-fixed-top\">\n";
@@ -303,6 +336,14 @@ $(document).ready(function () {
 			echo "    </li>\n";
 			echo "   </ul>\n";
 
+			echo "   <div id=\"menu-tasks\">";
+			echo "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
+			echo "    <li class=\"dropdown\">\n";
+			echo $this->menuTasks(array('review'=>array(), 'approval'=>array()));
+			echo "    </li>\n";
+			echo "   </ul>\n";
+			echo "   </div>";
+
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";
 				echo $this->menuClipboard($this->params['session']->getClipboard());

From a76e1de49e9e0d056f039c2850cde0e685e4da8d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 18:59:14 +0200
Subject: [PATCH 0274/2006] reorder lists

---
 views/bootstrap/class.MyDocuments.php | 322 +++++++++++++-------------
 1 file changed, 167 insertions(+), 155 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 1ce0cb9d7..59467d70a 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -269,118 +269,6 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					$this->contentContainerEnd();
 				}
 
-				// Get document list for the current user.
-				$revisionStatus = $user->getRevisionStatus();
-
-				$resArr = $dms->getDocumentList('ReviseByMe', $user);
-				if (is_bool($resArr) && !$resArr) {
-					$this->contentHeading(getMLText("warning"));
-					$this->contentContainer(getMLText("internal_error_exit"));
-					$this->htmlEndPage();
-					exit;
-				}
-				if($resArr) {
-					/* Create an array to hold all of these results, and index the array 
-					 * by document id. This makes it easier to retrieve document ID
-					 * information later on and saves us having to repeatedly poll the
-					 * database every time new document information is required.
-					 */
-					$docIdx = array();
-					foreach ($resArr as $res) {
-						/* verify expiry */
-						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-							$res["status"]=S_EXPIRED;
-						}
-						$docIdx[$res["id"]][$res["version"]] = $res;
-					}
-
-					$this->contentHeading(getMLText("documents_to_revise"));
-					$this->contentContainerStart();
-					$printheader=true;
-					$iRev = array();
-					$dList = array();
-					foreach ($revisionStatus["indstatus"] as $st) {
-					
-						if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
-							$dList[] = $st["documentID"];
-							$document = $dms->getDocument($st["documentID"]);
-						
-							if ($printheader){
-								print "<table class=\"table table-condensed\">";
-								print "<thead>\n<tr>\n";
-								print "<th></th>\n";
-								print "<th>".getMLText("name")."</th>\n";
-								print "<th>".getMLText("owner")."</th>\n";
-								print "<th>".getMLText("version")."</th>\n";
-								print "<th>".getMLText("last_update")."</th>\n";
-								print "<th>".getMLText("expires")."</th>\n";
-								print "</tr>\n</thead>\n<tbody>\n";
-								$printheader=false;
-							}
-						
-							print "<tr>\n";
-							$latestContent = $document->getLatestContent();
-							$previewer->createPreview($latestContent);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($latestContent)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-							print "</tr>\n";
-						}
-					}
-					foreach ($revisionStatus["grpstatus"] as $st) {
-					
-						if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
-							$dList[] = $st["documentID"];
-							$document = $dms->getDocument($st["documentID"]);
-
-							if ($printheader){
-								print "<table class=\"table table-condensed\">";
-								print "<thead>\n<tr>\n";
-								print "<th></th>\n";
-								print "<th>".getMLText("name")."</th>\n";
-								print "<th>".getMLText("owner")."</th>\n";
-								print "<th>".getMLText("version")."</th>\n";
-								print "<th>".getMLText("last_update")."</th>\n";
-								print "<th>".getMLText("expires")."</th>\n";
-								print "</tr>\n</thead>\n<tbody>\n";
-								$printheader=false;
-							}
-
-							print "<tr>\n";
-							$latestContent = $document->getLatestContent();
-							$previewer->createPreview($latestContent);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($latestContent)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-							print "</tr>\n";
-						}
-					}
-					if (!$printheader){
-						echo "</tbody>\n</table>";
-					}else{
-						printMLText("no_docs_to_revise");
-					}
-					$this->contentContainerEnd();
-				}
-
 				/* Get list of documents owned by current user that are
 				 * pending review or pending approval.
 				 */
@@ -441,60 +329,121 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				$this->contentContainerEnd();
 			}
 
-			/* Get list of documents owned by current user that has
-			 * been rejected.
-			 */
-			$resArr = $dms->getDocumentList('RejectOwner', $user);
+			// Get document list for the current user.
+			$revisionStatus = $user->getRevisionStatus();
+
+			$resArr = $dms->getDocumentList('ReviseByMe', $user);
 			if (is_bool($resArr) && !$resArr) {
 				$this->contentHeading(getMLText("warning"));
 				$this->contentContainer(getMLText("internal_error_exit"));
 				$this->htmlEndPage();
 				exit;
 			}
-
-			if (count($resArr)>0) {
-				$this->contentHeading(getMLText("documents_user_rejected"));
-				$this->contentContainerStart();
-
-				print "<table class=\"table table-condensed\">";
-				print "<thead>\n<tr>\n";
-				print "<th></th>";
-				print "<th>".getMLText("name")."</th>\n";
-				print "<th>".getMLText("status")."</th>\n";
-				print "<th>".getMLText("version")."</th>\n";
-				print "<th>".getMLText("last_update")."</th>\n";
-				print "<th>".getMLText("expires")."</th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-
+			if($resArr) {
+				/* Create an array to hold all of these results, and index the array 
+				 * by document id. This makes it easier to retrieve document ID
+				 * information later on and saves us having to repeatedly poll the
+				 * database every time new document information is required.
+				 */
+				$docIdx = array();
 				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["documentID"]);
-				
-					// verify expiry
+					/* verify expiry */
 					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-							$res["status"]=S_EXPIRED;
+						$res["status"]=S_EXPIRED;
+					}
+					$docIdx[$res["id"]][$res["version"]] = $res;
+				}
+
+				$this->contentHeading(getMLText("documents_to_revise"));
+				$this->contentContainerStart();
+				$printheader=true;
+				$iRev = array();
+				$dList = array();
+				foreach ($revisionStatus["indstatus"] as $st) {
+				
+					if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
+						$dList[] = $st["documentID"];
+						$document = $dms->getDocument($st["documentID"]);
+					
+						if ($printheader){
+							print "<table class=\"table table-condensed\">";
+							print "<thead>\n<tr>\n";
+							print "<th></th>\n";
+							print "<th>".getMLText("name")."</th>\n";
+							print "<th>".getMLText("owner")."</th>\n";
+							print "<th>".getMLText("version")."</th>\n";
+							print "<th>".getMLText("last_update")."</th>\n";
+							print "<th>".getMLText("expires")."</th>\n";
+							print "</tr>\n</thead>\n<tbody>\n";
+							$printheader=false;
 						}
+					
+						print "<tr>\n";
+						$latestContent = $document->getLatestContent();
+						$previewer->createPreview($latestContent);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($latestContent)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
+						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
 					}
+				}
+				foreach ($revisionStatus["grpstatus"] as $st) {
 				
-					print "<tr>\n";
-					$latestContent = $document->getLatestContent();
-					$previewer->createPreview($latestContent);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($latestContent)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
+						$dList[] = $st["documentID"];
+						$document = $dms->getDocument($st["documentID"]);
+
+						if ($printheader){
+							print "<table class=\"table table-condensed\">";
+							print "<thead>\n<tr>\n";
+							print "<th></th>\n";
+							print "<th>".getMLText("name")."</th>\n";
+							print "<th>".getMLText("owner")."</th>\n";
+							print "<th>".getMLText("version")."</th>\n";
+							print "<th>".getMLText("last_update")."</th>\n";
+							print "<th>".getMLText("expires")."</th>\n";
+							print "</tr>\n</thead>\n<tbody>\n";
+							$printheader=false;
+						}
+
+						print "<tr>\n";
+						$latestContent = $document->getLatestContent();
+						$previewer->createPreview($latestContent);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($latestContent)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
 					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
-				}		
-				print "</tbody></table>";	
-				
+				}
+				if (!$printheader){
+					echo "</tbody>\n</table>";
+				}else{
+					printMLText("no_docs_to_revise");
+				}
+				$this->contentContainerEnd();
+			}
+			else {
+				$this->contentHeading(getMLText("documents_to_revise"));
+				$this->contentContainerStart();
+				printMLText("no_revision_needed");
 				$this->contentContainerEnd();
 			}
 
@@ -607,7 +556,70 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				}
 				$this->contentContainerEnd();
 			}
-			
+			else {
+				$this->contentHeading(getMLText("documents_to_receipt"));
+				$this->contentContainerStart();
+				printMLText("no_receipt_needed");
+				$this->contentContainerEnd();
+			}
+
+			/* Get list of documents owned by current user that has
+			 * been rejected.
+			 */
+			$resArr = $dms->getDocumentList('RejectOwner', $user);
+			if (is_bool($resArr) && !$resArr) {
+				$this->contentHeading(getMLText("warning"));
+				$this->contentContainer(getMLText("internal_error_exit"));
+				$this->htmlEndPage();
+				exit;
+			}
+
+			if (count($resArr)>0) {
+				$this->contentHeading(getMLText("documents_user_rejected"));
+				$this->contentContainerStart();
+
+				print "<table class=\"table table-condensed\">";
+				print "<thead>\n<tr>\n";
+				print "<th></th>";
+				print "<th>".getMLText("name")."</th>\n";
+				print "<th>".getMLText("status")."</th>\n";
+				print "<th>".getMLText("version")."</th>\n";
+				print "<th>".getMLText("last_update")."</th>\n";
+				print "<th>".getMLText("expires")."</th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["documentID"]);
+				
+					// verify expiry
+					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
+							$res["status"]=S_EXPIRED;
+						}
+					}
+				
+					print "<tr>\n";
+					$latestContent = $document->getLatestContent();
+					$previewer->createPreview($latestContent);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+					if($previewer->hasPreview($latestContent)) {
+						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					} else {
+						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					}
+					print "</a></td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+					print "<td>".getOverallStatusText($res["status"])."</td>";
+					print "<td>".$res["version"]."</td>";
+					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+					print "</tr>\n";
+				}		
+				print "</tbody></table>";	
+				
+				$this->contentContainerEnd();
+			}
+
 			/* Get list of documents locked by current user */
 			$resArr = $dms->getDocumentList('LockedByMe', $user);
 			if (is_bool($resArr) && !$resArr) {

From ae288c83f2f2604a1389ca9105e7d7ca167bebb9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 18:59:28 +0200
Subject: [PATCH 0275/2006] add javascript for continuosily upating task list

---
 styles/bootstrap/application.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index c4bf38648..cbff36cf7 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -693,5 +693,12 @@ $(document).ready(function() {
 		e.stopPropagation();
 		e.preventDefault();
 	});
- 
+
+	var checkTasks = function() {
+		$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
+		timeOutId = setTimeout(checkTasks, 10000);
+	}
+//	timeOutId = setTimeout(checkTasks, 30000);
+	checkTasks();
+
 }); 

From bf95beb5368d9d5460f1ad99b2b4477ea437dc1f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Jul 2015 19:48:18 +0200
Subject: [PATCH 0276/2006] put tasks into submenus

---
 views/bootstrap/class.Bootstrap.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e8143e891..b7870a653 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -256,14 +256,28 @@ $(document).ready(function () {
 //		$content .= "    <li class=\"dropdown\">\n";
 		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval']).") <i class=\"icon-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		if($tasks['review']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_review")."</a>\n";
+		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['review'] as $t) {
 			$doc = $dms->getDocument($t);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+			$content .= "      <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
 		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if($tasks['approval']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_approve")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['approval'] as $t) {
 			$doc = $dms->getDocument($t);
 			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
 		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		$content .= "    <li><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("my_documents")."</a></li>\n";
 		$content .= "     </ul>\n";

From 9682b02b8e34b54abf69cbfa24cbdacaf3c8fa66 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 07:57:46 +0200
Subject: [PATCH 0277/2006] define function which updates the tasks in the menu

---
 styles/bootstrap/application.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index cbff36cf7..dee1c8d30 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -694,11 +694,19 @@ $(document).ready(function() {
 		e.preventDefault();
 	});
 
+}); 
+
+	var approval_count, review_count;
 	var checkTasks = function() {
-		$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
+		$.get('../op/op.Ajax.php', { command: 'mytasks' }, function(data) {
+			if(approval_count != data.data.approval.length ||
+				 review_count != data.data.review.length) {
+				$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
+				approval_count = data.data.approval.length;
+				review_count = data.data.review.length;
+			}
+		}, 'json');
 		timeOutId = setTimeout(checkTasks, 10000);
 	}
-//	timeOutId = setTimeout(checkTasks, 30000);
-	checkTasks();
+	//checkTasks();
 
-}); 

From cd3a23948283ddb0407ade87d45fe0a9d8682961 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 07:58:34 +0200
Subject: [PATCH 0278/2006] add new config parameter enableMenuTasks

---
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index c6418cf26..c9982e842 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -166,6 +166,8 @@ class Settings { /* {{{ */
 	var $_firstDayOfWeek = 0;
 	// enable/disable display of the clipboard
 	var $_enableClipboard = true;
+	// enable/disable list of tasks in main menu
+	var $_enableMenuTasks = true;
 	// enable/disable display of the drop zone for file upload
 	var $_enableDropUpload = true;
 	// enable/disable display of the folder tree
@@ -355,6 +357,7 @@ class Settings { /* {{{ */
 		$this->_enableEmail = Settings::boolVal($tab["enableEmail"]);
 		$this->_enableUsersView = Settings::boolVal($tab["enableUsersView"]);
 		$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
+		$this->_enableMenuTasks = Settings::boolVal($tab["enableMenuTasks"]);
 		$this->_enableDropUpload = Settings::boolVal($tab["enableDropUpload"]);
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
 		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
@@ -662,6 +665,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableEmail", $this->_enableEmail);
     $this->setXMLAttributValue($node, "enableUsersView", $this->_enableUsersView);
 		$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
+		$this->setXMLAttributValue($node, "enableMenuTasks", $this->_enableMenuTasks);
 		$this->setXMLAttributValue($node, "enableDropUpload", $this->_enableDropUpload);
     $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
     $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index f604887d8..aaff6a4fa 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -70,6 +70,7 @@ if ($action == "saveSettings")
   $settings->_enableUsersView = getBoolValue("enableUsersView");
   $settings->_enableFullSearch = getBoolValue("enableFullSearch");
   $settings->_enableClipboard = getBoolValue("enableClipboard");
+  $settings->_enableMenuTasks = getBoolValue("enableMenuTasks");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
   $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index ced156c1d..7a080b9da 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -169,6 +169,10 @@ if(!is_writeable($settings->_configFilePath)) {
 	    <tr title="<?php printMLText("settings_enableClipboard_desc");?>">
         <td><?php printMLText("settings_enableClipboard");?>:</td>
         <td><input name="enableClipboard" type="checkbox" <?php if ($settings->_enableClipboard) echo "checked" ?> /></td>
+      </tr>
+	    <tr title="<?php printMLText("settings_enableMenuTasks_desc");?>">
+        <td><?php printMLText("settings_enableMenuTasks");?>:</td>
+        <td><input name="enableMenuTasks" type="checkbox" <?php if ($settings->_enableMenuTasks) echo "checked" ?> /></td>
       </tr>
 	    <tr title="<?php printMLText("settings_enableDropUpload_desc");?>">
         <td><?php printMLText("settings_enableDropUpload");?>:</td>

From f35573611d085e010d179148175c8933e0342751 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 07:59:02 +0200
Subject: [PATCH 0279/2006] set param enablemenutasks for view

---
 inc/inc.ClassUI.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 23443aff8..20da3f727 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -96,6 +96,7 @@ class UI extends UI_Default {
 			$view->setParam('enablefoldertree', $settings->_enableFolderTree);
 			$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
 			$view->setParam('enableclipboard', $settings->_enableClipboard);
+			$view->setParam('enablemenutasks', $settings->_enableMenuTasks);
 			$view->setParam('workflowmode', $settings->_workflowMode);
 			$view->setParam('partitionsize', $settings->_partitionSize);
 			$view->setParam('checkoutdir', $settings->_checkOutDir);

From 863d203133626496ff727aa787693570d9cdad40 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 07:59:30 +0200
Subject: [PATCH 0280/2006] add command 'mytasks'

---
 op/op.Ajax.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index a4bca72e7..b00348853 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -429,8 +429,7 @@ switch($command) {
 				if($resArr) {
 					$reviews = array();
 					$approvals = array();
-					foreach ($resArr as $res) {
-						if($res["status"]==S_DRAFT_REV)
+					foreach ($resArr as $res) { if($res["status"]==S_DRAFT_REV)
 							$reviews[] = $res['id'];
 						if($res["status"]==S_DRAFT_APP)
 							$approvals[] = $res['id'];
@@ -736,6 +735,24 @@ switch($command) {
 		}
 		break; /* }}} */
 
+	case 'mytasks': /* {{{ */
+		if($user) {
+			$startts = microtime(true);
+			$reviews = array();
+			$approvals = array();
+			$resArr = $dms->getDocumentList('AppRevByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					if($res["status"]==S_DRAFT_REV)
+						$reviews[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					elseif($res["status"]==S_DRAFT_APP)
+						$approvals[] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+			header('Content-Type', 'application/json');
+			echo json_encode(array('error'=>0, 'data'=>array('review'=>$reviews, 'approval'=>$approvals), 'processing_time'=>microtime(true)-$startts));
+		}
+		break; /* }}} */
 }
 add_log_line();
 ?>

From 4290e705cf54c701d2fa8b3d3dbf03f2215a9308 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 07:59:54 +0200
Subject: [PATCH 0281/2006] add tasks to menu if configured

---
 views/bootstrap/class.Bootstrap.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index b7870a653..9cb93535c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -350,13 +350,16 @@ $(document).ready(function () {
 			echo "    </li>\n";
 			echo "   </ul>\n";
 
-			echo "   <div id=\"menu-tasks\">";
-			echo "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
-			echo "    <li class=\"dropdown\">\n";
-			echo $this->menuTasks(array('review'=>array(), 'approval'=>array()));
-			echo "    </li>\n";
-			echo "   </ul>\n";
-			echo "   </div>";
+			if($this->params['enablemenutasks']) {
+				echo "   <div id=\"menu-tasks\">";
+				echo "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
+				echo "    <li class=\"dropdown\">\n";
+				echo $this->menuTasks(array('review'=>array(), 'approval'=>array()));
+				echo "    </li>\n";
+				echo "   </ul>\n";
+				echo "   </div>";
+				$this->addFooterJS('checkTasks();');
+			}
 
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";

From 59fd3c7170336c49ff00b1ac3f3530caeecc7445 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 08:00:43 +0200
Subject: [PATCH 0282/2006] add missing space between tag attributes

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 9cb93535c..bd5e805e8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -299,7 +299,7 @@ $(document).ready(function () {
 		echo "   <a class=\"brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
 		if(isset($this->params['user']) && $this->params['user']) {
 			echo "   <div class=\"nav-collapse nav-col1\">\n";
-			echo "   <ul id=\"main-menu-admin\"class=\"nav pull-right\">\n";
+			echo "   <ul id=\"main-menu-admin\" class=\"nav pull-right\">\n";
 			echo "    <li class=\"dropdown\">\n";
 			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' <i class=\"icon-caret-down\"></i></a>\n";
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";

From 9bc675873d037ff548e0e8f53cfe277b545a797a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 18:25:55 +0200
Subject: [PATCH 0283/2006] getDocumentList() returns only documents I haven't
 touched

The lists AppRevByMe, ReviseByMe and ReceiptByMe will only return
those documents in its initial review/approval/receipt/revision
status (0).
---
 SeedDMS_Core/Core/inc.ClassDMS.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 362ed27d4..ac16d877a 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -679,9 +679,11 @@ class SeedDMS_Core_DMS {
 	 * [statusName] => name of user who has initiated the status change
 	 *
 	 * @param string $listtype type of document list, can be 'AppRevByMe',
-	 * 'AppRevOwner', 'ReceiptByMe', 'LockedByMe', 'MyDocs'
+	 * 'AppRevOwner', 'ReceiptByMe', 'ReviseByMe', 'LockedByMe', 'MyDocs'
 	 * @param object $param1 user
-	 * @param string $param2 sort list if listtype='MyDocs'
+	 * @param string $param2 sort list if listtype='MyDocs', set to true
+	 * if 'AppRevByMe', 'ReviseByMe', 'ReceiptByMe' shall return even documents
+	 * І have already taken care of.
 	 * @return array list of documents
 	 */
 	function getDocumentList($listtype, $param1=null, $param2='') { /* {{{ */
@@ -720,22 +722,22 @@ class SeedDMS_Core_DMS {
 			// Take only those documents into account which hasn't be touched by the user
 			$dList = array();
 			foreach ($reviewStatus["indstatus"] as $st) {
-				if ($st["status"]==0 && !in_array($st["documentID"], $dList)) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
 			foreach ($reviewStatus["grpstatus"] as $st) {
-				if ($st["status"]==0 && !in_array($st["documentID"], $dList)) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
 			foreach ($approvalStatus["indstatus"] as $st) {
-				if ($st["status"]==0 && !in_array($st["documentID"], $dList)) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
 			foreach ($approvalStatus["grpstatus"] as $st) {
-				if ($st["status"]==0 && !in_array($st["documentID"], $dList)) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
@@ -761,12 +763,12 @@ class SeedDMS_Core_DMS {
 			// required.
 			$dList = array();
 			foreach ($receiptStatus["indstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
 			foreach ($receiptStatus["grpstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
@@ -791,12 +793,12 @@ class SeedDMS_Core_DMS {
 			// required.
 			$dList = array();
 			foreach ($revisionStatus["indstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}
 			foreach ($revisionStatus["grpstatus"] as $st) {
-				if (!in_array($st["documentID"], $dList)) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
 					$dList[] = $st["documentID"];
 				}
 			}

From f25c090039ad8cabc7db4dde57659e2f2a228ff1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 18:28:08 +0200
Subject: [PATCH 0284/2006] command mytasks also returns documents to receipt
 and revise

---
 op/op.Ajax.php | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index b00348853..69f752c1d 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -429,13 +429,27 @@ switch($command) {
 				if($resArr) {
 					$reviews = array();
 					$approvals = array();
+					$receipts = array();
+					$revisions = array();
 					foreach ($resArr as $res) { if($res["status"]==S_DRAFT_REV)
 							$reviews[] = $res['id'];
 						if($res["status"]==S_DRAFT_APP)
 							$approvals[] = $res['id'];
 					}
 				}
-				$content = $view->menuTasks(array('review'=>$reviews, 'approval'=>$approvals));
+				$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+				if($resArr) {
+					foreach ($resArr as $res) {
+						$receipts[] = $res['id'];
+					}
+				}
+				$resArr = $dms->getDocumentList('ReviseByMe', $user);
+				if($resArr) {
+					foreach ($resArr as $res) {
+						$revisions[] = $res['id'];
+					}
+				}
+				$content = $view->menuTasks(array('review'=>$reviews, 'approval'=>$approvals, 'receipt'=>$receipts, 'revision'=>$revisions));
 				break;
 			case 'mainclipboard':
 				$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $settings->_previewWidthList);
@@ -740,6 +754,8 @@ switch($command) {
 			$startts = microtime(true);
 			$reviews = array();
 			$approvals = array();
+			$receipts = array();
+			$revisions = array();
 			$resArr = $dms->getDocumentList('AppRevByMe', $user);
 			if($resArr) {
 				foreach ($resArr as $res) {
@@ -749,8 +765,20 @@ switch($command) {
 						$approvals[] = array('id'=>$res['id'], 'name'=>$res['name']);
 				}
 			}
+			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$receipts[] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+			$resArr = $dms->getDocumentList('ReviseByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$revisions[] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
 			header('Content-Type', 'application/json');
-			echo json_encode(array('error'=>0, 'data'=>array('review'=>$reviews, 'approval'=>$approvals), 'processing_time'=>microtime(true)-$startts));
+			echo json_encode(array('error'=>0, 'data'=>array('review'=>$reviews, 'approval'=>$approvals, 'receipt'=>$receipts, 'revision'=>$revisions), 'processing_time'=>microtime(true)-$startts));
 		}
 		break; /* }}} */
 }

From 7a601a1cd0c3e3dcbd18233d8d35dda50b232627 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 18:29:08 +0200
Subject: [PATCH 0285/2006] checkTasks() also checks documents to receipt and
 revise

---
 styles/bootstrap/application.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index dee1c8d30..c4937473a 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -696,14 +696,18 @@ $(document).ready(function() {
 
 }); 
 
-	var approval_count, review_count;
+	var approval_count, review_count, receipt_count, revision_count;
 	var checkTasks = function() {
 		$.get('../op/op.Ajax.php', { command: 'mytasks' }, function(data) {
 			if(approval_count != data.data.approval.length ||
-				 review_count != data.data.review.length) {
+				 review_count != data.data.review.length ||
+				 receipt_count != data.data.receipt.length ||
+				 revision_count != data.data.revision.length) {
 				$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
 				approval_count = data.data.approval.length;
 				review_count = data.data.review.length;
+				receipt_count = data.data.receipt.length;
+				revision_count = data.data.revision.length;
 			}
 		}, 'json');
 		timeOutId = setTimeout(checkTasks, 10000);

From a6541296a15f3e227f907342893cb25e3cab4c3a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jul 2015 18:29:34 +0200
Subject: [PATCH 0286/2006] list documents to receipt and revise in menu task
 list

---
 views/bootstrap/class.Bootstrap.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index bd5e805e8..be80f32ac 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -254,7 +254,7 @@ $(document).ready(function () {
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 //		$content .= "    <li class=\"dropdown\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"icon-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if($tasks['review']) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
@@ -278,6 +278,28 @@ $(document).ready(function () {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
+		if($tasks['receipt']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['receipt'] as $t) {
+			$doc = $dms->getDocument($t);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=receipt\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if($tasks['revision']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['revision'] as $t) {
+			$doc = $dms->getDocument($t);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revise\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
 		$content .= "    <li class=\"divider\"></li>\n";
 		$content .= "    <li><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("my_documents")."</a></li>\n";
 		$content .= "     </ul>\n";
@@ -354,7 +376,7 @@ $(document).ready(function () {
 				echo "   <div id=\"menu-tasks\">";
 				echo "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 				echo "    <li class=\"dropdown\">\n";
-				echo $this->menuTasks(array('review'=>array(), 'approval'=>array()));
+				echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
 				echo "    </li>\n";
 				echo "   </ul>\n";
 				echo "   </div>";

From 4f2392e492fc29121481c4cd59c82a33c291d5fe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 10 Jul 2015 08:28:19 +0200
Subject: [PATCH 0287/2006] set timeout for checkTask() function

---
 styles/bootstrap/application.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index c4937473a..4b4ff091e 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -698,18 +698,24 @@ $(document).ready(function() {
 
 	var approval_count, review_count, receipt_count, revision_count;
 	var checkTasks = function() {
-		$.get('../op/op.Ajax.php', { command: 'mytasks' }, function(data) {
-			if(approval_count != data.data.approval.length ||
-				 review_count != data.data.review.length ||
-				 receipt_count != data.data.receipt.length ||
-				 revision_count != data.data.revision.length) {
-				$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
-				approval_count = data.data.approval.length;
-				review_count = data.data.review.length;
-				receipt_count = data.data.receipt.length;
-				revision_count = data.data.revision.length;
-			}
-		}, 'json');
+		$.ajax({url: '../op/op.Ajax.php',
+			type: 'GET',
+			dataType: "json",
+			data: {command: 'mytasks'},
+			success: function(data) {
+				if(approval_count != data.data.approval.length ||
+					 review_count != data.data.review.length ||
+					 receipt_count != data.data.receipt.length ||
+					 revision_count != data.data.revision.length) {
+					$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
+					approval_count = data.data.approval.length;
+					review_count = data.data.review.length;
+					receipt_count = data.data.receipt.length;
+					revision_count = data.data.revision.length;
+				}
+			},
+			timeout: 200
+		}); 
 		timeOutId = setTimeout(checkTasks, 10000);
 	}
 	//checkTasks();

From e17bcc714afa1853f85cb8b86eea02d53771a183 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 10 Jul 2015 10:51:56 +0200
Subject: [PATCH 0288/2006] initialize all arrays for return value in menutasks

---
 op/op.Ajax.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 69f752c1d..7d5eaf0a4 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -425,12 +425,12 @@ switch($command) {
 				$content = $view->menuClipboard($session->getClipboard());
 				break;
 			case 'menutasks':
+				$reviews = array();
+				$approvals = array();
+				$receipts = array();
+				$revisions = array();
 				$resArr = $dms->getDocumentList('AppRevByMe', $user);
 				if($resArr) {
-					$reviews = array();
-					$approvals = array();
-					$receipts = array();
-					$revisions = array();
 					foreach ($resArr as $res) { if($res["status"]==S_DRAFT_REV)
 							$reviews[] = $res['id'];
 						if($res["status"]==S_DRAFT_APP)

From 5a3dec7c2e3bace9ea10512660ea737a98d78f88 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Jul 2015 10:00:39 +0200
Subject: [PATCH 0289/2006] some reorganization of docinfo tab

make some more room
---
 views/bootstrap/class.ViewDocument.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 60fd7da7a..83218f966 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -368,14 +368,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		print "<table class=\"table\">";
 		print "<thead>\n<tr>\n";
-		print "<th style=\"width:".$previewwidthdetail."px;\"></th>\n";
-		print "<th width='*'>".getMLText("file")."</th>\n";
-		print "<th width='25%'>".getMLText("comment")."</th>\n";
-		print "<th width='15%'>".getMLText("status")."</th>\n";
+		print "<th colspan=\"2\">".$latestContent->getOriginalFileName()."</th>\n";
+//		print "<th width='*'>".getMLText("file")."</th>\n";
+//		print "<th width='25%'>".getMLText("comment")."</th>\n";
+		print "<th width='20%'>".getMLText("status")."</th>\n";
 		print "<th width='25%'></th>\n";
 		print "</tr></thead><tbody>\n";
 		print "<tr>\n";
-		print "<td style=\"width:".$previewwidthdetail."px;\">";
+		print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
 		/*
 		print "<ul class=\"actions unstyled\">";
 
@@ -408,7 +408,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</td>\n";
 
 		print "<td><ul class=\"actions unstyled\">\n";
-		print "<li>".$latestContent->getOriginalFileName() ."</li>\n";
+//		print "<li>".$latestContent->getOriginalFileName() ."</li>\n";
 		print "<li>".getMLText('version').": ".$latestContent->getVersion()."</li>\n";
 
 		if ($file_exists)
@@ -420,6 +420,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "<li>".getLongReadableDate($latestContent->getDate())."</li>";
 
 		print "</ul>\n";
+		print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
 		print "<ul class=\"actions unstyled\">\n";
 		$attributes = $latestContent->getAttributes();
 		if($attributes) {
@@ -435,7 +436,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		print "</ul>\n";
 
-		print "<td>".htmlspecialchars($latestContent->getComment())."</td>";
+//		print "<td>".htmlspecialchars($latestContent->getComment())."</td>";
 
 		print "<td width='10%'>";
 		print getOverallStatusText($status["status"]);

From d0760b2925b1449f3e6443d5e3fb6d66996e62c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Jul 2015 10:08:04 +0200
Subject: [PATCH 0290/2006] place comment in left column on previous versions
 tab

---
 views/bootstrap/class.ViewDocument.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 83218f966..b1821e7ce 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1106,7 +1106,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<thead>\n<tr>\n";
 			print "<th width='10%'></th>\n";
 			print "<th width='30%'>".getMLText("file")."</th>\n";
-			print "<th width='25%'>".getMLText("comment")."</th>\n";
+//			print "<th width='25%'>".getMLText("comment")."</th>\n";
 			print "<th width='15%'>".getMLText("status")."</th>\n";
 			print "<th width='20%'></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
@@ -1148,6 +1148,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
 				print "<li>".getLongReadableDate($version->getDate())."</li>";
 				print "</ul>\n";
+				if($version->getComment())
+					print "<p style=\"font-style: italic;\">".htmlspecialchars($version->getComment())."</p>";
 				print "<ul class=\"actions unstyled\">\n";
 				$attributes = $version->getAttributes();
 				if($attributes) {
@@ -1162,7 +1164,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					}
 				}
 				print "</ul>\n";
-				print "<td>".htmlspecialchars($version->getComment())."</td>";
+//				print "<td>".htmlspecialchars($version->getComment())."</td>";
 				print "<td>".getOverallStatusText($vstat["status"])."</td>";
 				print "<td>";
 				print "<ul class=\"actions unstyled\">";

From a2179ca53e3646cc1b4cddd55548b5d462607566 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Jul 2015 21:23:33 +0200
Subject: [PATCH 0291/2006] add new paramter autoLoginUser

---
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index c9982e842..d87927021 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -50,6 +50,8 @@ class Settings { /* {{{ */
 	var $_passwordHistory = 10;
 	// Number of failed logins before account is disabled
 	var $_loginFailure = 0;
+	// User id that is automatically logged if nobody is logged in
+	var $_autoLoginUser = 0;
 	// maximum amount of bytes a user may consume, 0 = unlimited
 	var $_quota = 0;
 	// comma separated list of undeleteable user ids
@@ -405,6 +407,7 @@ class Settings { /* {{{ */
 		$this->_passwordExpiration = intval($tab["passwordExpiration"]);
 		$this->_passwordHistory = intval($tab["passwordHistory"]);
 		$this->_loginFailure = intval($tab["loginFailure"]);
+		$this->_autoLoginUser = intval($tab["autoLoginUser"]);
 		$this->_quota = intval($tab["quota"]);
 		$this->_undelUserIds = strval($tab["undelUserIds"]);
 		$this->_encryptionKey = strval($tab["encryptionKey"]);
@@ -711,6 +714,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "passwordExpiration", $this->_passwordExpiration);
     $this->setXMLAttributValue($node, "passwordHistory", $this->_passwordHistory);
     $this->setXMLAttributValue($node, "loginFailure", $this->_loginFailure);
+    $this->setXMLAttributValue($node, "autoLoginUser", $this->_autoLoginUser);
     $this->setXMLAttributValue($node, "quota", $this->_quota);
     $this->setXMLAttributValue($node, "undelUserIds", $this->_undelUserIds);
     $this->setXMLAttributValue($node, "encryptionKey", $this->_encryptionKey);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index aaff6a4fa..14aac36fe 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -115,6 +115,7 @@ if ($action == "saveSettings")
   $settings->_passwordExpiration = intval($_POST["passwordExpiration"]);
   $settings->_passwordHistory = intval($_POST["passwordHistory"]);
   $settings->_loginFailure = intval($_POST["loginFailure"]);
+  $settings->_autoLoginUser = intval($_POST["autoLoginUser"]);
   $settings->_quota = intval($_POST["quota"]);
   $settings->_undelUserIds = strval($_POST["undelUserIds"]);
   $settings->_encryptionKey = strval($_POST["encryptionKey"]);
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 7a080b9da..c9409c688 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -376,6 +376,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_loginFailure");?>:</td>
         <td><input type="text" name="loginFailure" value="<?php echo $settings->_loginFailure; ?>" size="2" /></td>
       </tr>
+      <tr title="<?php printMLText("settings_autoLoginUser_desc");?>">
+        <td><?php printMLText("settings_autoLoginUser");?>:</td>
+        <td><input type="text" name="autoLoginUser" value="<?php echo $settings->_autoLoginUser; ?>" size="3" /></td>
+      </tr>
       <tr title="<?php printMLText("settings_quota_desc");?>">
         <td><?php printMLText("settings_quota");?>:</td>
         <td><input type="text" name="quota" value="<?php echo $settings->_quota; ?>" size="2" /></td>

From f187dff23abf90560ad56dd4623d8467851e4472 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Jul 2015 21:23:54 +0200
Subject: [PATCH 0292/2006] auto login user if not already logged in

the user won't have a session, but will be granted access for the
http request
---
 inc/inc.Authentication.php | 95 +++++++++++++++++++++++++-------------
 1 file changed, 63 insertions(+), 32 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 86c7961e2..266ff7097 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -18,42 +18,74 @@ if (!strncmp("/op", $refer, 3)) {
 } else {
 	$refer = urlencode($refer);
 }
-if (!isset($_COOKIE["mydms_session"])) {
-	header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
-	exit;
-}
 
 require_once("inc.Utils.php");
 require_once("inc.ClassEmail.php");
 require_once("inc.ClassSession.php");
 
-/* Load session */
-$dms_session = $_COOKIE["mydms_session"];
-$session = new SeedDMS_Session($db);
-if(!$resArr = $session->load($dms_session)) {
-	setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
-	header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
-	exit;
-}
-
-/* Update last access time */
-$session->updateAccess($dms_session);
-/* Load user data */
-
-$user = $dms->getUser($resArr["userID"]);
-/* Check if user was substituted */
-if($resArr["su"] && $su = $dms->getUser($resArr["su"])) {
-	/* Admin may always substitute the user, but regular users are*/
-	if($user->isAdmin() || $user->maySwitchToUser($su)) {
-		$user = $su;
+if (!isset($_COOKIE["mydms_session"])) {
+	if($settings->_autoLoginUser) {
+		if(!($user = $dms->getUser($settings->_autoLoginUser))/* || !$user->isGuest()*/) {
+			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+			exit;
+		}
+		$theme = $user->getTheme();
+		if (strlen($theme)==0) {
+			$theme = $settings->_theme;
+			$user->setTheme($theme);
+		}
+		$lang = $user->getLanguage();
+		if (strlen($lang)==0) {
+			$lang = $settings->_language;
+			$user->setLanguage($lang);
+		}
+		$session = new SeedDMS_Session($db);
+		if(!$id = $session->create(array('userid'=>$user->getID(), 'theme'=>$theme, 'lang'=>$lang))) {
+			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+			exit;
+		}
+		/*
+		if($settings->_cookieLifetime)
+			$lifetime = time() + intval($settings->_cookieLifetime);
+		else
+			$lifetime = 0;
+		setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload);
+		*/
 	} else {
-		$session->resetSu();
+		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+		exit;
 	}
-}
-if (!is_object($user)) {
-	setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
-	header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
-	exit;
+} else {
+	/* Load session */
+	$dms_session = $_COOKIE["mydms_session"];
+	$session = new SeedDMS_Session($db);
+	if(!$resArr = $session->load($dms_session)) {
+		setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
+		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+		exit;
+	}
+	/* Update last access time */
+	$session->updateAccess($dms_session);
+	/* Load user data */
+
+	$user = $dms->getUser($resArr["userID"]);
+
+	/* Check if user was substituted */
+	if($resArr["su"] && $su = $dms->getUser($resArr["su"])) {
+		/* Admin may always substitute the user, but regular users are*/
+		if($user->isAdmin() || $user->maySwitchToUser($su)) {
+			$user = $su;
+		} else {
+			$session->resetSu();
+		}
+	}
+	if (!is_object($user)) {
+		setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
+		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+		exit;
+	}
+	$theme = $resArr["theme"];
+	$lang = $resArr["language"];
 }
 
 $dms->setUser($user);
@@ -77,9 +109,8 @@ if(file_exists($settings->_rootDir . "languages/" . $resArr["language"] . "/lang
 }
 */
 
-$theme = $resArr["theme"];
-if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $resArr["language"] . "/lang.inc")) {
-	include $settings->_rootDir . "view/".$theme."/languages/" . $resArr["language"] . "/lang.inc";
+if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc")) {
+	include $settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc";
 }
 
 /* Check if password needs to be changed because it expired. If it needs

From d09605c6b948fe4073dd7fbb9b8ea7ee3ab664f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Jul 2015 21:26:40 +0200
Subject: [PATCH 0293/2006] pass null to printAttributeEditField if attribute
 is not set

---
 views/bootstrap/class.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 6ebd0a93b..1c8268709 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -184,7 +184,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 ?>
 <tr>
 	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '') ?></td>
+	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : null) ?></td>
 </tr>
 
 <?php

From 96040765552d7e06a86b8df8de6d2e758954a139 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Jul 2015 21:27:41 +0200
Subject: [PATCH 0294/2006] printAttributeEditField() can be passed a default
 value

document menu can be extended by a hook
---
 views/bootstrap/class.Bootstrap.php | 54 +++++++++++++++++------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index be80f32ac..fca389356 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -532,47 +532,56 @@ $(document).ready(function () {
 		echo "<id=\"first\"><a href=\"../out/out.ViewDocument". $docid ."\" class=\"brand\">".getMLText("document")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "<ul class=\"nav\">\n";
+		$menuitems = array();
 
 		if ($accessMode >= M_READWRITE) {
 			if (!$document->isLocked()) {
-				echo "<li id=\"first\"><a href=\"../out/out.UpdateDocument". $docid ."\">".getMLText("update_document")."</a></li>";
-				echo "<li><a href=\"../op/op.LockDocument". $docid ."\">".getMLText("lock_document")."</a></li>";
+				$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
+				$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>'lock_document');
 				if($document->isCheckedOut())
-					echo "<li><a href=\"../out/out.CheckInDocument". $docid ."\">".getMLText("checkin_document")."</a></li>";
+					$menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>'checkin_document');
 				else {
 					if($this->params['checkoutdir']) {
-						echo "<li><a href=\"../op/op.CheckOutDocument". $docid ."\">".getMLText("checkout_document")."</a></li>";
+						$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>'checkout_document');
 					}
 				}
-				echo "<li><a href=\"../out/out.EditDocument". $docid ."\">".getMLText("edit_document_props")."</a></li>";
-				echo "<li><a href=\"../out/out.MoveDocument". $docid ."\">".getMLText("move_document")."</a></li>";
+				$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>'edit_document_props');
+				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 			}
 			else {
 				$lockingUser = $document->getLockingUser();
 				if (($lockingUser->getID() == $this->params['user']->getID()) || ($document->getAccessMode($this->params['user']) == M_ALL)) {
-					echo "<li id=\"first\"><a href=\"../out/out.UpdateDocument". $docid ."\">".getMLText("update_document")."</a></li>";
-					echo "<li><a href=\"../op/op.UnlockDocument". $docid ."\">".getMLText("unlock_document")."</a></li>";
-					if($document->isCheckedOut())
-						echo "<li><a href=\"../out/out.CheckInDocument". $docid ."\">".getMLText("checkin_document")."</a></li>";
-					else {
+					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
+					$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>'unlock_document');
+					if($document->isCheckedOut()) {
+						$menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>'checkin_document');
+					} else {
 						if($this->params['checkoutdir']) {
-							echo "<li><a href=\"../op/op.CheckOutDocument". $docid ."\">".getMLText("checkout_document")."</a></li>";
+							$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>'checkout_document');
 						}
 					}
-					echo "<li><a href=\"../out/out.EditDocument". $docid ."\">".getMLText("edit_document_props")."</a></li>";
-					echo "<li><a href=\"../out/out.MoveDocument". $docid ."\">".getMLText("move_document")."</a></li>";
+					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>'edit_document_props');
+					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 				}
 			}
 			if($this->params['accessobject']->maySetExpires()) {
-				echo "<li><a href=\"../out/out.SetExpires". $docid ."\">".getMLText("expires")."</a></li>";
+				$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>'expires');
+			//	$menuitems[''] = array('link'=>"", 'label'=>'');
 			}
 		}
 		if ($accessMode == M_ALL) {
-			echo "<li><a href=\"../out/out.RemoveDocument". $docid ."\">".getMLText("rm_document")."</a></li>";
-			echo "<li><a href=\"../out/out.DocumentAccess". $docid ."\">".getMLText("edit_document_access")."</a></li>";
+			$menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>'rm_document');
+			$menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>'edit_document_access');
 		}
 		if ($accessMode >= M_READ && !$this->params['user']->isGuest()) {
-			echo "<li><a href=\"../out/out.DocumentNotify". $docid ."\">".getMLText("edit_existing_notify")."</a></li>";
+			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify');
+		}
+
+		$this->hasHook('documentNavigationBar');
+		$this->callHook('documentNavigationBar', $document, $menuitems);
+
+		foreach($menuitems as $menuitem) {
+			echo "<li><a href=\"".$menuitem['link']."\">".getMLText($menuitem['label'])."</a></li>";
 		}
 		echo "</ul>\n";
 		echo "</div>\n";
@@ -1140,7 +1149,7 @@ function folderSelected<?php echo $form ?>(id, name) {
 			if(!$attrdef->getMultipleValues()) {
 				echo "<option value=\"\"></option>";
 			}
-			$objvalue = $attribute ? $attribute->getValueAsArray() : array();
+			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : $attribute) : array();
 			foreach($valueset as $value) {
 				if($value) {
 					echo "<option value=\"".htmlspecialchars($value)."\"";
@@ -1153,10 +1162,11 @@ function folderSelected<?php echo $form ?>(id, name) {
 			}
 			echo "</select>";
 		} else {
-			if($attribute && strlen($attribute->getValue()) > 30)
-				echo "<textarea name=\"".$fieldname."[".$attrdef->getId()."]\">".htmlspecialchars($attribute->getValue())."</textarea>";
+			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
+			if(strlen($objvalue) > 30)
+				echo "<textarea name=\"".$fieldname."[".$attrdef->getId()."]\">".htmlspecialchars($objvalue)."</textarea>";
 			else
-				echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".($attribute ? htmlspecialchars($attribute->getValue()) : '')."\" />";
+				echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\" />";
 		}
 	} /* }}} */
 

From 889779113d5b3b1c5b647c3f871a424b9f073575 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Jul 2015 21:35:53 +0200
Subject: [PATCH 0295/2006] first check if user is an object before using it

---
 inc/inc.Authentication.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 266ff7097..c53b3de6e 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -69,6 +69,11 @@ if (!isset($_COOKIE["mydms_session"])) {
 	/* Load user data */
 
 	$user = $dms->getUser($resArr["userID"]);
+	if (!is_object($user)) {
+		setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
+		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+		exit;
+	}
 
 	/* Check if user was substituted */
 	if($resArr["su"] && $su = $dms->getUser($resArr["su"])) {
@@ -79,11 +84,7 @@ if (!isset($_COOKIE["mydms_session"])) {
 			$session->resetSu();
 		}
 	}
-	if (!is_object($user)) {
-		setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
-		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
-		exit;
-	}
+
 	$theme = $resArr["theme"];
 	$lang = $resArr["language"];
 }

From bd7a11f0b150f5ba9af3d181b312704dccd0107c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 15 Jul 2015 16:57:26 +0200
Subject: [PATCH 0296/2006] use configured classname in getInstance()

this will make sure that even getInstance in child classes defined
by an extension will return objects of the right class
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 3 ++-
 SeedDMS_Core/Core/inc.ClassFolder.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 58e016aa9..bd8d60015 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -239,7 +239,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$lock = $lockArr[0]["userID"];
 		}
 
-		$document = new self($resArr["id"], $resArr["name"], $resArr["comment"], $resArr["date"], $resArr["expires"], $resArr["owner"], $resArr["folder"], $resArr["inheritAccess"], $resArr["defaultAccess"], $lock, $resArr["keywords"], $resArr["sequence"]);
+		$classname = $dms->getClassname('document');
+		$document = new $classname($resArr["id"], $resArr["name"], $resArr["comment"], $resArr["date"], $resArr["expires"], $resArr["owner"], $resArr["folder"], $resArr["inheritAccess"], $resArr["defaultAccess"], $lock, $resArr["keywords"], $resArr["sequence"]);
 		$document->setDMS($dms);
 		return $document;
 	} /* }}} */
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 7fb9b28f1..982ca1652 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -131,7 +131,8 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			return false;
 
 		$resArr = $resArr[0];
-		$folder = new self($resArr["id"], $resArr["name"], $resArr["parent"], $resArr["comment"], $resArr["date"], $resArr["owner"], $resArr["inheritAccess"], $resArr["defaultAccess"], $resArr["sequence"]);
+		$classname = $dms->getClassname('folder');
+		$folder = new $classname($resArr["id"], $resArr["name"], $resArr["parent"], $resArr["comment"], $resArr["date"], $resArr["owner"], $resArr["inheritAccess"], $resArr["defaultAccess"], $resArr["sequence"]);
 		$folder->setDMS($dms);
 		return $folder;
 	} /* }}} */

From ce79c8e8cd59c04856724d30a7dd90cd8a2fecf0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 15 Jul 2015 16:58:53 +0200
Subject: [PATCH 0297/2006] check for files relative to $settings->_rootDir
 instead of '../'

---
 inc/inc.ClassUI.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 20da3f727..7656d6dc9 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -57,13 +57,13 @@ class UI extends UI_Default {
 		 */
 		$filename = '';
 		foreach($EXT_CONF as $extname=>$extconf) {
-			$filename = '../ext/'.$extname.'/views/'.$theme."/class.".$class.".php";
+			$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php";
 			if(file_exists($filename)) {
 				break;
 			}
 			$filename = '';
 			if(isset($extconf['views'][$class])) {
-				$filename = '../ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file'];
+				$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file'];
 				if(file_exists($filename)) {
 					$classname = $extconf['views'][$class]['name'];
 					break;

From 4e9cadeca6d0814996d9b4dae05a36e93b4f0655 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 15 Jul 2015 16:59:36 +0200
Subject: [PATCH 0298/2006] add new method getHookObjects() which returns all
 registered hook objects

---
 inc/inc.ClassViewCommon.php | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 199bc8f94..29b3ea03a 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -67,6 +67,10 @@ class SeedDMS_View_Common {
 	 * This function will execute all registered hooks in the order
 	 * they were registered.
 	 *
+	 * Attention: as func_get_arg() cannot handle references passed to the hook,
+	 * callHook() should not be called if that is required. In that case get
+	 * a list of hook objects with getHookObjects() and call the hooks yourself.
+	 *
 	 * @params string $hook name of hook
 	 * @return string concatenated string of whatever the hook function returns
 	 */
@@ -105,6 +109,35 @@ class SeedDMS_View_Common {
 		return $ret;
 	} /* }}} */
 
+	/**
+	 * Return all hook objects for the given or calling class
+	 *
+	 * <code>
+	 * <?php
+	 * $hookObjs = $this->getHookObjects();
+	 * foreach($hookObjs as $hookObj) {
+	 *   if (method_exists($hookObj, $hook)) {
+	 *     $ret = $hookObj->$hook($this, ...);
+	 *     ...
+	 *   }
+	 * }
+	 * ?>
+	 * </code>
+	 *
+	 * @params string $classname name of class (current class if left empty)
+	 * @return array list of hook objects registered for the class
+	 */
+	function getHookObjects($classname='') { /* {{{ */
+		if($classname)
+			$tmp = explode('_', $classname);
+		else
+			$tmp = explode('_', get_class($this));
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])])) {
+			return $GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])];
+		}
+		return array();
+	} /* }}} */
+
 	/**
 	 * Check if a hook is registered
 	 *

From a6d8ed829fbe58fc0a5971c391427f2a13874b13 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 15 Jul 2015 17:00:23 +0200
Subject: [PATCH 0299/2006] add new parameter $base to htmlStartPage(), call
 hook for documentMenu propperly

---
 views/bootstrap/class.Bootstrap.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index fca389356..5fa0642b8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -49,11 +49,13 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		$this->footerjs[] = $script;
 	} /* }}} */
 
-	function htmlStartPage($title="", $bodyClass="") { /* {{{ */
+	function htmlStartPage($title="", $bodyClass="", $base="") { /* {{{ */
 		echo "<!DOCTYPE html>\n";
 		echo "<html lang=\"en\">\n<head>\n";
 		echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
 		echo '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
+		if($base)
+			echo '<base href="../../">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/bootstrap/css/bootstrap.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">'."\n";
 		echo '<link href="../styles/'.$this->theme.'/font-awesome/css/font-awesome.css" rel="stylesheet">'."\n";
@@ -577,8 +579,21 @@ $(document).ready(function () {
 			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify');
 		}
 
-		$this->hasHook('documentNavigationBar');
-		$this->callHook('documentNavigationBar', $document, $menuitems);
+		/* Check if hook exists because otherwise callHook() will override $menuitems */
+		if($this->hasHook('documentNavigationBar'))
+			$menuitems = $this->callHook('documentNavigationBar', $document, $menuitems);
+
+		/* Do not use $this->callHook() because $menuitems must be returned by the hook
+		 * or left unchanged
+		 */
+		/*
+		$hookObjs = $this->getHookObjects();
+		foreach($hookObjs as $hookObj) {
+			if (method_exists($hookObj, 'documentNavigationBar')) {
+	      $menuitems = $hookObj->documentNavigationBar($this, $document, $menuitems);
+			}
+		}
+		*/
 
 		foreach($menuitems as $menuitem) {
 			echo "<li><a href=\"".$menuitem['link']."\">".getMLText($menuitem['label'])."</a></li>";

From 8ed3264ae65254800b6ae4bdb3d6aad7df4c9fdd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 15 Jul 2015 22:08:59 +0200
Subject: [PATCH 0300/2006] run hook folderNavigationMenu

---
 views/bootstrap/class.Bootstrap.php | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5fa0642b8..babdbdbf0 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -498,30 +498,39 @@ $(document).ready(function () {
 		echo "<id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=". $folderID ."&showtree=".showtree()."\" class=\"brand\">".getMLText("folder")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "<ul class=\"nav\">\n";
+		$menuitems = array();
 
 		if ($accessMode == M_READ && !$this->params['user']->isGuest()) {
-			echo "<li id=\"first\"><a href=\"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("edit_folder_notify")."</a></li>\n";
+			$menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_notify');
 		}
 		else if ($accessMode >= M_READWRITE) {
-			echo "<li id=\"first\"><a href=\"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("add_subfolder")."</a></li>\n";
-			echo "<li><a href=\"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("add_document")."</a></li>\n";
+			$menuitems['add_subfolder'] = array('link'=>"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_subfolder');
+			$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_document');
 			if($this->params['enablelargefileupload'])
-				echo "<li><a href=\"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("add_multiple_documents")."</a></li>\n";
-			echo "<li><a href=\"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("edit_folder_props")."</a></li>\n";
+				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_multiple_documents');
+			$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'edit_folder_props');
 			if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-				echo "<li><a href=\"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("move_folder")."</a></li>\n";
+				$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'move_folder');
 
 			if ($accessMode == M_ALL) {
 				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-					echo "<li><a href=\"../out/out.RemoveFolder.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("rm_folder")."</a></li>\n";
+					$menuitems['rm_folder'] = array('link'=>"../out/out.RemoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'rm_folder');
 			}
 			if ($accessMode == M_ALL) {
-				echo "<li><a href=\"../out/out.FolderAccess.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("edit_folder_access")."</a></li>\n";
+				$menuitems['edit_folder_access'] = array('link'=>"../out/out.FolderAccess.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_access');
 			}
-			echo "<li><a href=\"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=".showtree()."\">".getMLText("edit_existing_notify")."</a></li>\n";
+			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>'edit_existing_notify');
 		}
 		if ($this->params['user']->isAdmin() && $this->params['enablefullsearch']) {
-			echo "<li><a href=\"../out/out.Indexer.php?folderid=". $folderID ."\">".getMLText("index_folder")."</a></li>\n";
+			$menuitems['index_folder'] = array('link'=>"../out/out.Indexer.php?folderid=". $folderID."&showtree=".showtree(), 'label'=>'index_folder');
+		}
+
+		/* Check if hook exists because otherwise callHook() will override $menuitems */
+		if($this->hasHook('folderNavigationBar'))
+			$menuitems = $this->callHook('folderNavigationBar', $folder, $menuitems);
+
+		foreach($menuitems as $menuitem) {
+			echo "<li><a href=\"".$menuitem['link']."\">".getMLText($menuitem['label'])."</a></li>";
 		}
 		echo "</ul>\n";
 		echo "</div>\n";

From 368ef8478c2573fbd0518842fcfcf5b086803a08 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Jul 2015 07:08:22 +0200
Subject: [PATCH 0301/2006] use view classes from extension only if enabled

---
 inc/inc.ClassUI.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 7656d6dc9..446b73649 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -57,17 +57,19 @@ class UI extends UI_Default {
 		 */
 		$filename = '';
 		foreach($EXT_CONF as $extname=>$extconf) {
-			$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php";
-			if(file_exists($filename)) {
-				break;
-			}
-			$filename = '';
-			if(isset($extconf['views'][$class])) {
-				$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file'];
+			if(!isset($extconf['disable']) || $extconf['disable'] == false) {
+				$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php";
 				if(file_exists($filename)) {
-					$classname = $extconf['views'][$class]['name'];
 					break;
 				}
+				$filename = '';
+				if(isset($extconf['views'][$class])) {
+					$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file'];
+					if(file_exists($filename)) {
+						$classname = $extconf['views'][$class]['name'];
+						break;
+					}
+				}
 			}
 		}
 		if(!$filename)

From 75fbf8d1f44fe154f51d5234dc8497dc15a209a8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Jul 2015 09:13:06 +0200
Subject: [PATCH 0302/2006] add keys settings_autoLoginUser and
 settings_autoLoginUser_desc

---
 languages/ar_EG/lang.inc |   2 +
 languages/bg_BG/lang.inc |   2 +
 languages/ca_ES/lang.inc |   2 +
 languages/cs_CZ/lang.inc |   2 +
 languages/de_DE/lang.inc |   4 +-
 languages/en_GB/lang.inc |   4 +-
 languages/es_ES/lang.inc |   2 +
 languages/fr_FR/lang.inc |   2 +
 languages/hu_HU/lang.inc |   2 +
 languages/it_IT/lang.inc | 229 ++++++++++++++++++++-------------------
 languages/nl_NL/lang.inc |   2 +
 languages/pl_PL/lang.inc |   2 +
 languages/pt_BR/lang.inc |   2 +
 languages/ro_RO/lang.inc |   2 +
 languages/ru_RU/lang.inc |   2 +
 languages/sk_SK/lang.inc |   2 +
 languages/sv_SE/lang.inc |   2 +
 languages/tr_TR/lang.inc |   2 +
 languages/uk_UA/lang.inc |   2 +
 languages/zh_CN/lang.inc |   2 +
 languages/zh_TW/lang.inc |   2 +
 21 files changed, 158 insertions(+), 115 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 4eef19485..df33a1ebe 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -873,6 +873,8 @@ URL: [url]',
 'settings_Advanced' => 'متقدم',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => 'اعدادات التقويم',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 473c31a0c..2c98ce0de 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -738,6 +738,8 @@ $text = array(
 'settings_Advanced' => 'Допълнително',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Настройки на автентификацията',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Кеш папка',
 'settings_cacheDir_desc' => 'къде се съхраняват превю картинките (най-добре да се избере папка която не е достъпна през web-server-а)',
 'settings_Calendar' => 'Настройки календар',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 61578e517..a3e2aed16 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -743,6 +743,8 @@ URL: [url]',
 'settings_Advanced' => '',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 7ec45468b..0b6cda6b7 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -882,6 +882,8 @@ URL: [url]',
 'settings_Advanced' => 'Advanced',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authentication settings',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Adresář mezipaměti',
 'settings_cacheDir_desc' => 'Kde jsou uloženy náhledy obrázků (nejlepší zvolit adresář, který není přístupný přes webový server)',
 'settings_Calendar' => 'Nastavení kalendáře',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 976828251..0c11ba128 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2092), dgrutsch (18)
+//    Translators: Admin (2094), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -902,6 +902,8 @@ URL: [url]',
 'settings_Advanced' => 'Erweitert',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authentifikations-Einstellungen',
+'settings_autoLoginUser' => 'Automatisches Login',
+'settings_autoLoginUser_desc' => 'Verwende den Benutzer mit der angegebenen Id, sofern man nicht bereits angemeldet ist. Solch ein Zugriff erzeugt keine eigene Sitzung.',
 'settings_cacheDir' => 'Cache Verzeichnis',
 'settings_cacheDir_desc' => 'Verzeichnis in dem Vorschaubilder abgelegt werden. Dies sollte ein Verzeichnis sein, auf das man über den Web-Browser keinen direkten Zugriff hat.',
 'settings_Calendar' => 'Kalender-Einstellungen',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index bc78e95d3..d5cadafea 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1220), dgrutsch (3), netixw (14)
+//    Translators: Admin (1222), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -909,6 +909,8 @@ URL: [url]',
 'settings_Advanced' => 'Advanced',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authentication settings',
+'settings_autoLoginUser' => 'Automatic login',
+'settings_autoLoginUser_desc' => 'Use this user id for accesses if the user is not already logged in. Such an access will not create a session.',
 'settings_cacheDir' => 'Cache directory',
 'settings_cacheDir_desc' => 'Where the preview images are stored (best to choose a directory that is not accessible through your web-server)',
 'settings_Calendar' => 'Calendar settings',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index c20611613..88ebdcb9c 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -888,6 +888,8 @@ URL: [url]',
 'settings_Advanced' => 'Avanzado',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Reescritura',
 'settings_Authentication' => 'Configuración de autenticación',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Carpeta caché',
 'settings_cacheDir_desc' => 'Donde están archivadas las imágenes anteriores (mejor elegir una carpeta que no sea accesible a través de su servidor web)',
 'settings_Calendar' => 'Configuración de calendario',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index db6925dd8..e7d2dc1cd 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -864,6 +864,8 @@ URL: [url]',
 'settings_Advanced' => 'Avancé',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Paramètres d\'authentification',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Dossier Cache',
 'settings_cacheDir_desc' => 'Lieu de stockage des images de prévisualisation (choisir de préférence un dossier non accessible à travers le web-server)',
 'settings_Calendar' => 'Paramètres de l\'agenda',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 6b0e30e38..9efe59b52 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -887,6 +887,8 @@ URL: [url]',
 'settings_Advanced' => 'Részletek',
 'settings_apache_mod_rewrite' => 'Apache - Rewrite modul',
 'settings_Authentication' => 'Hitelesítési beállítások',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Átmeneti állományok könyvtára',
 'settings_cacheDir_desc' => 'Ahol az előnézeti képek tárolódnak (legjobb olyan könyvtárat választani, amit a web-kiszolgálón keresztül nem lehet elérni)',
 'settings_Calendar' => 'Naptár beállítások',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 4d35773a1..eea33c29a 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1384), s.pnt (26)
+//    Translators: Admin (1490), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -59,13 +59,13 @@ URL: [url]',
 'add_member' => 'Aggiungi un membro',
 'add_multiple_documents' => 'Aggiungi documenti multipli',
 'add_multiple_files' => 'Aggiungi documenti multipli (il nome del file verrà usato come nome del documento)',
-'add_receipt' => '',
+'add_receipt' => 'invio ricevuta',
 'add_review' => 'Invio revisione',
-'add_revision' => '',
+'add_revision' => 'Aggiungi approvazione',
 'add_subfolder' => 'Aggiungi sottocartella',
 'add_to_clipboard' => 'Aggiungi agli appunti',
-'add_to_transmittal' => '',
-'add_transmittal' => '',
+'add_to_transmittal' => 'Aggiungi alla trasmissione',
+'add_transmittal' => 'Aggiungi trasmissione',
 'add_user' => 'Aggiungi un nuovo utente',
 'add_user_to_group' => 'Aggiungi un utente al gruppo',
 'add_workflow' => 'Crea un flusso di lavoro',
@@ -89,7 +89,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'approval_deletion_email_subject' => '[sitename]: [name] - Richiesta di approvazione cancellata',
-'approval_file' => '',
+'approval_file' => 'File',
 'approval_group' => 'Gruppo di approvazione',
 'approval_log' => 'Registro delle approvazioni',
 'approval_request_email' => 'Richiesta di approvazione',
@@ -114,8 +114,8 @@ URL: [url]',
 'approval_summary' => 'Dettaglio approvazioni',
 'approval_update_failed' => 'Errore nel modificare lo stato di approvazione. Aggiornamento fallito.',
 'approvers' => 'Approvatori',
-'approver_already_assigned' => '',
-'approver_already_removed' => '',
+'approver_already_assigned' => 'Utente già approvatore',
+'approver_already_removed' => 'Utente già rimosso dal processo di approvazione o ha già approvato',
 'april' => 'Aprile',
 'archive_creation' => 'Creazione archivi',
 'archive_creation_warning' => 'Con questa operazione è possibile creare archivi contenenti i file di intere cartelle del DMS. Dopo la creazione l\'archivio viene salvato nella cartella dati del server. Attenzione: un archivio creato per uso esterno non è utilizzabile come backup del server.',
@@ -137,12 +137,12 @@ URL: [url]',
 'attrdef_objtype' => 'Tipo di oggetto',
 'attrdef_regex' => 'Espressione regolare',
 'attrdef_type' => 'Tipo',
-'attrdef_type_boolean' => '',
-'attrdef_type_email' => '',
-'attrdef_type_float' => '',
-'attrdef_type_int' => '',
-'attrdef_type_string' => '',
-'attrdef_type_url' => '',
+'attrdef_type_boolean' => 'Booleano',
+'attrdef_type_email' => 'Email',
+'attrdef_type_float' => 'Virgola mobile',
+'attrdef_type_int' => 'Intero',
+'attrdef_type_string' => 'Stringa',
+'attrdef_type_url' => 'URL',
 'attrdef_valueset' => 'Set di valori',
 'attributes' => 'Attributi',
 'attribute_changed_email_body' => 'Attributo modificato
@@ -155,7 +155,8 @@ URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Attributo modificato',
 'attribute_count' => 'Numero di utilizzi',
 'attribute_value' => 'Valore dell\'Attributo',
-'attr_malformed_email' => '',
+'attr_malformed_email' => 'Il valore di \'[value]\' dell,
+ => attributo \'[attrname]\' non é un URL valido.',
 'attr_malformed_url' => '',
 'attr_max_values' => 'Il numero massimo dei valori richiesti per l\'Attributo [attrname] è superato.',
 'attr_min_values' => 'Il numero minimo di valori richiesti per l\'Attributo [attrname] non è raggiunto.',
@@ -194,8 +195,8 @@ URL: [url]',
 'change_assignments' => 'Modifica le Assegnazioni',
 'change_password' => 'Cambia la password',
 'change_password_message' => 'La password è stata cambiata',
-'change_recipients' => '',
-'change_revisors' => '',
+'change_recipients' => 'Cambia lista cartelle',
+'change_revisors' => 'Cambia reimmissione',
 'change_status' => 'Modifica lo Stato',
 'charts' => 'Grafici',
 'chart_docsaccumulated_title' => 'Numero di documenti',
@@ -206,12 +207,12 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documenti per utente',
 'chart_selection' => 'Seleziona grafico',
 'chart_sizeperuser_title' => 'Spazio su disco per utente',
-'checkedout_file_has_different_version' => '',
-'checkedout_file_has_disappeared' => '',
-'checkedout_file_is_unchanged' => '',
-'checkin_document' => '',
-'checkout_document' => '',
-'checkout_is_disabled' => '',
+'checkedout_file_has_different_version' => 'La versione approvata non è uguale alla versione corrente. Non si aggiornerà documento.',
+'checkedout_file_has_disappeared' => 'File documento approvato non trovato. Impossibile caricare.',
+'checkedout_file_is_unchanged' => 'La versione approvata è uguale alla versione corrente. Impossibile caricare.',
+'checkin_document' => 'Da approvare',
+'checkout_document' => 'Approvato',
+'checkout_is_disabled' => 'Approvazione dei documenti disabilitata',
 'choose_attrdef' => 'Seleziona l\'Attributo',
 'choose_category' => 'Seleziona',
 'choose_group' => 'Seleziona il gruppo',
@@ -240,15 +241,15 @@ URL: [url]',
 'confirm_rm_folder_files' => 'Vuoi davvero rimuovere tutti i file dalla cartella "[foldername]" e dalle sue sottocartelle? Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_group' => 'Vuoi davvero rimuovere il gruppo "[groupname]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_log' => 'Vuoi davvero rimuovere il file di log "[logname]"?<br>Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_transmittalitem' => '',
+'confirm_rm_transmittalitem' => 'Conferma rimozione',
 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
-'confirm_update_transmittalitem' => '',
+'confirm_update_transmittalitem' => 'Conferma aggiornamento',
 'content' => 'Contenuto',
 'continue' => 'Continua',
-'converter_new_cmd' => '',
-'converter_new_mimetype' => '',
-'copied_to_checkout_as' => '',
+'converter_new_cmd' => 'Comando',
+'converter_new_mimetype' => 'Nuovo mimetype',
+'copied_to_checkout_as' => 'File copiato come \'[filename]\'',
 'create_fulltext_index' => 'Crea indice fulltext',
 'create_fulltext_index_warning' => 'Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l\'indice? Prego conferma l\'operazione.',
 'creation_date' => 'Data creazione',
@@ -273,17 +274,17 @@ URL: [url]',
 'discspace' => 'Spazio su disco',
 'document' => 'Documento',
 'documents' => 'Documenti',
-'documents_checked_out_by_you' => '',
+'documents_checked_out_by_you' => 'Documenti approvati da te',
 'documents_in_process' => 'Documenti in lavorazione',
 'documents_locked_by_you' => 'Documenti bloccati da te',
 'documents_only' => 'Solo documenti',
 'documents_to_approve' => 'Documenti in attesa della tua approvazione',
-'documents_to_receipt' => '',
+'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
-'documents_to_revise' => '',
+'documents_to_revise' => 'Documenti da revisionare.',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
-'document_already_checkedout' => '',
+'document_already_checkedout' => 'Questo documento è già approvato',
 'document_already_locked' => 'Questo documento è già bloccato',
 'document_comment_changed_email' => 'Commento modificato',
 'document_comment_changed_email_body' => 'Commento modificato
@@ -304,7 +305,7 @@ Utente: [username]',
 'document_duplicate_name' => 'Nome del Documento duplicato',
 'document_has_no_workflow' => 'Il documento non ha un flusso di lavoro',
 'document_infos' => 'Informazioni documento',
-'document_is_checked_out' => '',
+'document_is_checked_out' => 'Il documento é approvato. Se aggiorni il documento, la versione approvata verrà sovrascritta definitivamente',
 'document_is_not_locked' => 'Questo documento non è bloccato',
 'document_link_by' => 'Collegato da',
 'document_link_public' => 'Pubblico',
@@ -316,7 +317,7 @@ Nuova cartella: [new_folder_path]
 Utente: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Documento spostato',
-'document_not_checkedout' => '',
+'document_not_checkedout' => 'Documento non approvato',
 'document_renamed_email' => 'Documento rinominato',
 'document_renamed_email_body' => 'Documento rinominato
 Documento: [name]
@@ -350,7 +351,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Imposta il checksum',
 'do_object_setfilesize' => 'Imposta la dimensione del file',
 'do_object_unlink' => 'Cancella la versione del documento',
-'draft' => '',
+'draft' => 'Bozza',
 'draft_pending_approval' => 'Bozza - in approvazione',
 'draft_pending_review' => 'Bozza - in revisione',
 'drag_icon_here' => 'Trascina qui l\'icona della cartella o del documento',
@@ -376,7 +377,7 @@ URL: [url]',
 'edit_folder_notify' => 'Modifica la lista di notifica per la cartella',
 'edit_folder_props' => 'Modifica proprietà cartella',
 'edit_group' => 'Modifica il gruppo',
-'edit_transmittal_props' => '',
+'edit_transmittal_props' => 'Modifica proprietà trasmissione',
 'edit_user' => 'Modifica l\'utente',
 'edit_user_details' => 'Modifica i dettagli utente',
 'email' => 'Email',
@@ -403,7 +404,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'expiry_changed_email_subject' => '[sitename]: [name] - Scadenza cambiata',
-'export' => '',
+'export' => 'Esporta',
 'extension_manager' => 'Gestisci le estensioni dei files',
 'february' => 'Febbraio',
 'file' => 'File',
@@ -475,14 +476,14 @@ URL: [url]',
 'guest_login' => 'Login come Ospite',
 'guest_login_disabled' => 'Il login come Ospite è disabilitato.',
 'help' => 'Aiuto',
-'home_folder' => '',
+'home_folder' => 'Cartella Utente',
 'hourly' => 'Ogni ora',
 'hours' => 'ore',
 'human_readable' => 'Archivio per uso esterno',
 'hu_HU' => 'Ungherese',
 'id' => 'ID',
 'identical_version' => 'La nuova versione è identica a quella attuale.',
-'include_content' => '',
+'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
 'index_converters' => 'Indice di conversione documenti',
@@ -512,7 +513,7 @@ URL: [url]',
 'invalid_target_folder' => 'ID cartella selezionata non valido',
 'invalid_user_id' => 'ID utente non valido',
 'invalid_version' => 'Versione del documento non valida',
-'in_revision' => '',
+'in_revision' => 'In fase di revisione',
 'in_workflow' => 'In fase di lavorazione',
 'is_disabled' => 'Account Disabilitato',
 'is_hidden' => 'Nascondi dalla lista utenti',
@@ -544,7 +545,7 @@ URL: [url]',
 'lastaccess' => 'Ultimo accesso',
 'last_update' => 'Ultima modifica',
 'legend' => 'Legenda',
-'librarydoc' => '',
+'librarydoc' => 'Documento da cartella',
 'linked_documents' => 'Documenti collegati',
 'linked_files' => 'Allegati',
 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la <a href="%s">pagina alternativa di upload</a>.',
@@ -591,7 +592,7 @@ URL: [url]',
 'move_folder' => 'Sposta cartella',
 'my_account' => 'Account personale',
 'my_documents' => 'Documenti personali',
-'my_transmittals' => '',
+'my_transmittals' => 'Mie trasmissioni',
 'name' => 'Nome',
 'needs_workflow_action' => 'Il documento richiede attenzione. Prego controllare il flusso di lavoro.',
 'never' => 'Mai',
@@ -652,13 +653,13 @@ URL: [url]',
 'no_attached_files' => 'Nessun file allegato',
 'no_current_version' => 'La corrente versione di SeedDMS non è aggiornata. La versione più recente disponibile è la [latestversion].',
 'no_default_keywords' => 'Nessuna parola-chiave disponibile',
-'no_docs_checked_out' => '',
+'no_docs_checked_out' => 'Nessun documento approvato',
 'no_docs_locked' => 'Nessun documento bloccato.',
 'no_docs_to_approve' => 'Non ci sono documenti che richiedano approvazione.',
 'no_docs_to_look_at' => 'Non ci sono documenti che richiedano attenzione.',
-'no_docs_to_receipt' => '',
+'no_docs_to_receipt' => 'Nessuna cartella richiesta.',
 'no_docs_to_review' => 'Non ci sono documenti che richiedano revisioni.',
-'no_docs_to_revise' => '',
+'no_docs_to_revise' => 'Non ci sono documenti che richiedano approvazione.',
 'no_email_or_login' => 'Login ed email devono essere digitate',
 'no_fulltextindex' => 'Nessun indice fulltext disponibile',
 'no_groups' => 'Nessun gruppo',
@@ -668,7 +669,7 @@ URL: [url]',
 'no_receipt_needed' => '',
 'no_review_needed' => 'Nessuna revisione in sospeso.',
 'no_revision_needed' => '',
-'no_revision_planed' => '',
+'no_revision_planed' => 'Nessuna revisione pianificata.',
 'no_update_cause_locked' => 'Non è quindi possible aggiornare il documento. Prego contattare l\'utente che l\'ha bloccato.',
 'no_user_image' => 'Nessuna immagine trovata',
 'no_version_check' => 'Il controllo per una nuova versione di SeedDMS è fallito! Questo può essere causato da allow_url_fopen settato a 0 nella tua configurazione php.',
@@ -718,8 +719,8 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'password_wrong' => 'Password errata',
 'personal_default_keywords' => 'Parole-chiave personali',
 'pl_PL' => 'Polacco',
-'possible_substitutes' => '',
-'preview_converters' => '',
+'possible_substitutes' => 'Sostituti',
+'preview_converters' => 'Anteprima convesione documento',
 'previous_state' => 'Stato precedente',
 'previous_versions' => 'Versioni precedenti',
 'pt_BR' => 'Portoghese (BR)',
@@ -727,9 +728,9 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].',
 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.',
 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.',
-'receipt_log' => '',
-'receipt_summary' => '',
-'recipients' => '',
+'receipt_log' => 'Ricezione Log',
+'receipt_summary' => 'Sommario ricezione',
+'recipients' => 'Cartelle',
 'refresh' => 'Ricarica',
 'rejected' => 'Rifiutato',
 'released' => 'Rilasciato',
@@ -740,9 +741,9 @@ Documento: [document]
 Utente: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Allegato rimosso',
-'removed_recipient' => '',
-'removed_reviewer' => 'é stato rimosso dalla lista dei revisori.',
-'removed_revispr' => '',
+'removed_recipient' => 'è stato rimosso dalla lista delle cartelle.',
+'removed_reviewer' => 'è stato rimosso dalla lista dei revisori.',
+'removed_revispr' => 'è stato rimosso dalla lista degli approvatori.',
 'removed_workflow_email_body' => 'Flusso di lavoro rimosso dalla versione del documento
 Documento: [name]
 Versione: [version]
@@ -754,16 +755,16 @@ URL: [url]',
 'remove_marked_files' => 'Rimuovi i files contrassegnati',
 'repaired' => 'riparato',
 'repairing_objects' => 'Riparazione documenti e cartelle in corso...',
-'request_workflow_action_email_body' => 'Il flusso di lavoro richiede che tu esegua un\'azione.
-Documento: [name]
-Versione: [version]
-Flusso di lavoro: [workflow]
-Stato attuale: [current_state]
-Cartella: [folder_path]
-Utente: [username]
+'request_workflow_action_email_body' => 'Il flusso di lavoro richiede che tu esegua un\'azione.
+Documento: [name]
+Versione: [version]
+Flusso di lavoro: [workflow]
+Stato attuale: [current_state]
+Cartella: [folder_path]
+Utente: [username]
 URL: [url]',
 'request_workflow_action_email_subject' => 'Richiesta di azione in un flusso di lavoro',
-'reset_checkout' => '',
+'reset_checkout' => 'Check Out terminato',
 'results_page' => 'Pagina dei risultati',
 'return_from_subworkflow' => 'Ritorno dal sotto-flusso di lavoro',
 'return_from_subworkflow_email_body' => 'Ritorno dal sotto-flusso di lavoro
@@ -787,7 +788,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'review_deletion_email_subject' => '[sitename]: [name] - Richiesta di revisione cancellata',
-'review_file' => '',
+'review_file' => 'File',
 'review_group' => 'Gruppo revisori',
 'review_log' => 'Rivedi log',
 'review_request_email' => 'Richiesta di revisione',
@@ -811,13 +812,13 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Sottoposta revisione',
 'review_summary' => 'Dettaglio revisioni',
 'review_update_failed' => 'Errore nella variazione dello stato di revisione. Aggiornamento fallito.',
-'revise_document' => '',
-'revise_document_on' => '',
-'revision_date' => '',
-'revision_log' => '',
-'revisors' => '',
-'revisor_already_assigned' => '',
-'revisor_already_removed' => '',
+'revise_document' => 'Rivedi documento',
+'revise_document_on' => 'Prossima revisione del documento il [date]',
+'revision_date' => 'data revisione',
+'revision_log' => 'Log revisione',
+'revisors' => 'Revisori',
+'revisor_already_assigned' => 'Utente già assegnato al ruolo di revisore',
+'revisor_already_removed' => 'Revisore già rimosso dal processo di revisione o ha già revisionato documento.',
 'rewind_workflow' => 'Inverti il flusso di lavoro',
 'rewind_workflow_email_body' => 'Il flusso di lavoro è stato invertito
 Document: [name]
@@ -836,8 +837,8 @@ URL: [url]',
 'rm_folder' => 'Rimuovi cartella',
 'rm_from_clipboard' => 'Rimuovi dalla clipboard',
 'rm_group' => 'Rimuovi questo gruppo',
-'rm_transmittal' => '',
-'rm_transmittalitem' => '',
+'rm_transmittal' => 'Rimuovi trasmissione',
+'rm_transmittalitem' => 'Rimuovi oggetto',
 'rm_user' => 'Rimuovi questo utente',
 'rm_version' => 'Rimuovi versione',
 'rm_workflow' => 'Rimuovi flusso di lavoro',
@@ -885,14 +886,14 @@ URL: [url]',
 'select_groups' => 'Clicca per selezionare i gruppi',
 'select_grp_approvers' => 'Seleziona gruppo approvatore',
 'select_grp_notification' => 'Seleziona Gruppo',
-'select_grp_recipients' => '',
+'select_grp_recipients' => 'Seleziona gruppo cartelle',
 'select_grp_reviewers' => 'Seleziona gruppo revisore',
-'select_grp_revisors' => '',
+'select_grp_revisors' => 'Seleziona gruppo revisori',
 'select_ind_approvers' => 'Seleziona approvatore',
 'select_ind_notification' => 'Seleziona Utente',
-'select_ind_recipients' => '',
+'select_ind_recipients' => 'Seleziona singole cartelle',
 'select_ind_reviewers' => 'Seleziona revisore',
-'select_ind_revisors' => '',
+'select_ind_revisors' => 'Seleziona singoli revisori',
 'select_one' => 'Seleziona uno',
 'select_users' => 'Clicca per selezionare gli utenti',
 'select_workflow' => 'Seleziona il flusso di lavoro',
@@ -910,14 +911,16 @@ URL: [url]',
 'settings_Advanced' => 'Avanzate',
 'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite',
 'settings_Authentication' => 'Impostazioni di Autenticazione',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Cartella di cache',
 'settings_cacheDir_desc' => 'Cartella in cui vengono conservate le immagini di anteprima, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_Calendar' => 'Impostazioni calendario',
 'settings_calendarDefaultView' => 'Vista di default del calendario',
 'settings_calendarDefaultView_desc' => 'Vista di default del calendario',
 'settings_cannot_disable' => 'Il file ENABLE_INSTALL_TOOL non può essere cancellato',
-'settings_checkOutDir' => '',
-'settings_checkOutDir_desc' => '',
+'settings_checkOutDir' => 'Cartella per i documenti approvati',
+'settings_checkOutDir_desc' => 'Questa eultima versione del documento viene copiata se approvato. Se accessibile agli utenti, possono editare il documento e ricopiarlo quando finito.',
 'settings_contentDir' => 'Cartella contenitore',
 'settings_contentDir_desc' => 'Cartella in cui vengono conservati i files caricati, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_contentOffsetDir' => 'Cartella Offset',
@@ -926,8 +929,8 @@ URL: [url]',
 'settings_cookieLifetime_desc' => 'Tempo di vita del cookie in secondi: se impostato su 0 il cookie verrà rimosso alla chiusura del browser',
 'settings_coreDir' => 'Cartella principale dell\'applicazione',
 'settings_coreDir_desc' => 'Percorso del pacchetto principale dell\'applicazione',
-'settings_createCheckOutDir' => '',
-'settings_createCheckOutDir_desc' => '',
+'settings_createCheckOutDir' => 'Cartella approvati',
+'settings_createCheckOutDir_desc' => 'I documenti verranno copiati in questa cartella, quando approvati.',
 'settings_createdatabase' => 'Crea database',
 'settings_createdirectory' => 'Crea cartella',
 'settings_currentvalue' => 'Valore corrente',
@@ -951,8 +954,8 @@ URL: [url]',
 'settings_dropFolderDir' => 'Cartella per il drop',
 'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per rilasciare (drop) files sul server per importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare files in questo modo.',
 'settings_Edition' => 'Impostazioni di edizione',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
+'settings_enableAcknowledgeWorkflow' => 'Abilitare per notifiche',
+'settings_enableAcknowledgeWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.',
 'settings_enableAdminRevApp' => 'Permetti la revisione/approvazione da parte degli amministratori',
 'settings_enableAdminRevApp_desc' => 'Abilita per elencare gli amministratori tra i revisori/approvatori e per le transizioni del flusso di lavoro',
 'settings_enableCalendar' => 'Abilita calendario',
@@ -989,8 +992,8 @@ URL: [url]',
 'settings_enablePasswordForgotten_desc' => 'Spuntare nel caso si desideri permettere all\'utente di re-impostare la password inviata per email.',
 'settings_enableRecursiveCount' => 'Abilita il conteggio ricursivo di documenti/cartelle',
 'settings_enableRecursiveCount_desc' => 'Se selezionato il numero di documenti e sottocartelle accessibili all\'utente sarà calcolato con un conteggio ricursivo di tutti gli oggetti contenuti nella cartella.',
-'settings_enableRevisionWorkflow' => '',
-'settings_enableRevisionWorkflow_desc' => '',
+'settings_enableRevisionWorkflow' => 'Abilita revisione documenti',
+'settings_enableRevisionWorkflow_desc' => 'Abilita per attivare workflow su revisione documenti dopo scadenza.',
 'settings_enableSelfRevApp' => 'Permetti revisione/approvazione all\'utente registrato',
 'settings_enableSelfRevApp_desc' => 'Abilitare se si desidera aggiungere l\'utente attualmente registrato alla lista dei revisori/approvatori e per le transizioni del flusso di lavoro.',
 'settings_enableThemeSelector' => 'Selezione tema grafico',
@@ -1022,10 +1025,10 @@ URL: [url]',
 'settings_guestID_desc' => 'ID o utenza ospite utilizzata quando collegati al sito come ospite (da cambiare solo in casi eccezionali).',
 'settings_httpRoot' => 'Cartella web principale',
 'settings_httpRoot_desc' => 'Percorso relativo nell\'URL dopo il dominio e senza il prefisso \'http://\'. Es: se l\'URL completo è http://www.esempio.com/SeedDMS/, impostare \'/SeedDMS/\'; se invece l\'URL è http://www.esempio.com/, impostare \'/\'',
-'settings_initialDocumentStatus' => '',
-'settings_initialDocumentStatus_desc' => '',
-'settings_initialDocumentStatus_draft' => '',
-'settings_initialDocumentStatus_released' => '',
+'settings_initialDocumentStatus' => 'Stato iniziale documento',
+'settings_initialDocumentStatus_desc' => 'Stato assegnato quando si aggiunge documento',
+'settings_initialDocumentStatus_draft' => 'Bozza',
+'settings_initialDocumentStatus_released' => 'Rilasciato',
 'settings_installADOdb' => 'Installa ADOdb',
 'settings_install_disabled' => 'Il file ENABLE_INSTALL_TOOL è stato cancellato. Ora puoi effettuare il login in SeedDMS e fare ulteriori configurazioni.',
 'settings_install_pear_package_log' => 'Installa il registro del pacchetto Pear',
@@ -1036,8 +1039,8 @@ URL: [url]',
 'settings_install_zendframework' => 'Installare il framework Zend, se si intende usufruire del motore di ricerca fulltext.',
 'settings_language' => 'Lingua di default',
 'settings_language_desc' => 'Lingua di default (nome della sottocartella corrispondente nella cartella "languages")',
-'settings_libraryFolder' => '',
-'settings_libraryFolder_desc' => '',
+'settings_libraryFolder' => 'Libreria cartelle',
+'settings_libraryFolder_desc' => 'Cartella dove i documenti possono essere copiati per crearne di nuovi.',
 'settings_logFileEnable' => 'Abilita il file di registro',
 'settings_logFileEnable_desc' => 'Abilita/disabilita il file di registro',
 'settings_logFileRotation' => 'Rotazione del file di registro',
@@ -1059,8 +1062,8 @@ URL: [url]',
 'settings_Notification' => 'Impostazioni di notifica',
 'settings_notwritable' => 'La configurazione non può essere salvata perchè il file di configurazione non può essere sovrascritto.',
 'settings_no_content_dir' => 'Cartella contenitore',
-'settings_overrideMimeType' => '',
-'settings_overrideMimeType_desc' => '',
+'settings_overrideMimeType' => 'Ignora MimeType',
+'settings_overrideMimeType_desc' => 'Ignora il MimeType impostato dal browser, se un file viene caricato. Il MimeType è determinato ed impostato dal DMS stesso.',
 'settings_partitionSize' => 'Dimensione file parziale',
 'settings_partitionSize_desc' => 'Dimensione parziale dei files caricati da Jumploader in bytes. Non impostare un valore maggiore del massimo carico di upload attribuito dal server.',
 'settings_passwordExpiration' => 'Scadenza Password',
@@ -1173,7 +1176,7 @@ URL: [url]',
 'splash_add_user' => 'Utente aggiunto',
 'splash_cleared_clipboard' => 'Appunti cancellati',
 'splash_document_added' => 'Documento aggiunto',
-'splash_document_checkedout' => '',
+'splash_document_checkedout' => 'Documento approvato',
 'splash_document_edited' => 'Documento modificato',
 'splash_document_locked' => 'Documento bloccato',
 'splash_document_unlocked' => 'Documento sbloccato',
@@ -1202,29 +1205,29 @@ URL: [url]',
 'status_approved' => 'Approvato',
 'status_approver_removed' => 'Approvatore rimosso dal processo',
 'status_not_approved' => 'Non ancora approvato',
-'status_not_receipted' => '',
+'status_not_receipted' => 'Non ancora ricevuto',
 'status_not_reviewed' => 'Non ancora revisionato',
-'status_not_revised' => '',
-'status_receipted' => '',
-'status_receipt_rejected' => '',
-'status_recipient_removed' => '',
+'status_not_revised' => 'Non revisionato',
+'status_receipted' => 'Ricevuto',
+'status_receipt_rejected' => 'Rigettato',
+'status_recipient_removed' => 'Cartella rimossa dalla lista',
 'status_reviewed' => 'Revisionato',
 'status_reviewer_rejected' => 'Bozza rifiutata',
 'status_reviewer_removed' => 'Revisore rimosso dal processo',
-'status_revised' => '',
-'status_revision_rejected' => '',
-'status_revision_sleeping' => '',
-'status_revisor_removed' => '',
+'status_revised' => 'Revisionato',
+'status_revision_rejected' => 'Rigettato',
+'status_revision_sleeping' => 'In attesa',
+'status_revisor_removed' => 'Revisore rimosso dalla lista',
 'status_unknown' => 'Sconosciuto',
 'storage_size' => 'Spazio di archiviazione',
 'submit_approval' => 'Invio approvazione',
 'submit_login' => 'Accedi',
 'submit_password' => 'Impostazione nuova password',
 'submit_password_forgotten' => 'Inizio processo di recupero',
-'submit_receipt' => '',
+'submit_receipt' => 'Invio ricevuta',
 'submit_review' => 'Invio revisione',
 'submit_userinfo' => 'Invio info utente',
-'substitute_to_user' => '',
+'substitute_to_user' => 'Cambia in \'[username]\'',
 'substitute_user' => 'Impersona utente',
 'sunday' => 'Domenica',
 'sunday_abbr' => 'Dom',
@@ -1255,12 +1258,12 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'transition_triggered_email_subject' => 'Transizione del flusso di lavoro iniziata',
-'transmittal' => '',
-'transmittalitem_removed' => '',
-'transmittalitem_updated' => '',
-'transmittal_comment' => '',
-'transmittal_name' => '',
-'transmittal_size' => '',
+'transmittal' => 'Trasmissione',
+'transmittalitem_removed' => 'Oggetto trasmissione rimosso',
+'transmittalitem_updated' => 'Documento aggiornato alla ultima versione',
+'transmittal_comment' => 'Commento',
+'transmittal_name' => 'Nome',
+'transmittal_size' => 'Dimensione',
 'trigger_workflow' => 'Flusso di lavoro',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martedì',
@@ -1289,10 +1292,10 @@ URL: [url]',
 'update_fulltext_index' => 'Aggiorna indice fulltext',
 'update_info' => 'Aggiorna informazioni',
 'update_locked_msg' => 'Questo documento è bloccato.',
-'update_recipients' => '',
+'update_recipients' => 'Aggiorna lista cartelle',
 'update_reviewers' => 'Aggiorna lista revisori',
-'update_revisors' => '',
-'update_transmittalitem' => '',
+'update_revisors' => 'Aggiorna lista dei revisori',
+'update_transmittalitem' => 'Aggiorna alla ultima versione del documento',
 'uploaded_by' => 'Caricato da',
 'uploading_failed' => 'Upload fallito. Controllare la dimensione massima caricabile consentita.',
 'uploading_maxsize' => 'Il file caricato supera la dimensione massima consentita.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 21a7e2fa2..c4ee370cf 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -879,6 +879,8 @@ URL: [url]',
 'settings_Advanced' => 'Uitgebreid',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Authenticatie instellingen',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'cache directory',
 'settings_cacheDir_desc' => 'Waar de voorbeeld afbeeldingen zijn opgeslagen (het is het beste om te kiezen voor een pad, welke niet toegankelijk is door uw webserver)',
 'settings_Calendar' => 'Kalender instellingen',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index f7d0dd4bb..7d3e6bf76 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -867,6 +867,8 @@ URL: [url]',
 'settings_Advanced' => 'Zaawansowane',
 'settings_apache_mod_rewrite' => 'Apache - Moduł Rewrite',
 'settings_Authentication' => 'Ustawienia uwierzytelniania',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Folder bufora',
 'settings_cacheDir_desc' => 'Miejsce przechowywania obrazków podglądu (najlepiej wybrać katalog nie dostępny bezpośrednio dla web-serwera).',
 'settings_Calendar' => 'Ustawienia kalendarza',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index a4ba1ec90..16480f0de 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -885,6 +885,8 @@ URL: [url]',
 'settings_Advanced' => 'Avançado',
 'settings_apache_mod_rewrite' => 'Apache - Módulo Rewrite',
 'settings_Authentication' => 'Definições de autenticação',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Diretório de cache',
 'settings_cacheDir_desc' => 'Onde as imagens de visualização são armazenadas (melhor escolher um diretório que não é acessível através de seu web-server)',
 'settings_Calendar' => 'Configurações do calendário',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 0ea912613..1d800f539 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -910,6 +910,8 @@ URL: [url]',
 'settings_Advanced' => 'Avansat',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Setări de autentificare',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Director Cache',
 'settings_cacheDir_desc' => 'Unde sunt stocate imaginile de previzualizare (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_Calendar' => 'Setări calendar',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 753672aa8..b535858c0 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -878,6 +878,8 @@ URL: [url]',
 'settings_Advanced' => 'Дополнительно',
 'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
 'settings_Authentication' => 'Настройки авторизации',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Каталог кэша',
 'settings_cacheDir_desc' => 'Где хранятся эскизы изображений (лучше выбрать каталог недоступный веб-серверу).',
 'settings_Calendar' => 'Настройки календаря',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 77453d4f7..54916c86d 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -738,6 +738,8 @@ $text = array(
 'settings_Advanced' => '',
 'settings_apache_mod_rewrite' => '',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index f69ecaa07..ec0b19894 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -873,6 +873,8 @@ URL: [url]',
 'settings_Advanced' => 'Avancerat',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Autentiseringsinställningar',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Cache-mapp',
 'settings_cacheDir_desc' => 'Här kommer bilder för förhandsvisning att sparas. (Det är bäst att använda en mapp som inte är tillgänglig från webbservern)',
 'settings_Calendar' => 'Kalenderinställningar',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 6b18cf2d6..606e61b49 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -889,6 +889,8 @@ URL: [url]',
 'settings_Advanced' => 'Gelişmiş ayarlar',
 'settings_apache_mod_rewrite' => 'Apache - Module Rewrite',
 'settings_Authentication' => 'Yetkilendirme ayarları',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Cache klasörü',
 'settings_cacheDir_desc' => 'Önizleme resimlerinin depolanacağı yer (web üzerinden erişilemeyen bir yer tercih etmeniz önerilir.)',
 'settings_Calendar' => 'Takvim ayarları',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index b297723d4..af5928cdf 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -900,6 +900,8 @@ URL: [url]',
 'settings_Advanced' => 'Додатково',
 'settings_apache_mod_rewrite' => 'Apache — модуль Rewrite',
 'settings_Authentication' => 'Налаштування авторизації',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => 'Каталог кешу',
 'settings_cacheDir_desc' => 'Де зберігаються ескізи зображень (краще вибрати каталог, недоступний веб-серверові).',
 'settings_Calendar' => 'Налаштування календаря',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 77f8db33c..af18cca6f 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -744,6 +744,8 @@ URL: [url]',
 'settings_Advanced' => '高级设置',
 'settings_apache_mod_rewrite' => '',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index ecec9eaf5..d59aac937 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -742,6 +742,8 @@ URL: [url]',
 'settings_Advanced' => '',
 'settings_apache_mod_rewrite' => '',
 'settings_Authentication' => '',
+'settings_autoLoginUser' => '',
+'settings_autoLoginUser_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',

From 43341c802fc17dcd263a5afd5dc2560bd262f867 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Jul 2015 09:19:55 +0200
Subject: [PATCH 0303/2006] add keys settings_enableMenuTasks and
 settings_enableMenuTasks_desc

---
 languages/ar_EG/lang.inc | 2 ++
 languages/bg_BG/lang.inc | 2 ++
 languages/ca_ES/lang.inc | 2 ++
 languages/cs_CZ/lang.inc | 2 ++
 languages/de_DE/lang.inc | 4 +++-
 languages/en_GB/lang.inc | 4 +++-
 languages/es_ES/lang.inc | 2 ++
 languages/fr_FR/lang.inc | 2 ++
 languages/hu_HU/lang.inc | 2 ++
 languages/it_IT/lang.inc | 2 ++
 languages/nl_NL/lang.inc | 2 ++
 languages/pl_PL/lang.inc | 2 ++
 languages/pt_BR/lang.inc | 2 ++
 languages/ro_RO/lang.inc | 2 ++
 languages/ru_RU/lang.inc | 2 ++
 languages/sk_SK/lang.inc | 2 ++
 languages/sv_SE/lang.inc | 2 ++
 languages/tr_TR/lang.inc | 2 ++
 languages/uk_UA/lang.inc | 2 ++
 languages/zh_CN/lang.inc | 2 ++
 languages/zh_TW/lang.inc | 2 ++
 21 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index df33a1ebe..3e3fdd78c 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -942,6 +942,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 2c98ce0de..609436180 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -807,6 +807,8 @@ $text = array(
 'settings_enableLanguageSelector_desc' => 'Покажи селектор за език на интерфейса след влизане. Това не влияе на избора на език на първа страница.',
 'settings_enableLargeFileUpload' => 'Включи джава-зараждане на файлове',
 'settings_enableLargeFileUpload_desc' => 'Ако е включено, качване на файлове е дустъпно и чрез джава-аплет, именован jumploader, без лимит за размер на файла. Това също ще позволи да се качват няколко файла наведнъж.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Разреши уведомление до рецензиращи/утвърждаващи',
 'settings_enableNotificationAppRev_desc' => 'Избери за изпращане на уведомление до рецензиращи/утвърждаващи когато се добавя нова версия на документа',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index a3e2aed16..a9fc100b9 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -812,6 +812,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 0b6cda6b7..f3ab013ef 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -951,6 +951,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Zobrazit výběr jazyka uživatelského rozhraní po přihlášení.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Povolit oznámení posuzovateli/schvalovateli',
 'settings_enableNotificationAppRev_desc' => 'Označit pro oznamování posuzovateli/schvalovateli, pokud je přidána nová verze dokumentu.',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 0c11ba128..4d375075e 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2094), dgrutsch (18)
+//    Translators: Admin (2096), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -971,6 +971,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Zeige Auswahl der verfügbaren Sprachen nachdem man sich angemeldet hat.',
 'settings_enableLargeFileUpload' => 'Hochladen von sehr großen Dateien ermöglichen',
 'settings_enableLargeFileUpload_desc' => 'Wenn dies gesetzt ist, dann ist ebenfalls der Upload von Dokumenten durch ein java applet mit Namen \'jumploader\' ohne Begrenzung der maximalen Dateigröße möglich. Auch das Hochladen mehrerer Dokumente in einem Schritt wird dadurch ermöglicht. Das Einschalten bewirkt, dass keine http only Cookies mehr gesetzt werden.',
+'settings_enableMenuTasks' => 'Aufgabenliste im Menü',
+'settings_enableMenuTasks_desc' => 'Ein-/Ausschalten des Menüeintrags, der anstehenden Aufgaben des Benutzers enthält. Diese Liste beinhaltet Dokumente die geprüft, freigegeben, usw. werden müssen.',
 'settings_enableNotificationAppRev' => 'Prűfer/Freigeber benachrichtigen',
 'settings_enableNotificationAppRev_desc' => 'Setzen Sie diese Option, wenn die Prüfer und Freigeber eines Dokuments beim Hochladen einer neuen Version benachrichtigt werden sollen.',
 'settings_enableNotificationWorkflow' => 'Sende Benachrichtigung an Benutzer im nächsten Workflow-Schritt',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index d5cadafea..5026cc8c1 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1222), dgrutsch (3), netixw (14)
+//    Translators: Admin (1224), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -978,6 +978,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
 'settings_enableLargeFileUpload_desc' => 'If set, file upload is also available through a java applet called jumploader without a file size limit set by the browser. It also allows to upload several files in one step. Turning this on will turn off http only cookies.',
+'settings_enableMenuTasks' => 'Enable task list in menu',
+'settings_enableMenuTasks_desc' => 'Enable/Disable the menu item which contains all tasks for the user. This contains documents, that need to be reviewed, approved, etc.',
 'settings_enableNotificationAppRev' => 'Enable reviewer/approver notification',
 'settings_enableNotificationAppRev_desc' => 'Check to send a notification to the reviewer/approver when a new document version is added',
 'settings_enableNotificationWorkflow' => 'Send notification to users in next workflow transition',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 88ebdcb9c..0eb461198 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -957,6 +957,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Mostrar selector de lenguaje para usuario despues de identificarse.',
 'settings_enableLargeFileUpload' => 'Habilitar la carga de ficheros grandes',
 'settings_enableLargeFileUpload_desc' => 'Si se habilita, la carga de ficheros también estará disponible a través de un applet java llamado jumploader, sin límite de tamaño de fichero fijado por el navegador. También permite la carga de múltiples ficheros de una sola vez.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Habilitar notificación a revisor/aprobador',
 'settings_enableNotificationAppRev_desc' => 'Habilitar para enviar notificación a revisor/aprobador cuando se añade una nueva versión de documento',
 'settings_enableNotificationWorkflow' => 'Enviar notificación a los usuarios en la siguiente transacción del flujo.',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index e7d2dc1cd..920cd79aa 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -933,6 +933,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur.',
 'settings_enableLargeFileUpload' => 'Activer téléchargement des gros fichiers',
 'settings_enableLargeFileUpload_desc' => 'Si défini, le téléchargement de fichier est également disponible via un applet java appelé jumploader sans limite de taille définie par le navigateur. Il permet également de télécharger plusieurs fichiers en une seule fois.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Notification correcteur/approbateur',
 'settings_enableNotificationAppRev_desc' => 'Cochez pour envoyer une notification au correcteur/approbateur quand une nouvelle version du document est ajoutée',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 9efe59b52..b10a42d91 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -956,6 +956,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Megjelenít egy választást a felhasználói felületen a bejelentkezést követően.',
 'settings_enableLargeFileUpload' => 'Nagy méretű állományok feltöltésének engedélyezése',
 'settings_enableLargeFileUpload_desc' => 'Ha beállítja az állományok feltöltése elérhető lesz egy jumploadernek hívott java appleten keresztül a böngészőprogram állomány méret korlátja nélkül. Ez engedélyezi több állomány feltöltését egy lépésben.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'A felülvizsgáló/jóváhagyó értesítés engedélyezése',
 'settings_enableNotificationAppRev_desc' => 'Ellenőrzi az értesítés küldését a felülvizsgálónak/jóváhagyónak új dokumentum változat hozzáadásakor',
 'settings_enableNotificationWorkflow' => 'A felhasználó értesítése a következő munkafolyamatnál',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index eea33c29a..6c47ed560 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -980,6 +980,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Mostra/nasconde il selettore di lingua successivamente al login.',
 'settings_enableLargeFileUpload' => 'Abilita caricamento grandi files',
 'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Abilita/disabilita notifica a revisore/approvatore',
 'settings_enableNotificationAppRev_desc' => 'Spuntare per inviare una notifica al revisore/approvatore nel momento in cui viene aggiunta una nuova versione del documento.',
 'settings_enableNotificationWorkflow' => 'Invia notifiche ai partecipanti al flusso di lavoro',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index c4ee370cf..0a69196a5 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -948,6 +948,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Laat selector zien voor taalinterface, nadat gebruikers inloggen.',
 'settings_enableLargeFileUpload' => 'Inschakelen groot bestand upload',
 'settings_enableLargeFileUpload_desc' => 'Indien ingeschakeld, is bestandsupload ook beschikbaar via een java applet jumploader genaamd zonder een bestandsgrootte limiet door de browser. Het staat ook toe om meerdere bestanden in een keer te versturen.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Inschakelen controleur/beoordeler notificatie',
 'settings_enableNotificationAppRev_desc' => 'Vink aan om een notificatie te versturen naar de controleur/beoordeler als een nieuw document versie is toegevoegd.',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 7d3e6bf76..9fdb7a508 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -936,6 +936,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Pokaż selektor języka dla interfejsu użytkownika po zalogowaniu To nie ma wpływu na wybór języka na stronie logowania.',
 'settings_enableLargeFileUpload' => 'Zezwól na wczytywanie dużych plików',
 'settings_enableLargeFileUpload_desc' => 'Jeśli zaznaczone, wczytywanie plików będzie możliwe również przez aplet javy nazywany jumploader bez limitu rozmiaru plików. Aplet ten pozwala również na wczytywanie wielu plików jednocześnie.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Włącz/Wyłącz powiadomienia dla zatwierdzających/recenzentów',
 'settings_enableNotificationAppRev_desc' => 'Zaznacz aby wysyłać powiadomienia do zatwierdzających i recenzentów kiedy pojawi się nowa wersja dokumentu',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 16480f0de..0c9e79d29 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -954,6 +954,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Mostrar seletor para idioma de interface de usuário após login.',
 'settings_enableLargeFileUpload' => 'Ativar envio de grandes arquivos',
 'settings_enableLargeFileUpload_desc' => 'Se selecionado, o upload de arquivo também estará disponível através de um applet java chamado jumploader sem limite de tamanho de arquivo definido pelo navegador. Ele também permite fazer o upload de vários arquivos de uma só vez.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Habilitar notificações revisor/aprovador',
 'settings_enableNotificationAppRev_desc' => 'Verificar o envio de uma notificação para o revisor/aprovador quando uma nova versão do documento for adicionada',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 1d800f539..afe4f1e59 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -979,6 +979,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Arată selectorul de limbă pentru interfața cu utilizatorul după ce a fost autentificat.',
 'settings_enableLargeFileUpload' => 'Activare încărcare fișier mare',
 'settings_enableLargeFileUpload_desc' => 'Dacă este setat, incărcarea este de asemenea disponibilă prin intermediul unui applet Java numit jumploader fără limită de dimensiune a fișierului stabilită de browser. De asemenea, permite încărcarea mai multor fișiere într-un singur pas. Activand aceasta optiune va dezactiva optiunea http only cookies.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Activare notificari rezuitor/aprobator',
 'settings_enableNotificationAppRev_desc' => 'Bifati pentru a trimite o notificare către revizuitor/aprobator când se adaugă o nouă versiune la document',
 'settings_enableNotificationWorkflow' => 'Trimite notificare utilizatorilor din urmatorul pas al workflow-ului',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index b535858c0..0ace3367a 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -947,6 +947,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Показывать меню выбора языка пользовательского интерфейса после входа в систему. Это не влияет на выбор языка на странице входа.',
 'settings_enableLargeFileUpload' => 'Включить Java-загрузчик файлов',
 'settings_enableLargeFileUpload_desc' => 'Если включено, загрузка файлов доступна так же через Java-апплет, называемый jumploader, без ограничения размера файла. Это также позволит загружать несколько файлов за раз.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Извещать рецензента или утверждающего',
 'settings_enableNotificationAppRev_desc' => 'Включите для отправки извещения рецензенту или утверждающему при добавлении новой версии документа.',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 54916c86d..8b59bc7ea 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -807,6 +807,8 @@ $text = array(
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index ec0b19894..896412c3b 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -942,6 +942,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Visa språkurval i användargränssnittet efter inloggning.',
 'settings_enableLargeFileUpload' => 'Aktivera uppladdning av stora filer',
 'settings_enableLargeFileUpload_desc' => 'Om aktiverad, kan filer laddas upp via javaapplet med namnet jumploader, utan begränsningar i filstorlek. Flera filer kan även laddas upp samtidigt i ett steg.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Aktivera meddelande till personer som granskar/godkänner',
 'settings_enableNotificationAppRev_desc' => 'Kryssa i, för att skicka ett meddelande till personer som granskar/godkänner när en ny version av dokumentet har lagts till',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 606e61b49..380dfc91e 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -958,6 +958,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Kullanıcının giriş yaparken dil seçimi yapabilmesi için bu seçeneği etkinleştirin.',
 'settings_enableLargeFileUpload' => 'Büyük dosya yüklemeyi etkinleştir',
 'settings_enableLargeFileUpload_desc' => 'Etkinleştirilirse, büyük dosyalar dosya limitine bakılmaksızın jumploader isimli java applet aracılığıyla yüklenebilir. Bu ayrıca bir seferde birden çok dosya yüklemeyi de sağlar. Bu açıldığında sadece http çerezleri kapanmış olur.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Kontrol eden/onaylayan bildirimlerini etkinleştir',
 'settings_enableNotificationAppRev_desc' => 'Dokümanın yeni versiyonu yüklendiğinde kontrol eden/onaylayana bildirim mesajı gitmesi için bunu etkinleştirin.',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index af5928cdf..78a4e8793 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -969,6 +969,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => 'Відображати меню вибору мови інтерфейсу користувача після входу в систему. Це не впливає на вибір мови на сторінці авторизації.',
 'settings_enableLargeFileUpload' => 'Увімкнути Java-завантажувач файлів',
 'settings_enableLargeFileUpload_desc' => 'Якщо увімкнено, завантаження файлів доступне такок через Java-аплет jumploader без обмеження розміру файлів. Це також дозволить завантажувати кілька файлів за раз.',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Сповіщати рецензента і затверджувача',
 'settings_enableNotificationAppRev_desc' => 'Увімкніть для відправки сповіщення рецензенту чи затверджувачеві при додаванні нової версії документа.',
 'settings_enableNotificationWorkflow' => 'Відсилати сповіщення користувачам, задіяним в наступній стадії процесу',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index af18cca6f..a01437916 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -813,6 +813,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index d59aac937..04fdc50e7 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -811,6 +811,8 @@ URL: [url]',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
 'settings_enableLargeFileUpload_desc' => '',
+'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => '',
 'settings_enableNotificationAppRev_desc' => '',
 'settings_enableNotificationWorkflow' => '',

From 5f8cc5f46008bbba10dc1f291fdb2bc409fd9b78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Jul 2015 16:05:47 +0200
Subject: [PATCH 0304/2006] add class variable _doNotCheckDBVersion

---
 inc/inc.ClassSettings.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index d87927021..0234c24df 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -215,6 +215,8 @@ class Settings { /* {{{ */
 	var $_dbUser = null;
 	// password for database-access
 	var $_dbPass = null;
+	// set to 1 if database version shall not be checked
+	var $_doNotCheckDBVersion = 0;
 	// SMTP : server
 	var $_smtpServer = null;
 	// SMTP : port

From 572927668ab666a9da2fc8dda5db9f2d79831ebf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Jul 2015 20:54:21 +0200
Subject: [PATCH 0305/2006] remove space in content type for excel sheet

---
 op/op.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Search.php b/op/op.Search.php
index 99131f3ad..c205482ae 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -435,7 +435,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 			header("Content-Transfer-Encoding: binary");
 			header("Content-Length: " . filesize($filename));
 			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".xls\"");
-			header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml. sheet");
+			header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
 			header("Cache-Control: must-revalidate");
 		}
 

From 9a228017c14e7f71fc9ff0483ea89f4e1073874d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Jul 2015 06:45:43 +0200
Subject: [PATCH 0306/2006] take duplicate declaration of doNotCheckDBVersion

---
 inc/inc.ClassSettings.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 0234c24df..d87927021 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -215,8 +215,6 @@ class Settings { /* {{{ */
 	var $_dbUser = null;
 	// password for database-access
 	var $_dbPass = null;
-	// set to 1 if database version shall not be checked
-	var $_doNotCheckDBVersion = 0;
 	// SMTP : server
 	var $_smtpServer = null;
 	// SMTP : port

From b520bfece090aaa74ffafcd4a225e8812bc4855a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Jul 2015 07:28:34 +0200
Subject: [PATCH 0307/2006] add method addDirSep()

---
 inc/inc.Utils.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index eabfe1787..daf1ea5c5 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -40,7 +40,7 @@ function getLongReadableDate($timestamp) {
  * @param $date string date in form Y-m-d H:i:s
  * @return integer/boolean unix timestamp or false in case of an error
  */
-function makeTsFromLongDate($date) { /* }}} */
+function makeTsFromLongDate($date) { /* {{{ */
 	$tmp = explode(' ', $date);
 	if(count($tmp) != 2)
 		return false;
@@ -544,4 +544,17 @@ function get_extension($mimetype) { /* {{{ */
 		default: return false;
 	}
 } /* }}} */
+
+/**
+ * Adds a missing front slash to a string
+ *
+ * This function is used for making sure a directory name has a
+ * trailing directory separator
+ */
+function addDirSep($str) { /* {{{ */
+	if(substr($str, -1, 1) != DIRECTORY_SEPARATOR)
+		return $str.DIRECTORY_SEPARATOR;
+	else
+		return $str;
+} /* }}} */
 ?>

From ff53a3e3e549d6b1841e741251e26d74cd716b7a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Jul 2015 07:29:08 +0200
Subject: [PATCH 0308/2006] backup dir can be set

---
 inc/inc.ClassSettings.php          |  4 ++++
 op/op.Settings.php                 | 17 +++++++++--------
 views/bootstrap/class.Settings.php |  4 ++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index d87927021..c7a7479ce 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -85,6 +85,8 @@ class Settings { /* {{{ */
 	var $_luceneDir = null;
 	// Where the drop folders are located
 	var $_dropFolderDir = null;
+	// Where the backup directory is located
+	var $_backupDir = null;
 	// Where the library folder is located
 	var $_libraryFolder = 1;
 	// Where the checked out files are located
@@ -390,6 +392,7 @@ class Settings { /* {{{ */
 		$this->_stagingDir = strval($tab["stagingDir"]);
 		$this->_luceneDir = strval($tab["luceneDir"]);
 		$this->_dropFolderDir = strval($tab["dropFolderDir"]);
+		$this->_backupDir = strval($tab["backupDir"]);
 		$this->_checkOutDir = strval($tab["checkOutDir"]);
 		$this->_createCheckOutDir = Settings::boolVal($tab["createCheckOutDir"]);
 		$this->_logFileEnable = Settings::boolVal($tab["logFileEnable"]);
@@ -698,6 +701,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "stagingDir", $this->_stagingDir);
     $this->setXMLAttributValue($node, "luceneDir", $this->_luceneDir);
     $this->setXMLAttributValue($node, "dropFolderDir", $this->_dropFolderDir);
+    $this->setXMLAttributValue($node, "backupDir", $this->_backupDir);
     $this->setXMLAttributValue($node, "checkOutDir", $this->_checkOutDir);
     $this->setXMLAttributValue($node, "createCheckOutDir", $this->_createCheckOutDir);
     $this->setXMLAttributValue($node, "logFileEnable", $this->_logFileEnable);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 14aac36fe..ee45499d0 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -89,15 +89,16 @@ if ($action == "saveSettings")
   $settings->_firstDayOfWeek = intval($_POST["firstDayOfWeek"]);
 
   // SETTINGS - SYSTEM - SERVER
-  $settings->_rootDir = $_POST["rootDir"];
+  $settings->_rootDir = addDirSep($_POST["rootDir"]);
   $settings->_httpRoot = $_POST["httpRoot"];
-  $settings->_contentDir = $_POST["contentDir"];
-  $settings->_cacheDir = $_POST["cacheDir"];
-  $settings->_stagingDir = $_POST["stagingDir"];
-  $settings->_luceneDir = $_POST["luceneDir"];
-  $settings->_extraPath = $_POST["extraPath"];
-  $settings->_dropFolderDir = $_POST["dropFolderDir"];
-  $settings->_checkOutDir = $_POST["checkOutDir"];
+  $settings->_contentDir = addDirSep($_POST["contentDir"]);
+  $settings->_cacheDir = addDirSep($_POST["cacheDir"]);
+  $settings->_stagingDir = addDirSep($_POST["stagingDir"]);
+  $settings->_luceneDir = addDirSep($_POST["luceneDir"]);
+  $settings->_extraPath = addDirSep($_POST["extraPath"]);
+  $settings->_dropFolderDir = addDirSep($_POST["dropFolderDir"]);
+  $settings->_backupDir = addDirSep($_POST["backupDir"]);
+  $settings->_checkOutDir = addDirSep($_POST["checkOutDir"]);
   $settings->_createCheckOutDir = getBoolValue("createCheckOutDir");
   $settings->_logFileEnable = getBoolValue("logFileEnable");
   $settings->_logFileRotation = $_POST["logFileRotation"];
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index c9409c688..2495ae059 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -282,6 +282,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_contentDir");?>:</td>
         <td><input type="text" name="contentDir" value="<?php echo $settings->_contentDir ?>" size="100" /></td>
       </tr>
+      <tr title="<?php printMLText("settings_backupDir_desc");?>">
+        <td><?php printMLText("settings_backupDir");?>:</td>
+        <td><input type="text" name="backupDir" value="<?php echo $settings->_backupDir ?>" size="100" /></td>
+      </tr>
       <tr title="<?php printMLText("settings_cacheDir_desc");?>">
         <td><?php printMLText("settings_cacheDir");?>:</td>
         <td><input type="text" name="cacheDir" value="<?php echo $settings->_cacheDir ?>" size="100" /></td>

From 2bf7bd0a4e795460d3c44aebc5c3662c70c9cfcb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Jul 2015 07:30:24 +0200
Subject: [PATCH 0309/2006] use backup dir if set

---
 op/op.CreateFolderArchive.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/op/op.CreateFolderArchive.php b/op/op.CreateFolderArchive.php
index e396d9471..4ed3b28dc 100644
--- a/op/op.CreateFolderArchive.php
+++ b/op/op.CreateFolderArchive.php
@@ -169,8 +169,12 @@ if (!is_object($folder)) {
 
 $human_readable = (isset($_GET["human_readable"]) && $_GET["human_readable"]==1 ? true : false);
 
-if ($human_readable)$ark_name = $settings->_contentDir.time()."_".$folderid."_HR.tar";
-else $ark_name = $settings->_contentDir.time()."_".$folderid.".tar";
+if($settings->_backupDir && file_exists($settings->_backupDir))
+	$basedir = $settings->_backupDir;
+else
+	$basedir = $setting->_contentDir;
+if ($human_readable)$ark_name = $basedir.time()."_".$folderid."_HR.tar";
+else $ark_name = $basedir.time()."_".$folderid.".tar";
 
 $ark = fopen($ark_name,"w");
 

From c1b28071dff8aa7a4cb07d046e12c443d1a4af1a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Jul 2015 07:32:29 +0200
Subject: [PATCH 0310/2006] addSepDir() doesn't add dir separator to empty
 string

also remove space from string
---
 inc/inc.Utils.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index daf1ea5c5..74ed5e79a 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -552,9 +552,11 @@ function get_extension($mimetype) { /* {{{ */
  * trailing directory separator
  */
 function addDirSep($str) { /* {{{ */
-	if(substr($str, -1, 1) != DIRECTORY_SEPARATOR)
-		return $str.DIRECTORY_SEPARATOR;
+	if(trim($str) == '')
+		return '';
+	if(substr(trim($str), -1, 1) != DIRECTORY_SEPARATOR)
+		return trim($str).DIRECTORY_SEPARATOR;
 	else
-		return $str;
+		return trim($str);
 } /* }}} */
 ?>

From 30ccf4f8f635f5ea3293278f9b0d06dbd4e56cc0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Jul 2015 07:49:35 +0200
Subject: [PATCH 0311/2006] use backup dir if set

---
 op/op.CreateDump.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php
index 5e3a1c09d..a04712386 100644
--- a/op/op.CreateDump.php
+++ b/op/op.CreateDump.php
@@ -30,7 +30,11 @@ if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-$dump_name = $settings->_contentDir.time().".sql";
+if($settings->_backupDir && file_exists($settings->_backupDir))
+	$basedir = $settings->_backupDir;
+else
+	$basedir = $setting->_contentDir;
+$dump_name = $basedir.time().".sql";
 
 $h=fopen($dump_name,"w");
 

From d653c516ea977e1bff667997660cc8515c783c73 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Jul 2015 07:50:02 +0200
Subject: [PATCH 0312/2006] pass backup dir to view

---
 out/out.BackupTools.php               |  6 +++++-
 views/bootstrap/class.BackupTools.php | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/out/out.BackupTools.php b/out/out.BackupTools.php
index 7d2138391..7437d38e3 100644
--- a/out/out.BackupTools.php
+++ b/out/out.BackupTools.php
@@ -30,8 +30,12 @@ if (!$user->isAdmin()) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'contentdir'=>$settings->_contentDir));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
+	if($settings->_backupDir && file_exists($settings->_backupDir))
+		$view->setParam('backupdir', $settings->_backupDir);
+	else
+		$view->setParam('backupdir', $settings->_contentDir);
 	$view->show();
 	exit;
 }
diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php
index d1cd6444a..bc4408a0f 100644
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@@ -34,7 +34,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$contentdir = $this->params['contentdir'];
+		$backupdir = $this->params['backupdir'];
 
 		$this->htmlStartPage(getMLText("backup_tools"));
 		$this->globalNavigation();
@@ -43,7 +43,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 
 		$this->contentHeading(getMLText("backup_tools"));
 		$this->contentContainerStart();
-		print getMLText("space_used_on_data_folder")." : ".SeedDMS_Core_File::format_filesize(dskspace($contentdir));
+		print getMLText("space_used_on_data_folder")." : ".SeedDMS_Core_File::format_filesize(dskspace($backupdir));
 		$this->contentContainerEnd();
 
 		// versioning file creation ////////////////////////////////////////////////////
@@ -76,10 +76,10 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 
 		$print_header=true;
 
-		$handle = opendir($contentdir);
+		$handle = opendir($backupdir);
 		$entries = array();
 		while ($e = readdir($handle)){
-			if (is_dir($contentdir.$e)) continue;
+			if (is_dir($backupdir.$e)) continue;
 			if (strpos($e,".tar.gz")==FALSE) continue;
 			$entries[] = $e;
 		}
@@ -109,8 +109,8 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 			print "<td><a href=\"../op/op.Download.php?arkname=".$entry."\">".$entry."</a></td>\n";
 			if (is_object($folder)) print "<td>".htmlspecialchars($folder->getName())."</td>\n";
 			else print "<td>".getMLText("unknown_id")."</td>\n";
-			print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-			print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
+			print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
+			print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 			print "<td>";
 			print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
 			print "</td>\n";	
@@ -137,10 +137,10 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 
 		$print_header=true;
 
-		$handle = opendir($contentdir);
+		$handle = opendir($backupdir);
 		$entries = array();
 		while ($e = readdir($handle)){
-			if (is_dir($contentdir.$e)) continue;
+			if (is_dir($backupdir.$e)) continue;
 			if (strpos($e,".sql.gz")==FALSE) continue;
 			$entries[] = $e;
 		}
@@ -164,8 +164,8 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 
 			print "<tr>\n";
 			print "<td><a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a></td>\n";
-			print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-			print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
+			print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
+			print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 			print "<td>";
 			print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
 			print "</td>\n";	

From 0c48b342a5ba01f26c3d9fbd74ee3f0a2ae06e7a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Jul 2015 07:50:37 +0200
Subject: [PATCH 0313/2006] dskspace() checks if directory could be opened

---
 inc/inc.Utils.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 74ed5e79a..371b29770 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -329,11 +329,12 @@ function dskspace($dir) { /* {{{ */
 	if(is_file($dir)) {
 		$space = filesize($dir);
 	} elseif (is_dir($dir)) {
-		$dh = opendir($dir);
-		while (($file = readdir($dh)) !== false)
-			if ($file != "." and $file != "..")
-				$space += dskspace($dir."/".$file);
-		closedir($dh);
+		if($dh = opendir($dir)) {
+			while (($file = readdir($dh)) !== false)
+				if ($file != "." and $file != "..")
+					$space += dskspace($dir."/".$file);
+			closedir($dh);
+		}
 	}
 	return $space;
 } /* }}} */

From 3d4f64a4e6d4102f73aabb7551504067fc1aa623 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Jul 2015 15:20:35 +0200
Subject: [PATCH 0314/2006] dangling links not needed anymore

---
 views/clean | 1 -
 views/hc    | 1 -
 2 files changed, 2 deletions(-)
 delete mode 120000 views/clean
 delete mode 120000 views/hc

diff --git a/views/clean b/views/clean
deleted file mode 120000
index f5ac3db8c..000000000
--- a/views/clean
+++ /dev/null
@@ -1 +0,0 @@
-blue
\ No newline at end of file
diff --git a/views/hc b/views/hc
deleted file mode 120000
index f5ac3db8c..000000000
--- a/views/hc
+++ /dev/null
@@ -1 +0,0 @@
-blue
\ No newline at end of file

From c7f5f7792567dc444546734f9fec74f33927e22d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Aug 2015 17:30:41 +0200
Subject: [PATCH 0315/2006] sync with mysql statements, fix errors

---
 install/create_tables-sqlite3.sql | 82 ++++++++++---------------------
 1 file changed, 25 insertions(+), 57 deletions(-)

diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index bca377b64..8ba222f8e 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -63,7 +63,6 @@ CREATE TABLE `tblUsers` (
   `disabled` INTEGER NOT NULL default '0',
   `quota` INTEGER,
   `homefolder` INTEGER default '0',
-  `homefolder` INTEGER default '0',
   UNIQUE (`login`)
 );
 
@@ -307,8 +306,8 @@ CREATE TABLE `tblDocumentLocks` (
 
 CREATE TABLE `tblDocumentCheckOuts` (
   `document` INTEGER REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`)
   `version` INTEGER unsigned NOT NULL default '0',
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`),
   `date` TEXT NOT NULL default '0000-00-00 00:00:00',
   `filename` varchar(255) NOT NULL default '',
   UNIQUE (`document`)
@@ -316,6 +315,21 @@ CREATE TABLE `tblDocumentCheckOuts` (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblDocumentReviewers`
+-- 
+
+CREATE TABLE `tblDocumentReviewers` (
+  `reviewID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `type` INTEGER NOT NULL default '0',
+  `required` INTEGER NOT NULL default '0',
+  UNIQUE (`documentID`,`version`,`type`,`required`)
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table `tblDocumentReviewLog`
 -- 
@@ -332,11 +346,11 @@ CREATE TABLE `tblDocumentReviewLog` (
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `tblDocumentReviewers`
+-- Table structure for table `tblDocumentRecipients`
 -- 
 
-CREATE TABLE `tblDocumentReviewers` (
-  `reviewID` INTEGER PRIMARY KEY AUTOINCREMENT,
+CREATE TABLE `tblDocumentRecipients` (
+  `receiptID` INTEGER PRIMARY KEY AUTOINCREMENT,
   `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
   `type` INTEGER NOT NULL default '0',
@@ -361,36 +375,6 @@ CREATE TABLE `tblDocumentReceiptLog` (
 
 -- --------------------------------------------------------
 
--- 
--- Table structure for table `tblDocumentRecipients`
--- 
-
-CREATE TABLE `tblDocumentRecipients` (
-  `receiptID` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  `version` INTEGER unsigned NOT NULL default '0',
-  `type` INTEGER NOT NULL default '0',
-  `required` INTEGER NOT NULL default '0',
-  UNIQUE (`documentID`,`version`,`type`,`required`)
-) ;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table `tblDocumentRevisionLog`
--- 
-
-CREATE TABLE `tblDocumentRevisionLog` (
-  `revisionLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `revisionID` INTEGER NOT NULL default '0',
-  `status` INTEGER NOT NULL default '0',
-  `comment` TEXT NOT NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
-  `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
-) ;
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table `tblDocumentRevisors`
 -- 
@@ -402,9 +386,8 @@ CREATE TABLE `tblDocumentRevisors` (
   `type` INTEGER NOT NULL default '0',
   `required` INTEGER NOT NULL default '0',
   `startdate` TEXT default NULL,
-  UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
-  CONSTRAINT `tblDocumentRevisors_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
-);
+  UNIQUE (`documentID`,`version`,`type`,`required`)
+) ;
 
 -- --------------------------------------------------------
 
@@ -423,22 +406,6 @@ CREATE TABLE `tblDocumentRevisionLog` (
 
 -- --------------------------------------------------------
 
--- 
--- Table structure for table `tblDocumentRevisors`
--- 
-
-CREATE TABLE `tblDocumentRevisors` (
-  `revisionID` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  `version` INTEGER unsigned NOT NULL default '0',
-  `type` INTEGER NOT NULL default '0',
-  `required` INTEGER NOT NULL default '0',
-  `startdate` TEXT default NULL,
-  UNIQUE (`documentID`,`version`,`type`,`required`)
-) ;
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table `tblDocumentStatus`
 -- 
@@ -759,11 +726,12 @@ CREATE TABLE `tblTransmittalItems` (
 CREATE TABLE `tblAros` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `model` TEXT NOT NULL,
-	`foreignid` INTEGER NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
+	`foreignid` INTEGER NOT NULL DEFAULT '0'
 ) ;
 
 
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for access control objects
 -- 
@@ -784,7 +752,7 @@ CREATE TABLE `tblArosAcos` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
 	`aro` int(11) NOT NULL DEFAULT '0' REFERENCES `tblAros` (`id`) ON DELETE CASCADE,
 	`aco` int(11) NOT NULL DEFAULT '0' REFERENCES `tblAcos` (`id`) ON DELETE CASCADE,
-  UNIQUE (aco, aro),
+  UNIQUE (aco, aro)
 ) ;
 
 -- --------------------------------------------------------

From 3478d4e86ce02f30bd48d63445ee98e78160c398 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Aug 2015 17:53:57 +0200
Subject: [PATCH 0316/2006] fix field name revisiondate in tblDocumentContent

---
 install/create_tables-innodb.sql  | 2 +-
 install/create_tables-sqlite3.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 4f5ac4cb2..104dded42 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -266,7 +266,7 @@ CREATE TABLE `tblDocumentContent` (
   `mimeType` varchar(100) NOT NULL default '',
   `fileSize` BIGINT,
   `checksum` char(32),
-  `revsiondate` datetime default NULL,
+  `revisiondate` datetime default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE (`document`, `version`),
   CONSTRAINT `tblDocumentContent_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`)
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 8ba222f8e..ba7b78c34 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -236,7 +236,7 @@ CREATE TABLE `tblDocumentContent` (
   `mimeType` varchar(70) NOT NULL default '',
   `fileSize` INTEGER,
   `checksum` char(32),
-  `revsiondate` INTEGER default NULL,
+  `revisiondate` TEXT NOT NULL default '0000-00-00 00:00:00',
   UNIQUE (`document`,`version`)
 ) ;
 

From 46bbf2234a8c75dcdb79609288fe8d823bf5fbb0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Aug 2015 18:00:17 +0200
Subject: [PATCH 0317/2006] tblDocumentCheckOuts is not created in version
 5.0.x

---
 install/update-5.0.0/update-sqlite3.sql |  9 ---------
 install/update-5.0.0/update.sql         | 11 -----------
 2 files changed, 20 deletions(-)

diff --git a/install/update-5.0.0/update-sqlite3.sql b/install/update-5.0.0/update-sqlite3.sql
index 30b913496..ffa9e0d4a 100644
--- a/install/update-5.0.0/update-sqlite3.sql
+++ b/install/update-5.0.0/update-sqlite3.sql
@@ -2,15 +2,6 @@ BEGIN;
 
 ALTER TABLE tblUsers ADD COLUMN `homefolder` INTEGER DEFAULT 0;
 
-CREATE TABLE `tblDocumentCheckOuts` (
-  `document` INTEGER REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`)
-  `version` INTEGER unsigned NOT NULL default '0',
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
-  `filename` varchar(255) NOT NULL default '',
-  UNIQUE (`document`)
-) ;
-
 UPDATE tblVersion set major=5, minor=0, subminor=0;
 
 COMMIT;
diff --git a/install/update-5.0.0/update.sql b/install/update-5.0.0/update.sql
index b6fd612c6..a9347320e 100644
--- a/install/update-5.0.0/update.sql
+++ b/install/update-5.0.0/update.sql
@@ -2,17 +2,6 @@ START TRANSACTION;
 
 ALTER TABLE tblUsers ADD COLUMN `homefolder` INTEGER DEFAULT 0;
 
-CREATE TABLE `tblDocumentCheckOuts` (
-  `document` int(11) NOT NULL default '0',
-  `version` smallint(5) unsigned NOT NULL default '0',
-  `userID` int(11) NOT NULL default '0',
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
-  `filename` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`document`),
-  CONSTRAINT `tblDocumentCheckOuts_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `tblDocumentCheckOuts_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 UPDATE tblVersion set major=5, minor=0, subminor=0;
 
 COMMIT;

From 215380b806e33f8954cb6d432aa80ee7f32e3385 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Aug 2015 22:45:57 +0200
Subject: [PATCH 0318/2006] remove echo statement

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 79fc11ea1..301e75aeb 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1671,7 +1671,6 @@ class SeedDMS_Core_DMS {
 		}
 
 		$queryStr = "INSERT INTO tblTransmittals (name, comment, userID) VALUES (".$this->db->qstr($name).", ".$this->db->qstr($comment).", ".$user->getID().")";
-		echo $queryStr;
 		if (!$this->db->getResult($queryStr))
 			return false;
 

From 91086c594e478600b499d462d11e1bfe3e81324e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Aug 2015 22:46:15 +0200
Subject: [PATCH 0319/2006] export transmittals

---
 utils/xmldump.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index 67386ea32..34bb2ab72 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -530,5 +530,30 @@ if($folder) {
 	tree($folder, null, '', $skiproot);
 }
 
+$transmittals = $dms->getAllTransmittals();
+if($transmittals) {
+	echo "<transmittals>\n";
+	foreach($transmittals as $transmittal) {
+		echo " <transmittal id=\"".$transmittal->getID()."\">\n";
+		echo "  <attr name=\"name\">".$transmittal->getName()."</attr>\n";
+		echo "  <attr name=\"owner\">".$transmittal->getUser()->getID()."</attr>\n";
+		echo "  <attr name=\"comment\">".$transmittal->getComment()."</attr>\n";
+		if($items = $transmittal->getItems()) {
+			echo "  <items>\n";
+			foreach($items as $item) {
+				echo "   <item id=\"".$item->getID()."\">\n";
+				$content = $item->getContent();
+				echo "    <attr name=\"document\">".$content->getDocument()->getID()."</attr>\n";
+				echo "    <attr name=\"version\">".$content->getVersion()."</attr>\n";
+				echo "    <attr name=\"date\" format=\"Y-m-d H:i:s\">".$item->getDate()."</attr>\n";
+				echo "   </item>\n";
+			}
+			echo "  </items>\n";
+		}
+		echo " </transmittal>\n";
+	}
+	echo "</transmittals>\n";
+}
+
 echo "</dms>\n";
 ?>

From ed32bcfb703d9ace8663d92cca386d790887e56c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Aug 2015 22:46:30 +0200
Subject: [PATCH 0320/2006] import transmittals

---
 utils/xmlimport.php | 81 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 4 deletions(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 5c997e8d1..9aec9b5c2 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -644,6 +644,46 @@ function insert_folder($folder) { /* {{{ */
 	return $newFolder;
 } /* }}} */
 
+function insert_transmittal($transmittal) { /* {{{ */
+	global $dms, $debug, $objmap, $sections;
+
+	if(1||$debug) print_r($transmittal);
+
+	if(!array_key_exists((int) $transmittal['attributes']['owner'], $objmap['users'])) {
+		echo "Error: owner of transmittal cannot be found\n";
+		return false;
+	}
+	$owner = $dms->getUser($objmap['users'][(int) $transmittal['attributes']['owner']]);
+
+	if(in_array('transmittals', $sections)) {
+		if(!$newTransmittal = $dms->addTransmittal($transmittal['attributes']['name'], $transmittal['attributes']['comment'], $owner)) {
+			echo "Error: could not add transmittal\n";
+			return false;
+		}
+		foreach($transmittal['items'] as $item) {
+			if(!array_key_exists((int) $item['attributes']['document'], $objmap['documents'])) {
+				echo "Warning: document mapping of transmittal item cannot be found\n";
+			} else {
+				if($document = $dms->getDocument($objmap['documents'][(int) $item['attributes']['document']])) {
+					if($content = $document->getContentByVersion((int) $item['attributes']['version'])) {
+						$newTransmittal->addContent($content);
+					} else {
+						echo "Warning: document version of transmittal item cannot be found\n";
+					}
+				} else {
+					echo "Warning: document of transmittal item cannot be found\n";
+				}
+			}
+		}
+	} else {
+		$newTransmittal = null;
+	}
+
+	if($newTransmittal)
+		$objmap['transmittals'][$documentcat['id']] = $newTransmittal->getID();
+	return $newCategory;
+} /* }}} */
+
 function resolve_links() { /* {{{ */
 	global $dms, $debug, $defaultUser, $links, $objmap;
 
@@ -681,7 +721,7 @@ function resolve_links() { /* {{{ */
 } /* }}} */
 
 function startElement($parser, $name, $attrs) { /* {{{ */
-	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link;
+	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_transmittal, $cur_transmittalitem;
 
 	$parent = end($elementstack);
 	array_push($elementstack, array('name'=>$name, 'attributes'=>$attrs));
@@ -734,6 +774,17 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				}
 			}
 			break;
+		case "TRANSMITTAL":
+			$cur_transmittal = array();
+			$cur_transmittal['id'] = (int) $attrs['ID'];
+			$cur_transmittal['attributes'] = array();
+			$cur_transmittal['items'] = array();
+			break;
+		case "TRANSMITTALITEM":
+			$cur_transmittalitem = array();
+			$cur_transmittalitem['id'] = (int) $attrs['ID'];
+			$cur_transmittalitem['attributes'] = array();
+			break;
 		case "DOCUMENT":
 			$cur_document = array();
 			$cur_document['id'] = (int) $attrs['ID'];
@@ -824,6 +875,10 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_file['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'LINK') {
 				$cur_link['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'TRANSMITTAL') {
+				$cur_transmittal['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'TRANSMITTALITEM') {
+				$cur_transmittalitem['attributes'][$attrs['NAME']] = '';
 			}
 			break;
 		case "CATEGORIES":
@@ -936,7 +991,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 } /* }}} */
 
 function endElement($parser, $name) { /* {{{ */
-	global $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link;
+	global $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_transmittal, $cur_transmittalitem;
 
 	array_pop($elementstack);
 	$parent = end($elementstack);
@@ -1006,11 +1061,17 @@ function endElement($parser, $name) { /* {{{ */
 				$cur_document['links'][] = $cur_link;
 			}
 			break;
+		case "TRANSMITTALITEM":
+			$cur_transmittal['items'][] = $cur_transmittalitem;
+			break;
+		case 'TRANSMITTAL':
+			insert_transmittal($cur_transmittal);
+			break;
 	}
 } /* }}} */
 
 function characterData($parser, $data) { /* {{{ */
-	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link;
+	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_transmittal, $cur_transmittalitem;
 
 	$current = end($elementstack);
 	$parent = prev($elementstack);
@@ -1098,6 +1159,18 @@ function characterData($parser, $data) { /* {{{ */
 				case 'LINK':
 					$cur_link['attributes'][$current['attributes']['NAME']] = $data;
 					break;
+				case 'TRANSMITTAL':
+					if(isset($cur_transmittal['attributes'][$current['attributes']['NAME']]))
+						$cur_transmittal['attributes'][$current['attributes']['NAME']] .= $data;
+					else
+						$cur_transmittal['attributes'][$current['attributes']['NAME']] = $data;
+					break;
+				case 'TRANSMITTALITEM':
+					if(isset($cur_transmittalitem['attributes'][$current['attributes']['NAME']]))
+						$cur_transmittalitem['attributes'][$current['attributes']['NAME']] .= $data;
+					else
+						$cur_transmittalitem['attributes'][$current['attributes']['NAME']] = $data;
+					break;
 			}
 			break;
 		case 'DATA':
@@ -1194,7 +1267,7 @@ if(isset($options['export-mapping'])) {
 	$exportmapping = $options['export-mapping'];
 }
 
-$sections = array('documents', 'folders', 'groups', 'users', 'keywordcategories', 'documentcategories', 'attributedefinitions');
+$sections = array('documents', 'folders', 'groups', 'users', 'keywordcategories', 'documentcategories', 'attributedefinitions', 'transmittals');
 if(isset($options['sections'])) {
 	$sections = explode(',', $options['sections']);
 }

From 68a695d58c97b5c1bce9ef711609af9366dfd0cc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Aug 2015 06:24:37 +0200
Subject: [PATCH 0321/2006] dump revision and receiption log

---
 utils/xmldump.php | 56 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index 34bb2ab72..1ad732e9a 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -208,8 +208,10 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 			if($versions) {
 				echo $indent." <versions>\n";
 				foreach($versions as $version) {
-					$approvalStatus = $version->getApprovalStatus(30);
-					$reviewStatus = $version->getReviewStatus();
+					$approvalStatus = $version->getApprovalStatus(300);
+					$reviewStatus = $version->getReviewStatus(300);
+					$receiptStatus = $version->getReceiptStatus(300);
+					$revisionStatus = $version->getRevisionStatus(300);
 					$owner = $version->getUser();
 					echo $indent."  <version version=\"".$version->getVersion()."\">\n";
 					echo $indent."   <attr name=\"mimetype\">".$version->getMimeType()."</attr>\n";
@@ -286,6 +288,56 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 							echo $indent."    </review>\n";
 						echo $indent."   </reviews>\n";
 					}
+					if($receiptStatus) {
+						echo $indent."   <receipts>\n";
+						$curreceiptid = 0;
+						foreach($receiptStatus as $a) {
+							if($a['receiptID'] != $curreceiptid) {
+								if($curreceiptid != 0) {
+									echo $indent."    </receipt>\n";
+								}
+								echo $indent."    <receipt id=\"".$a['receiptID']."\">\n";
+								echo $indent."     <attr name=\"type\">".$a['type']."</attr>\n";
+								echo $indent."     <attr name=\"required\">".$a['required']."</attr>\n";
+							}
+							echo $indent."     <receiptlog id=\"".$a['receiptLogID']."\">\n";
+							echo $indent."      <attr name=\"user\">".$a['userID']."</attr>\n";
+							echo $indent."      <attr name=\"status\">".$a['status']."</attr>\n";
+							echo $indent."      <attr name=\"comment\">".wrapWithCData($a['comment'])."</attr>\n";
+							echo $indent."      <attr name=\"date\" format=\"Y-m-d H:i:s\">".$a['date']."</attr>\n";
+							echo $indent."     </receiptlog>\n";
+//							echo $indent."    </receipt>\n";
+							$curreceiptid = $a['receiptID'];
+						}
+						if($curreceiptid != 0)
+							echo $indent."    </receipt>\n";
+						echo $indent."   </receipts>\n";
+					}
+					if($revisionStatus) {
+						echo $indent."   <revisions>\n";
+						$currevisionid = 0;
+						foreach($revisionStatus as $a) {
+							if($a['revisionID'] != $currevisionid) {
+								if($currevisionid != 0) {
+									echo $indent."    </revision>\n";
+								}
+								echo $indent."    <revision id=\"".$a['revisionID']."\">\n";
+								echo $indent."     <attr name=\"type\">".$a['type']."</attr>\n";
+								echo $indent."     <attr name=\"required\">".$a['required']."</attr>\n";
+							}
+							echo $indent."     <revisionlog id=\"".$a['revisionLogID']."\">\n";
+							echo $indent."      <attr name=\"user\">".$a['userID']."</attr>\n";
+							echo $indent."      <attr name=\"status\">".$a['status']."</attr>\n";
+							echo $indent."      <attr name=\"comment\">".wrapWithCData($a['comment'])."</attr>\n";
+							echo $indent."      <attr name=\"date\" format=\"Y-m-d H:i:s\">".$a['date']."</attr>\n";
+							echo $indent."     </revisionlog>\n";
+//							echo $indent."    </revision>\n";
+							$currevisionid = $a['revisionID'];
+						}
+						if($currevisionid != 0)
+							echo $indent."    </revision>\n";
+						echo $indent."   </revisions>\n";
+					}
 					if(file_exists($dms->contentDir . $version->getPath())) {
 						echo $indent."   <data length=\"".filesize($dms->contentDir . $version->getPath())."\"";
 						if(filesize($dms->contentDir . $version->getPath()) < $maxsize) {

From 6c7420654442332eb5f194566dbe18f7d30e03a2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Aug 2015 06:25:06 +0200
Subject: [PATCH 0322/2006] add transmittals to $objmap

---
 utils/xmlimport.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index c7c079e0b..83815839f 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -16,7 +16,7 @@ function usage() { /* {{{ */
 	echo "  --file <file>: file containing the dump.\n";
 	echo "  --sections <sections>: comma seperated list of sections to read from dump.\n";
 	echo "     can be: users, groups, documents, folders, keywordcategories, or\n";
-	echo "     documentcategories\n";
+	echo "     documentcategories, transmittals\n";
 	echo "  --contentdir <dir>: directory where all document versions are stored\n";
 	echo "    which are not included in the xml file.\n";
 	echo "  --default-user <user id>: use this user if user could not be found.\n";
@@ -680,7 +680,7 @@ function insert_transmittal($transmittal) { /* {{{ */
 	}
 
 	if($newTransmittal)
-		$objmap['transmittals'][$documentcat['id']] = $newTransmittal->getID();
+		$objmap['transmittals'][$transmittal['id']] = $newTransmittal->getID();
 	return $newCategory;
 } /* }}} */
 
@@ -1310,6 +1310,7 @@ $objmap = array(
 	'groups' => array(),
 	'folders' => array(),
 	'documents' => array(),
+	'transmittals' => array(),
 );
 
 $xml_parser = xml_parser_create("UTF-8");

From e1f8a1abbb4d2be8af63de12923217c8b8265adc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Aug 2015 17:55:42 +0200
Subject: [PATCH 0323/2006] export user substitutes

---
 utils/xmldump.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index 1ad732e9a..71302ddeb 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -487,6 +487,13 @@ if($users) {
 			}
 			echo "  </mandatory_approvers>\n";
 		}
+		if($substitutes = $user->getSubstitutes()) {
+			echo "  <substitutes>\n";
+			foreach($substitutes as $substitute) {
+				echo "   <substitute user=\"".$substitute['substitute']."\" />\n";
+			}
+			echo "  </substitutes>\n";
+		}
 		echo " </user>\n";
 	}
 	echo "</users>\n";

From cca8221f2881ee29eeeb2e2b3124aa40c8127466 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Aug 2015 18:26:47 +0200
Subject: [PATCH 0324/2006] fix export of substitutes

---
 utils/xmldump.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index e9475abcd..f4298e10f 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -502,7 +502,7 @@ if($users) {
 		if($substitutes = $user->getSubstitutes()) {
 			echo "  <substitutes>\n";
 			foreach($substitutes as $substitute) {
-				echo "   <substitute user=\"".$substitute['substitute']."\" />\n";
+				echo "   <substitute user=\"".$substitute->getID()."\" />\n";
 			}
 			echo "  </substitutes>\n";
 		}

From 06c89b0cc5ebc027af800f133c7920b409cf805d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Aug 2015 22:21:28 +0200
Subject: [PATCH 0325/2006] add statistic for transmittals

---
 utils/xmldump.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index f4298e10f..4c5eb4b40 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -99,6 +99,7 @@ $statistic = array(
 	'attributedefinitions'=>0,
 	'keywordcategories'=>0,
 	'documentcategories'=>0,
+	'transmittals'=>0,
 );
 
 function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
@@ -627,6 +628,7 @@ if($transmittals) {
 			echo "  </items>\n";
 		}
 		echo " </transmittal>\n";
+		$statistic['transmittals']++;
 	}
 	echo "</transmittals>\n";
 }

From eeff55eb7daac462609ad4a0c32727f61fbfd1e9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 7 Aug 2015 13:15:13 +0200
Subject: [PATCH 0326/2006] pass $dms to constructor of SeedDMS_AccessOperation

---
 op/op.ReceiptDocument.php    | 2 +-
 op/op.ReviseDocument.php     | 2 +-
 out/out.AddToTransmittal.php | 2 +-
 out/out.CheckInDocument.php  | 2 +-
 out/out.ReceiptDocument.php  | 2 +-
 out/out.ReviseDocument.php   | 2 +-
 out/out.SetRecipients.php    | 2 +-
 out/out.SetRevisors.php      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index 2b365bce9..2c9eaa970 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -74,7 +74,7 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 // verify if document may be receіpted
 if (!$accessop->mayReceipt()){
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index d302a6195..d1a3f5520 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -74,7 +74,7 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 $olddocstatus = $content->getStatus();
 // verify if document maybe revised
diff --git a/out/out.AddToTransmittal.php b/out/out.AddToTransmittal.php
index b909f9461..77e5e929e 100644
--- a/out/out.AddToTransmittal.php
+++ b/out/out.AddToTransmittal.php
@@ -55,7 +55,7 @@ $folder = $document->getFolder();
 $transmittals = $dms->getAllTransmittals($user);
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index 418d7a1d7..baaf100e6 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -60,7 +60,7 @@ if($settings->_quota > 0) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate));
diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php
index ca3498ae9..bd4ea84f6 100644
--- a/out/out.ReceiptDocument.php
+++ b/out/out.ReceiptDocument.php
@@ -59,7 +59,7 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 // verify if document may be receipted
 if (!$accessop->mayReceipt()){
diff --git a/out/out.ReviseDocument.php b/out/out.ReviseDocument.php
index d0fd6d197..abee2132a 100644
--- a/out/out.ReviseDocument.php
+++ b/out/out.ReviseDocument.php
@@ -60,7 +60,7 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 // verify if document maybe revised
 if (!$document->mayRevise()){
diff --git a/out/out.SetRecipients.php b/out/out.SetRecipients.php
index 92610de23..a19f9d48e 100644
--- a/out/out.SetRecipients.php
+++ b/out/out.SetRecipients.php
@@ -58,7 +58,7 @@ if(!$settings->_enableVersionModification) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp));
diff --git a/out/out.SetRevisors.php b/out/out.SetRevisors.php
index 977f10998..6e45232ae 100644
--- a/out/out.SetRevisors.php
+++ b/out/out.SetRevisors.php
@@ -58,7 +58,7 @@ if(!$settings->_enableVersionModification) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));

From 1bc65c0eef029e0bfa7ee5e62e0243c329e9e12b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 7 Aug 2015 20:09:45 +0200
Subject: [PATCH 0327/2006] add update script for 6.0.0

---
 install/update-6.0.0/update-sqlite3.sql |  78 ++++++++++++++++++
 install/update-6.0.0/update.sql         | 101 ++++++++++++++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 install/update-6.0.0/update-sqlite3.sql
 create mode 100644 install/update-6.0.0/update.sql

diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql
new file mode 100644
index 000000000..10ba0ce4a
--- /dev/null
+++ b/install/update-6.0.0/update-sqlite3.sql
@@ -0,0 +1,78 @@
+BEGIN;
+
+ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` TEXT NOT NULL default '0000-00-00 00:00:00';
+
+CREATE TABLE `tblUserSubstitutes` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `user` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `substitute` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  UNIQUE (`user`, `substitute`)
+);
+
+CREATE TABLE `tblDocumentCheckOuts` (
+  `document` INTEGER REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`),
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `filename` varchar(255) NOT NULL default '',
+  UNIQUE (`document`)
+) ;
+
+CREATE TABLE `tblDocumentRecipients` (
+  `receiptID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `type` INTEGER NOT NULL default '0',
+  `required` INTEGER NOT NULL default '0',
+  UNIQUE (`documentID`,`version`,`type`,`required`)
+) ;
+
+CREATE TABLE `tblDocumentReceiptLog` (
+  `receiptLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `receiptID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
+  `status` INTEGER NOT NULL default 0,
+  `comment` TEXT NOT NULL,
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ;
+
+CREATE TABLE `tblDocumentRevisors` (
+  `revisionID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `type` INTEGER NOT NULL default '0',
+  `required` INTEGER NOT NULL default '0',
+  `startdate` TEXT default NULL,
+  UNIQUE (`documentID`,`version`,`type`,`required`)
+) ;
+
+CREATE TABLE `tblDocumentRevisionLog` (
+  `revisionLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `revisionID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
+  `status` INTEGER NOT NULL default 0,
+  `comment` TEXT NOT NULL,
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ;
+
+CREATE TABLE tblTransmittals (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` text NOT NULL,
+  `comment` text NOT NULL,
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `public` INTEGER NOT NULL default '0'
+);
+
+CREATE TABLE `tblTransmittalItems` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+	`transmittal` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE,
+  `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  UNIQUE (document, version)
+);
+
+UPDATE tblVersion set major=6, minor=0, subminor=0;
+
+COMMIT;
diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
new file mode 100644
index 000000000..2639d399a
--- /dev/null
+++ b/install/update-6.0.0/update.sql
@@ -0,0 +1,101 @@
+START TRANSACTION;
+
+ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` datetime default NULL;
+
+
+CREATE TABLE `tblUserSubstitutes` (
+  `id` int(11) NOT NULL auto_increment,
+  `user` int(11) default null,
+  `substitute` int(11) default null,
+  PRIMARY KEY (`id`),
+  UNIQUE (`user`, `substitute`),
+  CONSTRAINT `tblUserSubstitutes_user` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblUserSubstitutes_substitute` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+);
+
+CREATE TABLE `tblDocumentCheckOuts` (
+  `document` int(11) NOT NULL default '0',
+  `version` smallint(5) unsigned NOT NULL default '0',
+  `userID` int(11) NOT NULL default '0',
+  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `filename` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`document`),
+  CONSTRAINT `tblDocumentCheckOuts_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblDocumentCheckOuts_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tblDocumentRecipients` (
+  `receiptID` int(11) NOT NULL auto_increment,
+  `documentID` int(11) NOT NULL default '0',
+  `version` smallint(5) unsigned NOT NULL default '0',
+  `type` tinyint(4) NOT NULL default '0',
+  `required` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`receiptID`),
+  UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
+  CONSTRAINT `tblDocumentRecipients_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tblDocumentReceiptLog` (
+  `receiptLogID` int(11) NOT NULL auto_increment,
+  `receiptID` int(11) NOT NULL default '0',
+  `status` tinyint(4) NOT NULL default '0',
+  `comment` text NOT NULL,
+  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `userID` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`receiptLogID`),
+  CONSTRAINT `tblDocumentReceiptLog_recipient` FOREIGN KEY (`receiptID`) REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
+  CONSTRAINT `tblDocumentReceiptLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tblDocumentRevisors` (
+  `revisionID` int(11) NOT NULL auto_increment,
+  `documentID` int(11) NOT NULL default '0',
+  `version` smallint(5) unsigned NOT NULL default '0',
+  `type` tinyint(4) NOT NULL default '0',
+  `required` int(11) NOT NULL default '0',
+  `startdate` datetime default NULL,
+  PRIMARY KEY  (`revisionID`),
+  UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
+  CONSTRAINT `tblDocumentRevisors_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tblDocumentRevisionLog` (
+  `revisionLogID` int(11) NOT NULL auto_increment,
+  `revisionID` int(11) NOT NULL default '0',
+  `status` tinyint(4) NOT NULL default '0',
+  `comment` text NOT NULL,
+  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `userID` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`revisionLogID`),
+  CONSTRAINT `tblDocumentRevisionLog_revision` FOREIGN KEY (`revisionID`) REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
+  CONSTRAINT `tblDocumentRevisionLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tblTransmittals` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` text NOT NULL,
+  `comment` text NOT NULL,
+  `userID` int(11) NOT NULL default '0',
+  `date` datetime,
+  `public` tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  CONSTRAINT `tblTransmittals_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tblTransmittalItems` (
+  `id` int(11) NOT NULL auto_increment,
+	`transmittal` int(11) NOT NULL DEFAULT '0',
+  `document` int(11) default NULL,
+  `version` smallint(5) unsigned NOT NULL default '0',
+  `date` datetime,
+  PRIMARY KEY  (`id`),
+  UNIQUE (document, version),
+  CONSTRAINT `tblTransmittalItems_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblTransmittalItem_transmittal` FOREIGN KEY (`transmittal`) REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+UPDATE tblVersion set major=6, minor=0, subminor=0;
+
+COMMIT;
+
+

From ec244587ebe1e54bea6341f3911b6ac277c46861 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 9 Aug 2015 07:19:53 +0200
Subject: [PATCH 0328/2006] fix merge error

---
 utils/xmldump.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index 853ba55a3..2968cd06f 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -283,15 +283,12 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 			if($versions) {
 				echo $indent." <versions>\n";
 				foreach($versions as $version) {
-<<<<<<< HEAD
 					$approvalStatus = $version->getApprovalStatus(300);
 					$reviewStatus = $version->getReviewStatus(300);
 					$receiptStatus = $version->getReceiptStatus(300);
 					$revisionStatus = $version->getRevisionStatus(300);
-=======
 					$approvalStatus = $version->getApprovalStatus(30);
 					$reviewStatus = $version->getReviewStatus(30);
->>>>>>> seeddms-5.0.x
 					$owner = $version->getUser();
 					echo $indent."  <version version=\"".$version->getVersion()."\">\n";
 					echo $indent."   <attr name=\"mimetype\">".$version->getMimeType()."</attr>\n";

From 3ef5dbd2aeb3ccc9d064f2c4e0f8a766698c93d9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 9 Aug 2015 07:24:42 +0200
Subject: [PATCH 0329/2006] use dumplog() from revisionlog and receiptlog

---
 utils/xmldump.php | 48 ++---------------------------------------------
 1 file changed, 2 insertions(+), 46 deletions(-)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index 2968cd06f..a80cfdd90 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -322,54 +322,10 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 						dumplog($version, 'review', $reviewStatus, $indent);
 					}
 					if($receiptStatus) {
-						echo $indent."   <receipts>\n";
-						$curreceiptid = 0;
-						foreach($receiptStatus as $a) {
-							if($a['receiptID'] != $curreceiptid) {
-								if($curreceiptid != 0) {
-									echo $indent."    </receipt>\n";
-								}
-								echo $indent."    <receipt id=\"".$a['receiptID']."\">\n";
-								echo $indent."     <attr name=\"type\">".$a['type']."</attr>\n";
-								echo $indent."     <attr name=\"required\">".$a['required']."</attr>\n";
-							}
-							echo $indent."     <receiptlog id=\"".$a['receiptLogID']."\">\n";
-							echo $indent."      <attr name=\"user\">".$a['userID']."</attr>\n";
-							echo $indent."      <attr name=\"status\">".$a['status']."</attr>\n";
-							echo $indent."      <attr name=\"comment\">".wrapWithCData($a['comment'])."</attr>\n";
-							echo $indent."      <attr name=\"date\" format=\"Y-m-d H:i:s\">".$a['date']."</attr>\n";
-							echo $indent."     </receiptlog>\n";
-//							echo $indent."    </receipt>\n";
-							$curreceiptid = $a['receiptID'];
-						}
-						if($curreceiptid != 0)
-							echo $indent."    </receipt>\n";
-						echo $indent."   </receipts>\n";
+						dumplog($version, 'receipt', $receiptStatus, $indent);
 					}
 					if($revisionStatus) {
-						echo $indent."   <revisions>\n";
-						$currevisionid = 0;
-						foreach($revisionStatus as $a) {
-							if($a['revisionID'] != $currevisionid) {
-								if($currevisionid != 0) {
-									echo $indent."    </revision>\n";
-								}
-								echo $indent."    <revision id=\"".$a['revisionID']."\">\n";
-								echo $indent."     <attr name=\"type\">".$a['type']."</attr>\n";
-								echo $indent."     <attr name=\"required\">".$a['required']."</attr>\n";
-							}
-							echo $indent."     <revisionlog id=\"".$a['revisionLogID']."\">\n";
-							echo $indent."      <attr name=\"user\">".$a['userID']."</attr>\n";
-							echo $indent."      <attr name=\"status\">".$a['status']."</attr>\n";
-							echo $indent."      <attr name=\"comment\">".wrapWithCData($a['comment'])."</attr>\n";
-							echo $indent."      <attr name=\"date\" format=\"Y-m-d H:i:s\">".$a['date']."</attr>\n";
-							echo $indent."     </revisionlog>\n";
-//							echo $indent."    </revision>\n";
-							$currevisionid = $a['revisionID'];
-						}
-						if($currevisionid != 0)
-							echo $indent."    </revision>\n";
-						echo $indent."   </revisions>\n";
+						dumplog($version, 'revision', $revisionStatus, $indent);
 					}
 					if(file_exists($dms->contentDir . $version->getPath())) {
 						echo $indent."   <data length=\"".filesize($dms->contentDir . $version->getPath())."\"";

From 9aa2637a71245426dc582e37749ababc69465079 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Aug 2015 18:00:48 +0200
Subject: [PATCH 0330/2006] user showTextField()

---
 views/bootstrap/class.Settings.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 754b1a20f..e5510cffe 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -308,7 +308,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_backupDir_desc");?>">
         <td><?php printMLText("settings_backupDir");?>:</td>
-        <td><input type="text" name="backupDir" value="<?php echo $settings->_backupDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("backupDir", $settings->_backupDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_cacheDir_desc");?>">
         <td><?php printMLText("settings_cacheDir");?>:</td>
@@ -328,7 +328,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_checkOutDir_desc");?>">
         <td><?php printMLText("settings_checkOutDir");?>:</td>
-        <td><input type="text" name="checkOutDir" value="<?php echo $settings->_checkOutDir ?>" size="100" /></td>
+        <td><?php $this->showTextField("checkOutDir", $settings->_checkOutDir); ?></td>
       </tr>
       <tr title="<?php printMLText("settings_createCheckOutDir_desc");?>">
         <td><?php printMLText("settings_createCheckOutDir");?>:</td>
@@ -652,8 +652,8 @@ if(!is_writeable($settings->_configFilePath)) {
 	}
 ?>
       <tr title="">
-			<td><input type="text" name="converters[fulltext][newmimetype]" value="" placeholder="<?= getMLText('converter_new_mimetype') ?>"/>:</td>
-			<td><input type="text" name="converters[fulltext][newcmd]" value="" placeholder="<?= getMLText('converter_new_cmd') ?>"/></td>
+			<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

From 263d4b7caf920fbcced8e2dc11d1688d0716638a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Aug 2015 18:02:37 +0200
Subject: [PATCH 0331/2006] fix input field name for new mimetype

---
 views/bootstrap/class.Settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index e5510cffe..c4c045961 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -667,8 +667,8 @@ if(!is_writeable($settings->_configFilePath)) {
 	}
 ?>
       <tr title="">
-        <td><?php $this->showTextField("converters[preview]newmimetype", ""); ?></td>
-        <td><?php $this->showTextField("converters[preview]newcmd", ""); ?></td>
+        <td><?php $this->showTextField("converters[preview][newmimetype]", ""); ?>:</td>
+        <td><?php $this->showTextField("converters[preview][newcmd]", ""); ?></td>
       </tr>
     </table>
 <?php		$this->contentContainerEnd(); ?>

From 022490e46122ca47348e0f81420d86383f0d71d7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Aug 2015 16:43:27 +0200
Subject: [PATCH 0332/2006] set propper content type for excel documents

---
 op/op.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Search.php b/op/op.Search.php
index 8992cbb05..4c3463a24 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -427,7 +427,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 			header("Content-Transfer-Encoding: binary");
 			header("Content-Length: " . filesize($filename));
 			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".xls\"");
-			header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			header("Content-Type: application/vnd.ms-excel");
 			header("Cache-Control: must-revalidate");
 		}
 

From 07053ca7e90cfb824fd9a90bf7c6b5066b889a9d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Aug 2015 16:44:07 +0200
Subject: [PATCH 0333/2006] check for includecontent checkbox and pass it to
 url

---
 views/bootstrap/class.Search.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 17c316be8..c6a61bccc 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -214,12 +214,20 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
       <div class="accordion-inner">
 <table class="table-condensed">
 <tr>
-<td><?= getMLText('content') ?></td><td><label class="checkbox inline"><input type="checkbox" name="includecontent" value="1"> <?php printMLText("include_content"); ?></label></td>
+<td><?= getMLText('content') ?></td><td><label class="checkbox inline"><input id="includecontent" type="checkbox" name="includecontent" value="1"> <?php printMLText("include_content"); ?></label></td>
 </tr>
 <tr>
-<td></td><td><a class="btn" href="<?= $_SERVER['REQUEST_URI']."&export=1" ?>"><i class="icon-download"></i> Export</a></td>
+<td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&export=1" ?>"><i class="icon-download"></i> Export</a></td>
 </tr>
 </table>
+<script>
+$(document).ready( function() {
+	$('#export').on('click', function(e) {
+		e.preventDefault();
+		window.location.href = $(this).attr('href')+'&includecontent='+($('#includecontent').prop('checked') ? '1' : '0');
+	});
+});		
+</script>
       </div>
     </div>
   </div>

From 850bb05481582e73d4e317960b55c6bd0d07cd24 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Sep 2015 11:10:11 +0200
Subject: [PATCH 0334/2006] add superfluous code

---
 out/out.AddDocument.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 3fb73d32d..c44de267c 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -47,7 +47,6 @@ if($settings->_quota > 0) {
 	}
 }
 
-$folderid = $_GET["folderid"];
 $libfolder = $dms->getFolder($settings->_libraryFolder);
 if (!is_object($libfolder)) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));

From ab35650f0bac5f98945d486a3db93690c6c084a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Sep 2015 11:25:59 +0200
Subject: [PATCH 0335/2006] check if settings->_libraryFolder is set before
 using it

---
 out/out.AddDocument.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index c44de267c..12bd92996 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -47,17 +47,21 @@ if($settings->_quota > 0) {
 	}
 }
 
-$libfolder = $dms->getFolder($settings->_libraryFolder);
-if (!is_object($libfolder)) {
-	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
-}
+if($settings->_libraryFolder) {
+	$libfolder = $dms->getFolder($settings->_libraryFolder);
+	if (!is_object($libfolder)) {
+		UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
+	}
 
-if ($libfolder->getAccessMode($user) < M_READ) {
-	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($libfolder->getName()))), getMLText("access_denied"));
+	if ($libfolder->getAccessMode($user) < M_READ) {
+		UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($libfolder->getName()))), getMLText("access_denied"));
+	}
+} else {
+	$libfolder = null;
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'libraryfolder'=>$dms->getFolder($libfolder), 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList, 'orderby'=>$settings->_sortFoldersDefault));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'libraryfolder'=>$libfolder, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList, 'orderby'=>$settings->_sortFoldersDefault));
 if($view) {
 	$view->show();
 	exit;

From e8b99cea709c79e849209c5e5ba3fc571e0013ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2015 09:01:18 +0200
Subject: [PATCH 0336/2006] replace all CURRENT_TIMESTAMP by
 $db->getCurrentTimestamp()

---
 SeedDMS_Core/Core/inc.ClassDocument.php    | 26 +++++++++++-----------
 SeedDMS_Core/Core/inc.ClassGroup.php       |  4 ++--
 SeedDMS_Core/Core/inc.ClassTransmittal.php |  2 +-
 SeedDMS_Core/Core/inc.ClassUser.php        |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 240d3f83d..4b12d0a5d 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -804,7 +804,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$lc = self::getLatestContent();
 
 		$filename = $checkoutdir."/".$lc->getOriginalFileName();
-		$queryStr = "INSERT INTO tblDocumentCheckOuts (document, version, userID, date, filename) VALUES (".$this->_id.", ".$lc->getVersion().", ".$user->getID().", CURRENT_TIMESTAMP, ".$db->qstr($filename).")";
+		$queryStr = "INSERT INTO tblDocumentCheckOuts (document, version, userID, date, filename) VALUES (".$this->_id.", ".$lc->getVersion().", ".$user->getID().", ".$db->getCurrentDatetime().", ".$db->qstr($filename).")";
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -2704,7 +2704,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if(!$date)
 			$queryStr = "UPDATE tblDocumentContent SET revisiondate = null WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
 		elseif($date == 'now')
-			$queryStr = "UPDATE tblDocumentContent SET revisiondate = CURRENT_TIMESTAMP WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
+			$queryStr = "UPDATE tblDocumentContent SET revisiondate = ".$db->getCurrentDatetime()." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
 		else
 			$queryStr = "UPDATE tblDocumentContent SET revisiondate = ".$db->qstr($date)." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
 		if (!$db->getResult($queryStr))
@@ -3885,7 +3885,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $receiptID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+			"VALUES ('". $receiptID ."', '0', '', ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -3947,7 +3947,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $receiptID ."', '0', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+			"VALUES ('". $receiptID ."', '0', '', ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -4034,7 +4034,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $revisionID ."', '".S_LOG_SLEEPING."', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+			"VALUES ('". $revisionID ."', '".S_LOG_SLEEPING."', '', ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -4100,7 +4100,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`,
   	  `comment`, `date`, `userID`) ".
 			"VALUES ('". $indstatus["receiptID"] ."', '".
-			(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '".
+			(int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentDatetime().", '".
 			$requestUser->getID() ."')";
 		$res=$db->getResult($queryStr);
 		if (is_bool($res) && !$res)
@@ -4148,7 +4148,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`recipientsID`, `status`,
   	  `comment`, `date`, `userID`) ".
 			"VALUES ('". $receiptStatus[0]["recipientsID"] ."', '".
-			(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '".
+			(int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentDatetime().", '".
 			$requestUser->getID() ."')";
 		$res=$db->getResult($queryStr);
 		if (is_bool($res) && !$res)
@@ -4230,7 +4230,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
 			`comment`, `date`, `userID`) ".
 			"VALUES ('". $indstatus["revisionID"] ."', '".
-			(int) $status ."', ".$db->qstr($comment).", CURRENT_TIMESTAMP, '".
+			(int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentDatetime().", '".
 			$requestUser->getID() ."')";
 		$res=$db->getResult($queryStr);
 		if (is_bool($res) && !$res)
@@ -4398,7 +4398,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $indstatus["receiptID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+			"VALUES ('". $indstatus["receiptID"] ."', '-2', '', ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -4430,7 +4430,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $status["receiptID"] ."', '-2', '', CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+			"VALUES ('". $status["receiptID"] ."', '-2', '', ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -4504,7 +4504,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			}
 
 			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $indstatus["revisionID"] ."', '".S_LOG_USER_REMOVED."', ".$db->qstr($msg).", CURRENT_TIMESTAMP, '". $requestUser->getID() ."')";
+				"VALUES ('". $indstatus["revisionID"] ."', '".S_LOG_USER_REMOVED."', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 			$res = $db->getResult($queryStr);
 			if (is_bool($res) && !$res) {
 				return -1;
@@ -4559,7 +4559,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
 					`comment`, `date`, `userID`) ".
 					"VALUES ('". $status["revisionID"] ."', ".
-					S_LOG_WAITING.", ".$db->qstr($msg).", CURRENT_TIMESTAMP, '".
+					S_LOG_WAITING.", ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '".
 					$requestUser->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if (is_bool($res) && !$res) {
@@ -4616,7 +4616,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
 					`comment`, `date`, `userID`) ".
 					"VALUES ('". $status["revisionID"] ."', ".
-					S_LOG_SLEEPING.", ".$db->qstr($msg).", CURRENT_TIMESTAMP, '".
+					S_LOG_SLEEPING.", ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '".
 					$requestUser->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if (is_bool($res) && !$res) {
diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 53f5760d0..6b2e1efad 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -315,7 +315,7 @@ class SeedDMS_Core_Group {
 		$receiptStatus = $this->getReceiptStatus();
 		foreach ($receiptStatus as $r) {
 			$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $r["receiptID"] ."', '-2', 'Recipients group removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+				"VALUES ('". $r["receiptID"] ."', '-2', 'Recipients group removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 			$res=$db->getResult($queryStr);
 			if(!$res) {
 				$db->rollbackTransaction();
@@ -326,7 +326,7 @@ class SeedDMS_Core_Group {
 		$revisionStatus = $this->getRevisionStatus();
 		foreach ($revisionStatus as $r) {
 			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $r["revisionID"] ."', '-2', 'Revisors group removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+				"VALUES ('". $r["revisionID"] ."', '-2', 'Revisors group removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 			$res=$db->getResult($queryStr);
 			if(!$res) {
 				$db->rollbackTransaction();
diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index d6e23104b..11a916bd0 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -250,7 +250,7 @@ class SeedDMS_Core_Transmittal {
 
 		$document = $item->getDocument();
 		$queryStr = "INSERT INTO `tblTransmittalItems` (`transmittal`, `document`, `version`, `date`) ".
-			"VALUES ('". $this->_id ."', ".$document->getID().", ".$item->getVersion().", CURRENT_TIMESTAMP)";
+			"VALUES ('". $this->_id ."', ".$document->getID().", ".$item->getVersion().", ".$db->getCurrentDatetime().")";
 		$res=$db->getResult($queryStr);
 		if(!$res) {
 			return false;
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 93ba82791..1a3066ebe 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -703,7 +703,7 @@ class SeedDMS_Core_User { /* {{{ */
 		$receiptStatus = $this->getReceiptStatus();
 		foreach ($receiptStatus["indstatus"] as $ri) {
 			$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+				"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 			$res=$db->getResult($queryStr);
 			if(!$res) {
 				$db->rollbackTransaction();
@@ -714,7 +714,7 @@ class SeedDMS_Core_User { /* {{{ */
 		$revisionStatus = $this->getRevisionStatus();
 		foreach ($revisionStatus["indstatus"] as $ri) {
 			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', CURRENT_TIMESTAMP, '". $user->getID() ."')";
+				"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 			$res=$db->getResult($queryStr);
 			if(!$res) {
 				$db->rollbackTransaction();

From dc66a5959d91ddf91549d75b007076461ea240e7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 30 Sep 2015 13:22:25 +0200
Subject: [PATCH 0337/2006] use converters

---
 SeedDMS_Preview/Preview/Previewer.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 8ebb9341c..5300bcc4b 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -76,7 +76,7 @@ class SeedDMS_Preview_Previewer {
 		);
 		$pipes = array();
 	 
-	  $timeout += time();
+		$timeout += time();
 		$process = proc_open($cmd, $descriptorspec, $pipes);
 		if (!is_resource($process)) {
 			throw new Exception("proc_open failed on: " . $cmd);
@@ -161,6 +161,10 @@ class SeedDMS_Preview_Previewer {
 			$target = $this->previewDir.$dir.md5($infile).'-'.$width;
 		if($target != '' && (!file_exists($target.'.png') || filectime($target.'.png') < filectime($infile))) {
 			$cmd = '';
+			if(isset($this->converters[$mimetype])) {
+				$cmd = str_replace(array('%w', '%f', '%o'), array($width, $infile, $target.'.png'), $this->converters[$mimetype]);
+			}
+			/*
 			switch($mimetype) {
 				case "image/png":
 				case "image/gif":
@@ -180,6 +184,7 @@ class SeedDMS_Preview_Previewer {
 					$cmd = 'tar tzvf '.$infile.' | convert -density 100 -resize '.$width.'x text:-[0] '.$target.'.png';
 					break;
 			}
+			 */
 			if($cmd) {
 				//exec($cmd);
 				try {

From ecf8f311d9c22468fb114bbc81d03ecbf98ad8c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Nov 2015 13:43:49 +0100
Subject: [PATCH 0338/2006] set propper Content-Type

---
 op/op.Ajax.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 8775bb75c..7d9397576 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -695,7 +695,7 @@ switch($command) {
 	case 'removetransmittalitem': /* {{{ */
 		if($user) {
 			if(!checkFormKey('removetransmittalitem', 'GET')) {
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
 				$item = SeedDMS_Core_TransmittalItem::getInstance((int) $_REQUEST['id'], $dms);
@@ -704,22 +704,22 @@ switch($command) {
 					if($transmittal) {
 						if ($transmittal->getUser()->getID() == $user->getID()) {
 							if($item->remove()) {
-								header('Content-Type', 'application/json');
+								header('Content-Type: application/json');
 								echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 							} else {
-								header('Content-Type', 'application/json');
+								header('Content-Type: application/json');
 								echo json_encode(array('success'=>false, 'message'=>'Error removing transmittal item', 'data'=>''));
 							}
 						} else {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
 						}
 					} else {
-						header('Content-Type', 'application/json');
+						header('Content-Type: application/json');
 						echo json_encode(array('success'=>false, 'message'=>'No transmittal', 'data'=>''));
 					}
 				} else {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>'No transmittal item', 'data'=>''));
 				}
 			}
@@ -729,7 +729,7 @@ switch($command) {
 	case 'updatetransmittalitem': /* {{{ */
 		if($user) {
 			if(!checkFormKey('updatetransmittalitem', 'GET')) {
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
 				$item = SeedDMS_Core_TransmittalItem::getInstance((int) $_REQUEST['id'], $dms);
@@ -738,22 +738,22 @@ switch($command) {
 					if($transmittal) {
 						if ($transmittal->getUser()->getID() == $user->getID()) {
 							if($item->updateContent()) {
-								header('Content-Type', 'application/json');
+								header('Content-Type: application/json');
 								echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 							} else {
-								header('Content-Type', 'application/json');
+								header('Content-Type: application/json');
 								echo json_encode(array('success'=>false, 'message'=>'Error removing transmittal item', 'data'=>''));
 							}
 						} else {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
 						}
 					} else {
-						header('Content-Type', 'application/json');
+						header('Content-Type: application/json');
 						echo json_encode(array('success'=>false, 'message'=>'No transmittal', 'data'=>''));
 					}
 				} else {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>'No transmittal item', 'data'=>''));
 				}
 			}
@@ -788,7 +788,7 @@ switch($command) {
 					$revisions[] = array('id'=>$res['id'], 'name'=>$res['name']);
 				}
 			}
-			header('Content-Type', 'application/json');
+			header('Content-Type: application/json');
 			echo json_encode(array('error'=>0, 'data'=>array('review'=>$reviews, 'approval'=>$approvals, 'receipt'=>$receipts, 'revision'=>$revisions), 'processing_time'=>microtime(true)-$startts));
 		}
 		break; /* }}} */

From 10cbf3b3b327564ff0d52950c8cbe7d82963362e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 Nov 2015 19:48:40 +0100
Subject: [PATCH 0339/2006] add pptx to getMimeType()

---
 inc/inc.Utils.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 371b29770..bbd9dcbe9 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -540,6 +540,7 @@ function get_extension($mimetype) { /* {{{ */
 		case 'application/pdf': return '.pdf';
 		case 'application/postscript': return '.ps';
 		case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': return '.docx';
+		case 'application/vnd.openxmlformats-officedocument.presentationml.presentation': return '.pptx';
 		case 'text/plain': return '.txt';
 		case 'text/csv': return '.csv';
 		default: return false;

From 348d40ad22d3bbe4da8fe7f7bd7e6a888f6d8c73 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 Nov 2015 20:44:33 +0100
Subject: [PATCH 0340/2006] show filename as saved in database table

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 1c48db12e..a949803bd 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -230,10 +230,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <div class="span3">
 <?php
 		$this->contentHeading(getMLText("document_infos"));
-		if($document->isCheckedOut()) {
+		if($info = $document->getCheckOutInfo()) {
 			echo "<div class=\"alert alert-info\">";
 			$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
-			echo "<a href=\"file://".$checkoutpath.urldecode($latestContent->getOriginalFileName())."\">".getMLText('copied_to_checkout_as', array('filename'=>$latestContent->getOriginalFileName()))."</a>";
+			echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('filename'=>substr($info['filename'], strlen($checkoutpath)+1)))."</a>";
 			echo "</div>";
 		}
 		$this->contentContainerStart();

From 5351bd9596fe02c0c8a830d22e28538eeef33a07 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 Nov 2015 20:45:03 +0100
Subject: [PATCH 0341/2006] create checkout filename from id, version and name

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 1479429de..5a25d6921 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -803,7 +803,14 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		$lc = self::getLatestContent();
 
-		$filename = $checkoutdir."/".$lc->getOriginalFileName();
+		$ext = pathinfo($this->getName(), PATHINFO_EXTENSION);
+		$oext = pathinfo($lc->getOriginalFileName(), PATHINFO_EXTENSION);
+		if($ext == $oext)
+			$filename = preg_replace('/[^A-Za-z0-9_.-]/', '_', $this->getName());
+		else {
+			$filename = preg_replace('/[^A-Za-z0-9_-]/', '_', $this->getName()).'.'.$oext;
+		}
+		$filename = $checkoutdir.$this->getID().'-'.$lc->getVersion().'-'.$filename; //$lc->getOriginalFileName();
 		$queryStr = "INSERT INTO tblDocumentCheckOuts (document, version, userID, date, filename) VALUES (".$this->_id.", ".$lc->getVersion().", ".$user->getID().", ".$db->getCurrentDatetime().", ".$db->qstr($filename).")";
 		if (!$db->getResult($queryStr))
 			return false;

From 0fc1806ca4a723151dcff347ea6c9acd1b8bb61f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2015 09:23:41 +0100
Subject: [PATCH 0342/2006] do not include ../inc/inc.ClassEmail.php

---
 op/op.AddToTransmittal.php | 1 -
 op/op.AddTransmittal.php   | 1 -
 op/op.CheckInDocument.php  | 1 -
 op/op.ReceiptDocument.php  | 1 -
 op/op.ReviseDocument.php   | 1 -
 op/op.SetRecipients.php    | 1 -
 op/op.SetRevisors.php      | 1 -
 7 files changed, 7 deletions(-)

diff --git a/op/op.AddToTransmittal.php b/op/op.AddToTransmittal.php
index c87d4d9d5..6aa99dc12 100644
--- a/op/op.AddToTransmittal.php
+++ b/op/op.AddToTransmittal.php
@@ -19,7 +19,6 @@
 
 include("../inc/inc.Settings.php");
 include("../inc/inc.LogInit.php");
-include("../inc/inc.ClassEmail.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
diff --git a/op/op.AddTransmittal.php b/op/op.AddTransmittal.php
index 1fc840d71..9909fd9e4 100644
--- a/op/op.AddTransmittal.php
+++ b/op/op.AddTransmittal.php
@@ -26,7 +26,6 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassEmail.php");
 include("../inc/inc.Authentication.php");
 
 /* Check if the form data comes for a trusted request */
diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 46fdc4237..f7e797ec1 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -18,7 +18,6 @@
 
 include("../inc/inc.Settings.php");
 include("../inc/inc.LogInit.php");
-include("../inc/inc.ClassEmail.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index 2c9eaa970..be0845832 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -24,7 +24,6 @@ include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
-include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index d1a3f5520..cc8d9fbb4 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -24,7 +24,6 @@ include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
-include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 6bd7c4e61..9c99ce148 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -21,7 +21,6 @@
 
 include("../inc/inc.Settings.php");
 include("../inc/inc.LogInit.php");
-include("../inc/inc.ClassEmail.php");
 include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 9057ccf0a..395c9a7c2 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -21,7 +21,6 @@
 
 include("../inc/inc.Settings.php");
 include("../inc/inc.LogInit.php");
-include("../inc/inc.ClassEmail.php");
 include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");

From eee4e2f0eb27c660dabe2fc99dcc75836ee76712 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2015 18:06:15 +0100
Subject: [PATCH 0343/2006] add getUser()

---
 inc/inc.ClassSession.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php
index d67532521..564ecc6ec 100644
--- a/inc/inc.ClassSession.php
+++ b/inc/inc.ClassSession.php
@@ -170,6 +170,15 @@ class SeedDMS_Session {
 		return $this->id;
 	} /* }}} */
 
+	/**
+	 * Get user id of session
+	 *
+	 * @return integer user id
+	 */
+	function getUser() { /* {{{ */
+		return $this->data['userid'];
+	} /* }}} */
+
 	/**
 	 * Set user of session
 	 *

From f7b2d5b6d67ee950686bb5fe8cb93a16b503ffe1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2015 18:06:41 +0100
Subject: [PATCH 0344/2006] use the checkout space of the logged in user not
 the substituted user

---
 op/op.CheckOutDocument.php             |  7 ++++++-
 views/bootstrap/class.ViewDocument.php | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/op/op.CheckOutDocument.php b/op/op.CheckOutDocument.php
index aa1f73e25..f6569ef22 100644
--- a/op/op.CheckOutDocument.php
+++ b/op/op.CheckOutDocument.php
@@ -53,7 +53,12 @@ if ($document->isCheckedOut()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("document_already_checkedout"));
 }
 
-$checkoutpath = sprintf($settings->_checkOutDir.'/', preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
+if($session->getSu()) {
+	$origuser = $dms->getUser($session->getUser());
+	$checkoutpath = sprintf($settings->_checkOutDir.'/', preg_replace('/[^A-Za-z0-9_-]/', '', $origuser->getLogin()));
+} else {
+	$checkoutpath = sprintf($settings->_checkOutDir.'/', preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
+}
 if(!file_exists($checkoutpath) && $settings->_createCheckOutDir) {
 	SeedDMS_Core_File::makeDir($checkoutpath);
 }
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index a949803bd..5bfc46fdd 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -232,8 +232,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("document_infos"));
 		if($info = $document->getCheckOutInfo()) {
 			echo "<div class=\"alert alert-info\">";
-			$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
-			echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('filename'=>substr($info['filename'], strlen($checkoutpath)+1)))."</a>";
+			$session = $this->params['session'];
+			if($session->getSu()) {
+				$origuser = $dms->getUser($session->getUser());
+				$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $origuser->getLogin()));
+			} else {
+				$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
+			}
+			echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>$info['date'], 'filename'=>substr($info['filename'], strlen($checkoutpath)+1)))."</a>";
 			echo "</div>";
 		}
 		$this->contentContainerStart();

From 7d88617964ff2478dee333b75c1c32590349e34c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Dec 2015 08:00:50 +0100
Subject: [PATCH 0345/2006] individual approver/reviewer can be take from group

---
 op/op.AddDocument.php                         | 21 ++++++++++++++
 op/op.SetReviewersApprovers.php               | 24 +++++++++++++++
 op/op.UpdateDocument.php                      | 20 +++++++++++++
 views/bootstrap/class.AddDocument.php         | 28 ++++++++++++++++++
 .../bootstrap/class.SetReviewersApprovers.php | 24 ++++++++++++++-
 views/bootstrap/class.UpdateDocument.php      | 29 +++++++++++++++++++
 6 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 06a69bf3d..339b9e034 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -164,6 +164,16 @@ if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'tra
 				$reviewers["g"][] = $grp;
 			}
 		}
+		// Retrieve the list of reviewer groups whose members become individual reviewers
+		if (isset($_POST["grpIndReviewers"])) {
+			foreach ($_POST["grpIndReviewers"] as $grp) {
+				if($group = $dms->getGroup($grp)) {
+					$members = $group->getUsers();
+					foreach($members as $member)
+						$reviewers["i"][] = $member->getID();
+				}
+			}
+		}
 	}
 
 	// Retrieve the list of individual approvers from the form.
@@ -178,6 +188,17 @@ if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'tra
 			$approvers["g"][] = $grp;
 		}
 	}
+	// Retrieve the list of reviewer groups whose members become individual approvers
+	if (isset($_POST["grpIndApprovers"])) {
+		foreach ($_POST["grpIndApprovers"] as $grp) {
+			if($group = $dms->getGroup($grp)) {
+				$members = $group->getUsers();
+				foreach($members as $member)
+					$approvers["i"][] = $member->getID();
+			}
+		}
+	}
+
 	// add mandatory reviewers/approvers
 	$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
 	if($settings->_workflowMode == 'traditional') {
diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php
index 393c07372..8794a66ca 100644
--- a/op/op.SetReviewersApprovers.php
+++ b/op/op.SetReviewersApprovers.php
@@ -104,6 +104,18 @@ foreach ($approvalStatus as $i=>$rs) {
 
 // Get the list of proposed reviewers, stripping out any duplicates.
 $pIndRev = (isset($_POST["indReviewers"]) ? array_values(array_unique($_POST["indReviewers"])) : array());
+// Retrieve the list of reviewer groups whose members become individual reviewers
+if (isset($_POST["grpIndReviewers"])) {
+	foreach ($_POST["grpIndReviewers"] as $grp) {
+		if($group = $dms->getGroup($grp)) {
+			$members = $group->getUsers();
+			foreach($members as $member) {
+				if(!in_array($member->getID(), $pIndRev))
+					$pIndRev[] = $member->getID();
+			}
+		}
+	}
+}
 $pGrpRev = (isset($_POST["grpReviewers"]) ? array_values(array_unique($_POST["grpReviewers"])) : array());
 foreach ($pIndRev as $p) {
 	if (is_numeric($p)) {
@@ -319,6 +331,18 @@ if (count($reviewIndex["g"]) > 0) {
 
 // Get the list of proposed approvers, stripping out any duplicates.
 $pIndApp = (isset($_POST["indApprovers"]) ? array_values(array_unique($_POST["indApprovers"])) : array());
+// Retrieve the list of approver groups whose members become individual reviewers
+if (isset($_POST["grpIndApprovers"])) {
+	foreach ($_POST["grpIndApprovers"] as $grp) {
+		if($group = $dms->getGroup($grp)) {
+			$members = $group->getUsers();
+			foreach($members as $member) {
+				if(!in_array($member->getID(), $pIndApp))
+					$pIndApp[] = $member->getID();
+			}
+		}
+	}
+}
 $pGrpApp = (isset($_POST["grpApprovers"]) ? array_values(array_unique($_POST["grpApprovers"])) : array());
 foreach ($pIndApp as $p) {
 	if (is_numeric($p)) {
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index b39385eb9..ea65c122a 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -129,6 +129,16 @@ if ($_FILES['userfile']['error'] == 0) {
 					$reviewers["g"][] = $grp;
 				}
 			}
+			// Retrieve the list of reviewer groups whose members become individual reviewers
+			if (isset($_POST["grpIndReviewers"])) {
+				foreach ($_POST["grpIndReviewers"] as $grp) {
+					if($group = $dms->getGroup($grp)) {
+						$members = $group->getUsers();
+						foreach($members as $member)
+							$reviewers["i"][] = $member->getID();
+					}
+				}
+			}
 		}
 
 		// Retrieve the list of individual approvers from the form.
@@ -145,6 +155,16 @@ if ($_FILES['userfile']['error'] == 0) {
 				$approvers["g"][] = $grp;
 			}
 		}
+		// Retrieve the list of reviewer groups whose members become individual approvers
+		if (isset($_POST["grpIndApprovers"])) {
+			foreach ($_POST["grpIndApprovers"] as $grp) {
+				if($group = $dms->getGroup($grp)) {
+					$members = $group->getUsers();
+					foreach($members as $member)
+						$approvers["i"][] = $member->getID();
+				}
+			}
+		}
 
 		// add mandatory reviewers/approvers
 		$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 9757231b0..2c61ae91a 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -348,6 +348,20 @@ $(document).ready(function() {
 ?>
       </td>
       </tr>
+      <tr>
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+        <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_reviewers'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+			</td>
+			</tr>
       <tr>
         <td>
 			<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
@@ -459,6 +473,20 @@ $(document).ready(function() {
 				</td>
 		  </tr>	
 		  <tr>	
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+      <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_approvers'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+				</td>
+		  </tr>	
+		  <tr>	
         <td>
 			<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
         </td>
diff --git a/views/bootstrap/class.SetReviewersApprovers.php b/views/bootstrap/class.SetReviewersApprovers.php
index 3661829f8..b4c11183f 100644
--- a/views/bootstrap/class.SetReviewersApprovers.php
+++ b/views/bootstrap/class.SetReviewersApprovers.php
@@ -123,6 +123,17 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 ?>
   </select>
 
+  <div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups")?>:</div>
+  <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_grp_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+
+		foreach ($docAccess["groups"] as $group) {
+
+			print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+		}
+?>
+  </select>
+
   <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
   <select class="chzn-select span9" name="grpReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
@@ -196,8 +207,19 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 		}
 ?>
   </select>
-  <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
 
+  <div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups")?>:</div>
+  <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_grp_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+
+		foreach ($docAccess["groups"] as $group) {
+
+			print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+		}
+?>
+  </select>
+
+  <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
   <select class="chzn-select span9" name="grpApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
 		foreach ($docAccess["groups"] as $group) {
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 156c15e88..e2a47e7b2 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -300,6 +300,20 @@ function checkForm()
 ?>
       </td>
     </tr>
+      <tr>
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+        <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_reviewers'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+			</td>
+			</tr>
     <tr>
       <td>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
@@ -448,6 +462,21 @@ function checkForm()
 ?>
       </td>
     </tr>
+		  <tr>	
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+      <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_approvers'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+				</td>
+			</tr>	
+		<tr>
       <td>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
       </td>

From 20e7b873a5906e8cb1969ab81f533a448e9b8831 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Dec 2015 08:34:32 +0100
Subject: [PATCH 0346/2006] get classname of SeedDMS Document from dms instance

don't use hard coded SeedDMS_Core_Document anymore
---
 inc/inc.ClassAccessOperation.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 439e3c404..a3835eb7a 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -122,7 +122,7 @@ class SeedDMS_AccessOperation {
 	 * settings.
 	 */
 	function maySetRecipients() { /* {{{ */
-		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
+		if(get_class($this->obj) == $this->dms->getClassname('document')) {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
 			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED)) {
@@ -142,10 +142,10 @@ class SeedDMS_AccessOperation {
 	 * settings.
 	 */
 	function maySetRevisors() { /* {{{ */
-		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
+		if(get_class($this->obj) == $this->dms->getClassname('document')) {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) /* && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)*/) {
+			if (($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin() /* && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)*/) {
 				return true;
 			}
 		}
@@ -281,7 +281,7 @@ class SeedDMS_AccessOperation {
 	 * account here.
 	 */
 	function mayReceipt() { /* {{{ */
-		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
+		if(get_class($this->obj) == $this->dms->getClassname('document')) {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
 			if ($status["status"]!=S_OBSOLETE) {
@@ -299,7 +299,7 @@ class SeedDMS_AccessOperation {
 	 * account here.
 	 */
 	function mayRevise() { /* {{{ */
-		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
+		if(get_class($this->obj) == $this->dms->getClassname('document')) {
 			$latestContent = $this->obj->getLatestContent();
 			$status = $latestContent->getStatus();
 			if ($status["status"]!=S_OBSOLETE) {

From 52b64822c5c6e61dc04730364501b47fe1498f43 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Dec 2015 09:00:04 +0100
Subject: [PATCH 0347/2006] show name of volume for checkout

---
 views/bootstrap/class.UsrMgr.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index cbfb5c74a..c17f71bf6 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -35,6 +35,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 		$dms = $this->params['dms'];
 		$seluser = $this->params['seluser'];
 		$quota = $this->params['quota'];
+		$settings = $this->params['settings'];
 
 		if($seluser) {
 			$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
@@ -53,6 +54,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 				$session = array_shift($sessions);
 				echo "<tr><td>".getMLText('lastaccess')."</td><td>".getLongReadableDate($session->getLastAccess())."</td></tr>\n";
 			}
+			echo "<tr><td>".getMLText('network_drive')."</td><td><a href=\"http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot.'checkout/'.preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."\">".preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."</a></td></tr>\n";
 			echo "</table>";
 		}
 	} /* }}} */

From ffc709c557046f0690b5afc6d182ed32de0c0e25 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Dec 2015 09:00:42 +0100
Subject: [PATCH 0348/2006] set individual recipients from group

---
 op/op.SetRecipients.php                 | 12 ++++++++++++
 views/bootstrap/class.SetRecipients.php |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 9c99ce148..a5f4dad99 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -87,6 +87,18 @@ foreach ($receiptStatus as $i=>$rs) {
 
 // Get the list of proposed recipients, stripping out any duplicates.
 $pIndRev = (isset($_POST["indRecipients"]) ? array_values(array_unique($_POST["indRecipients"])) : array());
+// Retrieve the list of recipient groups whose members become individual recipients
+if (isset($_POST["grpIndRecipients"])) {
+	foreach ($_POST["grpIndRecipients"] as $grp) {
+		if($group = $dms->getGroup($grp)) {
+			$members = $group->getUsers();
+			foreach($members as $member) {
+				if(!in_array($member->getID(), $pIndRev))
+					$pIndRev[] = $member->getID();
+			}
+		}
+	}
+}
 $pGrpRev = (isset($_POST["grpRecipients"]) ? array_values(array_unique($_POST["grpRecipients"])) : array());
 foreach ($pIndRev as $p) {
 	if (is_numeric($p)) {
diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index b6ceb6843..e8b4734e3 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -95,6 +95,15 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
 ?>
   </select>
 
+  <div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups")?>:</div>
+  <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+<?php
+		foreach ($docAccess["groups"] as $group) {
+			print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+		}
+?>
+  </select>
+
   <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
   <select class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php

From 502e9b6271a2af9c5c25c60eacd62a1133a9aa96 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Dec 2015 18:15:44 +0100
Subject: [PATCH 0349/2006] remove old sql code, use constant
 S_LOG_USER_REMOVED

---
 op/op.SetRevisors.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 395c9a7c2..8c5209c09 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -85,7 +85,7 @@ $revisionStatus = $content->getRevisionStatus();
 // Index the revision results for easy cross-reference with the Approvers List.
 $revisionIndex = array("i"=>array(), "g"=>array());
 foreach ($revisionStatus as $i=>$rs) {
-	if ($rs["status"]!=-2) {
+	if ($rs["status"]!=S_LOG_USER_REMOVED) {
 		if ($rs["type"]==0) {
 			$revisionIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
 		}
@@ -161,11 +161,6 @@ if (count($revisionIndex["i"]) > 0) {
 			if (!isset($accessIndex["i"][$rx])) {
 				// User does not have any revision privileges for this document
 				// revision or does not exist.
-				/* Take this out for now 
-				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $revisionStatus[$rv["idx"]]["revisionID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
-				$res = $db->getResult($queryStr);
-				 */
 				$res = $content->delIndRevisor($dms->getUser($rx), $user, getMLText("removed_recipient"));
 			}
 			else {
@@ -268,11 +263,6 @@ if (count($revisionIndex["g"]) > 0) {
 			if (!isset($accessIndex["g"][$rx])) {
 				// Group does not have any revision privileges for this document
 				// revision or does not exist.
-				/*
-				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $revisionStatus[$rv["idx"]]["revisionID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
-				$res = $db->getResult($queryStr);
-*/
 				$res = $content->delGrpRevisor($dms->getGroup($rx), $user, getMLText("removed_recipient"));
 			}
 			else {

From 4a5d084ddd2aeb846d7605e0e7479ac7f2e9f0d3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Dec 2015 18:16:25 +0100
Subject: [PATCH 0350/2006] remove old sql code, use constant
 S_LOG_USER_REMOVED

---
 op/op.SetRecipients.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index a5f4dad99..6cd1d670e 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -75,7 +75,7 @@ $receiptStatus = $content->getReceiptStatus();
 // Index the receipt results for easy cross-reference with the Approvers List.
 $receiptIndex = array("i"=>array(), "g"=>array());
 foreach ($receiptStatus as $i=>$rs) {
-	if ($rs["status"]!=-2) {
+	if ($rs["status"]!=S_LOG_USER_REMOVED) {
 		if ($rs["type"]==0) {
 			$receiptIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
 		}
@@ -164,7 +164,7 @@ if (count($receiptIndex["i"]) > 0) {
 				// User does not have any receipt privileges for this document
 				// revision or does not exist.
 				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $receiptStatus[$rv["idx"]]["receiptID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
+					"VALUES ('". $receiptStatus[$rv["idx"]]["receiptID"] ."', '".S_LOG_USER_REMOVED."', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
 				$res = $db->getResult($queryStr);
 			}
 			else {
@@ -268,7 +268,7 @@ if (count($receiptIndex["g"]) > 0) {
 				// Group does not have any receipt privileges for this document
 				// revision or does not exist.
 				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $receiptStatus[$rv["idx"]]["receiptID"] ."', '-2', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
+					"VALUES ('". $receiptStatus[$rv["idx"]]["receiptID"] ."', '".S_LOG_USER_REMOVED."', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
 				$res = $db->getResult($queryStr);
 			}
 			else {

From 6ae70ce7f68e9b5fbf7278f3f554df6dbc694c1d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Dec 2015 18:19:33 +0100
Subject: [PATCH 0351/2006] use constant S_LOG_USER_REMOVE

---
 op/op.SetReviewersApprovers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php
index 8794a66ca..f796a5788 100644
--- a/op/op.SetReviewersApprovers.php
+++ b/op/op.SetReviewersApprovers.php
@@ -80,7 +80,7 @@ $approvalStatus = $content->getApprovalStatus();
 // Index the review results for easy cross-reference with the Approvers List.
 $reviewIndex = array("i"=>array(), "g"=>array());
 foreach ($reviewStatus as $i=>$rs) {
-	if ($rs["status"]!=-2) {
+	if ($rs["status"]!=S_LOG_USER_REMOVED) {
 		if ($rs["type"]==0) {
 			$reviewIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
 		}
@@ -92,7 +92,7 @@ foreach ($reviewStatus as $i=>$rs) {
 // Index the approval results for easy cross-reference with the Approvers List.
 $approvalIndex = array("i"=>array(), "g"=>array());
 foreach ($approvalStatus as $i=>$rs) {
-	if ($rs["status"]!=-2) {
+	if ($rs["status"]!=S_LOG_USER_REMOVED) {
 		if ($rs["type"]==0) {
 			$approvalIndex["i"][$rs["required"]] = array("status"=>$rs["status"], "idx"=>$i);
 		}

From 65a1ba9102404073f39029122cfde25c3bff0f8f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Dec 2015 09:23:58 +0100
Subject: [PATCH 0352/2006] fix links in task menu

---
 views/bootstrap/class.Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 7c669f9fb..1c2fcb63c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -288,7 +288,7 @@ $(document).ready(function () {
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['receipt'] as $t) {
 			$doc = $dms->getDocument($t);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=receipt\">".$doc->getName()."</a></li>";
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
 		}
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
@@ -299,7 +299,7 @@ $(document).ready(function () {
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		foreach($tasks['revision'] as $t) {
 			$doc = $dms->getDocument($t);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revise\">".$doc->getName()."</a></li>";
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revision\">".$doc->getName()."</a></li>";
 		}
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";

From 569fa6273759e8a8a6285a41cb99cea2ad380928 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 10 Dec 2015 10:30:50 +0100
Subject: [PATCH 0353/2006] fix link to receipt or revise a document

---
 views/bootstrap/class.MyDocuments.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 1c2430abe..67002d825 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -388,7 +388,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 						}
 						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
 						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
 						print "<td>".$st["version"]."</td>";
 						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
@@ -425,7 +425,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 						}
 						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
 						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
 						print "<td>".$st["version"]."</td>";
 						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
@@ -504,7 +504,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 						}
 						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
 						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
 						print "<td>".$st["version"]."</td>";
 						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
@@ -541,7 +541,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 						}
 						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
 						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
 						print "<td>".$st["version"]."</td>";
 						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";

From f71ea7eddcdb94be5648c137ec369ee53fcee3be Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Jan 2016 10:10:15 +0100
Subject: [PATCH 0354/2006] do not add js function checkTasks() to footer
 anymore

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 8f1691989..87ef8d1ae 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -379,7 +379,7 @@ $(document).ready(function () {
 				echo "    </li>\n";
 				echo "   </ul>\n";
 				echo "   </div>";
-				$this->addFooterJS('checkTasks();');
+				//$this->addFooterJS('checkTasks();');
 			}
 
 			if($this->params['enableclipboard']) {

From ad41fd2571c5b21466b397993c472ed8344dff9e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Jan 2016 10:10:38 +0100
Subject: [PATCH 0355/2006] fix calling checkTasks()

---
 styles/bootstrap/application.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 501acf461..fd63f1af9 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -721,8 +721,8 @@ $(document).ready(function() {
 		timeOutId = setTimeout(checkTasks, 10000);
 	}
 $(document).ready(function() {
-$("#menu-tasks > ul > li").checkTasks();
+//$("#menu-tasks > ul > li").checkTasks();
+	checkTasks();
 }); 
 
-	//checkTasks();
 

From 14f600da35662073dcc22b71b34a929ed9c6141f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Feb 2016 12:30:51 +0100
Subject: [PATCH 0356/2006] add 'WorkflowByMe' list in getDocumentList()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 70802cc25..bf32ff14e 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -825,6 +825,38 @@ class SeedDMS_Core_DMS {
 				$queryStr = '';
 			}
 			break;
+		case 'WorkflowByMe': // Documents I to trigger in Worklflow
+			$user = $param1;
+			// Get document list for the current user.
+			$workflowStatus = $user->getWorkflowStatus();
+			
+			// Create a comma separated list of all the documentIDs whose information is
+			// required.
+			$dList = array();
+			foreach ($workflowStatus["u"] as $st) {
+				if (!in_array($st["document"], $dList)) {
+					$dList[] = $st["document"];
+				}
+			}
+			foreach ($workflowStatus["g"] as $st) {
+				if (!in_array($st["document"], $dList)) {
+					$dList[] = $st["document"];
+				}
+			}
+			$docCSV = "";
+			foreach ($dList as $d) {
+				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
+			}
+			
+			if (strlen($docCSV)>0) {
+				$queryStr .= 
+							//"AND `tblDocumentStatusLog`.`status` IN (".S_IN_WORKFLOW.", ".S_EXPIRED.") ".
+							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
+							"ORDER BY `statusDate` DESC";
+			} else {
+				$queryStr = '';
+			}
+			break;
 		case 'AppRevOwner': // Documents waiting for review/approval I'm owning
 			$user = $param1;
 			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".

From d62d6f56625783856ab60270d1bdc4c0e1d44f82 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Feb 2016 12:31:17 +0100
Subject: [PATCH 0357/2006] do not use sql but call getDocumentList()

---
 views/bootstrap/class.MyDocuments.php | 53 ++++-----------------------
 1 file changed, 8 insertions(+), 45 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index c821db6f4..b183f89c3 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -336,53 +336,15 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				// Get document list for the current user.
 				$workflowStatus = $user->getWorkflowStatus();
 
-				// Create a comma separated list of all the documentIDs whose information is
-				// required.
-				$dList = array();
-				foreach ($workflowStatus["u"] as $st) {
-					if (!in_array($st["document"], $dList)) {
-						$dList[] = $st["document"];
-					}
+				$resArr = $dms->getDocumentList('WorkflowByMe', $user);
+				if (is_bool($resArr) && !$resArr) {
+					$this->contentHeading(getMLText("warning"));
+					$this->contentContainer(getMLText("internal_error_exit"));
+					$this->htmlEndPage();
+					exit;
 				}
-				foreach ($workflowStatus["g"] as $st) {
-					if (!in_array($st["document"], $dList)) {
-						$dList[] = $st["document"];
-					}
-				}
-				$docCSV = "";
-				foreach ($dList as $d) {
-					$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
-				}
-				
-				if (strlen($docCSV)>0) {
-					// Get the document information.
-					$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-						"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-						"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-						"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-						"FROM `tblDocumentContent` ".
-						"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-						"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-						"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-						"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-						"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-						"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-						"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-						"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-						"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-						"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-						"AND `tblDocumentStatusLog`.`status` IN (".S_IN_WORKFLOW.", ".S_EXPIRED.") ".
-						"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
-						"ORDER BY `statusDate` DESC";
-
-					$resArr = $db->getResultArray($queryStr);
-					if (is_bool($resArr) && !$resArr) {
-						$this->contentHeading(getMLText("warning"));
-						$this->contentContainer(getMLText("internal_error_exit"));
-						$this->htmlEndPage();
-						exit;
-					}
 					
+				if (count($resArr)>0) {
 					// Create an array to hold all of these results, and index the array by
 					// document id. This makes it easier to retrieve document ID information
 					// later on and saves us having to repeatedly poll the database every time
@@ -403,6 +365,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					// List the documents where a review has been requested.
 					$this->contentHeading(getMLText("documents_to_process"));
 					$this->contentContainerStart();
+
 					$printheader=true;
 					$iRev = array();
 					$dList = array();

From db8b5cc033130eb1a385ac64d6ed145ba724c059 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Feb 2016 13:33:56 +0100
Subject: [PATCH 0358/2006] add 'WorkflowOwner' list to getDocumentList()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index bf32ff14e..e6b54e9e8 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -874,6 +874,12 @@ class SeedDMS_Core_DMS {
 			$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ".
 				"ORDER BY `statusDate` DESC";
 			break;
+		case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning
+			$user = $param1;
+			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_IN_WORKFLOW.") ".
+				"ORDER BY `statusDate` DESC";
+			break;
 		case 'MyDocs': // Documents owned by me
 			$user = $param1;
 			$orderby = $param2;

From 6c7648b75a4757b90b42e6f2a26dd2049fb3707c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Feb 2016 13:34:25 +0100
Subject: [PATCH 0359/2006] use getDocumentList() instead of plain sql

---
 views/bootstrap/class.MyDocuments.php | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index b183f89c3..e07d9de0c 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -453,28 +453,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					$this->contentContainerEnd();
 				}
 
-				// Get list of documents owned by current user that are pending review or
-				// pending approval.
-				$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
-					"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
-					"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
-					"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
-					"FROM `tblDocumentContent` ".
-					"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
-					"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-					"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-					"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
-					"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
-					"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
-					"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
-					"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
-					"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-					"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
-					"AND `tblDocuments`.`owner` = '".$user->getID()."' ".
-					"AND `tblDocumentStatusLog`.`status` IN (".S_IN_WORKFLOW.") ".
-					"ORDER BY `statusDate` DESC";
-
-				$resArr = $db->getResultArray($queryStr);
+				$resArr = $dms->getDocumentList('WorkflowOwner', $user);
 				if (is_bool($resArr) && !$resArr) {
 					$this->contentHeading(getMLText("warning"));
 					$this->contentContainer("Internal error. Unable to complete request. Exiting.");

From ee613233db15d3023750e5a02f33ebd7bb796a1a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Feb 2016 11:12:19 +0100
Subject: [PATCH 0360/2006] add missing arguments to printDocumentChooser()

---
 views/bootstrap/class.Bootstrap.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index dd4193420..881c60957 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1052,15 +1052,15 @@ modalDocChooser<?php echo $formName ?> = $('#docChooser<?php echo $formName ?>')
 function documentSelected<?php echo $formName ?>(id, name) {
 	$('#docid<?php echo $formName ?>').val(id);
 	$('#choosedocsearch').val(name);
-	modalDocChooser<?php echo $form ?>.modal('hide');
+	modalDocChooser<?php echo $formName ?>.modal('hide');
 }
-function folderSelected<?php echo $form ?>(id, name) {
+function folderSelected<?php echo $formName ?>(id, name) {
 }
 <?php
 	} /* }}} */
 
-	function printDocumentChooser($formName) { /* {{{ */
-		$this->printDocumentChooserHtml($formName);
+	function printDocumentChooser($formName, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
+		$this->printDocumentChooserHtml($formName, $accessMode, $exclude, $default, $formName, $folder, $partialtree);
 ?>
 		<script language="JavaScript">
 <?php

From 179af0643864e7d0e79e047d30e66a268ed31b78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Feb 2016 11:35:01 +0100
Subject: [PATCH 0361/2006] split printFolderChooser() for home folder into js
 and html

---
 views/bootstrap/class.UsrMgr.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 14353af60..cef71a25a 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -34,6 +34,8 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		$seluser = $this->params['seluser'];
 		$strictformcheck = $this->params['strictformcheck'];
+
+		$this->printFolderChooserJs("form");
 ?>
 function checkForm()
 {
@@ -250,7 +252,7 @@ $(document).ready( function() {
 		</tr>
 		<tr>
 			<td><?php printMLText("home_folder")?>:</td>
-			<td><?php $this->printFolderChooser("form".($currUser ? $currUser->getId() : '0'), M_READ, -1, $currUser ? $dms->getFolder($currUser->getHomeFolder()) : 0, 'homefolder');?></td>
+			<td><?php $this->printFolderChooserHtml("form", M_READ, -1, $currUser ? $dms->getFolder($currUser->getHomeFolder()) : 0, 'homefolder');?></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("quota");?>:</td>

From 39074313693d31310783e88f6052411662c241eb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Feb 2016 11:35:42 +0100
Subject: [PATCH 0362/2006] split printFolderChooser() for library folder into
 js and html part

---
 views/bootstrap/class.Settings.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index acd731fe1..b2b3e1719 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -77,6 +77,7 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 			});
 		});
 <?php
+		$this->printFolderChooserJs("form1");
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -287,7 +288,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_libraryFolder_desc");?>">
         <td><?php printMLText("settings_libraryFolder");?>:</td>
-				<td><?php $this->printFolderChooser("form1", M_READWRITE, -1, $dms->getFolder($settings->_libraryFolder), 'libraryFolder');?></td>
+				<td><?php $this->printFolderChooserHtml("form1", M_READWRITE, -1, $dms->getFolder($settings->_libraryFolder), 'libraryFolder');?></td>
       </tr>
 
       <!--

From 314906adf371d587e99fe4bf1a36a0555e6e172f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 17 Feb 2016 11:56:00 +0100
Subject: [PATCH 0363/2006] fix document chooser

---
 views/bootstrap/class.Bootstrap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index ba092dd7b..c8cef1fc5 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1058,12 +1058,12 @@ function folderSelected<?php echo $formName ?>(id, name) {
 <?php
 	} /* }}} */
 
-	function printDocumentChooser($formName, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
-		$this->printDocumentChooserHtml($formName, $accessMode, $exclude, $default, $formName, $folder, $partialtree);
+	function printDocumentChooser($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
+		$this->printDocumentChooserHtml($form, $accessMode, $exclude, $default, $formname, $folder, $partialtree);
 ?>
 		<script language="JavaScript">
 <?php
-		$this->printDocumentChooserJs($formName);
+		$this->printDocumentChooserJs($form);
 ?>
 		</script>
 <?php

From aa836a8954be798a18572f6a0209d8d838e21e1d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Feb 2016 20:35:56 +0100
Subject: [PATCH 0364/2006] fix syntax error

---
 controllers/class.Download.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index beb5bdfdf..6479b5b3b 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -47,7 +47,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 				$file = $this->params['file'];
 
 				if(!$this->callHook('file')) {
-					if(file_exists($dms->contentDir . $file->getPath()) {
+					if(file_exists($dms->contentDir . $file->getPath())) {
 						header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
 						header("Content-Transfer-Encoding: binary");
 						header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));

From d4e28ec7358cb1c2c299ca1fbb20fc32eddc500d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 19 Feb 2016 08:04:45 +0100
Subject: [PATCH 0365/2006] get timeout from view

---
 views/bootstrap/class.MyDocuments.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 48e251d27..4c9184632 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -40,6 +40,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 		$workflowmode = $this->params['workflowmode'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
 
 		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);

From 0e5e09dbbf1779a0d08c2276994c9f301cfede5b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 19 Feb 2016 08:21:22 +0100
Subject: [PATCH 0366/2006] fix logout if not admin

---
 inc/inc.Authentication.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 3e45929e9..f18d83dc4 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -79,9 +79,9 @@ if (!is_object($user)) {
 	exit;
 }
 
-if($user->isAdmin() || $user->maySwitchToUser($su)) {
-	if($resArr["su"]) {
-		$user = $dms->getUser($resArr["su"]);
+if($resArr["su"] && $su = $dms->getUser($resArr["su"])) {
+	if($user->isAdmin() || $user->maySwitchToUser($su)) {
+		$user = $su;
 	} else {
 		$session->resetSu();
 	}

From 91db603a8926d631a424b56eb57ddef7208a00ca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Feb 2016 14:03:23 +0100
Subject: [PATCH 0367/2006] next version will be 5.1.0

---
 install/{update-6.0.0 => update-5.1.0}/update-sqlite3.sql | 2 +-
 install/{update-6.0.0 => update-5.1.0}/update.sql         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename install/{update-6.0.0 => update-5.1.0}/update-sqlite3.sql (98%)
 rename install/{update-6.0.0 => update-5.1.0}/update.sql (98%)

diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
similarity index 98%
rename from install/update-6.0.0/update-sqlite3.sql
rename to install/update-5.1.0/update-sqlite3.sql
index 10ba0ce4a..3d5af1397 100644
--- a/install/update-6.0.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -73,6 +73,6 @@ CREATE TABLE `tblTransmittalItems` (
   UNIQUE (document, version)
 );
 
-UPDATE tblVersion set major=6, minor=0, subminor=0;
+UPDATE tblVersion set major=5, minor=1, subminor=0;
 
 COMMIT;
diff --git a/install/update-6.0.0/update.sql b/install/update-5.1.0/update.sql
similarity index 98%
rename from install/update-6.0.0/update.sql
rename to install/update-5.1.0/update.sql
index 2639d399a..eb1e541e8 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -94,7 +94,7 @@ CREATE TABLE `tblTransmittalItems` (
   CONSTRAINT `tblTransmittalItem_transmittal` FOREIGN KEY (`transmittal`) REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-UPDATE tblVersion set major=6, minor=0, subminor=0;
+UPDATE tblVersion set major=5, minor=1, subminor=0;
 
 COMMIT;
 

From f41210f2d7ce16674dd6dd18c314f3493154b72a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Feb 2016 14:18:42 +0100
Subject: [PATCH 0368/2006] new version 5.1.0

---
 Makefile                           |  2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 25 ++++++++++++++++++++-----
 inc/inc.Version.php                |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e2a28abb6..af4db7d90 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=5.0.1
+VERSION=5.1.0
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index e6b54e9e8..2590b1cd9 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -368,7 +368,7 @@ class SeedDMS_Core_DMS {
 		$this->classnames['transmittalitem'] = 'SeedDMS_Core_TransmittalItem';
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.0.1';
+			$this->version = '5.1.0';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 53619bbb2..6ddcbd419 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-01-22</date>
+ <date>2016-02-22</date>
  <time>09:28:28</time>
  <version>
-  <release>5.0.0</release>
-  <api>5.0.0</api>
+  <release>5.1.0</release>
+  <api>5.1.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,8 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- classes can be overloaded
-- clean workflow log when a document version was deleted
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -970,5 +968,22 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - SeedDMS_Core_User::getDocumentsLocked() sets locking user propperly
 	 </notes>
   </release>
+  <release>
+   <date>2016-01-22</date>
+   <time>09:28:28</time>
+   <version>
+    <release>5.0.0</release>
+    <api>5.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- classes can be overloaded
+- clean workflow log when a document version was deleted
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index a885948d2..7725e48cc 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.0.1";
+	public $_number = "5.1.0";
 	private $_string = "SeedDMS";
 
 	function SeedDMS_Version() {

From 480aca1c803344ec11c6fb6f79db0a9ab17b7ab5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2016 14:32:55 +0100
Subject: [PATCH 0369/2006] add roles

---
 SeedDMS_Core/Core/inc.ClassDMS.php   |  56 ++++++-
 SeedDMS_Core/Core/inc.ClassGroup.php |   6 +-
 SeedDMS_Core/Core/inc.ClassUser.php  | 220 ++++++++++++++++++++++++++-
 3 files changed, 274 insertions(+), 8 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index e6b54e9e8..923fb1a44 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -363,6 +363,7 @@ class SeedDMS_Core_DMS {
 		$this->classnames['document'] = 'SeedDMS_Core_Document';
 		$this->classnames['documentcontent'] = 'SeedDMS_Core_DocumentContent';
 		$this->classnames['user'] = 'SeedDMS_Core_User';
+		$this->classnames['role'] = 'SeedDMS_Core_Role';
 		$this->classnames['group'] = 'SeedDMS_Core_Group';
 		$this->classnames['transmittal'] = 'SeedDMS_Core_Transmittal';
 		$this->classnames['transmittalitem'] = 'SeedDMS_Core_TransmittalItem';
@@ -1598,7 +1599,9 @@ class SeedDMS_Core_DMS {
 		if (is_object($this->getUserByLogin($login))) {
 			return false;
 		}
-		if($role == '')
+		if(is_object($role))
+			$role = $role->getID();
+		elseif($role == '')
 			$role = '0';
 		if(trim($pwdexpiration) == '')
 			$pwdexpiration = '0000-00-00 00:00:00';
@@ -1662,6 +1665,57 @@ class SeedDMS_Core_DMS {
 		return $this->getGroup($this->db->getInsertID());
 	} /* }}} */
 
+	/**
+	 * Get a role by its id
+	 *
+	 * @param integer $id id of role
+	 * @return object/boolean role or false if no role was found
+	 */
+	function getRole($id) { /* {{{ */
+		$classname = $this->classnames['role'];
+		return $classname::getInstance($id, $this);
+	} /* }}} */
+
+	/**
+	 * Get a role by its name
+	 *
+	 * @param integer $name name of role
+	 * @return object/boolean role or false if no role was found
+	 */
+	function getRoleByName($name) { /* {{{ */
+		$classname = $this->classnames['role'];
+		return $classname::getInstance($name, $this, 'name');
+	} /* }}} */
+
+	/**
+	 * Return list of all roles
+	 *
+	 * @return array of instances of {@link SeedDMS_Core_Role} or false
+	 */
+	function getAllRoles($orderby = '') { /* {{{ */
+		$classname = $this->classnames['role'];
+		return $classname::getAllInstances($orderby, $this);
+	} /* }}} */
+
+	/**
+	 * Create a new role
+	 *
+	 * @param string $name name of role
+	 * @return object/boolean instance of {@link SeedDMS_Core_Role} or false in
+	 *         case of an error.
+	 */
+	function addRole($name, $role) { /* {{{ */
+		if (is_object($this->getRoleByName($name))) {
+			return false;
+		}
+
+		$queryStr = "INSERT INTO tblRoles (name, role) VALUES (".$this->db->qstr($name).", ".$role.")";
+		if (!$this->db->getResult($queryStr))
+			return false;
+
+		return $this->getRole($this->db->getInsertID());
+	} /* }}} */
+
 	/**
 	 * Get a transmittal by its id
 	 *
diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 4e9838412..55f12317f 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -151,9 +151,13 @@ class SeedDMS_Core_Group {
 
 			$this->_users = array();
 
+			$classnamerole = $dms->getClassname('role');
+
 			$classname = $this->_dms->getClassname('user');
 			foreach ($resArr as $row) {
-				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row['hidden']);
+				$role = $classnamerole::getInstance($row['role'], $dms);
+				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $role, $row['hidden']);
+				$user->setDMS($this->_dms);
 				array_push($this->_users, $user);
 			}
 		}
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index bdac68e2c..c157c7d33 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -12,6 +12,202 @@
  * @version    Release: @package_version@
  */
 
+/**
+ * Class to represent a role in the document management system
+ *
+ * @category   DMS
+ * @package    SeedDMS_Core
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Core_Role { /* {{{ */
+	/**
+	 * @var integer id of role
+	 *
+	 * @access protected
+	 */
+	var $_id;
+
+	/**
+	 * @var string name of role
+	 *
+	 * @access protected
+	 */
+	var $_login;
+
+	/**
+	 * @var string role of user. Can be one of SeedDMS_Core_User::role_user,
+	 *      SeedDMS_Core_User::role_admin, SeedDMS_Core_User::role_guest
+	 *
+	 * @access protected
+	 */
+	var $_role;
+
+	/**
+	 * @var object reference to the dms instance this user belongs to
+	 *
+	 * @access protected
+	 */
+	var $_dms;
+
+	const role_user = '0';
+	const role_admin = '1';
+	const role_guest = '2';
+
+	function SeedDMS_Core_Role($id, $name, $role) { /* {{{ */
+		$this->_id = $id;
+		$this->_name = $name;
+		$this->_role = $role;
+		$this->_dms = $role;
+	} /* }}} */
+
+	/**
+	 * Create an instance of a role object
+	 *
+	 * @param string|integer $id Id, login name, or email of user, depending
+	 * on the 3rd parameter.
+	 * @param object $dms instance of dms
+	 * @param string $by search by [name|email]. If 'name' is passed, the method
+	 * will check for the 4th paramater and also filter by email. If this
+	 * parameter is left empty, the user will be search by its Id.
+	 * @param string $email optional email address if searching for name
+	 * @return object instance of class SeedDMS_Core_User
+	 */
+	public static function getInstance($id, $dms, $by='') { /* {{{ */
+		$db = $dms->getDB();
+
+		switch($by) {
+		case 'name':
+			$queryStr = "SELECT * FROM `tblRoles` WHERE `name` = ".$db->qstr($id);
+			break;
+		default:
+			$queryStr = "SELECT * FROM `tblRoles` WHERE id = " . (int) $id;
+		}
+
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false) return false;
+		if (count($resArr) != 1) return false;
+
+		$resArr = $resArr[0];
+
+		$role = new self($resArr["id"], $resArr["name"], $resArr["role"]);
+		$role->setDMS($dms);
+		return $role;
+	} /* }}} */
+
+	public static function getAllInstances($orderby, $dms) { /* {{{ */
+		$db = $dms->getDB();
+
+		if($orderby == 'ame')
+			$queryStr = "SELECT * FROM tblRoles ORDER BY name";
+		else
+			$queryStr = "SELECT * FROM tblRoles ORDER BY id";
+		$resArr = $db->getResultArray($queryStr);
+
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+
+		$roles = array();
+
+		for ($i = 0; $i < count($resArr); $i++) {
+			$role = new self($resArr[$i]["id"], $resArr[$i]["name"], $resArr[$i]["role"]);
+			$role->setDMS($dms);
+			$roles[$i] = $role;
+		}
+
+		return $roles;
+} /* }}} */
+
+	function setDMS($dms) {
+		$this->_dms = $dms;
+	}
+
+	function getID() { return $this->_id; }
+
+	function getName() { return $this->_name; }
+
+	function setName($newName) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "UPDATE tblRoles SET name =".$db->qstr($newName)." WHERE id = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_name = $newName;
+		return true;
+	} /* }}} */
+
+	function isAdmin() { return ($this->_role == SeedDMS_Core_Role::role_admin); }
+
+	function isGuest() { return ($this->_role == SeedDMS_Core_Role::role_guest); }
+
+	function getRole() { return $this->_role; }
+
+	function setRole($newrole) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "UPDATE tblRoles SET role = " . $newrole . " WHERE id = " . $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_role = $newrole;
+		return true;
+	} /* }}} */
+
+	/**
+	 * Delete role
+	 *
+	 * @return boolean true on success or false in case of an error
+	 */
+	function remove($user) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "DELETE FROM tblRoles WHERE id = " . $this->_id;
+		if (!$db->getResult($queryStr)) {
+			return false;
+		}
+
+		return true;
+	} /* }}} */
+
+	function isUsed() { /* {{{ */
+		$db = $this->_dms->getDB();
+		
+		$queryStr = "SELECT * FROM tblUsers WHERE role=".$this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_array($resArr) && count($resArr) == 0)
+			return false;
+		return true;
+	} /* }}} */
+
+	function getUsers() { /* {{{ */
+		$db = $this->_dms->getDB();
+		
+		if (!isset($this->_users)) {
+			$queryStr = "SELECT * FROM tblUsers WHERE role=".$this->_id;
+			$resArr = $db->getResultArray($queryStr);
+			if (is_bool($resArr) && $resArr == false)
+				return false;
+
+			$this->_users = array();
+
+			$classnamerole = $this->_dms->getClassname('role');
+
+			$classname = $this->_dms->getClassname('user');
+			foreach ($resArr as $row) {
+				$role = $classnamerole::getInstance($row['role'], $this->_dms);
+				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $role, $row['hidden']);
+				$user->setDMS($this->_dms);
+				array_push($this->_users, $user);
+			}
+		}
+		return $this->_users;
+	} /* }}} */
+
+} /* }}} */
+
 /**
  * Class to represent a user in the document management system
  *
@@ -203,7 +399,10 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$resArr = $resArr[0];
 
-		$user = new self($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $resArr["role"], $resArr["hidden"], $resArr["disabled"], $resArr["pwdExpiration"], $resArr["loginfailures"], $resArr["quota"], $resArr["homefolder"]);
+		$classname = $dms->getClassname('role');
+		$role = $classname::getInstance($resArr['role'], $dms);
+
+		$user = new self($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $role, $resArr["hidden"], $resArr["disabled"], $resArr["pwdExpiration"], $resArr["loginfailures"], $resArr["quota"], $resArr["homefolder"]);
 		$user->setDMS($dms);
 		return $user;
 	} /* }}} */
@@ -356,7 +555,10 @@ class SeedDMS_Core_User { /* {{{ */
 	function setRole($newrole) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblUsers SET role = " . $newrole . " WHERE id = " . $this->_id;
+		if(is_object($newrole))
+			$queryStr = "UPDATE tblUsers SET role = " . $newrole->getID() . " WHERE id = " . $this->_id;
+		else
+			$queryStr = "UPDATE tblUsers SET role = " . $newrole . " WHERE id = " . $this->_id;
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -364,9 +566,12 @@ class SeedDMS_Core_User { /* {{{ */
 		return true;
 	} /* }}} */
 
-	function isAdmin() { return ($this->_role == SeedDMS_Core_User::role_admin); }
+	function isAdmin() { return (is_object($this->_role) ? $this->_role->isAdmin() : $this->_role == SeedDMS_Core_User::role_admin); }
 
-	function setAdmin($isAdmin) { /* {{{ */
+	/**
+	 * Was never used and is now deprecated
+	 */
+	function _setAdmin($isAdmin) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "UPDATE tblUsers SET role = " . SeedDMS_Core_User::role_admin . " WHERE id = " . $this->_id;
@@ -377,9 +582,12 @@ class SeedDMS_Core_User { /* {{{ */
 		return true;
 	} /* }}} */
 
-	function isGuest() { return ($this->_role == SeedDMS_Core_User::role_guest); }
+	function isGuest() { return (is_object($this->_role) ? $this->_role->isGuest() : $this->_role == SeedDMS_Core_User::role_guest); }
 
-	function setGuest($isGuest) { /* {{{ */
+	/**
+	 * Was never used and is now deprecated
+	 */
+	function _setGuest($isGuest) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "UPDATE tblUsers SET role = " . SeedDMS_Core_User::role_guest . " WHERE id = " . $this->_id;

From 4c3e45ee028f37a9a38075dc46518a46e904a074 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2016 14:34:30 +0100
Subject: [PATCH 0370/2006] add tables and updates for roles

---
 install/create_tables-innodb.sql        | 39 ++++++++++++++++++++-----
 install/create_tables-sqlite3.sql       | 15 +++++++++-
 install/update-5.1.0/update-sqlite3.sql | 38 ++++++++++++++++++++++++
 install/update-5.1.0/update.sql         | 17 +++++++++++
 4 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 72cbdfa6b..4cf60c387 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -50,6 +50,20 @@ CREATE TABLE `tblAttributeDefinitions` (
 -- Table structure for table `tblUsers`
 -- 
 
+CREATE TABLE `tblRoles` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) default NULL,
+  `role` smallint(1) NOT NULL default '0',
+  PRIMARY KEY (`id`),
+  UNIQUE (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblUsers`
+-- 
+
 CREATE TABLE `tblUsers` (
   `id` int(11) NOT NULL auto_increment,
   `login` varchar(50) default NULL,
@@ -59,7 +73,7 @@ CREATE TABLE `tblUsers` (
   `language` varchar(32) NOT NULL,
   `theme` varchar(32) NOT NULL,
   `comment` text NOT NULL,
-  `role` smallint(1) NOT NULL default '0',
+  `role` int(11) NOT NULL,
   `hidden` smallint(1) NOT NULL default '0',
   `pwdExpiration` datetime NOT NULL default '0000-00-00 00:00:00',
   `loginfailures` tinyint(4) NOT NULL default '0',
@@ -67,7 +81,8 @@ CREATE TABLE `tblUsers` (
   `quota` bigint,
   `homefolder` int(11) default NULL,
   PRIMARY KEY (`id`),
-  UNIQUE (`login`)
+  UNIQUE (`login`),
+  CONSTRAINT `tblUsers_role` FOREIGN KEY (`role`) REFERENCES `tblRoles` (`id`),
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -598,7 +613,7 @@ CREATE TABLE `tblSessions` (
   `theme` varchar(30) NOT NULL default '',
   `language` varchar(30) NOT NULL default '',
   `clipboard` text default '',
-	`su` INTEGER DEFAULT NULL,
+  `su` INTEGER DEFAULT NULL,
   `splashmsg` text default '',
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblSessions_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
@@ -821,7 +836,7 @@ CREATE TABLE `tblTransmittals` (
 
 CREATE TABLE `tblTransmittalItems` (
   `id` int(11) NOT NULL auto_increment,
-	`transmittal` int(11) NOT NULL DEFAULT '0',
+  `transmittal` int(11) NOT NULL DEFAULT '0',
   `document` int(11) default NULL,
   `version` smallint(5) unsigned NOT NULL default '0',
   `date` datetime,
@@ -855,8 +870,10 @@ CREATE TABLE `tblCachedAccess` (
 
 CREATE TABLE `tblAros` (
   `id` int(11) NOT NULL auto_increment,
+  `parent` int(11),
   `model` text NOT NULL,
-	`foreignid` int(11) NOT NULL DEFAULT '0',
+  `foreignid` int(11) NOT NULL DEFAULT '0',
+  `alias` varchar(255),
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -868,8 +885,10 @@ CREATE TABLE `tblAros` (
 
 CREATE TABLE `tblAcos` (
   `id` int(11) NOT NULL auto_increment,
+  `parent` int(11),
   `model` text NOT NULL,
-	`foreignid` int(11) NOT NULL DEFAULT '0',
+  `foreignid` int(11) NOT NULL DEFAULT '0',
+  `alias` varchar(255),
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -881,8 +900,12 @@ CREATE TABLE `tblAcos` (
 
 CREATE TABLE `tblArosAcos` (
   `id` int(11) NOT NULL auto_increment,
-	`aro` int(11) NOT NULL DEFAULT '0',
-	`aco` int(11) NOT NULL DEFAULT '0',
+  `aro` int(11) NOT NULL DEFAULT '0',
+  `aco` int(11) NOT NULL DEFAULT '0',
+  `create` tinyint(4) NOT NULL DEFAULT '-1',
+  `read` tinyint(4) NOT NULL DEFAULT '-1',
+  `update` tinyint(4) NOT NULL DEFAULT '-1',
+  `delete` tinyint(4) NOT NULL DEFAULT '-1',
   PRIMARY KEY (`id`),
   UNIQUE (aco, aro),
   CONSTRAINT `tblArosAcos_acos` FOREIGN KEY (`aco`) REFERENCES `tblAcos` (`id`) ON DELETE CASCADE,
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 044aaeaf4..7e3f04ed5 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -47,6 +47,19 @@ CREATE TABLE `tblAttributeDefinitions` (
 -- Table structure for table `tblUsers`
 -- 
 
+CREATE TABLE `tblRoles` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` varchar(50) default NULL,
+  `role` INTEGER NOT NULL default '0',
+  UNIQUE (`name`)
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblUsers`
+-- 
+
 CREATE TABLE `tblUsers` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `login` varchar(50) default NULL,
@@ -56,7 +69,7 @@ CREATE TABLE `tblUsers` (
   `language` varchar(32) NOT NULL,
   `theme` varchar(32) NOT NULL,
   `comment` text NOT NULL,
-  `role` INTEGER NOT NULL default '0',
+  `role` INTEGER NOT NULL REFERENCES `tblRoles` (`id`),
   `hidden` INTEGER NOT NULL default '0',
   `pwdExpiration` TEXT NOT NULL default '0000-00-00 00:00:00',
   `loginfailures` INTEGER NOT NULL default '0',
diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index 3d5af1397..97b68cfe9 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -73,6 +73,44 @@ CREATE TABLE `tblTransmittalItems` (
   UNIQUE (document, version)
 );
 
+CREATE TABLE `tblRoles` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` varchar(50) default NULL,
+  `role` INTEGER NOT NULL default '0',
+  UNIQUE (`name`)
+);
+
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
+
+UPDATE `tblUsers` SET role=3 WHERE role=0;
+
+CREATE TABLE `new_tblUsers` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `login` varchar(50) default NULL,
+  `pwd` varchar(50) default NULL,
+  `fullName` varchar(100) default NULL,
+  `email` varchar(70) default NULL,
+  `language` varchar(32) NOT NULL,
+  `theme` varchar(32) NOT NULL,
+  `comment` text NOT NULL,
+  `role` INTEGER NOT NULL REFERENCES `tblRoles` (`id`),
+  `hidden` INTEGER NOT NULL default '0',
+  `pwdExpiration` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `loginfailures` INTEGER NOT NULL default '0',
+  `disabled` INTEGER NOT NULL default '0',
+  `quota` INTEGER,
+  `homefolder` INTEGER default NULL REFERENCES `tblFolders` (`id`),
+  UNIQUE (`login`)
+);
+
+INSERT INTO new_tblUsers SELECT * FROM tblUsers;
+
+DROP TABLE tblUsers;
+
+ALTER TABLE new_tblUsers RENAME TO tblUsers;
+
 UPDATE tblVersion set major=5, minor=1, subminor=0;
 
 COMMIT;
diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index eb1e541e8..3be9c3814 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -94,6 +94,23 @@ CREATE TABLE `tblTransmittalItems` (
   CONSTRAINT `tblTransmittalItem_transmittal` FOREIGN KEY (`transmittal`) REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `tblRoles` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(50) default NULL,
+  `role` smallint(1) NOT NULL default '0',
+  PRIMARY KEY (`id`),
+  UNIQUE (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
+ALTER TABLE `tblRoles` AUTO_INCREMENT=4;
+
+ALTER TABLE tblUsers CHANGE role role int(11) NOT NULL;
+UPDATE `tblUsers` SET role=3 WHERE role=0;
+ALTER TABLE tblUsers ADD CONSTRAINT `tblUsers_role` FOREIGN KEY (`role`) REFERENCES `tblRoles` (`id`);
+
 UPDATE tblVersion set major=5, minor=1, subminor=0;
 
 COMMIT;

From ee7180ccd3cecefcac2f4d6b92554fdae0d02aee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2016 14:34:58 +0100
Subject: [PATCH 0371/2006] role is now an object of class SeedDMD_Core_Role

---
 op/op.UsrMgr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 9d85e50ab..563c4af64 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -58,7 +58,7 @@ if ($action == "adduser") {
 	$name    = $_POST["name"];
 	$email   = $_POST["email"];
 	$comment = $_POST["comment"];
-	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
+	$role    = $dms->getRole($_POST["role"]);
 	$isHidden = (isset($_POST["ishidden"]) && $_POST["ishidden"]==1 ? 1 : 0);
 	$isDisabled = (isset($_POST["isdisabled"]) && $_POST["isdisabled"]==1 ? 1 : 0);
 	$homefolder = (isset($_POST["homefolder"]) ? $_POST["homefolder"] : 0);
@@ -217,7 +217,7 @@ else if ($action == "edituser") {
 	$name    = $_POST["name"];
 	$email   = $_POST["email"];
 	$comment = $_POST["comment"];
-	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
+	$role    = $dms->getRole($_POST["role"]);
 	$isHidden = (isset($_POST["ishidden"]) && $_POST["ishidden"]==1 ? 1 : 0);
 	$isDisabled = (isset($_POST["isdisabled"]) && $_POST["isdisabled"]==1 ? 1 : 0);
 	$homefolder = (isset($_POST["homefolder"]) ? $_POST["homefolder"] : 0);

From 49be0485c5116f64e96dca0be0d648f173d78416 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2016 14:35:37 +0100
Subject: [PATCH 0372/2006] role is now an instance of SeedDMD_Core_Role

---
 out/out.UsrMgr.php               | 7 ++++++-
 views/bootstrap/class.UsrMgr.php | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php
index a506b2439..0800254ba 100644
--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@@ -40,6 +40,11 @@ if (is_bool($groups)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
 }
 
+$roles = $dms->getAllRoles();
+if (is_bool($roles)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+}
+
 if(isset($_GET['userid']) && $_GET['userid']) {
 	$seluser = $dms->getUser($_GET['userid']);
 } else {
@@ -47,7 +52,7 @@ if(isset($_GET['userid']) && $_GET['userid']) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota, 'strictformcheck'=>$settings->_strictFormCheck));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'allroles'=>$roles, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota, 'strictformcheck'=>$settings->_strictFormCheck));
 if($view) {
 	$view($_GET);
 }
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 344f063a4..10c82afc8 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -157,6 +157,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$users = $this->params['allusers'];
 		$groups = $this->params['allgroups'];
+		$roles = $this->params['allroles'];
 		$passwordstrength = $this->params['passwordstrength'];
 		$passwordexpiration = $this->params['passwordexpiration'];
 		$httproot = $this->params['httproot'];
@@ -240,7 +241,13 @@ $(document).ready( function() {
 		</tr>
 		<tr>
 			<td><?php printMLText("role");?>:</td>
-			<td><select name="role"><option value="<?php echo SeedDMS_Core_User::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_User::role_admin ?>" <?php if($currUser && $currUser->getRole() == SeedDMS_Core_User::role_admin) echo "selected"; ?>><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_User::role_guest ?>" <?php if($currUser && $currUser->getRole() == SeedDMS_Core_User::role_guest) echo "selected"; ?>><?php printMLText("role_guest"); ?></option></select></td>
+			<td><select name="role">
+<?php
+		foreach($roles as $role) {
+			echo '<option value="'.$role->getID().'"'.($currUser && $currUser->getRole()->getID() == $role->getID() ? ' selected' : '').'>'.$role->getName().'</option>';
+		}
+?>
+			</select></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("groups");?>:</td>

From 3d76792239dd7bf8d78622563c57a0404fb6d2df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2016 14:36:59 +0100
Subject: [PATCH 0373/2006] add management of roles

---
 op/op.RoleMgr.php                 | 132 +++++++++++++++++++++
 out/out.RoleMgr.php               |  55 +++++++++
 views/bootstrap/class.RoleMgr.php | 184 ++++++++++++++++++++++++++++++
 3 files changed, 371 insertions(+)
 create mode 100644 op/op.RoleMgr.php
 create mode 100644 out/out.RoleMgr.php
 create mode 100644 views/bootstrap/class.RoleMgr.php

diff --git a/op/op.RoleMgr.php b/op/op.RoleMgr.php
new file mode 100644
index 000000000..73e0656b9
--- /dev/null
+++ b/op/op.RoleMgr.php
@@ -0,0 +1,132 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2012 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassPasswordStrength.php");
+
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+if (isset($_POST["action"])) $action=$_POST["action"];
+else $action=NULL;
+
+// add new role ---------------------------------------------------------
+if ($action == "addrole") {
+	
+	/* Check if the form data comes for a trusted request */
+	if(!checkFormKey('addrole')) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+	}
+
+	$name    = $_POST["name"];
+	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
+
+	if (is_object($dms->getRoleByName($name))) {
+		UI::exitError(getMLText("admin_tools"),getMLText("role_exists"));
+	}
+
+	$newRole = $dms->addRole($name, $role);
+	if ($newRole) {
+	}
+	else UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+	
+	$roleid=$newRole->getID();
+	
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_role')));
+
+	add_log_line(".php&action=addrole&name=".$name);
+}
+
+// delete role ------------------------------------------------------------
+else if ($action == "removerole") {
+
+	/* Check if the form data comes for a trusted request */
+	if(!checkFormKey('removerole')) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+	}
+
+	if (isset($_POST["roleid"])) {
+		$roleid = $_POST["roleid"];
+	}
+
+	if (!isset($roleid) || !is_numeric($roleid) || intval($roleid)<1) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_role_id"));
+	}
+
+	$roleToRemove = $dms->getRole($roleid);
+	if (!is_object($roleToRemove)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_role_id"));
+	}
+
+	if (!$roleToRemove->remove()) {
+		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	}
+		
+	add_log_line(".php&action=removerole&roleid=".$roleid);
+	
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_role')));
+	$roleid=-1;
+}
+
+// modify role ------------------------------------------------------------
+else if ($action == "editrole") {
+
+	/* Check if the form data comes for a trusted request */
+	if(!checkFormKey('editrole')) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+	}
+
+	if (!isset($_POST["roleid"]) || !is_numeric($_POST["roleid"]) || intval($_POST["roleid"])<1) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_role_id"));
+	}
+	
+	$roleid=$_POST["roleid"];
+	$editedRole = $dms->getRole($roleid);
+	
+	if (!is_object($editedRole)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_role_id"));
+	}
+
+	$name    = $_POST["name"];
+	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
+	
+	if ($editedRole->getName() != $name)
+		$editedRole->setName($name);
+	if ($editedRole->getRole() != $role)
+		$editedRole->setRole($role);
+
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_role')));
+	add_log_line(".php&action=editrole&roleid=".$roleid);
+}
+else UI::exitError(getMLText("admin_tools"),getMLText("unknown_command"));
+
+header("Location:../out/out.RoleMgr.php?roleid=".$roleid);
+
+?>
diff --git a/out/out.RoleMgr.php b/out/out.RoleMgr.php
new file mode 100644
index 000000000..76785d81a
--- /dev/null
+++ b/out/out.RoleMgr.php
@@ -0,0 +1,55 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+$users = $dms->getAllUsers($settings->_sortUsersInList);
+if (is_bool($users)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+}
+
+$roles = $dms->getAllRoles();
+if (is_bool($roles)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+}
+
+if(isset($_GET['roleid']) && $_GET['roleid']) {
+	$selrole = $dms->getRole($_GET['roleid']);
+} else {
+	$selrole = null;
+}
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selrole'=>$selrole, 'allusers'=>$users, 'allroles'=>$roles));
+if($view) {
+	$view($_GET);
+}
+
+?>
diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
new file mode 100644
index 000000000..6065c7802
--- /dev/null
+++ b/views/bootstrap/class.RoleMgr.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Implementation of RoleMgr view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for RoleMgr view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_RoleMgr extends SeedDMS_Bootstrap_Style {
+
+	function js() { /* {{{ */
+		$selrole = $this->params['selrole'];
+
+		header('Content-Type: application/javascript');
+?>
+function checkForm()
+{
+	msg = new Array();
+
+	if($("#name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+	if (msg != "") {
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+
+$(document).ready( function() {
+	$('body').on('submit', '#form', function(ev){
+		if(checkForm()) return;
+		event.preventDefault();
+	});
+	$( "#selector" ).change(function() {
+		$('div.ajax').trigger('update', {roleid: $(this).val()});
+	});
+});
+<?php
+	} /* }}} */
+
+	function info() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$selrole = $this->params['selrole'];
+		$settings = $this->params['settings'];
+
+		if($selrole) {
+			$this->contentHeading(getMLText("role_info"));
+			$users = $selrole->getUsers();
+			echo "<table class=\"table table-condensed\">\n";
+			foreach($users as $cuser) {
+				echo "<tr><td>".htmlspecialchars($cuser->getFullName())."</td><td></td></tr>\n";
+			}
+			echo "</table>";
+		}
+	} /* }}} */
+
+	function form() { /* {{{ */
+		$selrole = $this->params['selrole'];
+
+		$this->showRoleForm($selrole);
+	} /* }}} */
+
+	function showRoleForm($currRole) { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$roles = $this->params['allroles'];
+
+		if($currRole && !$currRole->isUsed()) {
+?>
+			<form style="display: inline-block;" method="post" action="../op/op.RoleMgr.php" >
+				<?php echo createHiddenFieldWithKey('removerole'); ?>
+				<input type="hidden" name="roleid" value="<?php echo $currRole->getID()?>">
+				<input type="hidden" name="action" value="removerole">
+				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_role")?></button>
+			</form>
+<?php
+		}
+?>
+	<form action="../op/op.RoleMgr.php" method="post" enctype="multipart/form-data" name="form" id="form">
+<?php
+		if($currRole) {
+			echo createHiddenFieldWithKey('editrole');
+?>
+	<input type="hidden" name="roleid" id="roleid" value="<?php print $currRole->getID();?>">
+	<input type="hidden" name="action" value="editrole">
+<?php
+		} else {
+			echo createHiddenFieldWithKey('addrole');
+?>
+	<input type="hidden" id="roleid" value="0">
+	<input type="hidden" name="action" value="addrole">
+<?php
+		}
+?>
+	<table class="table-condensed">
+		<tr>
+			<td><?php printMLText("role_name");?>:</td>
+			<td><input type="text" name="name" id="name" value="<?php print $currRole ? htmlspecialchars($currRole->getName()) : "";?>"></td>
+		</tr>
+		<tr>
+			<td><?php printMLText("role");?>:</td>
+			<td><select name="role"><option value="<?php echo SeedDMS_Core_Role::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_admin ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_admin) echo "selected"; ?>><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_guest ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_guest) echo "selected"; ?>><?php printMLText("role_guest"); ?></option></select></td>
+		</tr>
+		<tr>
+			<td></td>
+			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText($currRole ? "save" : "add_role")?></button></td>
+		</tr>
+	</table>
+	</form>
+<?php
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$selrole = $this->params['selrole'];
+		$roles = $this->params['allroles'];
+
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+
+		$this->contentHeading(getMLText("role_management"));
+?>
+<div class="row-fluid">
+<div class="span4">
+<div class="well">
+<?php echo getMLText("selection")?>:
+<select class="chzn-select" id="selector">
+<option value="-1"><?php echo getMLText("choose_role")?>
+<option value="0"><?php echo getMLText("add_role")?>
+<?php
+		foreach ($roles as $currRole) {
+			print "<option value=\"".$currRole->getID()."\" ".($selrole && $currRole->getID()==$selrole->getID() ? 'selected' : '').">" . htmlspecialchars($currRole->getName());
+		}
+?>
+</select>
+</div>
+<div class="ajax" data-view="RoleMgr" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
+</div>
+
+<div class="span8">
+	<div class="well">
+		<div class="ajax" data-view="RoleMgr" data-action="form" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
+	</div>
+</div>
+
+<?php
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From fb95d8f5edafbbb9084a53e7116872f684366772 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2016 14:37:49 +0100
Subject: [PATCH 0374/2006] add class to handle access controll

---
 inc/inc.ClassAcl.php | 246 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 246 insertions(+)
 create mode 100644 inc/inc.ClassAcl.php

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
new file mode 100644
index 000000000..4b25eec60
--- /dev/null
+++ b/inc/inc.ClassAcl.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * Implementation of a access control list.
+ *
+ * SeedDMS uses access control list for setting permission,
+ * on various operations.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class to represent an access request object
+ *
+ * This class provides a model for access request objects.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Acl {
+	/**
+	 * @var object $dms reference to dms object.
+	 * @access protected
+	 */
+	protected $dms;
+
+	/**
+	 * Create a new instance of an acl
+	 *
+	 * @param object $dms object of dms
+	 * @return object instance of SeedDMS_Acl
+	 */
+	function __construct($dms) { /* {{{ */
+		$this->dmѕ = $dms;
+	} /* }}} */
+
+	public function check($aro, $aco) { /* {{{ */
+		$db = $dms->getDB();
+		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr) != 1)
+			return false;
+		$resArr = $resArr[0];
+		return($resArr['read'] == 1 ? true : false);
+
+	} /* }}} */
+}
+
+/**
+ * Class to represent an access request/controll object
+ *
+ * This class provides a model for access request/controll objects.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_AroAco { /* {{{ */
+	/**
+	 * @var object $dms reference to dms object.
+	 * @access protected
+	 */
+	protected $dms;
+
+	/**
+	 * @var integer id of access request object
+	 */
+	protected $_id;
+
+	/**
+	 * @var string alias of access request object
+	 */
+	protected $_alias;
+
+	/**
+	 * @var object object of access request object
+	 */
+	protected $_object;
+
+	/**
+	 * Create a new instance of an aro
+	 *
+	 * @param object $dms object of dms
+	 * @return object instance of SeedDMS_Aco
+	 */
+	function __construct($dms, $id, $object, $alias) { /* {{{ */
+		$this->dmѕ = $dms;
+		$this->_id = $id;
+		$this->_object = $object;
+		$this->_alias = $alias;
+	} /* }}} */
+
+	public function ѕetDMS($dms) { /* {{{ */
+		$this->dms = $dms;
+	} /* }}} */
+
+	public function getID() { /* {{{ */
+		return $this->_id;
+	} /* }}} */
+
+	public function getAlias() { /* {{{ */
+		return $this->_alias;
+	} /* }}} */
+
+	public function getObject() { /* {{{ */
+		return $this->_object;
+	} /* }}} */
+} /* }}} */
+
+/**
+ * Class to represent an access request object
+ *
+ * This class provides a model for access request objects.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
+
+	/**
+	 * Create a new instance of an aro
+	 *
+	 * @param object $dms object to access the underlying database
+	 * @return object instance of SeedDMS_Aro
+	 */
+	function __construct($dms, $id, $object, $alias) { /* {{{ */
+		parent::__construct($dms, $id, $object, $alias);
+	} /* }}} */
+
+	public static function getInstance($id, $dms) { /* {{{ */
+		$db = $dms->getDB();
+		if(is_int($id)) {
+			$queryStr = "SELECT * FROM tblAros WHERE id = " . (int) $id;
+			$resArr = $db->getResultArray($queryStr);
+			if (is_bool($resArr) && $resArr == false)
+				return null;
+			if (count($resArr) != 1)
+				return null;
+			$resArr = $resArr[0];
+		} elseif(is_object($id)) {
+			if($dms->getClassname('role') == get_class($id)) {
+				$model = 'Role';
+				$queryStr = "SELECT * FROM tblAros WHERE model=".$model." AND foreignid=".$id->getID();
+				$resArr = $db->getResultArray($queryStr);
+				if (is_bool($resArr) && $resArr == false)
+					return null;
+				if (count($resArr) != 1)
+					return null;
+				$parentid = $resArr[0]['parent'];
+			} else {
+				return null;
+			}
+		}
+
+		if($resArr['model'] == 'Group') {
+			$classname = $dms->getClassname('group');
+			$object = $classname::getInstance($resArr['foreignid'], $dms);
+		} else {
+			$object = null;
+		}
+
+		$aro = new self($dms, $resArr["id"], $object, $resArr['alias']);
+		return $aro;
+	} /* }}} */
+
+} /* }}} */
+
+/**
+ * Class to represent an access control object
+ *
+ * This class provides a model for access control objects.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
+
+	/**
+	 * Create a new instance of an aco
+	 *
+	 * @param object $dms object to access the underlying database
+	 * @return object instance of SeedDMS_Aco
+	 */
+	function __construct($dms, $id, $object, $alias) { /* {{{ */
+		parent::__construct($dms, $id, $object, $alias);
+	} /* }}} */
+
+	public static function getInstance($id, $dms) { /* {{{ */
+		$db = $dms->getDB();
+		if(is_int($id)) {
+			$queryStr = "SELECT * FROM tblAcos WHERE id = " . (int) $id;
+			$resArr = $db->getResultArray($queryStr);
+			if (is_bool($resArr) && $resArr == false)
+				return null;
+			if (count($resArr) != 1)
+				return null;
+			$resArr = $resArr[0];
+		} elseif(is_string($id)) {
+			$tmp = explode('/', $id);
+			$parentid = 0;
+			foreach($tmp as $part) {
+				$queryStr = "SELECT * FROM tblAcos WHERE alias = " . $db->qstr($part);
+				if($parentid)
+					$queryStr .= " AND parent=".$parentid;
+				$resArr = $db->getResultArray($queryStr);
+				if (is_bool($resArr) && $resArr == false)
+					return null;
+				if (count($resArr) != 1)
+					return null;
+				$parentid = $resArr[0]['parent'];
+			}
+			$resArr = $resArr[0];
+		}
+
+		if($resArr['model'] == 'Document') {
+			$classname = $dms->getClassname('document');
+			$object = $classname::getInstance($resArr['foreignid'], $dms);
+		} elseif($resArr['model'] == 'Folder') {
+			$classname = $dms->getClassname('focument');
+			$object = $classname::getInstance($resArr['foreignid'], $dms);
+		} else {
+			$object = null;
+		}
+
+		$aco = new self($dms, $resArr["id"], $object, $resArr['alias']);
+		return $aco;
+	} /* }}} */
+} /* }}} */

From e759b44d37bcd6866578f22c0f8701ae14b75888 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2016 14:38:28 +0100
Subject: [PATCH 0375/2006] include inc.ClassAcl.php

---
 out/out.ViewFolder.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index a701a1fd9..008788dcb 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -26,6 +26,7 @@ include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAcl.php");
 
 /**
  * Include class to preview documents
@@ -35,6 +36,9 @@ require_once("SeedDMS/Preview.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 
+//$aro = SeedDMS_Aro::getInstance($user->getRole(), $dms);
+//$aco = SeedDMS_Aco::getInstance('Views/'.$tmp[1], $dms);
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	$folderid = $settings->_rootFolderID;
 }

From 489f464163650df6b129b35cb7529832f0db96e3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2016 14:44:58 +0100
Subject: [PATCH 0376/2006] add link to role management in menu

---
 views/bootstrap/class.Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c8cef1fc5..08ee4fa46 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -665,6 +665,7 @@ $(document).ready(function () {
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("user_group_management")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		echo "      <li><a href=\"../out/out.UsrMgr.php\">".getMLText("user_management")."</a></li>\n";
+		echo "      <li><a href=\"../out/out.RoleMgr.php\">".getMLText("role_management")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.GroupMgr.php\">".getMLText("group_management")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.UserList.php\">".getMLText("user_list")."</a></li>\n";
 		echo "     </ul>\n";

From fcd4b237105a8a7a81107db5075a20e2883b4544 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2016 14:58:27 +0100
Subject: [PATCH 0377/2006] add button for role management

---
 views/bootstrap/class.AdminTools.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php
index d1f42b1fc..91fb20d24 100644
--- a/views/bootstrap/class.AdminTools.php
+++ b/views/bootstrap/class.AdminTools.php
@@ -48,6 +48,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	<div class="row-fluid">
 		<a href="../out/out.UsrMgr.php" class="span3 btn btn-medium"><i class="icon-user"></i><br /><?php echo getMLText("user_management")?></a>
 		<a href="../out/out.GroupMgr.php" class="span3 btn btn-medium"><i class="icon-group"></i><br /><?php echo getMLText("group_management")?></a>
+		<a href="../out/out.RoleMgr.php" class="span3 btn btn-medium"><i class="icon-bullseye"></i><br /><?php echo getMLText("role_management")?></a>
 	</div>
 	<div class="row-fluid">
 		<a href="../out/out.BackupTools.php" class="span3 btn btn-medium"><i class="icon-hdd"></i><br /><?php echo getMLText("backup_tools")?></a>

From 72ce140895260f963eb6907c63f441faaf340b55 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Feb 2016 10:16:40 +0100
Subject: [PATCH 0378/2006] fix creation of aro

---
 inc/inc.ClassAcl.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index 4b25eec60..2f7ea5e7c 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -155,20 +155,21 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 		} elseif(is_object($id)) {
 			if($dms->getClassname('role') == get_class($id)) {
 				$model = 'Role';
-				$queryStr = "SELECT * FROM tblAros WHERE model=".$model." AND foreignid=".$id->getID();
+				$queryStr = "SELECT * FROM tblAros WHERE model=".$db->qstr($model)." AND foreignid=".$id->getID();
 				$resArr = $db->getResultArray($queryStr);
 				if (is_bool($resArr) && $resArr == false)
 					return null;
 				if (count($resArr) != 1)
 					return null;
 				$parentid = $resArr[0]['parent'];
+				$resArr = $resArr[0];
 			} else {
 				return null;
 			}
 		}
 
-		if($resArr['model'] == 'Group') {
-			$classname = $dms->getClassname('group');
+		if($resArr['model'] == 'Role') {
+			$classname = $dms->getClassname('role');
 			$object = $classname::getInstance($resArr['foreignid'], $dms);
 		} else {
 			$object = null;

From 3b18b4398c12fec76520ceb9fbd073824c8e351d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Feb 2016 10:33:41 +0100
Subject: [PATCH 0379/2006] fix name of view parameter previewwidthdetail

---
 out/out.DocumentVersionDetail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index a23cd6cfb..948495549 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -70,7 +70,7 @@ $folder = $document->getFolder();
 $accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewwidthdetail'=>$settings->_previewWidthDetail, 'previewconverters'=>$settings->_converters['preview'], 'cachedir'=>$settings->_cacheDir, 'timeout'=>$settings->_cmdTimeout));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewWidthDetail'=>$settings->_previewWidthDetail, 'previewconverters'=>$settings->_converters['preview'], 'cachedir'=>$settings->_cacheDir, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->show();

From 7099dc6d734ce2e5aad7719ab87af0da0707b847 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Feb 2016 10:43:14 +0100
Subject: [PATCH 0380/2006] set $openfilterdlg before accordion for export

---
 views/bootstrap/class.Search.php | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index fc32f5e47..b31a2bc76 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -213,6 +213,27 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerEnd();
 // }}}
 ?>
+<?php
+		/* First check if any of the folder filters are set. If it is,
+		 * open the accordion.
+		 */
+		$openfilterdlg = false;
+		if($attrdefs) {
+			foreach($attrdefs as $attrdef) {
+				$attricon = '';
+				if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) {
+					if(!empty($attributes[$attrdef->getID()]))
+						$openfilterdlg = true;
+				}
+			}
+		}
+		if($categories)
+			$openfilterdlg = true;
+		if($status)
+			$openfilterdlg = true;
+		if($expirationdate)
+			$openfilterdlg = true;
+?>
 <?php if($totaldocs): ?>
 <div class="accordion" id="accordion1">
   <div class="accordion-group">
@@ -244,27 +265,6 @@ $(document).ready( function() {
   </div>
 </div>
 <?php endif; ?>
-<?php
-		/* First check if any of the folder filters are set. If it is,
-		 * open the accordion.
-		 */
-		$openfilterdlg = false;
-		if($attrdefs) {
-			foreach($attrdefs as $attrdef) {
-				$attricon = '';
-				if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document || $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) {
-					if(!empty($attributes[$attrdef->getID()]))
-						$openfilterdlg = true;
-				}
-			}
-		}
-		if($categories)
-			$openfilterdlg = true;
-		if($status)
-			$openfilterdlg = true;
-		if($expirationdate)
-			$openfilterdlg = true;
-?>
 <div class="accordion" id="accordion2">
   <div class="accordion-group">
     <div class="accordion-heading">

From 920d850915aca781d21570716c02e089d41f90b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 27 Feb 2016 08:44:20 +0100
Subject: [PATCH 0381/2006] set format of date fields

---
 inc/inc.ClassDownloadMgr.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index cfc2e02e2..7589f3f6b 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -107,7 +107,8 @@ class SeedDMS_Download_Mgr {
 					}
 					$tcol = $col;
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, $reqName);
-					$sheet->setCellValueByColumnAndRow($tcol++, $l, ($r['status']==1 || $r['status']==-1) ? $r['date'] : "");
+					$sheet->setCellValueByColumnAndRow($tcol, $l, ($r['status']==1 || $r['status']==-1) ? PHPExcel_Shared_Date::PHPToExcel(makeTsFromLongDate($r['date'])) : "");
+					$sheet->getStyleByColumnAndRow($tcol++, $l)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22);
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, $r['comment']);
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, getReviewStatusText($r["status"]));
 					$l++;
@@ -137,7 +138,8 @@ class SeedDMS_Download_Mgr {
 					}
 					$tcol = $col;
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, $reqName);
-					$sheet->setCellValueByColumnAndRow($tcol++, $k, ($r['status']==1 || $r['status']==-1) ?$r['date'] : "");
+					$sheet->setCellValueByColumnAndRow($tcol, $k, ($r['status']==1 || $r['status']==-1) ?PHPExcel_Shared_Date::PHPToExcel(makeTsFromLongDate($r['date'])) : "");
+					$sheet->getStyleByColumnAndRow($tcol++, $k)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22);
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, $r['comment']);
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, getApprovalStatusText($r["status"]));
 					$k++;

From a213a6a0cdbde9b637e8a5849a3271ffe436fb02 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Feb 2016 08:31:19 +0100
Subject: [PATCH 0382/2006] various new methods

---
 inc/inc.ClassAcl.php | 68 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index 2f7ea5e7c..c3727f97a 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -28,7 +28,7 @@
 class SeedDMS_Acl {
 	/**
 	 * @var object $dms reference to dms object.
-	 * @access protected
+	 * @access public
 	 */
 	protected $dms;
 
@@ -72,7 +72,7 @@ class SeedDMS_AroAco { /* {{{ */
 	 * @var object $dms reference to dms object.
 	 * @access protected
 	 */
-	protected $dms;
+	public $dms;
 
 	/**
 	 * @var integer id of access request object
@@ -102,10 +102,14 @@ class SeedDMS_AroAco { /* {{{ */
 		$this->_alias = $alias;
 	} /* }}} */
 
-	public function ѕetDMS($dms) { /* {{{ */
+	public function setDMS($dms) { /* {{{ */
 		$this->dms = $dms;
 	} /* }}} */
 
+	public function getDMS() { /* {{{ */
+		return($this->dms);
+	} /* }}} */
+
 	public function getID() { /* {{{ */
 		return $this->_id;
 	} /* }}} */
@@ -200,9 +204,9 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 	 * @param object $dms object to access the underlying database
 	 * @return object instance of SeedDMS_Aco
 	 */
-	function __construct($dms, $id, $object, $alias) { /* {{{ */
-		parent::__construct($dms, $id, $object, $alias);
-	} /* }}} */
+//	function __construct($dms, $id, $object, $alias) { /* {{{ */
+//		parent::__construct($dms, $id, $object, $alias);
+//	} /* }}} */
 
 	public static function getInstance($id, $dms) { /* {{{ */
 		$db = $dms->getDB();
@@ -241,7 +245,57 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 			$object = null;
 		}
 
-		$aco = new self($dms, $resArr["id"], $object, $resArr['alias']);
+		$aco = new SeedDMS_Aco($dms, $resArr["id"], $object, $resArr['alias']);
+		$aco->setDMS($dms);
 		return $aco;
 	} /* }}} */
+
+	public function getChildren() { /* {{{ */
+		$dms = $this->getDMS();
+		$db = $dms->getDB();
+		$queryStr = "SELECT * FROM tblAcos WHERE parent = " . $this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return null;
+		if (count($resArr) != 1)
+			return null;
+
+		$acos = array();
+		foreach($resArr as $row) {
+			$aco = new SeedDMS_Aco($this->dms, $row["id"], null, $row['alias']);
+			$aco->setDMS($dms);
+			$acos[] = $aco;
+		}
+		return $acos;
+	} /* }}} */
+
+	public function getPermission($aro) { /* {{{ */
+		$dms = $this->getDMS();
+		$db = $dms->getDB();
+		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr) != 1)
+			return 0;
+		return $resArr[0]['read'];
+	} /* }}} */
+
+	public static function getRoot($dms) { /* {{{ */
+		$db = $dms->getDB();
+		$queryStr = "SELECT * FROM tblAcos WHERE parent IS NULL";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return null;
+		if (count($resArr) != 1)
+			return null;
+
+		$acos = array();
+		foreach($resArr as $row) {
+			$aco = new SeedDMS_Aco($dms, $row["id"], null, $row['alias']);
+			$aco->setDMS($dms);
+			$acos[] = $aco;
+		}
+		return $acos;
+	} /* }}} */
 } /* }}} */

From 677534c8ecb9a18d32dc424a7dd14d148e32a392 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Feb 2016 11:18:55 +0100
Subject: [PATCH 0383/2006] add files for managing access control lists

---
 out/out.Acl.php               |  49 ++++++++
 views/bootstrap/class.Acl.php | 211 ++++++++++++++++++++++++++++++++++
 2 files changed, 260 insertions(+)
 create mode 100644 out/out.Acl.php
 create mode 100644 views/bootstrap/class.Acl.php

diff --git a/out/out.Acl.php b/out/out.Acl.php
new file mode 100644
index 000000000..1075b4bbd
--- /dev/null
+++ b/out/out.Acl.php
@@ -0,0 +1,49 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAcl.php");
+include("../inc/inc.Authentication.php");
+
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+$roles = $dms->getAllRoles();
+if (is_bool($roles)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+}
+
+if(isset($_GET['roleid']) && $_GET['roleid']) {
+	$selrole = $dms->getRole($_GET['roleid']);
+} else {
+	$selrole = null;
+}
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings, 'selrole'=>$selrole, 'allroles'=>$roles));
+if($view) {
+	$view($_GET);
+	exit;
+}
+
diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
new file mode 100644
index 000000000..5df491219
--- /dev/null
+++ b/views/bootstrap/class.Acl.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Implementation of Acl view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for Acl view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_Acl extends SeedDMS_Bootstrap_Style {
+
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+?>
+$('#acostree').tree({
+	openedIcon: '<i class="icon-minus-sign"></i>',
+	closedIcon: '<i class="icon-plus-sign"></i>',
+	onCreateLi: function(node, $li) {
+		switch(node.permission) {
+			case "-1":
+				$li.find('.jqtree-element').after('<span class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
+				$li.attr('style', 'background-color:#FDD');
+				break;
+			case "1":
+				$li.find('.jqtree-element').after('<span class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
+				$li.attr('style', 'background-color:#DFD');
+				break;
+			default:
+				$li.find('.jqtree-element').after('<span class="jqtree-add-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-plus-sign"></i></span>');
+		}
+ }
+});
+$('#acostree').on('click', '.jqtree-toggle-permission', function(event) {
+	acoid = $(event.target).parent().attr('data-acoid');
+	aroid = $(event.target).parent().attr('data-aroid');
+	$.ajax('out.Acl.php?action=add_permission&acoid='+acoid+'&aroid='+aroid, {
+		dataType: 'json',
+		success: function(data, textStatus) {
+			if(data.type == 'success')  {
+				timeout = 1500;
+				$('#acostree').tree('loadDataFromUrl');
+			} else {
+				timeout = 3500;
+			}
+			noty({text: data.msg, type: data.type, dismissQueue: true, layout: 'topRight', theme: 'defaultTheme', timeout: timeout});
+		},
+	});
+});
+
+$('#acostree').on('click', '.jqtree-add-permission', function(event) {
+	acoid = $(event.target).parent().attr('data-acoid');
+	aroid = $(event.target).parent().attr('data-aroid');
+	$.ajax('out.Acl.php?action=add_permission&acoid='+acoid+'&aroid='+aroid, {
+		dataType: 'json',
+		success: function(data, textStatus) {
+			if(data.type == 'success')  {
+				timeout = 1500;
+				$('#acostree').tree('loadDataFromUrl');
+			} else {
+				timeout = 3500;
+			}
+			noty({text: data.msg, type: data.type, dismissQueue: true, layout: 'topRight', theme: 'defaultTheme', timeout: timeout});
+		},
+	});
+});
+
+$('#acostree').on('click', '.jqtree-remove-permission', function(event) {
+	acoid = $(event.currentTarget).attr('data-acoid');
+	aroid = $(event.currentTarget).attr('data-aroid');
+	$.ajax('out.Acl.php?action=remove_permission&acoid='+acoid+'&aroid='+aroid, {
+		dataType: 'json',
+		success: function(data, textStatus) {
+			if(data.type == 'success')  {
+				timeout = 1500;
+				$('#acostree').tree('loadDataFromUrl');
+			} else {
+				timeout = 3500;
+			}
+			noty({text: data.msg, type: data.type, dismissQueue: true, layout: 'topRight', theme: 'defaultTheme', timeout: timeout});
+		},
+	});
+});
+
+$(document).ready( function() {
+	$( "#selector" ).change(function() {
+//		window.location='out.Acl.php?action=show&roleid=' + $(this).val();
+//		$('#acostree').tree({dataUrl: 'out.Acl.php?action=tree&roleid=' + $(this).val()});
+	});
+});
+<?php
+	} /* }}} */
+
+	/**
+	 * Show tree of acos
+	 *
+	 */
+	private function _tree($aro=null, $aco=null) { /* {{{ */
+		$children = array();
+		$tchildren = $aco->getChildren();
+		if($tchildren) {
+			foreach($tchildren as $child) {
+				$node = array();
+				if(false === ($perm = $child->getPermission($aro)))
+					$node['permission'] = 0;
+				else
+					$node['permission'] = $perm;
+				$node['id'] = $child->getID();
+				$node['label'] = $child->getAlias();
+				$node['acoid'] = $child->getID();
+				$node['aroid'] = $aro->getID();
+
+				$nchildren = $this->_tree($aro, $child);
+				if($nchildren) {
+					$node['is_folder'] = true;
+					$node['children'] = $nchildren;
+				}
+				$children[] = $node;
+			}
+		}
+		return $children;
+	} /* }}} */
+
+	/**
+	 * List all registered hooks
+	 *
+	 */
+	public function tree() { /* {{{ */
+		$dms = $this->params['dms'];
+		$selrole = $this->params['selrole'];
+
+		$result = array();
+		if($selrole) {
+			$aro = SeedDMS_Aro::getInstance($selrole, $dms);
+
+			$acos = SeedDMS_Aco::getRoot($dms);
+			foreach($acos as $aco) {
+				if(false === ($perm = $aco->getPermission($aro)))
+					$tree['permission'] = 0;
+				else
+					$tree['permission'] = $perm;
+				$tree['id'] = $aco->getID();
+				$tree['label'] = $aco->getAlias();
+				$node['acoid'] = $aco->getID();
+				$node['aroid'] = $aro->getID();
+				$tree['is_folder'] = true;
+				$tree['children'] = $this->_tree($aro, $aco);
+				$result[] = $tree;
+			}
+		}
+		echo json_encode($result);
+	} /* }}} */
+
+	public function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$roles = $this->params['allroles'];
+		$selrole = $this->params['selrole'];
+
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+?>
+<div class="row-fluid">
+<div class="span4">
+<?php
+		$this->contentHeading("Role");
+?>
+<select class="chzn-select" id="selector">
+	<option value="-1"><?php echo getMLText("choose_role")?>
+<?php
+		foreach ($roles as $currRole) {
+			print "<option value=\"".$currRole->getID()."\" ".($selrole && $currRole->getID()==$selrole->getID() ? 'selected' : '').">" . htmlspecialchars($currRole->getName());
+		}
+?>
+</select>
+</div>
+
+<div class="span8">
+<?php
+		$this->contentHeading("Acl");
+?>
+	<div id="acostree" data-url="out.Acl.php?action=tree&roleid=<?= ($selrole ? $selrole->getID() : 0) ?>">Berechtigungen werden geladen ...</div>
+</div>
+</div>
+<?php
+		$this->htmlEndPage();
+	} /* }}} */
+}
+
+

From b19f306bbff383322d34b762d2a1ee81181f9b06 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Feb 2016 14:07:20 +0100
Subject: [PATCH 0384/2006] add more methods

---
 inc/inc.ClassAcl.php | 59 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index c3727f97a..98982fefb 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -25,12 +25,12 @@
  * @copyright  2016 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_Acl {
+class SeedDMS_Acl { /* {{{ */
 	/**
 	 * @var object $dms reference to dms object.
 	 * @access public
 	 */
-	protected $dms;
+	public $_dms;
 
 	/**
 	 * Create a new instance of an acl
@@ -38,12 +38,12 @@ class SeedDMS_Acl {
 	 * @param object $dms object of dms
 	 * @return object instance of SeedDMS_Acl
 	 */
-	function __construct($dms) { /* {{{ */
-		$this->dmѕ = $dms;
+	public function __construct($dms) { /* {{{ */
+		$this->_dms = $dms;
 	} /* }}} */
 
 	public function check($aro, $aco) { /* {{{ */
-		$db = $dms->getDB();
+		$db = $this->_dms->getDB();
 		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
@@ -52,9 +52,56 @@ class SeedDMS_Acl {
 			return false;
 		$resArr = $resArr[0];
 		return($resArr['read'] == 1 ? true : false);
+	} /* }}} */
+
+	public function toggle($aro, $aco) { /* {{{ */
+		$db = $this->_dms->getDB();
+		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr) != 1)
+			return false;
+		$resArr = $resArr[0];
+
+		$newperm = $resArr['read'] == 1 ? -1 : 1;
+		$queryStr = "UPDATE tblArosAcos SET `read`=".$newperm." WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+		if (!$db->getResult($queryStr))
+			return false;
+		return true;
 
 	} /* }}} */
-}
+
+	public function add($aro, $aco, $perm=-1) { /* {{{ */
+		$db = $this->_dms->getDB();
+		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr) == 1) {
+			$resArr = $resArr[0];
+
+			$newperm = $resArr['read'] == 1 ? -1 : 1;
+			$queryStr = "UPDATE tblArosAcos SET `read`=".$newperm." WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+			if (!$db->getResult($queryStr))
+				return false;
+		} else {
+			$queryStr = "INSERT INTO tblArosAcos (`aro`, `aco`, `read`) VALUES (".$aro->getID().", ".$aco->getID().", ".$perm.")";
+			if (!$db->getResult($queryStr))
+				return false;
+		}
+		return true;
+
+	} /* }}} */
+
+	public function remove($aro, $aco) { /* {{{ */
+		$db = $this->_dms->getDB();
+		$queryStr = "DELETE FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+		if (!$db->getResult($queryStr))
+			return false;
+		return true;
+	} /* }}} */
+} /* }}} */
 
 /**
  * Class to represent an access request/controll object

From a8d615071e9c75a995d87ff82e8e116dc34f2c6f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Feb 2016 14:07:44 +0100
Subject: [PATCH 0385/2006] minor style changes, set propper url to modify
 permissions

---
 views/bootstrap/class.Acl.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index 5df491219..cf2b80f09 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -30,30 +30,33 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_Acl extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		$selrole = $this->params['selrole'];
 		header('Content-Type: application/javascript');
 ?>
 $('#acostree').tree({
+	autoOpen: 0,
+	saveState: 'acostree<?php echo $selrole->getID(); ?>',
 	openedIcon: '<i class="icon-minus-sign"></i>',
 	closedIcon: '<i class="icon-plus-sign"></i>',
 	onCreateLi: function(node, $li) {
 		switch(node.permission) {
 			case "-1":
-				$li.find('.jqtree-element').after('<span class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
+				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
 				$li.attr('style', 'background-color:#FDD');
 				break;
 			case "1":
-				$li.find('.jqtree-element').after('<span class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
+				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
 				$li.attr('style', 'background-color:#DFD');
 				break;
 			default:
-				$li.find('.jqtree-element').after('<span class="jqtree-add-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-plus-sign"></i></span>');
+				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-add-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-plus-sign"></i></span>');
 		}
  }
 });
 $('#acostree').on('click', '.jqtree-toggle-permission', function(event) {
 	acoid = $(event.target).parent().attr('data-acoid');
 	aroid = $(event.target).parent().attr('data-aroid');
-	$.ajax('out.Acl.php?action=add_permission&acoid='+acoid+'&aroid='+aroid, {
+	$.ajax('../op/op.Acl.php?action=toggle_permission&acoid='+acoid+'&aroid='+aroid, {
 		dataType: 'json',
 		success: function(data, textStatus) {
 			if(data.type == 'success')  {
@@ -70,7 +73,7 @@ $('#acostree').on('click', '.jqtree-toggle-permission', function(event) {
 $('#acostree').on('click', '.jqtree-add-permission', function(event) {
 	acoid = $(event.target).parent().attr('data-acoid');
 	aroid = $(event.target).parent().attr('data-aroid');
-	$.ajax('out.Acl.php?action=add_permission&acoid='+acoid+'&aroid='+aroid, {
+	$.ajax('../op/op.Acl.php?action=add_permission&acoid='+acoid+'&aroid='+aroid, {
 		dataType: 'json',
 		success: function(data, textStatus) {
 			if(data.type == 'success')  {
@@ -87,7 +90,7 @@ $('#acostree').on('click', '.jqtree-add-permission', function(event) {
 $('#acostree').on('click', '.jqtree-remove-permission', function(event) {
 	acoid = $(event.currentTarget).attr('data-acoid');
 	aroid = $(event.currentTarget).attr('data-aroid');
-	$.ajax('out.Acl.php?action=remove_permission&acoid='+acoid+'&aroid='+aroid, {
+	$.ajax('../op/op.Acl.php?action=remove_permission&acoid='+acoid+'&aroid='+aroid, {
 		dataType: 'json',
 		success: function(data, textStatus) {
 			if(data.type == 'success')  {
@@ -103,7 +106,7 @@ $('#acostree').on('click', '.jqtree-remove-permission', function(event) {
 
 $(document).ready( function() {
 	$( "#selector" ).change(function() {
-//		window.location='out.Acl.php?action=show&roleid=' + $(this).val();
+		window.location='out.Acl.php?action=show&roleid=' + $(this).val();
 //		$('#acostree').tree({dataUrl: 'out.Acl.php?action=tree&roleid=' + $(this).val()});
 	});
 });
@@ -160,8 +163,8 @@ $(document).ready( function() {
 					$tree['permission'] = $perm;
 				$tree['id'] = $aco->getID();
 				$tree['label'] = $aco->getAlias();
-				$node['acoid'] = $aco->getID();
-				$node['aroid'] = $aro->getID();
+				$tree['acoid'] = $aco->getID();
+				$tree['aroid'] = $aro->getID();
 				$tree['is_folder'] = true;
 				$tree['children'] = $this->_tree($aro, $aco);
 				$result[] = $tree;

From 8f7a84e495fd46ecd8d8dbd00dae62e147207412 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Feb 2016 16:24:55 +0100
Subject: [PATCH 0386/2006] complete acos and aros

---
 install/create_tables-sqlite3.sql | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 7e3f04ed5..4241e437c 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -532,7 +532,7 @@ CREATE TABLE `tblSessions` (
   `theme` varchar(30) NOT NULL default '',
   `language` varchar(30) NOT NULL default '',
   `clipboard` text default '',
-	`su` INTEGER DEFAULT NULL,
+  `su` INTEGER DEFAULT NULL,
   `splashmsg` text default ''
 ) ;
 
@@ -723,7 +723,7 @@ CREATE TABLE tblTransmittals (
 
 CREATE TABLE `tblTransmittalItems` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-	`transmittal` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE,
+  `transmittal` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE,
   `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
   `date` TEXT NOT NULL default '0000-00-00 00:00:00',
@@ -738,8 +738,10 @@ CREATE TABLE `tblTransmittalItems` (
 
 CREATE TABLE `tblAros` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `parent` INTEGER,
   `model` TEXT NOT NULL,
-	`foreignid` INTEGER NOT NULL DEFAULT '0'
+  `foreignid` INTEGER NOT NULL DEFAULT '0',
+  `alias` TEXT
 ) ;
 
 
@@ -751,8 +753,10 @@ CREATE TABLE `tblAros` (
 
 CREATE TABLE `tblAcos` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `parent` INTEGER,
   `model` TEXT NOT NULL,
-	`foreignid` INTEGER NOT NULL DEFAULT '0'
+  `foreignid` INTEGER NOT NULL DEFAULT '0',
+  `alias` TEXT
 ) ;
 
 -- --------------------------------------------------------
@@ -763,8 +767,12 @@ CREATE TABLE `tblAcos` (
 
 CREATE TABLE `tblArosAcos` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-	`aro` int(11) NOT NULL DEFAULT '0' REFERENCES `tblAros` (`id`) ON DELETE CASCADE,
-	`aco` int(11) NOT NULL DEFAULT '0' REFERENCES `tblAcos` (`id`) ON DELETE CASCADE,
+  `aro` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblAros` (`id`) ON DELETE CASCADE,
+  `aco` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblAcos` (`id`) ON DELETE CASCADE,
+  `create` INTEGER NOT NULL DEFAULT '-1',
+  `read` INTEGER NOT NULL DEFAULT '-1',
+  `update` INTEGER NOT NULL DEFAULT '-1',
+  `delete` INTEGER NOT NULL DEFAULT '-1',
   UNIQUE (aco, aro)
 ) ;
 

From e6966ae8414dd71eeb6bf23b166f98eab2fe3a0a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Feb 2016 16:32:32 +0100
Subject: [PATCH 0387/2006] controller for setting permissions

---
 op/op.Acl.php | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 op/op.Acl.php

diff --git a/op/op.Acl.php b/op/op.Acl.php
new file mode 100644
index 000000000..5d1c2769e
--- /dev/null
+++ b/op/op.Acl.php
@@ -0,0 +1,97 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2012 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAcl.php");
+include("../inc/inc.Authentication.php");
+
+if (!$user->isAdmin()) {
+	$result = array('type'=>'error', 'msg'=>getMLText("access_denied"));
+	echo json_encode($result);
+	exit;
+}
+
+if (isset($_GET["action"])) $action=$_GET["action"];
+else $action=NULL;
+
+if (isset($_GET["aroid"])) {
+	if(!($aro = SeedDMS_Aro::getInstance((int) $_GET["aroid"], $dms))) {
+		$result = array('type'=>'error', 'msg'=>'1'.getMLText("access_denied"));
+		echo json_encode($result);
+		exit;
+	}
+} else {
+	$result = array('type'=>'error', 'msg'=>'2'.getMLText("access_denied"));
+	echo json_encode($result);
+	exit;
+}
+
+if (isset($_GET["acoid"])) {
+	if(!($aco = SeedDMS_Aco::getInstance((int) $_GET["acoid"], $dms))) {
+		$result = array('type'=>'error', 'msg'=>'3'.getMLText("access_denied"));
+		echo json_encode($result);
+		exit;
+	}
+} else {
+	$result = array('type'=>'error', 'msg'=>'4'.getMLText("access_denied"));
+	echo json_encode($result);
+	exit;
+}
+
+switch($action) {
+case "toggle_permission":
+	$acl = new SeedDMS_Acl($dms);
+	if($acl->toggle($aro, $aco))
+		$result = array('type'=>'success', 'msg'=>'lasjfl');
+	else
+		$result = array('type'=>'error', 'msg'=>'lasjfl');
+	header('Content-Type: application/json');
+	echo json_encode($result);
+	break;
+case "add_permission":
+	$acl = new SeedDMS_Acl($dms);
+	if($acl->add($aro, $aco))
+		$result = array('type'=>'success', 'msg'=>'lasjfl');
+	else
+		$result = array('type'=>'error', 'msg'=>'lasjfl');
+	header('Content-Type: application/json');
+	$result = array('type'=>'success', 'msg'=>'lasjfl');
+	echo json_encode($result);
+	break;
+case "remove_permission":
+	$acl = new SeedDMS_Acl($dms);
+	if($acl->remove($aro, $aco))
+		$result = array('type'=>'success', 'msg'=>'lasjfl');
+	else
+		$result = array('type'=>'error', 'msg'=>'lasjfl');
+	header('Content-Type: application/json');
+	$result = array('type'=>'success', 'msg'=>'lasjfl');
+	echo json_encode($result);
+	break;
+}
+

From 839ae0b1dfa808f38103d66b76384c7222309b82 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Mar 2016 07:04:36 +0100
Subject: [PATCH 0388/2006] many improvements

---
 inc/inc.ClassAcl.php | 114 +++++++++++++++++++++++++++++--------------
 1 file changed, 78 insertions(+), 36 deletions(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index 98982fefb..87d6c413b 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -44,21 +44,27 @@ class SeedDMS_Acl { /* {{{ */
 
 	public function check($aro, $aco) { /* {{{ */
 		$db = $this->_dms->getDB();
-		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
-		$resArr = $db->getResultArray($queryStr);
-		if (is_bool($resArr) && $resArr == false)
-			return false;
-		if (count($resArr) != 1)
-			return false;
-		$resArr = $resArr[0];
-		return($resArr['read'] == 1 ? true : false);
+
+		while($aco) {
+			$acoid = $aco->getID();
+			$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$acoid;
+			$resArr = $db->getResultArray($queryStr);
+			if (is_bool($resArr) && $resArr === false)
+				return false;
+			if (count($resArr) == 1)
+				return($resArr[0]['read'] == 1 ? true : false);
+
+			$aco = $aco->getParent();
+		}
+
+		return false;
 	} /* }}} */
 
 	public function toggle($aro, $aco) { /* {{{ */
 		$db = $this->_dms->getDB();
 		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
 		$resArr = $db->getResultArray($queryStr);
-		if (is_bool($resArr) && $resArr == false)
+		if (is_bool($resArr) && $resArr === false)
 			return false;
 		if (count($resArr) != 1)
 			return false;
@@ -76,7 +82,7 @@ class SeedDMS_Acl { /* {{{ */
 		$db = $this->_dms->getDB();
 		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
 		$resArr = $db->getResultArray($queryStr);
-		if (is_bool($resArr) && $resArr == false)
+		if (is_bool($resArr) && $resArr === false)
 			return false;
 		if (count($resArr) == 1) {
 			$resArr = $resArr[0];
@@ -126,6 +132,11 @@ class SeedDMS_AroAco { /* {{{ */
 	 */
 	protected $_id;
 
+	/**
+	 * @var integer id of parent of access request object
+	 */
+	protected $_parent;
+
 	/**
 	 * @var string alias of access request object
 	 */
@@ -142,9 +153,10 @@ class SeedDMS_AroAco { /* {{{ */
 	 * @param object $dms object of dms
 	 * @return object instance of SeedDMS_Aco
 	 */
-	function __construct($dms, $id, $object, $alias) { /* {{{ */
+	function __construct($dms, $id, $parent, $object, $alias) { /* {{{ */
 		$this->dmѕ = $dms;
 		$this->_id = $id;
+		$this->_parent = $parent;
 		$this->_object = $object;
 		$this->_alias = $alias;
 	} /* }}} */
@@ -189,8 +201,8 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 	 * @param object $dms object to access the underlying database
 	 * @return object instance of SeedDMS_Aro
 	 */
-	function __construct($dms, $id, $object, $alias) { /* {{{ */
-		parent::__construct($dms, $id, $object, $alias);
+	function __construct($dms, $id, $parent, $object, $alias) { /* {{{ */
+		parent::__construct($dms, $id, $parent, $object, $alias);
 	} /* }}} */
 
 	public static function getInstance($id, $dms) { /* {{{ */
@@ -198,7 +210,7 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 		if(is_int($id)) {
 			$queryStr = "SELECT * FROM tblAros WHERE id = " . (int) $id;
 			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && $resArr == false)
+			if (is_bool($resArr) && $resArr === false)
 				return null;
 			if (count($resArr) != 1)
 				return null;
@@ -208,11 +220,16 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 				$model = 'Role';
 				$queryStr = "SELECT * FROM tblAros WHERE model=".$db->qstr($model)." AND foreignid=".$id->getID();
 				$resArr = $db->getResultArray($queryStr);
-				if (is_bool($resArr) && $resArr == false)
+				if (is_bool($resArr) && $resArr === false)
 					return null;
-				if (count($resArr) != 1)
-					return null;
-				$parentid = $resArr[0]['parent'];
+				if (count($resArr) == 0) {
+					$queryStr = "INSERT INTO tblAros (parent, model, foreignid) VALUES (0, ".$db->qstr($model).", ".$id->getID().")";
+					if (!$db->getResult($queryStr))
+						return null;
+					$id = $db->getInsertID();
+					$queryStr = "SELECT * FROM tblAros WHERE id = " . $id;
+					$resArr = $db->getResultArray($queryStr);
+				}
 				$resArr = $resArr[0];
 			} else {
 				return null;
@@ -226,7 +243,7 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 			$object = null;
 		}
 
-		$aro = new self($dms, $resArr["id"], $object, $resArr['alias']);
+		$aro = new self($dms, $resArr["id"], $resArr['parent'], $object, $resArr['alias']);
 		return $aro;
 	} /* }}} */
 
@@ -260,24 +277,31 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 		if(is_int($id)) {
 			$queryStr = "SELECT * FROM tblAcos WHERE id = " . (int) $id;
 			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && $resArr == false)
+			if (is_bool($resArr) && $resArr === false)
 				return null;
-			if (count($resArr) != 1)
+			if (count($resArr) == 0) {
 				return null;
+			}
 			$resArr = $resArr[0];
 		} elseif(is_string($id)) {
 			$tmp = explode('/', $id);
 			$parentid = 0;
 			foreach($tmp as $part) {
 				$queryStr = "SELECT * FROM tblAcos WHERE alias = " . $db->qstr($part);
-				if($parentid)
-					$queryStr .= " AND parent=".$parentid;
+//				if($parentid)
+				$queryStr .= " AND parent=".$parentid;
 				$resArr = $db->getResultArray($queryStr);
-				if (is_bool($resArr) && $resArr == false)
+				if (is_bool($resArr) && $resArr === false)
 					return null;
-				if (count($resArr) != 1)
-					return null;
-				$parentid = $resArr[0]['parent'];
+				if (count($resArr) == 0) {
+					$queryStr = "INSERT INTO tblAcos (parent, alias) VALUES (".$parentid.",".$db->qstr($part).")";
+					if (!$db->getResult($queryStr))
+						return null;
+					$id = $db->getInsertID();
+					$queryStr = "SELECT * FROM tblAcos WHERE id = " . $id;
+					$resArr = $db->getResultArray($queryStr);
+				}
+				$parentid = (int) $resArr[0]['id'];
 			}
 			$resArr = $resArr[0];
 		}
@@ -292,7 +316,7 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 			$object = null;
 		}
 
-		$aco = new SeedDMS_Aco($dms, $resArr["id"], $object, $resArr['alias']);
+		$aco = new SeedDMS_Aco($dms, $resArr["id"], $resArr['parent'], $object, $resArr['alias']);
 		$aco->setDMS($dms);
 		return $aco;
 	} /* }}} */
@@ -300,16 +324,16 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 	public function getChildren() { /* {{{ */
 		$dms = $this->getDMS();
 		$db = $dms->getDB();
-		$queryStr = "SELECT * FROM tblAcos WHERE parent = " . $this->_id;
+		$queryStr = "SELECT * FROM tblAcos WHERE parent = ".$this->_id;
 		$resArr = $db->getResultArray($queryStr);
-		if (is_bool($resArr) && $resArr == false)
+		if (is_bool($resArr) && $resArr === false)
 			return null;
-		if (count($resArr) != 1)
+		if (count($resArr) == 0)
 			return null;
 
 		$acos = array();
 		foreach($resArr as $row) {
-			$aco = new SeedDMS_Aco($this->dms, $row["id"], null, $row['alias']);
+			$aco = new SeedDMS_Aco($dms, $row["id"], $row['parent'], null, $row['alias']);
 			$aco->setDMS($dms);
 			$acos[] = $aco;
 		}
@@ -317,11 +341,13 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 	} /* }}} */
 
 	public function getPermission($aro) { /* {{{ */
+		if(!$aro)
+			return 0;
 		$dms = $this->getDMS();
 		$db = $dms->getDB();
 		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$this->_id;
 		$resArr = $db->getResultArray($queryStr);
-		if (is_bool($resArr) && $resArr == false)
+		if (is_bool($resArr) && $resArr === false)
 			return false;
 		if (count($resArr) != 1)
 			return 0;
@@ -330,19 +356,35 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 
 	public static function getRoot($dms) { /* {{{ */
 		$db = $dms->getDB();
-		$queryStr = "SELECT * FROM tblAcos WHERE parent IS NULL";
+		$queryStr = "SELECT * FROM tblAcos WHERE parent = 0";
 		$resArr = $db->getResultArray($queryStr);
-		if (is_bool($resArr) && $resArr == false)
+		if (is_bool($resArr) && $resArr === false)
 			return null;
 		if (count($resArr) != 1)
 			return null;
 
 		$acos = array();
 		foreach($resArr as $row) {
-			$aco = new SeedDMS_Aco($dms, $row["id"], null, $row['alias']);
+			$aco = new SeedDMS_Aco($dms, $row["id"], $row['parent'], null, $row['alias']);
 			$aco->setDMS($dms);
 			$acos[] = $aco;
 		}
 		return $acos;
 	} /* }}} */
+
+	public function getParent() { /* {{{ */
+		$dms = $this->getDMS();
+		$db = $dms->getDB();
+		$queryStr = "SELECT * FROM tblAcos WHERE id = ".$this->_parent;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr === false)
+			return null;
+		if (count($resArr) != 1)
+			return null;
+
+		$row = $resArr[0];
+		$aco = new SeedDMS_Aco($dms, $row["id"], $row['parent'], null, $row['alias']);
+		$aco->setDMS($dms);
+		return $aco;
+	} /* }}} */
 } /* }}} */

From bae1386c588fd7154452b109024058fbf24c6612 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Mar 2016 07:05:09 +0100
Subject: [PATCH 0389/2006] add phrases for new access control

---
 languages/ar_EG/lang.inc | 10 ++++++++++
 languages/bg_BG/lang.inc | 10 ++++++++++
 languages/ca_ES/lang.inc | 10 ++++++++++
 languages/cs_CZ/lang.inc | 10 ++++++++++
 languages/de_DE/lang.inc | 12 +++++++++++-
 languages/en_GB/lang.inc | 12 +++++++++++-
 languages/es_ES/lang.inc | 26 ++++++++++++++++++--------
 languages/fr_FR/lang.inc | 14 ++++++++++++--
 languages/hr_HR/lang.inc | 28 +++++++++++++++++++---------
 languages/hu_HU/lang.inc | 10 ++++++++++
 languages/it_IT/lang.inc | 10 ++++++++++
 languages/ko_KR/lang.inc | 10 ++++++++++
 languages/nl_NL/lang.inc | 10 ++++++++++
 languages/pl_PL/lang.inc | 10 ++++++++++
 languages/pt_BR/lang.inc | 10 ++++++++++
 languages/ro_RO/lang.inc | 10 ++++++++++
 languages/ru_RU/lang.inc | 10 ++++++++++
 languages/sk_SK/lang.inc | 10 ++++++++++
 languages/sv_SE/lang.inc | 10 ++++++++++
 languages/tr_TR/lang.inc | 10 ++++++++++
 languages/uk_UA/lang.inc | 10 ++++++++++
 languages/zh_CN/lang.inc | 14 ++++++++++++--
 languages/zh_TW/lang.inc | 10 ++++++++++
 23 files changed, 253 insertions(+), 23 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 00a6b0214..da2af77fd 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'وافق',
+'access_control' => '',
 'access_denied' => 'دخول غير مصرح به.',
 'access_inheritance' => 'صلاحيات موروثة',
 'access_mode' => 'نوع الدخول',
@@ -387,9 +388,13 @@ URL: [url]',
 'en_GB' => 'الإنكليزية (GB)',
 'equal_transition_states' => 'حالة البداية والنهاية متشابهة',
 'error' => 'خطأ',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'لم يتم اختيار مستند',
 'error_no_folder_selected' => 'لم يتم اختيار مجلد',
 'error_occured' => 'حدث خطأ',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'الإسبانية',
 'event_details' => 'تفاصيل الحدث',
 'exclude_items' => '',
@@ -588,6 +593,7 @@ URL: [url]',
 'missing_checksum' => 'فحص اخطاء مفقود',
 'missing_file' => '',
 'missing_filesize' => 'حجم ملف مفقود',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'مستخدم/مجموعة مفقودة للتحول',
 'monday' => 'الاثنين',
 'monday_abbr' => 'ن',
@@ -1251,6 +1257,10 @@ URL: [url]',
 'submit_userinfo' => 'ادخال بيانات',
 'substitute_to_user' => '',
 'substitute_user' => 'استبدال المستخدم',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'الأحد',
 'sunday_abbr' => 'ح',
 'sv_SE' => 'السويدية',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index d51eea8cb..252d55ca4 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Приеми',
+'access_control' => '',
 'access_denied' => 'достъп забранен',
 'access_inheritance' => 'Наследване на достъпа',
 'access_mode' => 'Режим на достъп',
@@ -342,9 +343,13 @@ $text = array(
 'en_GB' => '',
 'equal_transition_states' => 'Началното и крайно състояние са еднакви',
 'error' => 'Грешка',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Няма избрани документи',
 'error_no_folder_selected' => 'Няма избрани папки',
 'error_occured' => 'Стана грешка',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => '',
 'event_details' => 'Детайли за събитието',
 'exclude_items' => '',
@@ -519,6 +524,7 @@ $text = array(
 'missing_checksum' => 'липсва контролна сума',
 'missing_file' => '',
 'missing_filesize' => 'липсва размер на файла',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'липсва потребител или група за преход',
 'monday' => 'понеделник',
 'monday_abbr' => '',
@@ -1116,6 +1122,10 @@ $text = array(
 'submit_userinfo' => 'Изпрати информация за потребител',
 'substitute_to_user' => '',
 'substitute_user' => '',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'неделя',
 'sunday_abbr' => '',
 'sv_SE' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index d048875f0..d31cdb7d4 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Acceptar',
+'access_control' => '',
 'access_denied' => 'Accés denegat',
 'access_inheritance' => 'Accés heretat',
 'access_mode' => 'Mode d\'accés',
@@ -347,9 +348,13 @@ URL: [url]',
 'en_GB' => '',
 'equal_transition_states' => '',
 'error' => '',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
 'error_occured' => 'Ha succeït un error',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => '',
 'event_details' => 'Detalls de l\'event',
 'exclude_items' => '',
@@ -524,6 +529,7 @@ URL: [url]',
 'missing_checksum' => '',
 'missing_file' => '',
 'missing_filesize' => '',
+'missing_request_object' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Dilluns',
 'monday_abbr' => '',
@@ -1121,6 +1127,10 @@ URL: [url]',
 'submit_userinfo' => '',
 'substitute_to_user' => '',
 'substitute_user' => '',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Diumenge',
 'sunday_abbr' => '',
 'sv_SE' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 6692aa40a..e07d195a7 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Přijmout',
+'access_control' => '',
 'access_denied' => 'Přístup zamítnut.',
 'access_inheritance' => 'Dědičnost přístupu',
 'access_mode' => 'Režim přístupu',
@@ -394,9 +395,13 @@ URL: [url]',
 'en_GB' => 'Angličtina (GB)',
 'equal_transition_states' => 'Počáteční a konečný stav jsou stejné',
 'error' => 'Error',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Není vybrán žádný dokument.',
 'error_no_folder_selected' => 'Není vybrána žádná složka',
 'error_occured' => 'Vyskytla se chyba',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Španělština',
 'event_details' => 'Údaje akce',
 'exclude_items' => '',
@@ -595,6 +600,7 @@ URL: [url]',
 'missing_checksum' => 'Chybějící kontrolní součet',
 'missing_file' => '',
 'missing_filesize' => 'Chybějící velikost souboru',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Chybějící uživatel/skupina pro změnu',
 'monday' => 'Pondělí',
 'monday_abbr' => 'Po',
@@ -1260,6 +1266,10 @@ URL: [url]',
 'submit_userinfo' => 'Odeslat info',
 'substitute_to_user' => '',
 'substitute_user' => 'Zaměnit uživatele',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Neděle',
 'sunday_abbr' => 'Ne',
 'sv_SE' => 'Švédština',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 1721aac72..b71c559b0 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,10 +19,11 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2184), dgrutsch (21)
+//    Translators: Admin (2194), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
+'access_control' => 'Zugriffskontrolle',
 'access_denied' => 'Zugriff verweigert',
 'access_inheritance' => 'Zugriff vererben',
 'access_mode' => 'Berechtigung',
@@ -399,9 +400,13 @@ URL: [url]',
 'en_GB' => 'Englisch (GB)',
 'equal_transition_states' => 'Start- und Endstatus ѕind gleich',
 'error' => 'Fehler',
+'error_add_aro' => 'Fehler beim Hinzufügen des Zugriffsobjekt',
+'error_add_permission' => 'Fehler beim Hinzufügen der Berechtigung',
 'error_no_document_selected' => 'Kein Dokument ausgewählt',
 'error_no_folder_selected' => 'Kein Ordner ausgewählt',
 'error_occured' => 'Ein Fehler ist aufgetreten. Bitte Administrator benachrichtigen.',
+'error_remove_permission' => 'Fehler beim Entfernen der Berechtigung',
+'error_toogle_permission' => 'Fehler beim Ändern der Berechtigung',
 'es_ES' => 'Spanisch',
 'event_details' => 'Ereignisdetails',
 'exclude_items' => 'Einträge auslassen',
@@ -600,6 +605,7 @@ URL: [url]',
 'missing_checksum' => 'Fehlende Check-Summe',
 'missing_file' => 'Datei fehlt',
 'missing_filesize' => 'Fehlende Dateigröße',
+'missing_request_object' => 'Fehlendes Zugriffsobjekte',
 'missing_transition_user_group' => 'Fehlende/r Benutzer/Gruppe für Transition',
 'monday' => 'Montag',
 'monday_abbr' => 'Mo',
@@ -1297,6 +1303,10 @@ URL: [url]',
 'submit_userinfo' => 'Daten setzen',
 'substitute_to_user' => 'Wechsel zu \'[username]\'',
 'substitute_user' => 'Benutzer wechseln',
+'success_add_aro' => 'Zugriffsobjekt hinzugefügt',
+'success_add_permission' => 'Berechtigung hinzugefügt',
+'success_remove_permission' => 'Berechtigung entfernt',
+'success_toogle_permission' => 'Berechtigung geändert',
 'sunday' => 'Sonntag',
 'sunday_abbr' => 'So',
 'sv_SE' => 'Schwedisch',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index e3be58f21..dcc62b593 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,10 +19,11 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1318), dgrutsch (7), netixw (14)
+//    Translators: Admin (1328), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
+'access_control' => 'Access control',
 'access_denied' => 'Access denied.',
 'access_inheritance' => 'Access Inheritance',
 'access_mode' => 'Access mode',
@@ -399,9 +400,13 @@ URL: [url]',
 'en_GB' => 'English (GB)',
 'equal_transition_states' => 'Start and end state are equal',
 'error' => 'Error',
+'error_add_aro' => 'Error while adding access request object',
+'error_add_permission' => 'Error while add permission',
 'error_no_document_selected' => 'No document selected',
 'error_no_folder_selected' => 'No folder selected',
 'error_occured' => 'An error has occured',
+'error_remove_permission' => 'Error while remove permission',
+'error_toogle_permission' => 'Error while changing permission',
 'es_ES' => 'Spanish',
 'event_details' => 'Event details',
 'exclude_items' => 'Exclude items',
@@ -600,6 +605,7 @@ URL: [url]',
 'missing_checksum' => 'Missing checksum',
 'missing_file' => 'Missing file',
 'missing_filesize' => 'Missing filesize',
+'missing_request_object' => 'Missing request object',
 'missing_transition_user_group' => 'Missing user/group for transition',
 'monday' => 'Monday',
 'monday_abbr' => 'Mo',
@@ -1297,6 +1303,10 @@ URL: [url]',
 'submit_userinfo' => 'Submit info',
 'substitute_to_user' => 'Switch to \'[username]\'',
 'substitute_user' => 'Substitute User',
+'success_add_aro' => 'Access request object added',
+'success_add_permission' => 'Added permission',
+'success_remove_permission' => 'Removed permission',
+'success_toogle_permission' => 'Permission changed',
 'sunday' => 'Sunday',
 'sunday_abbr' => 'Su',
 'sv_SE' => 'Swedish',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 72984715a..2f586e8c7 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,10 +19,11 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (983), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (990), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
+'access_control' => '',
 'access_denied' => 'Acceso denegado',
 'access_inheritance' => 'Acceso heredado',
 'access_mode' => 'Tipo de acceso',
@@ -394,9 +395,13 @@ URL: [url]',
 'en_GB' => 'Ingless (GB)',
 'equal_transition_states' => 'Estado inicial y final son iguales',
 'error' => 'Error',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Ningún documento seleccionado',
 'error_no_folder_selected' => 'Ninguna carpeta seleccionada',
 'error_occured' => 'Ha ocurrido un error',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Castellano',
 'event_details' => 'Detalles del evento',
 'exclude_items' => 'Registros excluidos',
@@ -595,6 +600,7 @@ URL: [url]',
 'missing_checksum' => 'Falta checksum',
 'missing_file' => '',
 'missing_filesize' => 'Falta tamaño fichero',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Falta usuario/grupo para transición',
 'monday' => 'Lunes',
 'monday_abbr' => 'L',
@@ -939,7 +945,7 @@ URL: [url]',
 'settings_cannot_disable' => 'No es posible eliminar el archivo ENABLE_INSTALL_TOOL',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
-'settings_cmdTimeout' => '',
+'settings_cmdTimeout' => 'Tiempo limite para comandos externos',
 'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'Carpeta de contenidos',
 'settings_contentDir_desc' => 'Donde se almacenan los archivos subidos (es preferible seleccionar una carpeta que no sea accesible a través del servidor web)',
@@ -966,9 +972,9 @@ URL: [url]',
 'settings_dbUser' => 'Nombre de usuario',
 'settings_dbUser_desc' => 'Nombre de usuario de acceso a su base de datos introducido durante el proceso de instalación. No edite este campo a menos que sea necesario, por ejemplo si la base de datos se transfiere a un nuevo servidor.',
 'settings_dbVersion' => 'Esquema de base de datos demasiado antiguo',
-'settings_defaultSearchMethod' => '',
-'settings_defaultSearchMethod_desc' => '',
-'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod' => 'Método de búsqueda por defecto',
+'settings_defaultSearchMethod_desc' => 'Método de búsqueda por defecto, cuando se inicia una búsqueda mediante el formulario en el menú principal',
+'settings_defaultSearchMethod_valdatabase' => 'base de datos',
 'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Para utilizar SeedDMS, debe eliminar el archivo ENABLE_INSTALL_TOOL de la carpeta de configuración',
 'settings_disableSelfEdit' => 'Deshabilitar autoedición',
@@ -998,11 +1004,11 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Falso para no mostrar el árbol de carpetas',
 'settings_enableFullSearch' => 'Habilitar búsqueda de texto completo',
 'settings_enableFullSearch_desc' => 'Habilitar búsqueda de texto completo',
-'settings_enableGuestAutoLogin' => '',
-'settings_enableGuestAutoLogin_desc' => '',
+'settings_enableGuestAutoLogin' => 'Activar inicio de sesión automático para invitado',
+'settings_enableGuestAutoLogin_desc' => 'Si están activados la sesión de invitado y el inicio de sesión automático, el invitado iniciará sesión automaticamente.',
 'settings_enableGuestLogin' => 'Habilitar acceso de invitado',
 'settings_enableGuestLogin_desc' => 'Si quiere que cualquiera acceda como invitado, chequee esta opción. Nota: El acceso de invitado debería permitirse solo en entornos de confianza',
-'settings_enableHelp' => '',
+'settings_enableHelp' => 'Activar la ayuda',
 'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Habilitar selector de idioma',
 'settings_enableLanguageSelector_desc' => 'Mostrar selector de lenguaje para usuario despues de identificarse.',
@@ -1266,6 +1272,10 @@ URL: [url]',
 'submit_userinfo' => 'Enviar información',
 'substitute_to_user' => 'Cambiar a \'[username]\'',
 'substitute_user' => 'Cambiar de usuario',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Domingo',
 'sunday_abbr' => 'D',
 'sv_SE' => 'Sueco',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index b3c2c93b4..7cb985c17 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,10 +19,11 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1013), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (1014), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
+'access_control' => '',
 'access_denied' => 'Accès refusé.',
 'access_inheritance' => 'Héritage d\'accès',
 'access_mode' => 'Droits d\'accès',
@@ -394,9 +395,13 @@ URL: [url]',
 'en_GB' => 'Anglais (RU)',
 'equal_transition_states' => 'Etat de début et fin identique',
 'error' => 'Erreur',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Aucun document sélectionné',
 'error_no_folder_selected' => 'Aucun dossier sélectionné',
 'error_occured' => 'Une erreur s\'est produite',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Espagnol',
 'event_details' => 'Détails de l\'événement',
 'exclude_items' => '',
@@ -595,6 +600,7 @@ URL: [url]',
 'missing_checksum' => 'Checksum manquante',
 'missing_file' => '',
 'missing_filesize' => 'Taille de fichier manquante',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Utilisateur/groupe manquant pour transition',
 'monday' => 'Lundi',
 'monday_abbr' => 'Lun.',
@@ -945,7 +951,7 @@ URL: [url]',
 'settings_defaultSearchMethod' => '',
 'settings_defaultSearchMethod_desc' => '',
 'settings_defaultSearchMethod_valdatabase' => 'base de données',
-'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultSearchMethod_valfulltext' => 'texto completo',
 'settings_delete_install_folder' => 'Pour utiliser SeedDMS, vous devez supprimer le fichier ENABLE_INSTALL_TOOL dans le répertoire de configuration',
 'settings_disableSelfEdit' => 'Désactiver auto modification',
 'settings_disableSelfEdit_desc' => 'Si coché, l\'utilisateur ne peut pas éditer son profil',
@@ -1242,6 +1248,10 @@ URL: [url]',
 'submit_userinfo' => 'Soumettre info',
 'substitute_to_user' => '',
 'substitute_user' => 'Utilisateur de substitution',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Dimanche',
 'sunday_abbr' => 'Dim.',
 'sv_SE' => 'Suédois',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index e5de95f1c..7c9c51784 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -19,10 +19,11 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1177), marbanas (16)
+//    Translators: Admin (1185), marbanas (16)
 
 $text = array(
 'accept' => 'Prihvati',
+'access_control' => '',
 'access_denied' => 'Odbijen pristup.',
 'access_inheritance' => 'Nasljedivost razine pristupa',
 'access_mode' => 'Način pristupa',
@@ -399,9 +400,13 @@ Internet poveznica: [url]',
 'en_GB' => 'Engleski (GB)',
 'equal_transition_states' => 'Početni i završni status su jednaki',
 'error' => 'Greška',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Nije odabran dokument',
 'error_no_folder_selected' => 'Nije odabrana mapa',
 'error_occured' => 'Dogodila se greška',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Španjolski',
 'event_details' => 'Detalji događaja',
 'exclude_items' => 'Isključivanje stavki',
@@ -600,6 +605,7 @@ Internet poveznica: [url]',
 'missing_checksum' => 'Nedostaje kontrolna suma',
 'missing_file' => '',
 'missing_filesize' => 'Nedostaje veličina datoteke',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Nedostaje korisnik/grupa za promjenu',
 'monday' => 'Ponedjeljak',
 'monday_abbr' => 'Po',
@@ -987,10 +993,10 @@ Internet poveznica: [url]',
 'settings_dbUser' => 'Korisničko ime',
 'settings_dbUser_desc' => 'Korisničko ime za pristup vašoj bazi podataka unijeto tijekom postupka instalacije. Ne uređujte ovo polje bez prijeke potrebe, npr. prijenos baze podataka na novi Host.',
 'settings_dbVersion' => 'Shema baze podataka je prestara',
-'settings_defaultSearchMethod' => '',
-'settings_defaultSearchMethod_desc' => '',
-'settings_defaultSearchMethod_valdatabase' => '',
-'settings_defaultSearchMethod_valfulltext' => '',
+'settings_defaultSearchMethod' => 'Zadana metoda pretrage',
+'settings_defaultSearchMethod_desc' => 'Zadana metoda pretrage, kada se pretraživanje pokreće putem formulara iz glavnog izbornika',
+'settings_defaultSearchMethod_valdatabase' => 'baza podataka',
+'settings_defaultSearchMethod_valfulltext' => 'puni tekst',
 'settings_delete_install_folder' => 'Da bi koristili ProsperaDMS, morate izbrisati datoteku ENABLE_INSTALL_TOOL u mapi konfiguracije',
 'settings_disableSelfEdit' => 'Onemogućite samostalno uređivanje',
 'settings_disableSelfEdit_desc' => 'Ako je označeno, korisnik ne može uređivati svoj vlastiti profil',
@@ -1019,12 +1025,12 @@ Internet poveznica: [url]',
 'settings_enableFolderTree_desc' => 'Omogući/onemogući stablo mape na \'Vidi mapu\' stranici',
 'settings_enableFullSearch' => 'Omogući pretraživanje cijelog teksta',
 'settings_enableFullSearch_desc' => 'Omogući pretraživanje cijelog teksta',
-'settings_enableGuestAutoLogin' => '',
-'settings_enableGuestAutoLogin_desc' => '',
+'settings_enableGuestAutoLogin' => 'Omogući automatsku prijavu za goste',
+'settings_enableGuestAutoLogin_desc' => 'Ako je omogućena prijava gostiju i automatska prijava, gost će se automatski prijaviti.',
 'settings_enableGuestLogin' => 'Omogući Gost prijavu',
 'settings_enableGuestLogin_desc' => 'Ako želite da se bilo tko koristi Gost prijavu, označite ovu opciju. Napomena: gost prijava smije se koristiti samo u pouzdanom okruženju.',
-'settings_enableHelp' => '',
-'settings_enableHelp_desc' => '',
+'settings_enableHelp' => 'Omogući pomoć',
+'settings_enableHelp_desc' => 'Omogući/onemogući poveznicu do pomoći u izborniku',
 'settings_enableLanguageSelector' => 'Omogući Izbornik jezika',
 'settings_enableLanguageSelector_desc' => 'Prikaži izbornik za jezik korisničkog sučelja nakon prijave.',
 'settings_enableLargeFileUpload' => 'Omogući učitavanje velikih datoteka',
@@ -1287,6 +1293,10 @@ Internet poveznica: [url]',
 'submit_userinfo' => 'Pošaljite info',
 'substitute_to_user' => 'Prebaci na \'[username]\'',
 'substitute_user' => 'Zamjenski korisnik',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Nedjelja',
 'sunday_abbr' => 'Ne',
 'sv_SE' => 'Švedski',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 493b0366e..f8c21db85 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Elfogad',
+'access_control' => '',
 'access_denied' => 'Hozzáférés megtagadva.',
 'access_inheritance' => 'Hozzáférés öröklés',
 'access_mode' => 'Hozzáférési mód',
@@ -394,9 +395,13 @@ URL: [url]',
 'en_GB' => 'Angol (GB)',
 'equal_transition_states' => 'A kezdő- és végállapot megegyezik',
 'error' => 'Hiba',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Nincs kijelölt dokumentum',
 'error_no_folder_selected' => 'Nincs kijelölt mappa',
 'error_occured' => 'Hiba történt',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Spanyol',
 'event_details' => 'Esemény részletek',
 'exclude_items' => 'Kizárt elemek',
@@ -595,6 +600,7 @@ URL: [url]',
 'missing_checksum' => 'Hiányzó ellenőrzőösszeg',
 'missing_file' => '',
 'missing_filesize' => 'Hiányzó állomány méret',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Hiányzó felhasználó/csoport az átvezetéshez',
 'monday' => 'Hétfő',
 'monday_abbr' => 'Hé',
@@ -1265,6 +1271,10 @@ URL: [url]',
 'submit_userinfo' => 'Információ küldése',
 'substitute_to_user' => '',
 'substitute_user' => 'Helyettesítő felhasználó',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Vasárnap',
 'sunday_abbr' => 'Va',
 'sv_SE' => 'Svéd',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 0bdd75e55..5c2da851f 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Accetta',
+'access_control' => '',
 'access_denied' => 'Accesso negato',
 'access_inheritance' => 'Permessi ereditari',
 'access_mode' => 'Permessi',
@@ -400,9 +401,13 @@ URL: [url]',
 'en_GB' => 'Inglese (GB)',
 'equal_transition_states' => 'Lo stato iniziale e quello finale sono identici',
 'error' => 'Errore',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Nessun documento selezionato',
 'error_no_folder_selected' => 'Nessuna cartella selezionata',
 'error_occured' => 'Ooops... Si è verificato un errore',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Spagnolo',
 'event_details' => 'Dettagli evento',
 'exclude_items' => '',
@@ -601,6 +606,7 @@ URL: [url]',
 'missing_checksum' => 'Checksum mancante',
 'missing_file' => '',
 'missing_filesize' => 'Dimensione mancante',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Utente/Gruppo per la transizione mancanti',
 'monday' => 'Lunedì',
 'monday_abbr' => 'Lun',
@@ -1289,6 +1295,10 @@ URL: [url]',
 'submit_userinfo' => 'Invio info utente',
 'substitute_to_user' => 'Cambia in \'[username]\'',
 'substitute_user' => 'Impersona utente',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Domenica',
 'sunday_abbr' => 'Dom',
 'sv_SE' => 'Svedese',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 9686708e0..4e23df8f9 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => '동의',
+'access_control' => '',
 'access_denied' => '접근가 거부되었습니다.',
 'access_inheritance' => '접근 상속',
 'access_mode' => '접근 모드',
@@ -399,9 +400,13 @@ URL: [url]',
 'en_GB' => '영어 (GB)',
 'equal_transition_states' => '시작 및 종료가 동일한 상태',
 'error' => '오류',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => '선택되지 문서는',
 'error_no_folder_selected' => '어떤 폴더를 선택하지',
 'error_occured' => '오류가 발생했습니다',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => '스페인어',
 'event_details' => '이벤트의 자세한 사항',
 'exclude_items' => '항목 제외',
@@ -600,6 +605,7 @@ URL: [url]',
 'missing_checksum' => '검사 누락',
 'missing_file' => '누락 된 파일',
 'missing_filesize' => '누락 된 파일 크기',
+'missing_request_object' => '',
 'missing_transition_user_group' => '변화에 대한 사용자 / 그룹을 누락',
 'monday' => '월요일',
 'monday_abbr' => '월',
@@ -1280,6 +1286,10 @@ URL : [url]',
 'submit_userinfo' => '정보 제출',
 'substitute_to_user' => '\'[username]\'로 전환',
 'substitute_user' => '대체 사용자',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => '일요일',
 'sunday_abbr' => '일',
 'sv_SE' => '스웨덴어',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 8ef680f45..fd38a9405 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Accept',
+'access_control' => '',
 'access_denied' => 'Geen toegang.',
 'access_inheritance' => 'Toegang overerfd',
 'access_mode' => 'Toegang modus',
@@ -392,9 +393,13 @@ URL: [url]',
 'en_GB' => 'Engels (GB)',
 'equal_transition_states' => 'Begin en eind status zijn hetzelfde',
 'error' => 'Fout',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Geen document geselecteerd',
 'error_no_folder_selected' => 'Geen map geselecteerd',
 'error_occured' => 'Er is een fout opgetreden',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Spaans',
 'event_details' => 'Activiteit details',
 'exclude_items' => '',
@@ -593,6 +598,7 @@ URL: [url]',
 'missing_checksum' => 'Mis controlesom',
 'missing_file' => '',
 'missing_filesize' => 'ontbrekende bestandsgrootte',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Gebruiker / groep ontbreekt voor de overdracht',
 'monday' => 'Maandag',
 'monday_abbr' => 'MO',
@@ -1262,6 +1268,10 @@ URL: [url]',
 'submit_userinfo' => 'Wijzigingen opslaan',
 'substitute_to_user' => '',
 'substitute_user' => 'Invaller/ vervanger Gebruiker',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Zondag',
 'sunday_abbr' => 'Su',
 'sv_SE' => 'Zweeds',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 9de36a7c8..85bbc86db 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Akceptuj',
+'access_control' => '',
 'access_denied' => 'Dostęp zabroniony.',
 'access_inheritance' => 'Dziedziczenie dostępu',
 'access_mode' => 'Tryb dostępu',
@@ -387,9 +388,13 @@ URL: [url]',
 'en_GB' => 'Angielski (GB)',
 'equal_transition_states' => 'Stan rozpoczęcia i ukończenia jest taki sam',
 'error' => 'Błąd',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Brak wybranych dokumentów',
 'error_no_folder_selected' => 'Brak wybranych katalogów',
 'error_occured' => 'Wystąpił błąd',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Hiszpański',
 'event_details' => 'Szczegóły zdarzenia',
 'exclude_items' => '',
@@ -588,6 +593,7 @@ URL: [url]',
 'missing_checksum' => 'Brak sumy kontrolnej',
 'missing_file' => '',
 'missing_filesize' => 'Brakujący rozmiar pliku',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Brak użytkownika / grupy dla przejścia',
 'monday' => 'Poniedziałek',
 'monday_abbr' => 'Pn.',
@@ -1245,6 +1251,10 @@ URL: [url]',
 'submit_userinfo' => 'Zatwierdź dane',
 'substitute_to_user' => '',
 'substitute_user' => 'Zastępca użytkownika',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Niedziela',
 'sunday_abbr' => 'Ni',
 'sv_SE' => 'szwedzki',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 05c2f89ae..8227367dd 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Aceitar',
+'access_control' => '',
 'access_denied' => 'Acesso Negado.',
 'access_inheritance' => 'access Inheritance',
 'access_mode' => 'Modo de acesso',
@@ -393,9 +394,13 @@ URL: [url]',
 'en_GB' => 'Inglês (GB)',
 'equal_transition_states' => 'Estado de início e fim são iguais',
 'error' => 'Erro',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Nenhum documento selecionado',
 'error_no_folder_selected' => 'Nenhuma pasta selecionada',
 'error_occured' => 'Ocorreu um erro',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Espanhol',
 'event_details' => 'Event details',
 'exclude_items' => '',
@@ -594,6 +599,7 @@ URL: [url]',
 'missing_checksum' => 'Falta de verificação',
 'missing_file' => '',
 'missing_filesize' => 'Falta tamanho do arquivo',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Falta usuário/grupo para transição',
 'monday' => 'Monday',
 'monday_abbr' => 'Mo',
@@ -1263,6 +1269,10 @@ URL: [url]',
 'submit_userinfo' => 'Submeter informação',
 'substitute_to_user' => '',
 'substitute_user' => 'Substituto do usuário',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Sunday',
 'sunday_abbr' => 'Su',
 'sv_SE' => 'Sueco',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 2224bbad2..0d93d753a 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Accept',
+'access_control' => '',
 'access_denied' => 'Acces interzis.',
 'access_inheritance' => 'Mostenire acces',
 'access_mode' => 'Mod de acces',
@@ -399,9 +400,13 @@ URL: [url]',
 'en_GB' => 'Engleza (GB)',
 'equal_transition_states' => 'Starea de start și de stop sunt egale',
 'error' => 'Eroare',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Nici un document selectat',
 'error_no_folder_selected' => 'Nici un folder selectat',
 'error_occured' => 'An error has occured',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Spaniola',
 'event_details' => 'Detalii eveniment',
 'exclude_items' => 'Elemente excluse',
@@ -600,6 +605,7 @@ URL: [url]',
 'missing_checksum' => 'Lipsește suma de control(checksum)',
 'missing_file' => '',
 'missing_filesize' => 'Lipsește dimensiunea fișierului',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Lipsește utilizatorul/grupul pentru tranziție',
 'monday' => 'Luni',
 'monday_abbr' => 'Lu',
@@ -1288,6 +1294,10 @@ URL: [url]',
 'submit_userinfo' => 'Trimite informații',
 'substitute_to_user' => '',
 'substitute_user' => 'Substituie Utilizator',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Duminică',
 'sunday_abbr' => 'Du',
 'sv_SE' => 'Suedeză',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 6b689c487..56dc40c6e 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Принять',
+'access_control' => '',
 'access_denied' => 'Доступ запрещён',
 'access_inheritance' => 'Наследование доступа',
 'access_mode' => 'Режим доступа',
@@ -387,9 +388,13 @@ URL: [url]',
 'en_GB' => 'English (GB)',
 'equal_transition_states' => 'Одинаковые начальный и конечный статусы',
 'error' => 'Ошибка',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Нет выбранных документов',
 'error_no_folder_selected' => 'Нет выбранных каталогов',
 'error_occured' => 'Произошла ошибка',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Spanish',
 'event_details' => 'Информация о событии',
 'exclude_items' => '',
@@ -588,6 +593,7 @@ URL: [url]',
 'missing_checksum' => 'Отсутствует контрольная сумма',
 'missing_file' => '',
 'missing_filesize' => 'Отсутствует размер файла',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Отсутствует пользователь/группа для изменения.',
 'monday' => 'Понедельник',
 'monday_abbr' => 'Пн',
@@ -1256,6 +1262,10 @@ URL: [url]',
 'submit_userinfo' => 'Отправить информацию',
 'substitute_to_user' => '',
 'substitute_user' => 'Переключиться',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Воскресенье',
 'sunday_abbr' => 'Вс',
 'sv_SE' => 'Swedish',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 974f6e41e..95d27dbbd 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Prijať',
+'access_control' => '',
 'access_denied' => 'Prístup zamietnutý.',
 'access_inheritance' => 'Dedičnosť prístupu',
 'access_mode' => 'Režim prístupu',
@@ -346,9 +347,13 @@ URL: [url]',
 'en_GB' => 'Angličtina (UK)',
 'equal_transition_states' => '',
 'error' => 'Chyba',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
 'error_occured' => 'Vyskytla sa chyba',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Španielčina',
 'event_details' => 'Detail udalosti',
 'exclude_items' => '',
@@ -523,6 +528,7 @@ URL: [url]',
 'missing_checksum' => '',
 'missing_file' => '',
 'missing_filesize' => '',
+'missing_request_object' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Pondelok',
 'monday_abbr' => '',
@@ -1120,6 +1126,10 @@ URL: [url]',
 'submit_userinfo' => '',
 'substitute_to_user' => '',
 'substitute_user' => 'Nahradiť používateľa',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Nedeľa',
 'sunday_abbr' => '',
 'sv_SE' => 'Švédština',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 82eb47468..9146fc140 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Godkänn',
+'access_control' => '',
 'access_denied' => 'Åtkomst nekas.',
 'access_inheritance' => 'Ärv åtkomst',
 'access_mode' => 'Åtkomstnivå',
@@ -387,9 +388,13 @@ URL: [url]',
 'en_GB' => 'engelska (GB)',
 'equal_transition_states' => 'Start and slut status är lika',
 'error' => 'Fel',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Inget dokument har valts',
 'error_no_folder_selected' => 'Ingen katalog har valts',
 'error_occured' => 'Ett fel har inträffat.',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'spanska',
 'event_details' => 'Händelseinställningar',
 'exclude_items' => '',
@@ -588,6 +593,7 @@ URL: [url]',
 'missing_checksum' => 'Checksumma saknas',
 'missing_file' => '',
 'missing_filesize' => 'Filstorlek saknas',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Användare/grupp saknas för övergång',
 'monday' => 'måndag',
 'monday_abbr' => 'må',
@@ -1251,6 +1257,10 @@ URL: [url]',
 'submit_userinfo' => 'Skicka info',
 'substitute_to_user' => '',
 'substitute_user' => 'Byt användare',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'söndag',
 'sunday_abbr' => 'sö',
 'sv_SE' => 'svenska',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 1a2568f9d..7f366e160 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Kabul',
+'access_control' => '',
 'access_denied' => 'Erişim engellendi.',
 'access_inheritance' => 'Devredilen Erişim',
 'access_mode' => 'Erişim modu',
@@ -393,9 +394,13 @@ URL: [url]',
 'en_GB' => 'İngilizce',
 'equal_transition_states' => 'Başlangıç ve bitiş durumları eşit',
 'error' => 'Hata',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Hiçbir doküman seçilmedi',
 'error_no_folder_selected' => 'Hiçbir klasör seçilmedi',
 'error_occured' => 'Bir hata oluştu',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'İspanyolca',
 'event_details' => 'Etkinkil detayları',
 'exclude_items' => '',
@@ -594,6 +599,7 @@ URL: [url]',
 'missing_checksum' => 'Sağlama toplamı eksik',
 'missing_file' => '',
 'missing_filesize' => 'Dosya boyutu eksik',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Geçiş için kullanıcı/grup bilgisi eksik',
 'monday' => 'Pazartesi',
 'monday_abbr' => 'Pzt',
@@ -1267,6 +1273,10 @@ URL: [url]',
 'submit_userinfo' => 'Bilgi gönder',
 'substitute_to_user' => '',
 'substitute_user' => 'Kullanıcının Yerine Geç',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Pazar',
 'sunday_abbr' => 'Pa',
 'sv_SE' => 'İsveççe',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 7001bf174..6d29e7a1b 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => 'Прийняти',
+'access_control' => '',
 'access_denied' => 'Доступ заборонений',
 'access_inheritance' => 'Наслідування доступу',
 'access_mode' => 'Режим доступу',
@@ -399,9 +400,13 @@ URL: [url]',
 'en_GB' => 'English (GB)',
 'equal_transition_states' => 'Однакові початковий і кінцевий статуси',
 'error' => 'Помилка',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => 'Немає вибраних документів',
 'error_no_folder_selected' => 'Немає вибраних каталогів',
 'error_occured' => 'Виникла помилка',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => 'Spanish',
 'event_details' => 'Інформація про подію',
 'exclude_items' => '',
@@ -600,6 +605,7 @@ URL: [url]',
 'missing_checksum' => 'Відсутня контрольна сума',
 'missing_file' => '',
 'missing_filesize' => 'Відсутній розмір файлу',
+'missing_request_object' => '',
 'missing_transition_user_group' => 'Відсутній користувач/група для зміни.',
 'monday' => 'Понеділок',
 'monday_abbr' => 'Пн',
@@ -1278,6 +1284,10 @@ URL: [url]',
 'submit_userinfo' => 'Відправити інформацію',
 'substitute_to_user' => 'Перемикнутися на \'[username]\'',
 'substitute_user' => 'Перемикнутися',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Неділя',
 'sunday_abbr' => 'Нд',
 'sv_SE' => 'Swedish',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 5a98ef339..6eea4b7fe 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,10 +19,11 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (628), fengjohn (5)
+//    Translators: Admin (629), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
+'access_control' => '',
 'access_denied' => '拒绝访问',
 'access_inheritance' => '继承访问权限',
 'access_mode' => '访问模式',
@@ -187,7 +188,7 @@ URL: [url]',
 'chart_docspermonth_title' => '每月创建的新文档',
 'chart_docsperstatus_title' => '',
 'chart_docsperuser_title' => '',
-'chart_selection' => '',
+'chart_selection' => '选择报表',
 'chart_sizeperuser_title' => '',
 'checkedout_file_has_different_version' => '',
 'checkedout_file_has_disappeared' => '',
@@ -348,9 +349,13 @@ URL: [url]',
 'en_GB' => '英语',
 'equal_transition_states' => '',
 'error' => '错误',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => '请选择文档',
 'error_no_folder_selected' => '请选择文件夹',
 'error_occured' => '出错',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => '西班牙语',
 'event_details' => '错误详情',
 'exclude_items' => '',
@@ -525,6 +530,7 @@ URL: [url]',
 'missing_checksum' => '缺失校验',
 'missing_file' => '',
 'missing_filesize' => '缺失文件大小',
+'missing_request_object' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Monday',
 'monday_abbr' => '',
@@ -1122,6 +1128,10 @@ URL: [url]',
 'submit_userinfo' => '',
 'substitute_to_user' => '',
 'substitute_user' => '代理人',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Sunday',
 'sunday_abbr' => '',
 'sv_SE' => '瑞典语',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 6228eea97..b42f9950a 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -23,6 +23,7 @@
 
 $text = array(
 'accept' => '接受',
+'access_control' => '',
 'access_denied' => '拒絕訪問',
 'access_inheritance' => '繼承存取權限',
 'access_mode' => '訪問模式',
@@ -346,9 +347,13 @@ URL: [url]',
 'en_GB' => '英語',
 'equal_transition_states' => '',
 'error' => '',
+'error_add_aro' => '',
+'error_add_permission' => '',
 'error_no_document_selected' => '請選擇文檔',
 'error_no_folder_selected' => '請選擇資料夾',
 'error_occured' => '出錯',
+'error_remove_permission' => '',
+'error_toogle_permission' => '',
 'es_ES' => '西班牙語',
 'event_details' => '錯誤詳情',
 'exclude_items' => '',
@@ -523,6 +528,7 @@ URL: [url]',
 'missing_checksum' => '',
 'missing_file' => '',
 'missing_filesize' => '',
+'missing_request_object' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Monday',
 'monday_abbr' => '',
@@ -1120,6 +1126,10 @@ URL: [url]',
 'submit_userinfo' => '',
 'substitute_to_user' => '',
 'substitute_user' => '代理人',
+'success_add_aro' => '',
+'success_add_permission' => '',
+'success_remove_permission' => '',
+'success_toogle_permission' => '',
 'sunday' => 'Sunday',
 'sunday_abbr' => '',
 'sv_SE' => '瑞典語',

From c987412482dab5ef7a808c03a0f070ff219218c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Mar 2016 07:06:10 +0100
Subject: [PATCH 0390/2006] set propper messages, add missing commands

---
 op/op.Acl.php | 68 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/op/op.Acl.php b/op/op.Acl.php
index 5d1c2769e..d34723416 100644
--- a/op/op.Acl.php
+++ b/op/op.Acl.php
@@ -39,58 +39,80 @@ if (!$user->isAdmin()) {
 if (isset($_GET["action"])) $action=$_GET["action"];
 else $action=NULL;
 
-if (isset($_GET["aroid"])) {
-	if(!($aro = SeedDMS_Aro::getInstance((int) $_GET["aroid"], $dms))) {
-		$result = array('type'=>'error', 'msg'=>'1'.getMLText("access_denied"));
+if($action == 'add_aro') {
+	if (isset($_GET["roleid"])) {
+		if(!($role = SeedDMS_Core_Role::getInstance((int) $_GET["roleid"], $dms))) {
+			$result = array('type'=>'error', 'msg'=>getMLText("access_denied"));
+			echo json_encode($result);
+			exit;
+		}
+	} else {
+		$result = array('type'=>'error', 'msg'=>getMLText("access_denied"));
 		echo json_encode($result);
 		exit;
 	}
-} else {
-	$result = array('type'=>'error', 'msg'=>'2'.getMLText("access_denied"));
-	echo json_encode($result);
-	exit;
-}
 
-if (isset($_GET["acoid"])) {
-	if(!($aco = SeedDMS_Aco::getInstance((int) $_GET["acoid"], $dms))) {
-		$result = array('type'=>'error', 'msg'=>'3'.getMLText("access_denied"));
+} else {
+	if (isset($_GET["aroid"])) {
+		if(!($aro = SeedDMS_Aro::getInstance((int) $_GET["aroid"], $dms))) {
+			$result = array('type'=>'error', 'msg'=>getMLText("access_denied"));
+			echo json_encode($result);
+			exit;
+		}
+	} else {
+		$result = array('type'=>'error', 'msg'=>getMLText("access_denied"));
+		echo json_encode($result);
+		exit;
+	}
+
+	if (isset($_GET["acoid"])) {
+		if(!($aco = SeedDMS_Aco::getInstance((int) $_GET["acoid"], $dms))) {
+			$result = array('type'=>'error', 'msg'=>getMLText("access_denied"));
+			echo json_encode($result);
+			exit;
+		}
+	} else {
+		$result = array('type'=>'error', 'msg'=>getMLText("access_denied"));
 		echo json_encode($result);
 		exit;
 	}
-} else {
-	$result = array('type'=>'error', 'msg'=>'4'.getMLText("access_denied"));
-	echo json_encode($result);
-	exit;
 }
 
 switch($action) {
 case "toggle_permission":
 	$acl = new SeedDMS_Acl($dms);
 	if($acl->toggle($aro, $aco))
-		$result = array('type'=>'success', 'msg'=>'lasjfl');
+		$result = array('type'=>'success', 'msg'=>getMLText('success_toogle_permission'));
 	else
-		$result = array('type'=>'error', 'msg'=>'lasjfl');
+		$result = array('type'=>'error', 'msg'=>getMLText('error_toogle_permission'));
 	header('Content-Type: application/json');
 	echo json_encode($result);
 	break;
 case "add_permission":
 	$acl = new SeedDMS_Acl($dms);
 	if($acl->add($aro, $aco))
-		$result = array('type'=>'success', 'msg'=>'lasjfl');
+		$result = array('type'=>'success', 'msg'=>getMLText('success_add_permission'));
 	else
-		$result = array('type'=>'error', 'msg'=>'lasjfl');
+		$result = array('type'=>'error', 'msg'=>getMLText('error_add_permission'));
 	header('Content-Type: application/json');
-	$result = array('type'=>'success', 'msg'=>'lasjfl');
 	echo json_encode($result);
 	break;
 case "remove_permission":
 	$acl = new SeedDMS_Acl($dms);
 	if($acl->remove($aro, $aco))
-		$result = array('type'=>'success', 'msg'=>'lasjfl');
+		$result = array('type'=>'success', 'msg'=>getMLText('success_remove_permission'));
 	else
-		$result = array('type'=>'error', 'msg'=>'lasjfl');
+		$result = array('type'=>'error', 'msg'=>getMLText('error_remove_permission'));
+	header('Content-Type: application/json');
+	echo json_encode($result);
+	break;
+case "add_aro":
+	if(SeedDMS_Aro::getInstance($role, $dms)) {
+		$result = array('type'=>'success', 'msg'=>getMLText('success_add_aro'));
+	} else {
+		$result = array('type'=>'error', 'msg'=>getMLText('error_add_aro'));
+	}
 	header('Content-Type: application/json');
-	$result = array('type'=>'success', 'msg'=>'lasjfl');
 	echo json_encode($result);
 	break;
 }

From e089cc898c022708f1e9a733effe088a59d66627 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Mar 2016 07:08:42 +0100
Subject: [PATCH 0391/2006] add button for adding missing aro

---
 views/bootstrap/class.Acl.php | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index cf2b80f09..60121a85b 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -35,7 +35,7 @@ class SeedDMS_View_Acl extends SeedDMS_Bootstrap_Style {
 ?>
 $('#acostree').tree({
 	autoOpen: 0,
-	saveState: 'acostree<?php echo $selrole->getID(); ?>',
+	saveState: 'acostree<?php echo ($selrole ? $selrole->getID() : ''); ?>',
 	openedIcon: '<i class="icon-minus-sign"></i>',
 	closedIcon: '<i class="icon-plus-sign"></i>',
 	onCreateLi: function(node, $li) {
@@ -104,6 +104,22 @@ $('#acostree').on('click', '.jqtree-remove-permission', function(event) {
 	});
 });
 
+$('#add_aro').on('click', function(event) {
+	roleid = $(event.currentTarget).attr('data-roleid');
+	$.ajax('../op/op.Acl.php?action=add_aro&roleid='+roleid, {
+		dataType: 'json',
+		success: function(data, textStatus) {
+			if(data.type == 'success')  {
+				timeout = 1500;
+				window.location='out.Acl.php?action=show&roleid=' + roleid;
+			} else {
+				timeout = 3500;
+			}
+			noty({text: data.msg, type: data.type, dismissQueue: true, layout: 'topRight', theme: 'defaultTheme', timeout: timeout});
+		},
+	});
+});
+
 $(document).ready( function() {
 	$( "#selector" ).change(function() {
 		window.location='out.Acl.php?action=show&roleid=' + $(this).val();
@@ -130,7 +146,7 @@ $(document).ready( function() {
 				$node['id'] = $child->getID();
 				$node['label'] = $child->getAlias();
 				$node['acoid'] = $child->getID();
-				$node['aroid'] = $aro->getID();
+				$node['aroid'] = $aro ? $aro->getID() : 0;
 
 				$nchildren = $this->_tree($aro, $child);
 				if($nchildren) {
@@ -164,7 +180,7 @@ $(document).ready( function() {
 				$tree['id'] = $aco->getID();
 				$tree['label'] = $aco->getAlias();
 				$tree['acoid'] = $aco->getID();
-				$tree['aroid'] = $aro->getID();
+				$tree['aroid'] = $aro ? $aro->getID() : 0;
 				$tree['is_folder'] = true;
 				$tree['children'] = $this->_tree($aro, $aco);
 				$result[] = $tree;
@@ -187,7 +203,7 @@ $(document).ready( function() {
 <div class="row-fluid">
 <div class="span4">
 <?php
-		$this->contentHeading("Role");
+		$this->contentHeading(getMLText("role"));
 ?>
 <select class="chzn-select" id="selector">
 	<option value="-1"><?php echo getMLText("choose_role")?>
@@ -201,9 +217,18 @@ $(document).ready( function() {
 
 <div class="span8">
 <?php
-		$this->contentHeading("Acl");
+		$this->contentHeading(getMLText("access_control"));
+
+		$aro = SeedDMS_Aro::getInstance($selrole, $dms);
+		if(!$aro) {
+			$this->warningMsg(getMLText("missing_request_object"));
+			echo "<button id=\"add_aro\" class=\"btn btn-primary\" data-roleid=\"".$selrole->getID()."\">".getMLText('add')."</button>";
+		} else {
 ?>
 	<div id="acostree" data-url="out.Acl.php?action=tree&roleid=<?= ($selrole ? $selrole->getID() : 0) ?>">Berechtigungen werden geladen ...</div>
+<?php
+		}
+?>
 </div>
 </div>
 <?php

From 8985748f8a0afcb64f5ce9a5193d4c9d79bba22b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Mar 2016 07:37:26 +0100
Subject: [PATCH 0392/2006] use new instanciation of view

---
 out/out.FolderNotify.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/out/out.FolderNotify.php b/out/out.FolderNotify.php
index c72e5c87c..410c4f77c 100644
--- a/out/out.FolderNotify.php
+++ b/out/out.FolderNotify.php
@@ -27,6 +27,9 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
@@ -43,10 +46,12 @@ if ($folder->getAccessMode($user) < M_READ) {
 $allUsers = $dms->getAllUsers($settings->_sortUsersInList);
 $allGroups = $dms->getAllGroups();
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'allusers'=>$allUsers, 'allgroups'=>$allGroups, 'strictformcheck'=>$settings->_strictFormCheck));
 if($view) {
-	$view->show();
+	$view->setParam('folder', $folder);
+	$view->setParam('allusers', $allUsers);
+	$view->setParam('allgroups', $allGroups);
+	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view($_GET);
 	exit;
 }
 

From 51fa5d18e6599cd5f7dc61dd7363b15af4829e20 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Mar 2016 07:39:04 +0100
Subject: [PATCH 0393/2006] enhance AccessOperation by check_view_access()

all methods in SeedDMS_AccessOperation take the object to be checked
as the first parameter. Add new method check_view_access() which
checks if a view may be accessed based on the tables tblAros, tblAcos,
tblArosAcos
---
 inc/inc.ClassAccessOperation.php       | 132 ++++++++++++++-----------
 op/op.ApproveDocument.php              |   4 +-
 op/op.ReceiptDocument.php              |   4 +-
 op/op.ReviewDocument.php               |   4 +-
 op/op.ReviseDocument.php               |   4 +-
 out/out.AddToTransmittal.php           |   2 +-
 out/out.ApproveDocument.php            |   2 +-
 out/out.CheckInDocument.php            |   2 +-
 out/out.DocumentAccess.php             |   2 +-
 out/out.DocumentNotify.php             |   2 +-
 out/out.DocumentVersionDetail.php      |   2 +-
 out/out.EditAttributes.php             |   2 +-
 out/out.EditComment.php                |   2 +-
 out/out.EditDocument.php               |   2 +-
 out/out.MoveDocument.php               |   2 +-
 out/out.OverrideContentStatus.php      |   2 +-
 out/out.ReceiptDocument.php            |   4 +-
 out/out.RemoveDocument.php             |   2 +-
 out/out.RemoveDocumentFile.php         |   2 +-
 out/out.RemoveVersion.php              |   2 +-
 out/out.RemoveWorkflowFromDocument.php |   2 +-
 out/out.ReviewDocument.php             |   4 +-
 out/out.ReviseDocument.php             |   2 +-
 out/out.RewindWorkflow.php             |   2 +-
 out/out.RunSubWorkflow.php             |   2 +-
 out/out.SetExpires.php                 |   2 +-
 out/out.SetRecipients.php              |   2 +-
 out/out.SetReviewersApprovers.php      |   4 +-
 out/out.SetRevisors.php                |   2 +-
 out/out.SetWorkflow.php                |   2 +-
 out/out.TriggerWorkflow.php            |   2 +-
 out/out.UpdateDocument.php             |   2 +-
 out/out.ViewDocument.php               |   2 +-
 out/out.ViewFolder.php                 |   9 +-
 views/bootstrap/class.Bootstrap.php    |   2 +-
 views/bootstrap/class.ViewDocument.php |  32 +++---
 36 files changed, 134 insertions(+), 119 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index a3835eb7a..0e14e7a45 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -11,6 +11,8 @@
  * @version    Release: @package_version@
  */
 
+require_once "inc.ClassAcl.php";
+
 /**
  * Class to check certain access restrictions
  *
@@ -27,12 +29,6 @@ class SeedDMS_AccessOperation {
 	 */
 	private $dms;
 
-	/**
-	 * @var object $obj object being accessed
-	 * @access protected
-	 */
-	private $obj;
-
 	/**
 	 * @var object $user user requesting the access
 	 * @access protected
@@ -45,9 +41,8 @@ class SeedDMS_AccessOperation {
 	 */
 	private $settings;
 
-	function __construct($dms, $obj, $user, $settings) { /* {{{ */
+	function __construct($dms, $user, $settings) { /* {{{ */
 		$this->dms = $dms;
-		$this->obj = $obj;
 		$this->user = $user;
 		$this->settings = $settings;
 	} /* }}} */
@@ -61,10 +56,10 @@ class SeedDMS_AccessOperation {
 	 * document may delete versions. The admin may even delete a version
 	 * even if is disallowed in the settings.
 	 */
-	function mayRemoveVersion() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$versions = $this->obj->getContent();
-			if ((($this->settings->_enableVersionDeletion && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin() ) && (count($versions) > 1)) {
+	function mayRemoveVersion($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$versions = $document->getContent();
+			if ((($this->settings->_enableVersionDeletion && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin() ) && (count($versions) > 1)) {
 				return true;
 			}
 		}
@@ -81,11 +76,11 @@ class SeedDMS_AccessOperation {
 	 * The admin may even modify the status
 	 * even if is disallowed in the settings.
 	 */
-	function mayOverrideStatus() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function mayOverrideStatus($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE)) {
+			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE)) {
 				return true;
 			}
 		}
@@ -101,11 +96,11 @@ class SeedDMS_AccessOperation {
 	 * admin may even set reviewers/approvers if is disallowed in the
 	 * settings.
 	 */
-	function maySetReviewersApprovers() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function maySetReviewersApprovers($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status['status']==S_DRAFT || $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP && $this->settings->_workflowMode == 'traditional_only_approval')) {
+			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status['status']==S_DRAFT || $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP && $this->settings->_workflowMode == 'traditional_only_approval')) {
 				return true;
 			}
 		}
@@ -121,11 +116,11 @@ class SeedDMS_AccessOperation {
 	 * admin may even set recipients if is disallowed in the
 	 * settings.
 	 */
-	function maySetRecipients() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function maySetRecipients($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED)) {
+			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED)) {
 				return true;
 			}
 		}
@@ -141,11 +136,11 @@ class SeedDMS_AccessOperation {
 	 * admin may even set revisors if is disallowed in the
 	 * settings.
 	 */
-	function maySetRevisors() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function maySetRevisors($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
-			if (($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin() /* && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)*/) {
+			if (($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin() /* && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)*/) {
 				return true;
 			}
 		}
@@ -161,11 +156,11 @@ class SeedDMS_AccessOperation {
 	 * admin may even set the workflow if is disallowed in the
 	 * settings.
 	 */
-	function maySetWorkflow() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function maySetWorkflow($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$workflow = $latestContent->getWorkflow();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
+			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
 				return true;
 			}
 		}
@@ -178,11 +173,11 @@ class SeedDMS_AccessOperation {
 	 * This check can only be done for documents. Setting the documents
 	 * expiration date is only allowed if the document has not been obsoleted.
 	 */
-	function maySetExpires() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function maySetExpires($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->obj->getAccessMode($this->user) == M_ALL) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
+			if ((($document->getAccessMode($this->user) == M_ALL) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
 				return true;
 			}
 		}
@@ -198,17 +193,17 @@ class SeedDMS_AccessOperation {
 	 * The admin may set the comment even if is
 	 * disallowed in the settings.
 	 */
-	function mayEditComment() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			if($this->obj->isLocked()) {
-				$lockingUser = $this->obj->getLockingUser();
-				if (($lockingUser->getID() != $this->user->getID()) && ($this->obj->getAccessMode($this->user) != M_ALL)) {
+	function mayEditComment($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			if($document->isLocked()) {
+				$lockingUser = $document->getLockingUser();
+				if (($lockingUser->getID() != $this->user->getID()) && ($document->getAccessMode($this->user) != M_ALL)) {
 					return false;
 				}
 			}
-			$latestContent = $this->obj->getLatestContent();
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
+			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
 				return true;
 			}
 		}
@@ -224,12 +219,12 @@ class SeedDMS_AccessOperation {
 	 * The admin may set the comment even if is
 	 * disallowed in the settings.
 	 */
-	function mayEditAttributes() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function mayEditAttributes($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
 			$workflow = $latestContent->getWorkflow();
-			if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT_REV || ($workflow && $workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
+			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT_REV || ($workflow && $workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
 				return true;
 			}
 		}
@@ -243,9 +238,9 @@ class SeedDMS_AccessOperation {
 	 * obsoleted. There are other requirements which are not taken into
 	 * account here.
 	 */
-	function mayReview() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function mayReview($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
 			if ($status["status"]!=S_OBSOLETE) {
 				return true;
@@ -262,9 +257,9 @@ class SeedDMS_AccessOperation {
 	 * There are other requirements which are not taken into
 	 * account here.
 	 */
-	function mayApprove() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function mayApprove($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
 			if ($status["status"]!=S_OBSOLETE && $status["status"]!=S_DRAFT_REV && $status["status"]!=S_REJECTED) {
 				return true;
@@ -280,9 +275,9 @@ class SeedDMS_AccessOperation {
 	 * obsoleted. There are other requirements which are not taken into
 	 * account here.
 	 */
-	function mayReceipt() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function mayReceipt($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
 			if ($status["status"]!=S_OBSOLETE) {
 				return true;
@@ -298,9 +293,9 @@ class SeedDMS_AccessOperation {
 	 * obsoleted. There are other requirements which are not taken into
 	 * account here.
 	 */
-	function mayRevise() { /* {{{ */
-		if(get_class($this->obj) == $this->dms->getClassname('document')) {
-			$latestContent = $this->obj->getLatestContent();
+	function mayRevise($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
 			if ($status["status"]!=S_OBSOLETE) {
 				return true;
@@ -309,5 +304,24 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check for access permission
+	 *
+	 * @param object $dms Instanz of dms
+	 * @param object $role role of currently logged in user
+	 * @param string $scope 'Views', 'Controllers'
+	 * @param string $script Scriptname without 'out.' and '.php'
+	 * @param string $get query parameters
+	 * @return boolean true if access is allowed otherwise false
+	 */
+	function check_view_access($view, $get=array()) { /* {{{ */
+		$scope = 'Views';
+		$script = $view->getParam('class');
+		$action = (isset($get['action']) && $get['action']) ? $get['action'] : 'show';
+		$acl = new SeedDMS_Acl($this->dms);
+		$aro = SeedDMS_Aro::getInstance($this->user->getRole(), $this->dms);
+		$aco = SeedDMS_Aco::getInstance($scope.'/'.$script.'/'.$action, $this->dms);
+		return $acl->check($aro, $aco);
+	} /* }}} */
 }
 ?>
diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 9c4886feb..8557f5f39 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -74,11 +74,11 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $olddocstatus = $content->getStatus();
 // verify if document may be approved
-if (!$accessop->mayApprove()){
+if (!$accessop->mayApprove($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index be0845832..e973019f6 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -73,10 +73,10 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 // verify if document may be receіpted
-if (!$accessop->mayReceipt()){
+if (!$accessop->mayReceipt($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index ff661f2f4..8d55437da 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -73,11 +73,11 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $olddocstatus = $content->getStatus();
 // verify if document may be reviewed
-if (!$accessop->mayReview()){
+if (!$accessop->mayReview($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index cc8d9fbb4..cd7c65e18 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -73,11 +73,11 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $olddocstatus = $content->getStatus();
 // verify if document maybe revised
-if (!$document->mayRevise()){
+if (!$accessop->mayRevise($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
diff --git a/out/out.AddToTransmittal.php b/out/out.AddToTransmittal.php
index 77e5e929e..866895e65 100644
--- a/out/out.AddToTransmittal.php
+++ b/out/out.AddToTransmittal.php
@@ -55,7 +55,7 @@ $folder = $document->getFolder();
 $transmittals = $dms->getAllTransmittals($user);
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
diff --git a/out/out.ApproveDocument.php b/out/out.ApproveDocument.php
index e50c1eaed..5b9e9a640 100644
--- a/out/out.ApproveDocument.php
+++ b/out/out.ApproveDocument.php
@@ -41,7 +41,7 @@ if (!is_object($document)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 if ($document->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index baaf100e6..a85e29399 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -60,7 +60,7 @@ if($settings->_quota > 0) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate));
diff --git a/out/out.DocumentAccess.php b/out/out.DocumentAccess.php
index 8fe5d7931..8afbcddaf 100644
--- a/out/out.DocumentAccess.php
+++ b/out/out.DocumentAccess.php
@@ -47,7 +47,7 @@ $allUsers = $dms->getAllUsers($settings->_sortUsersInList);
 $allGroups = $dms->getAllGroups();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'allusers'=>$allUsers, 'allgroups'=>$allGroups));
diff --git a/out/out.DocumentNotify.php b/out/out.DocumentNotify.php
index 637e55d88..d12abcfdc 100644
--- a/out/out.DocumentNotify.php
+++ b/out/out.DocumentNotify.php
@@ -45,7 +45,7 @@ if ($document->getAccessMode($user) < M_READ) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'sortusersinlist'=>$settings->_sortUsersInList));
diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index 948495549..a3c1f478c 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -67,7 +67,7 @@ if ($latestContent->getVersion()==$version->getVersion()) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewWidthDetail'=>$settings->_previewWidthDetail, 'previewconverters'=>$settings->_converters['preview'], 'cachedir'=>$settings->_cacheDir, 'timeout'=>$settings->_cmdTimeout));
diff --git a/out/out.EditAttributes.php b/out/out.EditAttributes.php
index 064544227..1ee72d7b9 100644
--- a/out/out.EditAttributes.php
+++ b/out/out.EditAttributes.php
@@ -46,7 +46,7 @@ if (!is_object($version)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
 
diff --git a/out/out.EditComment.php b/out/out.EditComment.php
index 63ab52bfb..6b9bf1e1f 100644
--- a/out/out.EditComment.php
+++ b/out/out.EditComment.php
@@ -51,7 +51,7 @@ if (!is_object($version)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'strictformcheck'=>$settings->_strictFormCheck));
diff --git a/out/out.EditDocument.php b/out/out.EditDocument.php
index 096a38674..5ea462ead 100644
--- a/out/out.EditDocument.php
+++ b/out/out.EditDocument.php
@@ -51,7 +51,7 @@ $folder = $document->getFolder();
 $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_all));
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'attrdefs'=>$attrdefs, 'strictformcheck'=>$settings->_strictFormCheck, 'orderby'=>$settings->_sortFoldersDefault));
diff --git a/out/out.MoveDocument.php b/out/out.MoveDocument.php
index 17508401c..8d466ca1f 100644
--- a/out/out.MoveDocument.php
+++ b/out/out.MoveDocument.php
@@ -64,7 +64,7 @@ if(isset($_GET['targetid']) && $_GET['targetid']) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'target'=>$target));
diff --git a/out/out.OverrideContentStatus.php b/out/out.OverrideContentStatus.php
index 2b5e24083..8b5fdd23f 100644
--- a/out/out.OverrideContentStatus.php
+++ b/out/out.OverrideContentStatus.php
@@ -62,7 +62,7 @@ if ($overallStatus["status"] == S_REJECTED || $overallStatus["status"] == S_EXPI
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php
index bd4ea84f6..243749657 100644
--- a/out/out.ReceiptDocument.php
+++ b/out/out.ReceiptDocument.php
@@ -59,10 +59,10 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 // verify if document may be receipted
-if (!$accessop->mayReceipt()){
+if (!$accessop->mayReceipt($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
diff --git a/out/out.RemoveDocument.php b/out/out.RemoveDocument.php
index f4accdcbf..e5d848948 100644
--- a/out/out.RemoveDocument.php
+++ b/out/out.RemoveDocument.php
@@ -51,7 +51,7 @@ if($document->isLocked()) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document));
diff --git a/out/out.RemoveDocumentFile.php b/out/out.RemoveDocumentFile.php
index 553148079..e10c417b4 100644
--- a/out/out.RemoveDocumentFile.php
+++ b/out/out.RemoveDocumentFile.php
@@ -53,7 +53,7 @@ if (($document->getAccessMode($user) < M_ALL)&&($user->getID()!=$file->getUserID
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'file'=>$file));
diff --git a/out/out.RemoveVersion.php b/out/out.RemoveVersion.php
index faa0cea33..e71278aaa 100644
--- a/out/out.RemoveVersion.php
+++ b/out/out.RemoveVersion.php
@@ -60,7 +60,7 @@ if (!is_object($version)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version));
diff --git a/out/out.RemoveWorkflowFromDocument.php b/out/out.RemoveWorkflowFromDocument.php
index 074425b4d..840372e22 100644
--- a/out/out.RemoveWorkflowFromDocument.php
+++ b/out/out.RemoveWorkflowFromDocument.php
@@ -60,7 +60,7 @@ if (!is_object($workflow)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version));
diff --git a/out/out.ReviewDocument.php b/out/out.ReviewDocument.php
index 063f53de3..049192d01 100644
--- a/out/out.ReviewDocument.php
+++ b/out/out.ReviewDocument.php
@@ -60,10 +60,10 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 // verify if document may be reviewed
-if (!$accessop->mayReview()){
+if (!$accessop->mayReview($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
diff --git a/out/out.ReviseDocument.php b/out/out.ReviseDocument.php
index abee2132a..a57da7231 100644
--- a/out/out.ReviseDocument.php
+++ b/out/out.ReviseDocument.php
@@ -60,7 +60,7 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 // verify if document maybe revised
 if (!$document->mayRevise()){
diff --git a/out/out.RewindWorkflow.php b/out/out.RewindWorkflow.php
index 074425b4d..840372e22 100644
--- a/out/out.RewindWorkflow.php
+++ b/out/out.RewindWorkflow.php
@@ -60,7 +60,7 @@ if (!is_object($workflow)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version));
diff --git a/out/out.RunSubWorkflow.php b/out/out.RunSubWorkflow.php
index 8105e566a..049d9423f 100644
--- a/out/out.RunSubWorkflow.php
+++ b/out/out.RunSubWorkflow.php
@@ -65,7 +65,7 @@ if (!is_object($subworkflow)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'subworkflow'=>$subworkflow));
diff --git a/out/out.SetExpires.php b/out/out.SetExpires.php
index df3c1b878..7da6e88db 100644
--- a/out/out.SetExpires.php
+++ b/out/out.SetExpires.php
@@ -44,7 +44,7 @@ if ($document->getAccessMode($user) < M_READWRITE) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document));
diff --git a/out/out.SetRecipients.php b/out/out.SetRecipients.php
index a19f9d48e..fa8e3b4d2 100644
--- a/out/out.SetRecipients.php
+++ b/out/out.SetRecipients.php
@@ -58,7 +58,7 @@ if(!$settings->_enableVersionModification) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp));
diff --git a/out/out.SetReviewersApprovers.php b/out/out.SetReviewersApprovers.php
index b1e5c3d90..c43882400 100644
--- a/out/out.SetReviewersApprovers.php
+++ b/out/out.SetReviewersApprovers.php
@@ -55,8 +55,8 @@ if(!$settings->_enableVersionModification) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
-if (!$accessop->maySetReviewersApprovers()) {
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->maySetReviewersApprovers($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("cannot_assign_invalid_state"));
 }
 
diff --git a/out/out.SetRevisors.php b/out/out.SetRevisors.php
index 6e45232ae..47a2bef12 100644
--- a/out/out.SetRevisors.php
+++ b/out/out.SetRevisors.php
@@ -58,7 +58,7 @@ if(!$settings->_enableVersionModification) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
diff --git a/out/out.SetWorkflow.php b/out/out.SetWorkflow.php
index 0b6aa6216..250a8e249 100644
--- a/out/out.SetWorkflow.php
+++ b/out/out.SetWorkflow.php
@@ -51,7 +51,7 @@ if (!is_object($version)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version));
diff --git a/out/out.TriggerWorkflow.php b/out/out.TriggerWorkflow.php
index 4c8a2de7b..aa20b4843 100644
--- a/out/out.TriggerWorkflow.php
+++ b/out/out.TriggerWorkflow.php
@@ -61,7 +61,7 @@ if (!is_object($transition)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'transition'=>$transition));
diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php
index e1ee91a71..cdaf5d181 100644
--- a/out/out.UpdateDocument.php
+++ b/out/out.UpdateDocument.php
@@ -58,7 +58,7 @@ if($settings->_quota > 0) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate));
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 3fef0230e..27a10ec38 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -49,7 +49,7 @@ if (!is_object($document)) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $folder = $document->getFolder();
 
diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index 008788dcb..1c4a1b622 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -26,7 +26,7 @@ include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAcl.php");
+include("../inc/inc.ClassAccessOperation.php");
 
 /**
  * Include class to preview documents
@@ -35,9 +35,10 @@ require_once("SeedDMS/Preview.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-
-//$aro = SeedDMS_Aro::getInstance($user->getRole(), $dms);
-//$aco = SeedDMS_Aco::getInstance('Views/'.$tmp[1], $dms);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if(!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError("", getMLText("access_denied"));
+}
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	$folderid = $settings->_rootFolderID;
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 891ba0243..cd9279c2f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -579,7 +579,7 @@ $(document).ready(function () {
 					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 				}
 			}
-			if($this->params['accessobject']->maySetExpires()) {
+			if($this->params['accessobject']->maySetExpires($document)) {
 				$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>'expires');
 			//	$menuitems[''] = array('link'=>"", 'label'=>'');
 			}
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 1511db706..c5ab56585 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -521,42 +521,42 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		/* Only admin has the right to remove version in any case or a regular
 		 * user if enableVersionDeletion is on
 		 */
-		if($accessop->mayRemoveVersion()) {
+		if($accessop->mayRemoveVersion($document)) {
 			print "<li><a href=\"out.RemoveVersion.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
 		}
-		if($accessop->mayOverrideStatus()) {
+		if($accessop->mayOverrideStatus($document)) {
 			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
 		}
-		if($accessop->maySetRecipients()) {
+		if($accessop->maySetRecipients($document)) {
 			print "<li><a href='../out/out.SetRecipients.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-check\"></i>".getMLText("change_recipients")."</a></li>";
 		}
-		if($accessop->maySetRevisors()) {
+		if($accessop->maySetRevisors($document)) {
 			print "<li><a href='../out/out.SetRevisors.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-refresh\"></i>".getMLText("change_revisors")."</a></li>";
 		}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
-			if($accessop->maySetReviewersApprovers()) {
+			if($accessop->maySetReviewersApprovers($document)) {
 				print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_assignments")."</a></li>";
 			}
 		} else {
-			if($accessop->maySetWorkflow()) {
+			if($accessop->maySetWorkflow($document)) {
 				if(!$workflow) {
 					print "<li><a href='../out/out.SetWorkflow.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-random\"></i>".getMLText("set_workflow")."</a></li>";
 				}
 			}
 		}
 		/*
-		if($accessop->maySetExpires()) {
+		if($accessop->maySetExpires($document)) {
 			print "<li><a href='../out/out.SetExpires.php?documentid=".$documentid."'><i class=\"icon-time\"></i>".getMLText("set_expiry")."</a></li>";
 		}
 		 */
 		if($dms->getAllTransmittals($user)) {
 			print "<li><a href=\"out.AddToTransmittal.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-list\"></i>".getMLText("add_to_transmittal")."</a></li>";
 		}
-		if($accessop->mayEditComment()) {
+		if($accessop->mayEditComment($document)) {
 			print "<li><a href=\"out.EditComment.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";
 		}
-		if($accessop->mayEditAttributes()) {
+		if($accessop->mayEditAttributes($document)) {
 			print "<li><a href=\"out.EditAttributes.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
 		}
 
@@ -676,7 +676,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".getReviewStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 
-				if($accessop->mayReview()) {
+				if($accessop->mayReview($document)) {
 					if ($is_reviewer && $r["status"]==0) {
 						print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-mini\">".getMLText("add_review")."</a></li>";
 					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
@@ -745,7 +745,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 
-				if($accessop->mayApprove()) {
+				if($accessop->mayApprove($document)) {
 					if ($is_approver && $a['status'] == 0 /*$status["status"]==S_DRAFT_APP*/) {
 						print "<li><a class=\"btn btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."</a></li>";
 					}else if (($updateUser==$user)&&(($a["status"]==1)||($a["status"]==-1))&&(!$document->hasExpired())){
@@ -1028,7 +1028,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".getReceiptStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 
-				if($accessop->mayReceipt()) {
+				if($accessop->mayReceipt($document)) {
 					if ($is_recipient && $r["status"]==0) {
 						print "<li><a href=\"../out/out.ReceiptDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("add_receipt")."</a></li>";
 					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
@@ -1130,7 +1130,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".getRevisionStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 
-				if($accessop->mayRevise()) {
+				if($accessop->mayRevise($document)) {
 					if ($is_recipient && $r["status"]==0) {
 						print "<li><a href=\"../out/out.ReviseDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&revisionid=".$r['revisionID']."\" class=\"btn btn-mini\">".getMLText("add_revision")."</a></li>";
 					} elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
@@ -1242,13 +1242,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				/* Only admin has the right to remove version in any case or a regular
 				 * user if enableVersionDeletion is on
 				 */
-				if($accessop->mayRemoveVersion()) {
+				if($accessop->mayRemoveVersion($document)) {
 					print "<li><a href=\"out.RemoveVersion.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
 				}
-				if($accessop->mayEditComment()) {
+				if($accessop->mayEditComment($document)) {
 					print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";
 				}
-				if($accessop->mayEditAttributes()) {
+				if($accessop->mayEditAttributes($document)) {
 					print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
 				}
 				print "<li><a href='../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version->getVersion()."'><i class=\"icon-info-sign\"></i>".getMLText("details")."</a></li>";

From 42e168a1fc633d7d9c4653bc5b9aa803769ad9e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:23:55 +0100
Subject: [PATCH 0394/2006] pass object of role to constructor in
 getAllInstances()

---
 SeedDMS_Core/Core/inc.ClassUser.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index c157c7d33..9f07ec8cf 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -421,8 +421,10 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$users = array();
 
+		$classname = $dms->getClassname('role');
 		for ($i = 0; $i < count($resArr); $i++) {
-			$user = new self($resArr[$i]["id"], $resArr[$i]["login"], $resArr[$i]["pwd"], $resArr[$i]["fullName"], $resArr[$i]["email"], (isset($resArr[$i]["language"])?$resArr[$i]["language"]:NULL), (isset($resArr[$i]["theme"])?$resArr[$i]["theme"]:NULL), $resArr[$i]["comment"], $resArr[$i]["role"], $resArr[$i]["hidden"], $resArr[$i]["disabled"], $resArr[$i]["pwdExpiration"], $resArr[$i]["loginfailures"], $resArr[$i]["quota"], $resArr[$i]["homefolder"]);
+			$role = $classname::getInstance($resArr[$i]['role'], $dms);
+			$user = new self($resArr[$i]["id"], $resArr[$i]["login"], $resArr[$i]["pwd"], $resArr[$i]["fullName"], $resArr[$i]["email"], (isset($resArr[$i]["language"])?$resArr[$i]["language"]:NULL), (isset($resArr[$i]["theme"])?$resArr[$i]["theme"]:NULL), $resArr[$i]["comment"], $role, $resArr[$i]["hidden"], $resArr[$i]["disabled"], $resArr[$i]["pwdExpiration"], $resArr[$i]["loginfailures"], $resArr[$i]["quota"], $resArr[$i]["homefolder"]);
 			$user->setDMS($dms);
 			$users[$i] = $user;
 		}

From f84c8eedd20ce1a5b55e9ce8980ef6d87f05c2cc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:25:18 +0100
Subject: [PATCH 0395/2006] add parameter to turn off/on advanced acl

---
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 8e92d69c8..9e3c2837e 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -139,6 +139,8 @@ class Settings { /* {{{ */
 	var $_enableDuplicateDocNames = true;
 	// override mimetype set by browser when uploading a file
 	var $_overrideMimeType = false;
+	// advanced access control lists
+	var $_advancedAcl = false;
 	// enable/disable notification when added as a reviewer/approver
 	var $_enableNotificationAppRev = true;
 	// enable/disable notification of users/group who need to take action for
@@ -541,6 +543,7 @@ class Settings { /* {{{ */
 		$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
 		$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
 		$this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]);
+		$this->_advancedAcl = Settings::boolval($tab["advancedAcl"]);
 
 		// XML Path: /configuration/advanced/notification
 		$node = $xml->xpath('/configuration/advanced/notification');
@@ -843,6 +846,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
     $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
     $this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType);
+    $this->setXMLAttributValue($node, "advancedAcl", $this->_advancedAcl);
 
     // XML Path: /configuration/advanced/notification
     $node = $this->getXMLNode($xml, '/configuration/advanced', 'notification');
diff --git a/op/op.Settings.php b/op/op.Settings.php
index a96dc4c66..4115e98aa 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -166,6 +166,7 @@ if ($action == "saveSettings")
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
   $settings->_overrideMimeType = getBoolValue("overrideMimeType");
+  $settings->_advancedAcl = getBoolValue("advancedAcl");
 
   // SETTINGS - ADVANCED - NOTIFICATION
   $settings->_enableOwnerNotification = getBoolValue("enableOwnerNotification");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 93bc24cf4..4d1b94f3d 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -629,6 +629,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_overrideMimeType");?>:</td>
         <td><input name="overrideMimeType" type="checkbox" <?php if ($settings->_overrideMimeType) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_advancedAcl_desc");?>">
+        <td><?php printMLText("settings_advancedAcl");?>:</td>
+        <td><input name="advancedAcl" type="checkbox" <?php if ($settings->_advancedAcl) echo "checked" ?> /></td>
+      </tr>
 
       <!--
         -- SETTINGS - ADVANCED - NOTIFICATION

From 1fe2b3bdc29ec08412371599f083e71358424a46 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:26:27 +0100
Subject: [PATCH 0396/2006] some code clean up, change varialbe dms to _dms

---
 inc/inc.ClassAcl.php | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index 87d6c413b..b8fcc3ae5 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -125,7 +125,7 @@ class SeedDMS_AroAco { /* {{{ */
 	 * @var object $dms reference to dms object.
 	 * @access protected
 	 */
-	public $dms;
+	public $_dms;
 
 	/**
 	 * @var integer id of access request object
@@ -154,7 +154,7 @@ class SeedDMS_AroAco { /* {{{ */
 	 * @return object instance of SeedDMS_Aco
 	 */
 	function __construct($dms, $id, $parent, $object, $alias) { /* {{{ */
-		$this->dmѕ = $dms;
+		$this->_dmѕ = $dms;
 		$this->_id = $id;
 		$this->_parent = $parent;
 		$this->_object = $object;
@@ -162,11 +162,11 @@ class SeedDMS_AroAco { /* {{{ */
 	} /* }}} */
 
 	public function setDMS($dms) { /* {{{ */
-		$this->dms = $dms;
+		$this->_dms = $dms;
 	} /* }}} */
 
 	public function getDMS() { /* {{{ */
-		return($this->dms);
+		return($this->_dms);
 	} /* }}} */
 
 	public function getID() { /* {{{ */
@@ -201,10 +201,6 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 	 * @param object $dms object to access the underlying database
 	 * @return object instance of SeedDMS_Aro
 	 */
-	function __construct($dms, $id, $parent, $object, $alias) { /* {{{ */
-		parent::__construct($dms, $id, $parent, $object, $alias);
-	} /* }}} */
-
 	public static function getInstance($id, $dms) { /* {{{ */
 		$db = $dms->getDB();
 		if(is_int($id)) {
@@ -243,7 +239,8 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 			$object = null;
 		}
 
-		$aro = new self($dms, $resArr["id"], $resArr['parent'], $object, $resArr['alias']);
+		$aro = new SeedDMS_Aro($dms, $resArr["id"], $resArr['parent'], $object, $resArr['alias']);
+		$aro->setDMS($dms);
 		return $aro;
 	} /* }}} */
 
@@ -268,10 +265,6 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 	 * @param object $dms object to access the underlying database
 	 * @return object instance of SeedDMS_Aco
 	 */
-//	function __construct($dms, $id, $object, $alias) { /* {{{ */
-//		parent::__construct($dms, $id, $object, $alias);
-//	} /* }}} */
-
 	public static function getInstance($id, $dms) { /* {{{ */
 		$db = $dms->getDB();
 		if(is_int($id)) {

From bd3fbd5cf764e8cc5897b38c1a2b8b008b796ef8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:27:29 +0100
Subject: [PATCH 0397/2006] cache aro, first param of check_view_access() can
 be string, array, object

---
 inc/inc.ClassAccessOperation.php | 43 ++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 0e14e7a45..4491f8564 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -27,19 +27,25 @@ class SeedDMS_AccessOperation {
 	 * @var object $dms reference to dms
 	 * @access protected
 	 */
-	private $dms;
+	protected $dms;
 
 	/**
 	 * @var object $user user requesting the access
 	 * @access protected
 	 */
-	private $user;
+	protected $user;
 
 	/**
 	 * @var object $settings SeedDMS Settings
 	 * @access protected
 	 */
-	private $settings;
+	protected $settings;
+
+	/**
+	 * @var object $aro access request object for caching
+	 * @access protected
+	 */
+	private $_aro;
 
 	function __construct($dms, $user, $settings) { /* {{{ */
 		$this->dms = $dms;
@@ -307,21 +313,36 @@ class SeedDMS_AccessOperation {
 	/**
 	 * Check for access permission
 	 *
-	 * @param object $dms Instanz of dms
-	 * @param object $role role of currently logged in user
-	 * @param string $scope 'Views', 'Controllers'
-	 * @param string $script Scriptname without 'out.' and '.php'
+	 * If the parameter $view is an array then each element is considered the
+	 * name of a view and true will be returned if one is accesible.
+	 *
+	 * @param mixed $view Instanz of view, name of view or array of view names
 	 * @param string $get query parameters
 	 * @return boolean true if access is allowed otherwise false
 	 */
 	function check_view_access($view, $get=array()) { /* {{{ */
+		if(!$this->settings->_advancedAcl)
+			return false;
+		if(is_string($view)) {
+			$scripts = array($view);
+		} elseif(is_array($view)) {
+			$scripts = $view;
+		} elseif(is_subclass_of($view, 'SeedDMS_View_Common')) {
+			$scripts = array($view->getParam('class'));
+		} else {
+			return false;
+		}
 		$scope = 'Views';
-		$script = $view->getParam('class');
 		$action = (isset($get['action']) && $get['action']) ? $get['action'] : 'show';
 		$acl = new SeedDMS_Acl($this->dms);
-		$aro = SeedDMS_Aro::getInstance($this->user->getRole(), $this->dms);
-		$aco = SeedDMS_Aco::getInstance($scope.'/'.$script.'/'.$action, $this->dms);
-		return $acl->check($aro, $aco);
+		if(!$this->_aro)
+			$this->_aro = SeedDMS_Aro::getInstance($this->user->getRole(), $this->dms);
+		foreach($scripts as $script) {
+			$aco = SeedDMS_Aco::getInstance($scope.'/'.$script.'/'.$action, $this->dms);
+			if($acl->check($this->_aro, $aco))
+				return true;
+		}
+		return false;
 	} /* }}} */
 }
 ?>

From 6826e69795e021b6f295021a041d3f1e6ac2d6f6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:28:37 +0100
Subject: [PATCH 0398/2006] add function for creating links, urls, and check
 access

---
 inc/inc.ClassViewCommon.php | 49 +++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 25c00c4a0..34d03937e 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -167,5 +167,54 @@ class SeedDMS_View_Common {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if the access on the view with given name or the current view itself
+	 * may be accessed.
+	 *
+	 * @param string|array $name name of view or list of view names
+	 * @return boolean true if access is allowed otherwise false
+	 */
+	protected function check_access($name='') { /* {{{ */
+		if(!$name)
+			$name = $this;
+		return ((isset($this->params['user']) && $this->params['user']->isAdmin()) || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access($name)));
+	} /* }}} */
+
+	/**
+	 * Create an url to a view
+	 *
+	 * @param string $name name of view
+	 * @param array $urlparams list of url parameters
+	 * @return string $url
+	 */
+	protected function html_url($view='', $urlparams) { /* {{{ */
+		$url = "../out/out.".$view.".php";
+		if($urlparams)
+			$url .= "?".http_build_query($urlparams);
+		return $url;
+	} /* }}} */
+
+	/**
+	 * Create a html link to a view
+	 *
+	 * First checks if the view may be accessed by the user
+	 *
+	 * @param string $name name of view
+	 * @param array $urlparams list of url parameters
+	 * @param array $linkparams list of link attributes (e.g. class, target)
+	 * @param string $link the link text itself
+	 * @param boolean $hsc set to false if htmlspecialchars() shall not be called
+	 * @return string link
+	 */
+	protected function html_link($view='', $urlparams=array(), $linkparams=array(), $link, $hsc=true) { /* {{{ */
+		if(!$this->check_access($view))
+			return '';
+		$url = $this->html_url($view, $urlparams);
+		$tag = "<a href=\"".$url."\"";
+		if($linkparams)
+			array_walk($linkparams, function($v, $k) {$tag .= " ".$k."=\"".$v."\"";});
+		$tag .= ">".($hsc ? htmlspecialchars($link) : $link)."</a>";
+		return $tag;
+	} /* }}} */
 }
 ?>

From 31017fee9d0199a606ca720558c68ea4318fa502 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:33:15 +0100
Subject: [PATCH 0399/2006] fix php error

---
 SeedDMS_Core/Core/inc.ClassGroup.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 55f12317f..9425fccb1 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -151,11 +151,10 @@ class SeedDMS_Core_Group {
 
 			$this->_users = array();
 
-			$classnamerole = $dms->getClassname('role');
-
+			$classnamerole = $this->_dms->getClassname('role');
 			$classname = $this->_dms->getClassname('user');
 			foreach ($resArr as $row) {
-				$role = $classnamerole::getInstance($row['role'], $dms);
+				$role = $classnamerole::getInstance($row['role'], $this->_dms);
 				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $role, $row['hidden']);
 				$user->setDMS($this->_dms);
 				array_push($this->_users, $user);

From 0909d43bcf0a09628041b81b09d88040dda633df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:34:47 +0100
Subject: [PATCH 0400/2006] minor code cleanup

---
 out/out.ViewDocument.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 27a10ec38..b59b09853 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -36,8 +36,7 @@ require_once("SeedDMS/Preview.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1]);
-if(!$view) {
-}
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	$view->exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
@@ -48,9 +47,6 @@ if (!is_object($document)) {
 	$view->exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
 $folder = $document->getFolder();
 
 if ($document->getAccessMode($user) < M_READ) {

From a3df77e713b93762ef36a23593d1d80083fb8b04 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:35:27 +0100
Subject: [PATCH 0401/2006] take out access check

---
 out/out.ViewFolder.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index 1c4a1b622..b141cd710 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -26,7 +26,6 @@ include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAccessOperation.php");
 
 /**
  * Include class to preview documents
@@ -36,9 +35,6 @@ require_once("SeedDMS/Preview.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if(!$accessop->check_view_access($view, $_GET)) {
-	UI::exitError("", getMLText("access_denied"));
-}
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	$folderid = $settings->_rootFolderID;
@@ -75,6 +71,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From e4bc8d2180a63eba9599f6b0a379d9faed5f1e6a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:36:08 +0100
Subject: [PATCH 0402/2006] add advanced access check

---
 out/out.Acl.php        | 13 ++++++++-----
 out/out.AdminTools.php | 15 ++++++++-------
 out/out.GroupMgr.php   | 17 ++++++++++++-----
 out/out.Info.php       | 15 ++++++++-------
 out/out.RoleMgr.php    | 13 ++++++++-----
 out/out.UserList.php   | 13 ++++++++-----
 out/out.UsrMgr.php     | 22 +++++++++++++++++-----
 7 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/out/out.Acl.php b/out/out.Acl.php
index 1075b4bbd..04efdb7bf 100644
--- a/out/out.Acl.php
+++ b/out/out.Acl.php
@@ -25,7 +25,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAcl.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -40,10 +43,10 @@ if(isset($_GET['roleid']) && $_GET['roleid']) {
 	$selrole = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings, 'selrole'=>$selrole, 'allroles'=>$roles));
 if($view) {
+	$view->setParam('settings', $settings);
+	$view->setParam('selrole', $selrole);
+	$view->setParam('allroles', $roles);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
-	exit;
 }
-
diff --git a/out/out.AdminTools.php b/out/out.AdminTools.php
index dce5690c0..4b02373c5 100644
--- a/out/out.AdminTools.php
+++ b/out/out.AdminTools.php
@@ -24,15 +24,16 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'enablefullsearch'=>$settings->_enableFullSearch, 'logfileenable'=>$settings->_logFileEnable));
 if($view) {
-	$view->show();
-	exit;
+	$view->setParam('enablefullsearch', $settings->_enableFullSearch);
+	$view->setParam('logfileenable', $settings->_logFileEnable);
+	$view->setParam('accessobject', $accessop);
+	$view($_GET);
 }
-
-?>
diff --git a/out/out.GroupMgr.php b/out/out.GroupMgr.php
index 0ebe39b77..4fdd806b5 100644
--- a/out/out.GroupMgr.php
+++ b/out/out.GroupMgr.php
@@ -32,7 +32,10 @@ include("../inc/inc.Authentication.php");
  */
 require_once("SeedDMS/Preview.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -52,10 +55,14 @@ if(isset($_GET['groupid']) && $_GET['groupid']) {
 	$selgroup = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selgroup'=>$selgroup, 'allgroups'=>$allGroups, 'allusers'=>$allUsers, 'strictformcheck'=>$settings->_strictFormCheck, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'workflowmode'=>$settings->_workflowMode, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
+	$view->setParam('selgroup', $selgroup);
+	$view->setParam('allgroups', $allGroups);
+	$view->setParam('allusers', $allUsers);
+	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('workflowmode', $settings->_workflowMode);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 }
-
-?>
diff --git a/out/out.Info.php b/out/out.Info.php
index 3fdc51744..5e63ae1d1 100644
--- a/out/out.Info.php
+++ b/out/out.Info.php
@@ -27,7 +27,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -42,11 +45,9 @@ if(@ini_get('allow_url_fopen') == '1') {
 	}
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'version'=>$v, 'availversions'=>$versions));
 if($view) {
-	$view->show();
-	exit;
+	$view->setParam('version', $v);
+	$view->setParam('availversions', $versions);
+	$view->setParam('accessobject', $accessop);
+	$view($_GET);
 }
-
-?>
diff --git a/out/out.RoleMgr.php b/out/out.RoleMgr.php
index 76785d81a..1873fde98 100644
--- a/out/out.RoleMgr.php
+++ b/out/out.RoleMgr.php
@@ -26,7 +26,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -46,10 +49,10 @@ if(isset($_GET['roleid']) && $_GET['roleid']) {
 	$selrole = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selrole'=>$selrole, 'allusers'=>$users, 'allroles'=>$roles));
 if($view) {
+	$view->setParam('selrole', $selrole);
+	$view->setParam('allusers', $users);
+	$view->setParam('allroles', $roles);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 }
-
-?>
diff --git a/out/out.UserList.php b/out/out.UserList.php
index f53da8030..f95547e96 100644
--- a/out/out.UserList.php
+++ b/out/out.UserList.php
@@ -25,17 +25,20 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassPasswordStrength.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
 $allUsers = $dms->getAllUsers($settings->_sortUsersInList);
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'allusers'=>$allUsers, 'httproot'=>$settings->_httpRoot, 'quota'=>$settings->_quota, 'pwdexpiration'=>$settings->_passwordExpiration));
 if($view) {
+	$view->setParam('allusers', $allUsers);
+	$view->setParam('httproot', $settings->_httpRoot);
+	$view->setParam('quota', $settings->_quota);
+	$view->setParam('pwdexpiration', $settings->_passwordExpiration);
 	$view($_GET);
 	exit;
 }
-
-?>
diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php
index 0800254ba..2a5688f20 100644
--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@@ -26,7 +26,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -51,10 +54,19 @@ if(isset($_GET['userid']) && $_GET['userid']) {
 	$seluser = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'allroles'=>$roles, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota, 'strictformcheck'=>$settings->_strictFormCheck));
 if($view) {
+	$view->setParam('seluser', $seluser);
+	$view->setParam('allusers', $users);
+	$view->setParam('allgroups', $groups);
+	$view->setParam('allroles', $roles);
+	$view->setParam('passwordstrength', $settings->_passwordStrength);
+	$view->setParam('passwordexpiration', $settings->_passwordExpiration);
+	$view->setParam('httproot', $settings->_httpRoot);
+	$view->setParam('enableuserimage', $settings->_enableUserImage);
+	$view->setParam('undeluserids', explode(',', $settings->_undelUserIds));
+	$view->setParam('workflowmode', $settings->_workflowMode);
+	$view->setParam('quota', $settings->_quota);
+	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 }
-
-?>

From 1175f6f9c52acb2cf68deef75323f15d8ff8894b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:36:44 +0100
Subject: [PATCH 0403/2006] list all users with the selected role

---
 views/bootstrap/class.Acl.php | 45 +++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index 60121a85b..023a211c5 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -129,6 +129,41 @@ $(document).ready( function() {
 <?php
 	} /* }}} */
 
+	function info() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$selrole = $this->params['selrole'];
+		if($selrole) {
+			$this->contentHeading(getMLText("role_info"));
+
+			$users = $selrole->getUsers();
+			if($users) {
+				echo "<table class=\"table table-condensed\"><thead><tr><th>".getMLText('name')."</th><th></th></tr></thead><tbody>";
+				foreach($users as $currUser) {
+					echo "<tr>";
+					echo "<td>";
+					echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")";
+					echo "<br /><a href=\"mailto:".$currUser->getEmail()."\">".htmlspecialchars($currUser->getEmail())."</a>";
+					if($currUser->getComment())
+						echo "<br /><small>".htmlspecialchars($currUser->getComment())."</small>";
+					echo "</td>";
+					echo "<td>";
+					if($this->check_access(array('UsrMgr', 'RemoveUser'))) {
+						echo "<div class=\"list-action\">";
+						if($this->check_access('UsrMgr'))
+							echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
+						if($this->check_access('RemoveUser'))
+							echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";
+						echo "</div>";
+					}
+					echo "</td>";
+					echo "</tr>";
+				}
+				echo "</tbody></table>";
+			}
+		}
+	} /* }}} */
+
 	/**
 	 * Show tree of acos
 	 *
@@ -194,17 +229,23 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$roles = $this->params['allroles'];
 		$selrole = $this->params['selrole'];
+		$settings = $this->params['settings'];
+		$accessop = $this->params['accessobject'];
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+		if(!$settings->_advancedAcl) {
+			$this->warningMsg(getMLText("access_control_is_off"));
+		}
 ?>
 <div class="row-fluid">
 <div class="span4">
 <?php
 		$this->contentHeading(getMLText("role"));
 ?>
+<div class="well">
 <select class="chzn-select" id="selector">
 	<option value="-1"><?php echo getMLText("choose_role")?>
 <?php
@@ -214,6 +255,10 @@ $(document).ready( function() {
 ?>
 </select>
 </div>
+<?php if($accessop->check_view_access($this, array('action'=>'info')) || $user->isAdmin()) { ?>
+<div class="ajax" data-view="Acl" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
+<?php } ?>
+</div>
 
 <div class="span8">
 <?php

From 304a5d804efce152daa3cd570cfddbbe325576df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:38:01 +0100
Subject: [PATCH 0404/2006] use same user list as for Acl manager

---
 views/bootstrap/class.RoleMgr.php | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 6065c7802..6cbf59ef8 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -77,11 +77,29 @@ $(document).ready( function() {
 		if($selrole) {
 			$this->contentHeading(getMLText("role_info"));
 			$users = $selrole->getUsers();
-			echo "<table class=\"table table-condensed\">\n";
-			foreach($users as $cuser) {
-				echo "<tr><td>".htmlspecialchars($cuser->getFullName())."</td><td></td></tr>\n";
+			if($users) {
+				echo "<table class=\"table table-condensed\"><thead><tr><th>".getMLText('name')."</th><th></th></tr></thead><tbody>\n";
+				foreach($users as $currUser) {
+					echo "<tr>";
+					echo "<td>";
+					echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")";
+					echo "<br /><a href=\"mailto:".$currUser->getEmail()."\">".htmlspecialchars($currUser->getEmail())."</a>";
+					if($currUser->getComment())
+						echo "<br /><small>".htmlspecialchars($currUser->getComment())."</small>";
+					echo "</td>";
+					echo "<td>";
+						echo htmlspecialchars($this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>'));
+					if($this->check_access(array('UsrMgr', 'RemoveUser'))) {
+						echo "<div class=\"list-action\">";
+						echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="icon-edit"></i>', false);
+						echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>', false);
+						echo "</div>";
+					}
+					echo "</td>";
+					echo "</tr>";
+				}
+				echo "</tbody></table>";
 			}
-			echo "</table>";
 		}
 	} /* }}} */
 

From 795f03f8b8e4a543e15924551c36d6584d70d5e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:38:37 +0100
Subject: [PATCH 0405/2006] add column with role

---
 views/bootstrap/class.UserList.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index b5a035979..db15817fc 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -50,7 +50,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 ?>
 
 	<table class="table table-condensed">
-	  <tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr>
+		<thead><tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('role'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr></thead><tbody>
 <?php
 		foreach ($allUsers as $currUser) {
 			echo "<tr>";
@@ -74,6 +74,9 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</td>";
 			echo "<td>";
+			echo htmlspecialchars($currUser->getRole()->getName());
+			echo "</td>";
+			echo "<td>";
 			echo SeedDMS_Core_File::format_filesize($currUser->getUsedDiskSpace());
 			if($quota) {
 				echo " / ";
@@ -109,7 +112,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "</tr>";
 		}
-		echo "</table>";
+		echo "</tbody></table>";
 
 		$this->contentContainerEnd();
 		$this->htmlEndPage();

From 06346b956c256264445e960d001caaa04a730494 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:39:22 +0100
Subject: [PATCH 0406/2006] check access for action info

---
 views/bootstrap/class.UsrMgr.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 10c82afc8..38bb5709d 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -165,6 +165,7 @@ $(document).ready( function() {
 		$undeluserids = $this->params['undeluserids'];
 		$workflowmode = $this->params['workflowmode'];
 		$quota = $this->params['quota'];
+		$accessop = $this->params['accessobject'];
 ?>
 	<form action="../op/op.UsrMgr.php" method="post" enctype="multipart/form-data" name="form" id="form">
 <?php
@@ -496,6 +497,7 @@ $(document).ready( function() {
 		$undeluserids = $this->params['undeluserids'];
 		$workflowmode = $this->params['workflowmode'];
 		$quota = $this->params['quota'];
+		$accessop = $this->params['accessobject'];
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -518,7 +520,9 @@ $(document).ready( function() {
 ?>
 </select>
 </div>
+<?php if($accessop->check_view_access($this, array('action'=>'info')) || $user->isAdmin()) { ?>
 <div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
+<?php } ?>
 </div>
 
 <div class="span8">

From 82ac006a13ec433d2e9a13dee6b7f57f5569bb29 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:40:08 +0100
Subject: [PATCH 0407/2006] add many access checks before showing a link

---
 views/bootstrap/class.AdminTools.php | 43 +++++++++++++++++++++++++++-
 views/bootstrap/class.Bootstrap.php  | 37 ++++++++++++++++++++++--
 2 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php
index 91fb20d24..fef2e0889 100644
--- a/views/bootstrap/class.AdminTools.php
+++ b/views/bootstrap/class.AdminTools.php
@@ -36,6 +36,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$logfileenable = $this->params['logfileenable'];
 		$enablefullsearch = $this->params['enablefullsearch'];
+		$accessop = $this->params['accessobject'];
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -46,52 +47,92 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 ?>
 	<div id="admin-tools">
 	<div class="row-fluid">
+<?php if($accessop->check_view_access('UsrMgr') || $user->isAdmin()) { ?>
 		<a href="../out/out.UsrMgr.php" class="span3 btn btn-medium"><i class="icon-user"></i><br /><?php echo getMLText("user_management")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('GroupMgr') || $user->isAdmin()) { ?>
 		<a href="../out/out.GroupMgr.php" class="span3 btn btn-medium"><i class="icon-group"></i><br /><?php echo getMLText("group_management")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('RoleMgr') || $user->isAdmin()) { ?>
 		<a href="../out/out.RoleMgr.php" class="span3 btn btn-medium"><i class="icon-bullseye"></i><br /><?php echo getMLText("role_management")?></a>
+<?php } ?>
 	</div>
 	<div class="row-fluid">
+<?php if($accessop->check_view_access('BackupTools') || $user->isAdmin()) { ?>
 		<a href="../out/out.BackupTools.php" class="span3 btn btn-medium"><i class="icon-hdd"></i><br /><?php echo getMLText("backup_tools")?></a>
+<?php } ?>
 <?php		
-		if ($logfileenable)
+		if ($logfileenable && ($accessop->check_view_access('LogManagement') || $user->isAdmin()))
 			echo "<a href=\"../out/out.LogManagement.php\" class=\"span3 btn btn-medium\"><i class=\"icon-list\"></i><br />".getMLText("log_management")."</a>";
 ?>
 	</div>
 	<div class="row-fluid">
+<?php if($accessop->check_view_access('DefaultKeywords') || $user->isAdmin()) { ?>
 		<a href="../out/out.DefaultKeywords.php" class="span3 btn btn-medium"><i class="icon-reorder"></i><br /><?php echo getMLText("global_default_keywords")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('Categories') || $user->isAdmin()) { ?>
 		<a href="../out/out.Categories.php" class="span3 btn btn-medium"><i class="icon-columns"></i><br /><?php echo getMLText("global_document_categories")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('AttributeMgr') || $user->isAdmin()) { ?>
 		<a href="../out/out.AttributeMgr.php" class="span3 btn btn-medium"><i class="icon-tags"></i><br /><?php echo getMLText("global_attributedefinitions")?></a>
+<?php } ?>
 	</div>
 <?php
 	if($this->params['workflowmode'] == 'advanced') {
 ?>
 	<div class="row-fluid">
+<?php if($accessop->check_view_access('WorkflowMgr') || $user->isAdmin()) { ?>
 		<a href="../out/out.WorkflowMgr.php" class="span3 btn btn-medium"><i class="icon-sitemap"></i><br /><?php echo getMLText("global_workflows"); ?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('WorkflowStatesMgr') || $user->isAdmin()) { ?>
 		<a href="../out/out.WorkflowStatesMgr.php" class="span3 btn btn-medium"><i class="icon-star"></i><br /><?php echo getMLText("global_workflow_states"); ?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('WorkflowActionsMgr') || $user->isAdmin()) { ?>
 		<a href="../out/out.WorkflowActionsMgr.php" class="span3 btn btn-medium"><i class="icon-bolt"></i><br /><?php echo getMLText("global_workflow_actions"); ?></a>
+<?php } ?>
 	</div>
 <?php
 		}
 		if($enablefullsearch) {
 ?>
 	<div class="row-fluid">
+<?php if($accessop->check_view_access('Indexer') || $user->isAdmin()) { ?>
 		<a href="../out/out.Indexer.php" class="span3 btn btn-medium"><i class="icon-refresh"></i><br /><?php echo getMLText("update_fulltext_index")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('CreateIndex') || $user->isAdmin()) { ?>
 		<a href="../out/out.CreateIndex.php" class="span3 btn btn-medium"><i class="icon-search"></i><br /><?php echo getMLText("create_fulltext_index")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('IndexInfo') || $user->isAdmin()) { ?>
 		<a href="../out/out.IndexInfo.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("fulltext_info")?></a>
+<?php } ?>
 	</div>
 <?php
 		}
 ?>
 	<div class="row-fluid">
+<?php if($accessop->check_view_access('Statistic') || $user->isAdmin()) { ?>
 		<a href="../out/out.Statistic.php" class="span3 btn btn-medium"><i class="icon-tasks"></i><br /><?php echo getMLText("folders_and_documents_statistic")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('Charts') || $user->isAdmin()) { ?>
 		<a href="../out/out.Charts.php" class="span3 btn btn-medium"><i class="icon-bar-chart"></i><br /><?php echo getMLText("charts")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('ObjectCheck') || $user->isAdmin()) { ?>
 		<a href="../out/out.ObjectCheck.php" class="span3 btn btn-medium"><i class="icon-check"></i><br /><?php echo getMLText("objectcheck")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('Timeline') || $user->isAdmin()) { ?>
 		<a href="../out/out.Timeline.php" class="span3 btn btn-medium"><i class="icon-time"></i><br /><?php echo getMLText("timeline")?></a>
+<?php } ?>
 	</div>
 	<div class="row-fluid">
+<?php if($accessop->check_view_access('Settings') || $user->isAdmin()) { ?>
 		<a href="../out/out.Settings.php" class="span3 btn btn-medium"><i class="icon-wrench"></i><br /><?php echo getMLText("settings")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('ExtensionMgr') || $user->isAdmin()) { ?>
 		<a href="../out/out.ExtensionMgr.php" class="span3 btn btn-medium"><i class="icon-cogs"></i><br /><?php echo getMLText("extension_manager")?></a>
+<?php } ?>
+<?php if($accessop->check_view_access('Info') || $user->isAdmin()) { ?>
 		<a href="../out/out.Info.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("version_info")?></a>
+<?php } ?>
 	</div>
 	</div>
 <?php
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index cd9279c2f..b850c9181 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -395,7 +395,7 @@ $(document).ready(function () {
 	//		echo "    <li id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".getMLText("content")."</a></li>\n";
 	//		echo "    <li><a href=\"../out/out.SearchForm.php?folderid=".$this->params['rootfolderid']."\">".getMLText("search")."</a></li>\n";
 			if ($this->params['enablecalendar']) echo "    <li><a href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
-			if ($this->params['user']->isAdmin()) echo "    <li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
+			if ($this->check_access('AdminTools')) echo "    <li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
 			if($this->params['enablehelp']) {
 			$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 			echo "    <li><a href=\"../out/out.Help.php?context=".$tmp[1]."\">".getMLText("help")."</a></li>\n";
@@ -664,70 +664,103 @@ $(document).ready(function () {
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "   <ul class=\"nav\">\n";
 
+		if($this->check_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) {
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("user_group_management")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('UsrMgr')))
 		echo "      <li><a href=\"../out/out.UsrMgr.php\">".getMLText("user_management")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('RoleMgr')))
 		echo "      <li><a href=\"../out/out.RoleMgr.php\">".getMLText("role_management")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('GroupMgr')))
 		echo "      <li><a href=\"../out/out.GroupMgr.php\">".getMLText("group_management")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('UserList')))
 		echo "      <li><a href=\"../out/out.UserList.php\">".getMLText("user_list")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Acl')))
+		echo "      <li><a href=\"../out/out.Acl.php\">".getMLText("access_control")."</a></li>\n";
 		echo "     </ul>\n";
 		echo "    </li>\n";
 		echo "   </ul>\n";
+		}
 
+		if($this->check_access(array('DefaultKeywords', 'Categories', 'AttributeMgr', 'WorkflowMgr', 'WorkflowStatesMgr', 'WorkflowActionsMgr'))) {
 		echo "   <ul class=\"nav\">\n";
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("definitions")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('DefaultKeywords')))
 		echo "      <li><a href=\"../out/out.DefaultKeywords.php\">".getMLText("global_default_keywords")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Categories')))
 		echo "     <li><a href=\"../out/out.Categories.php\">".getMLText("global_document_categories")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('AttributeMgr')))
 		echo "     <li><a href=\"../out/out.AttributeMgr.php\">".getMLText("global_attributedefinitions")."</a></li>\n";
 		if($this->params['workflowmode'] == 'advanced') {
+			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('WorkflowMgr')))
 			echo "     <li><a href=\"../out/out.WorkflowMgr.php\">".getMLText("global_workflows")."</a></li>\n";
+			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('WorkflowStatesMgr')))
 			echo "     <li><a href=\"../out/out.WorkflowStatesMgr.php\">".getMLText("global_workflow_states")."</a></li>\n";
+			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('WorkflowActionsMgr')))
 			echo "     <li><a href=\"../out/out.WorkflowActionsMgr.php\">".getMLText("global_workflow_actions")."</a></li>\n";
 		}
 		echo "     </ul>\n";
 		echo "    </li>\n";
 		echo "   </ul>\n";
+		}
 
 		if($this->params['enablefullsearch']) {
+			if($this->check_access(array('Indexer', 'CreateIndex', 'IndexInfo'))) {
 			echo "   <ul class=\"nav\">\n";
 			echo "    <li class=\"dropdown\">\n";
 			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("fullsearch")." <i class=\"icon-caret-down\"></i></a>\n";
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Indexer')))
 			echo "      <li><a href=\"../out/out.Indexer.php\">".getMLText("update_fulltext_index")."</a></li>\n";
+			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('CreateIndex')))
 			echo "      <li><a href=\"../out/out.CreateIndex.php\">".getMLText("create_fulltext_index")."</a></li>\n";
+			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('IndexInfo')))
 			echo "      <li><a href=\"../out/out.IndexInfo.php\">".getMLText("fulltext_info")."</a></li>\n";
 			echo "     </ul>\n";
 			echo "    </li>\n";
 			echo "   </ul>\n";
+			}
 		}
 
+		if($this->check_access(array('BackupTools', 'LogManagement'))) {
 		echo "   <ul class=\"nav\">\n";
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("backup_log_management")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('BackupTools')))
 		echo "      <li><a href=\"../out/out.BackupTools.php\">".getMLText("backup_tools")."</a></li>\n";
 		if ($this->params['logfileenable'])
+			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('LogManagement')))
 			echo "      <li><a href=\"../out/out.LogManagement.php\">".getMLText("log_management")."</a></li>\n";
 		echo "     </ul>\n";
 		echo "    </li>\n";
 		echo "   </ul>\n";
+		}
 
+		if($this->check_access(array('Statistic', 'Charts', 'Timeline', 'ObjectCheck', 'ExtensionMgr', 'Info'))) {
 		echo "   <ul class=\"nav\">\n";
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("misc")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Statistic')))
 		echo "      <li><a href=\"../out/out.Statistic.php\">".getMLText("folders_and_documents_statistic")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Charts')))
 		echo "      <li><a href=\"../out/out.Charts.php\">".getMLText("charts")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Timeline')))
 		echo "      <li><a href=\"../out/out.Timeline.php\">".getMLText("timeline")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('ObjectCheck')))
 		echo "      <li><a href=\"../out/out.ObjectCheck.php\">".getMLText("objectcheck")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('ExtensionMgr')))
 		echo "      <li><a href=\"../out/out.ExtensionMgr.php\">".getMLText("extension_manager")."</a></li>\n";
+		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Info')))
 		echo "      <li><a href=\"../out/out.Info.php\">".getMLText("version_info")."</a></li>\n";
 		echo "     </ul>\n";
 		echo "    </li>\n";
 		echo "   </ul>\n";
+		}
 
 		echo "<ul class=\"nav\">\n";
 		echo "</ul>\n";
@@ -1367,7 +1400,7 @@ $('#clearfilename<?php print $formName ?>').click(function(ev) {
 		
 		$this->htmlEndPage();
 		
-		add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle, PEAR_LOG_ERR);
+//		add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle, PEAR_LOG_ERR);
 
 		if($noexit)
 			return;

From 4770608d8f85da79569f1ba9d2caa19713d6c8f7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 09:40:49 +0100
Subject: [PATCH 0408/2006] include inc.ClassAccessOperation.php

---
 inc/inc.Authentication.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index f18d83dc4..2171d5a02 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -15,6 +15,7 @@
 require_once("inc.Utils.php");
 require_once("inc.ClassEmailNotify.php");
 require_once("inc.ClassSession.php");
+require_once("inc.ClassAccessOperation.php");
 
 $refer = $_SERVER["REQUEST_URI"];
 if (!strncmp("/op", $refer, 3)) {

From dcc3d9e74c110cfbcd4e2919c1c05c2ac31490c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 12:59:56 +0100
Subject: [PATCH 0409/2006] take out debug output

---
 views/bootstrap/class.RoleMgr.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 6cbf59ef8..7cba9976e 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -88,7 +88,6 @@ $(document).ready( function() {
 						echo "<br /><small>".htmlspecialchars($currUser->getComment())."</small>";
 					echo "</td>";
 					echo "<td>";
-						echo htmlspecialchars($this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>'));
 					if($this->check_access(array('UsrMgr', 'RemoveUser'))) {
 						echo "<div class=\"list-action\">";
 						echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="icon-edit"></i>', false);

From 04eadaad670246486cad9d58ff6aabec5fb3944d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 15:44:11 +0100
Subject: [PATCH 0410/2006] add check_controller_access()

---
 inc/inc.ClassAccessOperation.php | 37 +++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 4491f8564..2e5c0df11 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -311,7 +311,7 @@ class SeedDMS_AccessOperation {
 	} /* }}} */
 
 	/**
-	 * Check for access permission
+	 * Check for access permission on view
 	 *
 	 * If the parameter $view is an array then each element is considered the
 	 * name of a view and true will be returned if one is accesible.
@@ -344,5 +344,40 @@ class SeedDMS_AccessOperation {
 		}
 		return false;
 	} /* }}} */
+
+	/**
+	 * Check for access permission on controller
+	 *
+	 * If the parameter $controller is an array then each element is considered the
+	 * name of a controller and true will be returned if one is accesible.
+	 *
+	 * @param mixed $controller Instanz of controller, name of controller or array of controller names
+	 * @param string $get query parameters
+	 * @return boolean true if access is allowed otherwise false
+	 */
+	function check_controller_access($controller, $get=array()) { /* {{{ */
+		if(!$this->settings->_advancedAcl)
+			return false;
+		if(is_string($controller)) {
+			$scripts = array($controller);
+		} elseif(is_array($controller)) {
+			$scripts = $controller;
+		} elseif(is_subclass_of($controller, 'SeedDMS_Controller_Common')) {
+			$scripts = array($controller->getParam('class'));
+		} else {
+			return false;
+		}
+		$scope = 'Controllers';
+		$action = (isset($get['action']) && $get['action']) ? $get['action'] : 'run';
+		$acl = new SeedDMS_Acl($this->dms);
+		if(!$this->_aro)
+			$this->_aro = SeedDMS_Aro::getInstance($this->user->getRole(), $this->dms);
+		foreach($scripts as $script) {
+			$aco = SeedDMS_Aco::getInstance($scope.'/'.$script.'/'.$action, $this->dms);
+			if($acl->check($this->_aro, $aco))
+				return true;
+		}
+		return false;
+	} /* }}} */
 }
 ?>

From 8e606dac8b7b372ba40b01c12f51f5c0e472abc9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 15:45:10 +0100
Subject: [PATCH 0411/2006] order objects by alias

---
 inc/inc.ClassAcl.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index b8fcc3ae5..5fbd7e8ed 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -317,7 +317,7 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 	public function getChildren() { /* {{{ */
 		$dms = $this->getDMS();
 		$db = $dms->getDB();
-		$queryStr = "SELECT * FROM tblAcos WHERE parent = ".$this->_id;
+		$queryStr = "SELECT * FROM tblAcos WHERE parent = ".$this->_id." ORDER BY alias";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return null;
@@ -349,12 +349,10 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 
 	public static function getRoot($dms) { /* {{{ */
 		$db = $dms->getDB();
-		$queryStr = "SELECT * FROM tblAcos WHERE parent = 0";
+		$queryStr = "SELECT * FROM tblAcos WHERE parent = 0 ORDER BY alias";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return null;
-		if (count($resArr) != 1)
-			return null;
 
 		$acos = array();
 		foreach($resArr as $row) {

From 1f9aa108a4eaa4a6e4d5775784fb106dfc6204d4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 15:45:28 +0100
Subject: [PATCH 0412/2006] set parameter class

---
 inc/inc.ClassController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassController.php b/inc/inc.ClassController.php
index 22ea5428d..0c496fcde 100644
--- a/inc/inc.ClassController.php
+++ b/inc/inc.ClassController.php
@@ -54,6 +54,7 @@ class Controller {
 			/* Set some configuration parameters */
 			$controller->setParam('dms', $dms);
 			$controller->setParam('user', $user);
+			$controller->setParam('class', $class);
 			$controller->setParam('postVars', $_POST);
 			$controller->setParam('getVars', $_GET);
 			$controller->setParam('requestVars', $_REQUEST);

From 85ac4314f5cfc81c7ecf28c784d4ef1a472eb437 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 15:45:59 +0100
Subject: [PATCH 0413/2006] check if SeedDMS_Aco::getRoot() returns objects

---
 views/bootstrap/class.Acl.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index 023a211c5..dd12512bd 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -206,19 +206,20 @@ $(document).ready( function() {
 		if($selrole) {
 			$aro = SeedDMS_Aro::getInstance($selrole, $dms);
 
-			$acos = SeedDMS_Aco::getRoot($dms);
-			foreach($acos as $aco) {
-				if(false === ($perm = $aco->getPermission($aro)))
-					$tree['permission'] = 0;
-				else
-					$tree['permission'] = $perm;
-				$tree['id'] = $aco->getID();
-				$tree['label'] = $aco->getAlias();
-				$tree['acoid'] = $aco->getID();
-				$tree['aroid'] = $aro ? $aro->getID() : 0;
-				$tree['is_folder'] = true;
-				$tree['children'] = $this->_tree($aro, $aco);
-				$result[] = $tree;
+			if($acos = SeedDMS_Aco::getRoot($dms)) {
+				foreach($acos as $aco) {
+					if(false === ($perm = $aco->getPermission($aro)))
+						$tree['permission'] = 0;
+					else
+						$tree['permission'] = $perm;
+					$tree['id'] = $aco->getID();
+					$tree['label'] = $aco->getAlias();
+					$tree['acoid'] = $aco->getID();
+					$tree['aroid'] = $aro ? $aro->getID() : 0;
+					$tree['is_folder'] = true;
+					$tree['children'] = $this->_tree($aro, $aco);
+					$result[] = $tree;
+				}
 			}
 		}
 		echo json_encode($result);

From 535012f8448638d487b2c4effb7dd684c86e58cb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 16:01:40 +0100
Subject: [PATCH 0414/2006] add column with role

---
 views/bootstrap/class.SubstituteUser.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index df931c75e..e8c905e49 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -48,7 +48,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 ?>
 	<table class="table table-condensed">
-	  <tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('groups'); ?></th><th></th></tr>
+	  <thead><tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('role'); ?></th><th><?php printMLText('groups'); ?></th><th></th></tr></thead><tbody>
 <?php
 		foreach ($allUsers as $currUser) {
 			echo "<tr>";
@@ -60,6 +60,9 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			echo "<a href=\"mailto:".htmlspecialchars($currUser->getEmail())."\">".htmlspecialchars($currUser->getEmail())."</a><br />";
 			echo "</td>";
 			echo "<td>";
+			echo htmlspecialchars($currUser->getRole()->getName());
+			echo "</td>";
+			echo "<td>";
 			$groups = $currUser->getGroups();
 			if (count($groups) != 0) {
 				for ($j = 0; $j < count($groups); $j++)	{
@@ -76,7 +79,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "</tr>";
 		}
-		echo "</table>";
+		echo "</tbody></table>";
 		$this->contentContainerEnd();
 
 		$this->htmlEndPage();

From 64c0b377261aaa5276e636e2496edfffbe15964d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 16:02:03 +0100
Subject: [PATCH 0415/2006] add access check

---
 out/out.Categories.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/out/out.Categories.php b/out/out.Categories.php
index f913b0f3c..049e12163 100644
--- a/out/out.Categories.php
+++ b/out/out.Categories.php
@@ -26,7 +26,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -38,10 +41,8 @@ if(isset($_GET['categoryid']) && $_GET['categoryid']) {
 	$selcat = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'categories'=>$categories, 'selcategory'=>$selcat));
 if($view) {
+	$view->setParam('categories', $categories);
+	$view->setParam('selcategory', $selcat);
 	$view($_GET);
 }
-
-?>

From 1578b12cf960debd7db770f927bab487d53f31db Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Mar 2016 16:02:59 +0100
Subject: [PATCH 0416/2006] add access check (still commented out)

---
 op/op.RemoveDocument.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index c8addfcda..40d2d8cc9 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -29,6 +29,10 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1]);
+//$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+//if (!$accessop->check_controller_access($controller, $_POST)) {
+//	UI::exitError(getMLText("document_title", array("documentname" => "")),getMLText("access_denied"));
+//}
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('removedocument')) {

From c5435e0a27cb67feefa2d649e14c5d71c85a06e5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 15 Mar 2016 06:22:48 +0100
Subject: [PATCH 0417/2006] add acl check

---
 out/out.ObjectCheck.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index 983281c62..d1868c44d 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -30,8 +30,8 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-
-if (!$user->isAdmin()) {
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 

From 4a85977874f0a0d870b06159961fbfe878f435cb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Mar 2016 16:25:07 +0100
Subject: [PATCH 0418/2006] separate js from html for document chooser

---
 views/bootstrap/class.AddDocument.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 71bebcf06..c07d04986 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -76,6 +76,9 @@ $(document).ready(function() {
 <?php
 			$this->printKeywordChooserJs("form1");
 			$this->printDropFolderChooserJs("form1");
+			if($libraryfolder) {
+				$this->printDocumentChooserJs("form1");
+			}
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -225,7 +228,7 @@ $(document).ready(function() {
 <?php if($libraryfolder) { ?>
 		<tr>
 			<td><?php printMLText("librarydoc");?>:</td>
-			<td><?php $this->printDocumentChooser("form1", M_READ, -1, null, 'librarydoc', $libraryfolder, 1);?></td>
+			<td><?php $this->printDocumentChooserHtml("form1", M_READ, -1, null, 'librarydoc', $libraryfolder, 1);?></td>
 		</tr>
 <?php } ?>
 		<tr>

From a7a9bc72a22f317cad5fd1559e3d69eda2aaabeb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Mar 2016 16:38:36 +0100
Subject: [PATCH 0419/2006] get $libraryfolder from view in js()

---
 views/bootstrap/class.AddDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index c07d04986..6d8000d4c 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		$libraryfolder = $this->params['libraryfolder'];
 		header('Content-Type: application/javascript; charset=UTF-8');
 ?>
 function checkForm()

From 4dcd92b5289f1d5bf6ae4231dd5d25470fbaecb7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Mar 2016 16:52:04 +0100
Subject: [PATCH 0420/2006] convert to new method of view invocation

---
 out/out.AddToTransmittal.php  |  7 +++++--
 out/out.AddTransmittal.php    |  5 +++--
 out/out.CheckInDocument.php   | 14 ++++++++++++--
 out/out.ExtensionMgr.php      |  6 ++++--
 out/out.ReceiptDocument.php   |  7 +++++--
 out/out.ReceiptSummary.php    |  2 +-
 out/out.RemoveTransmittal.php |  5 +++--
 out/out.ReviseDocument.php    |  8 ++++++--
 out/out.SetRecipients.php     | 10 ++++++++--
 out/out.SetRevisors.php       |  7 +++++--
 out/out.TransmittalMgr.php    |  8 ++++++--
 11 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/out/out.AddToTransmittal.php b/out/out.AddToTransmittal.php
index 866895e65..6bb1b0837 100644
--- a/out/out.AddToTransmittal.php
+++ b/out/out.AddToTransmittal.php
@@ -58,11 +58,14 @@ $transmittals = $dms->getAllTransmittals($user);
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('version', $content);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('transmittals', $transmittals);
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.AddTransmittal.php b/out/out.AddTransmittal.php
index 28734b525..a94a72be6 100644
--- a/out/out.AddTransmittal.php
+++ b/out/out.AddTransmittal.php
@@ -29,9 +29,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'strictformcheck'=>$settings->_strictFormCheck));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
-	$view->show();
+	$view->setParam('strictformcheck'=>$settings->_strictFormCheck);
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index a85e29399..34d456102 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -63,10 +63,20 @@ $folder = $document->getFolder();
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload);
+	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
+	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
+	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
+	$view->setParam('workflowmode', $settings->_workflowMode);
+	$view->setParam('presetexpiration', $settings->_presetExpirationDate);
 	$view->setParam('accessobject', $accessop);
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index 54759ed93..11a0cc871 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -32,9 +32,11 @@ if (!$user->isAdmin()) {
 $v = new SeedDMS_Version;
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'httproot'=>$settings->_httpRoot, 'version'=>$v));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
-	$view->show();
+	$view->setParam('httproot', $settings->_httpRoot);
+	$view->setParam('version', $v);
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php
index 243749657..8584c2967 100644
--- a/out/out.ReceiptDocument.php
+++ b/out/out.ReceiptDocument.php
@@ -72,10 +72,13 @@ if(!$receipts) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('version', $content);
 	$view->setParam('accessobject', $accessop);
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php
index 0a7bd144f..73c636f0d 100644
--- a/out/out.ReceiptSummary.php
+++ b/out/out.ReceiptSummary.php
@@ -34,7 +34,7 @@ if ($user->isGuest()) {
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.RemoveTransmittal.php b/out/out.RemoveTransmittal.php
index 233da7d7d..3716cc53e 100644
--- a/out/out.RemoveTransmittal.php
+++ b/out/out.RemoveTransmittal.php
@@ -40,9 +40,10 @@ if (!is_object($rmtransmittal)) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'rmtransmittal'=>$rmtransmittal));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
-	$view->show();
+	$view->setParam('rmtransmittal', $rmtransmittal);
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.ReviseDocument.php b/out/out.ReviseDocument.php
index a57da7231..3db448da8 100644
--- a/out/out.ReviseDocument.php
+++ b/out/out.ReviseDocument.php
@@ -73,10 +73,14 @@ if(!$revisions) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content, 'revisionid'=>(int) $_GET['revisionid']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('version', $content);
+	$view->setParam('revisionid', (int) $_GET['revisionid']);
 	$view->setParam('accessobject', $accessop);
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.SetRecipients.php b/out/out.SetRecipients.php
index fa8e3b4d2..364549708 100644
--- a/out/out.SetRecipients.php
+++ b/out/out.SetRecipients.php
@@ -61,10 +61,16 @@ $folder = $document->getFolder();
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('version', $content);
+	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
+	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
+	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
 	$view->setParam('accessobject', $accessop);
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.SetRevisors.php b/out/out.SetRevisors.php
index 47a2bef12..b38172476 100644
--- a/out/out.SetRevisors.php
+++ b/out/out.SetRevisors.php
@@ -61,10 +61,13 @@ $folder = $document->getFolder();
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$content));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('version', $content);
 	$view->setParam('accessobject', $accessop);
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index ad072c707..d0df6a02b 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -42,9 +42,13 @@ if(isset($_GET['transmittalid']) && $_GET['transmittalid']) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seltransmittal'=>$seltransmittal,  'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
-	$view->show();
+	$view->setParam('seltransmittal', $seltransmittal);
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view($_GET);
 	exit;
 }
 

From 19793e41b96355f54af77c4e2937016a1668d9f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Mar 2016 22:47:15 +0100
Subject: [PATCH 0421/2006] add remove()

---
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index 11a916bd0..2a4dbcf7c 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -260,6 +260,17 @@ class SeedDMS_Core_Transmittal {
 		return SeedDMS_Core_TransmittalItem::getInstance($itemID, $this->_dms);
 	} /* }}} */
 
+	function remove() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "DELETE FROM tblTransmittals WHERE id = " . $this->_id;
+		if (!$db->getResult($queryStr)) {
+			return false;
+		}
+
+		return true;
+	} /* }}} */
+
 }
 
 /**

From 66da520835519a05257c5aed4f01d01048da131d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Mar 2016 22:47:28 +0100
Subject: [PATCH 0422/2006] add removal of transmittal

---
 op/op.TransmittalMgr.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/op/op.TransmittalMgr.php b/op/op.TransmittalMgr.php
index df75bf097..1c58bd032 100644
--- a/op/op.TransmittalMgr.php
+++ b/op/op.TransmittalMgr.php
@@ -60,7 +60,7 @@ if ($action == "addtransmittal") {
 	add_log_line(".php&action=addtransmittal&name=".$name);
 }
 
-// delete user ------------------------------------------------------------
+// delete transmittal ------------------------------------------------------------
 else if ($action == "removetransmittal") {
 
 	/* Check if the form data comes for a trusted request */
@@ -76,11 +76,14 @@ else if ($action == "removetransmittal") {
 		UI::exitError(getMLText("my_transmittals"),getMLText("invalid_transmittal_id"));
 	}
 
-	$transmittalToRemove = $dms->getUser($transmittalid);
+	$transmittalToRemove = $dms->getTransmittal($transmittalid);
 	if (!is_object($transmittalToRemove)) {
 		UI::exitError(getMLText("my_transmittals"),getMLText("invalid_transmittal_id"));
 	}
 
+	if (!$transmittalToRemove->remove()) {
+		UI::exitError(getMLText("my_transmittals"),getMLText("error_occured"));
+	}
 	add_log_line(".php&action=removetransmittal&transmittalid=".$transmittalid);
 	
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_transmittal')));

From d8e0ba840d78f19599d6c8207952d3effdc0bd4c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Mar 2016 22:47:51 +0100
Subject: [PATCH 0423/2006] fix syntax error

---
 out/out.AddTransmittal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.AddTransmittal.php b/out/out.AddTransmittal.php
index a94a72be6..85aea1b78 100644
--- a/out/out.AddTransmittal.php
+++ b/out/out.AddTransmittal.php
@@ -31,7 +31,7 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
-	$view->setParam('strictformcheck'=>$settings->_strictFormCheck);
+	$view->setParam('strictformcheck', $settings->_strictFormCheck);
 	$view($_GET);
 	exit;
 }

From b8fc40f60fefe8969677fbbe6b53cfaf27c2a488 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Mar 2016 22:48:13 +0100
Subject: [PATCH 0424/2006] fix access check

---
 out/out.ReviseDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.ReviseDocument.php b/out/out.ReviseDocument.php
index 3db448da8..66792e9b6 100644
--- a/out/out.ReviseDocument.php
+++ b/out/out.ReviseDocument.php
@@ -63,7 +63,7 @@ if ($latestContent->getVersion()!=$version) {
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 // verify if document maybe revised
-if (!$document->mayRevise()){
+if (!$accessop->mayRevise($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 

From 1cd5622ca061ee855666b4a154288c0a36eb7347 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Mar 2016 22:48:45 +0100
Subject: [PATCH 0425/2006] add missing space

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index efb359d93..9ebe5ea3d 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1699,7 +1699,7 @@ $(function() {
 	function printDeleteDocumentButton($document, $msg, $return=false){ /* {{{ */
 		$docid = $document->getID();
 		$content = '';
-    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'"confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
 		if($return)
 			return $content;
 		else

From 59786c7bb073b0eb0cb9da197e9bb43b32d2ae0d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Mar 2016 06:20:19 +0100
Subject: [PATCH 0426/2006] add missing contendEnd()

---
 views/bootstrap/class.CheckOutSummary.php | 2 +-
 views/bootstrap/class.ReceiptSummary.php  | 1 +
 views/bootstrap/class.SetRecipients.php   | 1 +
 views/bootstrap/class.SetRevisors.php     | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.CheckOutSummary.php b/views/bootstrap/class.CheckOutSummary.php
index 372f8af4b..396856fd7 100644
--- a/views/bootstrap/class.CheckOutSummary.php
+++ b/views/bootstrap/class.CheckOutSummary.php
@@ -136,8 +136,8 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("empty_notify_list");
 		}
 
-
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 725aa16ce..516fd6f9a 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -140,6 +140,7 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 
 
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index e8b4734e3..d61fde678 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -135,6 +135,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 9e8d612a0..88e8417f0 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -135,6 +135,7 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

From f2c239f67c8ad32bd18acb9c06c7ee2b31ee697d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Mar 2016 06:22:01 +0100
Subject: [PATCH 0427/2006] place all javascript into function js()

---
 views/bootstrap/class.AddTransmittal.php    |  37 ++--
 views/bootstrap/class.CheckInDocument.php   |  82 ++++----
 views/bootstrap/class.ReceiptDocument.php   |  99 ++++++----
 views/bootstrap/class.RemoveTransmittal.php |   2 +-
 views/bootstrap/class.ReviseDocument.php    |  98 ++++++----
 views/bootstrap/class.TransmittalMgr.php    | 206 +++++++++++---------
 6 files changed, 299 insertions(+), 225 deletions(-)

diff --git a/views/bootstrap/class.AddTransmittal.php b/views/bootstrap/class.AddTransmittal.php
index a7dda67d0..7005d860b 100644
--- a/views/bootstrap/class.AddTransmittal.php
+++ b/views/bootstrap/class.AddTransmittal.php
@@ -31,19 +31,10 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_AddTransmittal extends SeedDMS_Bootstrap_Style {
 
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
+	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
-
-		$this->htmlStartPage(getMLText("my_documents"));
-		$this->globalNavigation($folder);
-		$this->contentStart();
-		$this->pageNavigation(getMLText("my_documents"), "my_documents");
-		$this->contentHeading(getMLText("add_transmittal"));
-		$this->contentContainerStart();
+		header('Content-Type: application/javascript; charset=UTF-8');
 ?>
-<script language="JavaScript">
 function checkForm()
 {
 	msg = new Array();
@@ -69,9 +60,29 @@ function checkForm()
 	else
 		return true;
 }
-</script>
+$(document).ready(function() {
+	$('body').on('submit', '#form1', function(ev){
+		if(checkForm()) return;
+		event.preventDefault();
+	});
+});
+<?php
+	} /* }}} */
 
-<form action="../op/op.AddTransmittal.php" name="form1" onsubmit="return checkForm();" method="post">
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$strictformcheck = $this->params['strictformcheck'];
+
+		$this->htmlStartPage(getMLText("my_documents"));
+		$this->globalNavigation($folder);
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_documents"), "my_documents");
+		$this->contentHeading(getMLText("add_transmittal"));
+		$this->contentContainerStart();
+?>
+
+<form action="../op/op.AddTransmittal.php" id="form1" name="form1" method="post">
 	<?php echo createHiddenFieldWithKey('addtransmittal'); ?>
 	<table class="table-condensed">
 		<tr>
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 5fe891951..e318a7994 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -27,6 +27,50 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_CheckInDocument extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		$strictformcheck = $this->params['strictformcheck'];
+		header('Content-Type: application/javascript; charset=UTF-8');
+?>
+function checkForm()
+{
+	msg = new Array();
+<?php if($dropfolderdir) { ?>
+	if (document.form1.userfile.value == "" && document.form1.dropfolderfileform1.value == "") msg.push("<?php printMLText("js_no_file");?>");
+<?php } else { ?>
+	if (document.form1.userfile.value == "") msg.push("<?php printMLText("js_no_file");?>");
+<?php } ?>
+<?php
+	if ($strictformcheck) {
+	?>
+	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+<?php
+	}
+?>
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+$(document).ready(function() {
+	$('body').on('submit', '#form1', function(ev){
+		if(checkForm()) return;
+		event.preventDefault();
+	});
+});
+<?php
+	} /* }}} */
+
+?>
 	function __takeOverButton($name, $users) { /* {{{ */
 ?>
 	<span id="<?php echo $name; ?>_btn" style="cursor: pointer;" title="<?php printMLText("takeOver".$name); ?>"><i class="icon-arrow-left"></i></span>
@@ -66,42 +110,7 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("checkin_document"));
-?>
 
-<script language="JavaScript">
-function checkForm()
-{
-	msg = new Array();
-<?php if($dropfolderdir) { ?>
-	if (document.form1.userfile.value == "" && document.form1.dropfolderfileform1.value == "") msg.push("<?php printMLText("js_no_file");?>");
-<?php } else { ?>
-	if (document.form1.userfile.value == "") msg.push("<?php printMLText("js_no_file");?>");
-<?php } ?>
-<?php
-	if ($strictformcheck) {
-	?>
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-<?php
-	}
-?>
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
 		if ($document->isLocked()) {
 
 			$lockingUser = $document->getLockingUser();
@@ -162,7 +171,7 @@ function checkForm()
 		$this->contentContainerStart();
 ?>
 
-<form action="../op/op.CheckInDocument.php" method="post" name="form1" onsubmit="return checkForm();">
+<form action="../op/op.CheckInDocument.php" method="post" id="form1" name="form1">
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 	<table class="table-condensed">
 	
@@ -564,6 +573,7 @@ function checkForm()
 	<input type="submit" class="btn" value="<?php printMLText("reset_checkout"); ?>">
 <?php
 		}
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index 6544f2054..e7d285858 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -31,6 +31,62 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_ReceiptDocument extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
+?>
+function checkIndForm()
+{
+	msg = new Array();
+	if (document.form1.reviewStatus.value == "") msg.push("<?php printMLText("js_no_receipt_status");?>");
+	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+	if (msg != "") {
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+function checkGrpForm()
+{
+	msg = "";
+	if (document.form2.reviewGroup.value == "") msg += "<?php printMLText("js_no_receipt_group");?>\n";
+	if (document.form2.reviewStatus.value == "") msg += "<?php printMLText("js_no_receipt_status");?>\n";
+	if (document.form2.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+$(document).ready(function() {
+	$('body').on('submit', '#form1', function(ev){
+		if(checkIndForm()) return;
+		event.preventDefault();
+	});
+	$('body').on('submit', '#form2', function(ev){
+		if(checkGrpForm()) return;
+		event.preventDefault();
+	});
+});
+<?php
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -51,44 +107,6 @@ class SeedDMS_View_ReceiptDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_receipt"));
-?>
-<script language="JavaScript">
-function checkIndForm()
-{
-	msg = new Array();
-	if (document.form1.receiptStatus.value == "") msg.push("<?php printMLText("js_no_receipt_status");?>");
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-function checkGrpForm()
-{
-	msg = "";
-	if (document.form1.receiptGroup.value == "") msg += "<?php printMLText("js_no_receipt_group");?>\n";
-	if (document.form1.receiptStatus.value == "") msg += "<?php printMLText("js_no_receipt_status");?>\n";
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
 		$this->contentContainerStart();
 
 		// Display the Receipt form.
@@ -109,7 +127,7 @@ function checkGrpForm()
 				print "</tr></tbody></table><br>";
 			}
 ?>
-	<form method="post" action="../op/op.ReceiptDocument.php" name="form1" onsubmit="return checkIndForm();">
+	<form method="post" action="../op/op.ReceiptDocument.php" id="form1" name="form1">
 	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
 	<table class="table-condensed">
 		<tr>
@@ -159,7 +177,7 @@ function checkGrpForm()
 			}
 
 ?>
-	<form method="post" action="../op/op.ReceiptDocument.php" name="form1" onsubmit="return checkGrpForm();">
+	<form method="post" action="../op/op.ReceiptDocument.php" id="form2" name="form2">
 	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
 	<table class="table-condensed">
 		<tr>
@@ -192,6 +210,7 @@ function checkGrpForm()
 <?php
 		}
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/bootstrap/class.RemoveTransmittal.php b/views/bootstrap/class.RemoveTransmittal.php
index d9ad09adf..153dfa925 100644
--- a/views/bootstrap/class.RemoveTransmittal.php
+++ b/views/bootstrap/class.RemoveTransmittal.php
@@ -44,7 +44,7 @@ class SeedDMS_View_RemoveTransmittal extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 
 ?>
-<form action="../op/op.UsrMgr.php" name="form1" method="post">
+<form action="../op/op.TransmittalMgr.php" name="form1" method="post">
 <input type="hidden" name="transmittalid" value="<?php print $rmtransmittal->getID();?>">
 <input type="hidden" name="action" value="removetransmittal">
 <?php echo createHiddenFieldWithKey('removetransmittal'); ?>
diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 88523777f..2472a6396 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -31,6 +31,62 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_ReviseDocument extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
+?>
+function checkIndForm()
+{
+	msg = new Array();
+	if (document.form1.revisionStatus.value == "") msg.push("<?php printMLText("js_no_revision_status");?>");
+	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+	if (msg != "") {
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+function checkGrpForm()
+{
+	msg = "";
+	if (document.form2.revisionGroup.value == "") msg += "<?php printMLText("js_no_revision_group");?>\n";
+	if (document.form2.revisionSatus.value == "") msg += "<?php printMLText("js_no_revision_status");?>\n";
+	if (document.form2.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+$(document).ready(function() {
+	$('body').on('submit', '#form1', function(ev){
+		if(checkIndForm()) return;
+		event.preventDefault();
+	});
+	$('body').on('submit', '#form2', function(ev){
+		if(checkGrpForm()) return;
+		event.preventDefault();
+	});
+});
+<?php
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -52,44 +108,6 @@ class SeedDMS_View_ReviseDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_review"));
-?>
-<script language="JavaScript">
-function checkIndForm()
-{
-	msg = new Array();
-	if (document.form1.revisionStatus.value == "") msg.push("<?php printMLText("js_no_review_status");?>");
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-function checkGrpForm()
-{
-	msg = "";
-	if (document.form1.revisionGroup.value == "") msg += "<?php printMLText("js_no_revision_group");?>\n";
-	if (document.form1.revisionStatus.value == "") msg += "<?php printMLText("js_no_revision_status");?>\n";
-	if (document.form1.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
-	if (msg != "")
-	{
-		alert(msg);
-		return false;
-	}
-	else
-		return true;
-}
-</script>
-
-<?php
 		$this->contentContainerStart();
 
 		// Display the Revision form.
@@ -110,7 +128,7 @@ function checkGrpForm()
 				print "</tr></tbody></table><br>";
 			}
 ?>
-	<form method="post" action="../op/op.ReviseDocument.php" name="form1" onsubmit="return checkIndForm();">
+	<form method="post" action="../op/op.ReviseDocument.php" id="form1" name="form1">
 	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
 	<table class="table-condensed">
 		<tr>
@@ -160,7 +178,7 @@ function checkGrpForm()
 			}
 
 ?>
-	<form method="post" action="../op/op.ReviseDocument.php" name="form1" onsubmit="return checkGrpForm();">
+	<form method="post" action="../op/op.ReviseDocument.php" id="form2" name="form2">
 	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
 	<table class="table-condensed">
 		<tr>
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index aa7b6892e..52d2320f9 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -31,83 +31,11 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 
-	/**
-	 * Add some javascript at the bottom of the page
-	 */
-	function addAdditionalJS(){ /* {{{ */
-		$this->addFooterJS("
-	$('body').on('click', 'button.removetransmittalitem', function(ev){
-		ev.preventDefault();
-		var element = $(this);
-		attr_rel = $(ev.currentTarget).attr('rel');
-		attr_msg = $(ev.currentTarget).attr('msg');
-		attr_formtoken = $(ev.currentTarget).attr('formtoken');
-		id = attr_rel;
-		$.get('../op/op.Ajax.php',
-			{ command: 'removetransmittalitem', id: id, formtoken: attr_formtoken },
-			function(data) {
-//				console.log(data);
-				if(data.success) {
-					$('#table-row-transmittalitem-'+id).hide('slow');
-					noty({
-						text: attr_msg,
-						type: 'success',
-						dismissQueue: true,
-						layout: 'topRight',
-						theme: 'defaultTheme',
-						timeout: 1500,
-					});
-				} else {
-					noty({
-						text: data.message,
-						type: 'error',
-						dismissQueue: true,
-						layout: 'topRight',
-						theme: 'defaultTheme',
-						timeout: 3500,
-					});
-				}
-			},
-			'json'
-		);
-	});
-	$('body').on('click', 'button.updatetransmittalitem', function(ev){
-		ev.preventDefault();
-		var element = $(this);
-		attr_rel = $(ev.currentTarget).attr('rel');
-		attr_msg = $(ev.currentTarget).attr('msg');
-		attr_formtoken = $(ev.currentTarget).attr('formtoken');
-		id = attr_rel;
-		$.get('../op/op.Ajax.php',
-			{ command: 'updatetransmittalitem', id: id, formtoken: attr_formtoken },
-			function(data) {
-//				console.log(data);
-				if(data.success) {
-					$('#update-transmittalitem-btn-'+id).hide('slow');
-					noty({
-						text: attr_msg,
-						type: 'success',
-						dismissQueue: true,
-						layout: 'topRight',
-						theme: 'defaultTheme',
-						timeout: 1500,
-					});
-				} else {
-					noty({
-						text: data.message,
-						type: 'error',
-						dismissQueue: true,
-						layout: 'topRight',
-						theme: 'defaultTheme',
-						timeout: 3500,
-					});
-				}
-			},
-			'json'
-		);
-		$('#update-transmittalitem-btn-'+id).popover('hide');
-	});
-");
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
+		$this->printDeleteDocumentButtonJs();
+		$this->printDeleteItemButtonJs();
+		$this->printUpdateItemButtonJs();
 	} /* }}} */
 
 	/**
@@ -119,14 +47,7 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 	function printUpdateItemButton($item, $msg, $return=false){ /* {{{ */
 		$itemid = $item->getID();
 		$content = '';
-    $content .= '<a id="update-transmittalitem-btn-'.$itemid.'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'"><i class="icon-refresh"></i></a>';
-		$this->addFooterJS("
-$('#update-transmittalitem-btn-".$itemid."').popover({
-	title: '".getMLText("update_transmittalitem")."',
-	placement: 'left',
-	html: true,
-	content: \"<div>".htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES)."</div><div><button class='btn btn-danger updatetransmittalitem' style='float: right; margin:10px 0px;' rel='".$itemid."' msg='".htmlspecialchars($msg, ENT_QUOTES)."' formtoken='".createFormKey('updatetransmittalitem')."' id='confirm-update-transmittalitem-btn-".$itemid."'><i class='icon-refresh'></i> ".getMLText("update_transmittalitem")."</button> <button type='button' class='btn' style='float: right; margin:10px 10px;' onclick='$(&quot;#update-transmittalitem-btn-".$itemid."&quot;).popover(&quot;hide&quot;);'>".getMLText('cancel')."</button></div>\"});
-");
+    $content .= '<a class="update-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="icon-refresh"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -134,6 +55,56 @@ $('#update-transmittalitem-btn-".$itemid."').popover({
 		return '';
 	} /* }}} */
 
+	function printUpdateItemButtonJs(){ /* {{{ */
+		echo "
+		$(document).ready(function () {
+			$('body').on('click', 'a.update-transmittalitem-btn', function(ev){
+				id = $(ev.currentTarget).attr('rel');
+				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
+				msg = $(ev.currentTarget).attr('msg');
+				formtoken = '".createFormKey('updatetransmittalitem')."';
+				bootbox.dialog(confirmmsg, [{
+					\"label\" : \"<i class='icon-refresh'></i> ".getMLText("update_transmittalitem")."\",
+					\"class\" : \"btn-danger\",
+					\"callback\": function() {
+						$.get('../op/op.Ajax.php',
+							{ command: 'updatetransmittalitem', id: id, formtoken: formtoken },
+							function(data) {
+								if(data.success) {
+									$('#table-row-document-'+id).hide('slow');
+									noty({
+										text: msg,
+										type: 'success',
+										dismissQueue: true,
+										layout: 'topRight',
+										theme: 'defaultTheme',
+										timeout: 1500,
+									});
+								} else {
+									noty({
+										text: data.message,
+										type: 'error',
+										dismissQueue: true,
+										layout: 'topRight',
+										theme: 'defaultTheme',
+										timeout: 3500,
+									});
+								}
+							},
+							'json'
+						);
+					}
+				}, {
+					\"label\" : \"".getMLText("cancel")."\",
+					\"class\" : \"btn-cancel\",
+					\"callback\": function() {
+					}
+				}]);
+			});
+		});
+		";
+	} /* }}} */
+
 	/**
 	 * Print button with link for deleting a transmittal item
 	 *
@@ -147,14 +118,7 @@ $('#update-transmittalitem-btn-".$itemid."').popover({
 	function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
 		$itemid = $item->getID();
 		$content = '';
-    $content .= '<a id="delete-transmittalitem-btn-'.$itemid.'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'"><i class="icon-remove"></i></a>';
-		$this->addFooterJS("
-$('#delete-transmittalitem-btn-".$itemid."').popover({
-	title: '".getMLText("rm_transmittalitem")."',
-	placement: 'left',
-	html: true,
-	content: \"<div>".htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES)."</div><div><button class='btn btn-danger removetransmittalitem' style='float: right; margin:10px 0px;' rel='".$itemid."' msg='".htmlspecialchars($msg, ENT_QUOTES)."' formtoken='".createFormKey('removetransmittalitem')."' id='confirm-delete-transmittalitem-btn-".$itemid."'><i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."</button> <button type='button' class='btn' style='float: right; margin:10px 10px;' onclick='$(&quot;#delete-transmittalitem-btn-".$itemid."&quot;).popover(&quot;hide&quot;);'>".getMLText('cancel')."</button></div>\"});
-");
+    $content .= '<a class="delete-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -162,11 +126,61 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
 		return '';
 	} /* }}} */
 
+	function printDeleteItemButtonJs(){ /* {{{ */
+		echo "
+		$(document).ready(function () {
+			$('body').on('click', 'a.delete-transmittalitem-btn', function(ev){
+				id = $(ev.currentTarget).attr('rel');
+				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
+				msg = $(ev.currentTarget).attr('msg');
+				formtoken = '".createFormKey('removetransmittalitem')."';
+				bootbox.dialog(confirmmsg, [{
+					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."\",
+					\"class\" : \"btn-danger\",
+					\"callback\": function() {
+						$.get('../op/op.Ajax.php',
+							{ command: 'removetransmittalitem', id: id, formtoken: formtoken },
+							function(data) {
+								if(data.success) {
+									$('#table-row-document-'+id).hide('slow');
+									noty({
+										text: msg,
+										type: 'success',
+										dismissQueue: true,
+										layout: 'topRight',
+										theme: 'defaultTheme',
+										timeout: 1500,
+									});
+								} else {
+									noty({
+										text: data.message,
+										type: 'error',
+										dismissQueue: true,
+										layout: 'topRight',
+										theme: 'defaultTheme',
+										timeout: 3500,
+									});
+								}
+							},
+							'json'
+						);
+					}
+				}, {
+					\"label\" : \"".getMLText("cancel")."\",
+					\"class\" : \"btn-cancel\",
+					\"callback\": function() {
+					}
+				}]);
+			});
+		});
+		";
+	} /* }}} */
+
 	function showTransmittalForm($transmittal) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 ?>
-	<form action="../op/op.TransmittalMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $transmittal ? $transmittal->getID() : '0';?>" onsubmit="return checkForm('<?php print $transmittal ? $transmittal->getID() : '0';?>');">
+	<form action="../op/op.TransmittalMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $transmittal ? $transmittal->getID() : '0';?>">
 <?php
 		if($transmittal) {
 			echo createHiddenFieldWithKey('edittransmittal');
@@ -221,6 +235,8 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
 		$previewer->setConverters($previewconverters);
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("my_transmittals"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -270,7 +286,6 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
 		if($seltransmittal) {
 			$items = $seltransmittal->getItems();
 			if($items) {
-				$this->addAdditionalJS();
 				print "<table class=\"table table-condensed\">";
 				print "<thead>\n<tr>\n";
 				print "<th></th>\n";
@@ -307,6 +322,7 @@ $('#delete-transmittalitem-btn-".$itemid."').popover({
 </div>
 </div>
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

From 2fa5946bc5c11ce3d5198533257686af4cb080cc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Mar 2016 06:40:40 +0100
Subject: [PATCH 0428/2006] fix syntax error

---
 views/bootstrap/class.CheckInDocument.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index e318a7994..f785a4a33 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -70,7 +70,6 @@ $(document).ready(function() {
 <?php
 	} /* }}} */
 
-?>
 	function __takeOverButton($name, $users) { /* {{{ */
 ?>
 	<span id="<?php echo $name; ?>_btn" style="cursor: pointer;" title="<?php printMLText("takeOver".$name); ?>"><i class="icon-arrow-left"></i></span>

From 84e010bdf7d8fc57bc658d453db88348b3b820ea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Mar 2016 06:42:27 +0100
Subject: [PATCH 0429/2006] add missing contentEnd()

---
 views/bootstrap/class.AddToTransmittal.php  | 1 +
 views/bootstrap/class.AddTransmittal.php    | 1 +
 views/bootstrap/class.RemoveTransmittal.php | 1 +
 views/bootstrap/class.ReviseDocument.php    | 1 +
 views/bootstrap/class.RoleMgr.php           | 1 +
 5 files changed, 5 insertions(+)

diff --git a/views/bootstrap/class.AddToTransmittal.php b/views/bootstrap/class.AddToTransmittal.php
index a67775739..fd11ad092 100644
--- a/views/bootstrap/class.AddToTransmittal.php
+++ b/views/bootstrap/class.AddToTransmittal.php
@@ -67,6 +67,7 @@ class SeedDMS_View_AddToTransmittal extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/bootstrap/class.AddTransmittal.php b/views/bootstrap/class.AddTransmittal.php
index 7005d860b..5d3b6439e 100644
--- a/views/bootstrap/class.AddTransmittal.php
+++ b/views/bootstrap/class.AddTransmittal.php
@@ -99,6 +99,7 @@ $(document).ready(function() {
 	</table>
 </form>
 <?php
+		$this->contentEnd();
 		$this->contentContainerEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.RemoveTransmittal.php b/views/bootstrap/class.RemoveTransmittal.php
index 153dfa925..d766de17c 100644
--- a/views/bootstrap/class.RemoveTransmittal.php
+++ b/views/bootstrap/class.RemoveTransmittal.php
@@ -57,6 +57,7 @@ class SeedDMS_View_RemoveTransmittal extends SeedDMS_Bootstrap_Style {
 </form>
 <?php
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 2472a6396..ba87582d5 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -211,6 +211,7 @@ $(document).ready(function() {
 <?php
 		}
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 7cba9976e..be2211a6c 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -195,6 +195,7 @@ $(document).ready( function() {
 </div>
 
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

From 14b30ce48ff656531775bb6ca2e942d773d57550 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Mar 2016 07:46:55 +0100
Subject: [PATCH 0430/2006] do not call checkForm() if document wasn't modified

---
 views/bootstrap/class.CheckInDocument.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index f785a4a33..62ec3ecc6 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -567,9 +567,10 @@ $(document).ready( function() {
 		$this->contentContainerEnd();
 		} else {
 ?>
-<form action="../op/op.CheckInDocument.php" method="post" name="form1" onsubmit="return checkForm();">
+<form action="../op/op.CheckInDocument.php" method="post">
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 	<input type="submit" class="btn" value="<?php printMLText("reset_checkout"); ?>">
+</form>
 <?php
 		}
 		$this->contentEnd();

From c947f92a731dd9b18c4a939c040091ef9d6c2934 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Mar 2016 12:40:09 +0100
Subject: [PATCH 0431/2006] check for guest based on role

---
 op/op.UsrMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 50869c943..ff98a0068 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -245,7 +245,7 @@ else if ($action == "edituser") {
 		$editedUser->setLogin($login);
 	if($pwdexpiration)
 		$editedUser->setPwdExpiration($pwdexpiration);
-	if(($role == SeedDMS_Core_User::role_guest) && $clearpwd) {
+	if($role->isGuest() && $clearpwd) {
 		$editedUser->setPwd('');
 	} else {
 		if (isset($pwd) && ($pwd != "")) {

From 8d5e6d9d145e550d1c7e2c7ebab065db37d23b6d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Mar 2016 15:47:53 +0100
Subject: [PATCH 0432/2006] fix propper div wrapping

---
 views/bootstrap/class.Acl.php            | 1 +
 views/bootstrap/class.AddTransmittal.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index dd12512bd..fb42be0fb 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -278,6 +278,7 @@ $(document).ready( function() {
 </div>
 </div>
 <?php
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/bootstrap/class.AddTransmittal.php b/views/bootstrap/class.AddTransmittal.php
index 5d3b6439e..aa9528c9e 100644
--- a/views/bootstrap/class.AddTransmittal.php
+++ b/views/bootstrap/class.AddTransmittal.php
@@ -99,8 +99,8 @@ $(document).ready(function() {
 	</table>
 </form>
 <?php
-		$this->contentEnd();
 		$this->contentContainerEnd();
+		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }

From c7836aabfe89504918e018fe0d649f0f40ade980 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Mar 2016 16:27:56 +0100
Subject: [PATCH 0433/2006] check if $selrole is set

---
 views/bootstrap/class.Acl.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index fb42be0fb..4d4c956e2 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -265,14 +265,16 @@ $(document).ready( function() {
 <?php
 		$this->contentHeading(getMLText("access_control"));
 
-		$aro = SeedDMS_Aro::getInstance($selrole, $dms);
-		if(!$aro) {
-			$this->warningMsg(getMLText("missing_request_object"));
-			echo "<button id=\"add_aro\" class=\"btn btn-primary\" data-roleid=\"".$selrole->getID()."\">".getMLText('add')."</button>";
-		} else {
+		if($selrole) {
+			$aro = SeedDMS_Aro::getInstance($selrole, $dms);
+			if(!$aro) {
+				$this->warningMsg(getMLText("missing_request_object"));
+				echo "<button id=\"add_aro\" class=\"btn btn-primary\" data-roleid=\"".$selrole->getID()."\">".getMLText('add')."</button>";
+			} else {
 ?>
 	<div id="acostree" data-url="out.Acl.php?action=tree&roleid=<?= ($selrole ? $selrole->getID() : 0) ?>">Berechtigungen werden geladen ...</div>
 <?php
+			}
 		}
 ?>
 </div>

From a6932331509bd9654f734b7a140baf00e820afa8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Mar 2016 16:53:01 +0100
Subject: [PATCH 0434/2006] make mayEditVersion() work again

---
 inc/inc.ClassAccessOperation.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 9217ed3c8..48c31f72d 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -62,12 +62,12 @@ class SeedDMS_AccessOperation {
 	 * document may delete versions. The admin may even delete a version
 	 * even if is disallowed in the settings.
 	 */
-	function mayEditVersion() { /* {{{ */
-		if(get_class($this->obj) == 'SeedDMS_Core_Document') {
-			$version = $this->obj->getLatestContent();
+	function mayEditVersion($document) { /* {{{ */
+		if(get_class($document) == $this->dms->getClassname('document')) {
+			$version = $document->getLatestContent();
 			if (!isset($this->settings->_editOnlineFileTypes) || !is_array($this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getFileType()), $this->settings->_editOnlineFileTypes))
 				return false;
-			if ($this->obj->getAccessMode($this->user) == M_ALL || $this->user->isAdmin()) {
+			if ($document->getAccessMode($this->user) == M_ALL || $this->user->isAdmin()) {
 				return true;
 			}
 		}

From 50cfb869e29a4cd387556bd0d0591359c5f694d7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Mar 2016 16:53:32 +0100
Subject: [PATCH 0435/2006] pass $document to mayEditVersion()

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 814de30d0..157a5c352 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -523,7 +523,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		print "</ul>";
 		print "<ul class=\"unstyled actions\">";
-		if($accessop->mayEditVersion()) {
+		if($accessop->mayEditVersion($document)) {
 			print "<li><a href=\"out.EditOnline.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_version")."</a></li>";
 		}
 		/* Only admin has the right to remove version in any case or a regular

From 353be72dc992803a708a71bb1172f6562963b084 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Mar 2016 16:54:03 +0100
Subject: [PATCH 0436/2006] pass $document to mayApprove()

---
 out/out.ApproveDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.ApproveDocument.php b/out/out.ApproveDocument.php
index 1eac5fe27..d70e09fa7 100644
--- a/out/out.ApproveDocument.php
+++ b/out/out.ApproveDocument.php
@@ -63,7 +63,7 @@ if ($latestContent->getVersion()!=$version) {
 }
 
 // verify if document may be approved
-if (!$accessop->mayApprove()){
+if (!$accessop->mayApprove($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 

From 3e05cfe24fcd2c9cddb6a47d2756a764063d211e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Mar 2016 16:54:25 +0100
Subject: [PATCH 0437/2006] fix call of SeedDMS_AccessOperation()

---
 out/out.AddFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.AddFile.php b/out/out.AddFile.php
index 199fda8be..22611cc55 100644
--- a/out/out.AddFile.php
+++ b/out/out.AddFile.php
@@ -45,7 +45,7 @@ if ($document->getAccessMode($user) < M_READWRITE) {
 }
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));

From 6deefda545a5741046518c57d67df3e3251a48ba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Mar 2016 17:33:04 +0100
Subject: [PATCH 0438/2006] use $newdocstatus instead of $newStatus

---
 op/op.ReviewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 8d55437da..9552177d3 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -160,7 +160,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 }
 
 // Notify approvers, if necessary.
-if ($newStatus == S_DRAFT_APP) {
+if ($newdocstatus == S_DRAFT_APP) {
 	$requestUser = $document->getOwner();
 
 	if($notifier) {

From 50a39d439a8acc916210cc0f484df65f1d254278 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Mar 2016 17:56:34 +0100
Subject: [PATCH 0439/2006] revisors may not be set unless document is release
 or in revision

---
 inc/inc.ClassAccessOperation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 48c31f72d..0e350a951 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -167,7 +167,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			$latestContent = $document->getLatestContent();
 			$status = $latestContent->getStatus();
-			if (($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin() /* && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)*/) {
+			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
 				return true;
 			}
 		}
@@ -317,7 +317,7 @@ class SeedDMS_AccessOperation {
 	 * Check if document content may be revised
 	 *
 	 * Revising a document content is only allowed if the document was not
-	 * obsoleted. There are other requirements which are not taken into
+	 * obsoleted. There may be other requirements which are not taken into
 	 * account here.
 	 */
 	function mayRevise($document) { /* {{{ */

From f5db1b66cb9821c9920d411f90822877443a36c9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Mar 2016 15:40:25 +0100
Subject: [PATCH 0440/2006] =?UTF-8?q?setStatus=20will=20not=20fail=20if=20?=
 =?UTF-8?q?status=20is=20unchanged,=20finishRevision()=20will=20no=20longe?=
 =?UTF-8?q?r=20set=20state=20wa=D1=96ting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 04d37d047..a8897dfeb 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2984,7 +2984,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$this->getStatus();
 		}
 		if ($this->_status["status"]==$status) {
-			return false;
+			return true;
 		}
 		if($date)
 			$ddate = $db->qstr($date);
@@ -4631,6 +4631,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		 * this may not be possible.
 		 */
 		$db->startTransaction();
+		/* Does it make sense to put all revisions into sleeping mode? I guess
+		 * not. If a document was released or rejected the revision are useless
+		 * anyway 
 		foreach($revisionStatus as $status) {
 			if($status['status'] != S_LOG_SLEEPING && $status['status'] != S_LOG_USER_REMOVED) {
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
@@ -4645,6 +4648,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				}
 			}
 		}
+		 */
 		if(!$this->setStatus($docstatus, $docmsg, $requestUser)) {
 			$db->rollbackTransaction();
 			return false;

From fe8e1d2b5207669795b97cdda9f877f629e639b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Mar 2016 15:41:23 +0100
Subject: [PATCH 0441/2006] proper check of return value of setStatus()

---
 controllers/class.ReviseDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php
index 1720b270f..391e8ac14 100644
--- a/controllers/class.ReviseDocument.php
+++ b/controllers/class.ReviseDocument.php
@@ -64,7 +64,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 		$result = $this->callHook('reviseUpdateDocumentStatus', $content);
 		if($result === null) {
 			if ($revisionstatus == -1){
-				if($content->setStatus(S_REJECTED,$comment,$user)) {
+				if(!$content->setStatus(S_REJECTED,$comment,$user)) {
 					$this->error = 1;
 					$this->errormsg = "revision_update_failed";
 					return false;
@@ -94,7 +94,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 					}
 				} else {
 					$newStatus=S_IN_REVISION;
-					if($content->setStatus($newStatus,$comment,$user)) {
+					if(!$content->setStatus($newStatus,$comment,$user)) {
 						$this->error = 1;
 						$this->errormsg = "revision_update_failed";
 						return false;

From 5a43b8f9f446c8c61612fe8efb37a2c9c2d79a09 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Mar 2016 15:41:54 +0100
Subject: [PATCH 0442/2006] fix header

---
 views/bootstrap/class.SetRecipients.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index d61fde678..ddfd9df7f 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -44,7 +44,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
 		$this->globalNavigation($folder);
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
-		$this->contentHeading(getMLText("change_assignments"));
+		$this->contentHeading(getMLText("change_recipients"));
 
 		// Retrieve a list of all users and groups that have receipt privileges.
 		$docAccess = $document->getReadAccessList();

From ced19968aaf60903b9c92082bddbf3c509208f5d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Mar 2016 15:42:18 +0100
Subject: [PATCH 0443/2006] output progressbar for receipt status

---
 views/bootstrap/class.ViewDocument.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 157a5c352..be6cb87d5 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -999,9 +999,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<td width='20%'></td>\n";
 			print "</tr>\n";
 
+			$stat = array('-1'=>0, '0'=>0, '1'=>0);
 			foreach ($receiptStatus as $r) {
 				$required = null;
 				$is_recipient = false;
+				$stat[''.$r['status']]++;
 				switch ($r["type"]) {
 					case 0: // Reviewer is an individual.
 						$required = $dms->getUser($r["required"]);
@@ -1050,12 +1052,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		</table>
 <?php
-
 			$this->contentContainerEnd();
 			if($user->isAdmin()) {
 ?>
 			<div class="row-fluid">
 			<div class="span12">
+<div class="progress">
+<div class="bar bar-success" style="width: <?php echo round($stat['1']/count($receiptStatus)*100); ?>%;"></div>
+<!-- div class="bar bar-warning" style="width: <?php echo round($stat['0']/count($receiptStatus)*100); ?>%;"></div -->
+	<div class="bar bar-danger" style="width: <?php echo round($stat['-1']/count($receiptStatus)*100); ?>%;"></div>
+</div>
+			</div>
+			</div>
+			<div class="row-fluid">
+			<div class="span12">
 <?php
 				$this->printProtocol($latestContent, 'receipt');
 ?>

From cc1c4081bc2dfcad60be5363f36ce8f28e394541 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Mar 2016 15:43:00 +0100
Subject: [PATCH 0444/2006] select user even in status S_LOG_ACCEPTED or
 S_LOG_REJECTED

---
 views/bootstrap/class.SetRevisors.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 88e8417f0..91623ee55 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -87,6 +87,8 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 				switch ($revisionIndex["i"][$usr->getID()]["status"]) {
 					case S_LOG_WAITING:
 					case S_LOG_SLEEPING:
+					case S_LOG_ACCEPTED:
+					case S_LOG_REJECTED:
 						print "<option value='". $usr->getID() ."' selected='selected'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
 						break;
 					case S_LOG_USER_REMOVED:

From 9fec5fd1c01ee8be21bee5f32694db0e2279f85b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Mar 2016 15:57:10 +0100
Subject: [PATCH 0445/2006] use right translation phrase

---
 views/bootstrap/class.SetReviewersApprovers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.SetReviewersApprovers.php b/views/bootstrap/class.SetReviewersApprovers.php
index d6c3aec1d..2e3ec63f5 100644
--- a/views/bootstrap/class.SetReviewersApprovers.php
+++ b/views/bootstrap/class.SetReviewersApprovers.php
@@ -124,7 +124,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
   </select>
 
   <div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups")?>:</div>
-  <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_grp_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+  <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 
 		foreach ($docAccess["groups"] as $group) {
@@ -209,7 +209,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
   </select>
 
   <div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups")?>:</div>
-  <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_grp_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+  <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 
 		foreach ($docAccess["groups"] as $group) {

From 267734e8665b752ba0a5b2420824123623b7bb2e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Mar 2016 15:59:24 +0100
Subject: [PATCH 0446/2006] set missing variable from view

---
 views/bootstrap/class.CheckInDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 62ec3ecc6..c81e67925 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -29,6 +29,7 @@ class SeedDMS_View_CheckInDocument extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
+		$dropfolderdir = $this->params['dropfolderdir'];
 		header('Content-Type: application/javascript; charset=UTF-8');
 ?>
 function checkForm()

From 8139bebb6a05aed2a348fb8577d1952deff08fa0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 31 Mar 2016 11:34:00 +0200
Subject: [PATCH 0447/2006] add new tables Aros, Acos, ArosAcos to update
 script

---
 install/update-5.1.0/update-sqlite3.sql | 27 +++++++++++++++++++++
 install/update-5.1.0/update.sql         | 32 +++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index 97b68cfe9..9ddf8ea10 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -111,6 +111,33 @@ DROP TABLE tblUsers;
 
 ALTER TABLE new_tblUsers RENAME TO tblUsers;
 
+CREATE TABLE `tblAros` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `parent` INTEGER,
+  `model` TEXT NOT NULL,
+  `foreignid` INTEGER NOT NULL DEFAULT '0',
+  `alias` TEXT
+) ;
+
+CREATE TABLE `tblAcos` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `parent` INTEGER,
+  `model` TEXT NOT NULL,
+  `foreignid` INTEGER NOT NULL DEFAULT '0',
+  `alias` TEXT
+) ;
+
+CREATE TABLE `tblArosAcos` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `aro` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblAros` (`id`) ON DELETE CASCADE,
+  `aco` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblAcos` (`id`) ON DELETE CASCADE,
+  `create` INTEGER NOT NULL DEFAULT '-1',
+  `read` INTEGER NOT NULL DEFAULT '-1',
+  `update` INTEGER NOT NULL DEFAULT '-1',
+  `delete` INTEGER NOT NULL DEFAULT '-1',
+  UNIQUE (aco, aro)
+) ;
+
 UPDATE tblVersion set major=5, minor=1, subminor=0;
 
 COMMIT;
diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index 3be9c3814..95b36d9bb 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -111,6 +111,38 @@ ALTER TABLE tblUsers CHANGE role role int(11) NOT NULL;
 UPDATE `tblUsers` SET role=3 WHERE role=0;
 ALTER TABLE tblUsers ADD CONSTRAINT `tblUsers_role` FOREIGN KEY (`role`) REFERENCES `tblRoles` (`id`);
 
+CREATE TABLE `tblAros` (
+  `id` int(11) NOT NULL auto_increment,
+  `parent` int(11),
+  `model` text NOT NULL,
+  `foreignid` int(11) NOT NULL DEFAULT '0',
+  `alias` varchar(255),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tblAcos` (
+  `id` int(11) NOT NULL auto_increment,
+  `parent` int(11),
+  `model` text NOT NULL,
+  `foreignid` int(11) NOT NULL DEFAULT '0',
+  `alias` varchar(255),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tblArosAcos` (
+  `id` int(11) NOT NULL auto_increment,
+  `aro` int(11) NOT NULL DEFAULT '0',
+  `aco` int(11) NOT NULL DEFAULT '0',
+  `create` tinyint(4) NOT NULL DEFAULT '-1',
+  `read` tinyint(4) NOT NULL DEFAULT '-1',
+  `update` tinyint(4) NOT NULL DEFAULT '-1',
+  `delete` tinyint(4) NOT NULL DEFAULT '-1',
+  PRIMARY KEY (`id`),
+  UNIQUE (aco, aro),
+  CONSTRAINT `tblArosAcos_acos` FOREIGN KEY (`aco`) REFERENCES `tblAcos` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblArosAcos_aros` FOREIGN KEY (`aro`) REFERENCES `tblAros` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 UPDATE tblVersion set major=5, minor=1, subminor=0;
 
 COMMIT;

From ba23fa9073207ce46ec9694a94fd4737a4280fa4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 Apr 2016 19:33:49 +0200
Subject: [PATCH 0448/2006] fix take over reviewers/approvers from last
 version, add field for members of a group

---
 views/bootstrap/class.CheckInDocument.php | 59 ++++++++++++++---------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index c81e67925..82696db10 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -31,6 +31,7 @@ class SeedDMS_View_CheckInDocument extends SeedDMS_Bootstrap_Style {
 		$strictformcheck = $this->params['strictformcheck'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		header('Content-Type: application/javascript; charset=UTF-8');
+		$this->printSelectPresetButtonJs();
 ?>
 function checkForm()
 {
@@ -71,25 +72,6 @@ $(document).ready(function() {
 <?php
 	} /* }}} */
 
-	function __takeOverButton($name, $users) { /* {{{ */
-?>
-	<span id="<?php echo $name; ?>_btn" style="cursor: pointer;" title="<?php printMLText("takeOver".$name); ?>"><i class="icon-arrow-left"></i></span>
-<script>
-$(document).ready( function() {
-	$('#<?php echo $name; ?>_btn').click(function(ev){
-		ev.preventDefault();
-<?php
-		foreach($users as $_id) {
-			echo "$(\"#".$name." option[value='".$_id."']\").attr(\"selected\", \"selected\");\n";
-		}
-?>
-		$("#<?php echo $name; ?>").trigger("chosen:updated");
-	});
-});
-</script>
-<?php
-	} /* }}} */
-
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -260,7 +242,7 @@ $(document).ready( function() {
 					}
 				}
 				if($tmp) {
-					$this->__takeOverButton("IndReviewer", $tmp);
+					$this->printSelectPresetButtonHtml("IndReviewer", $tmp);
 				}
 				/* List all mandatory reviewers */
 				if($res) {
@@ -294,6 +276,20 @@ $(document).ready( function() {
 ?>
       </td>
     </tr>
+      <tr>
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+        <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_reviewers'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+			</td>
+			</tr>
     <tr>
       <td>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
@@ -329,7 +325,7 @@ $(document).ready( function() {
 					}
 				}
 				if($tmp) {
-					$this->__takeOverButton("GrpReviewer", $tmp);
+					$this->printSelectPresetButtonHtml("GrpReviewer", $tmp);
 				}
 				/* List all mandatory groups of reviewers */
 				if($res) {
@@ -407,7 +403,7 @@ $(document).ready( function() {
 					}
 				}
 				if($tmp) {
-					$this->__takeOverButton("IndApprover", $tmp);
+					$this->printSelectPresetButtonHtml("IndApprover", $tmp);
 				}
 				/* List all mandatory approvers */
 				if($res) {
@@ -441,7 +437,22 @@ $(document).ready( function() {
 				}
 ?>
       </td>
-    </tr>
+		</tr>
+		  <tr>	
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+      <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_approvers'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+				</td>
+			</tr>	
+		<tr>
       <td>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
       </td>
@@ -477,7 +488,7 @@ $(document).ready( function() {
 					}
 				}
 				if($tmp) {
-					$this->__takeOverButton("GrpApprover", $tmp);
+					$this->printSelectPresetButtonHtml("GrpApprover", $tmp);
 				}
 				/* List all mandatory groups of approvers */
 				if($res) {

From e3bc75da15c0f2359bcbe86285c7aa88e84c129b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 Apr 2016 19:34:42 +0200
Subject: [PATCH 0449/2006] check for $_POST["grpIndApprovers"] and
 $_POST["grpIndReviewers"]

---
 op/op.CheckInDocument.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index f7e797ec1..78459d678 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -87,6 +87,16 @@ else
 					$reviewers["g"][] = $grp;
 				}
 			}
+			// Retrieve the list of reviewer groups whose members become individual reviewers
+			if (isset($_POST["grpIndReviewers"])) {
+				foreach ($_POST["grpIndReviewers"] as $grp) {
+					if($group = $dms->getGroup($grp)) {
+						$members = $group->getUsers();
+						foreach($members as $member)
+							$reviewers["i"][] = $member->getID();
+					}
+				}
+			}
 		}
 
 		// Retrieve the list of individual approvers from the form.
@@ -103,6 +113,16 @@ else
 				$approvers["g"][] = $grp;
 			}
 		}
+		// Retrieve the list of reviewer groups whose members become individual approvers
+		if (isset($_POST["grpIndApprovers"])) {
+			foreach ($_POST["grpIndApprovers"] as $grp) {
+				if($group = $dms->getGroup($grp)) {
+					$members = $group->getUsers();
+					foreach($members as $member)
+						$approvers["i"][] = $member->getID();
+				}
+			}
+		}
 
 		// add mandatory reviewers/approvers
 		$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);

From 2caa65add6de806fa7f99031dd45c588dcc7d04e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 Apr 2016 12:54:25 +0200
Subject: [PATCH 0450/2006] replace phrase 'role' by 'type'

---
 views/bootstrap/class.RoleMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index be2211a6c..00a77bd07 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -146,7 +146,7 @@ $(document).ready( function() {
 			<td><input type="text" name="name" id="name" value="<?php print $currRole ? htmlspecialchars($currRole->getName()) : "";?>"></td>
 		</tr>
 		<tr>
-			<td><?php printMLText("role");?>:</td>
+			<td><?php printMLText("type");?>:</td>
 			<td><select name="role"><option value="<?php echo SeedDMS_Core_Role::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_admin ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_admin) echo "selected"; ?>><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_guest ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_guest) echo "selected"; ?>><?php printMLText("role_guest"); ?></option></select></td>
 		</tr>
 		<tr>

From 0a87820f9ae7bce810a865463757d0de4ca975c1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 Apr 2016 15:10:43 +0200
Subject: [PATCH 0451/2006] SeedDMS_Core_DocumentContent::getAccessMode() takes
 status into account

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 82 +++++++++++++++++++++----
 1 file changed, 71 insertions(+), 11 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 8e876d928..403132a93 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3066,21 +3066,81 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * @return integer mode
 	 */
 	function getAccessMode($u) { /* {{{ */
-		if(!$this->_workflow)
-			$this->getWorkflow();
+		$dms = $this->_document->_dms;
+		$db = $dms->getDB();
 
-		if($this->_workflow) {
-			if (!$this->_workflowState)
-				$this->getWorkflowState();
-			$transitions = $this->_workflow->getNextTransitions($this->_workflowState);
-			foreach($transitions as $transition) {
-				if($this->triggerWorkflowTransitionIsAllowed($u, $transition))
-					return M_READ;
+		/* If read access isn't further restricted by status, than grant read access */
+		if(!$dms->noReadForStatus)
+			return M_READ;
+
+		/* If the current status is not in list of status without read access, then grant read access */
+		if(!in_array($this->getStatus(), $dms->noReadForStatus))
+			return M_READ;
+
+		/* At this point the current status is in the list of status without read access.
+		 * The only way to still gain read access is, if the user is involved in the
+		 * process, e.g. is a reviewer, approver or an active person in the workflow.
+		 */
+		switch($this->getStatus) {
+		case S_DRAFT_REV:
+			$status = $this->getReviewStatus();
+			foreach ($status as $r) {
+				switch ($r["type"]) {
+				case 0: // Reviewer is an individual.
+					if($u->getId() == $r["required"])
+						return M_READ;
+					break;
+				case 1: // Reviewer is a group.
+					$required = $dms->getGroup($r["required"]);
+					if (is_object($required) && $required->isMember($u))
+						return M_READ;
+					break;
+				}
 			}
-			return M_NONE;
+			break;
+		case S_DRAFT_APP:
+			$status = $this->getApprovalStatus();
+			foreach ($status as $r) {
+				switch ($r["type"]) {
+				case 0: // Reviewer is an individual.
+					if($u->getId() == $r["required"])
+						return M_READ;
+					break;
+				case 1: // Reviewer is a group.
+					$required = $dms->getGroup($r["required"]);
+					if (is_object($required) && $required->isMember($u))
+						return M_READ;
+					break;
+				}
+			}
+			break;
+		case S_RELEASED:
+			break;
+		case S_IN_WORKFLOW:
+			if(!$this->_workflow)
+				$this->getWorkflow();
+
+			if($this->_workflow) {
+				if (!$this->_workflowState)
+					$this->getWorkflowState();
+				$transitions = $this->_workflow->getNextTransitions($this->_workflowState);
+				foreach($transitions as $transition) {
+					if($this->triggerWorkflowTransitionIsAllowed($u, $transition))
+						return M_READ;
+				}
+			}
+			break;
+		case S_IN_REVISION:
+			break;
+		case S_REJECTED:
+			break;
+		case S_OBSOLETE:
+			break;
+		case S_EXPIRED:
+			break;
 		}
 
-		return M_READ;
+		return M_NONE;
 	} /* }}} */
 
 	/**

From 9786a5182225caa7812dc28311d15cc87778fa9c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 07:44:48 +0200
Subject: [PATCH 0452/2006] add variable noReadForStatus, method
 getLoggedInUser

setting noReadForStatus will allow to check if a version may
be accessible in its status
---
 SeedDMS_Core/Core/inc.ClassDMS.php | 38 ++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 92b57866c..d7f59a120 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -146,6 +146,13 @@ class SeedDMS_Core_DMS {
 	 */
 	public $viewOnlineFileTypes;
 
+	/**
+	 * @var array $noReadForStatus list of status without read right
+	 *      online
+	 * @access public
+	 */
+	public $noReadForStatus;
+
 	/**
 	 * @var string $version version of pear package
 	 * @access public
@@ -231,6 +238,12 @@ class SeedDMS_Core_DMS {
 	/**
 	 * Filter objects out which are not accessible in a given mode by a user.
 	 *
+	 * This function can be used for documents and folders and calls
+	 * {@link SeedDMS_Core_Folder::getAccessMode()} or
+	 * {@link SeedDMS_Core_Document::getAccessMode()}. A document is also
+	 * filtered out if it has no latest content, which can happen if access
+	 * on documents in a certain state has been restricted.
+	 *
 	 * @param array $objArr list of objects (either documents or folders)
 	 * @param object $user user for which access is checked
 	 * @param integer $minMode minimum access mode required
@@ -242,8 +255,15 @@ class SeedDMS_Core_DMS {
 		}
 		$newArr = array();
 		foreach ($objArr as $obj) {
-			if ($obj->getAccessMode($user) >= $minMode)
-				array_push($newArr, $obj);
+			if ($obj->getAccessMode($user) >= $minMode) {
+				$dms = $obj->_dms;
+				if(get_class($obj) == $dms->getClassname('document')) {
+					if($obj->getLatestContent())
+						array_push($newArr, $obj);
+				} else {
+					array_push($newArr, $obj);
+				}
+			}
 		}
 		return $newArr;
 	} /* }}} */
@@ -358,6 +378,7 @@ class SeedDMS_Core_DMS {
 		$this->forceRename = false;
 		$this->enableConverting = false;
 		$this->convertFileTypes = array();
+		$this->noReadForStatus = array();
 		$this->classnames = array();
 		$this->classnames['folder'] = 'SeedDMS_Core_Folder';
 		$this->classnames['document'] = 'SeedDMS_Core_Document';
@@ -563,6 +584,19 @@ class SeedDMS_Core_DMS {
 		$this->user = $user;
 	} /* }}} */
 
+	/**
+	 * Get the logged in user
+	 *
+	 * If user authentication was done externally, this function can
+	 * be used to tell the dms who is currently logged in.
+	 *
+	 * @return object $user
+	 *
+	 */
+	function getLoggedInUser() { /* {{{ */
+		return $this->user;
+	} /* }}} */
+
 	/**
 	 * Return a document by its id
 	 *

From 130c894a3552bb9d9ccfa476022569eb14211682 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 07:46:37 +0200
Subject: [PATCH 0453/2006] check if version is accessible

all functions which return a document version (e.g. getLatestVersion())
will check if access has been restricted by setting
SeedDMS_Core_DMS::noReadForStatus
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 188 ++++++++++++++++++------
 1 file changed, 141 insertions(+), 47 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 2e43188f4..349b911a3 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -199,6 +199,16 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 */
 	protected $_sequence;
 
+	/**
+	 * @var object temp. storage for latestcontent
+	 */
+	protected $_latestContent;
+
+	/**
+	 * @var array temp. storage for content
+	 */
+	protected $_content;
+
 	function __construct($id, $name, $comment, $date, $expires, $ownerID, $folderID, $inheritAccess, $defaultAccess, $locked, $keywords, $sequence) { /* {{{ */
 		parent::__construct($id);
 		$this->_name = $name;
@@ -214,6 +224,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$this->_sequence = $sequence;
 		$this->_categories = array();
 		$this->_notifyList = array();
+		$this->_latestContent = null;
+		$this->_content = null;
 	} /* }}} */
 
 	public static function getInstance($id, $dms) { /* {{{ */
@@ -1560,8 +1572,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
-		unset($this->_content);
-		unset($this->_latestContent);
+		$this->_content = null;
+		$this->_latestContent = null;
 		$content = $this->getLatestContent($contentID);
 //		$content = new SeedDMS_Core_DocumentContent($contentID, $this, $version, $comment, $date, $user->getID(), $dir, $orgFileName, $fileType, $mimeType, $filesize, $checksum);
 		if($workflow)
@@ -1736,8 +1748,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
-		unset($this->_content);
-		unset($this->_latestContent);
+		$this->_content = null;
+		$this->_latestContent = null;
 		$db->commitTransaction();
 
 		return true;
@@ -1746,7 +1758,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Return all content elements of a document
 	 *
-	 * This functions returns an array of content elements ordered by version
+	 * This functions returns an array of content elements ordered by version.
+	 * Version which are not accessible because of its status, will be filtered
+	 * out.
 	 *
 	 * @return array list of objects of class SeedDMS_Core_DocumentContent
 	 */
@@ -1761,8 +1775,16 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 			$this->_content = array();
 			$classname = $this->_dms->getClassname('documentcontent');
-			foreach ($resArr as $row)
-				array_push($this->_content, new $classname($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum'], $row['revisiondate']));
+			$user = $this->_dms->getLoggedInUser();
+			foreach ($resArr as $row) {
+				$content = new $classname($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum'], $row['revisiondate']);
+				if($user) {
+					if($content->getAccessMode($user) >= M_READ)
+						array_push($this->_content, $content);
+				} else {
+					array_push($this->_content, $content);
+				}
+			}
 		}
 
 		return $this->_content;
@@ -1771,8 +1793,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Return the content element of a document with a given version number
 	 *
+	 * This function will check if the version is accessible and return false
+	 * if not.
+	 *
 	 * @param integer $version version number of content element
-	 * @return object object of class SeedDMS_Core_DocumentContent
+	 * @return object/boolean object of class {@link SeedDMS_Core_DocumentContent}
+	 * or false
 	 */
 	function getContentByVersion($version) { /* {{{ */
 		if (!is_numeric($version)) return false;
@@ -1795,11 +1821,20 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		$resArr = $resArr[0];
 		$classname = $this->_dms->getClassname('documentcontent');
-		return new $classname($resArr["id"], $this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"], $resArr['fileSize'], $resArr['checksum'], $resArr['revisiondate']);
+		if($content = new $classname($resArr["id"], $this, $resArr["version"], $resArr["comment"], $resArr["date"], $resArr["createdBy"], $resArr["dir"], $resArr["orgFileName"], $resArr["fileType"], $resArr["mimeType"], $resArr['fileSize'], $resArr['checksum'], $resArr['revisiondate'])) {
+			$user = $this->_dms->getLoggedInUser();
+			/* A user with write access on the document may always see the version */
+			if($user && $content->getAccessMode($user) == M_NONE)
+				return false;
+			else
+				return $content;
+		} else {
+			return false;
+		}
 	} /* }}} */
 
-	function getLatestContent() { /* {{{ */
-		if (!isset($this->_latestContent)) {
+	function __getLatestContent() { /* {{{ */
+		if (!$this->_latestContent) {
 			$db = $this->_dms->getDB();
 			$queryStr = "SELECT * FROM tblDocumentContent WHERE document = ".$this->_id." ORDER BY version DESC LIMIT 0,1";
 			$resArr = $db->getResultArray($queryStr);
@@ -1815,6 +1850,52 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_latestContent;
 	} /* }}} */
 
+	/**
+	 * Get the latest version of document
+	 *
+	 * This function returns the latest accessible version of a document.
+	 * If content access has been restricted by setting
+	 * {@link SeedDMS_Core_DMS::noReadForStatus} the function will go
+	 * backwards in history until an accessible version is found. If none
+	 * is found null will be returned.
+	 *
+	 * @return object object of class {@link SeedDMS_Core_DocumentContent}
+	 */
+	function getLatestContent() { /* {{{ */
+		if (!$this->_latestContent) {
+			$db = $this->_dms->getDB();
+			$queryStr = "SELECT * FROM tblDocumentContent WHERE document = ".$this->_id." ORDER BY version DESC";
+			$resArr = $db->getResultArray($queryStr);
+			if (is_bool($resArr) && !$res)
+				return false;
+
+			$classname = $this->_dms->getClassname('documentcontent');
+			$user = $this->_dms->getLoggedInUser();
+			foreach ($resArr as $row) {
+				if (!$this->_latestContent) {
+					$content = new $classname($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum'], $row['revisiondate']);
+					if($user) {
+						/* If the user may even write the document, then also allow to see all content.
+						 * This is needed because the user could upload a new version
+						 */
+						if($content->getAccessMode($user) >= M_READ) {
+							$this->_latestContent = $content;
+						}
+					} else {
+						$this->_latestContent = $content;
+					}
+				}
+			}
+		}
+
+		return $this->_latestContent;
+	} /* }}} */
+
+	/**
+	 * Remove a certain version
+	 *
+	 * @param integer $version version number
+	 */
 	function removeContent($version) { /* {{{ */
 		$db = $this->_dms->getDB();
 
@@ -3054,19 +3135,19 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 	/**
 	 * Returns the access mode similar to a document
-	 * There is no real access mode for document content, so this is more
-	 * like a virtual access mode, derived from the status or workflow
-	 * of the document content. The idea is to return an access mode
-	 * M_NONE if the user is still in a workflow or under review/approval.
-	 * In such a case only those user involved in the workflow/review/approval
-	 * process should be allowed to see the document. This method could
-	 * be called by any function that returns the content e.g. getLatestContent() 
-	 * It may as well be used by SeedDMS_Core_Document::getAccessMode() to
-	 * prevent access on the whole document if there is just one version.
-	 * The return value is planed to be either M_NONE or M_READ.
 	 *
-	 * @param object $user
-	 * @return integer mode
+	 * There is no real access mode for document content, so this is more
+	 * like a virtual access mode, derived from the status of the document 
+	 * content. The function checks if {@link SeedDMS_Core_DMS::noReadForStatus}
+	 * contains the status of the version and returns M_NONE if it exists and
+	 * the user is not involved in a workflow or review/approval.
+	 * This method is called by all functions that returns the content e.g.
+	 * {@link SeedDMS_Core_Document::getLatestContent()}
+	 * It is also used by {@link SeedDMS_Core_Document::getAccessMode()} to
+	 * prevent access on the whole document if there is no accessible version.
+	 *
+	 * @param object $u user
+	 * @return integer either M_NONE or M_READ
 	 */
 	function getAccessMode($u) { /* {{{ */
 		$dms = $this->_document->_dms;
@@ -3077,44 +3158,57 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return M_READ;
 
 		/* If the current status is not in list of status without read access, then grant read access */
-		if(!in_array($this->getStatus(), $dms->noReadForStatus))
+		if(!in_array($this->getStatus()['status'], $dms->noReadForStatus))
 			return M_READ;
 
+		/* Administrators have unrestricted access */
+		if ($u->isAdmin()) return M_READ;
+
+		/* The owner of the document has unrestricted access */
+		$owner = $this->_document->getOwner();
+		if ($u->getID() == $owner->getID()) return M_READ;
+
+		/* Read/Write access on the document will also grant access on the version */
+		if($this->_document->getAccessMode($user) >= M_READWRITE) return M_READ;
+
 		/* At this point the current status is in the list of status without read access.
 		 * The only way to still gain read access is, if the user is involved in the
 		 * process, e.g. is a reviewer, approver or an active person in the workflow.
 		 */
-		switch($this->getStatus) {
+		$s = $this->getStatus();
+		switch($s['status']) {
 		case S_DRAFT_REV:
 			$status = $this->getReviewStatus();
 			foreach ($status as $r) {
-				switch ($r["type"]) {
-				case 0: // Reviewer is an individual.
-					if($u->getId() == $r["required"])
-						return M_READ;
-					break;
-				case 1: // Reviewer is a group.
-					$required = $dms->getGroup($r["required"]);
-					if (is_object($required) && $required->isMember($u))
-						return M_READ;
-					break;
-				}
+				if($r['status'] != -2) // Check if reviewer was removed
+					switch ($r["type"]) {
+					case 0: // Reviewer is an individual.
+						if($u->getId() == $r["required"])
+							return M_READ;
+						break;
+					case 1: // Reviewer is a group.
+						$required = $dms->getGroup($r["required"]);
+						if (is_object($required) && $required->isMember($u))
+							return M_READ;
+						break;
+					}
 			}
 			break;
 		case S_DRAFT_APP:
 			$status = $this->getApprovalStatus();
 			foreach ($status as $r) {
-				switch ($r["type"]) {
-				case 0: // Reviewer is an individual.
-					if($u->getId() == $r["required"])
-						return M_READ;
-					break;
-				case 1: // Reviewer is a group.
-					$required = $dms->getGroup($r["required"]);
-					if (is_object($required) && $required->isMember($u))
-						return M_READ;
-					break;
-				}
+				if($r['status'] != -2) // Check if approver was removed
+					switch ($r["type"]) {
+					case 0: // Reviewer is an individual.
+						if($u->getId() == $r["required"])
+							return M_READ;
+						break;
+					case 1: // Reviewer is a group.
+						$required = $dms->getGroup($r["required"]);
+						if (is_object($required) && $required->isMember($u))
+							return M_READ;
+						break;
+					}
 			}
 			break;
 		case S_RELEASED:

From be8be01ed533590efa32950cd343a6d04d109a6d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 07:54:22 +0200
Subject: [PATCH 0454/2006] check if getLatestContent() returns a version

---
 inc/inc.ClassAccessOperation.php | 121 +++++++++++++++++--------------
 1 file changed, 67 insertions(+), 54 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 0e350a951..0eb6f48ab 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -64,11 +64,12 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayEditVersion($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$version = $document->getLatestContent();
-			if (!isset($this->settings->_editOnlineFileTypes) || !is_array($this->settings->_editOnlineFileTypes) || !in_array(strtolower($version->getFileType()), $this->settings->_editOnlineFileTypes))
-				return false;
-			if ($document->getAccessMode($this->user) == M_ALL || $this->user->isAdmin()) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				if (!isset($this->settings->_editOnlineFileTypes) || !is_array($this->settings->_editOnlineFileTypes) || !in_array(strtolower($latestContent->getFileType()), $this->settings->_editOnlineFileTypes))
+					return false;
+				if ($document->getAccessMode($this->user) == M_ALL || $this->user->isAdmin()) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -105,10 +106,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayOverrideStatus($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE)) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE)) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -125,10 +127,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function maySetReviewersApprovers($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status['status']==S_DRAFT || $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP && $this->settings->_workflowMode == 'traditional_only_approval')) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status['status']==S_DRAFT || $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP && $this->settings->_workflowMode == 'traditional_only_approval')) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -145,10 +148,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function maySetRecipients($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED)) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED)) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -165,10 +169,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function maySetRevisors($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -185,10 +190,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function maySetWorkflow($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$workflow = $latestContent->getWorkflow();
-			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$workflow = $latestContent->getWorkflow();
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -202,10 +208,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function maySetExpires($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ((($document->getAccessMode($this->user) == M_ALL) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ((($document->getAccessMode($this->user) == M_ALL) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -228,10 +235,11 @@ class SeedDMS_AccessOperation {
 					return false;
 				}
 			}
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -248,11 +256,12 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayEditAttributes($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			$workflow = $latestContent->getWorkflow();
-			if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT_REV || ($workflow && $workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				$workflow = $latestContent->getWorkflow();
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT_REV || ($workflow && $workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -267,10 +276,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayReview($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ($status["status"]!=S_OBSOLETE) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ($status["status"]!=S_OBSOLETE) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -286,10 +296,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayApprove($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ($status["status"]!=S_OBSOLETE && $status["status"]!=S_DRAFT_REV && $status["status"]!=S_REJECTED) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ($status["status"]!=S_OBSOLETE && $status["status"]!=S_DRAFT_REV && $status["status"]!=S_REJECTED) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -304,10 +315,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayReceipt($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ($status["status"]!=S_OBSOLETE) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ($status["status"]!=S_OBSOLETE) {
+					return true;
+				}
 			}
 		}
 		return false;
@@ -322,10 +334,11 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayRevise($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
-			$latestContent = $document->getLatestContent();
-			$status = $latestContent->getStatus();
-			if ($status["status"]!=S_OBSOLETE) {
-				return true;
+			if($latestContent = $document->getLatestContent()) {
+				$status = $latestContent->getStatus();
+				if ($status["status"]!=S_OBSOLETE) {
+					return true;
+				}
 			}
 		}
 		return false;

From fb73b9c92223fbf48287444f4a7d80ffd49d3f10 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 07:55:15 +0200
Subject: [PATCH 0455/2006] get $user from view in mainMenu()

---
 views/bootstrap/class.Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 0c0a3da42..02c42c3f0 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1605,6 +1605,7 @@ $(function() {
 	 */
 	function mainClipboard($clipboard, $previewer){ /* {{{ */
 		$dms = $this->params['dms'];
+		$user = $this->params['user'];
 		$content = '';
 		$foldercount = $doccount = 0;
 		if($clipboard['folders']) {

From 3654906e9a31afae99b9434b2636a7ff0c68dc9d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 07:56:53 +0200
Subject: [PATCH 0456/2006] set $dms->noReadForStatus (still commented out)

---
 inc/inc.DBInit.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index 1519dd4e0..ad458f90f 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -56,6 +56,7 @@ $dms->setRootFolderID($settings->_rootFolderID);
 $dms->setMaxDirID($settings->_maxDirID);
 $dms->setEnableConverting($settings->_enableConverting);
 $dms->setViewOnlineFileTypes($settings->_viewOnlineFileTypes);
+//$dms->noReadForStatus = array(S_DRAFT, S_DRAFT_REV/*, S_DRAFT_APP*/);
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {

From 50cf128471fa4536f1e49830d97370bc25d95cbe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 08:48:12 +0200
Subject: [PATCH 0457/2006] replace phrase 'type' with 'role_type'

---
 views/bootstrap/class.RoleMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 00a77bd07..f807f8435 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -146,7 +146,7 @@ $(document).ready( function() {
 			<td><input type="text" name="name" id="name" value="<?php print $currRole ? htmlspecialchars($currRole->getName()) : "";?>"></td>
 		</tr>
 		<tr>
-			<td><?php printMLText("type");?>:</td>
+			<td><?php printMLText("role_type");?>:</td>
 			<td><select name="role"><option value="<?php echo SeedDMS_Core_Role::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_admin ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_admin) echo "selected"; ?>><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_guest ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_guest) echo "selected"; ?>><?php printMLText("role_guest"); ?></option></select></td>
 		</tr>
 		<tr>

From 7a84ffee5e0d5a07e0b048a91c42b90d6dadddae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 09:17:35 +0200
Subject: [PATCH 0458/2006] fix typo in description of extension

---
 ext/example/conf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/example/conf.php b/ext/example/conf.php
index c6fd2ce56..931cc14a4 100644
--- a/ext/example/conf.php
+++ b/ext/example/conf.php
@@ -1,7 +1,7 @@
 <?php
 $EXT_CONF['example'] = array(
 	'title' => 'Example Extension',
-	'description' => 'This sample extension demonstrate the use of various hooks',
+	'description' => 'This sample extension demonstrates the use of various hooks',
 	'disable' => true,
 	'version' => '1.0.0',
 	'releasedate' => '2013-05-03',

From 0511d06d6335d37847010435bee8d456e7559528 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 12:21:55 +0200
Subject: [PATCH 0459/2006] add field for access restrictions by document
 status

---
 SeedDMS_Core/Core/inc.ClassUser.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 3a18a60b2..4f55bbc29 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -44,6 +44,13 @@ class SeedDMS_Core_Role { /* {{{ */
 	 */
 	var $_role;
 
+	/**
+	 * @var array list of status without access
+	 *
+	 * @access protected
+	 */
+	var $_noaccess;
+
 	/**
 	 * @var object reference to the dms instance this user belongs to
 	 *
@@ -55,10 +62,11 @@ class SeedDMS_Core_Role { /* {{{ */
 	const role_admin = '1';
 	const role_guest = '2';
 
-	function SeedDMS_Core_Role($id, $name, $role) { /* {{{ */
+	function SeedDMS_Core_Role($id, $name, $role, $noaccess=array()) { /* {{{ */
 		$this->_id = $id;
 		$this->_name = $name;
 		$this->_role = $role;
+		$this->_noaccess = $noaccess;
 		$this->_dms = $role;
 	} /* }}} */
 
@@ -91,7 +99,7 @@ class SeedDMS_Core_Role { /* {{{ */
 
 		$resArr = $resArr[0];
 
-		$role = new self($resArr["id"], $resArr["name"], $resArr["role"]);
+		$role = new self($resArr["id"], $resArr["name"], $resArr["role"], $resArr['noaccess'] ? explode(',', $resArr['noaccess']) : array());
 		$role->setDMS($dms);
 		return $role;
 	} /* }}} */
@@ -111,7 +119,7 @@ class SeedDMS_Core_Role { /* {{{ */
 		$roles = array();
 
 		for ($i = 0; $i < count($resArr); $i++) {
-			$role = new self($resArr[$i]["id"], $resArr[$i]["name"], $resArr[$i]["role"]);
+			$role = new self($resArr[$i]["id"], $resArr[$i]["name"], $resArr[$i]["role"], explode(',', $resArr[$i]['noaccess']));
 			$role->setDMS($dms);
 			$roles[$i] = $role;
 		}
@@ -156,6 +164,19 @@ class SeedDMS_Core_Role { /* {{{ */
 		return true;
 	} /* }}} */
 
+	function getNoAccess() { return $this->_noaccess; }
+
+	function setNoAccess($noaccess) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "UPDATE tblRoles SET noaccess = " . $db->qstr(implode(',',$noaccess)) . " WHERE id = " . $this->_id;
+		if (!$db->getResult($queryStr))
+			return false;
+
+		$this->_noaccess = $noaccess;
+		return true;
+	} /* }}} */
+
 	/**
 	 * Delete role
 	 *

From 6278dd8df364c596366c451ae9cba1689c027d3d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 12:22:36 +0200
Subject: [PATCH 0460/2006] set access restrictions by role

---
 inc/inc.Authentication.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 5c1134dd6..9ff61afe4 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -92,6 +92,8 @@ $theme = $resArr["theme"];
 $lang = $resArr["language"];
 
 $dms->setUser($user);
+$role = $user->getRole();
+$dms->noReadForStatus = $role->getNoAccess();
 
 $notifier = new SeedDMS_NotificationService();
 

From 795eb1e028e56194f4dc23089e0149c0b6acce0d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 12:23:04 +0200
Subject: [PATCH 0461/2006] manage access restrictions

---
 op/op.RoleMgr.php                 |  2 ++
 views/bootstrap/class.RoleMgr.php | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/op/op.RoleMgr.php b/op/op.RoleMgr.php
index 73e0656b9..8b2080014 100644
--- a/op/op.RoleMgr.php
+++ b/op/op.RoleMgr.php
@@ -116,11 +116,13 @@ else if ($action == "editrole") {
 
 	$name    = $_POST["name"];
 	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
+	$noaccess = isset($_POST['noaccess']) ? $_POST['noaccess'] : null;
 	
 	if ($editedRole->getName() != $name)
 		$editedRole->setName($name);
 	if ($editedRole->getRole() != $role)
 		$editedRole->setRole($role);
+	$editedRole->setNoAccess($noaccess);
 
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_role')));
 	add_log_line(".php&action=editrole&roleid=".$roleid);
diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index f807f8435..031d77238 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -149,6 +149,18 @@ $(document).ready( function() {
 			<td><?php printMLText("role_type");?>:</td>
 			<td><select name="role"><option value="<?php echo SeedDMS_Core_Role::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_admin ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_admin) echo "selected"; ?>><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_guest ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_guest) echo "selected"; ?>><?php printMLText("role_guest"); ?></option></select></td>
 		</tr>
+<?php
+		if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_user) {
+			echo "<tr>";
+			echo "<td>".getMLText('restrict_access')."</td>";
+			echo "<td>";
+			foreach(array(S_DRAFT_REV, S_DRAFT_APP, S_IN_WORKFLOW, S_REJECTED, S_RELEASED, S_IN_REVISION, S_DRAFT, S_OBSOLETE) as $status) {
+				echo "<input type=\"checkbox\" name=\"noaccess[]\" value=\"".$status."\" ".(in_array($status, $currRole->getNoAccess()) ? "checked" : "")."> ".getOverallStatusText($status)."<br />";
+			}
+			echo "</td>";
+			echo "</tr>";
+		}
+?>
 		<tr>
 			<td></td>
 			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText($currRole ? "save" : "add_role")?></button></td>

From 5bdc6fe3cca554dcc62d2f68f214987a6d814be7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 12:23:26 +0200
Subject: [PATCH 0462/2006] filter result by new access restrictions derived
 from status

---
 out/out.Search.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 8110dfc26..dd312a21b 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -143,9 +143,11 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 				foreach($hits as $hit) {
 					if($tmp = $dms->getDocument($hit['document_id'])) {
 						if($tmp->getAccessMode($user) >= M_READ) {
-							$tmp->verifyLastestContentExpriry();
-							$entries[] = $tmp;
-							$dcount++;
+							if($tmp->getLatestContent()) {
+								$tmp->verifyLastestContentExpriry();
+								$entries[] = $tmp;
+								$dcount++;
+							}
 						}
 					}
 				}
@@ -383,9 +385,11 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 	if($resArr['docs']) {
 		foreach ($resArr['docs'] as $entry) {
 			if ($entry->getAccessMode($user) >= M_READ) {
-				$entry->verifyLastestContentExpriry();
-				$entries[] = $entry;
-				$dcount++;
+				if($entry->getLatestContent()) {
+					$entry->verifyLastestContentExpriry();
+					$entries[] = $entry;
+					$dcount++;
+				}
 			}
 		}
 	}

From ece56944d825026a940bddaf8294dbb440a23c7b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 12:23:57 +0200
Subject: [PATCH 0463/2006] add new field noAccess in tblRoles

---
 install/create_tables-innodb.sql        | 1 +
 install/create_tables-sqlite3.sql       | 1 +
 install/update-5.1.0/update-sqlite3.sql | 1 +
 install/update-5.1.0/update.sql         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 4cf60c387..83af2822f 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -54,6 +54,7 @@ CREATE TABLE `tblRoles` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(50) default NULL,
   `role` smallint(1) NOT NULL default '0',
+  `noaccess` varchar(30) NOT NULL default '',
   PRIMARY KEY (`id`),
   UNIQUE (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 4241e437c..1bd57c948 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -51,6 +51,7 @@ CREATE TABLE `tblRoles` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` varchar(50) default NULL,
   `role` INTEGER NOT NULL default '0',
+  `noaccess` varchar(30) NOT NULL default '',
   UNIQUE (`name`)
 ) ;
 
diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index 9ddf8ea10..6d136b90b 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -77,6 +77,7 @@ CREATE TABLE `tblRoles` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` varchar(50) default NULL,
   `role` INTEGER NOT NULL default '0',
+  `noaccess` varchar(30) NOT NULL default '',
   UNIQUE (`name`)
 );
 
diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index 95b36d9bb..a68b965e9 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -98,6 +98,7 @@ CREATE TABLE `tblRoles` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(50) default NULL,
   `role` smallint(1) NOT NULL default '0',
+  `noaccess` varchar(30) NOT NULL default '',
   PRIMARY KEY (`id`),
   UNIQUE (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From f7118a6ac3963f50df79ec1f0478c4ad2b0514e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 15:30:19 +0200
Subject: [PATCH 0464/2006] fix notes of 1.1.8

---
 SeedDMS_Preview/package.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index dac0947e3..ee7067f3a 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -23,16 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-<<<<<<< HEAD
-- Converters to create preview images are no longer fixed. Those which has been hardcoded before remain the predefined converters, but they can also be changed.
-- command for creating the preview will be called with a given timeout
-add method getFilesize()
-timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
-check if object passed to createPreview(), hasPreview() is not null
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
-=======
 pass variables to stream_select (required by php7)
->>>>>>> seeddms-5.0.x
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From daa4066c044571ad200876809965e2bf8c09de27 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2016 17:22:04 +0200
Subject: [PATCH 0465/2006] show access restrictions for all role types except
 admin

---
 views/bootstrap/class.RoleMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 031d77238..76e0ba1c1 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -150,7 +150,7 @@ $(document).ready( function() {
 			<td><select name="role"><option value="<?php echo SeedDMS_Core_Role::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_admin ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_admin) echo "selected"; ?>><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_guest ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_guest) echo "selected"; ?>><?php printMLText("role_guest"); ?></option></select></td>
 		</tr>
 <?php
-		if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_user) {
+		if($currRole && $currRole->getRole() != SeedDMS_Core_Role::role_admin) {
 			echo "<tr>";
 			echo "<td>".getMLText('restrict_access')."</td>";
 			echo "<td>";

From d2b2bd0226d385ebc874e4ed856cdcb88d9fe99e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 08:47:33 +0200
Subject: [PATCH 0466/2006] check() returns true/false again

---
 inc/inc.ClassAcl.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index 5fbd7e8ed..27ff9691e 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -42,6 +42,15 @@ class SeedDMS_Acl { /* {{{ */
 		$this->_dms = $dms;
 	} /* }}} */
 
+	/**
+	 * Check if Aro has access on Aco
+	 *
+	 * @param object $aro access request object
+	 * @param object $aco access control object
+	 * @return integer/boolean -1 if access is explictly denied, 1 if access
+	 * is explictly allow, 0 if no access restrictions exists, false if
+	 * an error occured.
+	 */
 	public function check($aro, $aco) { /* {{{ */
 		$db = $this->_dms->getDB();
 
@@ -52,12 +61,12 @@ class SeedDMS_Acl { /* {{{ */
 			if (is_bool($resArr) && $resArr === false)
 				return false;
 			if (count($resArr) == 1)
-				return($resArr[0]['read'] == 1 ? true : false);
+				return((int) $resArr[0]['read']);
 
 			$aco = $aco->getParent();
 		}
 
-		return false;
+		return 0;
 	} /* }}} */
 
 	public function toggle($aro, $aco) { /* {{{ */

From e22ca653edc76e4b2a15720de7c4da618a9c7f72 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 08:48:23 +0200
Subject: [PATCH 0467/2006] check_view_access() returns true/false and also
 takes admin role into account

---
 inc/inc.ClassAccessOperation.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 0eb6f48ab..7303803a6 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -348,11 +348,16 @@ class SeedDMS_AccessOperation {
 	 * Check for access permission on view
 	 *
 	 * If the parameter $view is an array then each element is considered the
-	 * name of a view and true will be returned if one is accesible.
+	 * name of a view and true will be returned if one is accessible.
+	 * Whether access is allowed also depends on the currently logged in user
+	 * stored in the view object. If the user is an admin the access 
+	 * on a view must be explicitly disallowed. For regular users the access
+	 * must be explicitly allowed.
 	 *
 	 * @param mixed $view Instanz of view, name of view or array of view names
 	 * @param string $get query parameters
-	 * @return boolean true if access is allowed otherwise false
+	 * @return boolean true if access is allowed, false if access is disallowed
+	 * no specific access right is set, otherwise false
 	 */
 	function check_view_access($view, $get=array()) { /* {{{ */
 		if(!$this->settings->_advancedAcl)
@@ -373,7 +378,8 @@ class SeedDMS_AccessOperation {
 			$this->_aro = SeedDMS_Aro::getInstance($this->user->getRole(), $this->dms);
 		foreach($scripts as $script) {
 			$aco = SeedDMS_Aco::getInstance($scope.'/'.$script.'/'.$action, $this->dms);
-			if($acl->check($this->_aro, $aco))
+			$ll = $acl->check($this->_aro, $aco);
+			if($ll === 1 && !$this->user->isAdmin() || $ll !== -1 && $this->user->isAdmin())
 				return true;
 		}
 		return false;

From 4c15aa7c4923013acb7ce068e264afdbd60eab4b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 08:49:32 +0200
Subject: [PATCH 0468/2006] check_access() doesn't check for admin anymore

check_view_access() does it now
---
 inc/inc.ClassViewCommon.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index c0fb7ba81..00ecbe8f3 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -171,13 +171,30 @@ class SeedDMS_View_Common {
 	 * Check if the access on the view with given name or the current view itself
 	 * may be accessed.
 	 *
+	 * The function behaves differently for admins and other users. For admins
+	 * a view must be explitly disallowed for this function to return false.
+	 * For other users access on a view must be explicitly allow for the this
+	 * function to return true.
+	 *
 	 * @param string|array $name name of view or list of view names
 	 * @return boolean true if access is allowed otherwise false
 	 */
 	protected function check_access($name='') { /* {{{ */
 		if(!$name)
 			$name = $this;
-		return ((isset($this->params['user']) && $this->params['user']->isAdmin()) || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access($name)));
+		if(!isset($this->params['accessobject']))
+			return false;
+		$access = $this->params['accessobject']->check_view_access($name);
+		return $access;
+
+		if(isset($this->params['user']) && $this->params['user']->isAdmin()) {
+			if($access === -1)
+				return false;
+			else
+				return true;
+		}
+
+		return ($access === 1);
 	} /* }}} */
 
 	/**

From 23e3011d8295fc806658696c7ba4eebbe2604954 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 08:50:27 +0200
Subject: [PATCH 0469/2006] use access check

---
 out/out.Acl.php                        |  2 +-
 out/out.AdminTools.php                 |  2 +-
 out/out.AttributeMgr.php               |  8 +++++---
 out/out.BackupTools.php                |  8 +++++---
 out/out.Calendar.php                   |  9 +++++++--
 out/out.Categories.php                 |  3 ++-
 out/out.Charts.php                     |  6 ++++--
 out/out.CreateIndex.php                |  8 +++++---
 out/out.DefaultKeywords.php            | 10 +++++++---
 out/out.ExtensionMgr.php               |  8 +++++---
 out/out.GroupMgr.php                   |  3 ++-
 out/out.Hooks.php                      |  9 ++++++---
 out/out.ImportFS.php                   |  8 +++++---
 out/out.IndexInfo.php                  |  8 +++++---
 out/out.Indexer.php                    |  8 +++++---
 out/out.Info.php                       |  2 +-
 out/out.LogManagement.php              | 11 ++++++++---
 out/out.ObjectCheck.php                |  3 ++-
 out/out.RemoveArchive.php              |  7 ++++---
 out/out.RemoveDump.php                 |  7 ++++---
 out/out.RemoveFolderFiles.php          |  7 ++++---
 out/out.RemoveGroup.php                |  7 ++++---
 out/out.RemoveLog.php                  |  7 ++++---
 out/out.RemoveUser.php                 |  7 ++++---
 out/out.RemoveWorkflow.php             |  7 ++++---
 out/out.RemoveWorkflowFromDocument.php | 10 ++++------
 out/out.RewindWorkflow.php             | 10 ++++------
 out/out.RoleMgr.php                    |  2 +-
 out/out.Settings.php                   |  9 ++++++---
 out/out.Statistic.php                  |  9 ++++++---
 out/out.Timeline.php                   |  8 +++++---
 out/out.UserList.php                   |  3 ++-
 out/out.UsrMgr.php                     |  2 +-
 out/out.WorkflowActionsMgr.php         |  7 ++++---
 out/out.WorkflowMgr.php                |  7 ++++---
 out/out.WorkflowStatesMgr.php          |  7 ++++---
 36 files changed, 145 insertions(+), 94 deletions(-)

diff --git a/out/out.Acl.php b/out/out.Acl.php
index 04efdb7bf..f6665ef48 100644
--- a/out/out.Acl.php
+++ b/out/out.Acl.php
@@ -28,7 +28,7 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
diff --git a/out/out.AdminTools.php b/out/out.AdminTools.php
index 4b02373c5..780a8946a 100644
--- a/out/out.AdminTools.php
+++ b/out/out.AdminTools.php
@@ -27,7 +27,7 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php
index 44d6748fb..d35029a79 100644
--- a/out/out.AttributeMgr.php
+++ b/out/out.AttributeMgr.php
@@ -32,7 +32,10 @@ include("../inc/inc.Authentication.php");
  */
 require_once("SeedDMS/Preview.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -44,8 +47,6 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) {
 	$selattrdef = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('attrdefs', $attrdefs);
 	$view->setParam('selattrdef', $selattrdef);
@@ -55,6 +56,7 @@ if($view) {
 	$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 }
 
diff --git a/out/out.BackupTools.php b/out/out.BackupTools.php
index 25e4fb75d..dd861aabe 100644
--- a/out/out.BackupTools.php
+++ b/out/out.BackupTools.php
@@ -25,17 +25,19 @@ include("../inc/inc.Utils.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	if($settings->_backupDir && file_exists($settings->_backupDir))
 		$view->setParam('backupdir', $settings->_backupDir);
 	else
 		$view->setParam('backupdir', $settings->_contentDir);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index f32994371..6a79e2e3c 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.php
@@ -25,6 +25,13 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("calendar"),getMLText("access_denied"));
+}
+
 if ($_GET["mode"]) $mode=$_GET["mode"];
 
 // get required date else use current
@@ -37,8 +44,6 @@ else $month = (int)date("m", $currDate);
 if (isset($_GET["day"])&&is_numeric($_GET["day"])) $day=$_GET["day"];
 else $day = (int)date("d", $currDate);
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('mode', $mode);
 	$view->setParam('year', $year);
diff --git a/out/out.Categories.php b/out/out.Categories.php
index 049e12163..5ea509876 100644
--- a/out/out.Categories.php
+++ b/out/out.Categories.php
@@ -29,7 +29,7 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -44,5 +44,6 @@ if(isset($_GET['categoryid']) && $_GET['categoryid']) {
 if($view) {
 	$view->setParam('categories', $categories);
 	$view->setParam('selcategory', $selcat);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 }
diff --git a/out/out.Charts.php b/out/out.Charts.php
index 56c8166ce..98b5f51b9 100644
--- a/out/out.Charts.php
+++ b/out/out.Charts.php
@@ -27,10 +27,11 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-
-if (!$user->isAdmin()) {
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
+
 $rootfolder = $dms->getFolder($settings->_rootFolderID);
 
 $type = 'docsperuser';
@@ -50,6 +51,7 @@ if($view) {
 	$view->setParam('rootfolder', $rootfolder);
 	$view->setParam('type', $type);
 	$view->setParam('data', $data);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.CreateIndex.php b/out/out.CreateIndex.php
index 39bb6c176..6ea0380c8 100644
--- a/out/out.CreateIndex.php
+++ b/out/out.CreateIndex.php
@@ -29,7 +29,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -37,10 +40,9 @@ if(!$settings->_enableFullSearch) {
 	UI::exitError(getMLText("admin_tools"),getMLText("fulltextsearch_disabled"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('enablefullsearch', $settings->_enableFullSearch);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.DefaultKeywords.php b/out/out.DefaultKeywords.php
index fa5b616a4..d8b153ebc 100644
--- a/out/out.DefaultKeywords.php
+++ b/out/out.DefaultKeywords.php
@@ -26,7 +26,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -37,9 +40,10 @@ else
 
 $categories = $dms->getAllUserKeywordCategories($user->getID());
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'categories'=>$categories, 'selcategoryid'=>$selcategoryid));
 if($view) {
+	$view->setParam('categories', $categories);
+	$view->setParam('selcategoryid', $selcategoryid);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ExtensionMgr.php b/out/out.ExtensionMgr.php
index 11a0cc871..f5eb48963 100644
--- a/out/out.ExtensionMgr.php
+++ b/out/out.ExtensionMgr.php
@@ -25,17 +25,19 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
 $v = new SeedDMS_Version;
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('httproot', $settings->_httpRoot);
 	$view->setParam('version', $v);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.GroupMgr.php b/out/out.GroupMgr.php
index 4fdd806b5..250a125e0 100644
--- a/out/out.GroupMgr.php
+++ b/out/out.GroupMgr.php
@@ -35,7 +35,7 @@ require_once("SeedDMS/Preview.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -64,5 +64,6 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 }
diff --git a/out/out.Hooks.php b/out/out.Hooks.php
index 63870eb9e..ac452281d 100644
--- a/out/out.Hooks.php
+++ b/out/out.Hooks.php
@@ -24,13 +24,16 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings));
 if($view) {
+	$view->setParam('settings', $settings);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ImportFS.php b/out/out.ImportFS.php
index ff9a44ded..8b352cd17 100644
--- a/out/out.ImportFS.php
+++ b/out/out.ImportFS.php
@@ -23,13 +23,15 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'dropfolderdir'=>$settings->_dropFolderDir));
 if($view) {
+	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.IndexInfo.php b/out/out.IndexInfo.php
index 34e1f6367..15aaca03d 100644
--- a/out/out.IndexInfo.php
+++ b/out/out.IndexInfo.php
@@ -28,7 +28,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -41,12 +44,11 @@ if(!$index) {
 	UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('luceneclassdir', $settings->_luceneClassDir);
 	$view->setParam('lucenedir', $settings->_luceneDir);
 	$view->setParam('index', $index);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.Indexer.php b/out/out.Indexer.php
index 89e549e35..43ea6af13 100644
--- a/out/out.Indexer.php
+++ b/out/out.Indexer.php
@@ -29,7 +29,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -64,8 +67,6 @@ else {
 }
 $folder = $dms->getFolder($folderid);
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('index', $index);
 	$view->setParam('indexconf', $indexconf);
@@ -73,6 +74,7 @@ if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('converters', $settings->_converters['fulltext']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.Info.php b/out/out.Info.php
index d32d5d338..a41cf366d 100644
--- a/out/out.Info.php
+++ b/out/out.Info.php
@@ -30,7 +30,7 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
diff --git a/out/out.LogManagement.php b/out/out.LogManagement.php
index 599094ba6..7e483ba55 100644
--- a/out/out.LogManagement.php
+++ b/out/out.LogManagement.php
@@ -25,7 +25,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -35,9 +38,11 @@ else $logname=NULL;
 if (isset($_GET["mode"])) $mode=$_GET["mode"];
 else $mode='web';
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'logname'=>$logname, 'mode'=>$mode, 'contentdir'=>$settings->_contentDir));
 if($view) {
+	$view->setParam('logname', $logname);
+	$view->setParam('mode', $mode);
+	$view->setParam('contentdir', $settings->_contentDir);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index d1868c44d..f3a682e4f 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -31,7 +31,7 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -81,6 +81,7 @@ if($view) {
 	$view->setParam('setchecksum', $setchecksum);
 	$view->setParam('repair', $repair);
 	$view->setParam('rootfolder', $rootfolder);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.RemoveArchive.php b/out/out.RemoveArchive.php
index 2d11942f3..d8bc7b1d0 100644
--- a/out/out.RemoveArchive.php
+++ b/out/out.RemoveArchive.php
@@ -24,7 +24,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -34,8 +37,6 @@ if (!isset($_GET["arkname"]) || !file_exists($settings->_contentDir.$_GET["arkna
 
 $arkname = $_GET["arkname"];
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('archive', $arkname);
 	$view($_GET);
diff --git a/out/out.RemoveDump.php b/out/out.RemoveDump.php
index 7b182bf87..6d32bf837 100644
--- a/out/out.RemoveDump.php
+++ b/out/out.RemoveDump.php
@@ -24,7 +24,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -34,8 +37,6 @@ if (!isset($_GET["dumpname"]) || !file_exists($settings->_contentDir.$_GET["dump
 
 $dumpname = $_GET["dumpname"];
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('dumpfile', $dumpname);
 	$view($_GET);
diff --git a/out/out.RemoveFolderFiles.php b/out/out.RemoveFolderFiles.php
index c9a1eab0b..e201426a0 100644
--- a/out/out.RemoveFolderFiles.php
+++ b/out/out.RemoveFolderFiles.php
@@ -24,7 +24,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -38,8 +41,6 @@ if (!is_object($folder)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("invalid_folder_id"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view($_GET);
diff --git a/out/out.RemoveGroup.php b/out/out.RemoveGroup.php
index d995d1893..8f3c4b48a 100644
--- a/out/out.RemoveGroup.php
+++ b/out/out.RemoveGroup.php
@@ -26,7 +26,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -39,8 +42,6 @@ if (!is_object($group)) {
 	UI::exitError(getMLText("rm_group"),getMLText("invalid_group_id"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('group', $group);
 	$view($_GET);
diff --git a/out/out.RemoveLog.php b/out/out.RemoveLog.php
index 5b4202a3f..5d579ca47 100644
--- a/out/out.RemoveLog.php
+++ b/out/out.RemoveLog.php
@@ -24,7 +24,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -48,8 +51,6 @@ foreach($lognames as $file) {
 	}
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('lognames', $lognames);
 	$view->setParam('mode', $mode);
diff --git a/out/out.RemoveUser.php b/out/out.RemoveUser.php
index 8717bf430..214b7e1d6 100644
--- a/out/out.RemoveUser.php
+++ b/out/out.RemoveUser.php
@@ -26,7 +26,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -49,8 +52,6 @@ if ($rmuser->getID()==$user->getID()) {
 
 $allusers = $dms->getAllUsers($settings->_sortUsersInList);
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('rmuser', $rmuser);
 	$view->setParam('allusers', $allusers);
diff --git a/out/out.RemoveWorkflow.php b/out/out.RemoveWorkflow.php
index 77da1890d..6f7ffbc6c 100644
--- a/out/out.RemoveWorkflow.php
+++ b/out/out.RemoveWorkflow.php
@@ -27,7 +27,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -40,8 +43,6 @@ if (!is_object($workflow)) {
 	UI::exitError(getMLText("workflow_title"),getMLText("invalid_workflow_id"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('workflow', $workflow);
 	$view($_GET);
diff --git a/out/out.RemoveWorkflowFromDocument.php b/out/out.RemoveWorkflowFromDocument.php
index 52729944b..ae841a829 100644
--- a/out/out.RemoveWorkflowFromDocument.php
+++ b/out/out.RemoveWorkflowFromDocument.php
@@ -28,7 +28,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -59,11 +62,6 @@ if (!is_object($workflow)) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.RewindWorkflow.php b/out/out.RewindWorkflow.php
index 52729944b..ae841a829 100644
--- a/out/out.RewindWorkflow.php
+++ b/out/out.RewindWorkflow.php
@@ -28,7 +28,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -59,11 +62,6 @@ if (!is_object($workflow)) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.RoleMgr.php b/out/out.RoleMgr.php
index 1873fde98..1c720d2a8 100644
--- a/out/out.RoleMgr.php
+++ b/out/out.RoleMgr.php
@@ -29,7 +29,7 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
diff --git a/out/out.Settings.php b/out/out.Settings.php
index 99fe2025e..271f089ac 100644
--- a/out/out.Settings.php
+++ b/out/out.Settings.php
@@ -24,7 +24,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -32,9 +35,9 @@ if (!$user->isAdmin()) {
 if(!trim($settings->_encryptionKey))
 	$settings->_encryptionKey = md5(uniqid());
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings, 'currenttab'=>(isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '')));
 if($view) {
+	$view->setParam('settings', $settings);
+	$view->setParam('currenttab', (isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : ''));
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.Statistic.php b/out/out.Statistic.php
index 7c390d1c0..22861debc 100644
--- a/out/out.Statistic.php
+++ b/out/out.Statistic.php
@@ -25,14 +25,17 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 $rootfolder = $dms->getFolder($settings->_rootFolderID);
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'rootfolder'=>$rootfolder));
 if($view) {
+	$view->setParam('rootfolder', $rootfolder);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.Timeline.php b/out/out.Timeline.php
index e3f993870..a4760d9e3 100644
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@@ -30,7 +30,10 @@ include("../inc/inc.Authentication.php");
  */
 require_once("SeedDMS/Preview.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 $rootfolder = $dms->getFolder($settings->_rootFolderID);
@@ -53,8 +56,6 @@ if(isset($_GET['version']) && $_GET['version'] && is_numeric($_GET['version']))
 } else
 	$content = null;
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('fromdate', isset($_GET['fromdate']) ? $_GET['fromdate'] : '');
 	$view->setParam('todate', isset($_GET['todate']) ? $_GET['todate'] : '');
@@ -65,6 +66,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.UserList.php b/out/out.UserList.php
index f95547e96..6d9e7e34d 100644
--- a/out/out.UserList.php
+++ b/out/out.UserList.php
@@ -28,7 +28,7 @@ include("../inc/inc.ClassPasswordStrength.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -39,6 +39,7 @@ if($view) {
 	$view->setParam('httproot', $settings->_httpRoot);
 	$view->setParam('quota', $settings->_quota);
 	$view->setParam('pwdexpiration', $settings->_passwordExpiration);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php
index 2a5688f20..dc8160101 100644
--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@@ -29,7 +29,7 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->check_view_access($view, $_GET) && !$user->isAdmin()) {
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
diff --git a/out/out.WorkflowActionsMgr.php b/out/out.WorkflowActionsMgr.php
index 60b509d79..fa1307649 100644
--- a/out/out.WorkflowActionsMgr.php
+++ b/out/out.WorkflowActionsMgr.php
@@ -27,7 +27,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -42,8 +45,6 @@ if (is_bool($workflowactions)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('allworkflowactions', $workflowactions);
 	$view->setParam('selworkflowaction', $selworkflowaction);
diff --git a/out/out.WorkflowMgr.php b/out/out.WorkflowMgr.php
index aac3249ae..bdfbcab3d 100644
--- a/out/out.WorkflowMgr.php
+++ b/out/out.WorkflowMgr.php
@@ -27,7 +27,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -47,8 +50,6 @@ if(isset($_GET['workflowid']) && $_GET['workflowid']) {
 	$selworkflow = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('selworkflow', $selworkflow);
 	$view->setParam('allworkflows', $workflows);
diff --git a/out/out.WorkflowStatesMgr.php b/out/out.WorkflowStatesMgr.php
index c8de1f7c7..4380a3737 100644
--- a/out/out.WorkflowStatesMgr.php
+++ b/out/out.WorkflowStatesMgr.php
@@ -27,7 +27,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
@@ -37,8 +40,6 @@ if(isset($_GET['workflowstateid']) && $_GET['workflowstateid']) {
 	$selworkflowstate = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('selworkflowstate', $selworkflowstate);
 	$view($_GET);

From e527a6d1769b33321b840af71e95e3a8ef59b77c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 08:51:03 +0200
Subject: [PATCH 0470/2006] fix access check and add new debug menu item

---
 views/bootstrap/class.Bootstrap.php | 60 ++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 02c42c3f0..ebfb54343 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -406,7 +406,7 @@ $(document).ready(function () {
 			echo "   <ul class=\"nav\">\n";
 	//		echo "    <li id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".getMLText("content")."</a></li>\n";
 	//		echo "    <li><a href=\"../out/out.SearchForm.php?folderid=".$this->params['rootfolderid']."\">".getMLText("search")."</a></li>\n";
-			if ($this->params['enablecalendar']) echo "    <li><a href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
+			if ($this->params['enablecalendar'] && $this->check_access('Calendar')) echo "    <li><a href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
 			if ($this->check_access('AdminTools')) echo "    <li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
 			if($this->params['enablehelp']) {
 			$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
@@ -680,15 +680,15 @@ $(document).ready(function () {
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("user_group_management")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('UsrMgr')))
+		if ($this->check_access('UsrMgr'))
 		echo "      <li><a href=\"../out/out.UsrMgr.php\">".getMLText("user_management")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('RoleMgr')))
+		if ($this->check_access('RoleMgr'))
 		echo "      <li><a href=\"../out/out.RoleMgr.php\">".getMLText("role_management")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('GroupMgr')))
+		if ($this->check_access('GroupMgr'))
 		echo "      <li><a href=\"../out/out.GroupMgr.php\">".getMLText("group_management")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('UserList')))
+		if ($this->check_access('UserList'))
 		echo "      <li><a href=\"../out/out.UserList.php\">".getMLText("user_list")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Acl')))
+		if ($this->check_access('Acl'))
 		echo "      <li><a href=\"../out/out.Acl.php\">".getMLText("access_control")."</a></li>\n";
 		echo "     </ul>\n";
 		echo "    </li>\n";
@@ -700,18 +700,18 @@ $(document).ready(function () {
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("definitions")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('DefaultKeywords')))
+		if ($this->check_access('DefaultKeywords'))
 		echo "      <li><a href=\"../out/out.DefaultKeywords.php\">".getMLText("global_default_keywords")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Categories')))
+		if ($this->check_access('Categories'))
 		echo "     <li><a href=\"../out/out.Categories.php\">".getMLText("global_document_categories")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('AttributeMgr')))
+		if ($this->check_access('AttributeMgr'))
 		echo "     <li><a href=\"../out/out.AttributeMgr.php\">".getMLText("global_attributedefinitions")."</a></li>\n";
 		if($this->params['workflowmode'] == 'advanced') {
-			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('WorkflowMgr')))
+			if ($this->check_access('WorkflowMgr'))
 			echo "     <li><a href=\"../out/out.WorkflowMgr.php\">".getMLText("global_workflows")."</a></li>\n";
-			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('WorkflowStatesMgr')))
+			if ($this->check_access('WorkflowStatesMgr'))
 			echo "     <li><a href=\"../out/out.WorkflowStatesMgr.php\">".getMLText("global_workflow_states")."</a></li>\n";
-			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('WorkflowActionsMgr')))
+			if ($this->check_access('WorkflowActionsMgr'))
 			echo "     <li><a href=\"../out/out.WorkflowActionsMgr.php\">".getMLText("global_workflow_actions")."</a></li>\n";
 		}
 		echo "     </ul>\n";
@@ -725,11 +725,11 @@ $(document).ready(function () {
 			echo "    <li class=\"dropdown\">\n";
 			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("fullsearch")." <i class=\"icon-caret-down\"></i></a>\n";
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Indexer')))
+			if ($this->check_access('Indexer'))
 			echo "      <li><a href=\"../out/out.Indexer.php\">".getMLText("update_fulltext_index")."</a></li>\n";
-			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('CreateIndex')))
+			if ($this->check_access('CreateIndex'))
 			echo "      <li><a href=\"../out/out.CreateIndex.php\">".getMLText("create_fulltext_index")."</a></li>\n";
-			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('IndexInfo')))
+			if ($this->check_access('IndexInfo'))
 			echo "      <li><a href=\"../out/out.IndexInfo.php\">".getMLText("fulltext_info")."</a></li>\n";
 			echo "     </ul>\n";
 			echo "    </li>\n";
@@ -742,10 +742,10 @@ $(document).ready(function () {
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("backup_log_management")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('BackupTools')))
+		if ($this->check_access('BackupTools'))
 		echo "      <li><a href=\"../out/out.BackupTools.php\">".getMLText("backup_tools")."</a></li>\n";
 		if ($this->params['logfileenable'])
-			if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('LogManagement')))
+			if ($this->check_access('LogManagement'))
 			echo "      <li><a href=\"../out/out.LogManagement.php\">".getMLText("log_management")."</a></li>\n";
 		echo "     </ul>\n";
 		echo "    </li>\n";
@@ -757,23 +757,37 @@ $(document).ready(function () {
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("misc")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Statistic')))
+		if ($this->check_access('Statistic'))
 		echo "      <li><a href=\"../out/out.Statistic.php\">".getMLText("folders_and_documents_statistic")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Charts')))
+		if ($this->check_access('Charts'))
 		echo "      <li><a href=\"../out/out.Charts.php\">".getMLText("charts")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Timeline')))
+		if ($this->check_access('Timeline'))
 		echo "      <li><a href=\"../out/out.Timeline.php\">".getMLText("timeline")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('ObjectCheck')))
+		if ($this->check_access('ObjectCheck'))
 		echo "      <li><a href=\"../out/out.ObjectCheck.php\">".getMLText("objectcheck")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('ExtensionMgr')))
+		if ($this->check_access('ImportFS'))
+		echo "      <li><a href=\"../out/out.ImportFS.php\">".getMLText("importfs")."</a></li>\n";
+		if ($this->check_access('ExtensionMgr'))
 		echo "      <li><a href=\"../out/out.ExtensionMgr.php\">".getMLText("extension_manager")."</a></li>\n";
-		if ($this->params['user']->isAdmin() || (isset($this->params['accessobject']) && $this->params['accessobject']->check_view_access('Info')))
+		if ($this->check_access('Info'))
 		echo "      <li><a href=\"../out/out.Info.php\">".getMLText("version_info")."</a></li>\n";
 		echo "     </ul>\n";
 		echo "    </li>\n";
 		echo "   </ul>\n";
 		}
 
+		if($this->check_access(array('Hooks'))) {
+		echo "   <ul class=\"nav\">\n";
+		echo "    <li class=\"dropdown\">\n";
+		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("debug")." <i class=\"icon-caret-down\"></i></a>\n";
+		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		if ($this->check_access('Hooks'))
+		echo "      <li><a href=\"../out/out.Hooks.php\">".getMLText("list_hooks")."</a></li>\n";
+		echo "     </ul>\n";
+		echo "    </li>\n";
+		echo "   </ul>\n";
+		}
+
 		echo "<ul class=\"nav\">\n";
 		echo "</ul>\n";
 		echo "</div>\n";

From 46602c744b9809bb7cf337760aefbf23778cfb75 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 08:51:34 +0200
Subject: [PATCH 0471/2006] check for access on RemoveGroup

---
 views/bootstrap/class.GroupMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index f04581e39..951e19309 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -165,7 +165,7 @@ $(document).ready( function() {
 ?>
 	<table class="table-condensed">
 <?php
-		if($group) {
+		if($group && $this->check_access('RemoveGroup')) {
 ?>
 		<tr>
 			<td></td>

From 46b36ba7e5b5cdfca5447073293109236d04bf9e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 08:51:57 +0200
Subject: [PATCH 0472/2006] check for access on RemoveUser

---
 views/bootstrap/class.UserList.php | 3 ++-
 views/bootstrap/class.UsrMgr.php   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 1ccd3ff2f..931f7e3fc 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -106,7 +106,8 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>";
 			echo "<div class=\"list-action\">";
-     	echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
+			echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
+			if ($this->check_access('RemoveUser'))
      	echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";
 			echo "</div>";
 			echo "</td>";
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 30c4b77cb..6b4560857 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -185,7 +185,7 @@ $(document).ready( function() {
 ?>
 	<table class="table-condensed">
 <?php
-	if($currUser && !in_array($currUser->getID(), $undeluserids)) {
+	if($currUser && !in_array($currUser->getID(), $undeluserids) && $this->check_access('RemoveUser')) {
 ?>
 		<tr>
 			<td></td>

From a3e0f6eb7d71c82d4d2cf422786fff15eaafaecc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 08:56:51 +0200
Subject: [PATCH 0473/2006] fix inclusion of files

---
 out/out.ImportFS.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/out/out.ImportFS.php b/out/out.ImportFS.php
index 8b352cd17..ab071388a 100644
--- a/out/out.ImportFS.php
+++ b/out/out.ImportFS.php
@@ -17,9 +17,10 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 

From 64470891ba56f1fa264bec862d051657f6826580 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 10:53:57 +0200
Subject: [PATCH 0474/2006] set accessobject for view

---
 out/out.ImportFS.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.ImportFS.php b/out/out.ImportFS.php
index ab071388a..8dff5cccd 100644
--- a/out/out.ImportFS.php
+++ b/out/out.ImportFS.php
@@ -33,6 +33,7 @@ if (!$accessop->check_view_access($view, $_GET)) {
 
 if($view) {
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From e96e94d471ba9677ab279492c5208b99bd890980 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 10:54:12 +0200
Subject: [PATCH 0475/2006] use translated strings

---
 views/bootstrap/class.Hooks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Hooks.php b/views/bootstrap/class.Hooks.php
index b3c50af14..2e16594d7 100644
--- a/views/bootstrap/class.Hooks.php
+++ b/views/bootstrap/class.Hooks.php
@@ -39,7 +39,7 @@ class SeedDMS_View_Hooks extends SeedDMS_Bootstrap_Style {
 
 		echo "<table class=\"table\">\n";
 		echo "<thead>";
-		echo "<tr><th>Type</th><th>Name of hook</th><th>Name of class</th><th>File</th></tr>\n";
+		echo "<tr><th>".getMLText('type_of_hook')."</th><th>".getMLText('hook_name')."</th><th>".getMLText('class_name')."</th><th>".getMLText('file')."</th></tr>\n";
 		echo "</thead>";
 		echo "<tbody>";
 		foreach(array('controller', 'view') as $type) {
@@ -71,7 +71,7 @@ class SeedDMS_View_Hooks extends SeedDMS_Bootstrap_Style {
 		$this->globalNavigation();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading("Hooks");
+		$this->contentHeading(getMLText("list_hooks"));
 
 		self::list_hooks();
 

From b80cb91d542f36255dacc398883f6b24d029e09c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 18:29:21 +0200
Subject: [PATCH 0476/2006] check if parameter of setNoAccess() is set before
 using it

---
 SeedDMS_Core/Core/inc.ClassUser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 4f55bbc29..1f77848b6 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -169,7 +169,7 @@ class SeedDMS_Core_Role { /* {{{ */
 	function setNoAccess($noaccess) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblRoles SET noaccess = " . $db->qstr(implode(',',$noaccess)) . " WHERE id = " . $this->_id;
+		$queryStr = "UPDATE tblRoles SET noaccess = " . $db->qstr($noaccess ? implode(',',$noaccess) : '') . " WHERE id = " . $this->_id;
 		if (!$db->getResult($queryStr))
 			return false;
 

From 94682fb0ffc53686b91faefdf0a40567e43b5f83 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 18:29:58 +0200
Subject: [PATCH 0477/2006] copy code from check_view_access() to
 check_controller_access()

---
 inc/inc.ClassAccessOperation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 7303803a6..303b72ff2 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -414,7 +414,8 @@ class SeedDMS_AccessOperation {
 			$this->_aro = SeedDMS_Aro::getInstance($this->user->getRole(), $this->dms);
 		foreach($scripts as $script) {
 			$aco = SeedDMS_Aco::getInstance($scope.'/'.$script.'/'.$action, $this->dms);
-			if($acl->check($this->_aro, $aco))
+			$ll = $acl->check($this->_aro, $aco);
+			if($ll === 1 && !$this->user->isAdmin() || $ll !== -1 && $this->user->isAdmin())
 				return true;
 		}
 		return false;

From caf1501c89fae6af1853f20bcbb83d90999e98b8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 18:30:54 +0200
Subject: [PATCH 0478/2006] add mehtod __invoke()

---
 inc/inc.ClassControllerCommon.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/inc/inc.ClassControllerCommon.php b/inc/inc.ClassControllerCommon.php
index 308872d43..cff8df973 100644
--- a/inc/inc.ClassControllerCommon.php
+++ b/inc/inc.ClassControllerCommon.php
@@ -41,6 +41,24 @@ class SeedDMS_Controller_Common {
 		$this->errormsg = '';
 	}
 
+	/**
+	 * Call methods with name in $get['action']
+	 *
+	 * @params array $get $_GET or $_POST variables
+	 * @return mixed return value of called method
+	 */
+	function __invoke($get=array()) {
+		if(isset($get['action']) && $get['action']) {
+			if(method_exists($this, $get['action'])) {
+				return $this->{$get['action']}();
+			} else {
+				echo "Missing action '".$get['action']."'";
+				return false;
+			}
+		} else
+			return $this->run();
+	}
+
 	function setParams($params) {
 		$this->params = $params;
 	}

From 7e24402671a9d09505a8ca88ef3c3a3c62186b3e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 18:31:28 +0200
Subject: [PATCH 0479/2006] place code into controller

---
 controllers/class.RoleMgr.php |  56 ++++++++++++++++
 op/op.RoleMgr.php             | 121 +++++++++++++++++-----------------
 2 files changed, 116 insertions(+), 61 deletions(-)
 create mode 100644 controllers/class.RoleMgr.php

diff --git a/controllers/class.RoleMgr.php b/controllers/class.RoleMgr.php
new file mode 100644
index 000000000..fa11b08c0
--- /dev/null
+++ b/controllers/class.RoleMgr.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Implementation of Role manager controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for role manager
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_RoleMgr extends SeedDMS_Controller_Common {
+
+	public function run() {
+	}
+
+	public function addrole() {
+		$dms = $this->params['dms'];
+		$name = $this->params['name'];
+		$role = $this->params['role'];
+
+		return($dms->addRole($name, $role));
+	}
+
+	public function removerole() {
+		$roleobj = $this->params['roleobj'];
+		return $roleobj->remove();
+	}
+
+	public function editrole() {
+		$dms = $this->params['dms'];
+		$name = $this->params['name'];
+		$role = $this->params['role'];
+		$roleobj = $this->params['roleobj'];
+		$noaccess = $this->params['noaccess'];
+
+		if ($roleobj->getName() != $name)
+			$roleobj->setName($name);
+		if ($roleobj->getRole() != $role)
+			$roleobj->setRole($role);
+		$roleobj->setNoAccess($noaccess);
+
+		return true;
+	}
+}
diff --git a/op/op.RoleMgr.php b/op/op.RoleMgr.php
index 8b2080014..2bfa947f2 100644
--- a/op/op.RoleMgr.php
+++ b/op/op.RoleMgr.php
@@ -27,51 +27,29 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
-include("../inc/inc.ClassPasswordStrength.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
 if (isset($_POST["action"])) $action=$_POST["action"];
 else $action=NULL;
 
-// add new role ---------------------------------------------------------
-if ($action == "addrole") {
-	
-	/* Check if the form data comes for a trusted request */
-	if(!checkFormKey('addrole')) {
-		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
-	}
+if(!in_array($action, array('addrole', 'removerole', 'editrole')))
+	UI::exitError(getMLText("admin_tools"),getMLText("unknown_command"));
 
-	$name    = $_POST["name"];
-	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
-
-	if (is_object($dms->getRoleByName($name))) {
-		UI::exitError(getMLText("admin_tools"),getMLText("role_exists"));
-	}
-
-	$newRole = $dms->addRole($name, $role);
-	if ($newRole) {
-	}
-	else UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
-	
-	$roleid=$newRole->getID();
-	
-	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_role')));
-
-	add_log_line(".php&action=addrole&name=".$name);
+/* Check if the form data comes for a trusted request */
+if(!checkFormKey($action)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
 }
 
-// delete role ------------------------------------------------------------
-else if ($action == "removerole") {
-
-	/* Check if the form data comes for a trusted request */
-	if(!checkFormKey('removerole')) {
-		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
-	}
-
+$roleid = 0;
+if(in_array($action, array('removerole', 'editrole'))) {
 	if (isset($_POST["roleid"])) {
 		$roleid = $_POST["roleid"];
 	}
@@ -80,16 +58,52 @@ else if ($action == "removerole") {
 		UI::exitError(getMLText("admin_tools"),getMLText("invalid_role_id"));
 	}
 
-	$roleToRemove = $dms->getRole($roleid);
-	if (!is_object($roleToRemove)) {
+	$roleobj = $dms->getRole($roleid);
+	
+	if (!is_object($roleobj)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("invalid_role_id"));
 	}
 
-	if (!$roleToRemove->remove()) {
+	$controller->setParam('roleobj', $roleobj);
+}
+
+// add new role ---------------------------------------------------------
+if ($action == "addrole") {
+	
+	$name    = $_POST["name"];
+	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
+
+	if (is_object($dms->getRoleByName($name))) {
+		UI::exitError(getMLText("admin_tools"),getMLText("role_exists"));
+	}
+
+	if ($role === '') {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_role_type"));
+	}
+
+	$controller->setParam('name', $name);
+	$controller->setParam('role', $role);
+
+	$newRole = $controller($_POST);
+	if ($newRole) {
+	}
+	else UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	
+	$roleid=$newRole->getID();
+	
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_role')));
+
+	add_log_line(".php&action=".$action."&name=".$name);
+}
+
+// delete role ------------------------------------------------------------
+else if ($action == "removerole") {
+
+	if (!$controller($_POST)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 	}
 		
-	add_log_line(".php&action=removerole&roleid=".$roleid);
+	add_log_line(".php&action=".$action."&roleid=".$roleid);
 	
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_role')));
 	$roleid=-1;
@@ -98,36 +112,21 @@ else if ($action == "removerole") {
 // modify role ------------------------------------------------------------
 else if ($action == "editrole") {
 
-	/* Check if the form data comes for a trusted request */
-	if(!checkFormKey('editrole')) {
-		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
-	}
-
-	if (!isset($_POST["roleid"]) || !is_numeric($_POST["roleid"]) || intval($_POST["roleid"])<1) {
-		UI::exitError(getMLText("admin_tools"),getMLText("invalid_role_id"));
-	}
-	
-	$roleid=$_POST["roleid"];
-	$editedRole = $dms->getRole($roleid);
-	
-	if (!is_object($editedRole)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("invalid_role_id"));
-	}
-
 	$name    = $_POST["name"];
 	$role    = preg_replace('/[^0-2]+/', '', $_POST["role"]);
 	$noaccess = isset($_POST['noaccess']) ? $_POST['noaccess'] : null;
 	
-	if ($editedRole->getName() != $name)
-		$editedRole->setName($name);
-	if ($editedRole->getRole() != $role)
-		$editedRole->setRole($role);
-	$editedRole->setNoAccess($noaccess);
+	$controller->setParam('name', $name);
+	$controller->setParam('role', $role);
+	$controller->setParam('noaccess', $noaccess);
+
+	if (!$controller($_POST)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	}
 
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_role')));
-	add_log_line(".php&action=editrole&roleid=".$roleid);
+	add_log_line(".php&action=".$action."&roleid=".$roleid);
 }
-else UI::exitError(getMLText("admin_tools"),getMLText("unknown_command"));
 
 header("Location:../out/out.RoleMgr.php?roleid=".$roleid);
 

From 87231513614d536c224f26b1e9c0a5a35a69f8dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 18:31:42 +0200
Subject: [PATCH 0480/2006] check for access rights on controller actions

---
 views/bootstrap/class.RoleMgr.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 76e0ba1c1..08beeb2e1 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -111,9 +111,10 @@ $(document).ready( function() {
 	function showRoleForm($currRole) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$accessop = $this->params['accessobject'];
 		$roles = $this->params['allroles'];
 
-		if($currRole && !$currRole->isUsed()) {
+		if($currRole && !$currRole->isUsed() && $accessop->check_controller_access('RoleMgr', array('action'=>'removerole'))) {
 ?>
 			<form style="display: inline-block;" method="post" action="../op/op.RoleMgr.php" >
 				<?php echo createHiddenFieldWithKey('removerole'); ?>
@@ -160,11 +161,15 @@ $(document).ready( function() {
 			echo "</td>";
 			echo "</tr>";
 		}
+		if($currRole && $accessop->check_controller_access('RoleMgr', array('action'=>'editrole')) || !$currRole && $accessop->check_controller_access('RoleMgr', array('action'=>'addrole'))) {
 ?>
 		<tr>
 			<td></td>
 			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText($currRole ? "save" : "add_role")?></button></td>
 		</tr>
+<?php
+		}
+?>
 	</table>
 	</form>
 <?php
@@ -173,6 +178,7 @@ $(document).ready( function() {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$accessop = $this->params['accessobject'];
 		$selrole = $this->params['selrole'];
 		$roles = $this->params['allroles'];
 
@@ -189,7 +195,9 @@ $(document).ready( function() {
 <?php echo getMLText("selection")?>:
 <select class="chzn-select" id="selector">
 <option value="-1"><?php echo getMLText("choose_role")?>
+<?php if($accessop->check_controller_access('RoleMgr', array('action'=>'addrole'))) { ?>
 <option value="0"><?php echo getMLText("add_role")?>
+<?php } ?>
 <?php
 		foreach ($roles as $currRole) {
 			print "<option value=\"".$currRole->getID()."\" ".($selrole && $currRole->getID()==$selrole->getID() ? 'selected' : '').">" . htmlspecialchars($currRole->getName());

From 28dc4d32ad13e24b8b94b829baf2e17172477f12 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 Apr 2016 18:42:58 +0200
Subject: [PATCH 0481/2006] check access rights

---
 out/out.MyAccount.php      | 7 +++++--
 out/out.MyDocuments.php    | 7 +++++--
 out/out.SubstituteUser.php | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/out/out.MyAccount.php b/out/out.MyAccount.php
index 5aca11e08..e5d8fe9d5 100644
--- a/out/out.MyAccount.php
+++ b/out/out.MyAccount.php
@@ -26,17 +26,20 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('enableuserimage', $settings->_enableUserImage);
 	$view->setParam('passwordexpiration', $settings->_passwordExpiration);
 	$view->setParam('httproot', $settings->_httpRoot);
 	$view->setParam('quota', $settings->_quota);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 219ca3796..5997d8f84 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -31,6 +31,10 @@ include("../inc/inc.Authentication.php");
  */
 require_once("SeedDMS/Preview.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
@@ -47,8 +51,6 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 	$orderby=$_GET["orderby"];
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('orderby', $orderby);
 	$view->setParam('showinprocess', $showInProcess);
@@ -57,6 +59,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.SubstituteUser.php b/out/out.SubstituteUser.php
index 79a56145e..e7f4d727b 100644
--- a/out/out.SubstituteUser.php
+++ b/out/out.SubstituteUser.php
@@ -26,18 +26,21 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isAdmin()) {
 	$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
 } else {
 	$allUsers = $user->getReverseSubstitutes();
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1]);
 if($view) {
 	$view->setParam('dms', $dms);
 	$view->setParam('user', $user);
 	$view->setParam('allusers', $allUsers);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From f8adb0cecfcdb15a3d70a3e2ba81214498dd6801 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 Apr 2016 13:20:56 +0200
Subject: [PATCH 0482/2006] show previews were possible, pass accessobject to
 view

---
 out/out.ApprovalSummary.php               |  8 ++++++--
 out/out.ReceiptSummary.php                | 16 ++++++++++++++--
 out/out.ReviewSummary.php                 |  8 ++++++--
 out/out.TransmittalMgr.php                |  7 +++++--
 out/out.WorkflowSummary.php               |  7 +++++--
 views/bootstrap/class.ApprovalSummary.php |  2 ++
 views/bootstrap/class.CheckOutSummary.php | 16 ++++++++++++++++
 views/bootstrap/class.ReceiptSummary.php  | 16 ++++++++++++++++
 views/bootstrap/class.ReviewSummary.php   |  2 ++
 views/bootstrap/class.TransmittalMgr.php  |  4 ++--
 10 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php
index f43f02e69..2aa2be0b2 100644
--- a/out/out.ApprovalSummary.php
+++ b/out/out.ApprovalSummary.php
@@ -31,16 +31,20 @@ include("../inc/inc.Authentication.php");
  */
 require_once("SeedDMS/Preview.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php
index 73c636f0d..977ff6efd 100644
--- a/out/out.ReceiptSummary.php
+++ b/out/out.ReceiptSummary.php
@@ -27,13 +27,25 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php
index 0f68c80c5..977ff6efd 100644
--- a/out/out.ReviewSummary.php
+++ b/out/out.ReviewSummary.php
@@ -32,16 +32,20 @@ include("../inc/inc.Authentication.php");
  */
 require_once("SeedDMS/Preview.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index d0df6a02b..e9642f828 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -31,6 +31,10 @@ include("../inc/inc.Authentication.php");
  */
 require_once("SeedDMS/Preview.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));
 }
@@ -41,13 +45,12 @@ if(isset($_GET['transmittalid']) && $_GET['transmittalid']) {
 	$seltransmittal = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('seltransmittal', $seltransmittal);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php
index 8d31d3865..027718fd2 100644
--- a/out/out.WorkflowSummary.php
+++ b/out/out.WorkflowSummary.php
@@ -32,18 +32,21 @@ include("../inc/inc.Authentication.php");
  */
 require_once("SeedDMS/Preview.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 6e2e513c4..ea00eedeb 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -36,9 +36,11 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
 
 		$this->htmlStartPage(getMLText("approval_summary"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.CheckOutSummary.php b/views/bootstrap/class.CheckOutSummary.php
index 396856fd7..a243df01b 100644
--- a/views/bootstrap/class.CheckOutSummary.php
+++ b/views/bootstrap/class.CheckOutSummary.php
@@ -34,6 +34,13 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -64,6 +71,7 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"table-condensed\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -75,6 +83,14 @@ class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style {
 				}
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 516fd6f9a..06014a48b 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -34,6 +34,13 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -66,6 +73,7 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 				if ($printheader){
 					print "<table class=\"table-condensed\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
@@ -77,6 +85,14 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 				}
 			
 				print "<tr>\n";
+				$previewer->createPreview($version);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+				if($previewer->hasPreview($version)) {
+					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				} else {
+					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				}
+				print "</a></td>";
 				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 				print "<td>".getOverallStatusText($st["status"])."</td>";
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 95a3dd819..1c0b531d8 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -36,9 +36,11 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 52d2320f9..8a79b829c 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -230,9 +230,9 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
 
-		$db = $dms->getDB();
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');

From 4f70b6822b081a0a1f53156239c6c5607acd1bfd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 Apr 2016 15:16:07 +0200
Subject: [PATCH 0483/2006] fix typo

---
 op/op.CreateDump.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php
index 25c2fbf21..ceab734ab 100644
--- a/op/op.CreateDump.php
+++ b/op/op.CreateDump.php
@@ -33,7 +33,7 @@ if (!$user->isAdmin()) {
 if($settings->_backupDir && file_exists($settings->_backupDir))
 	$basedir = $settings->_backupDir;
 else
-	$basedir = $setting->_contentDir;
+	$basedir = $settings->_contentDir;
 
 $v = new SeedDMS_Version;
 $dump_name = $basedir.date('Y-m-d\TH:i:s')."_".$v->_number.".sql";

From 4e2313d387ba276bf60284217646111506d8cff6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Apr 2016 13:13:16 +0200
Subject: [PATCH 0484/2006] pass instance of Access Operation to view

---
 out/out.AddDocument.php         |  7 +++++--
 out/out.AddSubFolder.php        |  7 +++++--
 out/out.EditEvent.php           |  7 +++++--
 out/out.EditFolder.php          |  7 +++++--
 out/out.FolderAccess.php        |  7 +++++--
 out/out.FolderNotify.php        |  2 ++
 out/out.MoveFolder.php          |  7 +++++--
 out/out.RemoveFolder.php        |  7 +++++--
 out/out.Search.php              | 11 ++++++++++-
 out/out.UserDefaultKeywords.php |  7 +++++--
 out/out.ViewEvent.php           |  6 ++++--
 11 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 2e522237a..f47e92968 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -27,6 +27,10 @@ include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
@@ -60,8 +64,6 @@ if($settings->_libraryFolder) {
 	$libfolder = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
@@ -75,6 +77,7 @@ if($view) {
 	$view->setParam('presetexpiration', $settings->_presetExpirationDate);
 	$view->setParam('sortusersinlist', $settings->_sortUsersInList);
 	$view->setParam('orderby', $settings->_sortFoldersDefault);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.AddSubFolder.php b/out/out.AddSubFolder.php
index 0f9e14ff2..e5a1264a8 100644
--- a/out/out.AddSubFolder.php
+++ b/out/out.AddSubFolder.php
@@ -28,6 +28,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
@@ -40,12 +44,11 @@ if ($folder->getAccessMode($user) < M_READWRITE) {
 	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
 	$view->setParam('orderby', $settings->_sortFoldersDefault);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.EditEvent.php b/out/out.EditEvent.php
index 3372a0afe..0add550cc 100644
--- a/out/out.EditEvent.php
+++ b/out/out.EditEvent.php
@@ -25,6 +25,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Calendar.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("edit_event"),getMLText("access_denied"));
 }
@@ -42,11 +46,10 @@ if (($user->getID()!=$event["userID"])&&(!$user->isAdmin())){
 	UI::exitError(getMLText("edit_event"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('event', $event);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.EditFolder.php b/out/out.EditFolder.php
index 1639784f7..a8b9c49fb 100644
--- a/out/out.EditFolder.php
+++ b/out/out.EditFolder.php
@@ -26,6 +26,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
@@ -41,14 +45,13 @@ if ($folder->getAccessMode($user) < M_READWRITE) {
 
 $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('attrdefs', $attrdefs);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
 	$view->setParam('rootfolderid', $settings->_rootFolderID);
 	$view->setParam('orderby', $settings->_sortFoldersDefault);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.FolderAccess.php b/out/out.FolderAccess.php
index ae2a92d70..4198fa458 100644
--- a/out/out.FolderAccess.php
+++ b/out/out.FolderAccess.php
@@ -27,6 +27,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
@@ -43,13 +47,12 @@ if ($folder->getAccessMode($user) < M_ALL) {
 $allUsers = $dms->getAllUsers();
 $allGroups = $dms->getAllGroups();
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('allusers', $allUsers);
 	$view->setParam('allgroups', $allGroups);
 	$view->setParam('rootfolderid', $settings->_rootFolderID);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.FolderNotify.php b/out/out.FolderNotify.php
index 410c4f77c..e20a32356 100644
--- a/out/out.FolderNotify.php
+++ b/out/out.FolderNotify.php
@@ -29,6 +29,7 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
@@ -51,6 +52,7 @@ if($view) {
 	$view->setParam('allusers', $allUsers);
 	$view->setParam('allgroups', $allGroups);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.MoveFolder.php b/out/out.MoveFolder.php
index bf49b8c49..479761eae 100644
--- a/out/out.MoveFolder.php
+++ b/out/out.MoveFolder.php
@@ -27,6 +27,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
@@ -62,11 +66,10 @@ if(isset($_GET['targetid']) && $_GET['targetid']) {
 	$target = null;
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('target', $target);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.RemoveFolder.php b/out/out.RemoveFolder.php
index fef49f7b9..c14adf041 100644
--- a/out/out.RemoveFolder.php
+++ b/out/out.RemoveFolder.php
@@ -26,6 +26,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
@@ -44,10 +48,9 @@ if ($folder->getAccessMode($user) < M_ALL) {
 	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.Search.php b/out/out.Search.php
index dd312a21b..d02920bb9 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -444,8 +444,17 @@ if(count($entries) == 1) {
 	}
 } else {
 	$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-	$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'query'=>$query, 'searchhits'=>$entries, 'totalpages'=>$totalPages, 'pagenumber'=>$pageNumber, 'searchtime'=>$searchTime, 'urlparams'=>$_GET, 'cachedir'=>$settings->_cacheDir));
+	$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+	$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 	if($view) {
+		$view->setParam('accessobject', $accessop);
+		$view->setParam('query', $query);
+		$view->setParam('searchhits', $entries);
+		$view->setParam('totalpages', $totalPages);
+		$view->setParam('pagenumber', $pageNumber);
+		$view->setParam('searchtime', $searchTime);
+		$view->setParam('urlparams', $_GET);
+		$view->setParam('cachedir', $settings->_cacheDir);
 		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
 		$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) ? true : false);
diff --git a/out/out.UserDefaultKeywords.php b/out/out.UserDefaultKeywords.php
index f2d2e44d0..751431286 100644
--- a/out/out.UserDefaultKeywords.php
+++ b/out/out.UserDefaultKeywords.php
@@ -25,16 +25,19 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("edit_default_keywords"),getMLText("access_denied"));
 }
 
 $categories = $dms->getAllUserKeywordCategories($user->getID());
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('categories', $categories);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ViewEvent.php b/out/out.ViewEvent.php
index 495ec9d4d..37fa590a1 100644
--- a/out/out.ViewEvent.php
+++ b/out/out.ViewEvent.php
@@ -25,6 +25,9 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Calendar.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if (!isset($_GET["id"])){
 	UI::exitError(getMLText("event_details"),getMLText("error_occured"));
 }
@@ -34,10 +37,9 @@ if (is_bool($event)&&!$event){
 	UI::exitError(getMLText("event_details"),getMLText("error_occured"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('event', $event);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From 2188babab8f9ac9d6d744fbb9c9cac7d2aa274b4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Apr 2016 13:21:56 +0200
Subject: [PATCH 0485/2006] move js from html into dynamic js file

---
 views/bootstrap/class.Search.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 94151dd7d..c34ee5a59 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -49,7 +49,14 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
-
+?>
+$(document).ready( function() {
+	$('#export').on('click', function(e) {
+		e.preventDefault();
+		window.location.href = $(this).attr('href')+'&includecontent='+($('#includecontent').prop('checked') ? '1' : '0');
+	});
+});
+<?php
 		$this->printFolderChooserJs("form1");
 		$this->printDeleteFolderButtonJs();
 		$this->printDeleteDocumentButtonJs();
@@ -252,14 +259,6 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 <td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&export=1" ?>"><i class="icon-download"></i> Export</a></td>
 </tr>
 </table>
-<script>
-$(document).ready( function() {
-	$('#export').on('click', function(e) {
-		e.preventDefault();
-		window.location.href = $(this).attr('href')+'&includecontent='+($('#includecontent').prop('checked') ? '1' : '0');
-	});
-});		
-</script>
       </div>
     </div>
   </div>

From 8c77b0734c196d15df4389bab8b1bf688fdda7cf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Apr 2016 20:51:32 +0200
Subject: [PATCH 0486/2006] add hook to set extra columns, fix column counting
 if approval or review does not exists

---
 inc/inc.ClassDownloadMgr.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 7589f3f6b..55308ccbf 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -39,13 +39,21 @@ class SeedDMS_Download_Mgr {
 	 */
 	protected $items;
 
+	/**
+	 * @var array $extracols list of arrays with extra columns per item
+	 * @access protected
+	 */
+	protected $extracols;
+
 	function __construct($tmpdir = '') {
 		$this->tmpdir = $tmpdir;
 		$this->items = array();
+		$this->extracols = array();
 	}
 
-	public function addItem($item) { /* {{{ */
+	public function addItem($item, $extracols) { /* {{{ */
 		$this->items[$item->getID()] = $item;
+		$this->extracols[$item->getID()] = $extracols;
 	} /* }}} */
 
 	public function createToc($file) { /* {{{ */
@@ -113,9 +121,9 @@ class SeedDMS_Download_Mgr {
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, getReviewStatusText($r["status"]));
 					$l++;
 				}
-				$col = $tcol;
 				$l--;
 			}
+			$col += 4;
 			if($approvalStatus) {
 				foreach ($approvalStatus as $r) {
 					switch ($r["type"]) {
@@ -144,9 +152,13 @@ class SeedDMS_Download_Mgr {
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, getApprovalStatusText($r["status"]));
 					$k++;
 				}
-				$col = $tcol;
 				$k--;
 			}
+			$col += 4;
+			if(isset($this->extracols[$item->getID()]) && $this->extracols[$item->getID()]) {
+				foreach($this->extracols[$item->getID()] as $column)
+					$sheet->setCellValueByColumnAndRow($col++, $i, $column);
+			}
 			$i = max($l, $k);
 			$i++;
 		}

From 8d8f3e51fba574012f4788c6cdb71f08d32f888d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Apr 2016 20:53:00 +0200
Subject: [PATCH 0487/2006] move excel export into view

---
 out/out.Search.php               | 131 +++++++++++--------------------
 views/bootstrap/class.Search.php |  51 +++++++++++-
 2 files changed, 95 insertions(+), 87 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index d02920bb9..c4c847b9f 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -360,7 +360,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 			$pageNumber = (int) $_GET["pg"];
 		}
 		elseif (!strcasecmp($_GET["pg"], "all")) {
-		//	$limit = 0;
+			$pageNumber = "all";
 		}
 	}
 
@@ -393,99 +393,58 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 			}
 		}
 	}
-	if(isset($_GET['export']) && $_GET['export']) {
-		include("../inc/inc.ClassDownloadMgr.php");
-		$downmgr = new SeedDMS_Download_Mgr();
-		foreach($entries as $entry) {
-			if(get_class($entry) == $dms->getClassname('document')) {
-				$downmgr->addItem($entry->getLatestContent());
-			}
-		}
-		$filename = tempnam('/tmp', '');
-		if(isset($_GET['includecontent']) && $_GET['includecontent']) {
-			$downmgr->createArchive($filename);
-			header("Content-Transfer-Encoding: binary");
-			header("Content-Length: " . filesize($filename));
-			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
-			header("Content-Type: application/zip");
-			header("Cache-Control: must-revalidate");
-		} else {
-			$downmgr->createToc($filename);
-			header("Content-Transfer-Encoding: binary");
-			header("Content-Length: " . filesize($filename));
-			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".xls\"");
-			header("Content-Type: application/vnd.ms-excel");
-			header("Cache-Control: must-revalidate");
-		}
-
-		readfile($filename);
-		unlink($filename);
-		exit;
-	}
 
 	$totalPages = (int) (count($entries)/$limit);
 	if(count($entries)%$limit)
 		$totalPages++;
-	if (!isset($_GET["pg"]) || strcasecmp($_GET["pg"], "all"))
-		$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
 // }}}
 }
 
 // -------------- Output results --------------------------------------------
 
-if(count($entries) == 1) {
-	$entry = $entries[0];
-	if(get_class($entry) == $dms->getClassname('document')) {
-		header('Location: ../out/out.ViewDocument.php?documentid='.$entry->getID());
-		exit;
-	} elseif(get_class($entry) == $dms->getClassname('folder')) {
-		header('Location: ../out/out.ViewFolder.php?folderid='.$entry->getID());
-		exit;
-	}
-} else {
-	$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-	$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-	$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-	if($view) {
-		$view->setParam('accessobject', $accessop);
-		$view->setParam('query', $query);
-		$view->setParam('searchhits', $entries);
-		$view->setParam('totalpages', $totalPages);
-		$view->setParam('pagenumber', $pageNumber);
-		$view->setParam('searchtime', $searchTime);
-		$view->setParam('urlparams', $_GET);
-		$view->setParam('cachedir', $settings->_cacheDir);
-		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
-		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
-		$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) ? true : false);
-		$view->setParam('mode', isset($mode) ? $mode : '');
-		$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
-		$view->setParam('resultmode', isset($resultmode) ? $resultmode : '');
-		$view->setParam('searchin', isset($searchin) ? $searchin : array());
-		$view->setParam('startfolder', isset($startFolder) ? $startFolder : null);
-		$view->setParam('owner', $owner);
-		$view->setParam('startdate', isset($startdate) ? $startdate : array());
-		$view->setParam('stopdate', isset($stopdate) ? $stopdate : array());
-		$view->setParam('expstartdate', isset($expstartdate) ? $expstartdate : array());
-		$view->setParam('expstopdate', isset($expstopdate) ? $expstopdate : array());
-		$view->setParam('creationdate', isset($creationdate) ? $creationdate : '');
-		$view->setParam('expirationdate', isset($expirationdate) ? $expirationdate: '');
-		$view->setParam('status', isset($status) ? $status : array());
-		$view->setParam('categories', isset($categories) ? $categories : '');
-		$view->setParam('attributes', isset($attributes) ? $attributes : '');
-		$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
-		$view->setParam('attrdefs', $attrdefs);
-		$allCats = $dms->getDocumentCategories();
-		$view->setParam('allcategories', $allCats);
-		$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
-		$view->setParam('allusers', $allUsers);
-		$view->setParam('workflowmode', $settings->_workflowMode);
-		$view->setParam('enablefullsearch', $settings->_enableFullSearch);
-		$view->setParam('previewWidthList', $settings->_previewWidthList);
-		$view->setParam('previewconverters', $settings->_converters['preview']);
-		$view->setParam('timeout', $settings->_cmdTimeout);
-		$view($_GET);
-		exit;
-	}
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if($view) {
+	$view->setParam('accessobject', $accessop);
+	$view->setParam('query', $query);
+	$view->setParam('searchhits', $entries);
+	$view->setParam('totalpages', $totalPages);
+	$view->setParam('pagenumber', $pageNumber);
+	$view->setParam('limit', $limit);
+	$view->setParam('searchtime', $searchTime);
+	$view->setParam('urlparams', $_GET);
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
+	$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
+	$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) ? true : false);
+	$view->setParam('mode', isset($mode) ? $mode : '');
+	$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
+	$view->setParam('resultmode', isset($resultmode) ? $resultmode : '');
+	$view->setParam('searchin', isset($searchin) ? $searchin : array());
+	$view->setParam('startfolder', isset($startFolder) ? $startFolder : null);
+	$view->setParam('owner', $owner);
+	$view->setParam('startdate', isset($startdate) ? $startdate : array());
+	$view->setParam('stopdate', isset($stopdate) ? $stopdate : array());
+	$view->setParam('expstartdate', isset($expstartdate) ? $expstartdate : array());
+	$view->setParam('expstopdate', isset($expstopdate) ? $expstopdate : array());
+	$view->setParam('creationdate', isset($creationdate) ? $creationdate : '');
+	$view->setParam('expirationdate', isset($expirationdate) ? $expirationdate: '');
+	$view->setParam('status', isset($status) ? $status : array());
+	$view->setParam('categories', isset($categories) ? $categories : '');
+	$view->setParam('attributes', isset($attributes) ? $attributes : '');
+	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::objtype_all));
+	$view->setParam('attrdefs', $attrdefs);
+	$allCats = $dms->getDocumentCategories();
+	$view->setParam('allcategories', $allCats);
+	$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
+	$view->setParam('allusers', $allUsers);
+	$view->setParam('workflowmode', $settings->_workflowMode);
+	$view->setParam('enablefullsearch', $settings->_enableFullSearch);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view($_GET);
+	exit;
 }
 ?>
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index c34ee5a59..1a26f9223 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -62,12 +62,47 @@ $(document).ready( function() {
 		$this->printDeleteDocumentButtonJs();
 	} /* }}} */
 
+	function export() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$entries = $this->params['searchhits'];
+
+		include("../inc/inc.ClassDownloadMgr.php");
+		$downmgr = new SeedDMS_Download_Mgr();
+		foreach($entries as $entry) {
+			if(get_class($entry) == $dms->getClassname('document')) {
+				$extracols = $this->callHook('extraDownloadColumns', $entry);
+				$downmgr->addItem($entry->getLatestContent(), $extracols);
+			}
+		}
+		$filename = tempnam('/tmp', '');
+		if(isset($_GET['includecontent']) && $_GET['includecontent']) {
+			$downmgr->createArchive($filename);
+			header("Content-Transfer-Encoding: binary");
+			header("Content-Length: " . filesize($filename));
+			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
+			header("Content-Type: application/zip");
+			header("Cache-Control: must-revalidate");
+		} else {
+			$downmgr->createToc($filename);
+			header("Content-Transfer-Encoding: binary");
+			header("Content-Length: " . filesize($filename));
+			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".xls\"");
+			header("Content-Type: application/vnd.ms-excel");
+			header("Cache-Control: must-revalidate");
+		}
+
+		readfile($filename);
+		unlink($filename);
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$fullsearch = $this->params['fullsearch'];
 		$totaldocs = $this->params['totaldocs'];
 		$totalfolders = $this->params['totalfolders'];
+		$limit = $this->params['limit'];
 		$attrdefs = $this->params['attrdefs'];
 		$allCats = $this->params['allcategories'];
 		$allUsers = $this->params['allusers'];
@@ -99,6 +134,20 @@ $(document).ready( function() {
 		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
 
+		if(count($entries) == 1) {
+			$entry = $entries[0];
+			if(get_class($entry) == $dms->getClassname('document')) {
+				header('Location: ../out/out.ViewDocument.php?documentid='.$entry->getID());
+				exit;
+			} elseif(get_class($entry) == $dms->getClassname('folder')) {
+				header('Location: ../out/out.ViewFolder.php?folderid='.$entry->getID());
+				exit;
+			}
+		}
+
+		if ($pageNumber != 'all')
+			$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
+
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("search_results"));
@@ -256,7 +305,7 @@ $(document).ready( function() {
 <td><?= getMLText('content') ?></td><td><label class="checkbox inline"><input id="includecontent" type="checkbox" name="includecontent" value="1"> <?php printMLText("include_content"); ?></label></td>
 </tr>
 <tr>
-<td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&export=1" ?>"><i class="icon-download"></i> Export</a></td>
+<td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&action=export" ?>"><i class="icon-download"></i> Export</a></td>
 </tr>
 </table>
       </div>

From 4590a14de1fb430acae7b1ee7f894f93288861e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:01:20 +0200
Subject: [PATCH 0488/2006] fix html_link(), link attributes can't be added

---
 inc/inc.ClassViewCommon.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 00ecbe8f3..791586658 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -229,7 +229,8 @@ class SeedDMS_View_Common {
 		$url = $this->html_url($view, $urlparams);
 		$tag = "<a href=\"".$url."\"";
 		if($linkparams)
-			array_walk($linkparams, function($v, $k) {$tag .= " ".$k."=\"".$v."\"";});
+			foreach($linkparams as $k=>$v)
+				$tag .= " ".$k."=\"".$v."\"";
 		$tag .= ">".($hsc ? htmlspecialchars($link) : $link)."</a>";
 		return $tag;
 	} /* }}} */

From 5912354f098a89671220fefd2aac0255ac13b1c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:01:59 +0200
Subject: [PATCH 0489/2006] set accessobject in view

---
 out/out.Settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.Settings.php b/out/out.Settings.php
index 271f089ac..7446e6e3f 100644
--- a/out/out.Settings.php
+++ b/out/out.Settings.php
@@ -38,6 +38,7 @@ if(!trim($settings->_encryptionKey))
 if($view) {
 	$view->setParam('settings', $settings);
 	$view->setParam('currenttab', (isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : ''));
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From ae3c5faef5e0f1fc254812c9b2af7141b644d405 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:02:30 +0200
Subject: [PATCH 0490/2006] use html_link()

---
 views/bootstrap/class.GroupMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index 951e19309..2438f17e7 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -169,7 +169,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><a href="../out/out.RemoveGroup.php?groupid=<?php print $group->getID();?>" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_group");?></a></td>
+			<td><?php echo $this->html_link('RemoveGroup', array('groupid'=>$group->getID()), array('class'=>'btn'), '<i class="icon-remove"></i> '.getMLText("rm_group"), false); ?></td>
 		</tr>
 <?php
 		}

From 7ed8801f46a1418c7a62427a5e16c3d4b77b6c9c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:02:57 +0200
Subject: [PATCH 0491/2006] user html_url() and html_link()

---
 views/bootstrap/class.UserList.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 931f7e3fc..339829b94 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -56,7 +56,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			echo "<tr>";
 			echo "<td>";
 			if ($currUser->hasImage())
-				print "<img width=\"50\" src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
+				print "<img width=\"50\" src=\"".$this->html_url('UserImage', array('userid'=>$currUser->getId()))."\" >";
 			echo "</td>";
 			echo "<td>";
 			echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />";
@@ -105,11 +105,12 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</td>";
 			echo "<td>";
-			echo "<div class=\"list-action\">";
-			echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
-			if ($this->check_access('RemoveUser'))
-     	echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";
-			echo "</div>";
+			if($this->check_access(array('UsrMgr', 'RemoveUser'))) {
+				echo "<div class=\"list-action\">";
+				echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="icon-edit"></i>', false);
+				echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>', false);
+				echo "</div>";
+			}
 			echo "</td>";
 			echo "</tr>";
 		}

From dccb4c476a32c61d19bf98607347ca0e76f8464f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:03:15 +0200
Subject: [PATCH 0492/2006] use html_url() for image

---
 views/bootstrap/class.UsrMgr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 6b4560857..e241b0a37 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -189,7 +189,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><a class="btn" href="../out/out.RemoveUser.php?userid=<?php print $currUser->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_user");?></a></td>
+			<td><?php echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array('class'=>'btn'), '<i class="icon-remove"></i> '.getMLText("rm_user"), false); ?></td>
 		</tr>
 <?php
 	}
@@ -292,7 +292,7 @@ $(document).ready( function() {
 			<td>
 <?php
 					if ($currUser->hasImage())
-						print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
+						print "<img src=\"".$this->html_url('UserImage', array('userid'=>$currUser->getId()))."\" >";
 					else
 						printMLText("no_user_image");
 ?>

From 9999f6d57c62cc6d13938540a67bdfb3ce4d0cdd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 15:45:53 +0200
Subject: [PATCH 0493/2006] include missing files, set accessobject for view

---
 out/out.EditOnline.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/out/out.EditOnline.php b/out/out.EditOnline.php
index d911bf87b..4e6d70969 100644
--- a/out/out.EditOnline.php
+++ b/out/out.EditOnline.php
@@ -20,14 +20,19 @@
 
 include("../inc/inc.Settings.php");
 include("../inc/inc.LogInit.php");
-include("../inc/inc.DBInit.php");
 include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-$documentid = $_GET["documentid"];
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
+$documentid = $_GET["documentid"];
 if (!isset($documentid) || !is_numeric($documentid) || intval($documentid)<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -72,13 +77,8 @@ if (!isset($settings->_editOnlineFileTypes) || !is_array($settings->_editOnlineF
 }
  */
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
 $folder = $document->getFolder();
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('document', $document);
 	$view->setParam('version', $content);

From ae1bbffc64ab1f425e762c6d9914365ceaa3df4f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 15:46:36 +0200
Subject: [PATCH 0494/2006] fix link to out.EditOnline.php and
 out.RemoveVersion.php

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index be6cb87d5..e66cbade9 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -524,13 +524,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</ul>";
 		print "<ul class=\"unstyled actions\">";
 		if($accessop->mayEditVersion($document)) {
-			print "<li><a href=\"out.EditOnline.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_version")."</a></li>";
+			print "<li><a href=\"../out/out.EditOnline.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_version")."</a></li>";
 		}
 		/* Only admin has the right to remove version in any case or a regular
 		 * user if enableVersionDeletion is on
 		 */
 		if($accessop->mayRemoveVersion($document)) {
-			print "<li><a href=\"out.RemoveVersion.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
+			print "<li><a href=\"../out/out.RemoveVersion.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
 		}
 		if($accessop->mayOverrideStatus($document)) {
 			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";

From ea4d3d782cf6cec463f1d305f8b133d585845ca9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 18:08:24 +0200
Subject: [PATCH 0495/2006] add parameter to html_link() for turning access
 check off

---
 inc/inc.ClassViewCommon.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 791586658..c5d199a6b 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -223,9 +223,10 @@ class SeedDMS_View_Common {
 	 * @param boolean $hsc set to false if htmlspecialchars() shall not be called
 	 * @return string link
 	 */
-	protected function html_link($view='', $urlparams=array(), $linkparams=array(), $link, $hsc=true) { /* {{{ */
-		if(!$this->check_access($view))
-			return '';
+	protected function html_link($view='', $urlparams=array(), $linkparams=array(), $link, $hsc=true, $nocheck=false) { /* {{{ */
+		if(!$nocheck)
+			if(!$this->check_access($view))
+				return '';
 		$url = $this->html_url($view, $urlparams);
 		$tag = "<a href=\"".$url."\"";
 		if($linkparams)

From 8a08cc3bff4c9efe89913e5782c7194f957e8fd1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 18:09:05 +0200
Subject: [PATCH 0496/2006] check_view_access() returns true if advanced access
 is turned off

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 303b72ff2..b350e8b69 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -361,7 +361,7 @@ class SeedDMS_AccessOperation {
 	 */
 	function check_view_access($view, $get=array()) { /* {{{ */
 		if(!$this->settings->_advancedAcl)
-			return false;
+			return true;
 		if(is_string($view)) {
 			$scripts = array($view);
 		} elseif(is_array($view)) {

From e22f0e2065cbecec5253dbefe13cfd627eba87f3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 18:09:36 +0200
Subject: [PATCH 0497/2006] use html_link() instead of plain html

---
 views/bootstrap/class.ViewDocument.php | 50 +++++++++++++-------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index e66cbade9..845fb01de 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -524,51 +524,51 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</ul>";
 		print "<ul class=\"unstyled actions\">";
 		if($accessop->mayEditVersion($document)) {
-			print "<li><a href=\"../out/out.EditOnline.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_version")."</a></li>";
+			print "<li>".$this->html_link('EditOnline', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_version"), false, true)."</li>";
 		}
 		/* Only admin has the right to remove version in any case or a regular
 		 * user if enableVersionDeletion is on
 		 */
 		if($accessop->mayRemoveVersion($document)) {
-			print "<li><a href=\"../out/out.RemoveVersion.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
+			print "<li>".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-remove\"></i>".getMLText("rm_version"), false, true)."</li>";
 		}
 		if($accessop->mayOverrideStatus($document)) {
-			print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
+			print "<li>".$this->html_link('OverrideContentStatus', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-align-justify\"></i>".getMLText("change_status"), false, true)."</li>";
 		}
 		if($accessop->maySetRecipients($document)) {
-			print "<li><a href='../out/out.SetRecipients.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-check\"></i>".getMLText("change_recipients")."</a></li>";
+			print "<li>".$this->html_link('SetRecipients', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-check\"></i>".getMLText("change_recipients"), false, true)."</li>";
 		}
 		if($accessop->maySetRevisors($document)) {
-			print "<li><a href='../out/out.SetRevisors.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-refresh\"></i>".getMLText("change_revisors")."</a></li>";
+			print "<li>".$this->html_link('SetRevisors', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-refresh\"></i>".getMLText("change_revisors"), false, true)."</li>";
 		}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
 			if($accessop->maySetReviewersApprovers($document)) {
-				print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_assignments")."</a></li>";
+				print "<li>".$this->html_link('SetReviewersApprovers', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("change_assignments"), false, true)."</li>";
 			}
 		} else {
 			if($accessop->maySetWorkflow($document)) {
 				if(!$workflow) {
-					print "<li><a href='../out/out.SetWorkflow.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-random\"></i>".getMLText("set_workflow")."</a></li>";
+					print "<li>".$this->html_link('SetWorkflow', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-random\"></i>".getMLText("set_workflow"), false, true)."</li>";
 				}
 			}
 		}
 		/*
 		if($accessop->maySetExpires($document)) {
-			print "<li><a href='../out/out.SetExpires.php?documentid=".$documentid."'><i class=\"icon-time\"></i>".getMLText("set_expiry")."</a></li>";
+			print "<li>".$this->html_link('SetExpires', array('documentid'=>$documentid), array(), "<i class=\"icon-time\"></i>".getMLText("set_expiry"), false, true)."</li>";
 		}
 		 */
 		if($dms->getAllTransmittals($user)) {
-			print "<li><a href=\"out.AddToTransmittal.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-list\"></i>".getMLText("add_to_transmittal")."</a></li>";
+			print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
 		}
 		if($accessop->mayEditComment($document)) {
-			print "<li><a href=\"out.EditComment.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";
+			print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";
 		}
 		if($accessop->mayEditAttributes($document)) {
-			print "<li><a href=\"out.EditAttributes.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
+			print "<li>".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_attributes"), false, true)."</li>";
 		}
 
-		//print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&vfile=1\"><i class=\"icon-info-sign\"></i>".getMLText("versioning_info")."</a></li>";	
+		//print "<li>".$this->html_link('Download', array('documentid'=>$documentid, 'vfile'=>1), array(), "<i class=\"icon-info-sign\"></i>".getMLText("versioning_info"), false, true)."</li>";	
 
 		print "</ul>";
 		echo "</td>";
@@ -686,9 +686,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 				if($accessop->mayReview($document)) {
 					if ($is_reviewer && $r["status"]==0) {
-						print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-mini\">".getMLText("add_review")."</a></li>";
+						print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("add_review"), false, true)."</li>";
 					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-						print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-mini\">".getMLText("edit")."</a></li>";
+						print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 					}
 				}
 
@@ -755,9 +755,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 				if($accessop->mayApprove($document)) {
 					if ($is_approver && $a['status'] == 0 /*$status["status"]==S_DRAFT_APP*/) {
-						print "<li><a class=\"btn btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."</a></li>";
+						print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("add_approval"), false, true)."</li>";
 					}else if (($updateUser==$user)&&(($a["status"]==1)||($a["status"]==-1))&&(!$document->hasExpired())){
-						print "<li><a class=\"btn btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."</a></li>";
+						print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 					}
 				}
 
@@ -1040,9 +1040,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 				if($accessop->mayReceipt($document)) {
 					if ($is_recipient && $r["status"]==0) {
-						print "<li><a href=\"../out/out.ReceiptDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("add_receipt")."</a></li>";
+						print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."</li>";
 					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-						print "<li><a href=\"../out/out.ReceiptDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&receiptid=".$r['receiptID']."\" class=\"btn btn-mini\">".getMLText("edit")."</a></li>";
+						print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 					}
 				}
 
@@ -1150,9 +1150,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 				if($accessop->mayRevise($document)) {
 					if ($is_recipient && $r["status"]==0) {
-						print "<li><a href=\"../out/out.ReviseDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&revisionid=".$r['revisionID']."\" class=\"btn btn-mini\">".getMLText("add_revision")."</a></li>";
+						print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."</li>";
 					} elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-						print "<li><a href=\"../out/out.ReviseDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&revisionid=".$r['revisionID']."\" class=\"btn btn-mini\">".getMLText("edit")."</a></li>";
+						print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 					}
 				}
 
@@ -1261,15 +1261,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				 * user if enableVersionDeletion is on
 				 */
 				if($accessop->mayRemoveVersion($document)) {
-					print "<li><a href=\"out.RemoveVersion.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
+					print "<li>".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-remove\"></i>".getMLText("rm_version"), false, true)."</li>";
 				}
 				if($accessop->mayEditComment($document)) {
-					print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-comment\"></i>".getMLText("edit_comment")."</a></li>";
+					print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";
 				}
 				if($accessop->mayEditAttributes($document)) {
-					print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i>".getMLText("edit_attributes")."</a></li>";
+					print "<li>".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_attributes"), false, true)."</li>";
 				}
-				print "<li><a href='../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version->getVersion()."'><i class=\"icon-info-sign\"></i>".getMLText("details")."</a></li>";
+				print "<li>".$this->html_link('DocumentVersionDetail', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-info-sign\"></i>".getMLText("details"), false, true)."</li>";
 				print "</ul>";
 				print "</td>\n</tr>\n";
 			}
@@ -1351,7 +1351,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		else printMLText("no_attached_files");
 
 		if ($document->getAccessMode($user) >= M_READWRITE){
-			print "<ul class=\"unstyled\"><li><a href=\"../out/out.AddFile.php?documentid=".$documentid."\" class=\"btn\">".getMLText("add")."</a></ul>\n";
+			print "<ul class=\"unstyled\"><li>".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."</li></ul>\n";
 		}
 		$this->contentContainerEnd();
 ?>

From aee1ff2fcb2e35348105bf859e1d3080cb3651cc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 Apr 2016 13:32:37 +0200
Subject: [PATCH 0498/2006] inform notifier of new document too

---
 op/op.AddDocument.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index c8aebc69e..42a8e5487 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -394,7 +394,8 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	} else {
 		// Send notification to subscribers of folder.
 		if($notifier) {
-			$notifyList = $folder->getNotifyList();
+			$notifyList1 = $folder->getNotifyList();
+			$notifyList2 = $document->getNotifyList();
 
 			$subject = "new_document_email_subject";
 			$message = "new_document_email_body";
@@ -408,8 +409,12 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
-			foreach ($notifyList["groups"] as $grp) {
+			$notifier->toList($user, $notifyList1["users"], $subject, $message, $params);
+			foreach ($notifyList1["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+			$notifier->toList($user, $notifyList2["users"], $subject, $message, $params);
+			foreach ($notifyList2["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
 

From 20c0abf69d8af937ec9deefca811cc66a09da453 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 Apr 2016 15:33:57 +0200
Subject: [PATCH 0499/2006] add missing attribute 'target' to converters

this needs to be done when updating from 5.0.x to 5.1.x
---
 inc/inc.ClassSettings.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 6cd27fba2..3ec7ff2f7 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -843,7 +843,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "smtpPassword", $this->_smtpPassword);
 
     // XML Path: /configuration/advanced/display
-    $this->getXMLNode($xml, '/configuration', 'advanced');
+    $advnode = $this->getXMLNode($xml, '/configuration', 'advanced');
     $node = $this->getXMLNode($xml, '/configuration/advanced', 'display');
     $this->setXMLAttributValue($node, "siteDefaultPage", $this->_siteDefaultPage);
     $this->setXMLAttributValue($node, "rootFolderID", $this->_rootFolderID);
@@ -889,6 +889,12 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "maxExecutionTime", $this->_maxExecutionTime);
     $this->setXMLAttributValue($node, "cmdTimeout", $this->_cmdTimeout);
 
+		/* Check if there is still a converters list with a target attribute */
+		$node = $xml->xpath('/configuration/advanced/converters[count(@*)=0]');
+		if (count($node)>0) {
+			$this->setXMLAttributValue($node[0], 'target', 'fulltext');
+		}
+
 		// XML Path: /configuration/advanced/converters
 		foreach($this->_converters as $type=>$converters) {
 			foreach($this->_converters[$type] as $mimeType => $cmd) {
@@ -907,6 +913,10 @@ class Settings { /* {{{ */
 				} else {
 					if(trim($cmd)) {
 						$nodeParent = $xml->xpath('/configuration/advanced/converters[@target="'.$type.'"]');
+						if(count($nodeParent) == 0) {
+							$nodeParent = array($advnode->addChild("converters"));
+							$this->setXMLAttributValue($nodeParent[0], 'target', $type);
+						}
 						$node = $nodeParent[0]->addChild("converter");
 						$node[0] = $cmd;
 						$this->setXMLAttributValue($node, 'mimeType', $mimeType);

From 037646537b7371dbf586df6923135e61267838d4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 Apr 2016 16:00:16 +0200
Subject: [PATCH 0500/2006] set version to 5.1.0, use btn instead of plain link

---
 install/install.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/install.php b/install/install.php
index 1e550d647..c09f667e8 100644
--- a/install/install.php
+++ b/install/install.php
@@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "5.0.2");
+define("SEEDDMS_VERSION", "5.1.0");
 
 require_once('../inc/inc.ClassSettings.php');
 
@@ -362,7 +362,7 @@ if ($action=="setSettings") {
 									if(file_exists('update-'.$updatedir.'/update.txt')) {
 										print "<p>Please read the comments on updating this version. <a href=\"update-".$updatedir."/update.txt\" target=\"_blank\">Read now</a></p>";
 									}
-									print "<p>Run the <a href=\"update.php?version=".$updatedir."\">update script</a>.</p>";
+									print "<p><a href=\"update.php?version=".$updatedir."\" class=\"btn btn-primary\">Run the update script</a>.</p>";
 								}
 							}
 						} else {

From 35c8e5763338b2cae39a70e80e1a84dcbbb49238 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 Apr 2016 16:00:46 +0200
Subject: [PATCH 0501/2006] don't drop old table tblUsers, just rename it

dropping it, always issues an error 'database locked'
---
 install/update-5.1.0/update-sqlite3.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index 6d136b90b..9ddf1f026 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -108,7 +108,7 @@ CREATE TABLE `new_tblUsers` (
 
 INSERT INTO new_tblUsers SELECT * FROM tblUsers;
 
-DROP TABLE tblUsers;
+ALTER TABLE tblUsers RENAME TO old_tblUsers;
 
 ALTER TABLE new_tblUsers RENAME TO tblUsers;
 

From d0ef7f42381326350b3ceb05da3327bd87ada3ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 Apr 2016 16:01:38 +0200
Subject: [PATCH 0502/2006] convert to bootstrap

---
 install/update.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/install/update.php b/install/update.php
index afc7e3e46..05fedca03 100644
--- a/install/update.php
+++ b/install/update.php
@@ -33,11 +33,13 @@ if (!file_exists($configDir."/ENABLE_INSTALL_TOOL")) {
 	exit;
 }
 
-$theme = "blue";
+$theme = "bootstrap";
 require_once("../inc/inc.Language.php");
 require_once("../inc/inc.ClassUI.php");
 
 UI::htmlStartPage('Database update');
+UI::globalBanner();
+UI::contentStart();
 UI::contentHeading("SeedDMS Installation for version ".$_GET['version']);
 UI::contentContainerStart();
 
@@ -77,7 +79,7 @@ if($rec = $res->fetch(PDO::FETCH_ASSOC)) {
 						echo $query."<br />";
 						if(false === $db->exec($query)) {
 							$e = $db->ErrorInfo();
-							$errorMsg .= $e[2] . "<br/>";
+							$errorMsg .= $query.": ".$e[2] . "<br/>";
 						}
 					}
 				}
@@ -98,12 +100,13 @@ if($rec = $res->fetch(PDO::FETCH_ASSOC)) {
 	} else {
 		echo $errorMsg;
 	}
-	echo "<p><a href=\"install.php\">Go back to installation and recheck.</a></p>";
+	echo "<p><a href=\"install.php\" class=\"btn btn-primary\">Go back to installation and recheck.</a></p>";
 } else {
 	echo "<p>Could not determine database schema version.</p>";
 }
 $db = null;
 
 UI::contentContainerEnd();
+UI::contentEnd();
 UI::htmlEndPage();
 ?>

From cc685141e979e55f1f39cfcca765e14742cb85f1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 Apr 2016 17:19:28 +0200
Subject: [PATCH 0503/2006] fix wrong variable name

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 349b911a3..864a0d913 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3169,7 +3169,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if ($u->getID() == $owner->getID()) return M_READ;
 
 		/* Read/Write access on the document will also grant access on the version */
-		if($this->_document->getAccessMode($user) >= M_READWRITE) return M_READ;
+		if($this->_document->getAccessMode($u) >= M_READWRITE) return M_READ;
 
 		/* At this point the current status is in the list of status without read access.
 		 * The only way to still gain read access is, if the user is involved in the

From 823e7bf76ec3890d5038facc71a83ef74d9913ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 21 Apr 2016 17:19:58 +0200
Subject: [PATCH 0504/2006] better handling of access rights if advanced access
 rights are turn off

check_view_access() returns true for admins and false otherwise
---
 inc/inc.ClassAccessOperation.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index b350e8b69..d5e2d5732 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -360,8 +360,12 @@ class SeedDMS_AccessOperation {
 	 * no specific access right is set, otherwise false
 	 */
 	function check_view_access($view, $get=array()) { /* {{{ */
-		if(!$this->settings->_advancedAcl)
-			return true;
+		if(!$this->settings->_advancedAcl) {
+			if($this->user->isAdmin())
+				return true;
+			else
+				return false;
+		}
 		if(is_string($view)) {
 			$scripts = array($view);
 		} elseif(is_array($view)) {

From e1926ed2176929cd8b572f56626ad6df57b8fe65 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 08:21:18 +0200
Subject: [PATCH 0505/2006] add more documentation

---
 inc/inc.ClassAccessOperation.php | 7 +++++--
 inc/inc.ClassViewCommon.php      | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index d5e2d5732..cd6acdbca 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -348,14 +348,17 @@ class SeedDMS_AccessOperation {
 	 * Check for access permission on view
 	 *
 	 * If the parameter $view is an array then each element is considered the
-	 * name of a view and true will be returned if one is accessible.
+	 * name of a view and true will be returned if one of them is accessible.
 	 * Whether access is allowed also depends on the currently logged in user
 	 * stored in the view object. If the user is an admin the access 
 	 * on a view must be explicitly disallowed. For regular users the access
 	 * must be explicitly allowed.
 	 *
+	 * If advanced access control is turn off, this function will always return
+	 * true for admins and false for other users.
+	 *
 	 * @param mixed $view Instanz of view, name of view or array of view names
-	 * @param string $get query parameters
+	 * @param string $get query parameters possible containing the element 'action'
 	 * @return boolean true if access is allowed, false if access is disallowed
 	 * no specific access right is set, otherwise false
 	 */
diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index c5d199a6b..42dab1cf2 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -171,10 +171,10 @@ class SeedDMS_View_Common {
 	 * Check if the access on the view with given name or the current view itself
 	 * may be accessed.
 	 *
-	 * The function behaves differently for admins and other users. For admins
-	 * a view must be explitly disallowed for this function to return false.
-	 * For other users access on a view must be explicitly allow for the this
-	 * function to return true.
+	 * The function requires the parameter 'accessobject' to be available in the
+	 * view, because it calls SeedDMS_AccessOperation::check_view_access()
+	 * to check access rights. If the the optional $name is not set the
+	 * current view is used.
 	 *
 	 * @param string|array $name name of view or list of view names
 	 * @return boolean true if access is allowed otherwise false

From d63b36f3bfea9d3d575a55584ee44fc55d3cb5d7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 08:21:44 +0200
Subject: [PATCH 0506/2006] no need to check explicitly for admin,
 check_view_access() is enough

---
 views/bootstrap/class.AdminTools.php | 42 ++++++++++++++--------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php
index 8b92d3039..19a5619c2 100644
--- a/views/bootstrap/class.AdminTools.php
+++ b/views/bootstrap/class.AdminTools.php
@@ -47,33 +47,33 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 ?>
 	<div id="admin-tools">
 	<div class="row-fluid">
-<?php if($accessop->check_view_access('UsrMgr') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('UsrMgr')) { ?>
 		<a href="../out/out.UsrMgr.php" class="span3 btn btn-medium"><i class="icon-user"></i><br /><?php echo getMLText("user_management")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('GroupMgr') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('GroupMgr')) { ?>
 		<a href="../out/out.GroupMgr.php" class="span3 btn btn-medium"><i class="icon-group"></i><br /><?php echo getMLText("group_management")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('RoleMgr') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('RoleMgr')) { ?>
 		<a href="../out/out.RoleMgr.php" class="span3 btn btn-medium"><i class="icon-bullseye"></i><br /><?php echo getMLText("role_management")?></a>
 <?php } ?>
 	</div>
 	<div class="row-fluid">
-<?php if($accessop->check_view_access('BackupTools') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('BackupTools')) { ?>
 		<a href="../out/out.BackupTools.php" class="span3 btn btn-medium"><i class="icon-hdd"></i><br /><?php echo getMLText("backup_tools")?></a>
 <?php } ?>
 <?php		
-		if ($logfileenable && ($accessop->check_view_access('LogManagement') || $user->isAdmin()))
+		if ($logfileenable && ($accessop->check_view_access('LogManagement')))
 			echo "<a href=\"../out/out.LogManagement.php\" class=\"span3 btn btn-medium\"><i class=\"icon-list\"></i><br />".getMLText("log_management")."</a>";
 ?>
 	</div>
 	<div class="row-fluid">
-<?php if($accessop->check_view_access('DefaultKeywords') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('DefaultKeywords')) { ?>
 		<a href="../out/out.DefaultKeywords.php" class="span3 btn btn-medium"><i class="icon-reorder"></i><br /><?php echo getMLText("global_default_keywords")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('Categories') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('Categories')) { ?>
 		<a href="../out/out.Categories.php" class="span3 btn btn-medium"><i class="icon-columns"></i><br /><?php echo getMLText("global_document_categories")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('AttributeMgr') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('AttributeMgr')) { ?>
 		<a href="../out/out.AttributeMgr.php" class="span3 btn btn-medium"><i class="icon-tags"></i><br /><?php echo getMLText("global_attributedefinitions")?></a>
 <?php } ?>
 	</div>
@@ -81,13 +81,13 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 	if($this->params['workflowmode'] == 'advanced') {
 ?>
 	<div class="row-fluid">
-<?php if($accessop->check_view_access('WorkflowMgr') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('WorkflowMgr')) { ?>
 		<a href="../out/out.WorkflowMgr.php" class="span3 btn btn-medium"><i class="icon-sitemap"></i><br /><?php echo getMLText("global_workflows"); ?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('WorkflowStatesMgr') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('WorkflowStatesMgr')) { ?>
 		<a href="../out/out.WorkflowStatesMgr.php" class="span3 btn btn-medium"><i class="icon-star"></i><br /><?php echo getMLText("global_workflow_states"); ?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('WorkflowActionsMgr') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('WorkflowActionsMgr')) { ?>
 		<a href="../out/out.WorkflowActionsMgr.php" class="span3 btn btn-medium"><i class="icon-bolt"></i><br /><?php echo getMLText("global_workflow_actions"); ?></a>
 <?php } ?>
 	</div>
@@ -96,13 +96,13 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		if($enablefullsearch) {
 ?>
 	<div class="row-fluid">
-<?php if($accessop->check_view_access('Indexer') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('Indexer')) { ?>
 		<a href="../out/out.Indexer.php" class="span3 btn btn-medium"><i class="icon-refresh"></i><br /><?php echo getMLText("update_fulltext_index")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('CreateIndex') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('CreateIndex')) { ?>
 		<a href="../out/out.CreateIndex.php" class="span3 btn btn-medium"><i class="icon-search"></i><br /><?php echo getMLText("create_fulltext_index")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('IndexInfo') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('IndexInfo')) { ?>
 		<a href="../out/out.IndexInfo.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("fulltext_info")?></a>
 <?php } ?>
 	</div>
@@ -110,27 +110,27 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 	<div class="row-fluid">
-<?php if($accessop->check_view_access('Statistic') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('Statistic')) { ?>
 		<a href="../out/out.Statistic.php" class="span3 btn btn-medium"><i class="icon-tasks"></i><br /><?php echo getMLText("folders_and_documents_statistic")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('Charts') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('Charts')) { ?>
 		<a href="../out/out.Charts.php" class="span3 btn btn-medium"><i class="icon-bar-chart"></i><br /><?php echo getMLText("charts")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('ObjectCheck') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('ObjectCheck')) { ?>
 		<a href="../out/out.ObjectCheck.php" class="span3 btn btn-medium"><i class="icon-check"></i><br /><?php echo getMLText("objectcheck")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('Timeline') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('Timeline')) { ?>
 		<a href="../out/out.Timeline.php" class="span3 btn btn-medium"><i class="icon-time"></i><br /><?php echo getMLText("timeline")?></a>
 <?php } ?>
 	</div>
 	<div class="row-fluid">
-<?php if($accessop->check_view_access('Settings') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('Settings')) { ?>
 		<a href="../out/out.Settings.php" class="span3 btn btn-medium"><i class="icon-wrench"></i><br /><?php echo getMLText("settings")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('ExtensionMgr') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('ExtensionMgr')) { ?>
 		<a href="../out/out.ExtensionMgr.php" class="span3 btn btn-medium"><i class="icon-cogs"></i><br /><?php echo getMLText("extension_manager")?></a>
 <?php } ?>
-<?php if($accessop->check_view_access('Info') || $user->isAdmin()) { ?>
+<?php if($accessop->check_view_access('Info')) { ?>
 		<a href="../out/out.Info.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("version_info")?></a>
 <?php } ?>
 	</div>

From bc6f641eb3d8fe13bc379fa7bf170bfe293f733f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 08:22:19 +0200
Subject: [PATCH 0507/2006] add more access checks for action 'info' and 'form'

---
 views/bootstrap/class.AttributeMgr.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index cd4a3b011..ac0a7fdbc 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -306,12 +306,16 @@ $(document).ready( function() {
 ?>
 	</select>
 </div>
-<div class="ajax" data-view="AttributeMgr" data-action="info" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
+<?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
+	<div class="ajax" data-view="AttributeMgr" data-action="info" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
+<?php } ?>
 </div>
 
 <div class="span6">
 	<div class="well">
+<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
 		<div class="ajax" data-view="AttributeMgr" data-action="form" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
+<?php } ?>
 	</div>
 </div>
 

From 088a146888f56b131dfab7ac4182a0fa4d92d6d4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 08:22:50 +0200
Subject: [PATCH 0508/2006] add more access checks, fixed html

---
 views/bootstrap/class.GroupMgr.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index 2438f17e7..7b1838e0e 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -257,6 +257,7 @@ $(document).ready( function() {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$accessop = $this->params['accessobject'];
 		$selgroup = $this->params['selgroup'];
 		$allUsers = $this->params['allusers'];
 		$allGroups = $this->params['allgroups'];
@@ -284,18 +285,22 @@ $(document).ready( function() {
 ?>
 </select>
 </div>
-<div class="ajax" data-view="GroupMgr" data-action="info" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
+<?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
+	<div class="ajax" data-view="GroupMgr" data-action="info" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
+<?php } ?>
 </div>
 
 <div class="span8">
-<div class="well">
-<div class="ajax" data-view="GroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
-</div>
+	<div class="well">
+<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
+		<div class="ajax" data-view="GroupMgr" data-action="form" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
+<?php } ?>
+	</div>
 </div>
+
 </div>
 
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 7e3535ad1ac0d343b183861fd4640d36800c4426 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 08:23:15 +0200
Subject: [PATCH 0509/2006] add more access checks for actions 'info' and
 'form'

---
 views/bootstrap/class.RoleMgr.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 08beeb2e1..d19c6b8a1 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -205,14 +205,19 @@ $(document).ready( function() {
 ?>
 </select>
 </div>
-<div class="ajax" data-view="RoleMgr" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
+<?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
+	<div class="ajax" data-view="RoleMgr" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
+<?php } ?>
 </div>
 
 <div class="span8">
 	<div class="well">
+<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
 		<div class="ajax" data-view="RoleMgr" data-action="form" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
+<?php } ?>
 	</div>
 </div>
+</div>
 
 <?php
 		$this->contentEnd();

From 0d3ff8a2d4a32d42c76c1d8a15a3be66b01e471b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 08:23:37 +0200
Subject: [PATCH 0510/2006] add access check for action 'form', no need to
 check for admin

---
 views/bootstrap/class.UsrMgr.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index e241b0a37..337d6841f 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -520,14 +520,16 @@ $(document).ready( function() {
 ?>
 </select>
 </div>
-<?php if($accessop->check_view_access($this, array('action'=>'info')) || $user->isAdmin()) { ?>
-<div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
+<?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
+	<div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 <?php } ?>
 </div>
 
 <div class="span8">
 	<div class="well">
+<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
 		<div class="ajax" data-view="UsrMgr" data-action="form" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
+<?php } ?>
 	</div>
 </div>
 </div>

From c6121ff201ec546477f3ad84398b61b6c7081abe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 12:25:26 +0200
Subject: [PATCH 0511/2006] do not issue an error if access on library folder
 is forbitten

just disable the upload from the library folder
---
 out/out.AddDocument.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index f47e92968..eb805c5d9 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -58,7 +58,8 @@ if($settings->_libraryFolder) {
 	}
 
 	if ($libfolder->getAccessMode($user) < M_READ) {
-		UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($libfolder->getName()))), getMLText("access_denied"));
+		$libfolder = null;
+//		UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($libfolder->getName()))), getMLText("access_denied"));
 	}
 } else {
 	$libfolder = null;

From 281c4baeb34c0525e22f43c65fb17668b1019700 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 12:30:02 +0200
Subject: [PATCH 0512/2006] some reorganization of code

---
 out/out.UpdateDocument.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php
index 99e5bfd38..e6f65986e 100644
--- a/out/out.UpdateDocument.php
+++ b/out/out.UpdateDocument.php
@@ -28,6 +28,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -57,11 +61,6 @@ if($settings->_quota > 0) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);

From 35d7a70adeff5a097305010782337443c315f494 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 12:57:39 +0200
Subject: [PATCH 0513/2006] header for additional columns can be set

---
 inc/inc.ClassDownloadMgr.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 55308ccbf..b91cec988 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -48,9 +48,15 @@ class SeedDMS_Download_Mgr {
 	function __construct($tmpdir = '') {
 		$this->tmpdir = $tmpdir;
 		$this->items = array();
+		$this->header = array('Dokumenten-Nr.', 'Dokumentenname', 'Dateiname', 'Status', 'Int. Version', 'Prüfer', 'Prüfdatum', 'Prüfkommentar', 'Prüfstatus', 'Freigeber', 'Freigabedatum', 'Freigabekommentar', 'Freigabestatus');
 		$this->extracols = array();
+		$this->extraheader = array();
 	}
 
+	public function addHeader($extraheader) { /* {{{ */
+		$this->extraheader = $extraheader;
+	} /* }}} */
+
 	public function addItem($item, $extracols) { /* {{{ */
 		$this->items[$item->getID()] = $item;
 		$this->extracols[$item->getID()] = $extracols;
@@ -64,19 +70,10 @@ class SeedDMS_Download_Mgr {
 
 		$i = 1;
 		$col = 0;
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Dokumenten-Nr.');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Dokumentenname');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Dateiname');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Status');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Int. Version');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Prüfer');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Prüfdatum');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Prüfkommentar');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Prüfstatus');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Freigeber');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Freigabedatum');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Freigabekommentar');
-		$sheet->setCellValueByColumnAndRow($col++, $i, 'Freigabestatus');
+		foreach($this->header as $h)
+			$sheet->setCellValueByColumnAndRow($col++, $i, $h);
+		foreach($this->extraheader as $h)
+			$sheet->setCellValueByColumnAndRow($col++, $i, $h);
 		$i++;
 		foreach($items as $item) {
 			$document = $item->getDocument();

From 92ab26d547da55cb00c70886e4224c0ee5a03056 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Apr 2016 12:58:28 +0200
Subject: [PATCH 0514/2006] call hook extraDownloadHeader

---
 views/bootstrap/class.Search.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 1a26f9223..9c462d15b 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -69,6 +69,8 @@ $(document).ready( function() {
 
 		include("../inc/inc.ClassDownloadMgr.php");
 		$downmgr = new SeedDMS_Download_Mgr();
+		if($extraheader = $this->callHook('extraDownloadHeader'))
+			$downmgr->addHeader($extraheader);
 		foreach($entries as $entry) {
 			if(get_class($entry) == $dms->getClassname('document')) {
 				$extracols = $this->callHook('extraDownloadColumns', $entry);

From ad95fdecd9a881adc723af848d64a601787e377e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 18:12:36 +0200
Subject: [PATCH 0515/2006] add comment the getAccessMode() doesn't work in any
 case

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 864a0d913..56fc96a14 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3146,6 +3146,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * It is also used by {@link SeedDMS_Core_Document::getAccessMode()} to
 	 * prevent access on the whole document if there is no accessible version.
 	 *
+	 * FIXME: This function only works propperly if $u is the currently logged in
+	 * user, because noReadForStatus will be set for this user. 
+	 *
 	 * @param object $u user
 	 * @return integer either M_NONE or M_READ
 	 */

From f87a3ce570b80375a5ec210a350bea1cd3d03bf8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 18:14:12 +0200
Subject: [PATCH 0516/2006] fix line indenting

---
 op/op.Ajax.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 53e9cb517..b43e85881 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -484,7 +484,8 @@ switch($command) {
 				$revisions = array();
 				$resArr = $dms->getDocumentList('AppRevByMe', $user);
 				if($resArr) {
-					foreach ($resArr as $res) { if($res["status"]==S_DRAFT_REV)
+					foreach ($resArr as $res) {
+						if($res["status"]==S_DRAFT_REV)
 							$reviews[] = $res['id'];
 						if($res["status"]==S_DRAFT_APP)
 							$approvals[] = $res['id'];

From 6b2d4a4b754534ed804e6c7ca0bc59b9d4e85c4c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 18:14:38 +0200
Subject: [PATCH 0517/2006] set dms in view early, check for access on latest
 content

---
 out/out.ViewDocument.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index b59b09853..c198aa03f 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -35,7 +35,7 @@ include("../inc/inc.Authentication.php");
 require_once("SeedDMS/Preview.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1]);
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
@@ -53,6 +53,11 @@ if ($document->getAccessMode($user) < M_READ) {
 	$view->exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
+/* Could be that the advanced access rights prohibit access on the content */
+if (!$document->getLatestContent()) {
+	$view->exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
 /* Recalculate the status of a document and reload the page if the status
  * has changed. A status change may occur if the document has expired in
  * the mean time
@@ -69,8 +74,6 @@ if ($document->checkForDueRevisionWorkflow($user)){
 }
 
 if($view) {
-	$view->setParam('dms', $dms);
-	$view->setParam('user', $user);
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
 	$view->setParam('accessobject', $accessop);

From 99e52d68f4b3e63787cd849766bfa8ff3a063380 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 18:15:06 +0200
Subject: [PATCH 0518/2006] check if version is accessible

don't use the latest version but the version that needs to be reviewed,
approved, revised, ...
---
 views/bootstrap/class.MyDocuments.php | 499 +++++++++++++-------------
 1 file changed, 258 insertions(+), 241 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 7987c38e8..12e26e0e6 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -113,22 +113,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 									$printheader=false;
 								}
 							
-								print "<tr>\n";
-								$latestContent = $document->getLatestContent();
-								$previewer->createPreview($latestContent);
-								print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-								if($previewer->hasPreview($latestContent)) {
-									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-								} else {
-									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+								if($content = $document->getContentByVersion($st['version'])) {
+									print "<tr>\n";
+									$previewer->createPreview($content);
+									print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+									if($previewer->hasPreview($content)) {
+										print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+									} else {
+										print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+									}
+									print "</a></td>";
+									print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+									print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+									print "<td>".$st["version"]."</td>";
+									print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
+									print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+									print "</tr>\n";
 								}
-								print "</a></td>";
-								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-								print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-								print "<td>".$st["version"]."</td>";
-								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-								print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-								print "</tr>\n";
 							}
 						}
 						foreach ($reviewStatus["grpstatus"] as $st) {
@@ -151,22 +152,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 									$printheader=false;
 								}
 
-								print "<tr>\n";
-								$latestContent = $document->getLatestContent();
-								$previewer->createPreview($latestContent);
-								print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-								if($previewer->hasPreview($latestContent)) {
-									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-								} else {
-									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+								if($content = $document->getContentByVersion($st['version'])) {
+									print "<tr>\n";
+									$previewer->createPreview($content);
+									print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+									if($previewer->hasPreview($content)) {
+										print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+									} else {
+										print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+									}
+									print "</a></td>";
+									print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+									print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+									print "<td>".$st["version"]."</td>";
+									print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+									print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+									print "</tr>\n";
 								}
-								print "</a></td>";
-								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-								print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-								print "<td>".$st["version"]."</td>";
-								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-								print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-								print "</tr>\n";
 							}
 						}
 						if (!$printheader){
@@ -201,22 +203,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 								$printheader=false;
 							}
 
-							print "<tr>\n";
-							$latestContent = $document->getLatestContent();
-							$previewer->createPreview($latestContent);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($latestContent)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							if($content = $document->getContentByVersion($st['version'])) {
+								print "<tr>\n";
+								$previewer->createPreview($content);
+								print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+								if($previewer->hasPreview($content)) {
+									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+								} else {
+									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+								}
+								print "</a></td>";
+								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+								print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+								print "<td>".$st["version"]."</td>";
+								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+								print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";					
+								print "</tr>\n";
 							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";					
-							print "</tr>\n";
 						}
 					}
 					foreach ($approvalStatus["grpstatus"] as $st) {
@@ -236,22 +239,24 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 								print "</tr>\n</thead>\n<tbody>\n";
 								$printheader=false;
 							}
-							print "<tr>\n";
-							$latestContent = $document->getLatestContent();
-							$previewer->createPreview($latestContent);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($latestContent)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+
+							if($content = $document->getContentByVersion($st['version'])) {
+								print "<tr>\n";
+								$previewer->createPreview($content);
+								print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+								if($previewer->hasPreview($content)) {
+									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+								} else {
+									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+								}
+								print "</a></td>";
+								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+								print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+								print "<td>".$st["version"]."</td>";				
+								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+								print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+								print "</tr>\n";
 							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";				
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-							print "</tr>\n";
 						}
 					}
 					if (!$printheader){
@@ -310,22 +315,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							}
 						}
 					
-						print "<tr>\n";
-						$latestContent = $document->getLatestContent();
-						$previewer->createPreview($latestContent);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-						if($previewer->hasPreview($latestContent)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						if($content = $document->getContentByVersion($res['version'])) {
+							print "<tr>\n";
+							$previewer->createPreview($content);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+							if($previewer->hasPreview($content)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+							print "<td>".getOverallStatusText($res["status"])."</td>";
+							print "<td>".$res["version"]."</td>";
+							print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+							print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+							print "</tr>\n";
 						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-						print "<td>".getOverallStatusText($res["status"])."</td>";
-						print "<td>".$res["version"]."</td>";
-						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-						print "</tr>\n";
 					}		
 					print "</tbody></table>";	
 					
@@ -390,22 +396,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 								$printheader=false;
 							}
 						
-							print "<tr>\n";
-							$latestContent = $document->getLatestContent();
-							$previewer->createPreview($latestContent);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($latestContent)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							if($content = $document->getContentByVersion($st['version'])) {
+								print "<tr>\n";
+								$previewer->createPreview($content);
+								print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
+								if($previewer->hasPreview($content)) {
+									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+								} else {
+									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+								}
+								print "</a></td>";
+								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
+								print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
+								print "<td>".$st["version"]."</td>";
+								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]) ."</td>";
+								print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
+								print "</tr>\n";
 							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]) ."</td>";
-							print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
-							print "</tr>\n";
 						}
 					}
 					foreach ($workflowStatus["g"] as $st) {
@@ -428,22 +435,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 								$printheader=false;
 							}
 
-							print "<tr>\n";
-							$latestContent = $document->getLatestContent();
-							$previewer->createPreview($latestContent);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($latestContent)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							if($content = $document->getContentByVersion($st['version'])) {
+								print "<tr>\n";
+								$previewer->createPreview($content);
+								print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
+								if($previewer->hasPreview($content)) {
+									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+								} else {
+									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+								}
+								print "</a></td>";
+								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
+								print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
+								print "<td>".$st["version"]."</td>";
+								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"])."</td>";
+								print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
+								print "</tr>\n";
 							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"])."</td>";
-							print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
-							print "</tr>\n";
 						}
 					}
 					if (!$printheader){
@@ -487,22 +495,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							}
 						}
 					
-						print "<tr>\n";
-						$latestContent = $document->getLatestContent();
-						$previewer->createPreview($latestContent);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-						if($previewer->hasPreview($latestContent)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						if($content = $document->getContentByVersion($res['version'])) {
+							print "<tr>\n";
+							$previewer->createPreview($content);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+							if($previewer->hasPreview($content)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+							print "<td>".getOverallStatusText($res["status"])."</td>";
+							print "<td>".$res["version"]."</td>";
+							print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+							print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+							print "</tr>\n";
 						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-						print "<td>".getOverallStatusText($res["status"])."</td>";
-						print "<td>".$res["version"]."</td>";
-						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-						print "</tr>\n";
 					}		
 					print "</tbody></table>";	
 					
@@ -561,22 +570,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							$printheader=false;
 						}
 					
-						print "<tr>\n";
-						$latestContent = $document->getLatestContent();
-						$previewer->createPreview($latestContent);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($latestContent)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						if($content = $document->getContentByVersion($st['version'])) {
+							print "<tr>\n";
+							$previewer->createPreview($content);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+							if($previewer->hasPreview($content)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+							print "<td>".$st["version"]."</td>";
+							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
+							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+							print "</tr>\n";
 						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
 					}
 				}
 				foreach ($revisionStatus["grpstatus"] as $st) {
@@ -598,22 +608,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							$printheader=false;
 						}
 
-						print "<tr>\n";
-						$latestContent = $document->getLatestContent();
-						$previewer->createPreview($latestContent);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($latestContent)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						if($content = $document->getContentByVersion($st['version'])) {
+							print "<tr>\n";
+							$previewer->createPreview($content);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+							if($previewer->hasPreview($content)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+							print "<td>".$st["version"]."</td>";
+							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+							print "</tr>\n";
 						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
 					}
 				}
 				if (!$printheader){
@@ -677,22 +688,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							$printheader=false;
 						}
 					
-						print "<tr>\n";
-						$latestContent = $document->getLatestContent();
-						$previewer->createPreview($latestContent);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($latestContent)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						if($content = $document->getContentByVersion($st['version'])) {
+							print "<tr>\n";
+							$previewer->createPreview($content);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+							if($previewer->hasPreview($content)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+							print "<td>".$st["version"]."</td>";
+							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
+							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+							print "</tr>\n";
 						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
 					}
 				}
 				foreach ($receiptStatus["grpstatus"] as $st) {
@@ -714,22 +726,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							$printheader=false;
 						}
 
-						print "<tr>\n";
-						$latestContent = $document->getLatestContent();
-						$previewer->createPreview($latestContent);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($latestContent)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						if($content = $document->getContentByVersion($st['version'])) {
+							print "<tr>\n";
+							$previewer->createPreview($content);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+							if($previewer->hasPreview($content)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+							print "<td>".$st["version"]."</td>";
+							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+							print "</tr>\n";
 						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
 					}
 				}
 				if (!$printheader){
@@ -782,22 +795,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						}
 					}
 				
-					print "<tr>\n";
-					$latestContent = $document->getLatestContent();
-					$previewer->createPreview($latestContent);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($latestContent)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					if($content = $document->getContentByVersion($res['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+						print "<td>".getOverallStatusText($res["status"])."</td>";
+						print "<td>".$res["version"]."</td>";
+						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+						print "</tr>\n";
 					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
 				}		
 				print "</tbody></table>";	
 				
@@ -837,22 +851,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						}
 					}
 				
-					print "<tr>\n";
-					$latestContent = $document->getLatestContent();
-					$previewer->createPreview($latestContent);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($latestContent)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					if($content = $document->getContentByVersion($res['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+						print "<td>".getOverallStatusText($res["status"])."</td>";
+						print "<td>".$res["version"]."</td>";
+						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+						print "</tr>\n";
 					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
 				}		
 				print "</tbody></table>";	
 				
@@ -894,22 +909,23 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						}
 					}
 				
-					print "<tr>\n";
-					$latestContent = $document->getLatestContent();
-					$previewer->createPreview($latestContent);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($latestContent)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					if($content = $document->getContentByVersion($res['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+						print "<td>".getOverallStatusText($res["status"])."</td>";
+						print "<td>".$res["version"]."</td>";
+						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+						print "</tr>\n";
 					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
 				}		
 				print "</tbody></table>";	
 				
@@ -956,23 +972,24 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						}
 					}
 				
-					print "<tr>\n";
-					$latestContent = $document->getLatestContent();
-					$previewer->createPreview($latestContent);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($latestContent)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					if($content = $document->getContentByVersion($res['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+						print "<td>".getOverallStatusText($res["status"])."</td>";
+						print "<td>".$res["version"]."</td>";
+						print "<td>".$res["statusDate"]." ". htmlspecialchars($res["statusName"])."</td>";
+						//print "<td>".(!$res["expires"] ? getMLText("does_not_expire"):getReadableDate($res["expires"]))."</td>";				
+						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+						print "</tr>\n";
 					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ". htmlspecialchars($res["statusName"])."</td>";
-					//print "<td>".(!$res["expires"] ? getMLText("does_not_expire"):getReadableDate($res["expires"]))."</td>";				
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
 				}
 				print "</tbody></table>";
 			}

From 51ca23085aaef863f171ca14141e0e8f4933d7f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Apr 2016 18:16:24 +0200
Subject: [PATCH 0519/2006] fix some html markup

---
 views/bootstrap/class.ViewDocument.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 845fb01de..eb6dcc648 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -502,7 +502,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 			}
 		}
-		print "</ul>\n";
+		print "</ul></td>\n";
 
 //		print "<td>".htmlspecialchars($latestContent->getComment())."</td>";
 
@@ -693,7 +693,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 
 				print "</ul></td>\n";	
-				print "</td>\n</tr>\n";
+				print "</tr>\n";
 			}
 		}
 
@@ -763,7 +763,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 				print "</ul>";
 				print "</td>\n";	
-				print "</td>\n</tr>\n";
+				print "</tr>\n";
 			}
 		}
 
@@ -1047,7 +1047,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 
 				print "</ul></td>\n";	
-				print "</td>\n</tr>\n";
+				print "</tr>\n";
 			}
 ?>
 		</table>
@@ -1157,7 +1157,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 
 				print "</ul></td>\n";	
-				print "</td>\n</tr>\n";
+				print "</tr>\n";
 			}
 ?>
 		</table>
@@ -1329,7 +1329,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$responsibleUser->getEmail()."\">".htmlspecialchars($responsibleUser->getFullName())."</a></li>";
 				print "<li>".getLongReadableDate($file->getDate())."</li>";
-
+				print "</ul></td>";
 				print "<td>".htmlspecialchars($file->getComment())."</td>";
 			
 				print "<td><ul class=\"unstyled actions\">";

From 979b15a8faa800177ba51ed3fe0f6442771864f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 May 2016 07:47:29 +0200
Subject: [PATCH 0520/2006] set $accessop from view

---
 views/bootstrap/class.AttributeMgr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index ac0a7fdbc..67fcc2703 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -249,6 +249,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$attrdefs = $this->params['attrdefs'];
 		$selattrdef = $this->params['selattrdef'];
+		$accessop = $this->params['accessobject'];
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 

From 1b0a972cdda01f7a55ddecec6c804efac961ba5f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 23 May 2016 13:43:18 +0200
Subject: [PATCH 0521/2006] set notes for 5.1.1

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index fc61e5ceb..f7246181e 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+sync with application
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From a32a5c929a8a0d17e132ba2a5b0da80746a1a5aa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2016 19:24:43 +0200
Subject: [PATCH 0522/2006] treat empty attribute value as no value in
 validate()

---
 SeedDMS_Core/Core/inc.ClassAttribute.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index e718e3820..0d9ac5c04 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -863,8 +863,10 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 				$values = explode($attrvalue[0], substr($attrvalue, 1));
 			else
 				$values = $attrvalue;
-		} else {
+		} elseif($attrvalue) {
 			$values = array($attrvalue);
+		} else {
+			$values = array();
 		}
 
 		$this->_validation_error = 0;

From 4fe01ebbfdd827da1fcbb8b9b1652bf96c91a6c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2016 19:25:27 +0200
Subject: [PATCH 0523/2006] take out old code

---
 op/op.UpdateDocument.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 7072bca65..41b8417a7 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -249,21 +249,6 @@ if ($_FILES['userfile']['error'] == 0) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 					}
 				}
-				/*
-				if($attrdef->getRegex()) {
-					if(!preg_match($attrdef->getRegex(), $attribute)) {
-						UI::exitError(getMLText("document_title", array("documentname" => $folder->getName())),getMLText("attr_no_regex_match"));
-					}
-				}
-				if(is_array($attribute)) {
-					if($attrdef->getMinValues() > count($attribute)) {
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
-					}
-					if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
-					}
-				}
-				 */
 			} elseif($attrdef->getMinValues() > 0) {
 				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 			}

From 21c1d1b7b9f57e5dfda5f7197d23c5b5a9a805b0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2016 19:25:55 +0200
Subject: [PATCH 0524/2006] check for min values of attribute

---
 op/op.EditDocument.php | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index ebfb8cb84..79d7d8e04 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -280,31 +280,19 @@ if($attributes) {
 					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 				}
 			}
-			/*
-			if($attrdef->getRegex()) {
-				if(!preg_match($attrdef->getRegex(), $attribute)) {
-					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_no_regex_match"));
-				}
-			}
-			if(is_array($attribute)) {
-				if($attrdef->getMinValues() > count($attribute)) {
-					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
-				}
-				if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
-					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
-				}
-			}
-			 */
 			if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
 				if(!$document->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute))
 					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 			}
+		} elseif($attrdef->getMinValues() > 0) {
+			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 		} elseif(isset($oldattributes[$attrdefid])) {
 			if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid)))
 				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 		}
 	}
 }
+
 foreach($oldattributes as $attrdefid=>$oldattribute) {
 	if(!isset($attributes[$attrdefid])) {
 		if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid)))

From de793abb7b05fdc5a5a9804ae6af8ddc3fc2ffd6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2016 19:26:19 +0200
Subject: [PATCH 0525/2006] use SeedDMS_Core_Attribute->validate()

---
 op/op.AddDocument.php    | 28 ++++++++++++++++++----------
 op/op.EditAttributes.php | 30 +++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 739dce85b..3e0cbde72 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -82,17 +82,25 @@ else
 foreach($attributes as $attrdefid=>$attribute) {
 	$attrdef = $dms->getAttributeDefinition($attrdefid);
 	if($attribute) {
-		if($attrdef->getRegex()) {
-			if(!preg_match($attrdef->getRegex(), $attribute)) {
-				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_no_regex_match"));
-			}
-		}
-		if(is_array($attribute)) {
-			if($attrdef->getMinValues() > count($attribute)) {
-				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
-			}
-			if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
+		if(!$attrdef->validate($attribute)) {
+			switch($attrdef->getValidationError()) {
+			case 5:
+				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_malformed_email", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
+				break;
+			case 4:
+				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_malformed_url", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
+				break;
+			case 3:
+				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_no_regex_match", array("attrname"=>$attrdef->getName(), "value"=>$attribute, "regex"=>$attrdef->getRegex())));
+				break;
+			case 2:
 				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
+				break;
+			case 1:
+				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
+				break;
+			default:
+				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
 			}
 		}
 	} elseif($attrdef->getMinValues() > 0) {
diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php
index 607f7ff3f..90d9c9c2b 100644
--- a/op/op.EditAttributes.php
+++ b/op/op.EditAttributes.php
@@ -65,17 +65,25 @@ if($attributes) {
 	foreach($attributes as $attrdefid=>$attribute) {
 		$attrdef = $dms->getAttributeDefinition($attrdefid);
 		if($attribute) {
-			if($attrdef->getRegex()) {
-				if(!preg_match($attrdef->getRegex(), $attribute)) {
-					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_no_regex_match"));
-				}
-				if(is_array($attribute)) {
-					if($attrdef->getMinValues() > count($attribute)) {
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
-					}
-					if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
-					}
+			if(!$attrdef->validate($attribute)) {
+				switch($attrdef->getValidationError()) {
+				case 5:
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_malformed_email", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
+					break;
+				case 4:
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_malformed_url", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
+					break;
+				case 3:
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_no_regex_match", array("attrname"=>$attrdef->getName(), "value"=>$attribute, "regex"=>$attrdef->getRegex())));
+					break;
+				case 2:
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
+					break;
+				case 1:
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
+					break;
+				default:
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 				}
 			}
 			if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {

From 95b332586c934e90df75078045c752251af5c9e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2016 20:24:49 +0200
Subject: [PATCH 0526/2006] add initial roles

---
 install/create_tables-innodb.sql  | 3 +++
 install/create_tables-sqlite3.sql | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 83af2822f..63dccca0d 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -932,6 +932,9 @@ CREATE TABLE `tblVersion` (
 -- Initial content for database
 --
 
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
 INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Administrator', 'address@server.com', '', '', '', 1, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
 INSERT INTO tblUsers VALUES (2, 'guest', NULL, 'Guest User', NULL, '', '', '', 2, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
 INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', UNIX_TIMESTAMP(), 1, 0, 2, 0);
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 1bd57c948..ad0720acf 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -796,6 +796,9 @@ CREATE TABLE `tblVersion` (
 -- Initial content for database
 --
 
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
 INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0, 0);
 INSERT INTO tblUsers VALUES (2, 'guest', NULL, 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0, 0);
 INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', strftime('%s','now'), 1, 0, 2, 0);

From 50a837a05d0cb069ea44a709de430d15c143ee41 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2016 20:34:14 +0200
Subject: [PATCH 0527/2006] check if $settings->_converters['preview'] is set

---
 views/bootstrap/class.Settings.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index e84f61b33..38cff7419 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -713,13 +713,15 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr ><td><b> <?php printMLText("preview_converters");?></b></td> </tr>
 <?php
-	foreach($settings->_converters['preview'] as $mimetype=>$cmd) {
+	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>
       </tr>
 <?php
+		}
 	}
 ?>
       <tr title="">

From 21b053cd0d26d3cc6c5e183ce59914a014b9d82b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2016 20:34:29 +0200
Subject: [PATCH 0528/2006] propperly get enableAcknowledgeWorkflow and
 enableRevisionWorkflow

---
 op/op.Settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index 02647794f..f840d49d9 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -158,8 +158,8 @@ if ($action == "saveSettings")
   $settings->_presetExpirationDate = $_POST["presetExpirationDate"];
   $settings->_initialDocumentStatus = $_POST["initialDocumentStatus"];
   $settings->_workflowMode = $_POST["workflowMode"];
-  $settings->_enableAcknowledgeWorkflow = $_POST["enableAcknowledgeWorkflow"];
-  $settings->_enableRevisionWorkflow = $_POST["enableRevisionWorkflow"];
+  $settings->_enableAcknowledgeWorkflow = getBoolValue("enableAcknowledgeWorkflow");
+  $settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow");
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
   $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp");

From 1544912dbca0f734cd2b9a3ae4cab32c3aa5a65b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2016 20:41:36 +0200
Subject: [PATCH 0529/2006] fix access checking

---
 out/out.ClearCache.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/out/out.ClearCache.php b/out/out.ClearCache.php
index 6d96b7e8b..8fadce8ff 100644
--- a/out/out.ClearCache.php
+++ b/out/out.ClearCache.php
@@ -27,14 +27,16 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
 
-if (!$user->isAdmin()) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From d064d24903fc5ec68f064cf15034e0e0d54942c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 13:00:30 +0200
Subject: [PATCH 0530/2006] include ../inc/inc.ClassAccessOperation.php

---
 out/out.ImportFS.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.ImportFS.php b/out/out.ImportFS.php
index 34efd520c..d617bf059 100644
--- a/out/out.ImportFS.php
+++ b/out/out.ImportFS.php
@@ -23,6 +23,7 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));

From 303a114178fffb3550fbe0330a593f3c0ff92eb9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 22:24:50 +0200
Subject: [PATCH 0531/2006] add field 'secret' for secret of 2-factor auth

---
 SeedDMS_Core/Core/inc.ClassUser.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 1f77848b6..3dbe76a08 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -261,6 +261,13 @@ class SeedDMS_Core_User { /* {{{ */
 	 */
 	var $_pwd;
 
+	/**
+	 * @var string secret of user for 2-factor authentication
+	 *
+	 * @access protected
+	 */
+	var $_secret;
+
 	/**
 	 * @var string date when password expires
 	 *
@@ -365,7 +372,7 @@ class SeedDMS_Core_User { /* {{{ */
 	const role_admin = '1';
 	const role_guest = '2';
 
-	function __construct($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0, $isDisabled=0, $pwdExpiration='0000-00-00 00:00:00', $loginFailures=0, $quota=0, $homeFolder=null) {
+	function __construct($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0, $isDisabled=0, $pwdExpiration='0000-00-00 00:00:00', $loginFailures=0, $quota=0, $homeFolder=null, $secret='') {
 		$this->_id = $id;
 		$this->_login = $login;
 		$this->_pwd = $pwd;
@@ -381,6 +388,7 @@ class SeedDMS_Core_User { /* {{{ */
 		$this->_loginFailures = $loginFailures;
 		$this->_quota = $quota;
 		$this->_homeFolder = $homeFolder;
+		$this->_secret = $secret;
 		$this->_substitutes = null;
 		$this->_rev_substitutes = null;
 		$this->_dms = null;
@@ -423,7 +431,7 @@ class SeedDMS_Core_User { /* {{{ */
 		$classname = $dms->getClassname('role');
 		$role = $classname::getInstance($resArr['role'], $dms);
 
-		$user = new self($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $role, $resArr["hidden"], $resArr["disabled"], $resArr["pwdExpiration"], $resArr["loginfailures"], $resArr["quota"], $resArr["homefolder"]);
+		$user = new self($resArr["id"], $resArr["login"], $resArr["pwd"], $resArr["fullName"], $resArr["email"], $resArr["language"], $resArr["theme"], $resArr["comment"], $role, $resArr["hidden"], $resArr["disabled"], $resArr["pwdExpiration"], $resArr["loginfailures"], $resArr["quota"], $resArr["homefolder"], $resArr["secret"]);
 		$user->setDMS($dms);
 		return $user;
 	} /* }}} */
@@ -501,6 +509,20 @@ class SeedDMS_Core_User { /* {{{ */
 		return true;
 	} /* }}} */
 
+	function getSecret() { return $this->_secret; }
+
+	function setSecret($newSecret) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "UPDATE tblUsers SET secret =".$db->qstr($newSecret)." WHERE id = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_secret = $newSecret;
+		return true;
+	} /* }}} */
+
 	function getPwdExpiration() { return $this->_pwdExpiration; }
 
 	function setPwdExpiration($newPwdExpiration) { /* {{{ */

From 825ef2898b93f192b18c09ae05a756a437c9e049 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 22:25:43 +0200
Subject: [PATCH 0532/2006] add enable2FactorAuthentication

---
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 3b8a560f5..20431d852 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -40,6 +40,8 @@ class Settings { /* {{{ */
 	var $_enableGuestLogin = false;
 	// If you even want guest to be logged in automatically, set the following to true
 	var $_enableGuestAutoLogin = false;
+	// Set to true for 2-factor Authentication
+	var $_enable2FactorAuthentication = false;
 	// Allow users to reset their password
 	var $_enablePasswordForgotten = false;
 	// Minimum password strength (0 - x, 0 means no check)
@@ -446,6 +448,7 @@ class Settings { /* {{{ */
 		$tab = $node[0]->attributes();
 		$this->_enableGuestLogin = Settings::boolVal($tab["enableGuestLogin"]);
 		$this->_enableGuestAutoLogin = Settings::boolVal($tab["enableGuestAutoLogin"]);
+		$this->_enable2FactorAuthentication = Settings::boolVal($tab["enable2FactorAuthentication"]);
 		$this->_enablePasswordForgotten = Settings::boolVal($tab["enablePasswordForgotten"]);
 		$this->_passwordStrength = intval($tab["passwordStrength"]);
 		$this->_passwordStrengthAlgorithm = strval($tab["passwordStrengthAlgorithm"]);
@@ -764,6 +767,7 @@ class Settings { /* {{{ */
     $node = $this->getXMLNode($xml, '/configuration/system', 'authentication');
     $this->setXMLAttributValue($node, "enableGuestLogin", $this->_enableGuestLogin);
     $this->setXMLAttributValue($node, "enableGuestAutoLogin", $this->_enableGuestAutoLogin);
+    $this->setXMLAttributValue($node, "enable2FactorAuthentication", $this->_enable2FactorAuthentication);
     $this->setXMLAttributValue($node, "enablePasswordForgotten", $this->_enablePasswordForgotten);
     $this->setXMLAttributValue($node, "passwordStrength", $this->_passwordStrength);
     $this->setXMLAttributValue($node, "passwordStrengthAlgorithm", $this->_passwordStrengthAlgorithm);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index f840d49d9..7d550ab91 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -112,6 +112,7 @@ if ($action == "saveSettings")
   // SETTINGS - SYSTEM - AUTHENTICATION
   $settings->_enableGuestLogin = getBoolValue("enableGuestLogin");
   $settings->_enableGuestAutoLogin = getBoolValue("enableGuestAutoLogin");
+  $settings->_enable2FactorAuthentication = getBoolValue("enable2FactorAuthentication");
   $settings->_restricted = getBoolValue("restricted");
   $settings->_enableUserImage = getBoolValue("enableUserImage");
   $settings->_disableSelfEdit = getBoolValue("disableSelfEdit");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 38cff7419..9b7cf4274 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -411,6 +411,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableGuestAutoLogin");?>:</td>
         <td><input name="enableGuestAutoLogin" type="checkbox" <?php if ($settings->_enableGuestAutoLogin) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enable2FactorAuthentication");?>">
+        <td><?php printMLText("settings_enable2FactorAuthentication");?>:</td>
+        <td><input name="enable2FactorAuthentication" type="checkbox" <?php if ($settings->_enable2FactorAuthentication) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_restricted_desc");?>">
         <td><?php printMLText("settings_restricted");?>:</td>
         <td><input name="restricted" type="checkbox" <?php if ($settings->_restricted) echo "checked" ?> /></td>

From 4d7f228a4c46e62f52618f4ea3876f2ec42ee12b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 22:25:59 +0200
Subject: [PATCH 0533/2006] add field secret to tblUsers

---
 install/create_tables-innodb.sql        | 1 +
 install/create_tables-sqlite3.sql       | 1 +
 install/update-5.1.0/update-sqlite3.sql | 2 ++
 install/update-5.1.0/update.sql         | 1 +
 4 files changed, 5 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 63dccca0d..8e2f760a0 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -69,6 +69,7 @@ CREATE TABLE `tblUsers` (
   `id` int(11) NOT NULL auto_increment,
   `login` varchar(50) default NULL,
   `pwd` varchar(50) default NULL,
+  `secret` varchar(50) default NULL,
   `fullName` varchar(100) default NULL,
   `email` varchar(70) default NULL,
   `language` varchar(32) NOT NULL,
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index ad0720acf..ff2e825b8 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -65,6 +65,7 @@ CREATE TABLE `tblUsers` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `login` varchar(50) default NULL,
   `pwd` varchar(50) default NULL,
+  `secret` varchar(50) default NULL,
   `fullName` varchar(100) default NULL,
   `email` varchar(70) default NULL,
   `language` varchar(32) NOT NULL,
diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index 9ddf1f026..b33caa4a4 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -2,6 +2,8 @@ BEGIN;
 
 ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` TEXT NOT NULL default '0000-00-00 00:00:00';
 
+ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL;
+
 CREATE TABLE `tblUserSubstitutes` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `user` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index a68b965e9..73ce5b54d 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -2,6 +2,7 @@ START TRANSACTION;
 
 ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` datetime default NULL;
 
+ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL AFTER `pwd`;
 
 CREATE TABLE `tblUserSubstitutes` (
   `id` int(11) NOT NULL auto_increment,

From 7f9f118fba9d00d284aeb85d4de7e4459f0ebbc6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2016 22:26:23 +0200
Subject: [PATCH 0534/2006] add qrcode and secret for 2-factor auth

---
 views/bootstrap/class.MyAccount.php | 40 +++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/views/bootstrap/class.MyAccount.php b/views/bootstrap/class.MyAccount.php
index a999e3134..bbc51152d 100644
--- a/views/bootstrap/class.MyAccount.php
+++ b/views/bootstrap/class.MyAccount.php
@@ -31,6 +31,18 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_MyAccount extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+?>
+$(document).ready( function() {
+	$('#qrcode').hide();
+	$( "#toggleqrcode" ).click(function() {
+		$('#qrcode').toggle();
+	});
+});
+<?php
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -63,6 +75,20 @@ class SeedDMS_View_MyAccount extends SeedDMS_Bootstrap_Style {
 			echo "<div class=\"span12\">\n";
 		}
 
+		require "vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php";
+		require "vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php";
+		require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php";
+		require "vendor/robthree/twofactorauth/lib/Providers/Rng/IRNGProvider.php";
+		require "vendor/robthree/twofactorauth/lib/Providers/Rng/MCryptRNGProvider.php";
+		require "vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php";
+		require "vendor/robthree/twofactorauth/lib/TwoFactorAuth.php";
+		$tfa = new \RobThree\Auth\TwoFactorAuth('MyApp');
+
+		if($secret = $user->getSecret()) {
+		} else {
+			$secret = $tfa->createSecret();
+			$user->setSecret($secret);
+		}
 		print "<table class=\"table-condensed\">\n";
 		print "<tr>\n";
 		print "<td>".getMLText("name")." : </td>\n";
@@ -111,8 +137,22 @@ class SeedDMS_View_MyAccount extends SeedDMS_Bootstrap_Style {
 <?php
 			print "</td>\n";
 			print "</tr>\n";
+			print "<tr>\n";
+			print "<td>\n";
+			echo getMLText('2_factor_auth');
+			print "</td>\n";
+			print "<td>\n";
+			echo '<button class="btn btn-default" id="toggleqrcode">'.getMLText('toggle_qrcode').'</button>';
+			echo '<div id="qrcode">';
+			echo 'Code is: '.$code = $tfa->getCode($secret)."<br />";
+			echo 'Secret: '.$secret."<br />";
+			echo '<img src="' . $tfa->getQRCodeImageAsDataUri('My label', $secret) . '">';
+			echo "</div>";
+			print "</td>\n";
+			print "</tr>\n";
 		}
 		print "</table>\n";
+
 		print "</div>\n";
 		print "</div>\n";
 

From 2bc217b15635e06e10069c190204bb035d7863e7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Jul 2016 17:39:10 +0200
Subject: [PATCH 0535/2006] add files for 2 factor authentication

---
 op/op.Setup2Factor.php                 |  40 +++++++++
 out/out.Setup2Factor.php               |  36 ++++++++
 views/bootstrap/class.Setup2Factor.php | 119 +++++++++++++++++++++++++
 3 files changed, 195 insertions(+)
 create mode 100644 op/op.Setup2Factor.php
 create mode 100644 out/out.Setup2Factor.php
 create mode 100644 views/bootstrap/class.Setup2Factor.php

diff --git a/op/op.Setup2Factor.php b/op/op.Setup2Factor.php
new file mode 100644
index 000000000..83af009f4
--- /dev/null
+++ b/op/op.Setup2Factor.php
@@ -0,0 +1,40 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2009-2012 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassPasswordStrength.php");
+include("../inc/inc.ClassPasswordHistoryManager.php");
+
+if ($user->isGuest()) {
+	UI::exitError(getMLText("2_fact_auth"),getMLText("access_denied"));
+}
+
+$secret = $_POST["secret"];
+
+$user->setSecret($secret);
+
+header("Location:../out/out.Setup2Factor.php");
diff --git a/out/out.Setup2Factor.php b/out/out.Setup2Factor.php
new file mode 100644
index 000000000..8f2362731
--- /dev/null
+++ b/out/out.Setup2Factor.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Setup 2-factor authentication
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
+if ($user->isGuest()) {
+	UI::exitError(getMLText("2_factor_auth"),getMLText("access_denied"));
+}
+
+if($view) {
+	$view->setParam('enable2factauth', $settings->_enable2FactorAuthentication);
+	$view->setParam('accessobject', $accessop);
+	$view($_GET);
+	exit;
+}
+
diff --git a/views/bootstrap/class.Setup2Factor.php b/views/bootstrap/class.Setup2Factor.php
new file mode 100644
index 000000000..5060d0294
--- /dev/null
+++ b/views/bootstrap/class.Setup2Factor.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Implementation of Setup2Factor view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Include classes for 2-factor authentication
+ */
+require "vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php";
+require "vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php";
+require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php";
+require "vendor/robthree/twofactorauth/lib/Providers/Rng/IRNGProvider.php";
+require "vendor/robthree/twofactorauth/lib/Providers/Rng/MCryptRNGProvider.php";
+require "vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php";
+require "vendor/robthree/twofactorauth/lib/TwoFactorAuth.php";
+
+/**
+ * Class which outputs the html page for ForcePasswordChange view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_Setup2Factor extends SeedDMS_Bootstrap_Style {
+
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+?>
+function checkForm()
+{
+	msg = new Array();
+
+	if($("#currentpwd").val() == "") msg.push("<?php printMLText("js_no_pwd");?>");
+	if($("#pwd").val() == "") msg.push("<?php printMLText("js_no_pwd");?>");
+	if($("#pwd").val() != $("#pwdconf").val()) msg.push("<?php printMLText("js_pwd_not_conf");?>");
+	if (msg != "") {
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+
+$(document).ready( function() {
+	$('body').on('submit', '#form', function(ev){
+		if(checkForm()) return;
+		ev.preventDefault();
+	});
+});
+<?php
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$this->htmlStartPage(getMLText("2_factor_auth"), "forcepasswordchange");
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_account"), "my_account");
+		$this->contentHeading(getMLText('2_factor_auth'));
+		echo "<div class=\"alert\">".getMLText('2_factor_auth_info')."</div>";
+		echo '<div class="row-fluid">';
+		$this->contentContainerStart('span6');
+
+		$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
+		$oldsecret = $user->getSecret();
+		$secret = $tfa->createSecret();
+?>
+<form class="form-horizontal" action="../op/op.Setup2Factor.php" method="post" id="form" name="form1">
+		<div class="control-group"><label class="control-label"><?php printMLText('2_fact_auth_secret'); ?></label><div class="controls">
+		<input id="secret" class="secret" type="text" name="secret" size="30" value="<?php echo $secret; ?>"><br />
+		</div></div>
+		<div class="control-group"><label class="control-label"></label><div class="controls">
+		<img src="<?php echo $tfa->getQRCodeImageAsDataUri('My label', $secret); ?>">
+		</div></div>
+		<div class="control-group"><label class="control-label"></label><div class="controls">
+		<input class="btn" type="submit" value="<?php printMLText("submit_2_fact_auth") ?>"><br />
+		</div></div>
+</form>
+<?php
+		if($oldsecret) {
+			$this->contentContainerEnd();
+			$this->contentContainerStart('span6');
+			echo '<div>'.$oldsecret.'</div>';
+			echo '<div><img src="'.$tfa->getQRCodeImageAsDataUri('My label', $oldsecret).'"></div>';
+?>
+<?php
+		}
+
+		$this->contentContainerEnd();
+		echo '</div>';
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From b8b1996fb4eca6a4f1272006d3ee30cb629846ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Jul 2016 17:40:54 +0200
Subject: [PATCH 0536/2006] redirekt to out/out.Setup2Auth.php if 2-fact-auth
 isn't setup

make sure user has not been substituted for setting up 2-fact-auth
or password change
---
 inc/inc.Authentication.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 6b2f86051..0ddbc4d7e 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -81,8 +81,10 @@ if (!is_object($user)) {
 	exit;
 }
 
+$origuser = null;
 if($resArr["su"] && $su = $dms->getUser($resArr["su"])) {
 	if($user->isAdmin() || $user->maySwitchToUser($su)) {
+		$origuser = $user;
 		$user = $su;
 	} else {
 		$session->resetSu();
@@ -127,10 +129,10 @@ if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $lang . "/la
 /* Check if password needs to be changed because it expired. If it needs
  * to be changed redirect to out/out.ForcePasswordChange.php. Do this
  * check only if password expiration is turned on, we are not on the
- * page to change the password or the page that changes the password, and
- * it is not admin */
+ * page to change the password or the page that changes the password, the
+ * current user is not admin, and no user substiation has occured. */
 
-if (!$user->isAdmin()) {
+if (!$user->isAdmin() && $origuser == null) {
 	if($settings->_passwordExpiration > 0) {
 		if(basename($_SERVER['SCRIPT_NAME']) != 'out.ForcePasswordChange.php' && basename($_SERVER['SCRIPT_NAME']) != 'op.EditUserData.php') {
 			$pwdexp = $user->getPwdExpiration();
@@ -145,6 +147,17 @@ if (!$user->isAdmin()) {
 	}
 }
 
+/* Check if secret is set for 2-factor authentication. Redirect to Setup2Factor.php
+ * if secret is not set and 2-factor authentication is turned on. Also check if
+ * already on the page Setup2Factor.php and no user substiation has occured.
+ */
+if($settings->_enable2FactorAuthentication && $origuser == null && $user->getSecret() == '') {
+	if(basename($_SERVER['SCRIPT_NAME']) != 'out.Setup2Factor.php') {
+		header("Location: ../out/out.Setup2Factor.php");
+		exit;
+	}
+}
+
 /* Update cookie lifetime */
 if($settings->_cookieLifetime) {
 	$lifetime = time() + intval($settings->_cookieLifetime);

From b5b9a5eac3b6162c2b77b3a81c551f33a4d18e5e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Jul 2016 17:42:39 +0200
Subject: [PATCH 0537/2006] check code from google authenticator

---
 op/op.Login.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/op/op.Login.php b/op/op.Login.php
index 2eae79ce8..61022c92e 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -227,6 +227,23 @@ if (is_bool($user)) {
 		exit;
 	}
 
+	if($settings->_enable2FactorAuthentication) {
+		if($secret = $user->getSecret()) {
+			require "vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php";
+			require "vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php";
+			require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php";
+			require "vendor/robthree/twofactorauth/lib/Providers/Rng/IRNGProvider.php";
+			require "vendor/robthree/twofactorauth/lib/Providers/Rng/MCryptRNGProvider.php";
+			require "vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php";
+			require "vendor/robthree/twofactorauth/lib/TwoFactorAuth.php";
+			$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
+			if($tfa->verifyCode($secret, $_POST['twofactauth']) !== true) {
+				_printMessage(getMLText("login_error_title"),	getMLText("login_error_text"));
+				exit;
+			}
+		}
+	}
+
 	/* Clear login failures if login was successful */
 	$user->clearLoginFailures();
 

From e68a7b82b3ed310a9407fc66064a10ac86d6133e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Jul 2016 17:43:27 +0200
Subject: [PATCH 0538/2006] pass enable2fact to view

---
 out/out.Login.php     | 1 +
 out/out.MyAccount.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/out/out.Login.php b/out/out.Login.php
index b0463848d..72c44094f 100644
--- a/out/out.Login.php
+++ b/out/out.Login.php
@@ -48,6 +48,7 @@ if($view) {
 	$view->setParam('languages', getLanguages());
 	$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
 	$view->setParam('enablethemeselector', $settings->_enableThemeSelector);
+	$view->setParam('enable2factauth', $settings->_enable2FactorAuthentication);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.MyAccount.php b/out/out.MyAccount.php
index e5d8fe9d5..df1a51360 100644
--- a/out/out.MyAccount.php
+++ b/out/out.MyAccount.php
@@ -39,6 +39,7 @@ if($view) {
 	$view->setParam('passwordexpiration', $settings->_passwordExpiration);
 	$view->setParam('httproot', $settings->_httpRoot);
 	$view->setParam('quota', $settings->_quota);
+	$view->setParam('enable2factauth', $settings->_enable2FactorAuthentication);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;

From 420586ea0a398abac9344827960366f96dcf13bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Jul 2016 17:43:51 +0200
Subject: [PATCH 0539/2006] add out/out.Setup2Factor.php to menu

---
 views/bootstrap/class.Bootstrap.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 0cc2651b3..a98678637 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -645,6 +645,8 @@ $(document).ready(function () {
 
 		echo "<li><a href=\"../out/out.ManageNotify.php\">".getMLText("edit_existing_notify")."</a></li>\n";
 
+		echo "<li><a href=\"../out/out.Setup2Factor.php\">".getMLText("2_factor_auth")."</a></li>\n";
+
 		if ($this->params['enableusersview']){
 			echo "<li><a href=\"../out/out.UsrView.php\">".getMLText("users")."</a></li>\n";
 			echo "<li><a href=\"../out/out.GroupView.php\">".getMLText("groups")."</a></li>\n";

From 4230df3c884841f317de44fc8cd97e3be5170c30 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Jul 2016 17:44:56 +0200
Subject: [PATCH 0540/2006] add input field for 2-fact-auth code

---
 views/bootstrap/class.Login.php | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index 57e4ac132..e9ab3a0e6 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -89,6 +89,7 @@ $(document).ready( function() {
 		$languages = $this->params['languages'];
 		$enableLanguageSelector = $this->params['enablelanguageselector'];
 		$enableThemeSelector = $this->params['enablethemeselector'];
+		$enable2factauth = $this->params['enable2factauth'];
 
 		$this->htmlStartPage(getMLText("sign_in"), "login");
 		$this->globalBanner();
@@ -114,7 +115,28 @@ $(document).ready( function() {
 			<input type="Password" id="pwd" name="pwd">
 		</div>
 	</div>
-<?php if($enableLanguageSelector) { ?>
+<?php if($enable2factauth) { ?>
+<?php
+			require "vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php";
+			require "vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php";
+			require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php";
+			require "vendor/robthree/twofactorauth/lib/Providers/Rng/IRNGProvider.php";
+			require "vendor/robthree/twofactorauth/lib/Providers/Rng/MCryptRNGProvider.php";
+			require "vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php";
+			require "vendor/robthree/twofactorauth/lib/TwoFactorAuth.php";
+			$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
+//			echo $tfa->getCode('33V4QBXEZH2W7XPN');
+?>
+	<div class="control-group">
+		<label class="control-label" for="pwd"><?php printMLText("2_factor_auth");?>:</label>
+		<div class="controls">
+			<input type="Password" id="twofactauth" name="twofactauth" value="<?php //echo $tfa->getCode('NO3BORB54YPCJMQX'); ?>">
+		</div>
+	</div>
+<?php
+	}
+	if($enableLanguageSelector) {
+?>
 	<div class="control-group">
 		<label class="control-label" for="pwd"><?php printMLText("language");?>:</label>
 		<div class="controls">

From 65ec97c2ac2850ad0ad9de2a08aebca4e30fbf03 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Jul 2016 17:46:08 +0200
Subject: [PATCH 0541/2006] show 2-fact-auth qrcode

---
 views/bootstrap/class.MyAccount.php | 59 ++++++++++++++++-------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/views/bootstrap/class.MyAccount.php b/views/bootstrap/class.MyAccount.php
index bbc51152d..6417f8896 100644
--- a/views/bootstrap/class.MyAccount.php
+++ b/views/bootstrap/class.MyAccount.php
@@ -48,6 +48,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$enableuserimage = $this->params['enableuserimage'];
 		$passwordexpiration = $this->params['passwordexpiration'];
+		$enable2factauth = $this->params['enable2factauth'];
 		$httproot = $this->params['httproot'];
 		$quota = $this->params['quota'];
 
@@ -75,20 +76,6 @@ $(document).ready( function() {
 			echo "<div class=\"span12\">\n";
 		}
 
-		require "vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php";
-		require "vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php";
-		require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php";
-		require "vendor/robthree/twofactorauth/lib/Providers/Rng/IRNGProvider.php";
-		require "vendor/robthree/twofactorauth/lib/Providers/Rng/MCryptRNGProvider.php";
-		require "vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php";
-		require "vendor/robthree/twofactorauth/lib/TwoFactorAuth.php";
-		$tfa = new \RobThree\Auth\TwoFactorAuth('MyApp');
-
-		if($secret = $user->getSecret()) {
-		} else {
-			$secret = $tfa->createSecret();
-			$user->setSecret($secret);
-		}
 		print "<table class=\"table-condensed\">\n";
 		print "<tr>\n";
 		print "<td>".getMLText("name")." : </td>\n";
@@ -137,19 +124,37 @@ $(document).ready( function() {
 <?php
 			print "</td>\n";
 			print "</tr>\n";
-			print "<tr>\n";
-			print "<td>\n";
-			echo getMLText('2_factor_auth');
-			print "</td>\n";
-			print "<td>\n";
-			echo '<button class="btn btn-default" id="toggleqrcode">'.getMLText('toggle_qrcode').'</button>';
-			echo '<div id="qrcode">';
-			echo 'Code is: '.$code = $tfa->getCode($secret)."<br />";
-			echo 'Secret: '.$secret."<br />";
-			echo '<img src="' . $tfa->getQRCodeImageAsDataUri('My label', $secret) . '">';
-			echo "</div>";
-			print "</td>\n";
-			print "</tr>\n";
+			if($enable2factauth) {
+				require "vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php";
+				require "vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php";
+				require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php";
+				require "vendor/robthree/twofactorauth/lib/Providers/Rng/IRNGProvider.php";
+				require "vendor/robthree/twofactorauth/lib/Providers/Rng/MCryptRNGProvider.php";
+				require "vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php";
+				require "vendor/robthree/twofactorauth/lib/TwoFactorAuth.php";
+				$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
+
+				print "<tr>\n";
+				print "<td>\n";
+				echo getMLText('2_factor_auth');
+				print "</td>\n";
+				$secret = $user->getSecret();
+				if(!$secret) {
+					print "<td>\n";
+					echo '<a class="btn btn-default" href="../out/out.Setup2Factor.php">'.getMLText('setup_2_fact_auth').'</a>';
+					print "</td>\n";
+				} else {
+					print "<td>\n";
+					echo '<button class="btn btn-default" id="toggleqrcode">'.getMLText('toggle_qrcode').'</button>';
+					echo '<div id="qrcode">';
+					echo 'Code is: '.$code = $tfa->getCode($secret)."<br />";
+					echo 'Secret: '.$secret."<br />";
+					echo '<img src="' . $tfa->getQRCodeImageAsDataUri('My label', $secret) . '">';
+					echo "</div>";
+					print "</td>\n";
+				}
+				print "</tr>\n";
+			}
 		}
 		print "</table>\n";
 

From e384966172905a128c4e7cc60d7c3d2ec5f65afd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Jul 2016 08:00:54 +0200
Subject: [PATCH 0542/2006] fix errors in sql statements

---
 install/create_tables-innodb.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 8e2f760a0..4328d36a6 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -84,7 +84,7 @@ CREATE TABLE `tblUsers` (
   `homefolder` int(11) default NULL,
   PRIMARY KEY (`id`),
   UNIQUE (`login`),
-  CONSTRAINT `tblUsers_role` FOREIGN KEY (`role`) REFERENCES `tblRoles` (`id`),
+  CONSTRAINT `tblUsers_role` FOREIGN KEY (`role`) REFERENCES `tblRoles` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -861,7 +861,7 @@ CREATE TABLE `tblCachedAccess` (
   `mode` tinyint(4) NOT NULL default '0',
   PRIMARY KEY (`id`),
   CONSTRAINT `tblCachedAccess_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `tblCachedAccess_user` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblCachedAccess_user` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -936,8 +936,8 @@ CREATE TABLE `tblVersion` (
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1);
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2);
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
-INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Administrator', 'address@server.com', '', '', '', 1, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
-INSERT INTO tblUsers VALUES (2, 'guest', NULL, 'Guest User', NULL, '', '', '', 2, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
+INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
+INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
 INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', UNIX_TIMESTAMP(), 1, 0, 2, 0);
 INSERT INTO tblVersion VALUES (NOW(), 5, 0, 0);
 INSERT INTO tblCategory VALUES (0, '');

From 5f76b170b5aa39ad9abd2d71b93b5b6f11a370db Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Jul 2016 08:01:14 +0200
Subject: [PATCH 0543/2006] add '' as secret to insert into tblUsers statement

---
 install/create_tables-sqlite3.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index ff2e825b8..bab601c4d 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -800,8 +800,8 @@ CREATE TABLE `tblVersion` (
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1);
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2);
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
-INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0, 0);
-INSERT INTO tblUsers VALUES (2, 'guest', NULL, 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0, 0);
+INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0, 0);
+INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0, 0);
 INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', strftime('%s','now'), 1, 0, 2, 0);
 INSERT INTO tblVersion VALUES (DATETIME(), 5, 0, 0);
 INSERT INTO tblCategory VALUES (0, '');

From b717e0bafd6320ed9784a1b5d319ae25736c9e66 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Jul 2016 11:08:03 +0200
Subject: [PATCH 0544/2006] set version to 5.1.0

---
 install/create_tables-innodb.sql  | 2 +-
 install/create_tables-sqlite3.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 4328d36a6..f1574c11c 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -939,5 +939,5 @@ INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
 INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
 INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
 INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', UNIX_TIMESTAMP(), 1, 0, 2, 0);
-INSERT INTO tblVersion VALUES (NOW(), 5, 0, 0);
+INSERT INTO tblVersion VALUES (NOW(), 5, 1, 0);
 INSERT INTO tblCategory VALUES (0, '');
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index bab601c4d..92f2654e8 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -803,5 +803,5 @@ INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
 INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0, 0);
 INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0, 0);
 INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', strftime('%s','now'), 1, 0, 2, 0);
-INSERT INTO tblVersion VALUES (DATETIME(), 5, 0, 0);
+INSERT INTO tblVersion VALUES (DATETIME(), 5, 1, 0);
 INSERT INTO tblCategory VALUES (0, '');

From 53296bb3301d63202adfcca3e79643188df1028a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Jul 2016 18:46:47 +0200
Subject: [PATCH 0545/2006] add database changes for 5.2.0

---
 install/update-5.2.0/update-sqlite3.sql | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 install/update-5.2.0/update-sqlite3.sql

diff --git a/install/update-5.2.0/update-sqlite3.sql b/install/update-5.2.0/update-sqlite3.sql
new file mode 100644
index 000000000..7ded260be
--- /dev/null
+++ b/install/update-5.2.0/update-sqlite3.sql
@@ -0,0 +1,26 @@
+BEGIN;
+
+CREATE TABLE `tblAttributeDefinitionGroups` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` varchar(100) default NULL,
+  UNIQUE(`name`)
+);
+
+CREATE TABLE `tblAttributeDefinitionGroupAttributeDefinition` (
+  `attrdef` INTEGER REFERENCES `tblAttributeDefinitions` (`id`) ON DELETE CASCADE,
+  `attrgrp` INTEGER REFERENCES `tblAttributeGroups` (`id`) ON DELETE CASCADE,
+	`sequence` INTEGER,
+	`show` INTEGER,
+  UNIQUE(`attrdef`, `attrgrp`)
+);
+
+CREATE TABLE `tblFolderAttributeDefinitionGroup` (
+  `folder` INTEGER REFERENCES `tblFolders` (`id`) ON DELETE CASCADE,
+  `attrgrp` INTEGER REFERENCES `tblAttributeGroups` (`id`) ON DELETE CASCADE,
+	`sequence` INTEGER,
+  UNIQUE(`folder`, `attrgrp`)
+);
+
+UPDATE tblVersion set major=5, minor=2, subminor=0;
+
+COMMIT;

From 8a5014593203cdd7b294d5bb195942938319b856 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Jul 2016 08:00:58 +0200
Subject: [PATCH 0546/2006] should not be in branch 5.1.x

---
 install/update-5.2.0/update-sqlite3.sql | 26 -------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 install/update-5.2.0/update-sqlite3.sql

diff --git a/install/update-5.2.0/update-sqlite3.sql b/install/update-5.2.0/update-sqlite3.sql
deleted file mode 100644
index 7ded260be..000000000
--- a/install/update-5.2.0/update-sqlite3.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-BEGIN;
-
-CREATE TABLE `tblAttributeDefinitionGroups` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` varchar(100) default NULL,
-  UNIQUE(`name`)
-);
-
-CREATE TABLE `tblAttributeDefinitionGroupAttributeDefinition` (
-  `attrdef` INTEGER REFERENCES `tblAttributeDefinitions` (`id`) ON DELETE CASCADE,
-  `attrgrp` INTEGER REFERENCES `tblAttributeGroups` (`id`) ON DELETE CASCADE,
-	`sequence` INTEGER,
-	`show` INTEGER,
-  UNIQUE(`attrdef`, `attrgrp`)
-);
-
-CREATE TABLE `tblFolderAttributeDefinitionGroup` (
-  `folder` INTEGER REFERENCES `tblFolders` (`id`) ON DELETE CASCADE,
-  `attrgrp` INTEGER REFERENCES `tblAttributeGroups` (`id`) ON DELETE CASCADE,
-	`sequence` INTEGER,
-  UNIQUE(`folder`, `attrgrp`)
-);
-
-UPDATE tblVersion set major=5, minor=2, subminor=0;
-
-COMMIT;

From 0434caa89a7188846c9d5cbb6e0792dcb0db64fc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Jul 2016 21:02:02 +0200
Subject: [PATCH 0547/2006] add side menu for selecting list

---
 views/bootstrap/class.MyDocuments.php | 1498 ++++++++++++++-----------
 1 file changed, 860 insertions(+), 638 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index fb4a62f5b..42e76939a 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -36,33 +36,32 @@ require_once("SeedDMS/Preview.php");
  */
 class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 
-	function show() { /* {{{ */
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+?>
+$(document).ready( function() {
+	$('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){
+		ev.preventDefault();
+		$('#kkkk.ajax').data('action', $(this).data('action'));
+		$('#kkkk.ajax').trigger('update', {userid: $(this).val()});
+	});
+});
+<?php
+	} /* }}} */
+
+	function listReviews() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$orderby = $this->params['orderby'];
-		$showInProcess = $this->params['showinprocess'];
 		$cachedir = $this->params['cachedir'];
-		$workflowmode = $this->params['workflowmode'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
 
-		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
 
-		$this->htmlStartPage(getMLText("my_documents"));
-		$this->globalNavigation();
-		$this->contentStart();
-		$this->pageNavigation(getMLText("my_documents"), "my_documents");
-
-		if ($showInProcess){
-
-			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
-				
 				// Get document list for the current user.
 				$reviewStatus = $user->getReviewStatus();
-				$approvalStatus = $user->getApprovalStatus();
 
 				$resArr = $dms->getDocumentList('AppRevByMe', $user);
 				if (is_bool($resArr) && !$resArr) {
@@ -92,9 +91,8 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					}
 
 					// List the documents for which a review has been requested.
-					if($workflowmode == 'traditional') {
 						$this->contentHeading(getMLText("documents_to_review"));
-						$this->contentContainerStart();
+			//			$this->contentContainerStart();
 						$printheader=true;
 						$iRev = array();
 						$dList = array();
@@ -181,7 +179,54 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						}else{
 							printMLText("no_docs_to_review");
 						}
+//						$this->contentContainerEnd();
+				} else {
+						$this->contentHeading(getMLText("documents_to_review"));
+						$this->contentContainerStart();
+						printMLText("no_review_needed");
 						$this->contentContainerEnd();
+				}
+
+	} /* }}} */
+
+	function listApprovals() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+				$approvalStatus = $user->getApprovalStatus();
+
+				$resArr = $dms->getDocumentList('AppRevByMe', $user);
+				if (is_bool($resArr) && !$resArr) {
+					$this->contentHeading(getMLText("warning"));
+					$this->contentContainer(getMLText("internal_error_exit"));
+					$this->htmlEndPage();
+					exit;
+				}
+				if($resArr) {
+					/* Create an array to hold all of these results, and index the array 
+					 * by document id. This makes it easier to retrieve document ID
+					 * information later on and saves us having to repeatedly poll the
+					 * database every time
+					 * new document information is required.
+					 */
+					$docIdx = array();
+					foreach ($resArr as $res) {
+						
+						/* verify expiry */
+						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+							if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
+								$res["status"]=S_EXPIRED;
+							}
+						}
+
+						$docIdx[$res["id"]][$res["version"]] = $res;
 					}
 
 					// List the documents for which an approval has been requested.
@@ -272,502 +317,31 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					$this->contentContainerEnd();
 				}
 				else {
-					if($workflowmode == 'traditional') {	
-						$this->contentHeading(getMLText("documents_to_review"));
-						$this->contentContainerStart();
-						printMLText("no_review_needed");
-						$this->contentContainerEnd();
-					}
 					$this->contentHeading(getMLText("documents_to_approve"));
 					$this->contentContainerStart();
 					printMLText("no_approval_needed");
 					$this->contentContainerEnd();
 				}
 
-				/* Get list of documents owned by current user that are
-				 * pending review or pending approval.
-				 */
-				$resArr = $dms->getDocumentList('AppRevOwner', $user);
-				if (is_bool($resArr) && !$resArr) {
-					$this->contentHeading(getMLText("warning"));
-					$this->contentContainer(getMLText("internal_error_exit"));
-					$this->htmlEndPage();
-					exit;
-				}
+	} /* }}} */
 
-				$this->contentHeading(getMLText("documents_user_requiring_attention"));
-				$this->contentContainerStart();
-				if (count($resArr)>0) {
+	function listDocsToLookAt() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$workflowmode = $this->params['workflowmode'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
 
-					print "<table class=\"table table-condensed\">";
-					print "<thead>\n<tr>\n";
-					print "<th></th>";
-					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
-					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
-					print "</tr>\n</thead>\n<tbody>\n";
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
 
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["documentID"]);
-						$document->verifyLastestContentExpriry();
-					
-						// verify expiry
-						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-							if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-								$res["status"]=S_EXPIRED;
-							}
-						}
-					
-						if($content = $document->getContentByVersion($res['version'])) {
-							print "<tr>\n";
-							$previewer->createPreview($content);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-							if($previewer->hasPreview($content)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-							print "<td>".getOverallStatusText($res["status"])."</td>";
-							print "<td>".$res["version"]."</td>";
-							print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-							print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-							print "</tr>\n";
-						}
-					}		
-					print "</tbody></table>";	
-					
-				}
-				else printMLText("no_docs_to_look_at");
-				
-				$this->contentContainerEnd();
-			} elseif($workflowmode == 'advanced') {
-				// Get document list for the current user.
-				$workflowStatus = $user->getWorkflowStatus();
-
-				$resArr = $dms->getDocumentList('WorkflowByMe', $user);
-				if (is_bool($resArr) && !$resArr) {
-					$this->contentHeading(getMLText("warning"));
-					$this->contentContainer(getMLText("internal_error_exit"));
-					$this->htmlEndPage();
-					exit;
-				}
-					
-				if (count($resArr)>0) {
-					// Create an array to hold all of these results, and index the array by
-					// document id. This makes it easier to retrieve document ID information
-					// later on and saves us having to repeatedly poll the database every time
-					// new document information is required.
-					$docIdx = array();
-					foreach ($resArr as $res) {
-						
-						// verify expiry
-						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-							if  ( $res["status"]==S_IN_WORKFLOW ){
-								$res["status"]=S_EXPIRED;
-							}
-						}
-
-						$docIdx[$res["id"]][$res["version"]] = $res;
-					}
-
-					// List the documents where a review has been requested.
-					$this->contentHeading(getMLText("documents_to_process"));
-					$this->contentContainerStart();
-
-					$printheader=true;
-					$iRev = array();
-					$dList = array();
-					foreach ($workflowStatus["u"] as $st) {
-					
-						if ( isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) ) {
-							$dList[] = $st["document"];
-							$document = $dms->getDocument($st["document"]);
-							$document->verifyLastestContentExpriry();
-						
-							if ($printheader){
-								print "<table class=\"table table-condensed\">";
-								print "<thead>\n<tr>\n";
-								print "<th></th>\n";
-								print "<th>".getMLText("name")."</th>\n";
-								print "<th>".getMLText("owner")."</th>\n";
-								print "<th>".getMLText("version")."</th>\n";
-								print "<th>".getMLText("last_update")."</th>\n";
-								print "<th>".getMLText("expires")."</th>\n";
-								print "</tr>\n</thead>\n<tbody>\n";
-								$printheader=false;
-							}
-						
-							if($content = $document->getContentByVersion($st['version'])) {
-								print "<tr>\n";
-								$previewer->createPreview($content);
-								print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
-								if($previewer->hasPreview($content)) {
-									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-								} else {
-									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-								}
-								print "</a></td>";
-								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
-								print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
-								print "<td>".$st["version"]."</td>";
-								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]) ."</td>";
-								print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
-								print "</tr>\n";
-							}
-						}
-					}
-					foreach ($workflowStatus["g"] as $st) {
-					
-						if (!in_array($st["document"], $iRev) && isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
-							$dList[] = $st["document"];
-							$document = $dms->getDocument($st["document"]);
-							$document->verifyLastestContentExpriry();
-
-							if ($printheader){
-								print "<table class=\"table table-condensed\">";
-								print "<thead>\n<tr>\n";
-								print "<th></th>\n";
-								print "<th>".getMLText("name")."</th>\n";
-								print "<th>".getMLText("owner")."</th>\n";
-								print "<th>".getMLText("version")."</th>\n";
-								print "<th>".getMLText("last_update")."</th>\n";
-								print "<th>".getMLText("expires")."</th>\n";
-								print "</tr>\n</thead>\n<tbody>\n";
-								$printheader=false;
-							}
-
-							if($content = $document->getContentByVersion($st['version'])) {
-								print "<tr>\n";
-								$previewer->createPreview($content);
-								print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
-								if($previewer->hasPreview($content)) {
-									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-								} else {
-									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-								}
-								print "</a></td>";
-								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
-								print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
-								print "<td>".$st["version"]."</td>";
-								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"])."</td>";
-								print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
-								print "</tr>\n";
-							}
-						}
-					}
-					if (!$printheader){
-						echo "</tbody>\n</table>";
-					}else{
-						printMLText("no_docs_to_check");
-					}
-					$this->contentContainerEnd();
-				}
-
-				$resArr = $dms->getDocumentList('WorkflowOwner', $user);
-				if (is_bool($resArr) && !$resArr) {
-					$this->contentHeading(getMLText("warning"));
-					$this->contentContainer("Internal error. Unable to complete request. Exiting.");
-					$this->htmlEndPage();
-					exit;
-				}
-
-				$this->contentHeading(getMLText("documents_user_requiring_attention"));
-				$this->contentContainerStart();
-				if (count($resArr)>0) {
-
-					print "<table class=\"table table-condensed\">";
-					print "<thead>\n<tr>\n";
-					print "<th></th>";
-					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
-					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
-					print "</tr>\n</thead>\n<tbody>\n";
-
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["documentID"]);
-						$document->verifyLastestContentExpriry();
-					
-						// verify expiry
-						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-							if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-								$res["status"]=S_EXPIRED;
-							}
-						}
-					
-						if($content = $document->getContentByVersion($res['version'])) {
-							print "<tr>\n";
-							$previewer->createPreview($content);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-							if($previewer->hasPreview($content)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-							print "<td>".getOverallStatusText($res["status"])."</td>";
-							print "<td>".$res["version"]."</td>";
-							print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-							print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-							print "</tr>\n";
-						}
-					}		
-					print "</tbody></table>";	
-					
-				}
-				else printMLText("no_docs_to_look_at");
-
-				$this->contentContainerEnd();
-			}
-
-			// Get document list for the current user.
-			$revisionStatus = $user->getRevisionStatus();
-
-			$resArr = $dms->getDocumentList('ReviseByMe', $user);
-			if (is_bool($resArr) && !$resArr) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-			if($resArr) {
-				/* Create an array to hold all of these results, and index the array 
-				 * by document id. This makes it easier to retrieve document ID
-				 * information later on and saves us having to repeatedly poll the
-				 * database every time new document information is required.
-				 */
-				$docIdx = array();
-				foreach ($resArr as $res) {
-					/* verify expiry */
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						$res["status"]=S_EXPIRED;
-					}
-					$docIdx[$res["id"]][$res["version"]] = $res;
-				}
-
-				$this->contentHeading(getMLText("documents_to_revise"));
-				$this->contentContainerStart();
-				$printheader=true;
-				$iRev = array();
-				$dList = array();
-				foreach ($revisionStatus["indstatus"] as $st) {
-				
-					if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
-						$dList[] = $st["documentID"];
-						$document = $dms->getDocument($st["documentID"]);
-					
-						if ($printheader){
-							print "<table class=\"table table-condensed\">";
-							print "<thead>\n<tr>\n";
-							print "<th></th>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("version")."</th>\n";
-							print "<th>".getMLText("last_update")."</th>\n";
-							print "<th>".getMLText("expires")."</th>\n";
-							print "</tr>\n</thead>\n<tbody>\n";
-							$printheader=false;
-						}
-					
-						if($content = $document->getContentByVersion($st['version'])) {
-							print "<tr>\n";
-							$previewer->createPreview($content);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($content)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-							print "</tr>\n";
-						}
-					}
-				}
-				foreach ($revisionStatus["grpstatus"] as $st) {
-				
-					if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
-						$dList[] = $st["documentID"];
-						$document = $dms->getDocument($st["documentID"]);
-
-						if ($printheader){
-							print "<table class=\"table table-condensed\">";
-							print "<thead>\n<tr>\n";
-							print "<th></th>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("version")."</th>\n";
-							print "<th>".getMLText("last_update")."</th>\n";
-							print "<th>".getMLText("expires")."</th>\n";
-							print "</tr>\n</thead>\n<tbody>\n";
-							$printheader=false;
-						}
-
-						if($content = $document->getContentByVersion($st['version'])) {
-							print "<tr>\n";
-							$previewer->createPreview($content);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($content)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-							print "</tr>\n";
-						}
-					}
-				}
-				if (!$printheader){
-					echo "</tbody>\n</table>";
-				}else{
-					printMLText("no_docs_to_revise");
-				}
-				$this->contentContainerEnd();
-			}
-			else {
-				$this->contentHeading(getMLText("documents_to_revise"));
-				$this->contentContainerStart();
-				printMLText("no_revision_needed");
-				$this->contentContainerEnd();
-			}
-
-			$receiptStatus = $user->getReceiptStatus();
-			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-			if (is_bool($resArr) && !$resArr) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-			if($resArr) {
-				/* Create an array to hold all of these results, and index the array 
-				 * by document id. This makes it easier to retrieve document ID
-				 * information later on and saves us having to repeatedly poll the
-				 * database every time
-				 * new document information is required.
-				 */
-				$docIdx = array();
-				foreach ($resArr as $res) {
-					/* verify expiry */
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						$res["status"]=S_EXPIRED;
-					}
-					$docIdx[$res["id"]][$res["version"]] = $res;
-				}
-				$this->contentHeading(getMLText("documents_to_receipt"));
-				$this->contentContainerStart();
-				$printheader=true;
-				$iRev = array();
-				$dList = array();
-				foreach ($receiptStatus["indstatus"] as $st) {
-				
-					if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
-						$dList[] = $st["documentID"];
-						$document = $dms->getDocument($st["documentID"]);
-					
-						if ($printheader){
-							print "<table class=\"table table-condensed\">";
-							print "<thead>\n<tr>\n";
-							print "<th></th>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("version")."</th>\n";
-							print "<th>".getMLText("last_update")."</th>\n";
-							print "<th>".getMLText("expires")."</th>\n";
-							print "</tr>\n</thead>\n<tbody>\n";
-							$printheader=false;
-						}
-					
-						if($content = $document->getContentByVersion($st['version'])) {
-							print "<tr>\n";
-							$previewer->createPreview($content);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($content)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-							print "</tr>\n";
-						}
-					}
-				}
-				foreach ($receiptStatus["grpstatus"] as $st) {
-				
-					if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
-						$dList[] = $st["documentID"];
-						$document = $dms->getDocument($st["documentID"]);
-
-						if ($printheader){
-							print "<table class=\"table table-condensed\">";
-							print "<thead>\n<tr>\n";
-							print "<th></th>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("version")."</th>\n";
-							print "<th>".getMLText("last_update")."</th>\n";
-							print "<th>".getMLText("expires")."</th>\n";
-							print "</tr>\n</thead>\n<tbody>\n";
-							$printheader=false;
-						}
-
-						if($content = $document->getContentByVersion($st['version'])) {
-							print "<tr>\n";
-							$previewer->createPreview($content);
-							print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-							if($previewer->hasPreview($content)) {
-								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							} else {
-								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-							}
-							print "</a></td>";
-							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-							print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-							print "<td>".$st["version"]."</td>";
-							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-							print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-							print "</tr>\n";
-						}
-					}
-				}
-				if (!$printheader){
-					echo "</tbody>\n</table>";
-				}else{
-					printMLText("no_docs_to_receipt");
-				}
-				$this->contentContainerEnd();
-			}
-			else {
-				$this->contentHeading(getMLText("documents_to_receipt"));
-				$this->contentContainerStart();
-				printMLText("no_receipt_needed");
-				$this->contentContainerEnd();
-			}
-
-			/* Get list of documents owned by current user that has
-			 * been rejected.
+		if($workflowmode != 'advanced') {
+			/* Get list of documents owned by current user that are
+			 * pending review or pending approval.
 			 */
-			$resArr = $dms->getDocumentList('RejectOwner', $user);
+			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			if (is_bool($resArr) && !$resArr) {
 				$this->contentHeading(getMLText("warning"));
 				$this->contentContainer(getMLText("internal_error_exit"));
@@ -775,9 +349,9 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				exit;
 			}
 
+			$this->contentHeading(getMLText("documents_user_requiring_attention"));
+//			$this->contentContainerStart();
 			if (count($resArr)>0) {
-				$this->contentHeading(getMLText("documents_user_rejected"));
-				$this->contentContainerStart();
 
 				print "<table class=\"table table-condensed\">";
 				print "<thead>\n<tr>\n";
@@ -820,20 +394,21 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				}		
 				print "</tbody></table>";	
 				
-				$this->contentContainerEnd();
 			}
-
-			/* Get list of documents locked by current user */
-			$resArr = $dms->getDocumentList('LockedByMe', $user);
+			else printMLText("no_docs_to_look_at");
+			
+//			$this->contentContainerEnd();
+		} else {
+			$resArr = $dms->getDocumentList('WorkflowOwner', $user);
 			if (is_bool($resArr) && !$resArr) {
 				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
+				$this->contentContainer("Internal error. Unable to complete request. Exiting.");
 				$this->htmlEndPage();
 				exit;
 			}
 
-			$this->contentHeading(getMLText("documents_locked_by_you"));
-			$this->contentContainerStart();
+			$this->contentHeading(getMLText("documents_user_requiring_attention"));
+//			$this->contentContainerStart();
 			if (count($resArr)>0) {
 
 				print "<table class=\"table table-condensed\">";
@@ -846,126 +421,6 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				print "<th>".getMLText("expires")."</th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
 
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["documentID"]);
-				
-					// verify expiry
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-							$res["status"]=S_EXPIRED;
-						}
-					}
-				
-					if($content = $document->getContentByVersion($res['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-						print "<td>".getOverallStatusText($res["status"])."</td>";
-						print "<td>".$res["version"]."</td>";
-						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-						print "</tr>\n";
-					}
-				}		
-				print "</tbody></table>";	
-				
-			}
-			else printMLText("no_docs_locked");
-
-			$this->contentContainerEnd();
-
-			/* Get list of documents checked out by current user */
-			$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
-			if (is_bool($resArr) && !$resArr) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-
-			$this->contentHeading(getMLText("documents_checked_out_by_you"));
-			$this->contentContainerStart();
-			if (count($resArr)>0) {
-
-				print "<table class=\"table table-condensed\">";
-				print "<thead>\n<tr>\n";
-				print "<th></th>";
-				print "<th>".getMLText("name")."</th>\n";
-				print "<th>".getMLText("status")."</th>\n";
-				print "<th>".getMLText("version")."</th>\n";
-				print "<th>".getMLText("last_update")."</th>\n";
-				print "<th>".getMLText("expires")."</th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["documentID"]);
-				
-					// verify expiry
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-							$res["status"]=S_EXPIRED;
-						}
-					}
-				
-					if($content = $document->getContentByVersion($res['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-						print "<td>".getOverallStatusText($res["status"])."</td>";
-						print "<td>".$res["version"]."</td>";
-						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-						print "</tr>\n";
-					}
-				}		
-				print "</tbody></table>";	
-				
-			}
-			else printMLText("no_docs_checked_out");
-
-			$this->contentContainerEnd();
-
-		}
-		else {
-
-			/* Get list of documents owned by current user */
-			$resArr = $dms->getDocumentList('MyDocs', $user, $orderby);
-			if (is_bool($resArr) && !$resArr) {
-				$this->contentHeading(getMLText("warning"));
-				$this->contentContainer(getMLText("internal_error_exit"));
-				$this->htmlEndPage();
-				exit;
-			}
-
-			$this->contentHeading(getMLText("all_documents"));
-			$this->contentContainerStart();
-
-			if (count($resArr)>0) {
-
-				print "<table class=\"table table-condensed\">";
-				print "<thead>\n<tr>\n";
-				print "<th></th>";
-				print "<th><a href=\"../out/out.MyDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
-				print "<th><a href=\"../out/out.MyDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
-				print "<th>".getMLText("version")."</th>\n";
-				print "<th><a href=\"../out/out.MyDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n";
-				print "<th><a href=\"../out/out.MyDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-
 				foreach ($resArr as $res) {
 					$document = $dms->getDocument($res["documentID"]);
 					$document->verifyLastestContentExpriry();
@@ -987,21 +442,788 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
 						}
 						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
 						print "<td>".getOverallStatusText($res["status"])."</td>";
 						print "<td>".$res["version"]."</td>";
-						print "<td>".$res["statusDate"]." ". htmlspecialchars($res["statusName"])."</td>";
-						//print "<td>".(!$res["expires"] ? getMLText("does_not_expire"):getReadableDate($res["expires"]))."</td>";				
+						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
 						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
 						print "</tr>\n";
 					}
-				}
-				print "</tbody></table>";
+				}		
+				print "</tbody></table>";	
+				
 			}
-			else printMLText("empty_notify_list");
+			else printMLText("no_docs_to_look_at");
+
+//			$this->contentContainerEnd();
+		}
+	} /* }}} */
+
+	function listMyDocs() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of documents owned by current user */
+		$resArr = $dms->getDocumentList('MyDocs', $user, $orderby);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("all_documents"));
+//		$this->contentContainerStart();
+
+		if (count($resArr)>0) {
+
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>";
+			print "<th><a href=\"../out/out.MyDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
+			print "<th><a href=\"../out/out.MyDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
+			print "<th>".getMLText("version")."</th>\n";
+			print "<th><a href=\"../out/out.MyDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n";
+			print "<th><a href=\"../out/out.MyDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["documentID"]);
+				$document->verifyLastestContentExpriry();
 			
+				// verify expiry
+				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
+						$res["status"]=S_EXPIRED;
+					}
+				}
+			
+				if($content = $document->getContentByVersion($res['version'])) {
+					print "<tr>\n";
+					$previewer->createPreview($content);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+					if($previewer->hasPreview($content)) {
+						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+					} else {
+						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+					}
+					print "</a></td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+					print "<td>".getOverallStatusText($res["status"])."</td>";
+					print "<td>".$res["version"]."</td>";
+					print "<td>".$res["statusDate"]." ". htmlspecialchars($res["statusName"])."</td>";
+					//print "<td>".(!$res["expires"] ? getMLText("does_not_expire"):getReadableDate($res["expires"]))."</td>";				
+					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+					print "</tr>\n";
+				}
+			}
+			print "</tbody></table>";
+		}
+		else printMLText("empty_notify_list");
+		
+//		$this->contentContainerEnd();
+	} /* }}} */
+
+	function listWorkflow() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		// Get document list for the current user.
+		$workflowStatus = $user->getWorkflowStatus();
+
+		$resArr = $dms->getDocumentList('WorkflowByMe', $user);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+			
+		if (count($resArr)>0) {
+			// Create an array to hold all of these results, and index the array by
+			// document id. This makes it easier to retrieve document ID information
+			// later on and saves us having to repeatedly poll the database every time
+			// new document information is required.
+			$docIdx = array();
+			foreach ($resArr as $res) {
+				
+				// verify expiry
+				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+					if  ( $res["status"]==S_IN_WORKFLOW ){
+						$res["status"]=S_EXPIRED;
+					}
+				}
+
+				$docIdx[$res["id"]][$res["version"]] = $res;
+			}
+
+			// List the documents where a review has been requested.
+			$this->contentHeading(getMLText("documents_to_process"));
+//			$this->contentContainerStart();
+
+			$printheader=true;
+			$iRev = array();
+			$dList = array();
+			foreach ($workflowStatus["u"] as $st) {
+			
+				if ( isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) ) {
+					$dList[] = $st["document"];
+					$document = $dms->getDocument($st["document"]);
+					$document->verifyLastestContentExpriry();
+				
+					if ($printheader){
+						print "<table class=\"table table-condensed\">";
+						print "<thead>\n<tr>\n";
+						print "<th></th>\n";
+						print "<th>".getMLText("name")."</th>\n";
+						print "<th>".getMLText("owner")."</th>\n";
+						print "<th>".getMLText("version")."</th>\n";
+						print "<th>".getMLText("last_update")."</th>\n";
+						print "<th>".getMLText("expires")."</th>\n";
+						print "</tr>\n</thead>\n<tbody>\n";
+						$printheader=false;
+					}
+				
+					if($content = $document->getContentByVersion($st['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]) ."</td>";
+						print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
+					}
+				}
+			}
+			foreach ($workflowStatus["g"] as $st) {
+			
+				if (!in_array($st["document"], $iRev) && isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
+					$dList[] = $st["document"];
+					$document = $dms->getDocument($st["document"]);
+					$document->verifyLastestContentExpriry();
+
+					if ($printheader){
+						print "<table class=\"table table-condensed\">";
+						print "<thead>\n<tr>\n";
+						print "<th></th>\n";
+						print "<th>".getMLText("name")."</th>\n";
+						print "<th>".getMLText("owner")."</th>\n";
+						print "<th>".getMLText("version")."</th>\n";
+						print "<th>".getMLText("last_update")."</th>\n";
+						print "<th>".getMLText("expires")."</th>\n";
+						print "</tr>\n</thead>\n<tbody>\n";
+						$printheader=false;
+					}
+
+					if($content = $document->getContentByVersion($st['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"])."</td>";
+						print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
+					}
+				}
+			}
+			if (!$printheader){
+				echo "</tbody>\n</table>";
+			}else{
+				printMLText("no_docs_to_check");
+			}
+//			$this->contentContainerEnd();
+		}
+
+	} /* }}} */
+
+	function listRevisions() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		// Get document list for the current user.
+		$revisionStatus = $user->getRevisionStatus();
+
+		$resArr = $dms->getDocumentList('ReviseByMe', $user);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+		if($resArr) {
+			/* Create an array to hold all of these results, and index the array 
+			 * by document id. This makes it easier to retrieve document ID
+			 * information later on and saves us having to repeatedly poll the
+			 * database every time new document information is required.
+			 */
+			$docIdx = array();
+			foreach ($resArr as $res) {
+				/* verify expiry */
+				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+					$res["status"]=S_EXPIRED;
+				}
+				$docIdx[$res["id"]][$res["version"]] = $res;
+			}
+
+			$this->contentHeading(getMLText("documents_to_revise"));
+//			$this->contentContainerStart();
+			$printheader=true;
+			$iRev = array();
+			$dList = array();
+			foreach ($revisionStatus["indstatus"] as $st) {
+			
+				if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
+					$dList[] = $st["documentID"];
+					$document = $dms->getDocument($st["documentID"]);
+				
+					if ($printheader){
+						print "<table class=\"table table-condensed\">";
+						print "<thead>\n<tr>\n";
+						print "<th></th>\n";
+						print "<th>".getMLText("name")."</th>\n";
+						print "<th>".getMLText("owner")."</th>\n";
+						print "<th>".getMLText("version")."</th>\n";
+						print "<th>".getMLText("last_update")."</th>\n";
+						print "<th>".getMLText("expires")."</th>\n";
+						print "</tr>\n</thead>\n<tbody>\n";
+						$printheader=false;
+					}
+				
+					if($content = $document->getContentByVersion($st['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
+						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
+					}
+				}
+			}
+			foreach ($revisionStatus["grpstatus"] as $st) {
+			
+				if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
+					$dList[] = $st["documentID"];
+					$document = $dms->getDocument($st["documentID"]);
+
+					if ($printheader){
+						print "<table class=\"table table-condensed\">";
+						print "<thead>\n<tr>\n";
+						print "<th></th>\n";
+						print "<th>".getMLText("name")."</th>\n";
+						print "<th>".getMLText("owner")."</th>\n";
+						print "<th>".getMLText("version")."</th>\n";
+						print "<th>".getMLText("last_update")."</th>\n";
+						print "<th>".getMLText("expires")."</th>\n";
+						print "</tr>\n</thead>\n<tbody>\n";
+						$printheader=false;
+					}
+
+					if($content = $document->getContentByVersion($st['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
+					}
+				}
+			}
+			if (!$printheader){
+				echo "</tbody>\n</table>";
+			}else{
+				printMLText("no_docs_to_revise");
+			}
+//			$this->contentContainerEnd();
+		}
+		else {
+			$this->contentHeading(getMLText("documents_to_revise"));
+			$this->contentContainerStart();
+			printMLText("no_revision_needed");
 			$this->contentContainerEnd();
 		}
+	} /* }}} */
+
+	function listReceipts() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		$receiptStatus = $user->getReceiptStatus();
+		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+		if($resArr) {
+			/* Create an array to hold all of these results, and index the array 
+			 * by document id. This makes it easier to retrieve document ID
+			 * information later on and saves us having to repeatedly poll the
+			 * database every time
+			 * new document information is required.
+			 */
+			$docIdx = array();
+			foreach ($resArr as $res) {
+				/* verify expiry */
+				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+					$res["status"]=S_EXPIRED;
+				}
+				$docIdx[$res["id"]][$res["version"]] = $res;
+			}
+			$this->contentHeading(getMLText("documents_to_receipt"));
+//			$this->contentContainerStart();
+			$printheader=true;
+			$iRev = array();
+			$dList = array();
+			foreach ($receiptStatus["indstatus"] as $st) {
+			
+				if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
+					$dList[] = $st["documentID"];
+					$document = $dms->getDocument($st["documentID"]);
+				
+					if ($printheader){
+						print "<table class=\"table table-condensed\">";
+						print "<thead>\n<tr>\n";
+						print "<th></th>\n";
+						print "<th>".getMLText("name")."</th>\n";
+						print "<th>".getMLText("owner")."</th>\n";
+						print "<th>".getMLText("version")."</th>\n";
+						print "<th>".getMLText("last_update")."</th>\n";
+						print "<th>".getMLText("expires")."</th>\n";
+						print "</tr>\n</thead>\n<tbody>\n";
+						$printheader=false;
+					}
+				
+					if($content = $document->getContentByVersion($st['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
+						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
+					}
+				}
+			}
+			foreach ($receiptStatus["grpstatus"] as $st) {
+			
+				if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
+					$dList[] = $st["documentID"];
+					$document = $dms->getDocument($st["documentID"]);
+
+					if ($printheader){
+						print "<table class=\"table table-condensed\">";
+						print "<thead>\n<tr>\n";
+						print "<th></th>\n";
+						print "<th>".getMLText("name")."</th>\n";
+						print "<th>".getMLText("owner")."</th>\n";
+						print "<th>".getMLText("version")."</th>\n";
+						print "<th>".getMLText("last_update")."</th>\n";
+						print "<th>".getMLText("expires")."</th>\n";
+						print "</tr>\n</thead>\n<tbody>\n";
+						$printheader=false;
+					}
+
+					if($content = $document->getContentByVersion($st['version'])) {
+						print "<tr>\n";
+						$previewer->createPreview($content);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
+						if($previewer->hasPreview($content)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
+						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
+						print "<td>".$st["version"]."</td>";
+						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
+						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
+						print "</tr>\n";
+					}
+				}
+			}
+			if (!$printheader){
+				echo "</tbody>\n</table>";
+			}else{
+				printMLText("no_docs_to_receipt");
+			}
+//			$this->contentContainerEnd();
+		}
+		else {
+			$this->contentHeading(getMLText("documents_to_receipt"));
+			$this->contentContainerStart();
+			printMLText("no_receipt_needed");
+			$this->contentContainerEnd();
+		}
+
+	} /* }}} */
+
+	function listRejects() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of documents owned by current user that has
+		 * been rejected.
+		 */
+		$resArr = $dms->getDocumentList('RejectOwner', $user);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		if (count($resArr)>0) {
+			$this->contentHeading(getMLText("documents_user_rejected"));
+//			$this->contentContainerStart();
+
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("status")."</th>\n";
+			print "<th>".getMLText("version")."</th>\n";
+			print "<th>".getMLText("last_update")."</th>\n";
+			print "<th>".getMLText("expires")."</th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["documentID"]);
+				$document->verifyLastestContentExpriry();
+			
+				// verify expiry
+				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
+						$res["status"]=S_EXPIRED;
+					}
+				}
+			
+				if($content = $document->getContentByVersion($res['version'])) {
+					print "<tr>\n";
+					$previewer->createPreview($content);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+					if($previewer->hasPreview($content)) {
+						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+					} else {
+						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+					}
+					print "</a></td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+					print "<td>".getOverallStatusText($res["status"])."</td>";
+					print "<td>".$res["version"]."</td>";
+					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+					print "</tr>\n";
+				}
+			}		
+			print "</tbody></table>";	
+			
+//			$this->contentContainerEnd();
+		}
+
+	} /* }}} */
+
+	function listLockedDocs() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of documents locked by current user */
+		$resArr = $dms->getDocumentList('LockedByMe', $user);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("documents_locked_by_you"));
+//		$this->contentContainerStart();
+		if (count($resArr)>0) {
+
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("status")."</th>\n";
+			print "<th>".getMLText("version")."</th>\n";
+			print "<th>".getMLText("last_update")."</th>\n";
+			print "<th>".getMLText("expires")."</th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["documentID"]);
+			
+				// verify expiry
+				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
+						$res["status"]=S_EXPIRED;
+					}
+				}
+			
+				if($content = $document->getContentByVersion($res['version'])) {
+					print "<tr>\n";
+					$previewer->createPreview($content);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+					if($previewer->hasPreview($content)) {
+						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+					} else {
+						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+					}
+					print "</a></td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+					print "<td>".getOverallStatusText($res["status"])."</td>";
+					print "<td>".$res["version"]."</td>";
+					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+					print "</tr>\n";
+				}
+			}		
+			print "</tbody></table>";	
+			
+		}
+		else printMLText("no_docs_locked");
+
+//		$this->contentContainerEnd();
+
+	} /* }}} */
+
+	function listCheckedoutDocs() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of documents checked out by current user */
+		$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("documents_checked_out_by_you"));
+//		$this->contentContainerStart();
+		if (count($resArr)>0) {
+
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("status")."</th>\n";
+			print "<th>".getMLText("version")."</th>\n";
+			print "<th>".getMLText("last_update")."</th>\n";
+			print "<th>".getMLText("expires")."</th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["documentID"]);
+			
+				// verify expiry
+				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
+						$res["status"]=S_EXPIRED;
+					}
+				}
+			
+				if($content = $document->getContentByVersion($res['version'])) {
+					print "<tr>\n";
+					$previewer->createPreview($content);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+					if($previewer->hasPreview($content)) {
+						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+					} else {
+						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
+					}
+					print "</a></td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+					print "<td>".getOverallStatusText($res["status"])."</td>";
+					print "<td>".$res["version"]."</td>";
+					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+					print "</tr>\n";
+				}
+			}		
+			print "</tbody></table>";	
+			
+		}
+		else printMLText("no_docs_checked_out");
+
+//		$this->contentContainerEnd();
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$showInProcess = $this->params['showinprocess'];
+		$cachedir = $this->params['cachedir'];
+		$workflowmode = $this->params['workflowmode'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$db = $dms->getDB();
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		$this->htmlStartPage(getMLText("my_documents"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_documents"), "my_documents");
+
+		if($showInProcess) {
+			echo '<div class="row-fluid">';
+			echo '<div class="span3">';
+			echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
+			if($workflowmode == 'traditional') {
+				$resArr = $dms->getDocumentList('AppRevByMe', $user);
+				echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>';
+			}
+			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+				$resArr = $dms->getDocumentList('AppRevByMe', $user);
+				echo '<li class=""><a data-href="#documents_to_approve" data-action="listApprovals"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_approve").'</a></li>';
+			} else {
+				$resArr = $dms->getDocumentList('WorkflowByMe', $user);
+				echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>';
+			}
+			$resArr = $dms->getDocumentList('AppRevOwner', $user);
+			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
+			$resArr = $dms->getDocumentList('ReviseByMe', $user);
+			echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
+			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+			echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
+			$resArr = $dms->getDocumentList('RejectOwner', $user);
+			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
+			$resArr = $dms->getDocumentList('LockedByMe', $user);
+			echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
+			$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
+			echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
+      echo '</ul>';
+			echo '</div>';
+			echo '<div class="span9">';
+
+			echo '<div id="kkkk" class="ajax" data-view="MyDocuments" data-action="listReviews"></div>';
+
+			/*
+			if($workflowmode == 'traditional') {
+				echo '<div id="documents_to_review" class="ajax" data-view="MyDocuments" data-action="listReviews"></div>';
+			}
+
+			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+				echo '<div id="documents_to_approve" class="ajax" data-view="MyDocuments" data-action="listApprovals"></div>';
+			} elseif($workflowmode == 'advanced') {
+				echo '<div id="documents_to_process" class="ajax" data-view="MyDocuments" data-action="listWorkflow"></div>';
+			}
+			echo '<div id="documents_user_requiring_attention" class="ajax" data-view="MyDocuments" data-action="listDocsToLookAt"></div>';
+
+			echo '<div id="documents_to_revise" class="ajax" data-view="MyDocuments" data-action="listRevisions"></div>';
+
+			echo '<div id="documents_to_receipt" class="ajax" data-view="MyDocuments" data-action="listReceipts"></div>';
+
+			echo '<div id="documents_user_rejected" class="ajax" data-view="MyDocuments" data-action="listRejects"></div>';
+
+			echo '<div id="documents_locked_by_you" class="ajax" data-view="MyDocuments" data-action="listLockedDocs"></div>';
+
+			echo '<div id="documents_checked_out_by_you" class="ajax" data-view="MyDocuments" data-action="listCheckedoutDocs"></div>';
+
+			*/
+			echo '</div>';
+			echo '</div>';
+		} else {
+			echo '<div class="ajax" data-view="MyDocuments" data-action="listMyDocs"></div>';
+		}
 
 		$this->contentEnd();
 		$this->htmlEndPage();

From 76e8d25f874ed2282fa40d2826189d2983b67130 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Jul 2016 21:02:30 +0200
Subject: [PATCH 0548/2006] add style for sidebar

---
 styles/bootstrap/application.css | 69 ++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index 313d1715a..4d24775a6 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -175,6 +175,75 @@ ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
     background-color: #E0E0E0;
 }
 
+/* Sidenav for Docs
+ * -------------------------------------------------- */
+
+.bs-docs-sidenav {
+	width: 100%;
+	margin: 0px 0 30px 0;
+	padding: 0;
+	background-color: #fff;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065);
+	-moz-box-shadow: 0 1px 4px rgba(0,0,0,.065);
+	box-shadow: 0 1px 4px rgba(0,0,0,.065);
+}
+.bs-docs-sidenav > li > a {
+	display: block;
+	width: 190px \9;
+	margin: 0 0 -1px;
+	padding: 8px 14px;
+	border: 1px solid #e5e5e5;
+}
+.bs-docs-sidenav > li:first-child > a {
+	-webkit-border-radius: 6px 6px 0 0;
+	-moz-border-radius: 6px 6px 0 0;
+	border-radius: 6px 6px 0 0;
+}
+.bs-docs-sidenav > li:last-child > a {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+.bs-docs-sidenav > .active > a {
+	position: relative;
+	z-index: 2;
+	padding: 9px 15px;
+	border: 0;
+	text-shadow: 0 1px 0 rgba(0,0,0,.15);
+	-webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+	-moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+	box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+}
+/* Chevrons */
+.bs-docs-sidenav .badge-right {
+	float: right;
+	margin-top: 2px;
+	margin-right: -6px;
+	opacity: .25;
+}
+.bs-docs-sidenav > li > a:hover {
+	background-color: #f5f5f5;
+}
+.bs-docs-sidenav a:hover .icon-chevron-right {
+	opacity: .5;
+}
+.bs-docs-sidenav .active .icon-chevron-right,
+.bs-docs-sidenav .active a:hover .icon-chevron-right {
+	background-image: url(../img/glyphicons-halflings-white.png);
+	opacity: 1;
+}
+.bs-docs-sidenav.affix {
+	top: 100px;
+}
+.bs-docs-sidenav.affix-bottom {
+	position: absolute;
+	top: auto;
+	bottom: 270px;
+}
+
 @media (max-width: 480px) { 
     .nav-tabs > li {
         float:none;

From 8410ca92739e30fbd530193c3255852d2ebb0e65 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Jul 2016 21:02:49 +0200
Subject: [PATCH 0549/2006] add spinner when initially loading content by ajax
 call

---
 styles/bootstrap/application.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 9bf040650..4ec1f61f9 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -337,6 +337,7 @@ $(document).ready( function() {
 			}
 		} else
 			url = href;
+		element.prepend('<div style="position: _absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: 200px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
 		$.get(url, function(data) {
 			element.html(data);
 			$(".chzn-select").chosen();

From d5360b9342cacaaaa686141ea18e514cd54e23f7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Jul 2016 06:48:55 +0200
Subject: [PATCH 0550/2006] add changelog for 5.1.0 and 5.1.1

---
 CHANGELOG | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index a749b1907..68c082591 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.1
+--------------------------------------------------------------------------------
+- merge changes from 5.0.4
+- add two factor authentication based on google authenticator
+
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.0
+--------------------------------------------------------------------------------
+- add receipent list for documents
+- add revision of documents
+- add substitute user command for regular users
+- add access controll list for many functions
+- add document list which can be exported as an archive
+- search results can be exported
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.5
 --------------------------------------------------------------------------------

From 6097b7b9a9bc801f0ce996a5896a1695178aa8c1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Aug 2016 11:29:48 +0200
Subject: [PATCH 0551/2006] add dummy note

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index fc61e5ceb..b3ea12541 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+??
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 45fd0bf9346019542ef2b1b4ee383d15662cf576 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Aug 2016 11:49:52 +0200
Subject: [PATCH 0552/2006] set timeout of mytasks ajax call to 1000ms

---
 styles/bootstrap/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 4ec1f61f9..b5283068c 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -892,7 +892,7 @@ $(document).ready(function() {
 					revision_count = data.data.revision.length;
 				}
 			},
-			timeout: 200
+			timeout: 1000
 		}); 
 		timeOutId = setTimeout(checkTasks, 10000);
 	}

From 1cf7516cc31dc9fe59ff417f827d41282ddce586 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Aug 2016 11:52:14 +0200
Subject: [PATCH 0553/2006] add entry for 5.1.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 61659f69a..a965972cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - merge changes from 5.0.4
 - add two factor authentication based on google authenticator
+- set timeout for ajax call 'mytasks' from 200ms to 1000ms
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.0

From 3c6bd6bf6f53b3d2a868e4f145e5b3a47224dbc8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Aug 2016 13:37:04 +0200
Subject: [PATCH 0554/2006] check for su by regular user, call service hooks

---
 op/op.Ajax.php | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index b43e85881..b4f4fc324 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -50,15 +50,37 @@ if (isset($_COOKIE["mydms_session"])) {
 		echo json_encode(array('error'=>1));
 		exit;
 	}
-	$dms->setUser($user);
-	if($user->isAdmin()) {
-		if($resArr["su"]) {
-			$user = $dms->getUser($resArr["su"]);
+
+	if($resArr["su"] && $su = $dms->getUser($resArr["su"])) {
+		if($user->isAdmin() || $user->maySwitchToUser($su)) {
+			$user = $su;
+		} else {
+			$session->resetSu();
 		}
 	}
+	$dms->setUser($user);
+	$role = $user->getRole();
+	$dms->noReadForStatus = $role->getNoAccess();
+
 	$notifier = new SeedDMS_NotificationService();
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
+			if(method_exists($notificationObj, 'preAddService')) {
+				$notificationObj->preAddService($notifier);
+			}
+		}
+	}
+
 	if($settings->_enableEmail) {
-		$notifier->addService(new SeedDMS_EmailNotify($dms));
+		$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword));
+	}
+
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
+			if(method_exists($notificationObj, 'postAddService')) {
+				$notificationObj->postAddService($notifier);
+			}
+		}
 	}
 	include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
 } else {

From 0fb14d4c6a12f33661ba5030340d5f2a67ec5d95 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 Aug 2016 14:47:06 +0200
Subject: [PATCH 0555/2006] more similar look of documents list

---
 views/bootstrap/class.ViewDocument.php | 39 +++++++++-----------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8780a602b..98eeeb756 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -459,7 +459,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 		print "<table class=\"table\">";
 		print "<thead>\n<tr>\n";
-		print "<th colspan=\"2\">".$latestContent->getOriginalFileName()."</th>\n";
+		print "<th colspan=\"2\">".htmlspecialchars($latestContent->getOriginalFileName())."</th>\n";
 //		print "<th width='*'>".getMLText("file")."</th>\n";
 //		print "<th width='25%'>".getMLText("comment")."</th>\n";
 		print "<th width='20%'>".getMLText("status")."</th>\n";
@@ -467,17 +467,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</tr></thead><tbody>\n";
 		print "<tr>\n";
 		print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
-		/*
-		print "<ul class=\"actions unstyled\">";
-
-		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\" class=\"btn btn-medium\"><i class=\"icon-download\"></i><br />".getMLText("download")."</a></li>";
-			if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\" class=\"btn btn-medium\"><i class=\"icon-star\"></i><br />" . getMLText("view_online") . "</a></li>";
-		}else print "<li><img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></li>";
-
-		print "</ul>";
-		*/
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
 		$previewer->setConverters($previewconverters);
 		$previewer->createPreview($latestContent);
@@ -1209,11 +1198,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 			print "<table class=\"table\">";
 			print "<thead>\n<tr>\n";
-			print "<th width='10%'></th>\n";
-			print "<th width='30%'>".getMLText("file")."</th>\n";
-//			print "<th width='25%'>".getMLText("comment")."</th>\n";
-			print "<th width='15%'>".getMLText("status")."</th>\n";
-			print "<th width='20%'></th>\n";
+			print "<th colspan=\"2\"></th>\n";
+			print "<th width='20%'>".getMLText("status")."</th>\n";
+			print "<th width='25%'></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
 			for ($i = count($versions)-2; $i >= 0; $i--) {
@@ -1226,7 +1213,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$file_exists=file_exists($dms->contentDir . $version->getPath());
 
 				print "<tr>\n";
-				print "<td nowrap>";
+				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
 				if($file_exists) {
 					if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes)) {
 							print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\">";
@@ -1245,7 +1232,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 				print "</td>\n";
 				print "<td><ul class=\"unstyled\">\n";
-				print "<li>".$version->getOriginalFileName()."</li>\n";
+				print "<li>".htmlspecialchars($version->getOriginalFileName())."</li>\n";
 				print "<li>".getMLText('version').": ".$version->getVersion()."</li>\n";
 				if ($file_exists) print "<li>". SeedDMS_Core_File::format_filesize($version->getFileSize()) .", ".htmlspecialchars($version->getMimeType())."</li>";
 				else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>";
@@ -1398,11 +1385,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$targetDoc = $link->getTarget();
 				$targetlc = $targetDoc->getLatestContent();
 
-				$previewer->createPreview($targetlc, $previewwidthlist);
+				$previewer->createPreview($targetlc, $previewwidthdetail);
 				print "<tr>";
-				print "<td><a href=\"../op/op.Download.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."\">";
+				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
+				print "<a href=\"../op/op.Download.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."\">";
 				if($previewer->hasPreview($targetlc)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\"src=\"../op/op.Preview.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
 				} else {
 					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($targetlc->getFileType())."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
 				}
@@ -1469,11 +1457,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$sourceDoc = $link->getDocument();
 				$sourcelc = $sourceDoc->getLatestContent();
 
-				$previewer->createPreview($sourcelc, $previewwidthlist);
+				$previewer->createPreview($sourcelc, $previewwidthdetail);
 				print "<tr>";
-				print "<td><a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
+				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
+				print "<a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
 				if($previewer->hasPreview($sourcelc)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\"src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
+					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
 				} else {
 					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($sourcelc->getFileType())."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
 				}

From 9f795860172de539863da1a045fba76fea110f97 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 Aug 2016 14:49:22 +0200
Subject: [PATCH 0556/2006] add entry for 5.1.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3cfe2f00c..3875b6668 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - merge changes from 5.0.4
 - add two factor authentication based on google authenticator
 - set timeout for ajax call 'mytasks' from 200ms to 1000ms
+- use a similar layout for document list on the ViewDocument page
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.0

From b3ec207213e9873273d58ea65d41bedef7f44413 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Aug 2016 12:43:06 +0200
Subject: [PATCH 0557/2006] do not set datetime to '0000-00-00 00:00:00' by
 default

depending in the sql mode in mysql this is is not allowed
---
 install/create_tables-innodb.sql        | 26 ++++++++++-----------
 install/create_tables-sqlite3.sql       | 30 ++++++++++++-------------
 install/update-5.1.0/update-sqlite3.sql | 14 ++++++------
 install/update-5.1.0/update.sql         | 22 +++++++++++++-----
 4 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index f1574c11c..296c508e9 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -77,7 +77,7 @@ CREATE TABLE `tblUsers` (
   `comment` text NOT NULL,
   `role` int(11) NOT NULL,
   `hidden` smallint(1) NOT NULL default '0',
-  `pwdExpiration` datetime NOT NULL default '0000-00-00 00:00:00',
+  `pwdExpiration` datetime default NULL,
   `loginfailures` tinyint(4) NOT NULL default '0',
   `disabled` smallint(1) NOT NULL default '0',
   `quota` bigint,
@@ -113,7 +113,7 @@ CREATE TABLE `tblUserPasswordRequest` (
   `id` int(11) NOT NULL auto_increment,
   `userID` int(11) NOT NULL default '0',
   `hash` varchar(50) default NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblUserPasswordRequest_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -128,7 +128,7 @@ CREATE TABLE `tblUserPasswordHistory` (
   `id` int(11) NOT NULL auto_increment,
   `userID` int(11) NOT NULL default '0',
   `pwd` varchar(50) default NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblUserPasswordHistory_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -259,7 +259,7 @@ CREATE TABLE `tblDocumentApproveLog` (
   `approveID` int(11) NOT NULL default '0',
   `status` tinyint(4) NOT NULL default '0',
   `comment` text NOT NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `userID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`approveLogID`),
   CONSTRAINT `tblDocumentApproveLog_approve` FOREIGN KEY (`approveID`) REFERENCES `tblDocumentApprovers` (`approveID`) ON DELETE CASCADE,
@@ -374,7 +374,7 @@ CREATE TABLE `tblDocumentCheckOuts` (
   `document` int(11) NOT NULL default '0',
   `version` smallint(5) unsigned NOT NULL default '0',
   `userID` int(11) NOT NULL default '0',
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `filename` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`document`),
   CONSTRAINT `tblDocumentCheckOuts_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
@@ -409,7 +409,7 @@ CREATE TABLE `tblDocumentReviewLog` (
   `reviewID` int(11) NOT NULL default '0',
   `status` tinyint(4) NOT NULL default '0',
   `comment` text NOT NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `userID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`reviewLogID`),
   CONSTRAINT `tblDocumentReviewLog_review` FOREIGN KEY (`reviewID`) REFERENCES `tblDocumentReviewers` (`reviewID`) ON DELETE CASCADE,
@@ -444,7 +444,7 @@ CREATE TABLE `tblDocumentReceiptLog` (
   `receiptID` int(11) NOT NULL default '0',
   `status` tinyint(4) NOT NULL default '0',
   `comment` text NOT NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `userID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`receiptLogID`),
   CONSTRAINT `tblDocumentReceiptLog_recipient` FOREIGN KEY (`receiptID`) REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
@@ -480,7 +480,7 @@ CREATE TABLE `tblDocumentRevisionLog` (
   `revisionID` int(11) NOT NULL default '0',
   `status` tinyint(4) NOT NULL default '0',
   `comment` text NOT NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `userID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`revisionLogID`),
   CONSTRAINT `tblDocumentRevisionLog_revision` FOREIGN KEY (`revisionID`) REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
@@ -512,7 +512,7 @@ CREATE TABLE `tblDocumentStatusLog` (
   `statusID` int(11) NOT NULL default '0',
   `status` tinyint(4) NOT NULL default '0',
   `comment` text NOT NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `userID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`statusLogID`),
   KEY `statusID` (`statusID`),
@@ -772,7 +772,7 @@ CREATE TABLE tblWorkflowLog (
   `workflow` int(11) default NULL,
   `userid` int(11) default NULL,
   `transition` int(11) default NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `comment` text,
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblWorkflowLog_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
@@ -793,7 +793,7 @@ CREATE TABLE tblWorkflowDocumentContent (
   `document` int(11) DEFAULT NULL,
   `version` smallint(5) DEFAULT NULL,
   `state` int(11) DEFAULT NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   CONSTRAINT `tblWorkflowDocument_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblWorkflowDocument_workflow` FOREIGN KEY (`workflow`) REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblWorkflowDocument_state` FOREIGN KEY (`state`) REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE
@@ -824,7 +824,7 @@ CREATE TABLE `tblTransmittals` (
   `name` text NOT NULL,
   `comment` text NOT NULL,
   `userID` int(11) NOT NULL default '0',
-  `date` datetime,
+  `date` datetime NOT NULL,
   `public` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblTransmittals_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
@@ -841,7 +841,7 @@ CREATE TABLE `tblTransmittalItems` (
   `transmittal` int(11) NOT NULL DEFAULT '0',
   `document` int(11) default NULL,
   `version` smallint(5) unsigned NOT NULL default '0',
-  `date` datetime,
+  `date` datetime NOT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE (document, version),
   CONSTRAINT `tblTransmittalItems_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 92f2654e8..6429925a9 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -73,7 +73,7 @@ CREATE TABLE `tblUsers` (
   `comment` text NOT NULL,
   `role` INTEGER NOT NULL REFERENCES `tblRoles` (`id`),
   `hidden` INTEGER NOT NULL default '0',
-  `pwdExpiration` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `pwdExpiration` TEXT NOT NULL,
   `loginfailures` INTEGER NOT NULL default '0',
   `disabled` INTEGER NOT NULL default '0',
   `quota` INTEGER,
@@ -104,7 +104,7 @@ CREATE TABLE `tblUserPasswordRequest` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
   `hash` varchar(50) default NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00'
+  `date` TEXT NOT NULL
 );
 
 -- --------------------------------------------------------
@@ -117,7 +117,7 @@ CREATE TABLE `tblUserPasswordHistory` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
   `pwd` varchar(50) default NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00'
+  `date` TEXT NOT NULL
 );
 
 -- --------------------------------------------------------
@@ -228,7 +228,7 @@ CREATE TABLE `tblDocumentApproveLog` (
   `approveID` INTEGER NOT NULL default '0' REFERENCES `tblDocumentApprovers` (`approveID`) ON DELETE CASCADE,
   `status` INTEGER NOT NULL default '0',
   `comment` TEXT NOT NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
 
@@ -251,7 +251,7 @@ CREATE TABLE `tblDocumentContent` (
   `mimeType` varchar(70) NOT NULL default '',
   `fileSize` INTEGER,
   `checksum` char(32),
-  `revisiondate` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `revisiondate` TEXT NOT NULL,
   UNIQUE (`document`,`version`)
 ) ;
 
@@ -323,7 +323,7 @@ CREATE TABLE `tblDocumentCheckOuts` (
   `document` INTEGER REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`),
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `filename` varchar(255) NOT NULL default '',
   UNIQUE (`document`)
 ) ;
@@ -354,7 +354,7 @@ CREATE TABLE `tblDocumentReviewLog` (
   `reviewID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentReviewers` (`reviewID`) ON DELETE CASCADE,
   `status` INTEGER NOT NULL default 0,
   `comment` TEXT NOT NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
 
@@ -384,7 +384,7 @@ CREATE TABLE `tblDocumentReceiptLog` (
   `receiptID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
   `status` INTEGER NOT NULL default 0,
   `comment` TEXT NOT NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
 
@@ -415,7 +415,7 @@ CREATE TABLE `tblDocumentRevisionLog` (
   `revisionID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
   `status` INTEGER NOT NULL default 0,
   `comment` TEXT NOT NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
 
@@ -443,7 +443,7 @@ CREATE TABLE `tblDocumentStatusLog` (
   `statusID` INTEGER NOT NULL default '0' REFERENCES `tblDocumentStatus` (`statusID`) ON DELETE CASCADE,
   `status` INTEGER NOT NULL default '0',
   `comment` text NOT NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
 
@@ -671,7 +671,7 @@ CREATE TABLE tblWorkflowLog (
   `workflow` INTEGER default NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE,
   `userid` INTEGER default NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
   `transition` INTEGER default NULL REFERENCES `tblWorkflowTransitions` (`id`) ON DELETE CASCADE,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `comment` text
 ) ;
 
@@ -687,7 +687,7 @@ CREATE TABLE tblWorkflowDocumentContent (
   `document` INTEGER DEFAULT NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` smallint DEFAULT NULL,
   `state` INTEGER DEFAULT NULL REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00'
+  `date` datetime NOT NULL
 ) ;
 
 -- --------------------------------------------------------
@@ -713,7 +713,7 @@ CREATE TABLE tblTransmittals (
   `name` text NOT NULL,
   `comment` text NOT NULL,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `public` INTEGER NOT NULL default '0'
 );
 
@@ -728,7 +728,7 @@ CREATE TABLE `tblTransmittalItems` (
   `transmittal` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE,
   `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   UNIQUE (document, version)
 );
 
@@ -785,7 +785,7 @@ CREATE TABLE `tblArosAcos` (
 -- 
 
 CREATE TABLE `tblVersion` (
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `major` smallint,
   `minor` smallint,
   `subminor` smallint
diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index b33caa4a4..0afe6f5a5 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` TEXT NOT NULL default '0000-00-00 00:00:00';
+ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` TEXT NOT NULL;
 
 ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL;
 
@@ -15,7 +15,7 @@ CREATE TABLE `tblDocumentCheckOuts` (
   `document` INTEGER REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`),
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `filename` varchar(255) NOT NULL default '',
   UNIQUE (`document`)
 ) ;
@@ -34,7 +34,7 @@ CREATE TABLE `tblDocumentReceiptLog` (
   `receiptID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
   `status` INTEGER NOT NULL default 0,
   `comment` TEXT NOT NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
 
@@ -53,7 +53,7 @@ CREATE TABLE `tblDocumentRevisionLog` (
   `revisionID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
   `status` INTEGER NOT NULL default 0,
   `comment` TEXT NOT NULL,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
 
@@ -62,7 +62,7 @@ CREATE TABLE tblTransmittals (
   `name` text NOT NULL,
   `comment` text NOT NULL,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   `public` INTEGER NOT NULL default '0'
 );
 
@@ -71,7 +71,7 @@ CREATE TABLE `tblTransmittalItems` (
 	`transmittal` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE,
   `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
-  `date` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `date` TEXT NOT NULL,
   UNIQUE (document, version)
 );
 
@@ -100,7 +100,7 @@ CREATE TABLE `new_tblUsers` (
   `comment` text NOT NULL,
   `role` INTEGER NOT NULL REFERENCES `tblRoles` (`id`),
   `hidden` INTEGER NOT NULL default '0',
-  `pwdExpiration` TEXT NOT NULL default '0000-00-00 00:00:00',
+  `pwdExpiration` TEXT default NULL,
   `loginfailures` INTEGER NOT NULL default '0',
   `disabled` INTEGER NOT NULL default '0',
   `quota` INTEGER,
diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index 73ce5b54d..34c5571cc 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -4,6 +4,18 @@ ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` datetime default NULL
 
 ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL AFTER `pwd`;
 
+ALTER TABLE `tblUsers` CHANGE `pwdExpiration` `pwdExpiration` datetime default NULL;
+
+ALTER TABLE `tblUserPasswordRequest` CHANGE `date` `date` datetime NOT NULL;
+
+ALTER TABLE `tblUserPasswordHistory` CHANGE `date` `date` datetime NOT NULL;
+
+ALTER TABLE `tblDocumentApproveLog` CHANGE `date` `date` datetime NOT NULL;
+
+ALTER TABLE `tblDocumentReviewLog` CHANGE `date` `date` datetime NOT NULL;
+
+ALTER TABLE `tblDocumentStatusLog` CHANGE `date` `date` datetime NOT NULL;
+
 CREATE TABLE `tblUserSubstitutes` (
   `id` int(11) NOT NULL auto_increment,
   `user` int(11) default null,
@@ -18,7 +30,7 @@ CREATE TABLE `tblDocumentCheckOuts` (
   `document` int(11) NOT NULL default '0',
   `version` smallint(5) unsigned NOT NULL default '0',
   `userID` int(11) NOT NULL default '0',
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `filename` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`document`),
   CONSTRAINT `tblDocumentCheckOuts_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
@@ -41,7 +53,7 @@ CREATE TABLE `tblDocumentReceiptLog` (
   `receiptID` int(11) NOT NULL default '0',
   `status` tinyint(4) NOT NULL default '0',
   `comment` text NOT NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `userID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`receiptLogID`),
   CONSTRAINT `tblDocumentReceiptLog_recipient` FOREIGN KEY (`receiptID`) REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
@@ -65,7 +77,7 @@ CREATE TABLE `tblDocumentRevisionLog` (
   `revisionID` int(11) NOT NULL default '0',
   `status` tinyint(4) NOT NULL default '0',
   `comment` text NOT NULL,
-  `date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `date` datetime NOT NULL,
   `userID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`revisionLogID`),
   CONSTRAINT `tblDocumentRevisionLog_revision` FOREIGN KEY (`revisionID`) REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
@@ -77,7 +89,7 @@ CREATE TABLE `tblTransmittals` (
   `name` text NOT NULL,
   `comment` text NOT NULL,
   `userID` int(11) NOT NULL default '0',
-  `date` datetime,
+  `date` datetime NOT NULL,
   `public` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblTransmittals_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
@@ -88,7 +100,7 @@ CREATE TABLE `tblTransmittalItems` (
 	`transmittal` int(11) NOT NULL DEFAULT '0',
   `document` int(11) default NULL,
   `version` smallint(5) unsigned NOT NULL default '0',
-  `date` datetime,
+  `date` datetime NOT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE (document, version),
   CONSTRAINT `tblTransmittalItems_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,

From 83dcd9da7b02749e3804520b54ce8c5c89eaa2de Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Aug 2016 12:49:59 +0200
Subject: [PATCH 0558/2006] do not use '0000-00-00 00:00:00' as date anymore

use NULL instead because '0000-00-00 00:00:00' in certain sql_modes
---
 SeedDMS_Core/Core/inc.ClassDMS.php         | 6 ++++--
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 4 ++--
 SeedDMS_Core/Core/inc.ClassUser.php        | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 581d7216d..80c1d57d0 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1639,8 +1639,10 @@ class SeedDMS_Core_DMS {
 		elseif($role == '')
 			$role = '0';
 		if(trim($pwdexpiration) == '')
-			$pwdexpiration = '0000-00-00 00:00:00';
-		$queryStr = "INSERT INTO tblUsers (login, pwd, fullName, email, language, theme, comment, role, hidden, disabled, pwdExpiration, quota, homefolder) VALUES (".$db->qstr($login).", ".$db->qstr($pwd).", ".$db->qstr($fullName).", ".$db->qstr($email).", '".$language."', '".$theme."', ".$db->qstr($comment).", '".intval($role)."', '".intval($isHidden)."', '".intval($isDisabled)."', ".$db->qstr($pwdexpiration).", '".intval($quota)."', ".($homefolder ? intval($homefolder) : "NULL").")";
+			$pwdexpiration = 'NULL';
+		else
+			$pwdexpiration = $db->qstr($pwdexpiration);
+		$queryStr = "INSERT INTO tblUsers (login, pwd, fullName, email, language, theme, comment, role, hidden, disabled, pwdExpiration, quota, homefolder) VALUES (".$db->qstr($login).", ".$db->qstr($pwd).", ".$db->qstr($fullName).", ".$db->qstr($email).", '".$language."', '".$theme."', ".$db->qstr($comment).", '".intval($role)."', '".intval($isHidden)."', '".intval($isDisabled)."', ".$pwdexpiration.", '".intval($quota)."', ".($homefolder ? intval($homefolder) : "NULL").")";
 		$res = $this->db->getResult($queryStr);
 		if (!$res)
 			return false;
diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index 2a4dbcf7c..6f847f446 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -79,7 +79,7 @@ class SeedDMS_Core_Transmittal {
 	 */
 	var $_dms;
 
-	function SeedDMS_Core_Transmittal($id, $user, $name, $comment, $isPublic=0, $date='0000-00-00 00:00:00') {
+	function SeedDMS_Core_Transmittal($id, $user, $name, $comment, $isPublic=0, $date='') {
 		$this->_id = $id;
 		$this->_name = $name;
 		$this->_comment = $comment;
@@ -312,7 +312,7 @@ class SeedDMS_Core_TransmittalItem {
 	 */
 	var $_date;
 
-	function SeedDMS_Core_TransmittalItem($id, $transmittal, $content, $date='0000-00-00 00:00:00') {
+	function SeedDMS_Core_TransmittalItem($id, $transmittal, $content, $date='') {
 		$this->_id = $id;
 		$this->_transmittal = $transmittal;
 		$this->_content = $content;
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 3dbe76a08..27d4a19ce 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -372,7 +372,7 @@ class SeedDMS_Core_User { /* {{{ */
 	const role_admin = '1';
 	const role_guest = '2';
 
-	function __construct($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0, $isDisabled=0, $pwdExpiration='0000-00-00 00:00:00', $loginFailures=0, $quota=0, $homeFolder=null, $secret='') {
+	function __construct($id, $login, $pwd, $fullName, $email, $language, $theme, $comment, $role, $isHidden=0, $isDisabled=0, $pwdExpiration='', $loginFailures=0, $quota=0, $homeFolder=null, $secret='') {
 		$this->_id = $id;
 		$this->_login = $login;
 		$this->_pwd = $pwd;
@@ -529,8 +529,9 @@ class SeedDMS_Core_User { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if(trim($newPwdExpiration) == '')
-			$newPwdExpiration = '0000-00-00 00:00:00';
-		$queryStr = "UPDATE tblUsers SET pwdExpiration =".$db->qstr($newPwdExpiration)." WHERE id = " . $this->_id;
+			$queryStr = "UPDATE tblUsers SET pwdExpiration = NULL WHERE id = " . $this->_id;
+		else
+			$queryStr = "UPDATE tblUsers SET pwdExpiration =".$db->qstr($newPwdExpiration)." WHERE id = " . $this->_id;
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;

From dac9c7b37f3f6087075280b37096d8f4c03bbed9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Aug 2016 12:57:07 +0200
Subject: [PATCH 0559/2006] check also for '' in pwdExpiration

---
 inc/inc.Authentication.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 0ddbc4d7e..8c314f585 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -136,7 +136,7 @@ if (!$user->isAdmin() && $origuser == null) {
 	if($settings->_passwordExpiration > 0) {
 		if(basename($_SERVER['SCRIPT_NAME']) != 'out.ForcePasswordChange.php' && basename($_SERVER['SCRIPT_NAME']) != 'op.EditUserData.php') {
 			$pwdexp = $user->getPwdExpiration();
-			if(substr($pwdexp, 0, 10) != '0000-00-00') {
+			if($pwdexp && substr($pwdexp, 0, 10) != '0000-00-00') {
 				$pwdexpts = strtotime($pwdexp); // + $pwdexp*86400;
 				if($pwdexpts > 0 && $pwdexpts < time()) {
 					header("Location: ../out/out.ForcePasswordChange.php");

From 229b7e874fd5f8986c265be52d697489a8b6322e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Aug 2016 20:21:30 +0200
Subject: [PATCH 0560/2006] set pwdExpiration to 'keep' instead of ''

set '' as value for never
---
 op/op.UsrMgr.php                 | 2 +-
 views/bootstrap/class.UsrMgr.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index ff98a0068..0054778e4 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -243,7 +243,7 @@ else if ($action == "edituser") {
 	}
 	if ($editedUser->getLogin() != $login)
 		$editedUser->setLogin($login);
-	if($pwdexpiration)
+	if($pwdexpiration != 'keep')
 		$editedUser->setPwdExpiration($pwdexpiration);
 	if($role->isGuest() && $clearpwd) {
 		$editedUser->setPwd('');
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 337d6841f..ecc7993c7 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -223,7 +223,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td><?php printMLText("password_expiration");?>:</td>
-			<td><select name="pwdexpiration"><?php if($currUser) { ?><option value=""><?php printMLText("keep");?></option><?php } ?><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option><option value="0000-00-00"><?php printMLText("never");?></option></select> <?php echo $currUser ? $currUser->getPwdExpiration() : ""; ?></td>
+			<td><select name="pwdexpiration"><?php if($currUser) { ?><option value="keep"><?php printMLText("keep");?></option><?php } ?><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option><option value=""><?php printMLText("never");?></option></select> <?php echo $currUser ? $currUser->getPwdExpiration() : ""; ?></td>
 		</tr>
 <?php
 	}

From d2e959e32eeab62ba06136fed93a640b66bc2be5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Aug 2016 20:28:35 +0200
Subject: [PATCH 0561/2006] add command to set sql_mode as default by Ubuntu
 16.04 (not active)

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 4bd77a0d8..5d48723cf 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -181,6 +181,8 @@ class SeedDMS_Core_DatabaseAccess {
 				$this->_conn->exec('SET NAMES utf8');
 				/* Turn this on if you want strict checking of default values, etc. */
 //				$this->_conn->exec("SET SESSION sql_mode = 'STRICT_TRANS_TABLES'");
+				/* The following is the default on Ubuntu 16.04 */
+//				$this->_conn->exec("SET SESSION sql_mode = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'");
 				break;
 			case 'sqlite':
 				$this->_conn->exec('PRAGMA foreign_keys = ON');

From eef3b282702c7659da356c6dfdad1ebff0a9ab76 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Aug 2016 15:14:17 +0200
Subject: [PATCH 0562/2006] getDocumentList() accepts parameter for direction
 of order

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 80c1d57d0..9d8e2ef82 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -733,7 +733,7 @@ class SeedDMS_Core_DMS {
 	 * І have already taken care of.
 	 * @return array list of documents
 	 */
-	function getDocumentList($listtype, $param1=null, $param2='') { /* {{{ */
+	function getDocumentList($listtype, $param1=null, $param2='', $param3='') { /* {{{ */
 		/* The following query will get all documents and lots of additional
 		 * information. It requires the two temporary tables ttcontentid and
 		 * ttstatid.
@@ -919,11 +919,16 @@ class SeedDMS_Core_DMS {
 		case 'MyDocs': // Documents owned by me
 			$user = $param1;
 			$orderby = $param2;
+			if($param3 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
 			$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."' ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
 			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
 			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
 			break;
 		case 'CheckedOutByMe': // Documents I have checked out
 			$user = $param1;

From 8165ee4776916014be91016ac41a92499180daed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Aug 2016 15:15:00 +0200
Subject: [PATCH 0563/2006] remove opacity for badge

---
 styles/bootstrap/application.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index 4d24775a6..ac8471915 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -222,7 +222,6 @@ ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
 	float: right;
 	margin-top: 2px;
 	margin-right: -6px;
-	opacity: .25;
 }
 .bs-docs-sidenav > li > a:hover {
 	background-color: #f5f5f5;

From a87ae68c2434eddfe0cdc1de4e6cb1a53d438732 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Aug 2016 15:15:47 +0200
Subject: [PATCH 0564/2006] put list of all documents onto page with all other
 doc lists

---
 out/out.MyDocuments.php               |  6 ++++
 views/bootstrap/class.MyDocuments.php | 51 ++++++++++++++++++---------
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 442fe0255..4c249a40e 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -46,9 +46,15 @@ $orderby='n';
 if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 	$orderby=$_GET["orderby"];
 }
+$orderby='asc';
+if (!empty($_GET["orderdir"])) {
+	$orderdir=$_GET["orderdir"];
+}
 
 if($view) {
 	$view->setParam('orderby', $orderby);
+	$view->setParam('orderdir', $orderdir);
+	$view->setParam('showtree', showtree());
 	$view->setParam('showinprocess', $showInProcess);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('cachedir', $settings->_cacheDir);
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 42e76939a..b68601e50 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -43,7 +43,12 @@ $(document).ready( function() {
 	$('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){
 		ev.preventDefault();
 		$('#kkkk.ajax').data('action', $(this).data('action'));
-		$('#kkkk.ajax').trigger('update', {userid: $(this).val()});
+		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
+	});
+	$('body').on('click', 'table th a', function(ev){
+		ev.preventDefault();
+		$('#kkkk.ajax').data('action', $(this).data('action'));
+		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby'), orderdir: $(this).data('orderdir')});
 	});
 });
 <?php
@@ -463,7 +468,9 @@ $(document).ready( function() {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
+		$showtree = $this->params['showtree'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
@@ -472,7 +479,7 @@ $(document).ready( function() {
 		$previewer->setConverters($previewconverters);
 
 		/* Get list of documents owned by current user */
-		$resArr = $dms->getDocumentList('MyDocs', $user, $orderby);
+		$resArr = $dms->getDocumentList('MyDocs', $user, $orderby, $orderdir == 'desc' ? 'desc' : '');
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -488,17 +495,23 @@ $(document).ready( function() {
 			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>";
-			print "<th><a href=\"../out/out.MyDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
-			print "<th><a href=\"../out/out.MyDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
-			print "<th>".getMLText("version")."</th>\n";
-			print "<th><a href=\"../out/out.MyDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n";
-			print "<th><a href=\"../out/out.MyDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
+			print "<th><a data-action=\"listMyDocs\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> / <a data-action=\"listMyDocs\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> / <a data-action=\"listMyDocs\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a></th>\n";
+			print "<th><a data-action=\"listMyDocs\" data-orderby=\"s\">".getMLText("status")."</a></th>\n";
+			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
 			foreach ($resArr as $res) {
 				$document = $dms->getDocument($res["documentID"]);
 				$document->verifyLastestContentExpriry();
-			
+
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo $this->documentListRow($document, $previewer, false, $res['version']);
+				}
+
+if(0) {
 				// verify expiry
 				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
 					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
@@ -524,6 +537,7 @@ $(document).ready( function() {
 					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
 					print "</tr>\n";
 				}
+}
 			}
 			print "</tbody></table>";
 		}
@@ -1147,6 +1161,7 @@ $(document).ready( function() {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$showInProcess = $this->params['showinprocess'];
 		$cachedir = $this->params['cachedir'];
 		$workflowmode = $this->params['workflowmode'];
@@ -1167,29 +1182,31 @@ $(document).ready( function() {
 			echo '<div class="row-fluid">';
 			echo '<div class="span3">';
 			echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
+			$resArr = $dms->getDocumentList('MyDocs', $user);
+			echo '<li class=""><a data-href="#all_documents" data-action="listMyDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("all_documents").'</a></li>';
 			if($workflowmode == 'traditional') {
 				$resArr = $dms->getDocumentList('AppRevByMe', $user);
-				echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>';
+				echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>';
 			}
 			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 				$resArr = $dms->getDocumentList('AppRevByMe', $user);
-				echo '<li class=""><a data-href="#documents_to_approve" data-action="listApprovals"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_approve").'</a></li>';
+				echo '<li class=""><a data-href="#documents_to_approve" data-action="listApprovals"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_approve").'</a></li>';
 			} else {
 				$resArr = $dms->getDocumentList('WorkflowByMe', $user);
-				echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>';
+				echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>';
 			}
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
-			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
+			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
 			$resArr = $dms->getDocumentList('ReviseByMe', $user);
-			echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
+			echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
 			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-			echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
+			echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
 			$resArr = $dms->getDocumentList('RejectOwner', $user);
-			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
+			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
 			$resArr = $dms->getDocumentList('LockedByMe', $user);
-			echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
+			echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
 			$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
-			echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
+			echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
       echo '</ul>';
 			echo '</div>';
 			echo '<div class="span9">';

From 71e0fd36adb362e1d4fb77a8e912fd5c1682f881 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Aug 2016 15:16:20 +0200
Subject: [PATCH 0565/2006] take out links to different doc lists in mydocument
 menu

all lists are now on the start page of MyDocuments
---
 views/bootstrap/class.Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 0d2524a16..eff9b86b0 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -662,8 +662,8 @@ $(document).ready(function () {
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "<ul class=\"nav\">\n";
 
-		echo "<li><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("documents_in_process")."</a></li>\n";
-		echo "<li><a href=\"../out/out.MyDocuments.php\">".getMLText("all_documents")."</a></li>\n";
+//		echo "<li><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("documents_in_process")."</a></li>\n";
+//		echo "<li><a href=\"../out/out.MyDocuments.php\">".getMLText("all_documents")."</a></li>\n";
 		if($this->params['workflowmode'] == 'traditional' || $this->params['workflowmode'] == 'traditional_only_approval') {
 			if($this->params['workflowmode'] == 'traditional')
 				echo "<li><a href=\"../out/out.ReviewSummary.php\">".getMLText("review_summary")."</a></li>\n";

From eb2f3c7148da6119afdf92f094b559bc0e990854 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Aug 2016 17:14:57 +0200
Subject: [PATCH 0566/2006] AppRevOwner list can ordered by passed parameter

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 9d8e2ef82..4c5ba137f 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -895,9 +895,21 @@ class SeedDMS_Core_DMS {
 			break;
 		case 'AppRevOwner': // Documents waiting for review/approval I'm owning
 			$user = $param1;
-			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
-				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ".
-				"ORDER BY `statusDate` DESC";
+			$orderby = $param2;
+			if($param3 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+			$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+//			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+//				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ".
+//				"ORDER BY `statusDate` DESC";
 			break;
 		case 'RejectOwner': // Documents that has been rejected and I'm owning
 			$user = $param1;

From 31fd01cc71a8e54a5a32787741f42d765e257f91 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Aug 2016 17:15:26 +0200
Subject: [PATCH 0567/2006] pass timeout to view

---
 out/out.TransmittalMgr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index e9642f828..b9d460d21 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -48,6 +48,7 @@ if(isset($_GET['transmittalid']) && $_GET['transmittalid']) {
 if($view) {
 	$view->setParam('seltransmittal', $seltransmittal);
 	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('accessobject', $accessop);

From f397558f75348d59d42dfc8c0c79f202b1247aa2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Aug 2016 17:15:41 +0200
Subject: [PATCH 0568/2006] set proper default value for orderdir

---
 out/out.MyDocuments.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 4c249a40e..4b1d5372b 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -46,7 +46,7 @@ $orderby='n';
 if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 	$orderby=$_GET["orderby"];
 }
-$orderby='asc';
+$orderdir='asc';
 if (!empty($_GET["orderdir"])) {
 	$orderdir=$_GET["orderdir"];
 }

From 739b6fb9a9a60c215906e55fbfe0cbb46533b8e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Aug 2016 17:16:04 +0200
Subject: [PATCH 0569/2006] use documentListRow() in all lists

---
 views/bootstrap/class.MyDocuments.php | 588 ++++++--------------------
 1 file changed, 137 insertions(+), 451 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index b68601e50..5fae130d4 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -57,6 +57,8 @@ $(document).ready( function() {
 	function listReviews() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
@@ -68,7 +70,7 @@ $(document).ready( function() {
 				// Get document list for the current user.
 				$reviewStatus = $user->getReviewStatus();
 
-				$resArr = $dms->getDocumentList('AppRevByMe', $user);
+				$resArr = $dms->getDocumentList('AppRevByMe', $user, $orderby, $orderdir);
 				if (is_bool($resArr) && !$resArr) {
 					$this->contentHeading(getMLText("warning"));
 					$this->contentContainer(getMLText("internal_error_exit"));
@@ -84,20 +86,11 @@ $(document).ready( function() {
 					 */
 					$docIdx = array();
 					foreach ($resArr as $res) {
-						
-						/* verify expiry */
-						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-							if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-								$res["status"]=S_EXPIRED;
-							}
-						}
-
 						$docIdx[$res["id"]][$res["version"]] = $res;
 					}
 
 					// List the documents for which a review has been requested.
 						$this->contentHeading(getMLText("documents_to_review"));
-			//			$this->contentContainerStart();
 						$printheader=true;
 						$iRev = array();
 						$dList = array();
@@ -113,30 +106,17 @@ $(document).ready( function() {
 									print "<thead>\n<tr>\n";
 									print "<th></th>\n";
 									print "<th>".getMLText("name")."</th>\n";
-									print "<th>".getMLText("owner")."</th>\n";
-									print "<th>".getMLText("version")."</th>\n";
-									print "<th>".getMLText("last_update")."</th>\n";
-									print "<th>".getMLText("expires")."</th>\n";
+									print "<th>".getMLText("status")."</th>\n";
+									print "<th>".getMLText("action")."</th>\n";
 									print "</tr>\n</thead>\n<tbody>\n";
 									$printheader=false;
 								}
 							
-								if($content = $document->getContentByVersion($st['version'])) {
-									print "<tr>\n";
-									$previewer->createPreview($content);
-									print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-									if($previewer->hasPreview($content)) {
-										print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-									} else {
-										print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-									}
-									print "</a></td>";
-									print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-									print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-									print "<td>".$st["version"]."</td>";
-									print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-									print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-									print "</tr>\n";
+								$txt = $this->callHook('documentListItem', $document, $previewer);
+								if(is_string($txt))
+									echo $txt;
+								else {
+									echo $this->documentListRow($document, $previewer, false, $st['version']);
 								}
 							}
 						}
@@ -152,30 +132,17 @@ $(document).ready( function() {
 									print "<thead>\n<tr>\n";
 									print "<th></th>\n";
 									print "<th>".getMLText("name")."</th>\n";
-									print "<th>".getMLText("owner")."</th>\n";
-									print "<th>".getMLText("version")."</th>\n";
-									print "<th>".getMLText("last_update")."</th>\n";
-									print "<th>".getMLText("expires")."</th>\n";
+									print "<th>".getMLText("status")."</th>\n";
+									print "<th>".getMLText("action")."</th>\n";
 									print "</tr>\n</thead>\n<tbody>\n";
 									$printheader=false;
 								}
 
-								if($content = $document->getContentByVersion($st['version'])) {
-									print "<tr>\n";
-									$previewer->createPreview($content);
-									print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-									if($previewer->hasPreview($content)) {
-										print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-									} else {
-										print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-									}
-									print "</a></td>";
-									print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-									print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-									print "<td>".$st["version"]."</td>";
-									print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-									print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-									print "</tr>\n";
+								$txt = $this->callHook('documentListItem', $document, $previewer);
+								if(is_string($txt))
+									echo $txt;
+								else {
+									echo $this->documentListRow($document, $previewer, false, $st['version']);
 								}
 							}
 						}
@@ -184,7 +151,6 @@ $(document).ready( function() {
 						}else{
 							printMLText("no_docs_to_review");
 						}
-//						$this->contentContainerEnd();
 				} else {
 						$this->contentHeading(getMLText("documents_to_review"));
 						$this->contentContainerStart();
@@ -197,6 +163,8 @@ $(document).ready( function() {
 	function listApprovals() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
@@ -207,7 +175,7 @@ $(document).ready( function() {
 
 				$approvalStatus = $user->getApprovalStatus();
 
-				$resArr = $dms->getDocumentList('AppRevByMe', $user);
+				$resArr = $dms->getDocumentList('AppRevByMe', $user, $orderby, $orderdir);
 				if (is_bool($resArr) && !$resArr) {
 					$this->contentHeading(getMLText("warning"));
 					$this->contentContainer(getMLText("internal_error_exit"));
@@ -223,20 +191,11 @@ $(document).ready( function() {
 					 */
 					$docIdx = array();
 					foreach ($resArr as $res) {
-						
-						/* verify expiry */
-						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-							if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-								$res["status"]=S_EXPIRED;
-							}
-						}
-
 						$docIdx[$res["id"]][$res["version"]] = $res;
 					}
 
 					// List the documents for which an approval has been requested.
 					$this->contentHeading(getMLText("documents_to_approve"));
-					$this->contentContainerStart();
 					$printheader=true;
 					
 					foreach ($approvalStatus["indstatus"] as $st) {
@@ -250,30 +209,17 @@ $(document).ready( function() {
 								print "<thead>\n<tr>\n";
 								print "<th></th>\n";
 								print "<th>".getMLText("name")."</th>\n";
-								print "<th>".getMLText("owner")."</th>\n";
-								print "<th>".getMLText("version")."</th>\n";
-								print "<th>".getMLText("last_update")."</th>\n";
-								print "<th>".getMLText("expires")."</th>\n";
+								print "<th>".getMLText("status")."</th>\n";
+								print "<th>".getMLText("action")."</th>\n";
 								print "</tr>\n</thead>\n<tbody>\n";
 								$printheader=false;
 							}
 
-							if($content = $document->getContentByVersion($st['version'])) {
-								print "<tr>\n";
-								$previewer->createPreview($content);
-								print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-								if($previewer->hasPreview($content)) {
-									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-								} else {
-									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-								}
-								print "</a></td>";
-								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-								print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-								print "<td>".$st["version"]."</td>";
-								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-								print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";					
-								print "</tr>\n";
+							$txt = $this->callHook('documentListItem', $document, $previewer);
+							if(is_string($txt))
+								echo $txt;
+							else {
+								echo $this->documentListRow($document, $previewer, false, $st['version']);
 							}
 						}
 					}
@@ -287,30 +233,17 @@ $(document).ready( function() {
 								print "<thead>\n<tr>\n";
 								print "<th></th>\n";
 								print "<th>".getMLText("name")."</th>\n";
-								print "<th>".getMLText("owner")."</th>\n";
-								print "<th>".getMLText("version")."</th>\n";
-								print "<th>".getMLText("last_update")."</th>\n";
-								print "<th>".getMLText("expires")."</th>\n";
+								print "<th>".getMLText("status")."</th>\n";
+								print "<th>".getMLText("action")."</th>\n";
 								print "</tr>\n</thead>\n<tbody>\n";
 								$printheader=false;
 							}
 
-							if($content = $document->getContentByVersion($st['version'])) {
-								print "<tr>\n";
-								$previewer->createPreview($content);
-								print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-								if($previewer->hasPreview($content)) {
-									print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-								} else {
-									print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-								}
-								print "</a></td>";
-								print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revapp\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-								print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-								print "<td>".$st["version"]."</td>";				
-								print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-								print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-								print "</tr>\n";
+							$txt = $this->callHook('documentListItem', $document, $previewer);
+							if(is_string($txt))
+								echo $txt;
+							else {
+								echo $this->documentListRow($document, $previewer, false, $st['version']);
 							}
 						}
 					}
@@ -319,7 +252,6 @@ $(document).ready( function() {
 					 }else{
 						printMLText("no_docs_to_approve");
 					 }
-					$this->contentContainerEnd();
 				}
 				else {
 					$this->contentHeading(getMLText("documents_to_approve"));
@@ -333,6 +265,8 @@ $(document).ready( function() {
 	function listDocsToLookAt() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$workflowmode = $this->params['workflowmode'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
@@ -346,7 +280,7 @@ $(document).ready( function() {
 			/* Get list of documents owned by current user that are
 			 * pending review or pending approval.
 			 */
-			$resArr = $dms->getDocumentList('AppRevOwner', $user);
+			$resArr = $dms->getDocumentList('AppRevOwner', $user, $orderby, $orderdir);
 			if (is_bool($resArr) && !$resArr) {
 				$this->contentHeading(getMLText("warning"));
 				$this->contentContainer(getMLText("internal_error_exit"));
@@ -355,56 +289,33 @@ $(document).ready( function() {
 			}
 
 			$this->contentHeading(getMLText("documents_user_requiring_attention"));
-//			$this->contentContainerStart();
 			if (count($resArr)>0) {
 
 				print "<table class=\"table table-condensed\">";
 				print "<thead>\n<tr>\n";
 				print "<th></th>";
-				print "<th>".getMLText("name")."</th>\n";
+				print "<th><a data-action=\"listDocsToLookAt\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." / <a data-action=\"listDocsToLookAt\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." / <a data-action=\"listDocsToLookAt\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
 				print "<th>".getMLText("status")."</th>\n";
-				print "<th>".getMLText("version")."</th>\n";
-				print "<th>".getMLText("last_update")."</th>\n";
-				print "<th>".getMLText("expires")."</th>\n";
+				print "<th>".getMLText("action")."</th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
 
 				foreach ($resArr as $res) {
 					$document = $dms->getDocument($res["documentID"]);
 					$document->verifyLastestContentExpriry();
 				
-					// verify expiry
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-							$res["status"]=S_EXPIRED;
-						}
-					}
-				
-					if($content = $document->getContentByVersion($res['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-						print "<td>".getOverallStatusText($res["status"])."</td>";
-						print "<td>".$res["version"]."</td>";
-						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-						print "</tr>\n";
+					$txt = $this->callHook('documentListItem', $document, $previewer);
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->documentListRow($document, $previewer, false, $res['version']);
 					}
 				}		
 				print "</tbody></table>";	
 				
 			}
 			else printMLText("no_docs_to_look_at");
-			
-//			$this->contentContainerEnd();
 		} else {
-			$resArr = $dms->getDocumentList('WorkflowOwner', $user);
+			$resArr = $dms->getDocumentList('WorkflowOwner', $user, $orderby, $orderdir);
 			if (is_bool($resArr) && !$resArr) {
 				$this->contentHeading(getMLText("warning"));
 				$this->contentContainer("Internal error. Unable to complete request. Exiting.");
@@ -413,7 +324,6 @@ $(document).ready( function() {
 			}
 
 			$this->contentHeading(getMLText("documents_user_requiring_attention"));
-//			$this->contentContainerStart();
 			if (count($resArr)>0) {
 
 				print "<table class=\"table table-condensed\">";
@@ -421,46 +331,24 @@ $(document).ready( function() {
 				print "<th></th>";
 				print "<th>".getMLText("name")."</th>\n";
 				print "<th>".getMLText("status")."</th>\n";
-				print "<th>".getMLText("version")."</th>\n";
-				print "<th>".getMLText("last_update")."</th>\n";
-				print "<th>".getMLText("expires")."</th>\n";
+				print "<th>".getMLText("action")."</th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
 
 				foreach ($resArr as $res) {
 					$document = $dms->getDocument($res["documentID"]);
 					$document->verifyLastestContentExpriry();
 				
-					// verify expiry
-					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-						if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-							$res["status"]=S_EXPIRED;
-						}
-					}
-				
-					if($content = $document->getContentByVersion($res['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-						print "<td>".getOverallStatusText($res["status"])."</td>";
-						print "<td>".$res["version"]."</td>";
-						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-						print "</tr>\n";
+					$txt = $this->callHook('documentListItem', $document, $previewer);
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->documentListRow($document, $previewer, false, $res['version']);
 					}
 				}		
 				print "</tbody></table>";	
 				
 			}
 			else printMLText("no_docs_to_look_at");
-
-//			$this->contentContainerEnd();
 		}
 	} /* }}} */
 
@@ -479,7 +367,7 @@ $(document).ready( function() {
 		$previewer->setConverters($previewconverters);
 
 		/* Get list of documents owned by current user */
-		$resArr = $dms->getDocumentList('MyDocs', $user, $orderby, $orderdir == 'desc' ? 'desc' : '');
+		$resArr = $dms->getDocumentList('MyDocs', $user, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -488,14 +376,13 @@ $(document).ready( function() {
 		}
 
 		$this->contentHeading(getMLText("all_documents"));
-//		$this->contentContainerStart();
 
 		if (count($resArr)>0) {
 
 			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>";
-			print "<th><a data-action=\"listMyDocs\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> / <a data-action=\"listMyDocs\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> / <a data-action=\"listMyDocs\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a></th>\n";
+			print "<th><a data-action=\"listMyDocs\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." / <a data-action=\"listMyDocs\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." / <a data-action=\"listMyDocs\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
 			print "<th><a data-action=\"listMyDocs\" data-orderby=\"s\">".getMLText("status")."</a></th>\n";
 			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
@@ -510,45 +397,17 @@ $(document).ready( function() {
 				else {
 					echo $this->documentListRow($document, $previewer, false, $res['version']);
 				}
-
-if(0) {
-				// verify expiry
-				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-						$res["status"]=S_EXPIRED;
-					}
-				}
-			
-				if($content = $document->getContentByVersion($res['version'])) {
-					print "<tr>\n";
-					$previewer->createPreview($content);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($content)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ". htmlspecialchars($res["statusName"])."</td>";
-					//print "<td>".(!$res["expires"] ? getMLText("does_not_expire"):getReadableDate($res["expires"]))."</td>";				
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
-				}
-}
 			}
 			print "</tbody></table>";
 		}
 		else printMLText("empty_notify_list");
-		
-//		$this->contentContainerEnd();
 	} /* }}} */
 
 	function listWorkflow() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
@@ -560,7 +419,7 @@ if(0) {
 		// Get document list for the current user.
 		$workflowStatus = $user->getWorkflowStatus();
 
-		$resArr = $dms->getDocumentList('WorkflowByMe', $user);
+		$resArr = $dms->getDocumentList('WorkflowByMe', $user, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -575,20 +434,11 @@ if(0) {
 			// new document information is required.
 			$docIdx = array();
 			foreach ($resArr as $res) {
-				
-				// verify expiry
-				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-					if  ( $res["status"]==S_IN_WORKFLOW ){
-						$res["status"]=S_EXPIRED;
-					}
-				}
-
 				$docIdx[$res["id"]][$res["version"]] = $res;
 			}
 
 			// List the documents where a review has been requested.
 			$this->contentHeading(getMLText("documents_to_process"));
-//			$this->contentContainerStart();
 
 			$printheader=true;
 			$iRev = array();
@@ -605,30 +455,17 @@ if(0) {
 						print "<thead>\n<tr>\n";
 						print "<th></th>\n";
 						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("owner")."</th>\n";
-						print "<th>".getMLText("version")."</th>\n";
-						print "<th>".getMLText("last_update")."</th>\n";
-						print "<th>".getMLText("expires")."</th>\n";
+						print "<th>".getMLText("status")."</th>\n";
+						print "<th>".getMLText("action")."</th>\n";
 						print "</tr>\n</thead>\n<tbody>\n";
 						$printheader=false;
 					}
 				
-					if($content = $document->getContentByVersion($st['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]) ."</td>";
-						print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
+					$txt = $this->callHook('documentListItem', $document, $previewer);
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->documentListRow($document, $previewer, false, $st['version']);
 					}
 				}
 			}
@@ -644,30 +481,17 @@ if(0) {
 						print "<thead>\n<tr>\n";
 						print "<th></th>\n";
 						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("owner")."</th>\n";
-						print "<th>".getMLText("version")."</th>\n";
-						print "<th>".getMLText("last_update")."</th>\n";
-						print "<th>".getMLText("expires")."</th>\n";
+						print "<th>".getMLText("status")."</th>\n";
+						print "<th>".getMLText("action")."</th>\n";
 						print "</tr>\n</thead>\n<tbody>\n";
 						$printheader=false;
 					}
 
-					if($content = $document->getContentByVersion($st['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"])."</td>";
-						print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
+					$txt = $this->callHook('documentListItem', $document, $previewer);
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->documentListRow($document, $previewer, false, $st['version']);
 					}
 				}
 			}
@@ -676,7 +500,6 @@ if(0) {
 			}else{
 				printMLText("no_docs_to_check");
 			}
-//			$this->contentContainerEnd();
 		}
 
 	} /* }}} */
@@ -684,6 +507,8 @@ if(0) {
 	function listRevisions() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
@@ -695,7 +520,7 @@ if(0) {
 		// Get document list for the current user.
 		$revisionStatus = $user->getRevisionStatus();
 
-		$resArr = $dms->getDocumentList('ReviseByMe', $user);
+		$resArr = $dms->getDocumentList('ReviseByMe', $user, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -710,15 +535,10 @@ if(0) {
 			 */
 			$docIdx = array();
 			foreach ($resArr as $res) {
-				/* verify expiry */
-				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-					$res["status"]=S_EXPIRED;
-				}
 				$docIdx[$res["id"]][$res["version"]] = $res;
 			}
 
 			$this->contentHeading(getMLText("documents_to_revise"));
-//			$this->contentContainerStart();
 			$printheader=true;
 			$iRev = array();
 			$dList = array();
@@ -727,36 +547,24 @@ if(0) {
 				if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
 					$dList[] = $st["documentID"];
 					$document = $dms->getDocument($st["documentID"]);
+					$document->verifyLastestContentExpriry();
 				
 					if ($printheader){
 						print "<table class=\"table table-condensed\">";
 						print "<thead>\n<tr>\n";
 						print "<th></th>\n";
 						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("owner")."</th>\n";
-						print "<th>".getMLText("version")."</th>\n";
-						print "<th>".getMLText("last_update")."</th>\n";
-						print "<th>".getMLText("expires")."</th>\n";
+						print "<th>".getMLText("status")."</th>\n";
+						print "<th>".getMLText("action")."</th>\n";
 						print "</tr>\n</thead>\n<tbody>\n";
 						$printheader=false;
 					}
 				
-					if($content = $document->getContentByVersion($st['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
+					$txt = $this->callHook('documentListItem', $document, $previewer);
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->documentListRow($document, $previewer, false, $st['version']);
 					}
 				}
 			}
@@ -765,36 +573,24 @@ if(0) {
 				if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
 					$dList[] = $st["documentID"];
 					$document = $dms->getDocument($st["documentID"]);
+					$document->verifyLastestContentExpriry();
 
 					if ($printheader){
 						print "<table class=\"table table-condensed\">";
 						print "<thead>\n<tr>\n";
 						print "<th></th>\n";
 						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("owner")."</th>\n";
-						print "<th>".getMLText("version")."</th>\n";
-						print "<th>".getMLText("last_update")."</th>\n";
-						print "<th>".getMLText("expires")."</th>\n";
+						print "<th>".getMLText("status")."</th>\n";
+						print "<th>".getMLText("action")."</th>\n";
 						print "</tr>\n</thead>\n<tbody>\n";
 						$printheader=false;
 					}
 
-					if($content = $document->getContentByVersion($st['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=revision\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
+					$txt = $this->callHook('documentListItem', $document, $previewer);
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->documentListRow($document, $previewer, false, $st['version']);
 					}
 				}
 			}
@@ -803,7 +599,6 @@ if(0) {
 			}else{
 				printMLText("no_docs_to_revise");
 			}
-//			$this->contentContainerEnd();
 		}
 		else {
 			$this->contentHeading(getMLText("documents_to_revise"));
@@ -816,6 +611,8 @@ if(0) {
 	function listReceipts() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
@@ -825,7 +622,7 @@ if(0) {
 		$previewer->setConverters($previewconverters);
 
 		$receiptStatus = $user->getReceiptStatus();
-		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+		$resArr = $dms->getDocumentList('ReceiptByMe', $user, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -841,14 +638,9 @@ if(0) {
 			 */
 			$docIdx = array();
 			foreach ($resArr as $res) {
-				/* verify expiry */
-				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-					$res["status"]=S_EXPIRED;
-				}
 				$docIdx[$res["id"]][$res["version"]] = $res;
 			}
 			$this->contentHeading(getMLText("documents_to_receipt"));
-//			$this->contentContainerStart();
 			$printheader=true;
 			$iRev = array();
 			$dList = array();
@@ -857,36 +649,24 @@ if(0) {
 				if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
 					$dList[] = $st["documentID"];
 					$document = $dms->getDocument($st["documentID"]);
+					$document->verifyLastestContentExpriry();
 				
 					if ($printheader){
 						print "<table class=\"table table-condensed\">";
 						print "<thead>\n<tr>\n";
 						print "<th></th>\n";
 						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("owner")."</th>\n";
-						print "<th>".getMLText("version")."</th>\n";
-						print "<th>".getMLText("last_update")."</th>\n";
-						print "<th>".getMLText("expires")."</th>\n";
+						print "<th>".getMLText("status")."</th>\n";
+						print "<th>".getMLText("action")."</th>\n";
 						print "</tr>\n</thead>\n<tbody>\n";
 						$printheader=false;
 					}
 				
-					if($content = $document->getContentByVersion($st['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"]) ."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
+					$txt = $this->callHook('documentListItem', $document, $previewer);
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->documentListRow($document, $previewer, false, $st['version']);
 					}
 				}
 			}
@@ -895,36 +675,24 @@ if(0) {
 				if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
 					$dList[] = $st["documentID"];
 					$document = $dms->getDocument($st["documentID"]);
+					$document->verifyLastestContentExpriry();
 
 					if ($printheader){
 						print "<table class=\"table table-condensed\">";
 						print "<thead>\n<tr>\n";
 						print "<th></th>\n";
 						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("owner")."</th>\n";
-						print "<th>".getMLText("version")."</th>\n";
-						print "<th>".getMLText("last_update")."</th>\n";
-						print "<th>".getMLText("expires")."</th>\n";
+						print "<th>".getMLText("status")."</th>\n";
+						print "<th>".getMLText("action")."</th>\n";
 						print "</tr>\n</thead>\n<tbody>\n";
 						$printheader=false;
 					}
 
-					if($content = $document->getContentByVersion($st['version'])) {
-						print "<tr>\n";
-						$previewer->createPreview($content);
-						print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-						if($previewer->hasPreview($content)) {
-							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						} else {
-							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-						}
-						print "</a></td>";
-						print "<td><a href=\"out.ViewDocument.php?documentid=".$st["documentID"]."&currenttab=recipients\">".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["name"])."</a></td>";
-						print "<td>".htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["ownerName"])."</td>";
-						print "<td>".$st["version"]."</td>";
-						print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["documentID"]][$st["version"]]["statusName"])."</td>";
-						print "<td".($docIdx[$st["documentID"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["documentID"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["documentID"]][$st["version"]]["expires"]))."</td>";				
-						print "</tr>\n";
+					$txt = $this->callHook('documentListItem', $document, $previewer);
+					if(is_string($txt))
+						echo $txt;
+					else {
+						echo $this->documentListRow($document, $previewer, false, $st['version']);
 					}
 				}
 			}
@@ -933,7 +701,6 @@ if(0) {
 			}else{
 				printMLText("no_docs_to_receipt");
 			}
-//			$this->contentContainerEnd();
 		}
 		else {
 			$this->contentHeading(getMLText("documents_to_receipt"));
@@ -947,6 +714,8 @@ if(0) {
 	function listRejects() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
@@ -958,7 +727,7 @@ if(0) {
 		/* Get list of documents owned by current user that has
 		 * been rejected.
 		 */
-		$resArr = $dms->getDocumentList('RejectOwner', $user);
+		$resArr = $dms->getDocumentList('RejectOwner', $user, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -968,50 +737,27 @@ if(0) {
 
 		if (count($resArr)>0) {
 			$this->contentHeading(getMLText("documents_user_rejected"));
-//			$this->contentContainerStart();
 
 			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("version")."</th>\n";
-			print "<th>".getMLText("last_update")."</th>\n";
-			print "<th>".getMLText("expires")."</th>\n";
+			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
 			foreach ($resArr as $res) {
 				$document = $dms->getDocument($res["documentID"]);
 				$document->verifyLastestContentExpriry();
 			
-				// verify expiry
-				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-						$res["status"]=S_EXPIRED;
-					}
-				}
-			
-				if($content = $document->getContentByVersion($res['version'])) {
-					print "<tr>\n";
-					$previewer->createPreview($content);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($content)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo $this->documentListRow($document, $previewer, false, $res['version']);
 				}
 			}		
 			print "</tbody></table>";	
-			
-//			$this->contentContainerEnd();
 		}
 
 	} /* }}} */
@@ -1019,6 +765,8 @@ if(0) {
 	function listLockedDocs() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
@@ -1028,7 +776,7 @@ if(0) {
 		$previewer->setConverters($previewconverters);
 
 		/* Get list of documents locked by current user */
-		$resArr = $dms->getDocumentList('LockedByMe', $user);
+		$resArr = $dms->getDocumentList('LockedByMe', $user, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -1037,7 +785,6 @@ if(0) {
 		}
 
 		$this->contentHeading(getMLText("documents_locked_by_you"));
-//		$this->contentContainerStart();
 		if (count($resArr)>0) {
 
 			print "<table class=\"table table-condensed\">";
@@ -1045,37 +792,18 @@ if(0) {
 			print "<th></th>";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("version")."</th>\n";
-			print "<th>".getMLText("last_update")."</th>\n";
-			print "<th>".getMLText("expires")."</th>\n";
+			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
 			foreach ($resArr as $res) {
 				$document = $dms->getDocument($res["documentID"]);
+				$document->verifyLastestContentExpriry();
 			
-				// verify expiry
-				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-						$res["status"]=S_EXPIRED;
-					}
-				}
-			
-				if($content = $document->getContentByVersion($res['version'])) {
-					print "<tr>\n";
-					$previewer->createPreview($content);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($content)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo $this->documentListRow($document, $previewer, false, $res['version']);
 				}
 			}		
 			print "</tbody></table>";	
@@ -1083,13 +811,13 @@ if(0) {
 		}
 		else printMLText("no_docs_locked");
 
-//		$this->contentContainerEnd();
-
 	} /* }}} */
 
 	function listCheckedoutDocs() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
@@ -1099,7 +827,7 @@ if(0) {
 		$previewer->setConverters($previewconverters);
 
 		/* Get list of documents checked out by current user */
-		$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
+		$resArr = $dms->getDocumentList('CheckedOutByMe', $user, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -1116,37 +844,18 @@ if(0) {
 			print "<th></th>";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("version")."</th>\n";
-			print "<th>".getMLText("last_update")."</th>\n";
-			print "<th>".getMLText("expires")."</th>\n";
+			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
 			foreach ($resArr as $res) {
 				$document = $dms->getDocument($res["documentID"]);
+				$document->verifyLastestContentExpriry();
 			
-				// verify expiry
-				if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
-					if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
-						$res["status"]=S_EXPIRED;
-					}
-				}
-			
-				if($content = $document->getContentByVersion($res['version'])) {
-					print "<tr>\n";
-					$previewer->createPreview($content);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($content)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$content->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($content->getFileType())."\" title=\"".htmlspecialchars($content->getMimeType())."\">";
-					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
-					print "<td>".getOverallStatusText($res["status"])."</td>";
-					print "<td>".$res["version"]."</td>";
-					print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
-					print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
-					print "</tr>\n";
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo $this->documentListRow($document, $previewer, false, $res['version']);
 				}
 			}		
 			print "</tbody></table>";	
@@ -1213,29 +922,6 @@ if(0) {
 
 			echo '<div id="kkkk" class="ajax" data-view="MyDocuments" data-action="listReviews"></div>';
 
-			/*
-			if($workflowmode == 'traditional') {
-				echo '<div id="documents_to_review" class="ajax" data-view="MyDocuments" data-action="listReviews"></div>';
-			}
-
-			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
-				echo '<div id="documents_to_approve" class="ajax" data-view="MyDocuments" data-action="listApprovals"></div>';
-			} elseif($workflowmode == 'advanced') {
-				echo '<div id="documents_to_process" class="ajax" data-view="MyDocuments" data-action="listWorkflow"></div>';
-			}
-			echo '<div id="documents_user_requiring_attention" class="ajax" data-view="MyDocuments" data-action="listDocsToLookAt"></div>';
-
-			echo '<div id="documents_to_revise" class="ajax" data-view="MyDocuments" data-action="listRevisions"></div>';
-
-			echo '<div id="documents_to_receipt" class="ajax" data-view="MyDocuments" data-action="listReceipts"></div>';
-
-			echo '<div id="documents_user_rejected" class="ajax" data-view="MyDocuments" data-action="listRejects"></div>';
-
-			echo '<div id="documents_locked_by_you" class="ajax" data-view="MyDocuments" data-action="listLockedDocs"></div>';
-
-			echo '<div id="documents_checked_out_by_you" class="ajax" data-view="MyDocuments" data-action="listCheckedoutDocs"></div>';
-
-			*/
 			echo '</div>';
 			echo '</div>';
 		} else {

From 073bdf24bb140afbfde149af8aec372d84e01d9c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Aug 2016 18:16:39 +0200
Subject: [PATCH 0570/2006] add rss feed of timeline

---
 inc/inc.BasicAuthentication.php        |  83 ++++++++++++++
 out/out.TimelineFeed.php               |  53 +++++++++
 views/bootstrap/class.TimelineFeed.php | 151 +++++++++++++++++++++++++
 3 files changed, 287 insertions(+)
 create mode 100644 inc/inc.BasicAuthentication.php
 create mode 100644 out/out.TimelineFeed.php
 create mode 100644 views/bootstrap/class.TimelineFeed.php

diff --git a/inc/inc.BasicAuthentication.php b/inc/inc.BasicAuthentication.php
new file mode 100644
index 000000000..d4227d745
--- /dev/null
+++ b/inc/inc.BasicAuthentication.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Do authentication of users and session management
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+require_once("inc.Utils.php");
+require_once("inc.ClassNotificationService.php");
+require_once("inc.ClassEmailNotify.php");
+require_once("inc.ClassSession.php");
+require_once("inc.ClassAccessOperation.php");
+
+function __authenticate($username, $password) { /* {{{ */
+	global $dms, $settings;
+
+	$user = false;
+
+	/* Authenticate against LDAP server {{{ */
+	if (!$user && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
+		require_once("../inc/inc.ClassLdapAuthentication.php");
+		$authobj = new SeedDMS_LdapAuthentication($dms, $settings);
+		$user = $authobj->authenticate($username, $password);
+	} /* }}} */
+
+	/* Authenticate against SeedDMS database {{{ */
+	else {
+		require_once("../inc/inc.ClassDbAuthentication.php");
+		$authobj = new SeedDMS_DbAuthentication($dms, $settings);
+		$user = $authobj->authenticate($username, $password);
+	} /* }}} */
+
+	if (!$user) {
+		return false;
+	}
+
+	if (($user->getID() == $settings->_guestID) && (!$settings->_enableGuestLogin)) {
+		return false;
+	}
+
+	// Check if account is disabled
+	if($user->isDisabled()) {
+		return false;
+	}
+
+	// control admin IP address if required
+	if ($user->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $settings->_adminIP != "") ){
+		return false;
+	}
+
+	return $user;
+} /* }}} */
+
+if (!isset($_SERVER['PHP_AUTH_USER'])) {
+	header('WWW-Authenticate: Basic realm="'.$settings->_siteName.'"');
+	header('HTTP/1.0 401 Unauthorized');
+	echo getMLText('cancel_basic_authentication');
+	exit;
+} else {
+	if(!($user = __authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']))) {
+		header('WWW-Authenticate: Basic realm="'.$settings->_siteName.'"');
+		header('HTTP/1.0 401 Unauthorized');
+		echo getMLText('cancel_basic_authentication');
+		exit;
+	}
+}
+
+/* Clear login failures if login was successful */
+$user->clearLoginFailures();
+
+$dms->setUser($user);
+$notifier = new SeedDMS_NotificationService();
+if($settings->_enableEmail) {
+	$notifier->addService(new SeedDMS_EmailNotify($dms));
+}
+
diff --git a/out/out.TimelineFeed.php b/out/out.TimelineFeed.php
new file mode 100644
index 000000000..fc2a33665
--- /dev/null
+++ b/out/out.TimelineFeed.php
@@ -0,0 +1,53 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.BasicAuthentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+if(isset($_GET['skip']))
+	$skip = $_GET['skip'];
+else
+	$skip = array();
+
+if($view) {
+	$view->setParam('httproot', $settings->_httpRoot);
+	$view->setParam('fromdate', isset($_GET['fromdate']) ? $_GET['fromdate'] : '');
+	$view->setParam('todate', isset($_GET['todate']) ? $_GET['todate'] : '');
+	$view->setParam('skip', $skip);
+	$view->setParam('sitename', $settings->_siteName);
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view($_GET);
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
new file mode 100644
index 000000000..877ab3351
--- /dev/null
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Implementation of Feed view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C)2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+require_once("FeedWriter/Item.php");
+require_once("FeedWriter/Feed.php");
+require_once("FeedWriter/RSS2.php");
+
+use \FeedWriter\RSS2;
+
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+/**
+ * Class which outputs the html page for UserList view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C)2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$httproot = $this->params['httproot'];
+		$skip = $this->params['skip'];
+		$fromdate = $this->params['fromdate'];
+		$todate = $this->params['todate'];
+		$cachedir = $this->params['cachedir'];
+		$sitename = $this->params['sitename'];
+		$previewwidthlist = $this->params['previewWidthList'];
+		$previewwidthdetail = $this->params['previewWidthDetail'];
+		$timeout = $this->params['timeout'];
+
+		if($fromdate) {
+			$from = makeTsFromLongDate($fromdate.' 00:00:00');
+		} else {
+			$from = time()-7*86400;
+		}
+
+		if($todate) {
+			$to = makeTsFromLongDate($todate.' 23:59:59');
+		} else {
+			$to = time();
+		}
+
+		$baseurl = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$httproot;
+		$feed = new RSS2;
+		$feed->setTitle($sitename.': Recent Changes');
+		$feed->setLink($baseurl);
+		$feed->setDescription('Show recent changes in SeedDMS.');
+		// Image title and link must match with the 'title' and 'link' channel elements for RSS 2.0,
+		// which were set above.
+//		$feed->setImage('Testing & Checking the Feed Writer project', 'https://github.com/mibe/FeedWriter', 'https://upload.wikimedia.org/wikipedia/commons/thumb/d/d9/Rss-feed.svg/256px-Rss-feed.svg.png');
+		// Use core setChannelElement() function for other optional channel elements.
+		// See http://www.rssboard.org/rss-specification#optionalChannelElements
+		// for other optional channel elements. Here the language code for American English and
+		$feed->setChannelElement('language', 'en-US');
+		// The date when this feed was lastly updated. The publication date is also set.
+		$feed->setDate(date(DATE_RSS, time()));
+		$feed->setChannelElement('pubDate', date(\DATE_RSS, strtotime('2013-04-06')));
+		// You can add additional link elements, e.g. to a PubSubHubbub server with custom relations.
+		// It's recommended to provide a backlink to the feed URL.
+		$feed->setSelfLink($baseurl.'out/out.Feed.php');
+//		$feed->setAtomLink('http://pubsubhubbub.appspot.com', 'hub');
+		// You can add more XML namespaces for more custom channel elements which are not defined
+		// in the RSS 2 specification. Here the 'creativeCommons' element is used. There are much more
+		// available. Have a look at this list: http://feedvalidator.org/docs/howto/declare_namespaces.html
+//		$feed->addNamespace('creativeCommons', 'http://backend.userland.com/creativeCommonsRssModule');
+//		$feed->setChannelElement('creativeCommons:license', 'http://www.creativecommons.org/licenses/by/1.0');
+		// If you want you can also add a line to publicly announce that you used
+		// this fine piece of software to generate the feed. ;-)
+//		$feed->addGenerator();
+
+		if($data = $dms->getTimeline($from, $to)) {
+			foreach($data as $i=>$item) {
+				switch($item['type']) {
+				case 'add_version':
+					$msg = getMLText('timeline_'.$item['type']);
+					break;
+				case 'add_file':
+					$msg = getMLText('timeline_'.$item['type']);
+					break;
+				case 'status_change':
+					$msg = getMLText('timeline_'.$item['type'], array('version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					break;
+				default:
+					$msg = '???';
+				}
+				$data[$i]['msg'] = $msg;
+			}
+
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
+			foreach($data as $item) {
+				if($item['type'] == 'status_change')
+					$classname = $item['type']."_".$item['status'];
+				else
+					$classname = $item['type'];
+				if(!$skip || !in_array($classname, $skip)) {
+					$doc = $item['document'];
+					$owner = $doc->getOwner();
+					$version = $doc->getContentByVersion($item['version']);
+					$previewer->createPreview($version);
+					$d = makeTsFromLongDate($item['date']);
+					$newItem = $feed->createNewItem();
+					$newItem->setTitle($doc->getName()." (".$item['msg'].")");
+					$newItem->setLink($baseurl.'out/out.ViewDocument.php?documentid='.$doc->getID());
+					$newItem->setDescription("<h2>".$item['msg']."</h2>".
+						"<p>".getMLText('comment').": <b>".$doc->getComment()."</b></p>".
+						"<p>".getMLText('owner').": <b><a href=\"mailto:".$owner->getEmail()."\">".$owner->getFullName()."</a></b></p>".
+						"<p>".getMLText("creation_date").": <b>".getLongReadableDate($doc->getDate())."</p>"
+					);
+					$newItem->setDate(date('c', $d));
+					$newItem->setAuthor($owner->getFullName(), $owner->getEmail());
+					$newItem->setId('out/out.ViewDocument.php?documentid='.$doc->getID(), true);
+					if($previewer->hasPreview($version)) {
+						$newItem->addElement('enclosure', null, array('url' => $baseurl.'op/op.Preview.php?documentid='.$item['document']->getId().'&version='.$version->getVersion().'&width='.$previewwidthdetail, 'length'=>$previewer->getFileSize($version), 'type'=>'image/png'));
+					}
+					$feed->addItem($newItem);
+				}
+			}
+		}
+
+		// OK. Everything is done. Now generate the feed.
+		// If you want to send the feed directly to the browser, use the printFeed() method.
+		$myFeed = $feed->generateFeed();
+		// Do anything you want with the feed in $myFeed. Why not send it to the browser? ;-)
+		// You could also save it to a file if you don't want to invoke your script every time.
+		header('Content-Type: application/rss+xml');
+		echo $myFeed;
+	} /* }}} */
+}

From 889c82652b2b87aa4fc97f4242cf22a1187b506d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Aug 2016 18:20:39 +0200
Subject: [PATCH 0571/2006] add entry for 5.1.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index eddfd7ed0..4c65e3703 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - add two factor authentication based on google authenticator
 - set timeout for ajax call 'mytasks' from 200ms to 1000ms
 - use a similar layout for document list on the ViewDocument page
+- add RSS feef of timeline
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.0

From 0cc0d0795e06eec9cfba102f1d790e5601ebbffa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Aug 2016 18:23:05 +0200
Subject: [PATCH 0572/2006] add link to timeline rss feed

---
 views/bootstrap/class.Timeline.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 2ef72a7bf..d54456aa8 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -241,8 +241,9 @@ $(document).ready(function () {
 		</div>
 	</div>
 </form>
+</div>
+<a href="out.TimelineFeed.php"><i class="icon-rss"></i> <?php printMLText('subsribe_timelinefeed'); ?></a>
 <?php
-		echo "</div>\n";
 		echo "<div class=\"ajax\" data-view=\"Timeline\" data-action=\"iteminfo\" ></div>";
 		echo "</div>\n";
 

From 2e19ad3dcb2edb2b25b1e64ff330e2b2b735992d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Aug 2016 12:05:26 +0200
Subject: [PATCH 0573/2006] check for access

---
 op/op.Download.php   | 4 ++++
 op/op.ViewOnline.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/op/op.Download.php b/op/op.Download.php
index 1cae5e463..1557c1d51 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -32,6 +32,10 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => "")),getMLText("access_denied"));
+}
 
 if (isset($_GET["version"])) {
 
diff --git a/op/op.ViewOnline.php b/op/op.ViewOnline.php
index 13b0c2c90..b3686ad5b 100644
--- a/op/op.ViewOnline.php
+++ b/op/op.ViewOnline.php
@@ -30,6 +30,10 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => "")),getMLText("access_denied"));
+}
 
 $documentid = $_GET["documentid"];
 if (!isset($documentid) || !is_numeric($documentid) || intval($documentid)<1) {

From c4401a45dfc9242ea34d761540ce71c4774ad40d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Aug 2016 12:05:36 +0200
Subject: [PATCH 0574/2006] don't show any links to op/op.Download.php and
 op/op.ViewOnline.php if access is prohibited

---
 views/bootstrap/class.ViewDocument.php | 116 ++++++++++++++++++-------
 1 file changed, 86 insertions(+), 30 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 98eeeb756..f9cfa1060 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -167,18 +167,22 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 	function preview() { /* {{{ */
 		$document = $this->params['document'];
-		$latestContent = $document->getLatestContent();
-		switch($latestContent->getMimeType()) {
-		case 'audio/mpeg':
-		case 'audio/ogg':
-		case 'audio/wav':
-			$this->contentHeading(getMLText("preview"));
+		$accessop = $this->params['accessobject'];
+
+		if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+			$latestContent = $document->getLatestContent();
+			switch($latestContent->getMimeType()) {
+			case 'audio/mpeg':
+			case 'audio/ogg':
+			case 'audio/wav':
+				$this->contentHeading(getMLText("preview"));
 ?>
 		<audio controls style="width: 100%;">
 		<source  src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="audio/mpeg">
 		</audio>
 <?php
-			break;
+				break;
+			}
 		}
 	} /* }}} */
 
@@ -403,7 +407,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if(is_string($txt))
 			echo $txt;
 		$this->contentContainerEnd();
-//		$this->preview();
+		$this->preview();
 ?>
 </div>
 <div class="span9">
@@ -472,9 +476,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$previewer->createPreview($latestContent);
 		if ($file_exists) {
 			if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes)) {
-				print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\">";
+				if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+					print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\">";
+				}
 			} else {
-				print "<a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\">";
+				if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+					print "<a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\">";
+				}
 			}
 		}
 		if($previewer->hasPreview($latestContent)) {
@@ -483,7 +491,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 		}
 		if ($file_exists) {
-			print "</a>";
+			if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run')))
+				print "</a>";
 		}
 		print "</td>\n";
 
@@ -529,9 +538,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		print "<ul class=\"unstyled actions\">";
 		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a></li>";
-			if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+			if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+				print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a></li>";
+			}
+			if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+				if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes))
+					print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+			}
 		}
 		print "</ul>";
 		print "<ul class=\"unstyled actions\">";
@@ -690,7 +703,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".htmlspecialchars($r["comment"]);
 				if($r['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					}
 				}
 				print "</td>\n";
 				print "<td>".getReviewStatusText($r["status"])."</td>\n";
@@ -759,7 +774,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".htmlspecialchars($a["comment"]);
 				if($a['file']) {
 					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					}
 				}
 				echo "</td>\n";
 				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
@@ -1216,9 +1233,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
 				if($file_exists) {
 					if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes)) {
+						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
 							print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\">";
+						}
 					} else {
-						print "<a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\">";
+						if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+							print "<a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\">";
+						}
 					}
 				}
 				$previewer->createPreview($version);
@@ -1228,7 +1249,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
 				}
 				if($file_exists) {
-					print "</a>\n";
+					if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run')))
+						print "</a>\n";
 				}
 				print "</td>\n";
 				print "<td><ul class=\"unstyled\">\n";
@@ -1261,9 +1283,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>";
 				print "<ul class=\"actions unstyled\">";
 				if ($file_exists){
-					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a>";
+					if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+						print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a>";
+					}
 					if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes))
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a>";
+						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+							print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a>";
+						}
 					print "</ul>";
 					print "<ul class=\"actions unstyled\">";
 				}
@@ -1315,10 +1341,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>";
 				$previewer->createPreview($file, $previewwidthdetail);
 				if($file_exists) {
-					if ($viewonlinefiletypes && in_array(strtolower($file->getFileType()), $viewonlinefiletypes))
-						print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\">";
-					else
-						print "<a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\">";
+					if ($viewonlinefiletypes && in_array(strtolower($file->getFileType()), $viewonlinefiletypes)) {
+						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+							print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\">";
+						}
+					} else {
+						if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+							print "<a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\">";
+						}
+					}
 				}
 				if($previewer->hasPreview($file)) {
 					print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&file=".$file->getID()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($file->getMimeType())."\">");
@@ -1326,7 +1357,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
 				}
 				if($file_exists) {
-					print "</a>";
+					if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run')))
+						print "</a>";
 				}
 				print "</td>";
 				
@@ -1344,9 +1376,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			
 				print "<td><ul class=\"unstyled actions\">";
 				if ($file_exists) {
-					print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a>";
-					if ($viewonlinefiletypes && in_array(strtolower($file->getFileType()), $viewonlinefiletypes))
-						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+					if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+						print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a></li>";
+					}
+					if ($viewonlinefiletypes && in_array(strtolower($file->getFileType()), $viewonlinefiletypes)) {
+						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+							print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
+						}
+					}
 				} else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
 				echo "</ul><ul class=\"unstyled actions\">";
 				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID()))
@@ -1386,16 +1423,31 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$targetlc = $targetDoc->getLatestContent();
 
 				$previewer->createPreview($targetlc, $previewwidthdetail);
+				echo "<tr id=\"table-row-transmittalitem-".$link->getID()."\">";
+				echo $this->documentListRow($targetDoc, $previewer, true);
+				print "<td><small>".getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
+				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL )) {
+					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
+					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+				}
+				print "</small></td>";
+				echo "</tr>";
+
+				if(0){
 				print "<tr>";
 				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
-				print "<a href=\"../op/op.Download.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."\">";
+				if($accessop->check_controller_access('Download', array('action'=>'run')))
+					print "<a href=\"../op/op.Download.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."\">";
 				if($previewer->hasPreview($targetlc)) {
 					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
 				} else {
 					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($targetlc->getFileType())."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
 				}
+				if($accessop->check_controller_access('Download', array('action'=>'run')))
+					print "</a>";
 				print "</td>";
 				print "<td><a href=\"out.ViewDocument.php?documentid=".$targetDoc->getID()."\" class=\"linklist\">".htmlspecialchars($targetDoc->getName())."</a></td>";
+
 				print "<td>".htmlspecialchars($targetDoc->getComment())."</td>";
 				print "<td>".getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
 				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
@@ -1406,6 +1458,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";
 				print "</tr>";
+				}
 			}
 			print "</tbody>\n</table>\n";
 		}
@@ -1460,12 +1513,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$previewer->createPreview($sourcelc, $previewwidthdetail);
 				print "<tr>";
 				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
-				print "<a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
+				if($accessop->check_controller_access('Download', array('action'=>'run')))
+					print "<a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
 				if($previewer->hasPreview($sourcelc)) {
 					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
 				} else {
 					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($sourcelc->getFileType())."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
 				}
+				if($accessop->check_controller_access('Download', array('action'=>'run')))
+					print "</a>";
 				print "</td>";
 				print "<td><a href=\"out.ViewDocument.php?documentid=".$sourceDoc->getID()."\" class=\"linklist\">".htmlspecialchars($sourceDoc->getName())."</a></td>";
 				print "<td>".htmlspecialchars($sourceDoc->getComment())."</td>";

From 17c955633760019079737f63497bcfd715d4a1d1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Aug 2016 12:11:09 +0200
Subject: [PATCH 0575/2006] remove left over from git merge conflict

---
 op/op.AddDocument.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 94359d53e..6e32b14ae 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -376,7 +376,6 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 		}
 	}
 
-<<<<<<< HEAD
 	$controller->setParam('documentsource', $docsource);
 	$controller->setParam('folder', $folder);
 	$controller->setParam('index', $index);

From 8916c83a8ef0baa05709dd3b71e7f26e706184fa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Aug 2016 13:25:01 +0200
Subject: [PATCH 0576/2006] check for access on op/op.Download.php in
 documentListRow()

---
 views/bootstrap/class.Bootstrap.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index dbdd09324..d61a74ee3 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1942,6 +1942,7 @@ $(document).ready( function() {
 		$workflowmode = $this->params['workflowmode'];
 		$previewwidth = $this->params['previewWidthList'];
 		$enableClipboard = $this->params['enableclipboard'];
+		$accessop = $this->params['accessobject'];
 
 		$content = '';
 
@@ -1979,13 +1980,15 @@ $(document).ready( function() {
 
 			$content .= "<td>";
 			if (file_exists($dms->contentDir . $latestContent->getPath())) {
-				$content .= "<a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docID."&version=".$version."\">";
+				if($accessop->check_controller_access('Download', array('action'=>'run')))
+					$content .= "<a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docID."&version=".$version."\">";
 				if($previewer->hasPreview($latestContent)) {
 					$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				} else {
 					$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				}
-				$content .= "</a>";
+				if($accessop->check_controller_access('Download', array('action'=>'run')))
+					$content .= "</a>";
 			} else
 				$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 			$content .= "</td>";

From 20f5bd6489be3778e1305db1772b1ee9b1e809b1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Aug 2016 13:25:27 +0200
Subject: [PATCH 0577/2006] check for access on Download and ViewOnline

---
 views/bootstrap/class.DocumentVersionDetail.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index bc86c6c52..0588c5df4 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -42,6 +42,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
 		$version = $this->params['version'];
+		$accessop = $this->params['accessobject'];
 		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
 		$enableversionmodification = $this->params['enableversionmodification'];
 		$cachedir = $this->params['cachedir'];
@@ -188,9 +189,11 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		//if (($document->getAccessMode($user) >= M_READWRITE)) {
 		print "<ul class=\"actions unstyled\">";
 		if ($file_exists){
-			print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
+			if($accessop->check_controller_access('Download', array('action'=>'run')))
+				print "<li><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$version->getVersion()."\" title=\"".htmlspecialchars($version->getMimeType())."\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
 			if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes))
-				print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i> " . getMLText("view_online") . "</a>";
+				if($accessop->check_controller_access('ViewOnline', array('action'=>'run')))
+					print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i> " . getMLText("view_online") . "</a>";
 			print "</ul>";
 			print "<ul class=\"actions unstyled\">";
 		}
@@ -362,6 +365,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 </div>
+</div>
 <?php
 		$this->contentEnd();
 		$this->htmlEndPage();

From dc2edaca25115a22289950c5f8336354f84a21ca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Aug 2016 22:56:12 +0200
Subject: [PATCH 0578/2006] move more code into controller class

---
 controllers/class.Download.php | 205 +++++++++++++++++++++++++++------
 op/op.Download.php             | 131 +++++++++------------
 2 files changed, 224 insertions(+), 112 deletions(-)

diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index 6479b5b3b..88e63b4ea 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -22,46 +22,185 @@
  */
 class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 
-	public function run() {
+	public function version() { /* {{{ */
+		$dms = $this->params['dms'];
+		$content = $this->params['content'];
+
+		if(!$this->callHook('version')) {
+			if(file_exists($dms->contentDir . $content->getPath())) {
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($dms->contentDir . $content->getPath() ));
+				$efilename = rawurlencode($content->getOriginalFileName());
+				header("Content-Disposition: attachment; filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
+				header("Content-Type: " . $content->getMimeType());
+				header("Cache-Control: must-revalidate");
+
+				readfile($dms->contentDir . $content->getPath());
+			}
+		}
+	} /* }}} */
+
+	public function file() { /* {{{ */
+		$dms = $this->params['dms'];
+		$file = $this->params['file'];
+
+		if(!$this->callHook('file')) {
+			if(file_exists($dms->contentDir . $file->getPath())) {
+				header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));
+				header("Content-Disposition: attachment; filename=\"" . $file->getOriginalFileName() . "\"");
+				//header("Expires: 0");
+				header("Content-Type: " . $file->getMimeType());
+				//header("Cache-Control: no-cache, must-revalidate");
+				header("Cache-Control: must-revalidate");
+				//header("Pragma: no-cache");
+
+				readfile($dms->contentDir . $file->getPath());
+			}
+		}
+	} /* }}} */
+
+	public function archive() { /* {{{ */
+		$dms = $this->params['dms'];
+		$filename = $this->params['file'];
+		$basedir = $this->params['basedir'];
+
+		if(!$this->callHook('archive')) {
+			if(file_exists($basedir . $filename)) {
+				header('Content-Description: File Transfer');
+				header("Content-Type: application/zip");
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($basedir . $filename ));
+				$efilename = rawurlencode($filename);
+				header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
+				header("Cache-Control: public");
+				
+				ob_clean();
+				readfile($basedir .$filename );
+			}
+		}
+	} /* }}} */
+
+	public function log() { /* {{{ */
+		$dms = $this->params['dms'];
+		$filename = $this->params['file'];
+		$basedir = $this->params['basedir'];
+
+		if(!$this->callHook('log')) {
+			if(file_exists($basedir . $filename)) {
+				header("Content-Type: text/plain; name=\"" . $filename . "\"");
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($basedir . $filename ));
+				$efilename = rawurlencode($filename);
+				header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
+				header("Cache-Control: must-revalidate");
+
+				ob_clean();
+				readfile($basedir.$filename);
+			}
+		}
+	} /* }}} */
+
+	public function sqldump() { /* {{{ */
+		$dms = $this->params['dms'];
+		$filename = $this->params['file'];
+		$basedir = $this->params['basedir'];
+
+		if(!$this->callHook('sqldump')) {
+			if(file_exists($basedir . $filename)) {
+				header("Content-Type: application/zip; name=\"" . $filename . "\"");
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($basedir . $filename ));
+				$efilename = rawurlencode($filename);
+				header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
+				header("Cache-Control: must-revalidate");
+				
+				ob_clean();
+				readfile($basedir.$filename);
+			}
+		}
+	} /* }}} */
+
+	public function approval() { /* {{{ */
+		$dms = $this->params['dms'];
+		$document = $this->params['document'];
+		$logid = $this->params['approvelogid'];
+
+		$filename = $dms->contentDir . $document->getDir().'a'.$logid;
+		if (!file_exists($filename) ) {
+			$this->error = 1;
+			return;
+		}
+
+		if(!$this->callHook('approval')) {
+			if(file_exists($dms->contentDir . $filename)) {
+				$finfo = finfo_open(FILEINFO_MIME_TYPE);
+				$mimetype = finfo_file($finfo, $filename);
+
+				header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($filename ));
+				header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+				header("Cache-Control: must-revalidate");
+				readfile($filename);
+			}
+		}
+	} /* }}} */
+
+	public function review() { /* {{{ */
+		$dms = $this->params['dms'];
+		$document = $this->params['document'];
+		$logid = $this->params['reviewlogid'];
+
+		$filename = $dms->contentDir . $document->getDir().'r'.$logid;
+		if (!file_exists($filename) ) {
+			$this->error = 1;
+			return;
+		}
+
+		if(!$this->callHook('review')) {
+			if(file_exists($dms->contentDir . $filename)) {
+				$finfo = finfo_open(FILEINFO_MIME_TYPE);
+				$mimetype = finfo_file($finfo, $filename);
+
+				header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($filename ));
+				header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+				header("Cache-Control: must-revalidate");
+				readfile($filename);
+			}
+		}
+		return true;
+	} /* }}} */
+
+	public function run() { /* {{{ */
 		$dms = $this->params['dms'];
 		$type = $this->params['type'];
 
 		switch($type) {
 			case "version":
-				$content = $this->params['content'];
-
-				if(!$this->callHook('version')) {
-					if(file_exists($dms->contentDir . $content->getPath())) {
-						header("Content-Transfer-Encoding: binary");
-						header("Content-Length: " . filesize($dms->contentDir . $content->getPath() ));
-						$efilename = rawurlencode($content->getOriginalFileName());
-						header("Content-Disposition: attachment; filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
-						header("Content-Type: " . $content->getMimeType());
-						header("Cache-Control: must-revalidate");
-
-						readfile($dms->contentDir . $content->getPath());
-					}
-				}
+				$this->version();
 				break;
 			case "file":
-				$file = $this->params['file'];
-
-				if(!$this->callHook('file')) {
-					if(file_exists($dms->contentDir . $file->getPath())) {
-						header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
-						header("Content-Transfer-Encoding: binary");
-						header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));
-						header("Content-Disposition: attachment; filename=\"" . $file->getOriginalFileName() . "\"");
-						//header("Expires: 0");
-						header("Content-Type: " . $file->getMimeType());
-						//header("Cache-Control: no-cache, must-revalidate");
-						header("Cache-Control: must-revalidate");
-						//header("Pragma: no-cache");
-
-						readfile($dms->contentDir . $file->getPath());
-					}
-				}
+				$this->file();
+				break;
+			case "archive":
+				$this->archive();
+				break;
+			case "log":
+				$this->log();
+				break;
+			case "sqldump":
+				$this->sqldump();
+				break;
+			case "approval":
+				$this->approval();
+				break;
+			case "review":
+				$this->review();
 				break;
 		}
-	}
+	} /* }}} */
 }
diff --git a/op/op.Download.php b/op/op.Download.php
index 1557c1d51..f73c53ae6 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -37,7 +37,7 @@ if (!$accessop->check_controller_access($controller, $_POST)) {
 	UI::exitError(getMLText("document_title", array("documentname" => "")),getMLText("access_denied"));
 }
 
-if (isset($_GET["version"])) {
+if (isset($_GET["version"])) { /* {{{ */
 
 	// document download
 	if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
@@ -69,10 +69,10 @@ if (isset($_GET["version"])) {
 	}
 
 	$controller->setParam('content', $content);
-	$controller->setParam('type', 'version');
-	$controller->run();
+	$controller->version();
 
-} elseif (isset($_GET["file"])) {
+} /* }}} */
+elseif (isset($_GET["file"])) { /* {{{ */
 
 	// file download
 	
@@ -107,7 +107,8 @@ if (isset($_GET["version"])) {
 	$controller->setParam('file', $file);
 	$controller->setParam('type', 'file');
 	$controller->run();
-} elseif (isset($_GET["arkname"])) {
+} /* }}} */
+elseif (isset($_GET["arkname"])) { /* {{{ */
 	$filename = basename($_GET["arkname"]);
 
 	// backup download
@@ -120,29 +121,20 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
-	if (!file_exists($settings->_contentDir.$filename) ) {
+	if($settings->_backupDir && file_exists($settings->_backupDir))
+		$basedir = $settings->_backupDir;
+	else
+		$basedir = $settings->_contentDir;
+
+	if (!file_exists($basedir.$filename) ) {
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
 
-	header('Content-Description: File Transfer');
-	//header("Content-Type: application/force-download; name=\"" . $filename . "\"");
-	//header("Content-Type: application/octet-stream");
-	header("Content-Type: application/zip");
-	header("Content-Transfer-Encoding: binary");
-	header("Content-Length: " . filesize($settings->_contentDir . $filename ));
-	$efilename = rawurlencode($filename);
-	header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
-//	header("Expires: 0");
-	//header("Content-Type: " . $content->getMimeType());
-	//header("Cache-Control: no-cache, must-revalidate");
-//	header("Cache-Control: must-revalidate");
-	header("Cache-Control: public");
-	//header("Pragma: no-cache");	
-	
-	ob_clean();
-	readfile($settings->_contentDir .$filename );
-	
-} elseif (isset($_GET["logname"])) {
+	$controller->setParam('basedir', $basedir);
+	$controller->setParam('file', $filename);
+	$controller->archive();
+} /* }}} */
+elseif (isset($_GET["logname"])) { /* {{{ */
 	$filename = basename($_GET["logname"]);
 
 	// log download
@@ -159,17 +151,12 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
 
-	header("Content-Type: text/plain; name=\"" . $filename . "\"");
-	header("Content-Transfer-Encoding: binary");
-	header("Content-Length: " . filesize($settings->_contentDir . $filename ));
-	$efilename = rawurlencode($filename);
-	header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
-	header("Cache-Control: must-revalidate");
+	$controller->setParam('file', $filename);
+	$controller->setParam('basedir', $settings->_contentDir);
+	$controller->log();
 
-	ob_clean();
-	readfile($settings->_contentDir .$filename );
-	
-} elseif (isset($_GET["vfile"])) {
+} /* }}} */
+elseif (isset($_GET["vfile"])) { /* {{{ */
 
 	// versioning info download
 	
@@ -199,7 +186,8 @@ if (isset($_GET["version"])) {
 	ob_clean();
 	readfile($dms->contentDir . $document->getDir() .$settings->_versioningFileName);
 	
-} elseif (isset($_GET["dumpname"])) {
+} /* }}} */
+elseif (isset($_GET["dumpname"])) { /* {{{ */
 	$filename = basename($_GET["dumpname"]);
 
 	// dump file download
@@ -212,25 +200,20 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
-	if (!file_exists($settings->_contentDir.$filename) ) {
+	if($settings->_backupDir && file_exists($settings->_backupDir))
+		$basedir = $settings->_backupDir;
+	else
+		$basedir = $settings->_contentDir;
+
+	if (!file_exists($basedir.$filename) ) {
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
 
-	header("Content-Type: application/zip; name=\"" . $filename . "\"");
-	//header("Content-Type: application/force-download; name=\"" . $filename . "\"");
-	header("Content-Transfer-Encoding: binary");
-	header("Content-Length: " . filesize($settings->_contentDir . $filename ));
-	$efilename = rawurlencode($filename);
-	header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
-	//header("Expires: 0");
-	//header("Content-Type: " . $content->getMimeType());
-	//header("Cache-Control: no-cache, must-revalidate");
-	header("Cache-Control: must-revalidate");
-	//header("Pragma: no-cache");	
-	
-	ob_clean();
-	readfile($settings->_contentDir .$filename );
-} elseif (isset($_GET["reviewlogid"])) {
+	$controller->setParam('basedir', $basedir);
+	$controller->setParam('file', $filename);
+	$controller->sqldump();
+} /* }}} */
+elseif (isset($_GET["reviewlogid"])) { /* {{{ */
 	if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 		UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 	}
@@ -249,22 +232,17 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 	}
 
-	$filename = $dms->contentDir . $document->getDir().'r'.(int) $_GET['reviewlogid'];
-	if (!file_exists($filename) ) {
+	$controller->setParam('document', $document);
+	$controller->setParam('reviewlogid', (int) $_GET['reviewlogid']);
+	$controller->setParam('type', 'review');
+	$controller->run();
+	switch($controller->getErrorNo()) {
+	case 1:
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
+		break;
 	}
-
-	$finfo = finfo_open(FILEINFO_MIME_TYPE);
-	$mimetype = finfo_file($finfo, $filename);
-
-	header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
-	header("Content-Transfer-Encoding: binary");
-	header("Content-Length: " . filesize($filename ));
-	header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
-	header("Cache-Control: must-revalidate");
-	readfile($filename);
-
-} elseif (isset($_GET["approvelogid"])) {
+} /* }}} */
+elseif (isset($_GET["approvelogid"])) { /* {{{ */
 	if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 		UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 	}
@@ -283,21 +261,16 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 	}
 
-	$filename = $dms->contentDir . $document->getDir().'a'.(int) $_GET['approvelogid'];
-	if (!file_exists($filename) ) {
+	$controller->setParam('document', $document);
+	$controller->setParam('reviewlogid', (int) $_GET['approvelogid']);
+	$controller->setParam('type', 'approval');
+	$controller->run();
+	switch($controller->getErrorNo()) {
+	case 1:
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
+		break;
 	}
-
-	$finfo = finfo_open(FILEINFO_MIME_TYPE);
-	$mimetype = finfo_file($finfo, $filename);
-
-	header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
-	header("Content-Transfer-Encoding: binary");
-	header("Content-Length: " . filesize($filename ));
-	header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
-	header("Cache-Control: must-revalidate");
-	readfile($filename);
-}
+} /* }}} */
 
 add_log_line();
 exit();

From 4266e426dba98af9ae278a457b92f7e08b09b40d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Aug 2016 22:56:56 +0200
Subject: [PATCH 0579/2006] add access check for download in documentListRow()

---
 views/bootstrap/class.Bootstrap.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index d61a74ee3..77caaee26 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1630,6 +1630,7 @@ $(function() {
 	function mainClipboard($clipboard, $previewer){ /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$accessop = $this->params['accessobject'];
 		$content = '';
 		$foldercount = $doccount = 0;
 		if($clipboard['folders']) {
@@ -1667,13 +1668,17 @@ $(function() {
 						$content .= "<tr draggable=\"true\" rel=\"document_".$docid."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">";
 
 						if (file_exists($dms->contentDir . $latestContent->getPath())) {
-							$content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docid."&version=".$version."\">";
+							$content .= "<td>";
+							if($accessop->check_controller_access('Download', array('action'=>'version')))
+								$content .= "<a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docid."&version=".$version."\">";
 							if($previewer->hasPreview($latestContent)) {
 								$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"40\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 							} else {
 								$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 							}
-							$content .= "</a></td>";
+							if($accessop->check_controller_access('Download', array('action'=>'version')))
+								$content .= "</a>";
+							$content .= "</td>";
 						} else
 							$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
 						
@@ -1980,7 +1985,7 @@ $(document).ready( function() {
 
 			$content .= "<td>";
 			if (file_exists($dms->contentDir . $latestContent->getPath())) {
-				if($accessop->check_controller_access('Download', array('action'=>'run')))
+				if($accessop->check_controller_access('Download', array('action'=>'version')))
 					$content .= "<a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docID."&version=".$version."\">";
 				if($previewer->hasPreview($latestContent)) {
 					$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";

From d9d5c98c5fb257fc17542e206957d119d8fa504a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Aug 2016 22:57:53 +0200
Subject: [PATCH 0580/2006] use documentListRow() for output

---
 views/bootstrap/class.ApprovalSummary.php | 64 +++++++--------------
 views/bootstrap/class.ReceiptSummary.php  | 63 ++++++++-------------
 views/bootstrap/class.ReviewSummary.php   | 69 ++++++++---------------
 3 files changed, 68 insertions(+), 128 deletions(-)

diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 466ef22a7..5bd0db805 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -52,7 +52,6 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 		$this->contentHeading(getMLText("approval_summary"));
-		$this->contentContainerStart();
 
 		// Get document list for the current user.
 		$approvalStatus = $user->getApprovalStatus();
@@ -67,41 +66,31 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 			$document = $dms->getDocument($st['documentID']);
 			$version = $document->getContentByVersion($st['version']);
 			$previewer->createPreview($version);
-			$owner = $document->getOwner();
 			$moduser = $dms->getUser($st['required']);
 
 			if ($document && $version) {
 			
 				if ($printheader){
-					print "<table class=\"table-condensed\">";
+					print "<table class=\"table table-condensed\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
 					$printheader = false;
 				}
 			
-				print "<tr>\n";
-				$previewer->createPreview($version);
-				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRow($document, $previewer, true, $st['version']);
+					print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
+					echo "</tr>";
 				}
-				print "</a></td>";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".getOverallStatusText($st["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
 			}
 			if ($st["status"]!=-2) {
 				$iRev[] = $st["documentID"];
@@ -113,49 +102,37 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_approval_needed");
 		}
 
-		$this->contentContainerEnd();
 		$this->contentHeading(getMLText("group_approval_summary"));
-		$this->contentContainerStart();
 
 		$printheader = true;
 		foreach ($approvalStatus["grpstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
 			$version = $document->getContentByVersion($st['version']);
-			$owner = $document->getOwner();
 			$modgroup = $dms->getGroup($st['required']);
 
 			if (!in_array($st["documentID"], $iRev) && $document && $version) {
 			
 				if ($printheader){
-					print "<table class=\"table-condensed\">";
+					print "<table class=\"table table-condensed\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
 					$printheader = false;
 				}	
 			
-				print "<tr>\n";
-				$previewer->createPreview($version);
-				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRow($document, $previewer, true, $st['version']);
+					print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
+					echo "</tr>";
 				}
-				print "</a></td>";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".getOverallStatusText($st["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
 			}
 		}
 		if (!$printheader) {
@@ -164,7 +141,6 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_approval_needed");
 		}
 
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 06014a48b..ae5675d2d 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -48,7 +48,6 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 
 		$this->contentHeading(getMLText("receipt_summary"));
-		$this->contentContainerStart();
 
 		// TODO: verificare scadenza
 
@@ -65,41 +64,31 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 			$document = $dms->getDocument($st['documentID']);
 			if($document)
 				$version = $document->getContentByVersion($st['version']);
-			$owner = $document->getOwner();
 			$moduser = $dms->getUser($st['required']);
 
 			if ($document && $version) {
 			
 				if ($printheader){
-					print "<table class=\"table-condensed\">";
+					print "<table class=\"table table-condensed\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
 					$printheader=false;
 				}
-			
-				print "<tr>\n";
-				$previewer->createPreview($version);
-				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRow($document, $previewer, true, $st['version']);
+					print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
+					echo "</tr>";
 				}
-				print "</a></td>";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".getOverallStatusText($st["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
 			}
 			if ($st["status"]!=-2) {
 				$iRev[] = $st["documentID"];
@@ -111,41 +100,39 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_docs_to_receipt");
 		}
 
-		$this->contentContainerEnd();
 		$this->contentHeading(getMLText("group_receipt_summary"));
-		$this->contentContainerStart();
 
 		$printheader=true;
 		foreach ($receiptStatus["grpstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
 			if($document)
 				$version = $document->getContentByVersion($st['version']);
-			$owner = $document->getOwner();
 			$modgroup = $dms->getGroup($st['required']);
 
 			if (!in_array($st["documentID"], $iRev) && $document && $version) {
 			
 				if ($printheader){
-					print "<table class=\"folderView\">";
+					print "<table class=\"table table-condensed\">";
 					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
+					print "<table class=\"folderView\">";
 					$printheader=false;
 				}		
 			
-				print "<tr>\n";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".getOverallStatusText($st["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRow($document, $previewer, true, $st['version']);
+					print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
+					echo "</tr>";
+				}
 			}
 		}
 		if (!$printheader) {
@@ -154,8 +141,6 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_docs_to_receipt");
 		}
 
-
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 935a6c710..2a1f5b717 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -53,7 +53,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 
 		$this->contentHeading(getMLText("review_summary"));
-		$this->contentContainerStart();
+//		$this->contentContainerStart();
 
 		// TODO: verificare scadenza
 
@@ -69,41 +69,31 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		foreach ($reviewStatus["indstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
 			$version = $document->getContentByVersion($st['version']);
-			$owner = $document->getOwner();
 			$moduser = $dms->getUser($st['required']);
 
 			if ($document && $version) {
 			
 				if ($printheader){
-					print "<table class=\"table-condensed\">";
+					print "<table class=\"table table-condensed\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
 					$printheader=false;
 				}
 			
-				print "<tr>\n";
-				$previewer->createPreview($version);
-				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRow($document, $previewer, true, $st['version']);
+					print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
+					echo "</tr>";
 				}
-				print "</a></td>";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".getOverallStatusText($st["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
 			}
 			if ($st["status"]!=-2) {
 				$iRev[] = $st["documentID"];
@@ -115,49 +105,39 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_docs_to_review");
 		}
 
-		$this->contentContainerEnd();
+//		$this->contentContainerEnd();
 		$this->contentHeading(getMLText("group_review_summary"));
-		$this->contentContainerStart();
+//		$this->contentContainerStart();
 
 		$printheader=true;
 		foreach ($reviewStatus["grpstatus"] as $st) {
 			$document = $dms->getDocument($st['documentID']);
 			$version = $document->getContentByVersion($st['version']);
-			$owner = $document->getOwner();
 			$modgroup = $dms->getGroup($st['required']);
 
 			if (!in_array($st["documentID"], $iRev) && $document && $version) {
 			
 				if ($printheader){
-					print "<table class=\"folderView\">";
+					print "<table class=\"table table-condensed\">";
 					print "<thead>\n<tr>\n";
 					print "<th></th>\n";
 					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
 					$printheader=false;
 				}		
 			
-				print "<tr>\n";
-				$previewer->createPreview($version);
-				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRow($document, $previewer, true, $st['version']);
+					print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
+					echo "</tr>";
 				}
-				print "</a></td>";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".getOverallStatusText($st["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
 			}
 		}
 		if (!$printheader) {
@@ -166,8 +146,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_docs_to_review");
 		}
 
-
-		$this->contentContainerEnd();
+//		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 8126d6d3fe6ef23535b93e3d57427a43cba01c35 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 12:40:23 +0200
Subject: [PATCH 0581/2006] clean up parameters passed to getDocumentList()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 159 +++++++++++++++++++++--------
 1 file changed, 116 insertions(+), 43 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 4c5ba137f..9b2f892a4 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -201,7 +201,7 @@ class SeedDMS_Core_DMS {
 	} /* }}} */
 
 	/**
-	 * Checks if a list of objects contains a single object 
+	 * Checks if a list of objects contains a single object
 	 *
 	 * This function is only applicable on list containing objects which have
 	 * a method getID() because it is used to check if two objects are equal.
@@ -728,12 +728,14 @@ class SeedDMS_Core_DMS {
 	 * @param string $listtype type of document list, can be 'AppRevByMe',
 	 * 'AppRevOwner', 'ReceiptByMe', 'ReviseByMe', 'LockedByMe', 'MyDocs'
 	 * @param object $param1 user
-	 * @param string $param2 sort list if listtype='MyDocs', set to true
+	 * @param string $param2 set to true
 	 * if 'AppRevByMe', 'ReviseByMe', 'ReceiptByMe' shall return even documents
 	 * І have already taken care of.
+	 * @param string $param3 sort list by this field
+	 * @param string $param4 order direction
 	 * @return array list of documents
 	 */
-	function getDocumentList($listtype, $param1=null, $param2='', $param3='') { /* {{{ */
+	function getDocumentList($listtype, $param1=null, $param2=false, $param3='', $param4='') { /* {{{ */
 		/* The following query will get all documents and lots of additional
 		 * information. It requires the two temporary tables ttcontentid and
 		 * ttstatid.
@@ -741,6 +743,9 @@ class SeedDMS_Core_DMS {
 		if (!$this->db->createTemporaryTable("ttstatid") || !$this->db->createTemporaryTable("ttcontentid")) {
 			return false;
 		}
+		/* The following statement retrieves the status of the last version of all
+		 * documents. It must be restricted by further where clauses.
+		 */
 		$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
 			"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
 			"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
@@ -758,12 +763,12 @@ class SeedDMS_Core_DMS {
 			"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ";
 
 		switch($listtype) {
-		case 'AppRevByMe': // Documents I have to review/approve
+		case 'AppRevByMe': // Documents I have to review/approve {{{
 			$user = $param1;
 			// Get document list for the current user.
 			$reviewStatus = $user->getReviewStatus();
 			$approvalStatus = $user->getApprovalStatus();
-			
+
 			// Create a comma separated list of all the documentIDs whose information is
 			// required.
 			// Take only those documents into account which hasn't be touched by the user
@@ -792,7 +797,7 @@ class SeedDMS_Core_DMS {
 			foreach ($dList as $d) {
 				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
 			}
-			
+
 			if (strlen($docCSV)>0) {
 				$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.", ".S_EXPIRED.") ".
 							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
@@ -800,14 +805,82 @@ class SeedDMS_Core_DMS {
 			} else {
 				$queryStr = '';
 			}
-			break;
-		case 'ReceiptByMe': // Documents I have to receipt
+			break; // }}}
+		case 'ReviewByMe': // Documents I have to review {{{
+			$user = $param1;
+			// Get document list for the current user.
+			$reviewStatus = $user->getReviewStatus();
+
+			// Create a comma separated list of all the documentIDs whose information is
+			// required.
+			// Take only those documents into account which hasn't be touched by the user
+			// ($st["status"]==0)
+			$dList = array();
+			foreach ($reviewStatus["indstatus"] as $st) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			foreach ($reviewStatus["grpstatus"] as $st) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			$docCSV = "";
+			foreach ($dList as $d) {
+				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
+			}
+
+			if (strlen($docCSV)>0) {
+				$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_EXPIRED.") ".
+							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
+							"ORDER BY `statusDate` DESC";
+			} else {
+				$queryStr = '';
+			}
+			break; // }}}
+		case 'ApproveByMe': // Documents I have to approve {{{
+			$user = $param1;
+			// Get document list for the current user.
+			$approvalStatus = $user->getApprovalStatus();
+
+			// Create a comma separated list of all the documentIDs whose information is
+			// required.
+			// Take only those documents into account which hasn't be touched by the user
+			// ($st["status"]==0)
+			$dList = array();
+			foreach ($approvalStatus["indstatus"] as $st) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			foreach ($approvalStatus["grpstatus"] as $st) {
+				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
+					$dList[] = $st["documentID"];
+				}
+			}
+			$docCSV = "";
+			foreach ($dList as $d) {
+				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
+			}
+
+			if (strlen($docCSV)>0) {
+				$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_APP.", ".S_EXPIRED.") ".
+							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
+							"ORDER BY `statusDate` DESC";
+			} else {
+				$queryStr = '';
+			}
+			break; // }}}
+		case 'ReceiptByMe': // Documents I have to receipt {{{
 			$user = $param1;
 			// Get document list for the current user.
 			$receiptStatus = $user->getReceiptStatus();
-			
+
 			// Create a comma separated list of all the documentIDs whose information is
 			// required.
+			// Take only those documents into account which hasn't be touched by the user
+			// ($st["status"]==0)
 			$dList = array();
 			foreach ($receiptStatus["indstatus"] as $st) {
 				if (($st["status"]==0 || $param2) && !in_array($st["documentID"], $dList)) {
@@ -823,19 +896,19 @@ class SeedDMS_Core_DMS {
 			foreach ($dList as $d) {
 				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
 			}
-			
+
 			if (strlen($docCSV)>0) {
 				$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
 							"ORDER BY `statusDate` DESC";
 			} else {
 				$queryStr = '';
 			}
-			break;
-		case 'ReviseByMe': // Documents I have to receipt
+			break; // }}}
+		case 'ReviseByMe': // Documents I have to receipt {{{
 			$user = $param1;
 			// Get document list for the current user.
 			$revisionStatus = $user->getRevisionStatus();
-			
+
 			// Create a comma separated list of all the documentIDs whose information is
 			// required.
 			$dList = array();
@@ -853,19 +926,19 @@ class SeedDMS_Core_DMS {
 			foreach ($dList as $d) {
 				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
 			}
-			
+
 			if (strlen($docCSV)>0) {
 				$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
 							"ORDER BY `statusDate` DESC";
 			} else {
 				$queryStr = '';
 			}
-			break;
-		case 'WorkflowByMe': // Documents I to trigger in Worklflow
+			break; // }}}
+		case 'WorkflowByMe': // Documents I to trigger in Worklflow {{{
 			$user = $param1;
 			// Get document list for the current user.
 			$workflowStatus = $user->getWorkflowStatus();
-			
+
 			// Create a comma separated list of all the documentIDs whose information is
 			// required.
 			$dList = array();
@@ -883,20 +956,20 @@ class SeedDMS_Core_DMS {
 			foreach ($dList as $d) {
 				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
 			}
-			
+
 			if (strlen($docCSV)>0) {
-				$queryStr .= 
+				$queryStr .=
 							//"AND `tblDocumentStatusLog`.`status` IN (".S_IN_WORKFLOW.", ".S_EXPIRED.") ".
 							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
 							"ORDER BY `statusDate` DESC";
 			} else {
 				$queryStr = '';
 			}
-			break;
-		case 'AppRevOwner': // Documents waiting for review/approval I'm owning
+			break; // }}}
+		case 'AppRevOwner': // Documents waiting for review/approval I'm owning {{{
 			$user = $param1;
-			$orderby = $param2;
-			if($param3 == 'desc')
+			$orderby = $param3;
+			if($param4 == 'desc')
 				$orderdir = 'DESC';
 			else
 				$orderdir = 'ASC';
@@ -910,28 +983,28 @@ class SeedDMS_Core_DMS {
 //			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
 //				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ".
 //				"ORDER BY `statusDate` DESC";
-			break;
-		case 'RejectOwner': // Documents that has been rejected and I'm owning
+			break; // }}}
+		case 'RejectOwner': // Documents that has been rejected and I'm owning {{{
 			$user = $param1;
 			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
 				"AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") ".
 				"ORDER BY `statusDate` DESC";
-			break;
-		case 'LockedByMe': // Documents locked by me
+			break; // }}}
+		case 'LockedByMe': // Documents locked by me {{{
 			$user = $param1;
 			$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ".
 				"ORDER BY `statusDate` DESC";
-			break;
-		case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning
+			break; // }}}
+		case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning {{{
 			$user = $param1;
 			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
 				"AND `tblDocumentStatusLog`.`status` IN (".S_IN_WORKFLOW.") ".
 				"ORDER BY `statusDate` DESC";
-			break;
-		case 'MyDocs': // Documents owned by me
+			break; // }}}
+		case 'MyDocs': // Documents owned by me {{{
 			$user = $param1;
-			$orderby = $param2;
-			if($param3 == 'desc')
+			$orderby = $param3;
+			if($param4 == 'desc')
 				$orderdir = 'DESC';
 			else
 				$orderdir = 'ASC';
@@ -941,8 +1014,8 @@ class SeedDMS_Core_DMS {
 			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
 			else $queryStr .= "ORDER BY `name`";
 			$queryStr .= " ".$orderdir;
-			break;
-		case 'CheckedOutByMe': // Documents I have checked out
+			break; // }}}
+		case 'CheckedOutByMe': // Documents I have checked out {{{
 			$user = $param1;
 
 			$qs = 'SELECT document FROM tblDocumentCheckOuts WHERE userID='.$user->getID();
@@ -954,14 +1027,14 @@ class SeedDMS_Core_DMS {
 			foreach($ra as $d) {
 				$docs[] = $d['document'];
 			}
-			
+
 			if ($docs) {
 				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ".
 							"ORDER BY `statusDate` DESC";
 			} else {
 				$queryStr = '';
 			}
-			break;
+			break; // }}}
 		}
 
 		if($queryStr) {
@@ -2523,7 +2596,7 @@ class SeedDMS_Core_DMS {
 			$versions[] = $version;
 		}
 		return $versions;
-		
+
 	} /* }}} */
 
 	/**
@@ -2547,7 +2620,7 @@ class SeedDMS_Core_DMS {
 			$versions[] = $version;
 		}
 		return $versions;
-		
+
 	} /* }}} */
 
 	/**
@@ -2571,7 +2644,7 @@ class SeedDMS_Core_DMS {
 			$versions[] = $version;
 		}
 		return $versions;
-		
+
 	} /* }}} */
 
 	/**
@@ -2599,7 +2672,7 @@ class SeedDMS_Core_DMS {
 				$versions[$row['dupid']]['duplicates'][] = $version;
 		}
 		return $versions;
-		
+
 	} /* }}} */
 
 	/**
@@ -2755,11 +2828,11 @@ class SeedDMS_Core_DMS {
 				foreach ($record as $column) {
 					if (is_numeric($column)) $values .= $column;
 					else $values .= $this->db->qstr($column);
-			
+
 					if ($i<(count($record))) $values .= ",";
 					$i++;
 				}
-		
+
 				fwrite($h, "INSERT INTO `".$table."` VALUES (".$values.");\n");
 			}
 		}

From 4fa95bcd48ec49f22018709972a0858604a878d5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 12:41:07 +0200
Subject: [PATCH 0582/2006] major overhaul, replace inProcess paramter by
 listtype

most list where not correct and the code was way to complicated
---
 out/out.MyDocuments.php               |   8 +-
 views/bootstrap/class.MyDocuments.php | 696 +++++++-------------------
 2 files changed, 182 insertions(+), 522 deletions(-)

diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 4b1d5372b..163b3a918 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -37,9 +37,9 @@ if ($user->isGuest()) {
 
 // Check to see if the user wants to see only those documents that are still
 // in the review / approve stages.
-$showInProcess = false;
-if (isset($_GET["inProcess"]) && strlen($_GET["inProcess"])>0 && $_GET["inProcess"]!=0) {
-	$showInProcess = true;
+$listtype = '';
+if (isset($_GET["list"])) {
+	$listtype = $_GET['list'];
 }
 
 $orderby='n';
@@ -55,7 +55,7 @@ if($view) {
 	$view->setParam('orderby', $orderby);
 	$view->setParam('orderdir', $orderdir);
 	$view->setParam('showtree', showtree());
-	$view->setParam('showinprocess', $showInProcess);
+	$view->setParam('listtype', $listtype);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 5fae130d4..c0260137c 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -54,6 +54,49 @@ $(document).ready( function() {
 <?php
 	} /* }}} */
 
+	protected function printList($resArr, $previewer, $order=false) { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
+
+		print "<table class=\"table table-condensed\">";
+		print "<thead>\n<tr>\n";
+		print "<th></th>\n";
+		if($order)
+			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+		else
+			print "<th>".getMLText("name")."</th>\n";
+		if($order)
+			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+		else
+			print "<th>".getMLText("status")."</th>\n";
+		print "<th>".getMLText("action")."</th>\n";
+		print "</tr>\n</thead>\n<tbody>\n";
+
+		$noaccess = 0;
+		foreach ($resArr as $res) {
+			$document = $dms->getDocument($res["id"]);
+			$document->verifyLastestContentExpriry();
+
+			$txt = $this->callHook('documentListItem', $document, $previewer);
+			if(is_string($txt))
+				echo $txt;
+			else {
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					echo $this->documentListRow($document, $previewer, false, $res['version']);
+				} else {
+					$noaccess++;
+				}
+			}
+		}
+		echo "</tbody>\n</table>";
+
+		if($noaccess) {
+			$this->warningMsg(getMLText('list_contains_no_access_docs', array('count'=>$noaccess)));
+		}
+	} /* }}} */
+
 	function listReviews() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -67,96 +110,41 @@ $(document).ready( function() {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
 
-				// Get document list for the current user.
-				$reviewStatus = $user->getReviewStatus();
+		$resArr = $dms->getDocumentList('ReviewByMe', $user, false, $orderby, $orderdir);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
 
-				$resArr = $dms->getDocumentList('AppRevByMe', $user, $orderby, $orderdir);
-				if (is_bool($resArr) && !$resArr) {
-					$this->contentHeading(getMLText("warning"));
-					$this->contentContainer(getMLText("internal_error_exit"));
-					$this->htmlEndPage();
-					exit;
+		$this->contentHeading(getMLText("documents_to_review"));
+		if($resArr) {
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>\n";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("status")."</th>\n";
+			print "<th>".getMLText("action")."</th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+
+			// List the documents for which a review has been requested.
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				$document->verifyLastestContentExpriry();
+
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo $this->documentListRow($document, $previewer, false, $res['version']);
 				}
-				if($resArr) {
-					/* Create an array to hold all of these results, and index the array 
-					 * by document id. This makes it easier to retrieve document ID
-					 * information later on and saves us having to repeatedly poll the
-					 * database every time
-					 * new document information is required.
-					 */
-					$docIdx = array();
-					foreach ($resArr as $res) {
-						$docIdx[$res["id"]][$res["version"]] = $res;
-					}
+			}
 
-					// List the documents for which a review has been requested.
-						$this->contentHeading(getMLText("documents_to_review"));
-						$printheader=true;
-						$iRev = array();
-						$dList = array();
-						foreach ($reviewStatus["indstatus"] as $st) {
-						
-							if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
-								$dList[] = $st["documentID"];
-								$document = $dms->getDocument($st["documentID"]);
-								$document->verifyLastestContentExpriry();
-							
-								if ($printheader){
-									print "<table class=\"table table-condensed\">";
-									print "<thead>\n<tr>\n";
-									print "<th></th>\n";
-									print "<th>".getMLText("name")."</th>\n";
-									print "<th>".getMLText("status")."</th>\n";
-									print "<th>".getMLText("action")."</th>\n";
-									print "</tr>\n</thead>\n<tbody>\n";
-									$printheader=false;
-								}
-							
-								$txt = $this->callHook('documentListItem', $document, $previewer);
-								if(is_string($txt))
-									echo $txt;
-								else {
-									echo $this->documentListRow($document, $previewer, false, $st['version']);
-								}
-							}
-						}
-						foreach ($reviewStatus["grpstatus"] as $st) {
-						
-							if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
-								$dList[] = $st["documentID"];
-								$document = $dms->getDocument($st["documentID"]);
-								$document->verifyLastestContentExpriry();
-
-								if ($printheader){
-									print "<table class=\"table table-condensed\">";
-									print "<thead>\n<tr>\n";
-									print "<th></th>\n";
-									print "<th>".getMLText("name")."</th>\n";
-									print "<th>".getMLText("status")."</th>\n";
-									print "<th>".getMLText("action")."</th>\n";
-									print "</tr>\n</thead>\n<tbody>\n";
-									$printheader=false;
-								}
-
-								$txt = $this->callHook('documentListItem', $document, $previewer);
-								if(is_string($txt))
-									echo $txt;
-								else {
-									echo $this->documentListRow($document, $previewer, false, $st['version']);
-								}
-							}
-						}
-						if (!$printheader){
-							echo "</tbody>\n</table>";
-						}else{
-							printMLText("no_docs_to_review");
-						}
-				} else {
-						$this->contentHeading(getMLText("documents_to_review"));
-						$this->contentContainerStart();
-						printMLText("no_review_needed");
-						$this->contentContainerEnd();
-				}
+			echo "</tbody>\n</table>\n";
+		} else {
+			printMLText("no_docs_to_review");
+		}
 
 	} /* }}} */
 
@@ -173,93 +161,40 @@ $(document).ready( function() {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
 
-				$approvalStatus = $user->getApprovalStatus();
+		$resArr = $dms->getDocumentList('ApproveByMe', $user, false, $orderby, $orderdir);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+		$this->contentHeading(getMLText("documents_to_approve"));
+		if($resArr) {
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>\n";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("status")."</th>\n";
+			print "<th>".getMLText("action")."</th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
 
-				$resArr = $dms->getDocumentList('AppRevByMe', $user, $orderby, $orderdir);
-				if (is_bool($resArr) && !$resArr) {
-					$this->contentHeading(getMLText("warning"));
-					$this->contentContainer(getMLText("internal_error_exit"));
-					$this->htmlEndPage();
-					exit;
-				}
-				if($resArr) {
-					/* Create an array to hold all of these results, and index the array 
-					 * by document id. This makes it easier to retrieve document ID
-					 * information later on and saves us having to repeatedly poll the
-					 * database every time
-					 * new document information is required.
-					 */
-					$docIdx = array();
-					foreach ($resArr as $res) {
-						$docIdx[$res["id"]][$res["version"]] = $res;
-					}
+			// List the documents for which an approval has been requested.
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				$document->verifyLastestContentExpriry();
 
-					// List the documents for which an approval has been requested.
-					$this->contentHeading(getMLText("documents_to_approve"));
-					$printheader=true;
-					
-					foreach ($approvalStatus["indstatus"] as $st) {
-					
-						if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP) {
-							$document = $dms->getDocument($st["documentID"]);
-							$document->verifyLastestContentExpriry();
-						
-							if ($printheader){
-								print "<table class=\"table table-condensed\">";
-								print "<thead>\n<tr>\n";
-								print "<th></th>\n";
-								print "<th>".getMLText("name")."</th>\n";
-								print "<th>".getMLText("status")."</th>\n";
-								print "<th>".getMLText("action")."</th>\n";
-								print "</tr>\n</thead>\n<tbody>\n";
-								$printheader=false;
-							}
-
-							$txt = $this->callHook('documentListItem', $document, $previewer);
-							if(is_string($txt))
-								echo $txt;
-							else {
-								echo $this->documentListRow($document, $previewer, false, $st['version']);
-							}
-						}
-					}
-					foreach ($approvalStatus["grpstatus"] as $st) {
-					
-						if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
-							$document = $dms->getDocument($st["documentID"]);
-							$document->verifyLastestContentExpriry();
-							if ($printheader){
-								print "<table class=\"table table-condensed\">";
-								print "<thead>\n<tr>\n";
-								print "<th></th>\n";
-								print "<th>".getMLText("name")."</th>\n";
-								print "<th>".getMLText("status")."</th>\n";
-								print "<th>".getMLText("action")."</th>\n";
-								print "</tr>\n</thead>\n<tbody>\n";
-								$printheader=false;
-							}
-
-							$txt = $this->callHook('documentListItem', $document, $previewer);
-							if(is_string($txt))
-								echo $txt;
-							else {
-								echo $this->documentListRow($document, $previewer, false, $st['version']);
-							}
-						}
-					}
-					if (!$printheader){
-						echo "</tbody>\n</table>\n";
-					 }else{
-						printMLText("no_docs_to_approve");
-					 }
-				}
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
 				else {
-					$this->contentHeading(getMLText("documents_to_approve"));
-					$this->contentContainerStart();
-					printMLText("no_approval_needed");
-					$this->contentContainerEnd();
+					echo $this->documentListRow($document, $previewer, false, $res['version']);
 				}
+			}
 
+			echo "</tbody>\n</table>\n";
+		} else {
+			printMLText("no_docs_to_approve");
+		}
 	} /* }}} */
 
 	function listDocsToLookAt() { /* {{{ */
@@ -280,7 +215,7 @@ $(document).ready( function() {
 			/* Get list of documents owned by current user that are
 			 * pending review or pending approval.
 			 */
-			$resArr = $dms->getDocumentList('AppRevOwner', $user, $orderby, $orderdir);
+			$resArr = $dms->getDocumentList('AppRevOwner', $user, false, $orderby, $orderdir);
 			if (is_bool($resArr) && !$resArr) {
 				$this->contentHeading(getMLText("warning"));
 				$this->contentContainer(getMLText("internal_error_exit"));
@@ -289,33 +224,13 @@ $(document).ready( function() {
 			}
 
 			$this->contentHeading(getMLText("documents_user_requiring_attention"));
-			if (count($resArr)>0) {
-
-				print "<table class=\"table table-condensed\">";
-				print "<thead>\n<tr>\n";
-				print "<th></th>";
-				print "<th><a data-action=\"listDocsToLookAt\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." / <a data-action=\"listDocsToLookAt\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." / <a data-action=\"listDocsToLookAt\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
-				print "<th>".getMLText("status")."</th>\n";
-				print "<th>".getMLText("action")."</th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["documentID"]);
-					$document->verifyLastestContentExpriry();
-				
-					$txt = $this->callHook('documentListItem', $document, $previewer);
-					if(is_string($txt))
-						echo $txt;
-					else {
-						echo $this->documentListRow($document, $previewer, false, $res['version']);
-					}
-				}		
-				print "</tbody></table>";	
-				
+			if ($resArr) {
+				$this->printList($resArr, $previewer, 'listDocsToLookAt');
+			} else {
+				printMLText("no_docs_to_look_at");
 			}
-			else printMLText("no_docs_to_look_at");
 		} else {
-			$resArr = $dms->getDocumentList('WorkflowOwner', $user, $orderby, $orderdir);
+			$resArr = $dms->getDocumentList('WorkflowOwner', $user, false, $orderby, $orderdir);
 			if (is_bool($resArr) && !$resArr) {
 				$this->contentHeading(getMLText("warning"));
 				$this->contentContainer("Internal error. Unable to complete request. Exiting.");
@@ -324,29 +239,8 @@ $(document).ready( function() {
 			}
 
 			$this->contentHeading(getMLText("documents_user_requiring_attention"));
-			if (count($resArr)>0) {
-
-				print "<table class=\"table table-condensed\">";
-				print "<thead>\n<tr>\n";
-				print "<th></th>";
-				print "<th>".getMLText("name")."</th>\n";
-				print "<th>".getMLText("status")."</th>\n";
-				print "<th>".getMLText("action")."</th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["documentID"]);
-					$document->verifyLastestContentExpriry();
-				
-					$txt = $this->callHook('documentListItem', $document, $previewer);
-					if(is_string($txt))
-						echo $txt;
-					else {
-						echo $this->documentListRow($document, $previewer, false, $res['version']);
-					}
-				}		
-				print "</tbody></table>";	
-				
+			if($resArr) {
+				$this->printList($resArr, $previewer);
 			}
 			else printMLText("no_docs_to_look_at");
 		}
@@ -367,7 +261,7 @@ $(document).ready( function() {
 		$previewer->setConverters($previewconverters);
 
 		/* Get list of documents owned by current user */
-		$resArr = $dms->getDocumentList('MyDocs', $user, $orderby, $orderdir);
+		$resArr = $dms->getDocumentList('MyDocs', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -376,29 +270,8 @@ $(document).ready( function() {
 		}
 
 		$this->contentHeading(getMLText("all_documents"));
-
-		if (count($resArr)>0) {
-
-			print "<table class=\"table table-condensed\">";
-			print "<thead>\n<tr>\n";
-			print "<th></th>";
-			print "<th><a data-action=\"listMyDocs\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." / <a data-action=\"listMyDocs\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." / <a data-action=\"listMyDocs\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
-			print "<th><a data-action=\"listMyDocs\" data-orderby=\"s\">".getMLText("status")."</a></th>\n";
-			print "<th>".getMLText("action")."</th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["documentID"]);
-				$document->verifyLastestContentExpriry();
-
-				$txt = $this->callHook('documentListItem', $document, $previewer);
-				if(is_string($txt))
-					echo $txt;
-				else {
-					echo $this->documentListRow($document, $previewer, false, $res['version']);
-				}
-			}
-			print "</tbody></table>";
+		if($resArr) {
+			$this->printList($resArr, $previewer, 'listMyDocs');
 		}
 		else printMLText("empty_notify_list");
 	} /* }}} */
@@ -419,14 +292,14 @@ $(document).ready( function() {
 		// Get document list for the current user.
 		$workflowStatus = $user->getWorkflowStatus();
 
-		$resArr = $dms->getDocumentList('WorkflowByMe', $user, $orderby, $orderdir);
+		$resArr = $dms->getDocumentList('WorkflowByMe', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
 			$this->htmlEndPage();
 			exit;
 		}
-			
+
 		if (count($resArr)>0) {
 			// Create an array to hold all of these results, and index the array by
 			// document id. This makes it easier to retrieve document ID information
@@ -444,12 +317,12 @@ $(document).ready( function() {
 			$iRev = array();
 			$dList = array();
 			foreach ($workflowStatus["u"] as $st) {
-			
+
 				if ( isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) ) {
 					$dList[] = $st["document"];
 					$document = $dms->getDocument($st["document"]);
 					$document->verifyLastestContentExpriry();
-				
+
 					if ($printheader){
 						print "<table class=\"table table-condensed\">";
 						print "<thead>\n<tr>\n";
@@ -460,7 +333,7 @@ $(document).ready( function() {
 						print "</tr>\n</thead>\n<tbody>\n";
 						$printheader=false;
 					}
-				
+
 					$txt = $this->callHook('documentListItem', $document, $previewer);
 					if(is_string($txt))
 						echo $txt;
@@ -470,7 +343,7 @@ $(document).ready( function() {
 				}
 			}
 			foreach ($workflowStatus["g"] as $st) {
-			
+
 				if (!in_array($st["document"], $iRev) && isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
 					$dList[] = $st["document"];
 					$document = $dms->getDocument($st["document"]);
@@ -520,91 +393,19 @@ $(document).ready( function() {
 		// Get document list for the current user.
 		$revisionStatus = $user->getRevisionStatus();
 
-		$resArr = $dms->getDocumentList('ReviseByMe', $user, $orderby, $orderdir);
+		$resArr = $dms->getDocumentList('ReviseByMe', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
 			$this->htmlEndPage();
 			exit;
 		}
+
+		$this->contentHeading(getMLText("documents_to_revise"));
 		if($resArr) {
-			/* Create an array to hold all of these results, and index the array 
-			 * by document id. This makes it easier to retrieve document ID
-			 * information later on and saves us having to repeatedly poll the
-			 * database every time new document information is required.
-			 */
-			$docIdx = array();
-			foreach ($resArr as $res) {
-				$docIdx[$res["id"]][$res["version"]] = $res;
-			}
-
-			$this->contentHeading(getMLText("documents_to_revise"));
-			$printheader=true;
-			$iRev = array();
-			$dList = array();
-			foreach ($revisionStatus["indstatus"] as $st) {
-			
-				if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
-					$dList[] = $st["documentID"];
-					$document = $dms->getDocument($st["documentID"]);
-					$document->verifyLastestContentExpriry();
-				
-					if ($printheader){
-						print "<table class=\"table table-condensed\">";
-						print "<thead>\n<tr>\n";
-						print "<th></th>\n";
-						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("status")."</th>\n";
-						print "<th>".getMLText("action")."</th>\n";
-						print "</tr>\n</thead>\n<tbody>\n";
-						$printheader=false;
-					}
-				
-					$txt = $this->callHook('documentListItem', $document, $previewer);
-					if(is_string($txt))
-						echo $txt;
-					else {
-						echo $this->documentListRow($document, $previewer, false, $st['version']);
-					}
-				}
-			}
-			foreach ($revisionStatus["grpstatus"] as $st) {
-			
-				if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
-					$dList[] = $st["documentID"];
-					$document = $dms->getDocument($st["documentID"]);
-					$document->verifyLastestContentExpriry();
-
-					if ($printheader){
-						print "<table class=\"table table-condensed\">";
-						print "<thead>\n<tr>\n";
-						print "<th></th>\n";
-						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("status")."</th>\n";
-						print "<th>".getMLText("action")."</th>\n";
-						print "</tr>\n</thead>\n<tbody>\n";
-						$printheader=false;
-					}
-
-					$txt = $this->callHook('documentListItem', $document, $previewer);
-					if(is_string($txt))
-						echo $txt;
-					else {
-						echo $this->documentListRow($document, $previewer, false, $st['version']);
-					}
-				}
-			}
-			if (!$printheader){
-				echo "</tbody>\n</table>";
-			}else{
-				printMLText("no_docs_to_revise");
-			}
-		}
-		else {
-			$this->contentHeading(getMLText("documents_to_revise"));
-			$this->contentContainerStart();
-			printMLText("no_revision_needed");
-			$this->contentContainerEnd();
+			$this->printList($resArr, $previewer);
+		} else {
+			printMLText("no_docs_to_revise");
 		}
 	} /* }}} */
 
@@ -621,92 +422,19 @@ $(document).ready( function() {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
 
-		$receiptStatus = $user->getReceiptStatus();
-		$resArr = $dms->getDocumentList('ReceiptByMe', $user, $orderby, $orderdir);
+		$resArr = $dms->getDocumentList('ReceiptByMe', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
 			$this->htmlEndPage();
 			exit;
 		}
+
+		$this->contentHeading(getMLText("documents_to_receipt"));
 		if($resArr) {
-			/* Create an array to hold all of these results, and index the array 
-			 * by document id. This makes it easier to retrieve document ID
-			 * information later on and saves us having to repeatedly poll the
-			 * database every time
-			 * new document information is required.
-			 */
-			$docIdx = array();
-			foreach ($resArr as $res) {
-				$docIdx[$res["id"]][$res["version"]] = $res;
-			}
-			$this->contentHeading(getMLText("documents_to_receipt"));
-			$printheader=true;
-			$iRev = array();
-			$dList = array();
-			foreach ($receiptStatus["indstatus"] as $st) {
-			
-				if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
-					$dList[] = $st["documentID"];
-					$document = $dms->getDocument($st["documentID"]);
-					$document->verifyLastestContentExpriry();
-				
-					if ($printheader){
-						print "<table class=\"table table-condensed\">";
-						print "<thead>\n<tr>\n";
-						print "<th></th>\n";
-						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("status")."</th>\n";
-						print "<th>".getMLText("action")."</th>\n";
-						print "</tr>\n</thead>\n<tbody>\n";
-						$printheader=false;
-					}
-				
-					$txt = $this->callHook('documentListItem', $document, $previewer);
-					if(is_string($txt))
-						echo $txt;
-					else {
-						echo $this->documentListRow($document, $previewer, false, $st['version']);
-					}
-				}
-			}
-			foreach ($receiptStatus["grpstatus"] as $st) {
-			
-				if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId()) {
-					$dList[] = $st["documentID"];
-					$document = $dms->getDocument($st["documentID"]);
-					$document->verifyLastestContentExpriry();
-
-					if ($printheader){
-						print "<table class=\"table table-condensed\">";
-						print "<thead>\n<tr>\n";
-						print "<th></th>\n";
-						print "<th>".getMLText("name")."</th>\n";
-						print "<th>".getMLText("status")."</th>\n";
-						print "<th>".getMLText("action")."</th>\n";
-						print "</tr>\n</thead>\n<tbody>\n";
-						$printheader=false;
-					}
-
-					$txt = $this->callHook('documentListItem', $document, $previewer);
-					if(is_string($txt))
-						echo $txt;
-					else {
-						echo $this->documentListRow($document, $previewer, false, $st['version']);
-					}
-				}
-			}
-			if (!$printheader){
-				echo "</tbody>\n</table>";
-			}else{
-				printMLText("no_docs_to_receipt");
-			}
-		}
-		else {
-			$this->contentHeading(getMLText("documents_to_receipt"));
-			$this->contentContainerStart();
-			printMLText("no_receipt_needed");
-			$this->contentContainerEnd();
+			$this->printList($resArr, $previewer);
+		} else {
+			printMLText("no_docs_to_receipt");
 		}
 
 	} /* }}} */
@@ -727,7 +455,7 @@ $(document).ready( function() {
 		/* Get list of documents owned by current user that has
 		 * been rejected.
 		 */
-		$resArr = $dms->getDocumentList('RejectOwner', $user, $orderby, $orderdir);
+		$resArr = $dms->getDocumentList('RejectOwner', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -735,30 +463,11 @@ $(document).ready( function() {
 			exit;
 		}
 
-		if (count($resArr)>0) {
-			$this->contentHeading(getMLText("documents_user_rejected"));
-
-			print "<table class=\"table table-condensed\">";
-			print "<thead>\n<tr>\n";
-			print "<th></th>";
-			print "<th>".getMLText("name")."</th>\n";
-			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("action")."</th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["documentID"]);
-				$document->verifyLastestContentExpriry();
-			
-				$txt = $this->callHook('documentListItem', $document, $previewer);
-				if(is_string($txt))
-					echo $txt;
-				else {
-					echo $this->documentListRow($document, $previewer, false, $res['version']);
-				}
-			}		
-			print "</tbody></table>";	
+		$this->contentHeading(getMLText("documents_user_rejected"));
+		if ($resArr) {
+			$this->printList($resArr, $previewer);
 		}
+		else printMLText("no_docs_rejected");
 
 	} /* }}} */
 
@@ -776,7 +485,7 @@ $(document).ready( function() {
 		$previewer->setConverters($previewconverters);
 
 		/* Get list of documents locked by current user */
-		$resArr = $dms->getDocumentList('LockedByMe', $user, $orderby, $orderdir);
+		$resArr = $dms->getDocumentList('LockedByMe', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -785,29 +494,8 @@ $(document).ready( function() {
 		}
 
 		$this->contentHeading(getMLText("documents_locked_by_you"));
-		if (count($resArr)>0) {
-
-			print "<table class=\"table table-condensed\">";
-			print "<thead>\n<tr>\n";
-			print "<th></th>";
-			print "<th>".getMLText("name")."</th>\n";
-			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("action")."</th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["documentID"]);
-				$document->verifyLastestContentExpriry();
-			
-				$txt = $this->callHook('documentListItem', $document, $previewer);
-				if(is_string($txt))
-					echo $txt;
-				else {
-					echo $this->documentListRow($document, $previewer, false, $res['version']);
-				}
-			}		
-			print "</tbody></table>";	
-			
+		if ($resArr) {
+			$this->printList($resArr, $previewer);
 		}
 		else printMLText("no_docs_locked");
 
@@ -827,7 +515,7 @@ $(document).ready( function() {
 		$previewer->setConverters($previewconverters);
 
 		/* Get list of documents checked out by current user */
-		$resArr = $dms->getDocumentList('CheckedOutByMe', $user, $orderby, $orderdir);
+		$resArr = $dms->getDocumentList('CheckedOutByMe', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
 			$this->contentHeading(getMLText("warning"));
 			$this->contentContainer(getMLText("internal_error_exit"));
@@ -836,34 +524,10 @@ $(document).ready( function() {
 		}
 
 		$this->contentHeading(getMLText("documents_checked_out_by_you"));
-//		$this->contentContainerStart();
-		if (count($resArr)>0) {
-
-			print "<table class=\"table table-condensed\">";
-			print "<thead>\n<tr>\n";
-			print "<th></th>";
-			print "<th>".getMLText("name")."</th>\n";
-			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("action")."</th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["documentID"]);
-				$document->verifyLastestContentExpriry();
-			
-				$txt = $this->callHook('documentListItem', $document, $previewer);
-				if(is_string($txt))
-					echo $txt;
-				else {
-					echo $this->documentListRow($document, $previewer, false, $res['version']);
-				}
-			}		
-			print "</tbody></table>";	
-			
+		if ($resArr) {
+			$this->printList($resArr, $previewer);
 		}
 		else printMLText("no_docs_checked_out");
-
-//		$this->contentContainerEnd();
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -871,7 +535,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
-		$showInProcess = $this->params['showinprocess'];
+		$listtype = $this->params['listtype'];
 		$cachedir = $this->params['cachedir'];
 		$workflowmode = $this->params['workflowmode'];
 		$previewwidth = $this->params['previewWidthList'];
@@ -887,46 +551,42 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 
-		if($showInProcess) {
-			echo '<div class="row-fluid">';
-			echo '<div class="span3">';
-			echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
-			$resArr = $dms->getDocumentList('MyDocs', $user);
-			echo '<li class=""><a data-href="#all_documents" data-action="listMyDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("all_documents").'</a></li>';
-			if($workflowmode == 'traditional') {
-				$resArr = $dms->getDocumentList('AppRevByMe', $user);
-				echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>';
-			}
-			if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
-				$resArr = $dms->getDocumentList('AppRevByMe', $user);
-				echo '<li class=""><a data-href="#documents_to_approve" data-action="listApprovals"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_approve").'</a></li>';
-			} else {
-				$resArr = $dms->getDocumentList('WorkflowByMe', $user);
-				echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>';
-			}
+		echo '<div class="row-fluid">';
+		echo '<div class="span3">';
+		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
+		$resArr = $dms->getDocumentList('MyDocs', $user);
+		echo '<li class=""><a data-href="#all_documents" data-action="listMyDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("all_documents").'</a></li>';
+		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
-			$resArr = $dms->getDocumentList('ReviseByMe', $user);
-			echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
-			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-			echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
-			$resArr = $dms->getDocumentList('RejectOwner', $user);
-			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
-			$resArr = $dms->getDocumentList('LockedByMe', $user);
-			echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
-			$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
-			echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
-      echo '</ul>';
-			echo '</div>';
-			echo '<div class="span9">';
-
-			echo '<div id="kkkk" class="ajax" data-view="MyDocuments" data-action="listReviews"></div>';
-
-			echo '</div>';
-			echo '</div>';
-		} else {
-			echo '<div class="ajax" data-view="MyDocuments" data-action="listMyDocs"></div>';
+			$resArr = $dms->getDocumentList('ReviewByMe', $user);
+			echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>';
 		}
+		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+			$resArr = $dms->getDocumentList('ApproveByMe', $user);
+			echo '<li class=""><a data-href="#documents_to_approve" data-action="listApprovals"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_approve").'</a></li>';
+		} else {
+			$resArr = $dms->getDocumentList('WorkflowByMe', $user);
+			echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>';
+		}
+		$resArr = $dms->getDocumentList('ReviseByMe', $user);
+		echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
+		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+		echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
+		$resArr = $dms->getDocumentList('RejectOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
+		$resArr = $dms->getDocumentList('LockedByMe', $user);
+		echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
+		$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
+		echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
+		echo '</ul>';
+		echo '</div>';
+		echo '<div class="span9">';
+
+		echo '<div id="kkkk" class="ajax" data-view="MyDocuments" data-action="'.($listtype ? $listtype : 'listDocsToLookAt').'"></div>';
+
+		echo '</div>';
+		echo '</div>';
 
 		$this->contentEnd();
 		$this->htmlEndPage();

From 504cfe6d3e3bdacab043dc5f5c22fa4998c0b115 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 12:42:25 +0200
Subject: [PATCH 0583/2006] output a message if access to form() action was
 prohibited

---
 views/bootstrap/class.RoleMgr.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index d19c6b8a1..126106d23 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -211,11 +211,13 @@ $(document).ready( function() {
 </div>
 
 <div class="span8">
-	<div class="well">
 <?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
+	<div class="well">
 		<div class="ajax" data-view="RoleMgr" data-action="form" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
-<?php } ?>
 	</div>
+<?php } else {
+	$this->errorMsg(getMLText('access_denied'));
+} ?>
 </div>
 </div>
 

From bf7a63bf5a609216476102ce264c551dd7962c35 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 12:43:21 +0200
Subject: [PATCH 0584/2006] add more role based access checks

---
 views/bootstrap/class.ViewDocument.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f9cfa1060..dabe008a5 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -169,7 +169,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$document = $this->params['document'];
 		$accessop = $this->params['accessobject'];
 
-		if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+		if($accessop->check_controller_access('Download', array('action'=>'version'))) {
 			$latestContent = $document->getLatestContent();
 			switch($latestContent->getMimeType()) {
 			case 'audio/mpeg':
@@ -480,7 +480,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\">";
 				}
 			} else {
-				if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+				if($accessop->check_controller_access('Download', array('action'=>'version'))) {
 					print "<a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\">";
 				}
 			}
@@ -538,7 +538,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		print "<ul class=\"unstyled actions\">";
 		if ($file_exists){
-			if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+			if($accessop->check_controller_access('Download', array('action'=>'version'))) {
 				print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a></li>";
 			}
 			if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
@@ -1237,7 +1237,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\">";
 						}
 					} else {
-						if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+						if($accessop->check_controller_access('Download', array('action'=>'version'))) {
 							print "<a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\">";
 						}
 					}
@@ -1283,7 +1283,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>";
 				print "<ul class=\"actions unstyled\">";
 				if ($file_exists){
-					if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+					if($accessop->check_controller_access('Download', array('action'=>'version'))) {
 						print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a>";
 					}
 					if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes))
@@ -1346,7 +1346,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\">";
 						}
 					} else {
-						if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+						if($accessop->check_controller_access('Download', array('action'=>'file'))) {
 							print "<a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\">";
 						}
 					}
@@ -1376,7 +1376,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			
 				print "<td><ul class=\"unstyled actions\">";
 				if ($file_exists) {
-					if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+					if($accessop->check_controller_access('Download', array('action'=>'file'))) {
 						print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a></li>";
 					}
 					if ($viewonlinefiletypes && in_array(strtolower($file->getFileType()), $viewonlinefiletypes)) {
@@ -1436,7 +1436,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if(0){
 				print "<tr>";
 				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
-				if($accessop->check_controller_access('Download', array('action'=>'run')))
+				if($accessop->check_controller_access('Download', array('action'=>'version')))
 					print "<a href=\"../op/op.Download.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."\">";
 				if($previewer->hasPreview($targetlc)) {
 					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$targetDoc->getID()."&version=".$targetlc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($targetlc->getMimeType())."\">";
@@ -1513,7 +1513,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$previewer->createPreview($sourcelc, $previewwidthdetail);
 				print "<tr>";
 				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
-				if($accessop->check_controller_access('Download', array('action'=>'run')))
+				if($accessop->check_controller_access('Download', array('action'=>'version')))
 					print "<a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
 				if($previewer->hasPreview($sourcelc)) {
 					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\"src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";

From b90c9a379a7ca826731cc77d294992b2fad7f649 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 13:14:34 +0200
Subject: [PATCH 0585/2006] major overhaul

do not show backup space required, if backup is stored in content
direcotry. Add various role based access checks.
---
 out/out.BackupTools.php               |  7 ++-
 views/bootstrap/class.BackupTools.php | 63 ++++++++++++++++++---------
 2 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/out/out.BackupTools.php b/out/out.BackupTools.php
index 62001f4b4..08c727843 100644
--- a/out/out.BackupTools.php
+++ b/out/out.BackupTools.php
@@ -34,10 +34,13 @@ if (!$accessop->check_view_access($view, $_GET)) {
 }
 
 if($view) {
-	if($settings->_backupDir && file_exists($settings->_backupDir))
+	if($settings->_backupDir && file_exists($settings->_backupDir)) {
 		$view->setParam('backupdir', $settings->_backupDir);
-	else
+		$view->setParam('hasbackupdir', true);
+	} else {
 		$view->setParam('backupdir', $settings->_contentDir);
+		$view->setParam('hasbackupdir', false);
+	}
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php
index 66d506c9b..2d28b42b0 100644
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@@ -42,6 +42,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$accessop = $this->params['accessobject'];
 		$backupdir = $this->params['backupdir'];
 
 		$this->htmlStartPage(getMLText("backup_tools"));
@@ -49,17 +50,22 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
-		$this->contentHeading(getMLText("backup_tools"));
-		$this->contentContainerStart();
-		print getMLText("space_used_on_data_folder")." : ".SeedDMS_Core_File::format_filesize(dskspace($backupdir));
-		$this->contentContainerEnd();
+		/* Calculating the size of the backup dir is only reasonable if
+		 * it is not part of the content dir. Otherwise the content will
+		 * be counted as well.
+		 */
+		if($this->params['hasbackupdir']) {
+			$this->contentHeading(getMLText("backup_tools"));
+			$this->contentContainerStart();
+			print getMLText("space_used_on_data_folder")." : ".SeedDMS_Core_File::format_filesize(dskspace($backupdir));
+			$this->contentContainerEnd();
+		}
 
 		// versioning file creation ////////////////////////////////////////////////////
 
 		$this->contentHeading(getMLText("versioning_file_creation"));
-		$this->contentContainerStart();
 		print "<p>".getMLText("versioning_file_creation_warning")."</p>\n";
-
+		$this->contentContainerStart();
 		print "<form class=\"form-inline\" action=\"../op/op.CreateVersioningFiles.php\" name=\"form1\">";
 		$this->printFolderChooserHtml("form1",M_READWRITE);
 		print "<input type='submit' class='btn' name='' value='".getMLText("versioning_file_creation")."'/>";
@@ -70,14 +76,15 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 		// archive creation ////////////////////////////////////////////////////////////
 
 		$this->contentHeading(getMLText("archive_creation"));
-		$this->contentContainerStart();
 		print "<p>".getMLText("archive_creation_warning")."</p>\n";
-
-		print "<form action=\"../op/op.CreateFolderArchive.php\" name=\"form2\">";
-		$this->printFolderChooserHtml("form2",M_READWRITE);
-		print "<label class=\"checkbox\"><input type=\"checkbox\" name=\"human_readable\" value=\"1\">".getMLText("human_readable")."</label>";
-		print "<input type='submit' class='btn' name='' value='".getMLText("archive_creation")."'/>";
-		print "</form>\n";
+		$this->contentContainerStart();
+		if($accessop->check_controller_access('CreateFolderArchive', array('action'=>'run'))) {
+			print "<form action=\"../op/op.CreateFolderArchive.php\" name=\"form2\">";
+			$this->printFolderChooserHtml("form2",M_READWRITE);
+			print "<label class=\"checkbox\"><input type=\"checkbox\" name=\"human_readable\" value=\"1\">".getMLText("human_readable")."</label>";
+			print "<input type='submit' class='btn' name='' value='".getMLText("archive_creation")."'/>";
+			print "</form>\n";
+		}
 
 		// list backup files
 
@@ -110,13 +117,19 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 				$folder=$dms->getFolder((int)$folderid);
 						
 				print "<tr>\n";
-				print "<td><a href=\"../op/op.Download.php?arkname=".$entry."\">".$entry."</a></td>\n";
+				print "<td>";
+				if($accessop->check_controller_access('Download', array('action'=>'archive')))
+					print "<a href=\"../op/op.Download.php?arkname=".$entry."\">".$entry."</a>";
+				else
+					print $entry;
+				print "</td>\n";
 				if (is_object($folder)) print "<td>".htmlspecialchars($folder->getName())."</td>\n";
 				else print "<td>".getMLText("unknown_id")."</td>\n";
 				print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
 				print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 				print "<td>";
-				print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
+				if($accessop->check_controller_access('RemoveArchive', array('action'=>'run')))
+					print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
 				print "</td>\n";	
 				print "</tr>\n";
 			}
@@ -128,12 +141,14 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 		// dump creation ///////////////////////////////////////////////////////////////
 
 		$this->contentHeading(getMLText("dump_creation"));
-		$this->contentContainerStart();
 		print "<p>".getMLText("dump_creation_warning")."</p>\n";
+		$this->contentContainerStart();
 
-		print "<form action=\"../op/op.CreateDump.php\" name=\"form4\">";
-		print "<input type='submit' class='btn' name='' value='".getMLText("dump_creation")."'/>";
-		print "</form>\n";
+		if($accessop->check_controller_access('CreateDump', array('action'=>'run'))) {
+			print "<form action=\"../op/op.CreateDump.php\" name=\"form4\">";
+			print "<input type='submit' class='btn' name='' value='".getMLText("dump_creation")."'/>";
+			print "</form>\n";
+		}
 
 		// list backup files
 		$handle = opendir($backupdir);
@@ -160,11 +175,17 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 
 			foreach ($entries as $entry){
 				print "<tr>\n";
-				print "<td><a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a></td>\n";
+				print "<td>";
+				if($accessop->check_controller_access('Download', array('action'=>'sqldump')))
+					print "<a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a>";
+				else
+					print $entry;
+				print "</td>\n";
 				print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
 				print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
 				print "<td>";
-				print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
+				if($accessop->check_controller_access('RemoveDump', array('action'=>'run')))
+					print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
 				print "</td>\n";	
 				print "</tr>\n";
 			}

From 9a20306399b2eb73d3220d39bb0794782d9df8dc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 14:59:46 +0200
Subject: [PATCH 0586/2006] add access check for download of approval/review
 files

---
 views/bootstrap/class.Bootstrap.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 77caaee26..9792872e6 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2496,16 +2496,18 @@ mayscript>
 				echo "<br />".htmlspecialchars($rec['comment']);
 			switch($type) {
 			case "review":
-				if($rec['file']) {
-					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
-				}
+				if($accessop->check_controller_access('Download', array('action'=>'review')))
+					if($rec['file']) {
+						echo "<br />";
+						echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					}
 				break;
 			case "approval":
-				if($rec['file']) {
-					echo "<br />";
-					echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
-				}
+				if($accessop->check_controller_access('Download', array('action'=>'approval')))
+					if($rec['file']) {
+						echo "<br />";
+						echo "<a href=\"../op/op.Download.php?documentid=".$document->getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
+					}
 				break;
 			}
 			echo "</td>";

From f2ffca8096e70529ad803d89e79f26ab8867c0cf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 15:00:12 +0200
Subject: [PATCH 0587/2006] add role based access check

---
 views/bootstrap/class.LogManagement.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php
index 6641571cf..0f2c67e25 100644
--- a/views/bootstrap/class.LogManagement.php
+++ b/views/bootstrap/class.LogManagement.php
@@ -32,9 +32,10 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
 
 	function filelist($entries, $mode) { /* {{{ */
+		$accessop = $this->params['accessobject'];
 		$print_header = true;
 		foreach ($entries as $entry){
-			
+
 			if ($print_header){
 				print "<form action=\"out.RemoveLog.php\" method=\"get\">\n";
 				print "<table class=\"table-condensed\">\n";
@@ -47,7 +48,7 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
 				print "</tr>\n</thead>\n<tbody>\n";
 				$print_header=false;
 			}
-					
+
 			print "<tr>\n";
 			print "<td><input type=\"checkbox\" name=\"logname[]\" value=\"".$entry."\"/></td>\n";
 			print "<td><a href=\"out.LogManagement.php?logname=".$entry."\">".$entry."</a></td>\n";
@@ -55,13 +56,17 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
 			print "<td>".getLongReadableDate(filectime($this->contentdir.$entry))."</td>\n";
 			print "<td>".SeedDMS_Core_File::format_filesize(filesize($this->contentdir.$entry))."</td>\n";
 			print "<td>";
-			
-			print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("rm_file")."</a>";
-			print "&nbsp;";
-			print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
+
+			if($accessop->check_view_access('RemoveLog')) {
+				print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("rm_file")."</a>";
+			}
+			if($accessop->check_controller_access('Download', array('action'=>'log'))) {
+				print "&nbsp;";
+				print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText("download")."</a>";
+			}
 			print "&nbsp;";
 			print "<a data-target=\"#logViewer\" data-cache=\"false\" href=\"out.LogManagement.php?logname=".$entry."\" role=\"button\" class=\"btn btn-mini\" data-toggle=\"modal\"><i class=\"icon-eye-open\"></i> ".getMLText('view')." …</a>";
-			print "</td>\n";	
+			print "</td>\n";
 			print "</tr>\n";
 		}
 
@@ -79,13 +84,14 @@ $(document).ready( function() {
 		$('input[type=checkbox]').prop('checked', true);
 	});
 
-});		
+});
 <?php
 	} /* }}} */
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$accessop = $this->params['accessobject'];
 		$this->contentdir = $this->params['contentdir'];
 		$logname = $this->params['logname'];
 		$mode = $this->params['mode'];

From c56d02667964f465bf0b7a3b4d619edd96517d8d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 15:01:10 +0200
Subject: [PATCH 0588/2006] never needed

---
 views/bootstrap/class.CheckOutSummary.php | 160 ----------------------
 1 file changed, 160 deletions(-)
 delete mode 100644 views/bootstrap/class.CheckOutSummary.php

diff --git a/views/bootstrap/class.CheckOutSummary.php b/views/bootstrap/class.CheckOutSummary.php
deleted file mode 100644
index a243df01b..000000000
--- a/views/bootstrap/class.CheckOutSummary.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/**
- * Implementation of CheckOutSummary view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.Bootstrap.php");
-
-/**
- * Class which outputs the html page for CheckOutSummary view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_CheckOutSummary extends SeedDMS_Bootstrap_Style {
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$cachedir = $this->params['cachedir'];
-		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
-		$timeout = $this->params['timeout'];
-
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
-		$previewer->setConverters($previewconverters);
-
-		$this->htmlStartPage(getMLText("my_documents"));
-		$this->globalNavigation();
-		$this->contentStart();
-		$this->pageNavigation(getMLText("my_documents"), "my_documents");
-
-		$this->contentHeading(getMLText("checkout_summary"));
-		$this->contentContainerStart();
-
-		// Get document list for the current user.
-		$receiptStatus = $user->getReceiptStatus();
-
-		// reverse order
-		$receiptStatus["indstatus"]=array_reverse($receiptStatus["indstatus"],true);
-		$receiptStatus["grpstatus"]=array_reverse($receiptStatus["grpstatus"],true);
-
-		$printheader=true;
-		$iRev = array();
-		foreach ($receiptStatus["indstatus"] as $st) {
-			$document = $dms->getDocument($st['documentID']);
-			if($document)
-				$version = $document->getContentByVersion($st['version']);
-			$owner = $document->getOwner();
-			$moduser = $dms->getUser($st['required']);
-
-			if ($document && $version) {
-			
-				if ($printheader){
-					print "<table class=\"table-condensed\">";
-					print "<thead>\n<tr>\n";
-					print "<th></th>\n";
-					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
-					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
-					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
-					print "</tr>\n</thead>\n<tbody>\n";
-					$printheader=false;
-				}
-			
-				print "<tr>\n";
-				$previewer->createPreview($version);
-				print "<td><a href=\"../op/op.Download.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">";
-				if($previewer->hasPreview($version)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				}
-				print "</a></td>";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".getOverallStatusText($st["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
-			}
-			if ($st["status"]!=-2) {
-				$iRev[] = $st["documentID"];
-			}
-		}
-		if (!$printheader) {
-			echo "</tbody>\n</table>";
-		} else {
-			printMLText("no_docs_to_receipt");
-		}
-
-		$this->contentContainerEnd();
-		$this->contentHeading(getMLText("group_receipt_summary"));
-		$this->contentContainerStart();
-
-		$printheader=true;
-		foreach ($receiptStatus["grpstatus"] as $st) {
-			$document = $dms->getDocument($st['documentID']);
-			if($document)
-				$version = $document->getContentByVersion($st['version']);
-			$owner = $document->getOwner();
-			$modgroup = $dms->getGroup($st['required']);
-
-			if (!in_array($st["documentID"], $iRev) && $document && $version) {
-			
-				if ($printheader){
-					print "<table class=\"folderView\">";
-					print "<thead>\n<tr>\n";
-					print "<th>".getMLText("name")."</th>\n";
-					print "<th>".getMLText("owner")."</th>\n";
-					print "<th>".getMLText("status")."</th>\n";
-					print "<th>".getMLText("version")."</th>\n";
-					print "<th>".getMLText("last_update")."</th>\n";
-					print "<th>".getMLText("expires")."</th>\n";
-					print "</tr>\n</thead>\n<tbody>\n";
-					$printheader=false;
-				}		
-			
-				print "<tr>\n";
-				print "<td><a href=\"out.DocumentVersionDetail.php?documentid=".$st["documentID"]."&version=".$st["version"]."\">".htmlspecialchars($document->getName())."</a></td>";
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".getOverallStatusText($st["status"])."</td>";
-				print "<td>".$st["version"]."</td>";
-				print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
-				print "<td>".(!$document->expires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-				print "</tr>\n";
-			}
-		}
-		if (!$printheader) {
-			echo "</tbody>\n</table>";
-		}else{
-			printMLText("empty_notify_list");
-		}
-
-		$this->contentContainerEnd();
-		$this->contentEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>

From 224172f785099589e1e02e044b6e8b2b2a343ffd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 15:57:47 +0200
Subject: [PATCH 0589/2006] add access check

---
 out/out.MyAccount.php      | 3 +++
 out/out.MyDocuments.php    | 3 +++
 out/out.SubstituteUser.php | 3 +++
 out/out.TransmittalMgr.php | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/out/out.MyAccount.php b/out/out.MyAccount.php
index dddfd4196..33454b9e6 100644
--- a/out/out.MyAccount.php
+++ b/out/out.MyAccount.php
@@ -30,6 +30,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
+}
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 163b3a918..88f9064e6 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -30,6 +30,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
+}
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
diff --git a/out/out.SubstituteUser.php b/out/out.SubstituteUser.php
index 2e77009a7..41fd8918f 100644
--- a/out/out.SubstituteUser.php
+++ b/out/out.SubstituteUser.php
@@ -29,6 +29,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1]);
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
 
 if ($user->isAdmin()) {
 	$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index b9d460d21..31892e2d3 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -34,6 +34,9 @@ require_once("SeedDMS/Preview.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));
+}
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));

From 74f9a0209be042d9441ebc1ff302ce29962aafc3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 18:08:30 +0200
Subject: [PATCH 0590/2006] add more access checks

---
 out/out.AddDocument.php                |  3 +++
 out/out.AddEvent.php                   |  9 +++++++--
 out/out.AddFile.php                    | 12 +++++++-----
 out/out.AddSubFolder.php               |  3 +++
 out/out.AddToTransmittal.php           | 12 +++++++-----
 out/out.Calendar.php                   |  1 +
 views/bootstrap/class.Bootstrap.php    |  8 +++++---
 views/bootstrap/class.ViewDocument.php |  3 ++-
 8 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 0cd155340..a4203d059 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -31,6 +31,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));
+}
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
diff --git a/out/out.AddEvent.php b/out/out.AddEvent.php
index fd423da19..cc7e2e45b 100644
--- a/out/out.AddEvent.php
+++ b/out/out.AddEvent.php
@@ -25,12 +25,17 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("edit_event"),getMLText("access_denied"));
+}
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("edit_event"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view($_GET);
 	exit;
diff --git a/out/out.AddFile.php b/out/out.AddFile.php
index fc16de69a..7e9bdd01e 100644
--- a/out/out.AddFile.php
+++ b/out/out.AddFile.php
@@ -29,6 +29,13 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"]<1)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -45,11 +52,6 @@ if ($document->getAccessMode($user) < M_READWRITE) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.AddSubFolder.php b/out/out.AddSubFolder.php
index ee5ddbc79..9bded1b66 100644
--- a/out/out.AddSubFolder.php
+++ b/out/out.AddSubFolder.php
@@ -31,6 +31,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("folder_title", array("foldername" => '')),getMLText("access_denied"));
+}
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
diff --git a/out/out.AddToTransmittal.php b/out/out.AddToTransmittal.php
index 6bb1b0837..a8d528eff 100644
--- a/out/out.AddToTransmittal.php
+++ b/out/out.AddToTransmittal.php
@@ -29,6 +29,13 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("document_title", array("documentname" => '')),getMLText("access_denied"));
+}
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -54,11 +61,6 @@ if (!is_object($content)) {
 $folder = $document->getFolder();
 $transmittals = $dms->getAllTransmittals($user);
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index 01070f74e..8eb9c40ce 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.php
@@ -51,6 +51,7 @@ if($view) {
 	$view->setParam('month', $month);
 	$view->setParam('day', $day);
 	$view->setParam('firstdayofweek', $settings->_firstDayOfWeek);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 9792872e6..18c3481d0 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -525,8 +525,10 @@ $(document).ready(function () {
 			$menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_notify');
 		}
 		else if ($accessMode >= M_READWRITE) {
-			$menuitems['add_subfolder'] = array('link'=>"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_subfolder');
-			$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_document');
+			if ($this->check_access('AddSubFolder'))
+				$menuitems['add_subfolder'] = array('link'=>"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_subfolder');
+			if ($this->check_access('AddDocument'))
+				$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_document');
 			if($this->params['enablelargefileupload'])
 				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_multiple_documents');
 			$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'edit_folder_props');
@@ -812,7 +814,7 @@ $(document).ready(function () {
 		echo "<li><a href=\"../out/out.Calendar.php?mode=w".$ds."\">".getMLText("week_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.Calendar.php?mode=m".$ds."\">".getMLText("month_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.Calendar.php?mode=y".$ds."\">".getMLText("year_view")."</a></li>\n";
-		if (!$this->params['user']->isGuest()) echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
+		if (!$this->params['user']->isGuest() && $this->check_access('AddEvent')) echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
 		echo "</ul>\n";
 		echo "</div>\n";
 		return;
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index dabe008a5..88548f2e5 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -584,7 +584,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		 */
 		if($dms->getAllTransmittals($user)) {
-			print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
+			if($this->check_access('AddToTransmittal'))
+				print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
 		}
 		if($accessop->mayEditComment($document)) {
 			print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";

From 311207804166b950cb16bc59645f2b5dcce633d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Aug 2016 18:16:19 +0200
Subject: [PATCH 0591/2006] replace phrase when no review is needed

---
 views/bootstrap/class.ReviewSummary.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 2a1f5b717..831a30e9e 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -102,7 +102,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		if (!$printheader) {
 			echo "</tbody>\n</table>";
 		} else {
-			printMLText("no_docs_to_review");
+			printMLText("no_review_needed");
 		}
 
 //		$this->contentContainerEnd();
@@ -143,7 +143,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		if (!$printheader) {
 			echo "</tbody>\n</table>";
 		}else{
-			printMLText("no_docs_to_review");
+			printMLText("no_review_needed");
 		}
 
 //		$this->contentContainerEnd();

From 38e75cf422963ecef92c39e6e0bc58b648af58a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Aug 2016 07:08:31 +0200
Subject: [PATCH 0592/2006] don't need accessop in show_form()

---
 views/bootstrap/class.RoleMgr.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 126106d23..891a42e49 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -112,7 +112,6 @@ $(document).ready( function() {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$accessop = $this->params['accessobject'];
-		$roles = $this->params['allroles'];
 
 		if($currRole && !$currRole->isUsed() && $accessop->check_controller_access('RoleMgr', array('action'=>'removerole'))) {
 ?>

From b6907c6bc2f937f2f92ce154d8a7e618e856923a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 06:23:22 +0200
Subject: [PATCH 0593/2006] pass accessop to 'view', remove
 '[update|remove]transmittalitem'

'[update|remove]transmittalitem' is now in op/op.TransmittalMgr.php
---
 op/op.Ajax.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index ffe15e016..9f7b55410 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -496,10 +496,13 @@ switch($command) {
 
 	case 'view': /* {{{ */
 		require_once("SeedDMS/Preview.php");
+		require_once("../inc/inc.ClassAccessOperation.php");
 		$view = UI::factory($theme, '', array('dms'=>$dms, 'user'=>$user));
+		$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 		if($view) {
 			$view->setParam('refferer', '');
 			$view->setParam('cachedir', $settings->_cacheDir);
+			$view->setParam('accessobject', $accessop);
 		}
 		$content = '';
 		$viewname = $_REQUEST["view"];
@@ -765,7 +768,8 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'removetransmittalitem': /* {{{ */
+		/* Deprecated, has moved to op/op.TransmittalMgr.php */
+	case '___removetransmittalitem': /* {{{ */
 		if($user) {
 			if(!checkFormKey('removetransmittalitem', 'GET')) {
 				header('Content-Type: application/json');
@@ -799,7 +803,8 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'updatetransmittalitem': /* {{{ */
+		/* Deprecated, has moved to op/op.TransmittalMgr.php */
+	case '___updatetransmittalitem': /* {{{ */
 		if($user) {
 			if(!checkFormKey('updatetransmittalitem', 'GET')) {
 				header('Content-Type: application/json');

From 3e45e8cb10bbd06e3bd38457b237066784dd6d3e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 06:25:17 +0200
Subject: [PATCH 0594/2006] add actions '[update|remove]transmittalitem'

---
 op/op.TransmittalMgr.php | 85 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 77 insertions(+), 8 deletions(-)

diff --git a/op/op.TransmittalMgr.php b/op/op.TransmittalMgr.php
index 1c58bd032..73bbc1f52 100644
--- a/op/op.TransmittalMgr.php
+++ b/op/op.TransmittalMgr.php
@@ -28,7 +28,6 @@ include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
-include("../inc/inc.ClassPasswordStrength.php");
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));
@@ -38,7 +37,7 @@ if (isset($_POST["action"])) $action=$_POST["action"];
 else $action=NULL;
 
 // add new transmittal ---------------------------------------------------
-if ($action == "addtransmittal") {
+if ($action == "addtransmittal") { /* {{{ */
 	
 	/* Check if the form data comes for a trusted request */
 	if(!checkFormKey('addtransmittal')) {
@@ -58,10 +57,10 @@ if ($action == "addtransmittal") {
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_transmittal')));
 
 	add_log_line(".php&action=addtransmittal&name=".$name);
-}
+} /* }}} */
 
 // delete transmittal ------------------------------------------------------------
-else if ($action == "removetransmittal") {
+else if ($action == "removetransmittal") { /* {{{ */
 
 	/* Check if the form data comes for a trusted request */
 	if(!checkFormKey('removetransmittal')) {
@@ -88,10 +87,10 @@ else if ($action == "removetransmittal") {
 	
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_transmittal')));
 	$transmittalid=-1;
-}
+} /* }}} */
 
 // modify transmittal ----------------------------------------------------
-else if ($action == "edittransmittal") {
+else if ($action == "edittransmittal") { /* {{{ */
 
 	/* Check if the form data comes for a trusted request */
 	if(!checkFormKey('edittransmittal')) {
@@ -119,10 +118,80 @@ else if ($action == "edittransmittal") {
 
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_transmittal')));
 	add_log_line(".php&action=edittransmittal&transmittalid=".$transmittalid);
-}
+} /* }}} */
+
+// remove transmittal item ------------------------------------------------
+else if ($action == "removetransmittalitem") { /* {{{ */
+
+	if(!checkFormKey('removetransmittalitem', 'POST')) {
+		header('Content-Type: application/json');
+		echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+	} else {
+		$item = SeedDMS_Core_TransmittalItem::getInstance((int) $_REQUEST['id'], $dms);
+		if($item) {
+			$transmittal = $item->getTransmittal();
+			if($transmittal) {
+				if ($transmittal->getUser()->getID() == $user->getID()) {
+					if($item->remove()) {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+					} else {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>false, 'message'=>'Error removing transmittal item', 'data'=>''));
+					}
+				} else {
+					header('Content-Type: application/json');
+					echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+				}
+			} else {
+				header('Content-Type: application/json');
+				echo json_encode(array('success'=>false, 'message'=>'No transmittal', 'data'=>''));
+			}
+		} else {
+			header('Content-Type: application/json');
+			echo json_encode(array('success'=>false, 'message'=>'No transmittal item', 'data'=>''));
+		}
+	}
+	add_log_line(".php&action=removetransmittalitem&id=".$_REQUEST['id']);
+	exit;
+} /* }}} */
+
+// update transmittal item ------------------------------------------------
+else if ($action == "updatetransmittalitem") { /* {{{ */
+	if(!checkFormKey('updatetransmittalitem', 'POST')) {
+		header('Content-Type: application/json');
+		echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+	} else {
+		$item = SeedDMS_Core_TransmittalItem::getInstance((int) $_REQUEST['id'], $dms);
+		if($item) {
+			$transmittal = $item->getTransmittal();
+			if($transmittal) {
+				if ($transmittal->getUser()->getID() == $user->getID()) {
+					if($item->updateContent()) {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+					} else {
+						header('Content-Type: application/json');
+						echo json_encode(array('success'=>false, 'message'=>'Error updating transmittal item', 'data'=>''));
+					}
+				} else {
+					header('Content-Type: application/json');
+					echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+				}
+			} else {
+				header('Content-Type: application/json');
+				echo json_encode(array('success'=>false, 'message'=>'No transmittal', 'data'=>''));
+			}
+		} else {
+			header('Content-Type: application/json');
+			echo json_encode(array('success'=>false, 'message'=>'No transmittal item', 'data'=>''));
+		}
+	}
+	add_log_line(".php&action=updatetransmittalitem&id=".$_REQUEST['id']);
+	exit;
+} /* }}} */
 else UI::exitError(getMLText("my_transmittals"),getMLText("unknown_command"));
 
 header("Location:../out/out.TransmittalMgr.php?transmittalid=".$transmittalid);
 
-?>
 

From cf6f8b952d0583049bc1f13ba0c5e0112cdb1e2e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 06:26:34 +0200
Subject: [PATCH 0595/2006] add access check for MyDocuments, MyAccount,
 MyTransmittals

---
 views/bootstrap/class.Bootstrap.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5735c4de0..3242ab7c8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -309,8 +309,10 @@ $(document).ready(function () {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		$content .= "    <li class=\"divider\"></li>\n";
-		$content .= "    <li><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("my_documents")."</a></li>\n";
+		if ($this->check_access('MyDocuments')) {
+			$content .= "    <li class=\"divider\"></li>\n";
+			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
+		}
 		$content .= "     </ul>\n";
 //		$content .= "    </li>\n";
 //		$content .= "   </ul>\n";
@@ -336,9 +338,12 @@ $(document).ready(function () {
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			if (!$this->params['user']->isGuest()) {
 				$menuitems = array();
-				$menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php?inProcess=1", 'label'=>'my_documents');
-				$menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account');
-				$menuitems['my_transmittals'] = array('link'=>"../out/out.TransmittalMgr.php", 'label'=>'my_transmittals');
+				if ($this->check_access('MyDocuments'))
+					$menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php", 'label'=>'my_documents');
+				if ($this->check_access('MyAccount'))
+					$menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account');
+				if ($this->check_access('TransmittalMgr'))
+					$menuitems['my_transmittals'] = array('link'=>"../out/out.TransmittalMgr.php", 'label'=>'my_transmittals');
 				$hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap');
 				foreach($hookObjs as $hookObj) {
 					if (method_exists($hookObj, 'userMenuItems')) {
@@ -661,7 +666,7 @@ $(document).ready(function () {
 
 	private function myDocumentsNavigationBar() { /* {{{ */
 
-		echo "<id=\"first\"><a href=\"../out/out.MyDocuments.php?inProcess=1\" class=\"brand\">".getMLText("my_documents")."</a>\n";
+		echo "<id=\"first\"><a href=\"../out/out.MyDocuments.php\" class=\"brand\">".getMLText("my_documents")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "<ul class=\"nav\">\n";
 
@@ -2440,6 +2445,7 @@ mayscript>
 	protected function printProtocol($latestContent, $type="") { /* {{{ */
 		$dms = $this->params['dms'];
 		$document = $latestContent->getDocument();
+		$accessop = $this->params['accessobject'];
 ?>
 		<legend><?php printMLText($type.'_log'); ?></legend>
 		<table class="table condensed">

From 2d199cae8dc9a6527856262f50a8de38aa0de94c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 06:28:29 +0200
Subject: [PATCH 0596/2006] use ajax for loading parts of page

---
 views/bootstrap/class.TransmittalMgr.php | 205 +++++++++++++++--------
 1 file changed, 134 insertions(+), 71 deletions(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 8a79b829c..e7979ed54 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -36,6 +36,14 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 		$this->printDeleteDocumentButtonJs();
 		$this->printDeleteItemButtonJs();
 		$this->printUpdateItemButtonJs();
+?>
+$(document).ready( function() {
+	$('body').on('click', '.selecttransmittal', function(ev){
+		ev.preventDefault();
+		$('div.ajax').trigger('update', {transmittalid: $(ev.currentTarget).data('transmittalid')});
+	});
+});
+<?php
 	} /* }}} */
 
 	/**
@@ -44,10 +52,10 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 	 * @param object $item
 	 * @param string $msg message shown in case of successful update
 	 */
-	function printUpdateItemButton($item, $msg, $return=false){ /* {{{ */
+	protected function printUpdateItemButton($item, $msg, $return=false){ /* {{{ */
 		$itemid = $item->getID();
 		$content = '';
-    $content .= '<a class="update-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="icon-refresh"></i></a>';
+    $content .= '<a class="update-transmittalitem-btn" transmittal="'.$item->getTransmittal()->getID().'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="icon-refresh"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -55,11 +63,12 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 		return '';
 	} /* }}} */
 
-	function printUpdateItemButtonJs(){ /* {{{ */
+	protected function printUpdateItemButtonJs(){ /* {{{ */
 		echo "
 		$(document).ready(function () {
 			$('body').on('click', 'a.update-transmittalitem-btn', function(ev){
 				id = $(ev.currentTarget).attr('rel');
+				transmittalid = $(ev.currentTarget).attr('transmittal');
 				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('updatetransmittalitem')."';
@@ -67,11 +76,17 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 					\"label\" : \"<i class='icon-refresh'></i> ".getMLText("update_transmittalitem")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
-						$.get('../op/op.Ajax.php',
-							{ command: 'updatetransmittalitem', id: id, formtoken: formtoken },
-							function(data) {
+						$.ajax('../op/op.TransmittalMgr.php', {
+							type:'POST',
+							async:true,
+							dataType:'json',
+							data: {
+								action: 'updatetransmittalitem',
+								id: id,
+								formtoken: formtoken
+							},
+							success: function(data) {
 								if(data.success) {
-									$('#table-row-document-'+id).hide('slow');
 									noty({
 										text: msg,
 										type: 'success',
@@ -80,6 +95,7 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 										theme: 'defaultTheme',
 										timeout: 1500,
 									});
+									$('div.ajax').trigger('update', {transmittalid: transmittalid});
 								} else {
 									noty({
 										text: data.message,
@@ -90,9 +106,8 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 										timeout: 3500,
 									});
 								}
-							},
-							'json'
-						);
+							}
+						});
 					}
 				}, {
 					\"label\" : \"".getMLText("cancel")."\",
@@ -115,7 +130,7 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 	 * @param boolean $return return html instead of printing it
 	 * @return string html content if $return is true, otherwise an empty string
 	 */
-	function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
+	protected function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
 		$itemid = $item->getID();
 		$content = '';
     $content .= '<a class="delete-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
@@ -126,7 +141,7 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 		return '';
 	} /* }}} */
 
-	function printDeleteItemButtonJs(){ /* {{{ */
+	protected function printDeleteItemButtonJs(){ /* {{{ */
 		echo "
 		$(document).ready(function () {
 			$('body').on('click', 'a.delete-transmittalitem-btn', function(ev){
@@ -138,11 +153,18 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
-						$.get('../op/op.Ajax.php',
-							{ command: 'removetransmittalitem', id: id, formtoken: formtoken },
-							function(data) {
+						$.ajax('../op/op.TransmittalMgr.php', {
+							type:'POST',
+							async:true,
+							dataType:'json',
+							data: {
+								action: 'removetransmittalitem',
+								id: id,
+								formtoken: formtoken
+							},
+							success: function(data) {
 								if(data.success) {
-									$('#table-row-document-'+id).hide('slow');
+									$('#table-row-transmittalitem-'+id).hide('slow');
 									noty({
 										text: msg,
 										type: 'success',
@@ -162,8 +184,7 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 									});
 								}
 							},
-							'json'
-						);
+						});
 					}
 				}, {
 					\"label\" : \"".getMLText("cancel")."\",
@@ -176,9 +197,10 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 		";
 	} /* }}} */
 
-	function showTransmittalForm($transmittal) { /* {{{ */
+	protected function showTransmittalForm($transmittal) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$accessop = $this->params['accessobject'];
 ?>
 	<form action="../op/op.TransmittalMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $transmittal ? $transmittal->getID() : '0';?>">
 <?php
@@ -197,7 +219,7 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 ?>
 	<table class="table-condensed">
 <?php
-	if($transmittal) {
+	if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'removetransmittal'))) {
 ?>
 		<tr>
 			<td></td>
@@ -214,75 +236,44 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 			<td><?php printMLText("transmittal_comment");?>:</td>
 			<td><input type="text" name="comment" value="<?php print $transmittal ? htmlspecialchars($transmittal->getComment()) : "";?>"></td>
 		</tr>
+<?php
+		if($currRole && $accessop->check_controller_access('TransmittalMgr', array('action'=>'edittransmittal')) || !$currRole && $accessop->check_controller_access('TransmittalMgr', array('action'=>'addtransmittal'))) {
+?>
 		<tr>
 			<td></td>
 			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText($transmittal ? "save" : "add_transmittal")?></button></td>
 		</tr>
+<?php
+		}
+?>
 	</table>
 	</form>
 <?php
 	} /* }}} */
 
-	function show() { /* {{{ */
+	function removeitem() { /* {{{ */
+		$seltransmittal = $this->params['seltransmittal'];
+
+		$this->showTransmittalForm($seltransmittal);
+	} /* }}} */
+
+	function form() { /* {{{ */
+		$seltransmittal = $this->params['seltransmittal'];
+
+		$this->showTransmittalForm($seltransmittal);
+	} /* }}} */
+
+	protected function showTransmittalItems($seltransmittal) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$seltransmittal = $this->params['seltransmittal'];
+		$accessop = $this->params['accessobject'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
-		$timeout = $this->params['timeout'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
-		$this->htmlStartPage(getMLText("my_transmittals"));
-		$this->globalNavigation();
-		$this->contentStart();
-		$this->pageNavigation(getMLText("my_transmittals"), "my_documents");
-		$this->contentHeading(getMLText("my_transmittals"));
-?>
-<div class="row-fluid">
-<div class="span4">
-<?php
-		$this->contentContainerStart();
-
-		$transmittals = $dms->getAllTransmittals($user);
-
-		if ($transmittals){
-			print "<table class=\"table table-condensed\">";
-			print "<thead>\n<tr>\n";
-			print "<th>".getMLText("name")."</th>\n";
-			print "<th>".getMLText("comment")."</th>\n";
-			print "<th>".getMLText("transmittal_size")."</th>\n";
-			print "<th></th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-			foreach($transmittals as $transmittal) {
-				print "<tr>\n";
-				print "<td>".$transmittal->getName()."</td>";
-				print "<td>".$transmittal->getComment()."</td>";
-				$items = $transmittal->getItems();
-				print "<td>".count($items)." <em>(".SeedDMS_Core_File::format_filesize($transmittal->getSize()).")</em></td>";
-				print "<td>";
-				print "<div class=\"list-action\">";
-				print "<a href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"icon-edit\"></i></a>";
-				print "</div>";
-				print "</td>";
-				print "</tr>\n";
-			}
-			print "</tbody>\n</table>\n";
-		}
-
-		$this->contentContainerEnd();
-?>
-</div>
-<div class="span8">
-<?php
-		$this->contentContainerStart();
-		$this->showTransmittalForm($seltransmittal);
-		$this->contentContainerEnd();
-
 		if($seltransmittal) {
 			$items = $seltransmittal->getItems();
 			if($items) {
@@ -318,6 +309,78 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 				print "<a class=\"btn btn-default\" href=\"../op/op.TransmittalDownload.php?transmittalid=".$seltransmittal->getID()."\">".getMLText('download')."</a>";
 			}
 		}
+	} /* }}} */
+
+	function items() { /* {{{ */
+		$seltransmittal = $this->params['seltransmittal'];
+
+		$this->showTransmittalItems($seltransmittal);
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$accessop = $this->params['accessobject'];
+		$seltransmittal = $this->params['seltransmittal'];
+		$cachedir = $this->params['cachedir'];
+		$timeout = $this->params['timeout'];
+
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
+		$this->htmlStartPage(getMLText("my_transmittals"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_transmittals"), "my_documents");
+		$this->contentHeading(getMLText("my_transmittals"));
+?>
+<div class="row-fluid">
+<div class="span4">
+<?php
+		$this->contentContainerStart();
+
+		$transmittals = $dms->getAllTransmittals($user);
+
+		if ($transmittals){
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("comment")."</th>\n";
+			print "<th>".getMLText("transmittal_size")."</th>\n";
+			print "<th></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+			foreach($transmittals as $transmittal) {
+				print "<tr>\n";
+				print "<td>".$transmittal->getName()."</td>";
+				print "<td>".$transmittal->getComment()."</td>";
+				$items = $transmittal->getItems();
+				print "<td>".count($items)." <em>(".SeedDMS_Core_File::format_filesize($transmittal->getSize()).")</em></td>";
+				print "<td>";
+				print "<div class=\"list-action\">";
+				print "<a class=\"selecttransmittal\" data-transmittalid=\"".$transmittal->getID()."\" href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"icon-edit\"></i></a>";
+				print "</div>";
+				print "</td>";
+				print "</tr>\n";
+			}
+			print "</tbody>\n</table>\n";
+		}
+
+		$this->contentContainerEnd();
+?>
+</div>
+<div class="span8">
+<?php
+		if($accessop->check_view_access($this, array('action'=>'form'))) {
+		$this->contentContainerStart();
+?>
+		<div class="ajax" data-view="TransmittalMgr" data-action="form" <?php echo ($seltransmittal ? "data-query=\"transmittalid=".$seltransmittal->getID()."\"" : "") ?>></div>
+<?php
+		$this->contentContainerEnd();
+		}
+		if($accessop->check_view_access($this, array('action'=>'items'))) {
+?>
+		<div class="ajax" data-view="TransmittalMgr" data-action="items" <?php echo ($seltransmittal ? "data-query=\"transmittalid=".$seltransmittal->getID()."\"" : "") ?>></div>
+<?php
+		}
 ?>
 </div>
 </div>

From a2bde8fd6b08166b2209e3a5f01f636708228287 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 06:29:50 +0200
Subject: [PATCH 0597/2006] access check for AddToTransmittal

---
 views/bootstrap/class.ViewDocument.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 88548f2e5..40e2753f0 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1300,6 +1300,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($accessop->mayRemoveVersion($document)) {
 					print "<li>".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-remove\"></i>".getMLText("rm_version"), false, true)."</li>";
 				}
+				if($this->check_access('AddToTransmittal'))
+					print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
 				if($accessop->mayEditComment($document)) {
 					print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";
 				}

From c8121afed183e657cd4d4741f61f0685fcb4d74e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 06:30:38 +0200
Subject: [PATCH 0598/2006] make transmittal,document,version unique in
 tblTransmittalItem

---
 install/create_tables-innodb.sql        | 2 +-
 install/create_tables-sqlite3.sql       | 2 +-
 install/update-5.1.0/update-sqlite3.sql | 2 +-
 install/update-5.1.0/update.sql         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index d14d46f8a..9d5991ead 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -843,7 +843,7 @@ CREATE TABLE `tblTransmittalItems` (
   `version` smallint(5) unsigned NOT NULL default '0',
   `date` datetime NOT NULL,
   PRIMARY KEY  (`id`),
-  UNIQUE (document, version),
+  UNIQUE (transmittal, document, version),
   CONSTRAINT `tblTransmittalItems_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblTransmittalItem_transmittal` FOREIGN KEY (`transmittal`) REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index fc3486a5d..1ea5bf56e 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -729,7 +729,7 @@ CREATE TABLE `tblTransmittalItems` (
   `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
   `date` TEXT NOT NULL,
-  UNIQUE (document, version)
+  UNIQUE (transmittal, document, version)
 );
 
 -- --------------------------------------------------------
diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index 0afe6f5a5..f38565f01 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -72,7 +72,7 @@ CREATE TABLE `tblTransmittalItems` (
   `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
   `date` TEXT NOT NULL,
-  UNIQUE (document, version)
+  UNIQUE (transmittal, document, version)
 );
 
 CREATE TABLE `tblRoles` (
diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index 34c5571cc..1dadf78db 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -102,7 +102,7 @@ CREATE TABLE `tblTransmittalItems` (
   `version` smallint(5) unsigned NOT NULL default '0',
   `date` datetime NOT NULL,
   PRIMARY KEY  (`id`),
-  UNIQUE (document, version),
+  UNIQUE (transmittal, document, version),
   CONSTRAINT `tblTransmittalItems_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblTransmittalItem_transmittal` FOREIGN KEY (`transmittal`) REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From 34ce80eb3d809e693fb7a6e577a9e415bf1d5a94 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 17:00:52 +0200
Subject: [PATCH 0599/2006] do not redirect if session ended and it is an ajax
 call

---
 inc/inc.Authentication.php | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 8c314f585..ecdf35d81 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -24,19 +24,25 @@ if (!strncmp("/op", $refer, 3)) {
 } else {
 	$refer = urlencode($refer);
 }
+
+/* Check if this is a ajax call. In that case do not redirect to any page */
+$isajax = isset($_GET['action']) && ($_GET['action'] != 'show');
+
 if (!isset($_COOKIE["mydms_session"])) {
 	if($settings->_enableGuestLogin && $settings->_enableGuestAutoLogin) {
 		require_once("../inc/inc.ClassSession.php");
 		$session = new SeedDMS_Session($db);
 		if(!$dms_session = $session->create(array('userid'=>$settings->_guestID, 'theme'=>$settings->_theme, 'lang'=>$settings->_language))) {
-			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+			if(!$isajax)
+				header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 			exit;
 		}
 		$resArr = $session->load($dms_session);
 	}	elseif($settings->_autoLoginUser) {
 		require_once("../inc/inc.ClassSession.php");
 		if(!($user = $dms->getUser($settings->_autoLoginUser))/* || !$user->isGuest()*/) {
-			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+			if(!$isajax)
+				header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 			exit;
 		}
 		$theme = $user->getTheme();
@@ -51,12 +57,14 @@ if (!isset($_COOKIE["mydms_session"])) {
 		}
 		$session = new SeedDMS_Session($db);
 		if(!$dms_session = $session->create(array('userid'=>$user->getID(), 'theme'=>$theme, 'lang'=>$lang))) {
-			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+			if(!$isajax)
+				header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 			exit;
 		}
 		$resArr = $session->load($dms_session);
 	} else {
-		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+		if(!$isajax)
+			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 		exit;
 	}
 } else {
@@ -65,7 +73,8 @@ if (!isset($_COOKIE["mydms_session"])) {
 	$session = new SeedDMS_Session($db);
 	if(!$resArr = $session->load($dms_session)) {
 		setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
-		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+		if(!$isajax)
+			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 		exit;
 	}
 }
@@ -77,7 +86,8 @@ $session->updateAccess($dms_session);
 $user = $dms->getUser($resArr["userID"]);
 if (!is_object($user)) {
 	setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
-	header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+	if(!$isajax)
+		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 	exit;
 }
 
@@ -126,6 +136,10 @@ if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $lang . "/la
 	include $settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc";
 }
 
+/* if this is a ajax call, then exit early as the rest of the script is irrelevant */
+if($isajax)
+	return;
+
 /* Check if password needs to be changed because it expired. If it needs
  * to be changed redirect to out/out.ForcePasswordChange.php. Do this
  * check only if password expiration is turned on, we are not on the

From 3fbfadeebd5fbaeb51a099a7361ab504340c6207 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 17:01:53 +0200
Subject: [PATCH 0600/2006] add optional parameter $plain to exitError()

if set, the resulting html will only be a html fragment to be embedded
in a page
---
 inc/inc.ClassUI.php                 |  4 ++--
 views/bootstrap/class.Bootstrap.php | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index e849055d1..da6989de2 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -128,12 +128,12 @@ class UI extends UI_Default {
 		return $themes;
 	} /* }}} */
 
-	static function exitError($pagetitle, $error) {
+	static function exitError($pagetitle, $error, $noexit=false, $plain=false) {
 		global $theme, $dms;
 		$tmp = 'ErrorDlg';
 		$view = UI::factory($theme, $tmp);
 		$view->setParam('dms', $dms);
-		$view->exitError($pagetitle, $error);
+		$view->exitError($pagetitle, $error, $noexit, $plain);
 	}
 }
 
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 3242ab7c8..8977230a8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1438,20 +1438,24 @@ $('#clearfilename<?php print $formName ?>').click(function(ev) {
 		echo "</div>\n";
 	} /* }}} */
 
-	function exitError($pagetitle, $error, $noexit=false) { /* {{{ */
-	
-		$this->htmlStartPage($pagetitle);
-		$this->globalNavigation();
-		$this->contentStart();
+	function exitError($pagetitle, $error, $noexit=false, $plain=false) { /* {{{ */
+
+		if(!$plain) {	
+			$this->htmlStartPage($pagetitle);
+			$this->globalNavigation();
+			$this->contentStart();
+		}
 
 		print "<div class=\"alert alert-error\">";
 		print "<h4>".getMLText('error')."!</h4>";
 		print htmlspecialchars($error);
 		print "</div>";
-		print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
-		
-		$this->contentEnd();
-		$this->htmlEndPage();
+		if(!$plain) {	
+			print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
+			
+			$this->contentEnd();
+			$this->htmlEndPage();
+		}
 		
 //		add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle, PEAR_LOG_ERR);
 

From 58e52856b2800fdcab6cfc88dffbb912ceb34294 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 17:02:56 +0200
Subject: [PATCH 0601/2006] remove removeitem(), get $timeout from view in
 items()

---
 views/bootstrap/class.TransmittalMgr.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index e7979ed54..541e1dd04 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -251,12 +251,6 @@ $(document).ready( function() {
 <?php
 	} /* }}} */
 
-	function removeitem() { /* {{{ */
-		$seltransmittal = $this->params['seltransmittal'];
-
-		$this->showTransmittalForm($seltransmittal);
-	} /* }}} */
-
 	function form() { /* {{{ */
 		$seltransmittal = $this->params['seltransmittal'];
 
@@ -268,6 +262,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$accessop = $this->params['accessobject'];
 		$cachedir = $this->params['cachedir'];
+		$timeout = $this->params['timeout'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
 
@@ -322,8 +317,6 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$accessop = $this->params['accessobject'];
 		$seltransmittal = $this->params['seltransmittal'];
-		$cachedir = $this->params['cachedir'];
-		$timeout = $this->params['timeout'];
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 

From 8b9d4b98d58a42bf5e87a364ff2ac0e9a9e7cea0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 17:03:29 +0200
Subject: [PATCH 0602/2006] set parameter $plain for exitError() in case of an
 ajax call

---
 out/out.GroupMgr.php       | 7 ++++---
 out/out.TransmittalMgr.php | 7 ++-----
 out/out.UsrMgr.php         | 9 +++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/out/out.GroupMgr.php b/out/out.GroupMgr.php
index 73a05a382..0bbf8de49 100644
--- a/out/out.GroupMgr.php
+++ b/out/out.GroupMgr.php
@@ -27,21 +27,22 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$isajax = isset($_GET['action']) && ($_GET['action'] == 'info' || $_GET['action'] == 'form');
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if (!$accessop->check_view_access($view, $_GET)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
 }
 
 $allUsers = $dms->getAllUsers($settings->_sortUsersInList);
 if (is_bool($allUsers)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"), false, $isajax);
 }
 
 $allGroups = $dms->getAllGroups();
 if (is_bool($allGroups)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"), false, $isajax);
 }
 
 if(isset($_GET['groupid']) && $_GET['groupid']) {
diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index 31892e2d3..b43453423 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -31,15 +31,12 @@ include("../inc/inc.Authentication.php");
  */
 require_once("SeedDMS/Preview.php");
 
+$isajax = isset($_GET['action']) && ($_GET['action'] == 'items' || $_GET['action'] == 'form');
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if (!$accessop->check_view_access($view, $_GET)) {
-	UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));
-}
-
-if ($user->isGuest()) {
-	UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"));
+	UI::exitError(getMLText("my_transmittals"),getMLText("access_denied"), false, $isajax);
 }
 
 if(isset($_GET['transmittalid']) && $_GET['transmittalid']) {
diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php
index 54d5f6317..6ba535a25 100644
--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@@ -27,26 +27,27 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$isajax = isset($_GET['action']) && ($_GET['action'] == 'info' || $_GET['action'] == 'form');
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if (!$accessop->check_view_access($view, $_GET)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
 }
 
 $users = $dms->getAllUsers($settings->_sortUsersInList);
 if (is_bool($users)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"), false, $isajax);
 }
 
 $groups = $dms->getAllGroups();
 if (is_bool($groups)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"), false, $isajax);
 }
 
 $roles = $dms->getAllRoles();
 if (is_bool($roles)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"), false, $isajax);
 }
 
 if(isset($_GET['userid']) && $_GET['userid']) {

From d4e6732eebd06ca62180b6fa568fb5d08589d0fa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 22 Aug 2016 17:17:43 +0200
Subject: [PATCH 0603/2006] add entry for 5.1.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 584a8f23c..59fef7cac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - set timeout for ajax call 'mytasks' from 200ms to 1000ms
 - use a similar layout for document list on the ViewDocument page
 - add RSS feef of timeline
+- put more operations under access control
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.0

From 9604a4548d411d3079c96a69bccfc4872f7cb78c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Aug 2016 08:54:04 +0200
Subject: [PATCH 0604/2006] add field layoutdata to tblWorkflows

will store the layout of a workflow for rendering a graph
---
 install/create_tables-innodb.sql        | 1 +
 install/create_tables-sqlite3.sql       | 3 ++-
 install/update-5.1.0/update-sqlite3.sql | 2 ++
 install/update-5.1.0/update.sql         | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 9d5991ead..c20fe34ff 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -704,6 +704,7 @@ CREATE TABLE tblWorkflows (
   `id` int(11) NOT NULL auto_increment,
   `name` text NOT NULL,
   `initstate` int(11) NOT NULL,
+  `layoutdata` text NOT NULL,
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblWorkflow_initstate` FOREIGN KEY (`initstate`) REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 1ea5bf56e..209141c11 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -615,7 +615,8 @@ CREATE TABLE tblWorkflowActions (
 CREATE TABLE tblWorkflows (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` text NOT NULL,
-  `initstate` INTEGER NOT NULL REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE
+  `initstate` INTEGER NOT NULL REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE,
+  `layoutdata` text NOT NULL
 ) ;
 
 -- --------------------------------------------------------
diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index f38565f01..ed4c5bdb7 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -4,6 +4,8 @@ ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` TEXT NOT NULL;
 
 ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL;
 
+ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text default NULL;
+
 CREATE TABLE `tblUserSubstitutes` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `user` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index 1dadf78db..00ee28724 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -16,6 +16,8 @@ ALTER TABLE `tblDocumentReviewLog` CHANGE `date` `date` datetime NOT NULL;
 
 ALTER TABLE `tblDocumentStatusLog` CHANGE `date` `date` datetime NOT NULL;
 
+ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text default NULL AFTER `initstate`;
+
 CREATE TABLE `tblUserSubstitutes` (
   `id` int(11) NOT NULL auto_increment,
   `user` int(11) default null,

From 4d6ce5114afb984e52fd5bdc86180ba4fc8fd487 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Aug 2016 10:11:18 +0200
Subject: [PATCH 0605/2006] add operation for saving workflow layout (not ready
 yet)

---
 op/op.WorkflowMgr.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/op/op.WorkflowMgr.php b/op/op.WorkflowMgr.php
index c7a239a6c..382ec2f7c 100644
--- a/op/op.WorkflowMgr.php
+++ b/op/op.WorkflowMgr.php
@@ -133,7 +133,28 @@ else if ($action == "editworkflow") {
 		$editedWorkflow->setInitState($state);
 	
 	add_log_line(".php&action=editworkflow&workflowid=".$workflowid);
+}
 
+// save workflow graph for rendering -----------------------------------------
+else if ($action == "setrenderdata") {
+	if (!isset($_POST["workflowid"]) || !is_numeric($_POST["workflowid"]) || intval($_POST["workflowid"])<1) {
+		echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_workflow_id")));
+		exit;
+	}
+	
+	$workflowid=$_POST["workflowid"];
+	$workflow = $dms->getWorkflow($workflowid);
+	
+	if (!is_object($workflow)) {
+		echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_workflow_id")));
+		exit;
+	}
+	
+	$data = $_POST["data"];
+
+	header('Content-Type: application/json');
+	echo json_encode(array('success'=>true, 'message'=>getMLText("workflow_layoutdata_saved")));
+	exit;
 }
 else UI::exitError(getMLText("admin_tools"),getMLText("unknown_command"));
 

From d64747ddeff2a0a05b8314c4f35cd5e5529e3a7c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Aug 2016 10:11:46 +0200
Subject: [PATCH 0606/2006] add code for saving and redrawing layout

---
 views/bootstrap/class.WorkflowGraph.php | 48 +++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index 974e55bea..8000e0cad 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -96,6 +96,8 @@ var cy = cytoscape({
 	{
 		selector: 'edge',
 		style: {
+			'content': 'data(name)',
+			'text-wrap': 'wrap',
 			'width': 4,
 			'curve-style': 'bezier',
 			'target-arrow-shape': 'triangle',
@@ -109,6 +111,30 @@ var cy = cytoscape({
 
 );
 
+function save_handler(evt) {
+//	console.log(JSON.stringify(cy.json().elements));
+	$.ajax('../op/op.WorkflowMgr.php', {
+		type:"POST",
+		async:true,
+		dataType:"json",
+		data: {
+			action: 'setrenderdata',
+			workflowid: <?php echo $this->workflow->getID(); ?>,
+			data: JSON.stringify(cy.json().elements)
+		},
+		success: function(data, textStatus) {
+			noty({
+				text: data.message,
+				type: data.success ? 'success' : 'error',
+				dismissQueue: true,
+				layout: 'topRight',
+				theme: 'defaultTheme',
+				timeout: 1500,
+			});
+		}
+	});
+};
+
 cy.on('free', 'node', function(evt) {
 	$('#png').attr('src', cy.png({'full': true}));
 });
@@ -116,8 +142,20 @@ cy.on('free', 'node', function(evt) {
 		if(!$renderdata)
 			$this->printGraph();
 ?>
-	cy.layout({ name: '<?php echo $renderdata ? 'preset' : 'grid'; ?>', condense: true });
-$('#png').attr('src', cy.png({'full': true}));
+	cy.layout({ name: '<?php echo $renderdata ? 'preset' : 'cose'; ?>', condense: true, ready: function() {$('#png').attr('src', cy.png({'full': true}))} });
+//	$('#png').attr('src', cy.png({'full': true}));
+
+$(document).ready(function() {
+	$('body').on('click', '#savelayout', function(ev){
+		ev.preventDefault();
+		save_handler();
+	});
+	$('body').on('click', '#setlayout', function(ev){
+		ev.preventDefault();
+		var element = $(this);
+		cy.layout({name: element.data('layout'), ready: function() {$('#png').attr('src', cy.png({'full': true}))}});
+	});
+});
 <?php
 	} /* }}} */
 
@@ -244,6 +282,8 @@ $('#png').attr('src', cy.png({'full': true}));
 		$this->htmlAddHeader('
 <style type="text/css">
 body {padding: 0px;}
+div.buttons {float: right; padding-left: 4px; height: 100px; width: 120px; margin-right: 5px;}
+div.buttons button {margin: 3px; float: right;}
 </style>
 ', 'css');
 		$this->htmlStartPage(getMLText("admin_tools"));
@@ -252,6 +292,10 @@ body {padding: 0px;}
 ?>
 <div id="canvas" style="width: 100%; height:546px; _border: 1px solid #bbb;"></div>
 <img id="png" style="float: left; border: 1px solid #bbb; min-height: 100px; min-width: 100px; height: 100px; _width: 100px; padding: 3px;" />
+<div class="buttons">
+	<button class="btn btn-mini" id="savelayout">Save layout</button>
+	<button class="btn btn-mini" id="setlayout" data-layout="cose">Redraw</button>
+</div>
 <?php
 //		$this->contentContainerEnd();
 		if(method_exists($this, 'js'))

From 84a65f0f32de764874c5dfaf5cfb74bd4b38f6ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Aug 2016 11:54:15 +0200
Subject: [PATCH 0607/2006] implemented saving of layout data for workflows

---
 SeedDMS_Core/Core/inc.ClassDMS.php      |  4 ++--
 SeedDMS_Core/Core/inc.ClassWorkflow.php | 24 +++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 41abec788..dc69de3be 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2315,7 +2315,7 @@ class SeedDMS_Core_DMS {
 
 		$initstate = $this->getWorkflowState($resArr[0]['initstate']);
 
-		$workflow = new SeedDMS_Core_Workflow($resArr[0]["id"], $resArr[0]["name"], $initstate);
+		$workflow = new SeedDMS_Core_Workflow($resArr[0]["id"], $resArr[0]["name"], $initstate, $resArr[0]["layoutdata"]);
 		$workflow->setDMS($this);
 
 		return $workflow;
@@ -2341,7 +2341,7 @@ class SeedDMS_Core_DMS {
 
 		$initstate = $this->getWorkflowState($resArr[0]['initstate']);
 
-		$workflow = new SeedDMS_Core_Workflow($resArr[0]["id"], $resArr[0]["name"], $initstate);
+		$workflow = new SeedDMS_Core_Workflow($resArr[0]["id"], $resArr[0]["name"], $initstate, $resArr[0]["layoutdata"]);
 		$workflow->setDMS($this);
 
 		return $workflow;
diff --git a/SeedDMS_Core/Core/inc.ClassWorkflow.php b/SeedDMS_Core/Core/inc.ClassWorkflow.php
index 284011f6b..956bbfbfd 100644
--- a/SeedDMS_Core/Core/inc.ClassWorkflow.php
+++ b/SeedDMS_Core/Core/inc.ClassWorkflow.php
@@ -42,6 +42,13 @@ class SeedDMS_Core_Workflow { /* {{{ */
 	 */
 	var $_initstate;
 
+	/**
+	 * @var data for rendering graph
+	 *
+	 * @access protected
+	 */
+	var $_layoutdata;
+
 	/**
 	 * @var name of the workflow state
 	 *
@@ -56,10 +63,11 @@ class SeedDMS_Core_Workflow { /* {{{ */
 	 */
 	var $_dms;
 
-	function __construct($id, $name, $initstate) { /* {{{ */
+	function __construct($id, $name, $initstate, $layoutdata) { /* {{{ */
 		$this->_id = $id;
 		$this->_name = $name;
 		$this->_initstate = $initstate;
+		$this->_layoutdata = $layoutdata;
 		$this->_transitions = null;
 		$this->_dms = null;
 	} /* }}} */
@@ -98,6 +106,20 @@ class SeedDMS_Core_Workflow { /* {{{ */
 		return true;
 	} /* }}} */
 
+	function getLayoutData() { return $this->_layoutdata; }
+
+	function setLayoutData($newdata) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "UPDATE tblWorkflows SET layoutdata = ".$db->qstr($newdata)." WHERE id = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_layoutdata = $newdata;
+		return true;
+	} /* }}} */
+
 	function getTransitions() { /* {{{ */
 		$db = $this->_dms->getDB();
 

From bdd0dd65826f15a3c79b7b7a922b07101cac80ad Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Aug 2016 11:54:51 +0200
Subject: [PATCH 0608/2006] add saving and reloading layout data

---
 op/op.WorkflowMgr.php                   |  2 +
 views/bootstrap/class.WorkflowGraph.php | 63 +++++++++++++++----------
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/op/op.WorkflowMgr.php b/op/op.WorkflowMgr.php
index 382ec2f7c..bfbcc6d86 100644
--- a/op/op.WorkflowMgr.php
+++ b/op/op.WorkflowMgr.php
@@ -152,6 +152,8 @@ else if ($action == "setrenderdata") {
 	
 	$data = $_POST["data"];
 
+	$workflow->setLayoutData($data);
+
 	header('Content-Type: application/json');
 	echo json_encode(array('success'=>true, 'message'=>getMLText("workflow_layoutdata_saved")));
 	exit;
diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index 92623a1ce..77b7b3acc 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -35,7 +35,16 @@ class SeedDMS_View_WorkflowGraph extends SeedDMS_Bootstrap_Style {
 		$this->workflow = $this->params['workflow'];
 		header('Content-Type: application/javascript; charset=UTF-8');
 
-		$renderdata = '';
+		$renderdata = $this->workflow->getLayoutData();
+		if($renderdata) {
+			$positions = array();
+			$data = json_decode($renderdata);
+			foreach($data->nodes as $node) {
+				if($node->group == 'nodes') {
+					$positions[$node->data->id] = $node->position;
+				}
+			}
+		}
 ?>
 var cy = cytoscape({
 	container: document.getElementById('canvas'),
@@ -106,7 +115,7 @@ var cy = cytoscape({
 			'curve-style': 'bezier'
 		}
 	}]
-<?php if($renderdata) echo ",".$renderdata; ?>
+<?php //if($renderdata) echo ",elements: ".$renderdata; ?>
 }
 
 );
@@ -139,11 +148,9 @@ cy.on('free', 'node', function(evt) {
 	$('#png').attr('src', cy.png({'full': true}));
 });
 <?php
-		if(!$renderdata)
-			$this->printGraph();
+		$this->printGraph($positions);
 ?>
-	cy.layout({ name: '<?php echo $renderdata ? 'preset' : 'cose'; ?>', condense: true, ready: function() {$('#png').attr('src', cy.png({'full': true}))} });
-//	$('#png').attr('src', cy.png({'full': true}));
+	cy.layout({ name: '<?php echo $renderdata ? 'preset' : 'cose'; ?>', ready: function() {$('#png').attr('src', cy.png({'full': true}))} });
 
 $(document).ready(function() {
 	$('body').on('click', '#savelayout', function(ev){
@@ -159,7 +166,7 @@ $(document).ready(function() {
 <?php
 	} /* }}} */
 
-	function printGraph() { /* {{{ */
+	function printGraph($positions) { /* {{{ */
 		$transitions = $this->workflow->getTransitions();	
 		if($transitions) {
 
@@ -198,13 +205,15 @@ $(document).ready(function() {
 					foreach($transgroups as $transgroup) {
 						$gnames[] = $transgroup->getGroup()->getName();
 					}
+					$nodeid = "A".$transition->getID()."-".$action->getID();
 					echo "cy.add({
-						data: {
-							id: 'A".$transition->getID()."-".$action->getID()."',
-							name: \"".str_replace('"', "\\\"", $action->getName()).($unames ? "\\n(".str_replace('"', "\\\"", implode(", ", $unames)).")" : '').($gnames ? "\\n(".str_replace('"', "\\\"", implode(", ", $gnames)).")" : '')."\"
-						},
-						classes: 'action'
-					});\n";
+  data: {
+    id: '".$nodeid."',
+    name: \"".str_replace('"', "\\\"", $action->getName()).($unames ? "\\n(".str_replace('"', "\\\"", implode(", ", $unames)).")" : '').($gnames ? "\\n(".str_replace('"', "\\\"", implode(", ", $gnames)).")" : '')."\"
+  },".(isset($positions[$nodeid]) ? "
+  position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
+  classes: 'action'
+});\n";
 				}
 
 				if(!isset($this->states[$state->getID()])) {
@@ -212,24 +221,28 @@ $(document).ready(function() {
 					$initstate = '';
 					if($state == $this->workflow->getInitState())
 						$initstate = getMLText('workflow_initstate');
+					$nodeid = "S".$state->getID();
 					echo "cy.add({
-						data: {
-							id: 'S".$state->getID()."',
-							name: \"".str_replace('"', "\\\"", $state->getName()."\\n".$initstate)."\"
-						},
-						classes: 'state ".($state == $this->workflow->getInitState() ? 'init' : '')."'
-					});\n";
+  data: {
+    id: '".$nodeid."',
+    name: \"".str_replace('"', "\\\"", $state->getName()."\\n".$initstate)."\"
+  },".(isset($positions[$nodeid]) ? "
+  position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
+  classes: 'state ".($state == $this->workflow->getInitState() ? 'init' : '')."'
+});\n";
 				}
 				if(!isset($this->states[$nextstate->getID()])) {
 					$this->states[$nextstate->getID()] = $nextstate;
 					$docstatus = $nextstate->getDocumentStatus();
+					$nodeid = "S".$nextstate->getID();
 					echo "cy.add({
-						data: {
-							id: 'S".$nextstate->getID()."',
-							name: '".str_replace('"', "\\\"", $nextstate->getName())/*.($docstatus == S_RELEASED || $docstatus == S_REJECTED ? "\\n(".getOverallStatusText($docstatus).")" : '')*/."'
-						},
-						classes: 'state".($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ''))."'
-					});\n";
+  data: {
+    id: '".$nodeid."',
+    name: '".str_replace('"', "\\\"", $nextstate->getName())/*.($docstatus == S_RELEASED || $docstatus == S_REJECTED ? "\\n(".getOverallStatusText($docstatus).")" : '')*/."'
+  },".(isset($positions[$nodeid]) ? "
+  position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
+  classes: 'state".($docstatus == S_RELEASED ? ' released' : ($docstatus == S_REJECTED ? ' rejected' : ''))."'
+});\n";
 				}
 
 			}

From e272d26f300a49e0d8299435f0c969fc8f7a8213 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Sep 2016 10:05:16 +0200
Subject: [PATCH 0609/2006] add access check

---
 out/out.WorkflowGraph.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/out/out.WorkflowGraph.php b/out/out.WorkflowGraph.php
index 47362bdca..e03c0a9ac 100644
--- a/out/out.WorkflowGraph.php
+++ b/out/out.WorkflowGraph.php
@@ -27,6 +27,13 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
 $workflow = $dms->getWorkflow($_GET['workflow']);
 if (is_bool($workflow)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
@@ -50,12 +57,11 @@ if(isset($_GET['transitions']) && $_GET['transitions']) {
 	}
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('workflow', $workflow);
 	$view->setParam('transitions', $transitions);
 	$view->setParam('document', $document);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From f768ad63f00637044758b3796ac7df679bc428ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Sep 2016 10:05:37 +0200
Subject: [PATCH 0610/2006] pass accessobj to view

---
 out/out.WorkflowActionsMgr.php | 1 +
 out/out.WorkflowMgr.php        | 1 +
 out/out.WorkflowStatesMgr.php  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/out/out.WorkflowActionsMgr.php b/out/out.WorkflowActionsMgr.php
index 9948325a7..936097249 100644
--- a/out/out.WorkflowActionsMgr.php
+++ b/out/out.WorkflowActionsMgr.php
@@ -48,6 +48,7 @@ if (is_bool($workflowactions)) {
 if($view) {
 	$view->setParam('allworkflowactions', $workflowactions);
 	$view->setParam('selworkflowaction', $selworkflowaction);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.WorkflowMgr.php b/out/out.WorkflowMgr.php
index 1d731d496..6f5496a90 100644
--- a/out/out.WorkflowMgr.php
+++ b/out/out.WorkflowMgr.php
@@ -54,6 +54,7 @@ if($view) {
 	$view->setParam('selworkflow', $selworkflow);
 	$view->setParam('allworkflows', $workflows);
 	$view->setParam('allworkflowstates', $workflowstates);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.WorkflowStatesMgr.php b/out/out.WorkflowStatesMgr.php
index b71d3751e..43a8f5077 100644
--- a/out/out.WorkflowStatesMgr.php
+++ b/out/out.WorkflowStatesMgr.php
@@ -42,6 +42,7 @@ if(isset($_GET['workflowstateid']) && $_GET['workflowstateid']) {
 
 if($view) {
 	$view->setParam('selworkflowstate', $selworkflowstate);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From 75ce06c128689e7a2972ba000ae0194c77eb1abb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Sep 2016 10:05:54 +0200
Subject: [PATCH 0611/2006] check if workflow graph may be shown

---
 views/bootstrap/class.ViewDocument.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 243cb1129..5ea92d48e 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -833,7 +833,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		  <div class="tab-pane <?php if($currenttab == 'workflow') echo 'active'; ?>" id="workflow">
 <?php
 			echo "<div class=\"row-fluid\">";
-			echo "<div class=\"span6\">";
+			if ($this->check_access('WorkflowGraph'))
+				echo "<div class=\"span6\">";
+			else
+				echo "<div class=\"span12\">";
 			$this->contentContainerStart();
 			if($user->isAdmin()) {
 				if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
@@ -1007,11 +1010,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 			$this->contentContainerEnd();
 			echo "</div>";
-			echo "<div class=\"span6\">";
+			if ($this->check_access('WorkflowGraph')) {
+				echo "<div class=\"span6\">";
 ?>
 	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?><?php if($allowedtransitions) foreach($allowedtransitions as $tr) {echo "&transitions[]=".$tr->getID();} ?>" width="99%" height="661" style="border: 1px solid #AAA;"></iframe>
 <?php
-			echo "</div>";
+				echo "</div>";
+			}
 			echo "</div>";
 ?>
 		  </div>

From 1fb6305380c7cfb87eb9f6f8714648a69adf348c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Sep 2016 07:49:16 +0200
Subject: [PATCH 0612/2006] use translation for 'Save layout'

---
 views/bootstrap/class.WorkflowGraph.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index f2922c01f..92ef3fe92 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -382,7 +382,7 @@ div.buttons #zoom {margin: 3px; _float: right;}
 	</div>
 	<div class="buttons">
 		<div id="zoom"><button class="btn btn-mini btn-default">Zoom</button></div>
-		<button class="btn btn-mini" id="savelayout">Save layout</button>
+		<button class="btn btn-mini" id="savelayout"><?php printMLText('workflow_save_layout'); ?></button>
 		<button class="btn btn-mini" id="setlayout" data-layout="cose"><?php printMLText('redraw'); ?></button>
 	</div>
 </div>

From 93f3153903219a3d62eb20d3d4826684f2dab62d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Sep 2016 12:30:39 +0200
Subject: [PATCH 0613/2006] fix entry for 5.1.1

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index cbedc600f..1d44474b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1
 --------------------------------------------------------------------------------
-- merge changes from 5.0.4
+- merge changes up to 5.0.6
 - add two factor authentication based on google authenticator
 - set timeout for ajax call 'mytasks' from 200ms to 1000ms
 - use a similar layout for document list on the ViewDocument page

From 86b1a562c113bb80a1abbca47655fca45dc31f6a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Sep 2016 21:39:38 +0200
Subject: [PATCH 0614/2006] set text fields to default null

---
 install/create_tables-innodb.sql  | 2 +-
 install/create_tables-sqlite3.sql | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index c20fe34ff..d79c64020 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -704,7 +704,7 @@ CREATE TABLE tblWorkflows (
   `id` int(11) NOT NULL auto_increment,
   `name` text NOT NULL,
   `initstate` int(11) NOT NULL,
-  `layoutdata` text NOT NULL,
+  `layoutdata` text default NULL,
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblWorkflow_initstate` FOREIGN KEY (`initstate`) REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 209141c11..ac939edf1 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -73,7 +73,7 @@ CREATE TABLE `tblUsers` (
   `comment` text NOT NULL,
   `role` INTEGER NOT NULL REFERENCES `tblRoles` (`id`),
   `hidden` INTEGER NOT NULL default '0',
-  `pwdExpiration` TEXT NOT NULL,
+  `pwdExpiration` TEXT default NULL,
   `loginfailures` INTEGER NOT NULL default '0',
   `disabled` INTEGER NOT NULL default '0',
   `quota` INTEGER,
@@ -251,7 +251,7 @@ CREATE TABLE `tblDocumentContent` (
   `mimeType` varchar(70) NOT NULL default '',
   `fileSize` INTEGER,
   `checksum` char(32),
-  `revisiondate` TEXT NOT NULL,
+  `revisiondate` TEXT default NULL,
   UNIQUE (`document`,`version`)
 ) ;
 
@@ -616,7 +616,7 @@ CREATE TABLE tblWorkflows (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` text NOT NULL,
   `initstate` INTEGER NOT NULL REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE,
-  `layoutdata` text NOT NULL
+  `layoutdata` text default NULL
 ) ;
 
 -- --------------------------------------------------------

From 6ba36e2cae03453ca9f6a853612cf686d7a9b1d1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Sep 2016 21:40:19 +0200
Subject: [PATCH 0615/2006] dump roles

---
 utils/xmldump.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index cfb447aa4..84e8e81ed 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -100,6 +100,7 @@ if(isset($options['skip-root'])) {
 $statistic = array(
 	'documents'=>0,
 	'folders'=>0,
+	'roles'=>0,
 	'users'=>0,
 	'groups'=>0,
 	'attributedefinitions'=>0,
@@ -477,6 +478,24 @@ $dms->setRootFolderID($settings->_rootFolderID);
 echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
 echo "<dms dbversion=\"".implode('.', array_slice($dms->getDBVersion(), 1, 3))."\" date=\"".date('Y-m-d H:i:s')."\">\n";
 
+/* Dump roles {{{ */
+if(!$sections || in_array('roles', $sections)) {
+$roles = $dms->getAllRoles();
+if($roles) {
+	echo "<roles>\n";
+	foreach ($roles as $role) {
+		echo " <role id=\"".$role->getId()."\">\n";
+		echo "  <attr name=\"name\">".wrapWithCData($role->getName())."</attr>\n";
+		echo "  <attr name=\"role\">".$role->getRole()."</attr>\n";
+		echo "  <attr name=\"noaccess\">".implode(',', $role->getNoAccess())."</attr>\n";
+		echo " </role>\n";
+		$statistic['roles']++;
+	}
+	echo "</roles>\n";
+}
+}
+/* }}} */
+
 /* Dump users {{{ */
 if(!$sections || in_array('users', $sections)) {
 $users = $dms->getAllUsers();
@@ -491,7 +510,7 @@ if($users) {
 		echo "  <attr name=\"comment\">".wrapWithCData($user->getComment())."</attr>\n";
 		echo "  <attr name=\"language\">".$user->getLanguage()."</attr>\n";
 		echo "  <attr name=\"theme\">".$user->getTheme()."</attr>\n";
-		echo "  <attr name=\"role\">".$user->getRole()."</attr>\n";
+		echo "  <attr name=\"role\">".$user->getRole()->getID()."</attr>\n";
 		echo "  <attr name=\"hidden\">".$user->isHidden()."</attr>\n";
 		echo "  <attr name=\"disabled\">".$user->isDisabled()."</attr>\n";
 		echo "  <attr name=\"pwdexpiration\">".$user->getPwdExpiration()."</attr>\n";
@@ -682,6 +701,7 @@ if($workflows) {
 		echo " <workflow id=\"".$workflow->getID()."\">\n";
 		echo "  <attr name=\"name\">".$workflow->getName()."</attr>\n";
 		echo "  <attr name=\"initstate\">".$workflow->getInitState()->getID()."</attr>\n";
+		echo "  <attr name=\"layoutdata\">".wrapWithCData($workflow->getLayoutData())."</attr>\n";
 		if($transitions = $workflow->getTransitions()) {
 			echo "  <transitions>\n";
 			foreach($transitions as $transition) {

From 42ac18d962c61abcff684954a7e6652594e98f9f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Sep 2016 21:40:38 +0200
Subject: [PATCH 0616/2006] import roles

---
 utils/xmlimport.php | 87 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 73 insertions(+), 14 deletions(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 54ed34a4a..eee7a8468 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -72,6 +72,15 @@ function insert_user($user) { /* {{{ */
 
 	if($debug) print_r($user);
 
+	$roleobj = null;
+	if(isset($user['attributes']['role']) && $user['attributes']['role']) {
+		if(array_key_exists($user['attributes']['role'], $objmap['roles'])) {
+			if(!$roleobj = $dms->getRole($objmap['roles'][$user['attributes']['role']])) {
+				$logger->warn("Role ".$user['attributes']['role']." cannot be found");
+			}
+		}
+	}
+
 	if ($newUser = $dms->getUserByLogin($user['attributes']['login'])) {
 		$logger->info("User '".$user['attributes']['login']."' already exists");
 	} else {
@@ -84,7 +93,7 @@ function insert_user($user) { /* {{{ */
 				$user['attributes']['language'],
 				$user['attributes']['theme'],
 				$user['attributes']['comment'],
-				$user['attributes']['role'],
+				$roleobj,
 				$user['attributes']['hidden'],
 				$user['attributes']['disabled'],
 				$user['attributes']['pwdexpiration']);
@@ -111,14 +120,14 @@ function insert_user($user) { /* {{{ */
 } /* }}} */
 
 function set_homefolders() { /* {{{ */
-	global $dms, $debug, $defaultUser, $users, $objmap;
+	global $logger, $dms, $debug, $defaultUser, $users, $objmap;
 
 	foreach($users as $user) {
 		if(isset($user['attributes']['homefolder']) && $user['attributes']['homefolder']) {
 			if(array_key_exists($user['id'], $objmap['users'])) {
 				$userobj = $dms->getUser($objmap['users'][$user['id']]);
 				if(!array_key_exists((int) $user['attributes']['homefolder'], $objmap['folders'])) {
-					echo "Warning: homefolder ".$user['attributes']['homefolder']." cannot be found\n";
+					$logger->warning("Homefolder ".$user['attributes']['homefolder']." cannot be found");
 				} else {
 					$userobj->setHomeFolder($objmap['folders'][(int) $user['attributes']['homefolder']]);
 				}
@@ -172,6 +181,34 @@ function insert_group($group) { /* {{{ */
 	return $newGroup;
 } /* }}} */
 
+function insert_role($role) { /* {{{ */
+	global $logger, $dms, $debug, $objmap, $sections, $users;
+
+	if($debug) print_r($role);
+
+	if ($newRole = $dms->getRoleByName($role['attributes']['name'])) {
+		$logger->info("Role already exists");
+	} else {
+		if(in_array('roles', $sections)) {
+			$newRole = $dms->addRole($role['attributes']['name'], $role['attributes']['role']);
+			if($newRole) {
+				$logger->info("Added role '".$role['attributes']['name']."'");
+				if(!empty($role['attributes']['noaccess'])) {
+					$newRole->setNoAccess(explode(',', $role['attributes']['noaccess']));
+				}
+			} else {
+				$logger->err("Could not add role");
+				return false;
+			}
+		} else {
+			$newRole = null;
+		}
+	}
+	if($newRole)
+		$objmap['roles'][$role['id']] = $newRole->getID();
+	return $newRole;
+} /* }}} */
+
 function insert_attributedefinition($attrdef) { /* {{{ */
 	global $logger, $dms, $debug, $objmap, $sections;
 
@@ -277,6 +314,8 @@ function insert_workflow($workflow) { /* {{{ */
 			} else {
 				$logger->info("Added workflow '".$workflow['attributes']['name']."'");
 			}
+			if(!empty($workflow['layoutdata']))
+				$newWorkflow->setLayoutData($workflow['layoutdata']);
 			if($workflow['transitions']) {
 				foreach($workflow['transitions'] as $transition) {
 					if(!$state = $dms->getWorkflowState($objmap['workflowstates'][(int) $transition['attributes']['startstate']])) {
@@ -853,33 +892,33 @@ function insert_folder($folder) { /* {{{ */
 } /* }}} */
 
 function insert_transmittal($transmittal) { /* {{{ */
-	global $dms, $debug, $objmap, $sections;
+	global $logger, $dms, $debug, $objmap, $sections;
 
-	if(1||$debug) print_r($transmittal);
+	if($debug) print_r($transmittal);
 
 	if(!array_key_exists((int) $transmittal['attributes']['owner'], $objmap['users'])) {
-		echo "Error: owner of transmittal cannot be found\n";
+		$logger->err( "Owner of transmittal cannot be found");
 		return false;
 	}
 	$owner = $dms->getUser($objmap['users'][(int) $transmittal['attributes']['owner']]);
 
 	if(in_array('transmittals', $sections)) {
 		if(!$newTransmittal = $dms->addTransmittal($transmittal['attributes']['name'], $transmittal['attributes']['comment'], $owner)) {
-			echo "Error: could not add transmittal\n";
+			$logger->err("Could not add transmittal");
 			return false;
 		}
 		foreach($transmittal['items'] as $item) {
 			if(!array_key_exists((int) $item['attributes']['document'], $objmap['documents'])) {
-				echo "Warning: document mapping of transmittal item cannot be found\n";
+				$logger->warning("Document mapping of transmittal item cannot be found");
 			} else {
 				if($document = $dms->getDocument($objmap['documents'][(int) $item['attributes']['document']])) {
 					if($content = $document->getContentByVersion((int) $item['attributes']['version'])) {
 						$newTransmittal->addContent($content);
 					} else {
-						echo "Warning: document version of transmittal item cannot be found\n";
+						$logger->warning("Document version of transmittal item cannot be found");
 					}
 				} else {
-					echo "Warning: document of transmittal item cannot be found\n";
+					$logger->warning("Document of transmittal item cannot be found");
 				}
 			}
 		}
@@ -972,7 +1011,7 @@ function set_mandatory() { /* {{{ */
 } /* }}} */
 
 function startElement($parser, $name, $attrs) { /* {{{ */
-	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem;
+	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role;
 
 	$parent = end($elementstack);
 	array_push($elementstack, array('name'=>$name, 'attributes'=>$attrs));
@@ -1044,6 +1083,14 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_transition['groups'][] = (int) $attrs['ID'];
 			}
 			break;
+		case "ROLE":
+			$first = $elementstack[1];
+			if($first['name'] == 'ROLES') {
+				$cur_role = array();
+				$cur_role['id'] = (int) $attrs['ID'];
+				$cur_role['attributes'] = array();
+			}
+			break;
 		case "TRANSMITTAL":
 			$cur_transmittal = array();
 			$cur_transmittal['id'] = (int) $attrs['ID'];
@@ -1152,6 +1199,8 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_user['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'GROUP') {
 				$cur_group['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'ROLE') {
+				$cur_role['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'KEYWORD') {
 				$cur_keyword['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'ATTRIBUTEDEFINITION') {
@@ -1330,7 +1379,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 } /* }}} */
 
 function endElement($parser, $name) { /* {{{ */
-	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem;
+	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role;
 
 	array_pop($elementstack);
 	$parent = end($elementstack);
@@ -1379,6 +1428,9 @@ function endElement($parser, $name) { /* {{{ */
 				insert_group($cur_group);
 			}
 			break;
+		case 'ROLE':
+			insert_role($cur_role);
+			break;
 		case 'ATTRIBUTEDEFINITION':
 			insert_attributedefinition($cur_attrdef);
 			break;
@@ -1463,7 +1515,7 @@ function endElement($parser, $name) { /* {{{ */
 } /* }}} */
 
 function characterData($parser, $data) { /* {{{ */
-	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem;
+	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role;
 
 	$current = end($elementstack);
 	$parent = prev($elementstack);
@@ -1551,6 +1603,12 @@ function characterData($parser, $data) { /* {{{ */
 					else
 						$cur_group['attributes'][$current['attributes']['NAME']] = $data;
 					break;
+				case 'ROLE':
+					if(isset($cur_role['attributes'][$current['attributes']['NAME']]))
+						$cur_role['attributes'][$current['attributes']['NAME']] .= $data;
+					else
+						$cur_role['attributes'][$current['attributes']['NAME']] = $data;
+					break;
 				case 'ATTRIBUTEDEFINITION':
 					if(isset($cur_attrdef['attributes'][$current['attributes']['NAME']]))
 						$cur_attrdef['attributes'][$current['attributes']['NAME']] .= $data;
@@ -1730,7 +1788,7 @@ if(isset($options['no-version-check'])) {
 	$noversioncheck = true;
 }
 
-$sections = array('documents', 'folders', 'groups', 'users', 'keywordcategories', 'documentcategories', 'attributedefinitions', 'workflows', 'transmittals');
+$sections = array('documents', 'folders', 'groups', 'users', 'roles', 'keywordcategories', 'documentcategories', 'attributedefinitions', 'workflows', 'transmittals');
 if(isset($options['sections'])) {
 	$sections = explode(',', $options['sections']);
 }
@@ -1799,6 +1857,7 @@ set_mandatory();
 
 set_homefolders();
 
+print_r($objmap);
 if($exportmapping) {
 	if($fp = fopen($exportmapping, 'w')) {
 		fputcsv($fp, array('object type', 'old id', 'new id'));

From da616fd4ed38326ff584c5b5c5945ca029a86f93 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Sep 2016 06:37:30 +0200
Subject: [PATCH 0617/2006] take out print_r

---
 utils/xmlimport.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index aa53b616a..8afd7600b 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -1870,7 +1870,6 @@ set_mandatory();
 
 set_homefolders();
 
-print_r($objmap);
 if($exportmapping) {
 	if($fp = fopen($exportmapping, 'w')) {
 		fputcsv($fp, array('object type', 'old id', 'new id'));

From 5c558601c738b3386389ed7e6540c887c8a8bc0b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Sep 2016 12:48:20 +0200
Subject: [PATCH 0618/2006] set same date fields to default null

---
 install/create_tables-innodb.sql        | 4 ++--
 install/create_tables-sqlite3.sql       | 4 ++--
 install/update-5.1.0/update-sqlite3.sql | 4 ++--
 install/update-5.1.0/update.sql         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index d79c64020..3cf592221 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -825,7 +825,7 @@ CREATE TABLE `tblTransmittals` (
   `name` text NOT NULL,
   `comment` text NOT NULL,
   `userID` int(11) NOT NULL default '0',
-  `date` datetime NOT NULL,
+  `date` datetime default NULL,
   `public` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblTransmittals_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
@@ -842,7 +842,7 @@ CREATE TABLE `tblTransmittalItems` (
   `transmittal` int(11) NOT NULL DEFAULT '0',
   `document` int(11) default NULL,
   `version` smallint(5) unsigned NOT NULL default '0',
-  `date` datetime NOT NULL,
+  `date` datetime default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE (transmittal, document, version),
   CONSTRAINT `tblTransmittalItems_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index ac939edf1..5ef61ce2c 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -714,7 +714,7 @@ CREATE TABLE tblTransmittals (
   `name` text NOT NULL,
   `comment` text NOT NULL,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
-  `date` TEXT NOT NULL,
+  `date` TEXT default NULL,
   `public` INTEGER NOT NULL default '0'
 );
 
@@ -729,7 +729,7 @@ CREATE TABLE `tblTransmittalItems` (
   `transmittal` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE,
   `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
-  `date` TEXT NOT NULL,
+  `date` TEXT default NULL,
   UNIQUE (transmittal, document, version)
 );
 
diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index ed4c5bdb7..71bf8930d 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -64,7 +64,7 @@ CREATE TABLE tblTransmittals (
   `name` text NOT NULL,
   `comment` text NOT NULL,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
-  `date` TEXT NOT NULL,
+  `date` TEXT default NULL,
   `public` INTEGER NOT NULL default '0'
 );
 
@@ -73,7 +73,7 @@ CREATE TABLE `tblTransmittalItems` (
 	`transmittal` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE,
   `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
-  `date` TEXT NOT NULL,
+  `date` TEXT default NULL,
   UNIQUE (transmittal, document, version)
 );
 
diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index 00ee28724..7a9534665 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -91,7 +91,7 @@ CREATE TABLE `tblTransmittals` (
   `name` text NOT NULL,
   `comment` text NOT NULL,
   `userID` int(11) NOT NULL default '0',
-  `date` datetime NOT NULL,
+  `date` datetime default NULL,
   `public` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblTransmittals_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
@@ -102,7 +102,7 @@ CREATE TABLE `tblTransmittalItems` (
 	`transmittal` int(11) NOT NULL DEFAULT '0',
   `document` int(11) default NULL,
   `version` smallint(5) unsigned NOT NULL default '0',
-  `date` datetime NOT NULL,
+  `date` datetime default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE (transmittal, document, version),
   CONSTRAINT `tblTransmittalItems_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,

From 839b5f72f6c5be30034746fc5c78fed9c15a1b0b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Sep 2016 12:48:43 +0200
Subject: [PATCH 0619/2006] fix import of transmittal items

---
 utils/xmlimport.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 5611ccb52..466508baa 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -962,6 +962,7 @@ function insert_transmittal($transmittal) { /* {{{ */
 	if(in_array('transmittals', $sections)) {
 		if(!$newTransmittal = $dms->addTransmittal($transmittal['attributes']['name'], $transmittal['attributes']['comment'], $owner)) {
 			$logger->err("Could not add transmittal");
+			$logger->debug($dms->getDB()->getErrorMsg());
 			return false;
 		}
 		foreach($transmittal['items'] as $item) {
@@ -985,7 +986,7 @@ function insert_transmittal($transmittal) { /* {{{ */
 
 	if($newTransmittal)
 		$objmap['transmittals'][$transmittal['id']] = $newTransmittal->getID();
-	return $newCategory;
+	return $newTransmittal;
 } /* }}} */
 
 function resolve_links() { /* {{{ */
@@ -1155,7 +1156,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 			$cur_transmittal['attributes'] = array();
 			$cur_transmittal['items'] = array();
 			break;
-		case "TRANSMITTALITEM":
+		case "ITEM":
 			$cur_transmittalitem = array();
 			$cur_transmittalitem['id'] = (int) $attrs['ID'];
 			$cur_transmittalitem['attributes'] = array();
@@ -1269,7 +1270,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_link['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'TRANSMITTAL') {
 				$cur_transmittal['attributes'][$attrs['NAME']] = '';
-			} elseif($parent['name'] == 'TRANSMITTALITEM') {
+			} elseif($parent['name'] == 'ITEM') {
 				$cur_transmittalitem['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'WORKFLOW') {
 				$cur_workflow['attributes'][$attrs['NAME']] = '';
@@ -1513,7 +1514,7 @@ function endElement($parser, $name) { /* {{{ */
 				$cur_document['links'][] = $cur_link;
 			}
 			break;
-		case "TRANSMITTALITEM":
+		case "ITEM":
 			$cur_transmittal['items'][] = $cur_transmittalitem;
 			break;
 		case 'TRANSMITTAL':
@@ -1709,7 +1710,7 @@ function characterData($parser, $data) { /* {{{ */
 					else
 						$cur_transmittal['attributes'][$current['attributes']['NAME']] = $data;
 					break;
-				case 'TRANSMITTALITEM':
+				case 'ITEM':
 					if(isset($cur_transmittalitem['attributes'][$current['attributes']['NAME']]))
 						$cur_transmittalitem['attributes'][$current['attributes']['NAME']] .= $data;
 					else

From 19d4d84e58e49e5cf102f948d665bd464fe740e8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Sep 2016 08:47:20 +0200
Subject: [PATCH 0620/2006] set model in tblAcos because it may not be null

---
 inc/inc.ClassAcl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index 27ff9691e..2ea97a3f8 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -296,7 +296,7 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 				if (is_bool($resArr) && $resArr === false)
 					return null;
 				if (count($resArr) == 0) {
-					$queryStr = "INSERT INTO tblAcos (parent, alias) VALUES (".$parentid.",".$db->qstr($part).")";
+					$queryStr = "INSERT INTO tblAcos (parent, alias, model) VALUES (".$parentid.",".$db->qstr($part).", '')";
 					if (!$db->getResult($queryStr))
 						return null;
 					$id = $db->getInsertID();

From 159aa0963679e6b50dd952c25afdff3c599ea6d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Sep 2016 08:48:09 +0200
Subject: [PATCH 0621/2006] dump acos, aros

---
 utils/xmldump.php | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index 324e430af..f35fe092f 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -1,5 +1,6 @@
 <?php
 require_once("../inc/inc.ClassSettings.php");
+require_once("../inc/inc.ClassAcl.php");
 
 function usage() { /* {{{ */
 	echo "Usage:\n";
@@ -482,6 +483,37 @@ echo "<dms dbversion=\"".implode('.', array_slice($dms->getDBVersion(), 1, 3))."
 
 /* Dump roles {{{ */
 if(!$sections || in_array('roles', $sections)) {
+	/**
+	 * Show tree of acos
+	 *
+	 */
+	function aco_tree($aro=null, $aco=null, $indent='') { /* {{{ */
+		$tchildren = $aco->getChildren();
+		$html = '';
+		if($tchildren) {
+			foreach($tchildren as $child) {
+				if($child->getPermission($aro)) {
+					$html .= $indent."<aco id=\"".$child->getID()."\" alias=\"".$child->getAlias()."\">\n";
+					$html .= $indent." <attr name=\"permission\">".((int) $child->getPermission($aro))."</attr>\n";
+					//$html .= $indent." <attr name=\"alias\">".$child->getAlias()."</attr>\n";
+					//$html .= $indent." <attr name=\"aro\">".($aro ? $aro->getID() : 0)."</attr>\n";
+					if($thtml = aco_tree($aro, $child, $indent.' ')) {
+						$html .= $thtml;
+					}
+					$html .= $indent."</aco>\n";
+				} else {
+					if($thtml = aco_tree($aro, $child, $indent.' ')) {
+						$html .= $indent."<aco id=\"".$child->getID()."\" alias=\"".$child->getAlias()."\">\n";
+						//$html .= $indent." <attr name=\"alias\">".$child->getAlias()."</attr>\n";
+						$html .= $thtml;
+						$html .= $indent."</aco>\n";
+					}
+				}
+			}
+		}
+		return $html;
+	} /* }}} */
+
 $roles = $dms->getAllRoles();
 if($roles) {
 	echo "<roles>\n";
@@ -490,6 +522,22 @@ if($roles) {
 		echo "  <attr name=\"name\">".wrapWithCData($role->getName())."</attr>\n";
 		echo "  <attr name=\"role\">".$role->getRole()."</attr>\n";
 		echo "  <attr name=\"noaccess\">".implode(',', $role->getNoAccess())."</attr>\n";
+		$aro = SeedDMS_Aro::getInstance($role, $dms);
+		if($acos = SeedDMS_Aco::getRoot($dms)) {
+			foreach($acos as $aco) {
+				echo "  <aco id=\"".$aco->getID()."\" alias=\"".$aco->getAlias()."\">\n";
+				if($aco->getPermission($aro)) {
+					echo "   <attr name=\"permission\">".((int) $aco->getPermission($aro))."</attr>\n";
+//					echo "   <attr name=\"alias\">".$aco->getAlias()."</attr>\n";
+//					echo "   <attr name=\"aro\">".($aro ? $aro->getID() : 0)."</attr>\n";
+				} else {
+//					echo "   <attr name=\"alias\">".$aco->getAlias()."</attr>\n";
+				}
+				if($html = aco_tree($aro, $aco, '   '))
+					echo $html;
+				echo "  </aco>\n";
+			}
+		}
 		echo " </role>\n";
 		$statistic['roles']++;
 	}
@@ -746,6 +794,7 @@ if($folder) {
 /* }}} */
 
 /* Dump transmittals {{{ */
+if(!$sections || in_array('transmittals', $sections)) {
 $transmittals = $dms->getAllTransmittals();
 if($transmittals) {
 	echo "<transmittals>\n";
@@ -771,6 +820,7 @@ if($transmittals) {
 	}
 	echo "</transmittals>\n";
 }
+}
 /* }}} */
 
 /* Dump statistics {{{ */

From df63e1bb7e97ab80bd26855f4b9e2cb3b3a70895 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Sep 2016 08:48:28 +0200
Subject: [PATCH 0622/2006] insert acos and aros

---
 utils/xmlimport.php | 48 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 98b05c01d..510284121 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -1,5 +1,6 @@
 <?php
 require_once("../inc/inc.ClassSettings.php");
+require_once("../inc/inc.ClassAcl.php");
 require("Log.php");
 
 function usage() { /* {{{ */
@@ -229,6 +230,27 @@ function insert_role($role) { /* {{{ */
 				$logger->err("Could not add role");
 				return false;
 			}
+			if($aro = SeedDMS_Aro::getInstance($newRole, $dms)) {
+				$logger->info("Added aro");
+				if($role['acos']) {
+					$acl = new SeedDMS_Acl($dms);
+					foreach($role['acos'] as $alias=>$perm) {
+						if($aco = SeedDMS_Aco::getInstance($alias, $dms)) {
+							$logger->info("Added aco with alias '".$alias."'");
+							if(isset($perm['attributes']['permission'])) {
+								if($acl->add($aro, $aco, $perm['attributes']['permission'])) {
+								}
+							}
+						} else {
+							$logger->err("Could not add Aco");
+							return false;
+						}
+					}
+				}
+			} else {
+				$logger->err("Could not add Aro");
+				return false;
+			}
 		} else {
 			$newRole = null;
 		}
@@ -1022,7 +1044,7 @@ function set_mandatory() { /* {{{ */
 } /* }}} */
 
 function startElement($parser, $name, $attrs) { /* {{{ */
-	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role;
+	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	$parent = end($elementstack);
 	array_push($elementstack, array('name'=>$name, 'attributes'=>$attrs));
@@ -1094,12 +1116,19 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_transition['groups'][] = (int) $attrs['ID'];
 			}
 			break;
+		case "ACO":
+			array_push($cur_acopath, $attrs['ALIAS']);
+			$cur_acos[implode('/', $cur_acopath)] = array();
+			break;
 		case "ROLE":
 			$first = $elementstack[1];
 			if($first['name'] == 'ROLES') {
 				$cur_role = array();
 				$cur_role['id'] = (int) $attrs['ID'];
 				$cur_role['attributes'] = array();
+				$cur_role['acos'] = array();
+				$cur_acopath = array();
+				$cur_acos = array();
 			}
 			break;
 		case "TRANSMITTAL":
@@ -1212,6 +1241,8 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_group['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'ROLE') {
 				$cur_role['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'ACO') {
+				$cur_acos[implode('/', $cur_acopath)]['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'KEYWORD') {
 				$cur_keyword['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'ATTRIBUTEDEFINITION') {
@@ -1390,7 +1421,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 } /* }}} */
 
 function endElement($parser, $name) { /* {{{ */
-	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role;
+	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	array_pop($elementstack);
 	$parent = end($elementstack);
@@ -1439,7 +1470,11 @@ function endElement($parser, $name) { /* {{{ */
 				insert_group($cur_group);
 			}
 			break;
+		case 'ACO':
+			array_pop($cur_acopath);
+			break;
 		case 'ROLE':
+			$cur_role['acos'] = $cur_acos;
 			insert_role($cur_role);
 			break;
 		case 'ATTRIBUTEDEFINITION':
@@ -1526,7 +1561,7 @@ function endElement($parser, $name) { /* {{{ */
 } /* }}} */
 
 function characterData($parser, $data) { /* {{{ */
-	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role;
+	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	$current = end($elementstack);
 	$parent = prev($elementstack);
@@ -1620,6 +1655,12 @@ function characterData($parser, $data) { /* {{{ */
 					else
 						$cur_role['attributes'][$current['attributes']['NAME']] = $data;
 					break;
+				case 'ACO':
+					if(isset($cur_acos[implode('/', $cur_acopath)]['attributes'][$current['attributes']['NAME']]))
+						$cur_acos[implode('/', $cur_acopath)]['attributes'][$current['attributes']['NAME']] .= $data;
+					else
+						$cur_acos[implode('/', $cur_acopath)]['attributes'][$current['attributes']['NAME']] = $data;
+					break;
 				case 'ATTRIBUTEDEFINITION':
 					if(isset($cur_attrdef['attributes'][$current['attributes']['NAME']]))
 						$cur_attrdef['attributes'][$current['attributes']['NAME']] .= $data;
@@ -1833,6 +1874,7 @@ if($defaultuserid) {
 	$defaultUser = null;
 }
 
+$users = array();
 $elementstack = array();
 $objmap = array(
 	'attributedefs' => array(),

From e932c3efd5da510bf26f0282242bcaef820bb336 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Sep 2016 17:50:30 +0200
Subject: [PATCH 0623/2006] allow admins and owner as revisor and reciepent

---
 views/bootstrap/class.SetRecipients.php | 2 +-
 views/bootstrap/class.SetRevisors.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index ddfd9df7f..2516094d5 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -47,7 +47,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("change_recipients"));
 
 		// Retrieve a list of all users and groups that have receipt privileges.
-		$docAccess = $document->getReadAccessList();
+		$docAccess = $document->getReadAccessList(true, true);
 
 		// Retrieve list of currently assigned recipients, along with
 		// their latest status.
diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 91623ee55..9f706cfa3 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -47,7 +47,7 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("change_assignments"));
 
 		// Retrieve a list of all users and groups that have revision privileges.
-		$docAccess = $document->getReadAccessList();
+		$docAccess = $document->getReadAccessList(true, true);
 
 		// Retrieve list of currently assigned revisors, along with
 		// their latest status.

From 4219559450791d1d08f2a919c4ebe2aa6d1b3f6e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Sep 2016 14:09:03 +0200
Subject: [PATCH 0624/2006] get doc list ReviewByMe and ApproveByMe instead of
 AppRevByMe

---
 op/op.Ajax.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 5b735e2e4..09585f5be 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -527,13 +527,16 @@ switch($command) {
 				$approvals = array();
 				$receipts = array();
 				$revisions = array();
-				$resArr = $dms->getDocumentList('AppRevByMe', $user);
+				$resArr = $dms->getDocumentList('ApproveByMe', $user);
 				if($resArr) {
 					foreach ($resArr as $res) {
-						if($res["status"]==S_DRAFT_REV)
-							$reviews[] = $res['id'];
-						if($res["status"]==S_DRAFT_APP)
-							$approvals[] = $res['id'];
+						$approvals[] = $res['id'];
+					}
+				}
+				$resArr = $dms->getDocumentList('ReviewByMe', $user);
+				if($resArr) {
+					foreach ($resArr as $res) {
+						$reviews[] = $res['id'];
 					}
 				}
 				$resArr = $dms->getDocumentList('ReceiptByMe', $user);
@@ -859,13 +862,16 @@ switch($command) {
 			$approvals = array();
 			$receipts = array();
 			$revisions = array();
-			$resArr = $dms->getDocumentList('AppRevByMe', $user);
+			$resArr = $dms->getDocumentList('ApproveByMe', $user);
 			if($resArr) {
 				foreach ($resArr as $res) {
-					if($res["status"]==S_DRAFT_REV)
-						$reviews[] = array('id'=>$res['id'], 'name'=>$res['name']);
-					elseif($res["status"]==S_DRAFT_APP)
-						$approvals[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					$approvals[] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+			$resArr = $dms->getDocumentList('ReviewByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$reviews[] = array('id'=>$res['id'], 'name'=>$res['name']);
 				}
 			}
 			$resArr = $dms->getDocumentList('ReceiptByMe', $user);

From b8e3e2d0920033e15c30be144ac1774012d4a194 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Sep 2016 20:20:38 +0200
Subject: [PATCH 0625/2006] add $norequire as optional parameter to
 printAttributeEditField()

needed for search for, where fields are not required
---
 views/bootstrap/class.Bootstrap.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index dae521b7f..c8351e37c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1292,7 +1292,7 @@ $('#acceptkeywords').click(function(ev) {
 <?php
 	} /* }}} */
 
-	function printAttributeEditField($attrdef, $attribute, $fieldname='attributes') { /* {{{ */
+	function printAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false) { /* {{{ */
 		switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
 			echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"0\" />";
@@ -1316,7 +1316,7 @@ $('#acceptkeywords').click(function(ev) {
 				} else {
 					echo "\"";
 				}
-				echo "".($attrdef->getMinValues() > 0 ? ' required' : '').">";
+				echo "".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').">";
 				if(!$attrdef->getMultipleValues()) {
 					echo "<option value=\"\"></option>";
 				}
@@ -1335,9 +1335,9 @@ $('#acceptkeywords').click(function(ev) {
 			} else {
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 				if(strlen($objvalue) > 80) {
-					echo "<textarea name=\"".$fieldname."[".$attrdef->getId()."]\"".($attrdef->getMinValues() > 0 ? ' required' : '').">".htmlspecialchars($objvalue)."</textarea>";
+					echo "<textarea name=\"".$fieldname."[".$attrdef->getId()."]\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').">".htmlspecialchars($objvalue)."</textarea>";
 				} else {
-					echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".($attrdef->getMinValues() > 0 ? ' required' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
+					echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
 				}
 			}
 			break;

From be9f9873420f8b871b68bd73ce3fe07369634036 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Sep 2016 20:22:16 +0200
Subject: [PATCH 0626/2006] search for documents with missing receptions

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index c34df05d8..73d55ea1a 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1117,7 +1117,7 @@ class SeedDMS_Core_DMS {
 	 * @param expirationenddate array search for documents expiring before this date
 	 * @return array containing the elements total and docs
 	 */
-	function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x3, $expirationstartdate=array(), $expirationenddate=array()) { /* {{{ */
+	function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x3, $expirationstartdate=array(), $expirationenddate=array(), $missingreception=false) { /* {{{ */
 		// Split the search string into constituent keywords.
 		$tkeys=array();
 		if (strlen($query)>0) {
@@ -1430,6 +1430,8 @@ class SeedDMS_Core_DMS {
 				"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
 				"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
 				"LEFT JOIN `tblDocumentCategory` ON `tblDocuments`.`id`=`tblDocumentCategory`.`documentID` ".
+				"LEFT JOIN `tblDocumentRecipients` ON `tblDocuments`.`id`=`tblDocumentRecipients`.`documentID` ".
+				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentRecipients`.`receiptID`=`tblDocumentReceiptLog`.`receiptID` ".
 				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
 				"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version`";
 
@@ -1460,6 +1462,9 @@ class SeedDMS_Core_DMS {
 				$searchQuery .= " AND `tblDocumentStatusLog`.`status` IN (".implode(',', $status).")";
 			}
 
+			if($missingreception)
+				$searchQuery .= " AND `tblDocumentReceiptLog`.`status`=0";
+
 			if($searchKey || $searchOwner || $searchCategories || $searchCreateDate || $searchExpirationDate || $searchAttributes || $status) {
 				// Count the number of rows that the search will produce.
 				$resArr = $this->db->getResultArray("SELECT COUNT(*) AS num FROM (SELECT DISTINCT `tblDocuments`.id ".$searchQuery.") a");

From 7937f730317e1e5788e2259a92b2fb884ec5fafe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Sep 2016 20:22:42 +0200
Subject: [PATCH 0627/2006] pass $missingreception to view

---
 out/out.Search.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 74a96d7d5..847977b70 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -313,6 +313,11 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$status[] = S_EXPIRED;
 	}
 
+	$missingreception = false;
+	if (isset($_GET["missingreception"])){
+		$missingreception = true;
+	}
+
 	/* Do not search for folders if result shall be filtered by status.
 	 * If this is not done, unexplainable results will be delivered.
 	 * e.g. a search for expired documents of a given user will list
@@ -362,7 +367,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 	// ---------------- Start searching -----------------------------------------
 	$startTime = getTime();
-	$resArr = $dms->search($query, 0, 0 /*$limit, ($pageNumber-1)*$limit*/, $mode, $searchin, $startFolder, $owner, $status, $creationdate ? $startdate : array(), $creationdate ? $stopdate : array(), array(), array(), $categories, $attributes, $resultmode, $expirationdate ? $expstartdate : array(), $expirationdate ? $expstopdate : array());
+	$resArr = $dms->search($query, 0, 0 /*$limit, ($pageNumber-1)*$limit*/, $mode, $searchin, $startFolder, $owner, $status, $creationdate ? $startdate : array(), $creationdate ? $stopdate : array(), array(), array(), $categories, $attributes, $resultmode, $expirationdate ? $expstartdate : array(), $expirationdate ? $expstopdate : array(), $missingreception);
 	$searchTime = getTime() - $startTime;
 	$searchTime = round($searchTime, 2);
 
@@ -439,6 +444,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('missingreception', $missingreception);
 	$view($_GET);
 	exit;
 }

From 9746c85ce54b6d956d11bd64371defb4ce8bea10 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Sep 2016 20:22:59 +0200
Subject: [PATCH 0628/2006] add search paramter for documents with missing
 reception

---
 views/bootstrap/class.Search.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 251eea83c..50cb8463b 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -140,6 +140,7 @@ $(document).ready( function() {
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
+		$missingreception = $this->params['missingreception'];
 
 		if(count($entries) == 1) {
 			$entry = $entries[0];
@@ -258,7 +259,7 @@ $(document).ready( function() {
 ?>
 <tr>
 	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : null) ?></td>
+	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : null, 'attributes', true) ?></td>
 </tr>
 
 <?php
@@ -367,6 +368,12 @@ $(document).ready( function() {
 </td>
 </tr>
 <tr>
+<td><?php printMLText("missing_reception");?>:</td>
+<td>
+<label class="checkbox" for='missingreception'><input type="checkbox" id="missingreception" name="missingreception" value="1" <?php echo  $missingreception ? "checked" : ""; ?>></label>
+</td>
+</tr>
+<tr>
 <td><?php printMLText("expires");?>:</td>
 <td>
         <label class="checkbox inline">
@@ -391,7 +398,7 @@ $(document).ready( function() {
 ?>
 <tr>
 	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '') ?></td>
+	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : null, 'attributes', true) ?></td>
 </tr>
 
 <?php
@@ -437,7 +444,7 @@ $(document).ready( function() {
 ?>
 <tr>
 	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '') ?></td>
+	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : null, 'attributes', true) ?></td>
 </tr>
 <?php
 				}

From 3e777f987d6157d58c108551283429803759f069 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Sep 2016 21:28:01 +0200
Subject: [PATCH 0629/2006] search for each reception status (no action,
 rejected, acknowledged)

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 73d55ea1a..a44d0df2d 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1117,7 +1117,7 @@ class SeedDMS_Core_DMS {
 	 * @param expirationenddate array search for documents expiring before this date
 	 * @return array containing the elements total and docs
 	 */
-	function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x3, $expirationstartdate=array(), $expirationenddate=array(), $missingreception=false) { /* {{{ */
+	function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x3, $expirationstartdate=array(), $expirationenddate=array(), $reception=array()) { /* {{{ */
 		// Split the search string into constituent keywords.
 		$tkeys=array();
 		if (strlen($query)>0) {
@@ -1416,7 +1416,7 @@ class SeedDMS_Core_DMS {
 			// Construct the SQL query that will be used to search the database.
 			//
 
-			if (!$this->db->createTemporaryTable("ttcontentid") || !$this->db->createTemporaryTable("ttstatid")) {
+			if (!$this->db->createTemporaryTable("ttcontentid") || !$this->db->createTemporaryTable("ttstatid") || !$this->db->createTemporaryTable("ttreceiptid")) {
 				return false;
 			}
 
@@ -1432,7 +1432,9 @@ class SeedDMS_Core_DMS {
 				"LEFT JOIN `tblDocumentCategory` ON `tblDocuments`.`id`=`tblDocumentCategory`.`documentID` ".
 				"LEFT JOIN `tblDocumentRecipients` ON `tblDocuments`.`id`=`tblDocumentRecipients`.`documentID` ".
 				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentRecipients`.`receiptID`=`tblDocumentReceiptLog`.`receiptID` ".
+				"LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`maxLogID` = `tblDocumentReceiptLog`.`receiptLogID` ".
 				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
+				"AND `ttreceiptid`.`maxLogID`=`tblDocumentReceiptLog`.`receiptLogID` ".
 				"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version`";
 
 			if (strlen($searchKey)>0) {
@@ -1462,8 +1464,8 @@ class SeedDMS_Core_DMS {
 				$searchQuery .= " AND `tblDocumentStatusLog`.`status` IN (".implode(',', $status).")";
 			}
 
-			if($missingreception)
-				$searchQuery .= " AND `tblDocumentReceiptLog`.`status`=0";
+			if($reception)
+				$searchQuery .= " AND `tblDocumentReceiptLog`.`status` IN (".implode(',', $reception).")";
 
 			if($searchKey || $searchOwner || $searchCategories || $searchCreateDate || $searchExpirationDate || $searchAttributes || $status) {
 				// Count the number of rows that the search will produce.

From 88d7f252b61f5bf89a340a5c8a7bd5bf3d3bce0c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Sep 2016 21:28:51 +0200
Subject: [PATCH 0630/2006] create temp table ttreceiptid

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 5d48723cf..877379e53 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -434,6 +434,39 @@ class SeedDMS_Core_DatabaseAccess {
 			}
 			return $this->_ttcontentid;
 		}
+		elseif (!strcasecmp($tableName, "ttreceiptid")) {
+			switch($this->_driver) {
+				case 'sqlite':
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` AS ".
+						"SELECT `tblDocumentReceiptLog`.`receiptID`, ".
+						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReceiptLog` ".
+						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ".
+						"ORDER BY `maxLogID`";
+				break;
+				default:
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` (PRIMARY KEY (`receiptID`), INDEX (`maxLogID`)) ".
+						"SELECT `tblDocumentReceiptLog`.`receiptID`, ".
+						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReceiptLog` ".
+						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ".
+						"ORDER BY `maxLogID`";
+			}
+			if (!$this->_ttreceiptid) {
+				if (!$this->getResult($queryStr))
+					return false;
+				$this->_ttreceiptid=true;
+			}
+			else {
+				if (is_bool($override) && $override) {
+					if (!$this->getResult("DELETE FROM `ttreceiptid`"))
+						return false;
+					if (!$this->getResult($queryStr))
+						return false;
+				}
+			}
+			return $this->_ttreceiptid;
+		}
 		return false;
 	} /* }}} */
 

From 1989657c9a6abdfa9eadb84fe5bdbc185522afa0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Sep 2016 21:29:16 +0200
Subject: [PATCH 0631/2006] search for each status of reception

---
 out/out.Search.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 847977b70..94c59fd96 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -313,9 +313,9 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$status[] = S_EXPIRED;
 	}
 
-	$missingreception = false;
-	if (isset($_GET["missingreception"])){
-		$missingreception = true;
+	$reception = array();
+	if (isset($_GET["reception"])){
+		$reception = $_GET["reception"];
 	}
 
 	/* Do not search for folders if result shall be filtered by status.
@@ -367,7 +367,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 	// ---------------- Start searching -----------------------------------------
 	$startTime = getTime();
-	$resArr = $dms->search($query, 0, 0 /*$limit, ($pageNumber-1)*$limit*/, $mode, $searchin, $startFolder, $owner, $status, $creationdate ? $startdate : array(), $creationdate ? $stopdate : array(), array(), array(), $categories, $attributes, $resultmode, $expirationdate ? $expstartdate : array(), $expirationdate ? $expstopdate : array(), $missingreception);
+	$resArr = $dms->search($query, 0, 0 /*$limit, ($pageNumber-1)*$limit*/, $mode, $searchin, $startFolder, $owner, $status, $creationdate ? $startdate : array(), $creationdate ? $stopdate : array(), array(), array(), $categories, $attributes, $resultmode, $expirationdate ? $expstartdate : array(), $expirationdate ? $expstopdate : array(), $reception);
 	$searchTime = getTime() - $startTime;
 	$searchTime = round($searchTime, 2);
 
@@ -444,7 +444,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
-	$view->setParam('missingreception', $missingreception);
+	$view->setParam('reception', $reception);
 	$view($_GET);
 	exit;
 }

From 94c3ba51d100b040d2ede9324517e69bfa0bcfbe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Sep 2016 21:29:36 +0200
Subject: [PATCH 0632/2006] search for each status of reception

---
 views/bootstrap/class.Search.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 50cb8463b..6421bc736 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -140,7 +140,7 @@ $(document).ready( function() {
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
-		$missingreception = $this->params['missingreception'];
+		$reception = $this->params['reception'];
 
 		if(count($entries) == 1) {
 			$entry = $entries[0];
@@ -297,6 +297,8 @@ $(document).ready( function() {
 			$openfilterdlg = true;
 		if($expirationdate)
 			$openfilterdlg = true;
+		if($reception)
+			$openfilterdlg = true;
 ?>
 <?php if($totaldocs): ?>
 <div class="accordion" id="accordion1">
@@ -306,7 +308,7 @@ $(document).ready( function() {
         <?php printMLText('export'); ?>
       </a>
     </div>
-    <div id="collapseFolder" class="accordion-body <?php if(!$openfilterdlg) echo "collapse";?>" style="_height: 0px;">
+    <div id="collapseFolder" class="accordion-body">
       <div class="accordion-inner">
 <table class="table-condensed">
 <tr>
@@ -328,7 +330,7 @@ $(document).ready( function() {
         <?php printMLText('filter_for_documents'); ?>
       </a>
     </div>
-    <div id="collapseOne" class="accordion-body <?php if(!$openfilterdlg) echo "collapse";?>" style="_height: 0px;">
+    <div id="collapseOne" class="accordion-body <?php if(!$openfilterdlg) echo "collapse";?>">
       <div class="accordion-inner">
 <table class="table-condensed">
 <tr>
@@ -368,9 +370,11 @@ $(document).ready( function() {
 </td>
 </tr>
 <tr>
-<td><?php printMLText("missing_reception");?>:</td>
+<td><?php printMLText("reception");?>:</td>
 <td>
-<label class="checkbox" for='missingreception'><input type="checkbox" id="missingreception" name="missingreception" value="1" <?php echo  $missingreception ? "checked" : ""; ?>></label>
+<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="0" <?php echo in_array(0, $reception) ? "checked" : ""; ?>><?php printMLText('reception_noaction'); ?></label>
+<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="-1" <?php echo in_array(-1, $reception) ? "checked" : ""; ?>><?php printMLText('reception_rejected'); ?></label>
+<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="1" <?php echo in_array(1, $reception) ? "checked" : ""; ?>><?php printMLText('reception_acknowleged'); ?></label>
 </td>
 </tr>
 <tr>
@@ -433,7 +437,7 @@ $(document).ready( function() {
         <?php printMLText('filter_for_folders'); ?>
       </a>
     </div>
-    <div id="collapseFolder" class="accordion-body <?php if(!$openfilterdlg) echo "collapse";?>" style="_height: 0px;">
+    <div id="collapseFolder" class="accordion-body <?php if(!$openfilterdlg) echo "collapse";?>">
       <div class="accordion-inner">
 <table class="table-condensed">
 <?php

From 8f851e1a3a5e08957cdbc646abd4e5cd47193832 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 Oct 2016 21:28:53 +0200
Subject: [PATCH 0633/2006] search if only reception status is given

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index a44d0df2d..511f56a25 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1467,7 +1467,7 @@ class SeedDMS_Core_DMS {
 			if($reception)
 				$searchQuery .= " AND `tblDocumentReceiptLog`.`status` IN (".implode(',', $reception).")";
 
-			if($searchKey || $searchOwner || $searchCategories || $searchCreateDate || $searchExpirationDate || $searchAttributes || $status) {
+			if($searchKey || $searchOwner || $searchCategories || $searchCreateDate || $searchExpirationDate || $searchAttributes || $status || $reception) {
 				// Count the number of rows that the search will produce.
 				$resArr = $this->db->getResultArray("SELECT COUNT(*) AS num FROM (SELECT DISTINCT `tblDocuments`.id ".$searchQuery.") a");
 				$totalDocs = 0;

From 1c7bc39c8048899500756770a5200072aadf0ef5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Oct 2016 07:42:24 +0200
Subject: [PATCH 0634/2006] fix typo, minor updates

---
 CHANGELOG | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1e4526801..eede3f1e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,11 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1
 --------------------------------------------------------------------------------
-- merge changes up to 5.0.6
+- merge changes up to 5.0.7
 - add two factor authentication based on google authenticator
 - set timeout for ajax call 'mytasks' from 200ms to 1000ms
 - use a similar layout for document list on the ViewDocument page
-- add RSS feef of timeline
+- add RSS feed of timeline
 - put more operations under access control
 
 --------------------------------------------------------------------------------

From 736b916286d2b48b4861c07df2c6fe8385fea508 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Oct 2016 11:14:47 +0200
Subject: [PATCH 0635/2006] allow all users to receipt a document

---
 op/op.SetRecipients.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 6cd1d670e..f3df002b6 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -60,7 +60,7 @@ $folder = $document->getFolder();
 // Retrieve a list of all users and groups that have read rights.
 // Afterwards, reorganize them in two arrays with its key being the
 // userid or groupid
-$docAccess = $document->getReadAccessList();
+$docAccess = $document->getReadAccessList(true, true);
 $accessIndex = array("i"=>array(), "g"=>array());
 foreach ($docAccess["users"] as $i=>$da) {
 	$accessIndex["i"][$da->getID()] = $da;

From 70db94f83c4c5480dd8602486930ba956692541a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Oct 2016 11:15:06 +0200
Subject: [PATCH 0636/2006] allow revision only for users allowed by settings,
 fix html

---
 op/op.SetRevisors.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 8c5209c09..3026a16ce 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -70,7 +70,7 @@ $folder = $document->getFolder();
 // Retrieve a list of all users and groups that have read rights.
 // Afterwards, reorganize them in two arrays with its key being the
 // userid or groupid
-$docAccess = $document->getReadAccessList();
+$docAccess = $document->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
 $accessIndex = array("i"=>array(), "g"=>array());
 foreach ($docAccess["users"] as $i=>$da) {
 	$accessIndex["i"][$da->getID()] = $da;

From f5dc479714efce6ec464e54283c42d3a8ce73d33 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Oct 2016 11:15:50 +0200
Subject: [PATCH 0637/2006] fix error in addIndReceipt

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 8658007ac..bec9586be 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4571,7 +4571,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$userID = $user->getID();
 
 		// Check to see if the user can be removed from the recipient list.
-		$revisionStatus = $user->getReceiptStatus($this->_document->getID(), $this->_version);
+		$receiptStatus = $user->getReceiptStatus($this->_document->getID(), $this->_version);
 		if (is_bool($receiptStatus) && !$receiptStatus) {
 			return -1;
 		}

From 42de7bb0c9d5c65fae14a664e6cae410a306b3d6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Oct 2016 11:16:16 +0200
Subject: [PATCH 0638/2006] fix html

---
 views/bootstrap/class.ReceiptSummary.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index ae5675d2d..baaafa224 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -120,7 +120,6 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 					print "<th>".getMLText("action")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
-					print "<table class=\"folderView\">";
 					$printheader=false;
 				}		
 			

From 35e6625601472a668f2724070f4e45ebaebb5aa1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Oct 2016 11:16:26 +0200
Subject: [PATCH 0639/2006] fix calculation of already receipt documents

---
 views/bootstrap/class.ViewDocument.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 35322caa0..e7a4adce0 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1049,7 +1049,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<td width='20%'></td>\n";
 			print "</tr>\n";
 
-			$stat = array('-1'=>0, '0'=>0, '1'=>0);
+			$stat = array('-1'=>0, '0'=>0, '1'=>0, '2'=>0);
 			foreach ($receiptStatus as $r) {
 				$required = null;
 				$is_recipient = false;
@@ -1104,13 +1104,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 			$this->contentContainerEnd();
 			if($user->isAdmin()) {
+				/* Do not count entries '2' as they are removed userѕ */
+				$totalreceipts = $stat['-1'] + $stat['0'] + $stat['1'];
 ?>
 			<div class="row-fluid">
 			<div class="span12">
 <div class="progress">
-<div class="bar bar-success" style="width: <?php echo round($stat['1']/count($receiptStatus)*100); ?>%;"></div>
-<!-- div class="bar bar-warning" style="width: <?php echo round($stat['0']/count($receiptStatus)*100); ?>%;"></div -->
-	<div class="bar bar-danger" style="width: <?php echo round($stat['-1']/count($receiptStatus)*100); ?>%;"></div>
+<div class="bar bar-success" style="width: <?php echo round($stat['1']/$totalreceipts*100); ?>%;"></div>
+<!-- div class="bar bar-warning" style="width: <?php echo round($stat['0']/$totalreceipts*100); ?>%;"></div -->
+	<div class="bar bar-danger" style="width: <?php echo round($stat['-1']/$totalreceipts*100); ?>%;"></div>
 </div>
 			</div>
 			</div>

From efc11d4236afa14504a1b6d681eb4e9f95bdfb57 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Oct 2016 12:05:19 +0200
Subject: [PATCH 0640/2006] do not show users in list of recipients if they
 were deleted

only admin will see them
---
 views/bootstrap/class.ViewDocument.php | 43 ++++++++++++++------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index e7a4adce0..72a491253 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1049,7 +1049,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<td width='20%'></td>\n";
 			print "</tr>\n";
 
-			$stat = array('-1'=>0, '0'=>0, '1'=>0, '2'=>0);
+			$stat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0);
 			foreach ($receiptStatus as $r) {
 				$required = null;
 				$is_recipient = false;
@@ -1078,33 +1078,38 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
-				/* $updateUser is the user who has done the receipt */
-				$updateUser = $dms->getUser($r["userID"]);
-				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
-				print "<td>".htmlspecialchars($r["comment"])."</td>\n";
-				print "<td>".getReceiptStatusText($r["status"])."</td>\n";
-				print "<td><ul class=\"unstyled\">";
+				/* Do not list users that has been removed from the list of recipients
+				 * unless admin is logged in.
+				 */
+				if($user->isAdmin() || $r["status"] > -2) {
+					print "<tr>\n";
+					print "<td>".$reqName."</td>\n";
+					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+					/* $updateUser is the user who has done the receipt */
+					$updateUser = $dms->getUser($r["userID"]);
+					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
+					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
+					print "<td>".getReceiptStatusText($r["status"])."</td>\n";
+					print "<td><ul class=\"unstyled\">";
 
-				if($accessop->mayReceipt($document)) {
-					if ($is_recipient && $r["status"]==0) {
-						print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."</li>";
-					}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-						print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+					if($accessop->mayReceipt($document)) {
+						if ($is_recipient && $r["status"]==0) {
+							print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."</li>";
+						}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
+							print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+						}
 					}
-				}
 
-				print "</ul></td>\n";	
-				print "</tr>\n";
+					print "</ul></td>\n";	
+					print "</tr>\n";
+				}
 			}
 ?>
 		</table>
 <?php
 			$this->contentContainerEnd();
 			if($user->isAdmin()) {
-				/* Do not count entries '2' as they are removed userѕ */
+				/* Do not count entries '-2' as they are removed userѕ */
 				$totalreceipts = $stat['-1'] + $stat['0'] + $stat['1'];
 ?>
 			<div class="row-fluid">

From 7597cb1c7417b876e9aa5ab0a9bfc39dd04c41b3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Oct 2016 12:17:20 +0200
Subject: [PATCH 0641/2006] set recipient in notification mails

---
 op/op.SetRecipients.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index f3df002b6..efa3b2979 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -123,6 +123,7 @@ foreach ($pIndRev as $p) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
+								$params['recipient'] = $accessIndex["i"][$p]->getFullName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
@@ -183,6 +184,7 @@ if (count($receiptIndex["i"]) > 0) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
+								$params['recipient'] = $accessIndex["i"][$p]->getFullName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
@@ -230,6 +232,7 @@ foreach ($pGrpRev as $p) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
+								$params['recipient'] = $accessIndex["g"][$p]->getName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
@@ -286,6 +289,7 @@ if (count($receiptIndex["g"]) > 0) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
+								$params['recipient'] = $accessIndex["g"][$p]->getName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;

From bbc6376bcf4496ed47eea1cf8728d3ed041391f7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Oct 2016 12:39:16 +0200
Subject: [PATCH 0642/2006] fix setReceiptByGrp()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index bec9586be..b7fd88c0d 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4328,18 +4328,19 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			// Return an error.
 			return -3;
 		}
-		if ($receiptStatus[0]["status"]==-2) {
+		$grpstatus = array_pop($receiptStatus["status"]);
+		if ($grpstatus["status"] == S_LOG_USER_REMOVED) {
 			// Group has been deleted from recipients
 			return -4;
 		}
 
 		// Check if the status is really different from the current status
-		if ($receiptStatus[0]["status"] == $status)
+		if ($grpstatus["status"] == $status)
 			return 0;
 
-		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`recipientsID`, `status`,
+		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`,
   	  `comment`, `date`, `userID`) ".
-			"VALUES ('". $receiptStatus[0]["recipientsID"] ."', '".
+			"VALUES ('". $grpstatus["receiptID"] ."', '".
 			(int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentDatetime().", '".
 			$requestUser->getID() ."')";
 		$res=$db->getResult($queryStr);

From 3d1e6eede0316726358757318b748133b4ffb0ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Oct 2016 15:30:02 +0200
Subject: [PATCH 0643/2006] role has now id 3 instead of 0

---
 inc/inc.ClassLdapAuthentication.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassLdapAuthentication.php b/inc/inc.ClassLdapAuthentication.php
index 93d5d6169..0b6fc905d 100644
--- a/inc/inc.ClassLdapAuthentication.php
+++ b/inc/inc.ClassLdapAuthentication.php
@@ -140,7 +140,7 @@ class SeedDMS_LdapAuthentication extends SeedDMS_Authentication {
 					if (!is_bool($search)) {
 						$info = ldap_get_entries($ds, $search);
 						if (!is_bool($info) && $info["count"]==1 && $info[0]["count"]>0) {
-							$user = $dms->addUser($username, null, $info[0]['cn'][0], $info[0]['mail'][0], $settings->_language, $settings->_theme, "", 0);
+							$user = $dms->addUser($username, null, $info[0]['cn'][0], $info[0]['mail'][0], $settings->_language, $settings->_theme, "", 3);
 						}
 					}
 				}

From bf2ebc561cf2d5051349f6438d9149ee967954ea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Oct 2016 15:30:58 +0200
Subject: [PATCH 0644/2006] start new version 5.1.2

---
 CHANGELOG | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index eede3f1e1..f0e7762c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,12 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.2
+--------------------------------------------------------------------------------
+- merge changes up to 5.0.7
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1
 --------------------------------------------------------------------------------
-- merge changes up to 5.0.7
+- merge changes up to 5.0.6
 - add two factor authentication based on google authenticator
 - set timeout for ajax call 'mytasks' from 200ms to 1000ms
 - use a similar layout for document list on the ViewDocument page

From 8592554ad7120fa5a097626f36a03acd066b1424 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 16 Oct 2016 09:56:19 +0200
Subject: [PATCH 0645/2006] set showtree in view

---
 out/out.ViewDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 44b35a30f..752e23256 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -71,6 +71,7 @@ if ($document->checkForDueRevisionWorkflow($user)){
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
+	$view->setParam('showtree', showtree());
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);

From 04cb20a814572c4f448221c0e615acf759540a6e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Oct 2016 19:25:35 +0200
Subject: [PATCH 0646/2006] define and initialize $_ttreceiptid

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 877379e53..19ae61706 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -87,6 +87,11 @@ class SeedDMS_Core_DatabaseAccess {
 	 */
 	private $_ttcontentid;
 
+	/**
+	 * @var boolean set to true if temp. table for doc content has been created
+	 */
+	private $_ttreceiptid;
+
 	/**
 	 * @var boolean set to true if in a database transaction
 	 */
@@ -151,6 +156,7 @@ class SeedDMS_Core_DatabaseAccess {
 		$this->_ttapproveid = false;
 		$this->_ttstatid = false;
 		$this->_ttcontentid = false;
+		$this->_ttreceiptid = false;
 		$this->_debug = false;
 	} /* }}} */
 

From e10b6974ae1f09b841e9346d15dedab72d8f8501 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Oct 2016 12:17:04 +0200
Subject: [PATCH 0647/2006] add new config flag which allows doc reception by
 owner

---
 inc/inc.ClassSettings.php               | 4 ++++
 op/op.Settings.php                      | 1 +
 out/out.SetRecipients.php               | 4 +---
 out/out.ViewDocument.php                | 1 +
 views/bootstrap/class.SetRecipients.php | 3 ++-
 views/bootstrap/class.Settings.php      | 4 ++++
 views/bootstrap/class.ViewDocument.php  | 9 +++++----
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index e2c48578c..a5636c6db 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -139,6 +139,8 @@ class Settings { /* {{{ */
 	var $_enableOwnerRevApp = false;
 	// enable/disable listing logged in user as reviewer/approver
 	var $_enableSelfRevApp = false;
+	// enable/disable listing owner as recipient
+	var $_enableOwnerReceipt = false;
 	// enable/disable default notification for owner
 	var $_enableOwnerNotification = false;
 	// enable/disable deleting of versions for regular users
@@ -577,6 +579,7 @@ class Settings { /* {{{ */
 		$this->_enableAdminRevApp = Settings::boolval($tab["enableAdminRevApp"]);
 		$this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]);
 		$this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]);
+		$this->_enableOwnerReceipt = Settings::boolval($tab["enableOwnerReceipt"]);
 		$this->_presetExpirationDate = strval($tab["presetExpirationDate"]);
 		$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]);
 		$this->_versioningFileName = strval($tab["versioningFileName"]);
@@ -885,6 +888,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableAdminRevApp", $this->_enableAdminRevApp);
     $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp);
     $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp);
+    $this->setXMLAttributValue($node, "enableOwnerReceipt", $this->_enableOwnerReceipt);
     $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);
     $this->setXMLAttributValue($node, "initialDocumentStatus", $this->_initialDocumentStatus);
     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 7d26d4aa1..22ab4b033 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -167,6 +167,7 @@ if ($action == "saveSettings")
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
   $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp");
+  $settings->_enableOwnerReceipt = getBoolValue("enableOwnerReceipt");
   $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
diff --git a/out/out.SetRecipients.php b/out/out.SetRecipients.php
index 364549708..444860e30 100644
--- a/out/out.SetRecipients.php
+++ b/out/out.SetRecipients.php
@@ -66,9 +66,7 @@ if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
 	$view->setParam('version', $content);
-	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
-	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
-	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 752e23256..16acbfe77 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -75,6 +75,7 @@ if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
+	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index 2516094d5..68ef27db7 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -37,6 +37,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
 		$content = $this->params['version'];
+		$enableownerreceipt = $this->params['enableownerreceipt'];
 
 		$overallStatus = $content->getStatus();
 
@@ -47,7 +48,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("change_recipients"));
 
 		// Retrieve a list of all users and groups that have receipt privileges.
-		$docAccess = $document->getReadAccessList(true, true);
+		$docAccess = $document->getReadAccessList(true, $enableownerreceipt);
 
 		// Retrieve list of currently assigned recipients, along with
 		// their latest status.
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index fc987b73d..80233c3f2 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -629,6 +629,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableSelfRevApp");?>:</td>
         <td><input name="enableSelfRevApp" type="checkbox" <?php if ($settings->_enableSelfRevApp) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableOwnerReceipt_desc");?>">
+        <td><?php printMLText("settings_enableOwnerReceipt");?>:</td>
+        <td><input name="enableOwnerReceipt" type="checkbox" <?php if ($settings->_enableOwnerReceipt) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableVersionDeletion_desc");?>">
         <td><?php printMLText("settings_enableVersionDeletion");?>:</td>
         <td><input name="enableVersionDeletion" type="checkbox" <?php if ($settings->_enableVersionDeletion) echo "checked" ?> /></td>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 72a491253..6e521f6fb 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -195,6 +195,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$accessop = $this->params['accessobject'];
 		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
+		$enableownerreceipt = $this->params['enableownerreceipt'];
 		$workflowmode = $this->params['workflowmode'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidthlist = $this->params['previewWidthList'];
@@ -1055,7 +1056,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$is_recipient = false;
 				$stat[''.$r['status']]++;
 				switch ($r["type"]) {
-					case 0: // Reviewer is an individual.
+					case 0: // Recipient is an individual.
 						$required = $dms->getUser($r["required"]);
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
@@ -1063,17 +1064,17 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						else {
 							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 						}
-						if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+						if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerreceipt == 1))
 							$is_recipient = true;
 						break;
-					case 1: // Reviewer is a group.
+					case 1: // Recipient is a group.
 						$required = $dms->getGroup($r["required"]);
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
 							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-							if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+							if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerreceipt == 1))
 								$is_recipient = true;
 						}
 						break;

From 9ac66febeee3b58f6a29eccd83f8c66994331eab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Oct 2016 14:11:18 +0200
Subject: [PATCH 0648/2006] add config paramter enableAdminReceipt

allows admins in list of possible recipients of documents
---
 inc/inc.ClassSettings.php               | 4 ++++
 op/op.Settings.php                      | 1 +
 out/out.SetRecipients.php               | 1 +
 views/bootstrap/class.SetRecipients.php | 3 ++-
 views/bootstrap/class.Settings.php      | 4 ++++
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index a5636c6db..f3e0cf315 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -139,6 +139,8 @@ class Settings { /* {{{ */
 	var $_enableOwnerRevApp = false;
 	// enable/disable listing logged in user as reviewer/approver
 	var $_enableSelfRevApp = false;
+	// enable/disable listing administrator as recipient
+	var $_enableAdminReceipt = false;
 	// enable/disable listing owner as recipient
 	var $_enableOwnerReceipt = false;
 	// enable/disable default notification for owner
@@ -579,6 +581,7 @@ class Settings { /* {{{ */
 		$this->_enableAdminRevApp = Settings::boolval($tab["enableAdminRevApp"]);
 		$this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]);
 		$this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]);
+		$this->_enableAdminReceipt = Settings::boolval($tab["enableAdminReceipt"]);
 		$this->_enableOwnerReceipt = Settings::boolval($tab["enableOwnerReceipt"]);
 		$this->_presetExpirationDate = strval($tab["presetExpirationDate"]);
 		$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]);
@@ -888,6 +891,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableAdminRevApp", $this->_enableAdminRevApp);
     $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp);
     $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp);
+    $this->setXMLAttributValue($node, "enableAdminReceipt", $this->_enableAdminReceipt);
     $this->setXMLAttributValue($node, "enableOwnerReceipt", $this->_enableOwnerReceipt);
     $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);
     $this->setXMLAttributValue($node, "initialDocumentStatus", $this->_initialDocumentStatus);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 22ab4b033..3f6310133 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -167,6 +167,7 @@ if ($action == "saveSettings")
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
   $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp");
+  $settings->_enableAdminReceipt = getBoolValue("enableAdminReceipt");
   $settings->_enableOwnerReceipt = getBoolValue("enableOwnerReceipt");
   $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
diff --git a/out/out.SetRecipients.php b/out/out.SetRecipients.php
index 444860e30..ee2d26d4d 100644
--- a/out/out.SetRecipients.php
+++ b/out/out.SetRecipients.php
@@ -67,6 +67,7 @@ if($view) {
 	$view->setParam('document', $document);
 	$view->setParam('version', $content);
 	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
+	$view->setParam('enableadminreceipt', $settings->_enableAdminReceipt);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index 68ef27db7..fd4bb0b9f 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -38,6 +38,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
 		$document = $this->params['document'];
 		$content = $this->params['version'];
 		$enableownerreceipt = $this->params['enableownerreceipt'];
+		$enableadminreceipt = $this->params['enableadminreceipt'];
 
 		$overallStatus = $content->getStatus();
 
@@ -48,7 +49,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("change_recipients"));
 
 		// Retrieve a list of all users and groups that have receipt privileges.
-		$docAccess = $document->getReadAccessList(true, $enableownerreceipt);
+		$docAccess = $document->getReadAccessList($enableadminreceipt, $enableownerreceipt);
 
 		// Retrieve list of currently assigned recipients, along with
 		// their latest status.
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 80233c3f2..6ecda3caf 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -629,6 +629,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableSelfRevApp");?>:</td>
         <td><input name="enableSelfRevApp" type="checkbox" <?php if ($settings->_enableSelfRevApp) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableAdminReceipt_desc");?>">
+        <td><?php printMLText("settings_enableAdminReceipt");?>:</td>
+        <td><input name="enableAdminReceipt" type="checkbox" <?php if ($settings->_enableAdminReceipt) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableOwnerReceipt_desc");?>">
         <td><?php printMLText("settings_enableOwnerReceipt");?>:</td>
         <td><input name="enableOwnerReceipt" type="checkbox" <?php if ($settings->_enableOwnerReceipt) echo "checked" ?> /></td>

From ef4b6578ccbfb51580e7421a8eb7db00f7c801ea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Oct 2016 14:21:57 +0200
Subject: [PATCH 0649/2006] check if setting revisor is allowed, pass
 enableXXXRevApp to view

---
 out/out.SetRevisors.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/out/out.SetRevisors.php b/out/out.SetRevisors.php
index b38172476..4cda3fd41 100644
--- a/out/out.SetRevisors.php
+++ b/out/out.SetRevisors.php
@@ -55,10 +55,13 @@ if(!$settings->_enableVersionModification) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_version_modification"));
 }
 
-$folder = $document->getFolder();
-
 /* Create object for checking access to certain operations */
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->maySetRevisors($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("cannot_assign_invalid_state"));
+}
+
+$folder = $document->getFolder();
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
@@ -66,6 +69,9 @@ if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
 	$view->setParam('version', $content);
+	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
+	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
+	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;

From 2bc839918a689155217b86fde2066fb44a30c7b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Oct 2016 14:22:49 +0200
Subject: [PATCH 0650/2006] take enableXxxxRevApp into account

---
 views/bootstrap/class.SetRevisors.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 9f706cfa3..2a2add9fb 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -37,6 +37,9 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
 		$content = $this->params['version'];
+		$enableadminrevapp = $this->params['enableadminrevapp'];
+		$enableownerrevapp = $this->params['enableownerrevapp'];
+		$enableselfrevapp = $this->params['enableselfrevapp'];
 
 		$overallStatus = $content->getStatus();
 
@@ -46,8 +49,8 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("change_assignments"));
 
-		// Retrieve a list of all users and groups that have revision privileges.
-		$docAccess = $document->getReadAccessList(true, true);
+		// Retrieve a list of all users and groups that have review / approve privileges.
+		$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 
 		// Retrieve list of currently assigned revisors, along with
 		// their latest status.
@@ -99,6 +102,7 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 						break;
 				}
 			} else {
+				if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
 				print "<option value='". $usr->getID() ."'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
 			}
 		}

From 94dbc6b240b4b6234ac63e06e7196a22f1c16ff7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Oct 2016 14:23:26 +0200
Subject: [PATCH 0651/2006] do not take enableOwnerRe[vApp|cipt] into account

if a user has been assigen as Reviewer/Approver/Revisor and became
the owner of the document in the mean timer or the configuration has
change he/she should still be able to do the review/approval/revision
---
 views/bootstrap/class.ViewDocument.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 6e521f6fb..e3cf16881 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -680,7 +680,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						else {
 							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
-							if($required->getId() == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+							if($required->getId() == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_reviewer = true;
 						}
 						break;
@@ -691,7 +691,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						else {
 							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-							if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_reviewer = true;
 						}
 						break;
@@ -762,7 +762,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						else {
 							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-							if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_approver = true;
 						}
 						break;
@@ -1064,7 +1064,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						else {
 							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 						}
-						if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerreceipt == 1))
+						if($r["required"] == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerreceipt == 1)*/)
 							$is_recipient = true;
 						break;
 					case 1: // Recipient is a group.
@@ -1074,7 +1074,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						else {
 							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-							if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerreceipt == 1))
+							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerreceipt == 1)*/)
 								$is_recipient = true;
 						}
 						break;
@@ -1181,7 +1181,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						else {
 							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 						}
-						if($r["required"] == $user->getId() && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+						if($r["required"] == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 							$is_recipient = true;
 						break;
 					case 1: // Reviewer is a group.
@@ -1191,7 +1191,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						else {
 							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
-							if($required->isMember($user) && ($user->getId() != $owner->getId() || $enableownerrevapp == 1))
+							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_recipient = true;
 						}
 						break;

From f9d2d9dc486dd373802dd03eb065eb81be8153bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Oct 2016 14:28:54 +0200
Subject: [PATCH 0652/2006] make sure only users allowed to be a revcipient are
 saved

---
 op/op.SetRecipients.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index efa3b2979..f18abd161 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -60,7 +60,7 @@ $folder = $document->getFolder();
 // Retrieve a list of all users and groups that have read rights.
 // Afterwards, reorganize them in two arrays with its key being the
 // userid or groupid
-$docAccess = $document->getReadAccessList(true, true);
+$docAccess = $document->getReadAccessList($settings->_enableAdminReceipt, $settings->_enableOwnerReceipt);
 $accessIndex = array("i"=>array(), "g"=>array());
 foreach ($docAccess["users"] as $i=>$da) {
 	$accessIndex["i"][$da->getID()] = $da;

From 408cd5a3eb574795ed9a2f9f3cd6451903a8d8b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Oct 2016 14:35:04 +0200
Subject: [PATCH 0653/2006] fix fatal error when recipients were removed from
 list

---
 op/op.SetRecipients.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index f18abd161..7b8eb9e93 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -184,7 +184,7 @@ if (count($receiptIndex["i"]) > 0) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
-								$params['recipient'] = $accessIndex["i"][$p]->getFullName();
+								$params['recipient'] = $accessIndex["i"][$rx]->getFullName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
@@ -289,7 +289,7 @@ if (count($receiptIndex["g"]) > 0) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
-								$params['recipient'] = $accessIndex["g"][$p]->getName();
+								$params['recipient'] = $accessIndex["g"][$rx]->getName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;

From 86ba717c83897a4f2d31a537c235e79977e375fd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Nov 2016 20:29:45 +0100
Subject: [PATCH 0654/2006] use bootstrap tags for selection form

---
 views/bootstrap/class.Acl.php     | 7 +++++++
 views/bootstrap/class.RoleMgr.php | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index 4d4c956e2..e616b46f7 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -247,6 +247,10 @@ $(document).ready( function() {
 		$this->contentHeading(getMLText("role"));
 ?>
 <div class="well">
+<form class="form-horizontal">
+	<div class="control-group">
+		<label class="control-label" for="login"><?php printMLText("selection");?>:</label>
+		<div class="controls">
 <select class="chzn-select" id="selector">
 	<option value="-1"><?php echo getMLText("choose_role")?>
 <?php
@@ -255,6 +259,9 @@ $(document).ready( function() {
 		}
 ?>
 </select>
+		</div>
+	</div>
+</form>
 </div>
 <?php if($accessop->check_view_access($this, array('action'=>'info')) || $user->isAdmin()) { ?>
 <div class="ajax" data-view="Acl" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 891a42e49..4e68b5e45 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -191,7 +191,10 @@ $(document).ready( function() {
 <div class="row-fluid">
 <div class="span4">
 <div class="well">
-<?php echo getMLText("selection")?>:
+<form class="form-horizontal">
+	<div class="control-group">
+		<label class="control-label" for="login"><?php printMLText("selection");?>:</label>
+		<div class="controls">
 <select class="chzn-select" id="selector">
 <option value="-1"><?php echo getMLText("choose_role")?>
 <?php if($accessop->check_controller_access('RoleMgr', array('action'=>'addrole'))) { ?>
@@ -203,6 +206,9 @@ $(document).ready( function() {
 		}
 ?>
 </select>
+		</div>
+	</div>
+</form>
 </div>
 <?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
 	<div class="ajax" data-view="RoleMgr" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>

From 4e798993237b04e495ca78b07d817d25f61b3732 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Nov 2016 21:44:49 +0100
Subject: [PATCH 0655/2006] fix copy&paste error

---
 views/bootstrap/class.TransmittalMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 541e1dd04..6b38414f1 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -237,7 +237,7 @@ $(document).ready( function() {
 			<td><input type="text" name="comment" value="<?php print $transmittal ? htmlspecialchars($transmittal->getComment()) : "";?>"></td>
 		</tr>
 <?php
-		if($currRole && $accessop->check_controller_access('TransmittalMgr', array('action'=>'edittransmittal')) || !$currRole && $accessop->check_controller_access('TransmittalMgr', array('action'=>'addtransmittal'))) {
+		if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'edittransmittal')) || !$transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'addtransmittal'))) {
 ?>
 		<tr>
 			<td></td>

From 10a8b14effb2e96e2f14eb2e0eabe3179e4ac2d7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Nov 2016 20:28:22 +0100
Subject: [PATCH 0656/2006] take out search for reception

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 8 ++++----
 out/out.Search.php                 | 1 +
 views/bootstrap/class.Search.php   | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index b835b331b..26a6a19e2 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1431,11 +1431,11 @@ class SeedDMS_Core_DMS {
 				"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
 				"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
 				"LEFT JOIN `tblDocumentCategory` ON `tblDocuments`.`id`=`tblDocumentCategory`.`documentID` ".
-				"LEFT JOIN `tblDocumentRecipients` ON `tblDocuments`.`id`=`tblDocumentRecipients`.`documentID` ".
-				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentRecipients`.`receiptID`=`tblDocumentReceiptLog`.`receiptID` ".
-				"LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`maxLogID` = `tblDocumentReceiptLog`.`receiptLogID` ".
+//				"LEFT JOIN `tblDocumentRecipients` ON `tblDocuments`.`id`=`tblDocumentRecipients`.`documentID` ".
+//				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentRecipients`.`receiptID`=`tblDocumentReceiptLog`.`receiptID` ".
+//				"LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`maxLogID` = `tblDocumentReceiptLog`.`receiptLogID` ".
 				"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
-				"AND `ttreceiptid`.`maxLogID`=`tblDocumentReceiptLog`.`receiptLogID` ".
+//				"AND `ttreceiptid`.`maxLogID`=`tblDocumentReceiptLog`.`receiptLogID` ".
 				"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version`";
 
 			if (strlen($searchKey)>0) {
diff --git a/out/out.Search.php b/out/out.Search.php
index 5d3ac2e4f..7f0802a5f 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -161,6 +161,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$searchTime = getTime() - $startTime;
 		$searchTime = round($searchTime, 2);
 	}
+	$reception = array();
 	// }}}
 } else {
 	// Search in Database {{{
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 659b70589..08ef34282 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -370,6 +370,7 @@ $(document).ready( function() {
 <label class="checkbox" for='expired'><input type="checkbox" id="expired" name="expired" value="1" <?php echo in_array(S_EXPIRED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_EXPIRED);?></label>
 </td>
 </tr>
+<?php /* ?>
 <tr>
 <td><?php printMLText("reception");?>:</td>
 <td>
@@ -378,6 +379,7 @@ $(document).ready( function() {
 <label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="1" <?php echo in_array(1, $reception) ? "checked" : ""; ?>><?php printMLText('reception_acknowleged'); ?></label>
 </td>
 </tr>
+<?php */ ?>
 <tr>
 <td><?php printMLText("expires");?>:</td>
 <td>

From 20f2d68e050e55482669050676179e68dfc910c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 5 Nov 2016 12:28:25 +0100
Subject: [PATCH 0657/2006] take out some old code

---
 SeedDMS_Preview/Preview/Previewer.php | 54 ---------------------------
 1 file changed, 54 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 24a9a1da9..28b6fc2a9 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -244,60 +244,6 @@ class SeedDMS_Preview_Previewer {
 		$file = $document->_dms->contentDir.$object->getPath();
 		$target = $this->getFileName($object, $width);
 		return $this->createRawPreview($file, $document->getDir(), $object->getMimeType(), $width, $target);
-
-		if($width == 0)
-			$width = $this->width;
-		else
-			$width = intval($width);
-		if(!$this->previewDir)
-			return false;
-		$document = $object->getDocument();
-		$dir = $this->previewDir.'/'.$document->getDir();
-		if(!is_dir($dir)) {
-			if (!SeedDMS_Core_File::makeDir($dir)) {
-				return false;
-			}
-		}
-		$file = $document->_dms->contentDir.$object->getPath();
-		if(!file_exists($file))
-			return false;
-		$target = $this->getFileName($object, $width);
-		if($target !== false && (!file_exists($target.'.png') || filectime($target.'.png') < $object->getDate())) {
-			$cmd = '';
-			if(isset($this->converters[$object->getMimeType()])) {
-				$cmd = str_replace(array('%w', '%f', '%o'), array($width, $file, $target), $this->converters[$object->getMimeType()]);
-			}
-			/*
-			switch($object->getMimeType()) {
-				case "image/png":
-				case "image/gif":
-				case "image/jpeg":
-				case "image/jpg":
-				case "image/svg+xml":
-					$cmd = 'convert -resize '.$width.'x '.$file.' '.$target.'.png';
-					break;
-				case "application/pdf":
-				case "application/postscript":
-					$cmd = 'convert -density 100 -resize '.$width.'x '.$file.'[0] '.$target.'.png';
-					break;
-				case "text/plain":
-					$cmd = 'convert -resize '.$width.'x '.$file.'[0] '.$target.'.png';
-					break;
-				case "application/x-compressed-tar":
-					$cmd = 'tar tzvf '.$file.' | convert -density 100 -resize '.$width.'x text:-[0] '.$target.'.png';
-					break;
-			}
-			 */
-			if($cmd) {
-				//exec($cmd);
-				try {
-					self::execWithTimeout($cmd, $this->timeout);
-				} catch(Exception $e) {
-				}
-			}
-			return true;
-		}
-		return true;
 	} /* }}} */
 
 	/**

From ba338191cb8a3dfb540996fbe0df534519453edc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 8 Nov 2016 14:06:37 +0100
Subject: [PATCH 0658/2006] new version 5.1.2

---
 SeedDMS_Core/package.xml | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 251a7894d..f635f1824 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-09-06</date>
- <time>09:28:28</time>
+ <date>2016-11-08</date>
+ <time>14:06:06</time>
  <version>
-  <release>5.1.1</release>
-  <api>5.1.1</api>
+  <release>5.1.2</release>
+  <api>5.1.2</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-??
+- all changes from 5.0.7 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1328,5 +1328,21 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - all changes from 4.3.26 merged
    </notes>
   </release>
+  <release>
+   <date>2016-09-06</date>
+   <time>09:28:28</time>
+   <version>
+    <release>5.1.1</release>
+    <api>5.1.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes till 5.0.6 merged
+   </notes>
+  </release>
  </changelog>
 </package>

From 1df09242a0faa24d812b4c50c6024532ebde0846 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Nov 2016 19:54:00 +0100
Subject: [PATCH 0659/2006] don't show preview if ViewOnline isn't allowed,
 more access checks

---
 views/bootstrap/class.ViewDocument.php | 80 +++++++++++++++-----------
 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 18da0550f..25eb94581 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -439,7 +439,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if(is_string($txt))
 			echo $txt;
 		$this->contentContainerEnd();
-		$this->preview();
+		if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+			$this->preview();
+		}
 ?>
 </div>
 <div class="span8">
@@ -580,51 +582,61 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		print "</ul>";
 		print "<ul class=\"unstyled actions\">";
-		if($accessop->mayEditVersion($document)) {
-			print "<li>".$this->html_link('EditOnline', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_version"), false, true)."</li>";
-		}
+		if($this->check_access('EditOnline'))
+			if($accessop->mayEditVersion($document)) {
+				print "<li>".$this->html_link('EditOnline', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_version"), false, true)."</li>";
+			}
 		/* Only admin has the right to remove version in any case or a regular
 		 * user if enableVersionDeletion is on
 		 */
-		if($accessop->mayRemoveVersion($document)) {
-			print "<li>".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-remove\"></i>".getMLText("rm_version"), false, true)."</li>";
-		}
-		if($accessop->mayOverrideStatus($document)) {
-			print "<li>".$this->html_link('OverrideContentStatus', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-align-justify\"></i>".getMLText("change_status"), false, true)."</li>";
-		}
-		if($accessop->maySetRecipients($document)) {
-			print "<li>".$this->html_link('SetRecipients', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-check\"></i>".getMLText("change_recipients"), false, true)."</li>";
-		}
-		if($accessop->maySetRevisors($document)) {
-			print "<li>".$this->html_link('SetRevisors', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-refresh\"></i>".getMLText("change_revisors"), false, true)."</li>";
-		}
+		if($this->check_access('RemoveVersion'))
+			if($accessop->mayRemoveVersion($document)) {
+				print "<li>".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-remove\"></i>".getMLText("rm_version"), false, true)."</li>";
+			}
+		if($this->check_access('OverrideContentStatus'))
+			if($accessop->mayOverrideStatus($document)) {
+				print "<li>".$this->html_link('OverrideContentStatus', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-align-justify\"></i>".getMLText("change_status"), false, true)."</li>";
+			}
+		if($this->check_access('SetRecipients'))
+			if($accessop->maySetRecipients($document)) {
+				print "<li>".$this->html_link('SetRecipients', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-check\"></i>".getMLText("change_recipients"), false, true)."</li>";
+			}
+		if($this->check_access('SetRevisors'))
+			if($accessop->maySetRevisors($document)) {
+				print "<li>".$this->html_link('SetRevisors', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-refresh\"></i>".getMLText("change_revisors"), false, true)."</li>";
+			}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
-			if($accessop->maySetReviewersApprovers($document)) {
-				print "<li>".$this->html_link('SetReviewersApprovers', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("change_assignments"), false, true)."</li>";
-			}
-		} else {
-			if($accessop->maySetWorkflow($document)) {
-				if(!$workflow) {
-					print "<li>".$this->html_link('SetWorkflow', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-random\"></i>".getMLText("set_workflow"), false, true)."</li>";
+			if($this->check_access('SetReviewersApprovers'))
+				if($accessop->maySetReviewersApprovers($document)) {
+					print "<li>".$this->html_link('SetReviewersApprovers', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("change_assignments"), false, true)."</li>";
+				}
+		} else {
+			if($this->check_access('SetWorkflow'))
+				if($accessop->maySetWorkflow($document)) {
+					if(!$workflow) {
+						print "<li>".$this->html_link('SetWorkflow', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-random\"></i>".getMLText("set_workflow"), false, true)."</li>";
+					}
 				}
-			}
 		}
 		/*
 		if($accessop->maySetExpires($document)) {
 			print "<li>".$this->html_link('SetExpires', array('documentid'=>$documentid), array(), "<i class=\"icon-time\"></i>".getMLText("set_expiry"), false, true)."</li>";
 		}
 		 */
-		if($dms->getAllTransmittals($user)) {
-			if($this->check_access('AddToTransmittal'))
-				print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
-		}
-		if($accessop->mayEditComment($document)) {
-			print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";
-		}
-		if($accessop->mayEditAttributes($document)) {
-			print "<li>".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_attributes"), false, true)."</li>";
-		}
+		if($this->check_access('AddToTransmittal'))
+			if($dms->getAllTransmittals($user)) {
+				if($this->check_access('AddToTransmittal'))
+					print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
+			}
+		if($this->check_access('EditComment'))
+			if($accessop->mayEditComment($document)) {
+				print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";
+			}
+		if($this->check_access('EditAttributes'))
+			if($accessop->mayEditAttributes($document)) {
+				print "<li>".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_attributes"), false, true)."</li>";
+			}
 
 		//print "<li>".$this->html_link('Download', array('documentid'=>$documentid, 'vfile'=>1), array(), "<i class=\"icon-info-sign\"></i>".getMLText("versioning_info"), false, true)."</li>";	
 

From 87bbb6bf444ef32940dd1ec541caad0b8de83b61 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Nov 2016 19:54:53 +0100
Subject: [PATCH 0660/2006] use orig file, set filename in utf-8

---
 controllers/class.ViewOnline.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/controllers/class.ViewOnline.php b/controllers/class.ViewOnline.php
index 0475286b1..4ddb7688d 100644
--- a/controllers/class.ViewOnline.php
+++ b/controllers/class.ViewOnline.php
@@ -34,7 +34,8 @@ class SeedDMS_Controller_ViewOnline extends SeedDMS_Controller_Common {
 				if(!$this->callHook('version')) {
 					header("Content-Type: " . $content->getMimeType());
 					if (!isset($settings->_viewOnlineFileTypes) || !is_array($settings->_viewOnlineFileTypes) || !in_array(strtolower($content->getFileType()), $settings->_viewOnlineFileTypes)) {
-						header("Content-Disposition: filename=\"" . $document->getName().$content->getFileType()) . "\"";
+						$efilename = rawurlencode($content->getOriginalFileName());
+						header("Content-Disposition: filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
 					}
 					header("Content-Length: " . filesize($dms->contentDir . $content->getPath()));
 					header("Expires: 0");

From 3ddd24c7cd206e1cf9e3edc3f221ba3e17e59a71 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Nov 2016 16:19:42 +0100
Subject: [PATCH 0661/2006] add expired status to list of status without access

---
 views/bootstrap/class.RoleMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 4e68b5e45..aaa40f0ee 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -154,7 +154,7 @@ $(document).ready( function() {
 			echo "<tr>";
 			echo "<td>".getMLText('restrict_access')."</td>";
 			echo "<td>";
-			foreach(array(S_DRAFT_REV, S_DRAFT_APP, S_IN_WORKFLOW, S_REJECTED, S_RELEASED, S_IN_REVISION, S_DRAFT, S_OBSOLETE) as $status) {
+			foreach(array(S_DRAFT_REV, S_DRAFT_APP, S_IN_WORKFLOW, S_REJECTED, S_RELEASED, S_IN_REVISION, S_DRAFT, S_EXPIRED, S_OBSOLETE) as $status) {
 				echo "<input type=\"checkbox\" name=\"noaccess[]\" value=\"".$status."\" ".(in_array($status, $currRole->getNoAccess()) ? "checked" : "")."> ".getOverallStatusText($status)."<br />";
 			}
 			echo "</td>";

From 106f849e825b66cd1010b5a64f8f5bd567361d02 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Nov 2016 16:20:10 +0100
Subject: [PATCH 0662/2006] minor documentation fix

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index e9eb8344f..23e5f37ea 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -734,7 +734,7 @@ class SeedDMS_Core_DMS {
 	 * І have already taken care of.
 	 * @param string $param3 sort list by this field
 	 * @param string $param4 order direction
-	 * @return array list of documents
+	 * @return array list of documents records
 	 */
 	function getDocumentList($listtype, $param1=null, $param2=false, $param3='', $param4='') { /* {{{ */
 		/* The following query will get all documents and lots of additional
@@ -1043,6 +1043,11 @@ class SeedDMS_Core_DMS {
 			if (is_bool($resArr) && !$resArr) {
 				return false;
 			}
+			/*
+			$documents = array();
+			foreach($resArr as $row)
+				$documents[] = $this->getDocument($row["id"]);
+			 */
 		} else {
 			return array();
 		}

From 718762d2841d90bbe3916f295e588b48ddb6102a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Nov 2016 08:38:12 +0100
Subject: [PATCH 0663/2006] check for access on document in mytasks and
 view->menutasks (Ticket #88)

previously documents where listed, even if the user had no access
---
 op/op.Ajax.php | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index a10f5d1e3..15122911d 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -535,25 +535,37 @@ switch($command) {
 				$resArr = $dms->getDocumentList('ApproveByMe', $user);
 				if($resArr) {
 					foreach ($resArr as $res) {
-						$approvals[] = $res['id'];
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$approvals[] = $res['id'];
+						}
 					}
 				}
 				$resArr = $dms->getDocumentList('ReviewByMe', $user);
 				if($resArr) {
 					foreach ($resArr as $res) {
-						$reviews[] = $res['id'];
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$reviews[] = $res['id'];
+						}
 					}
 				}
 				$resArr = $dms->getDocumentList('ReceiptByMe', $user);
 				if($resArr) {
 					foreach ($resArr as $res) {
-						$receipts[] = $res['id'];
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$receipts[] = $res['id'];
+						}
 					}
 				}
 				$resArr = $dms->getDocumentList('ReviseByMe', $user);
 				if($resArr) {
 					foreach ($resArr as $res) {
-						$revisions[] = $res['id'];
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$revisions[] = $res['id'];
+						}
 					}
 				}
 				$content = $view->menuTasks(array('review'=>$reviews, 'approval'=>$approvals, 'receipt'=>$receipts, 'revision'=>$revisions));
@@ -871,25 +883,37 @@ switch($command) {
 			$resArr = $dms->getDocumentList('ApproveByMe', $user);
 			if($resArr) {
 				foreach ($resArr as $res) {
-					$approvals[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$approvals[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 			$resArr = $dms->getDocumentList('ReviewByMe', $user);
 			if($resArr) {
 				foreach ($resArr as $res) {
-					$reviews[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$reviews[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
 			if($resArr) {
 				foreach ($resArr as $res) {
-					$receipts[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$receipts[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 			$resArr = $dms->getDocumentList('ReviseByMe', $user);
 			if($resArr) {
 				foreach ($resArr as $res) {
-					$revisions[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$revisions[] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 			header('Content-Type: application/json');

From 7db1703477d866ab4c02d4ffd627e89fb27777df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Nov 2016 11:39:13 +0100
Subject: [PATCH 0664/2006] forget to create field secret when change table
 tblUsers

---
 install/update-5.1.0/update-sqlite3.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-5.1.0/update-sqlite3.sql
index 71bf8930d..c982e592f 100644
--- a/install/update-5.1.0/update-sqlite3.sql
+++ b/install/update-5.1.0/update-sqlite3.sql
@@ -107,6 +107,7 @@ CREATE TABLE `new_tblUsers` (
   `disabled` INTEGER NOT NULL default '0',
   `quota` INTEGER,
   `homefolder` INTEGER default NULL REFERENCES `tblFolders` (`id`),
+  `secret` varchar(50) default NULL,
   UNIQUE (`login`)
 );
 

From 6cb5dec1a9d8fd9c1756f837e8834bcf4e908818 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Nov 2016 17:58:28 +0100
Subject: [PATCH 0665/2006] fix search for documents with reception
 acknowledgement

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 23e5f37ea..4834542f1 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1422,9 +1422,14 @@ class SeedDMS_Core_DMS {
 			// Construct the SQL query that will be used to search the database.
 			//
 
-			if (!$this->db->createTemporaryTable("ttcontentid") || !$this->db->createTemporaryTable("ttstatid") || !$this->db->createTemporaryTable("ttreceiptid")) {
+			if (!$this->db->createTemporaryTable("ttcontentid") || !$this->db->createTemporaryTable("ttstatid")) {
 				return false;
 			}
+			if($reception) {
+				if (!$this->db->createTemporaryTable("ttreceiptid")) {
+					return false;
+				}
+			}
 
 			$searchQuery = "FROM `tblDocumentContent` ".
 				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
@@ -1470,8 +1475,26 @@ class SeedDMS_Core_DMS {
 				$searchQuery .= " AND `tblDocumentStatusLog`.`status` IN (".implode(',', $status).")";
 			}
 
-			if($reception)
-				$searchQuery .= " AND `tblDocumentReceiptLog`.`status` IN (".implode(',', $reception).")";
+			if($reception) {
+				$searchReception = array();
+				/* still waiting for users/groups to acknownledge reception */
+				if(in_array("missingaction", $reception))
+					$searchReception[] = "b.`status` IN (0)";
+				/* document has not been acknowledeged by at least one user/group */
+				if(in_array("hasrejection", $reception))
+					$searchReception[] = "b.`status` IN (-1)";
+				/* document has been acknowledeged by at least one user/group */
+				if(in_array("hasacknowledge", $reception))
+					$searchReception[] = "b.`status` IN (1)";
+				/* document has been acknowledeged by all users/groups !!! not working !!! */
+				if(in_array("completeacknowledge", $reception))
+					$searchReception[] = "b.`status` NOT IN (-1, 0)";
+				if($searchReception) {
+					$searchQuery .= " AND EXISTS (SELECT NULL FROM `tblDocumentRecipients` a LEFT JOIN `tblDocumentReceiptLog` b ON a.`receiptID`=b.`receiptID` LEFT JOIN `ttreceiptid` c ON c.`maxLogID` = b.`receiptLogID` WHERE ";
+					$searchQuery .= "c.`maxLogID`=b.`receiptLogID` AND `tblDocuments`.`id` = a.`documentID` ";
+					$searchQuery .= "AND (".implode(' OR ', $searchReception)."))";
+				}
+			}
 
 			if($searchKey || $searchOwner || $searchCategories || $searchCreateDate || $searchExpirationDate || $searchAttributes || $status || $reception) {
 				// Count the number of rows that the search will produce.

From e21e897468577ba45af0532d63b80414b0b0016b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Nov 2016 17:58:59 +0100
Subject: [PATCH 0666/2006] use keywords for different searches for document
 reception

---
 views/bootstrap/class.Search.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index ef669c166..70877fb47 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -373,16 +373,14 @@ $(document).ready( function() {
 <label class="checkbox" for='expired'><input type="checkbox" id="expired" name="expired" value="1" <?php echo in_array(S_EXPIRED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_EXPIRED);?></label>
 </td>
 </tr>
-<?php /* ?>
 <tr>
 <td><?php printMLText("reception");?>:</td>
 <td>
-<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="0" <?php echo in_array(0, $reception) ? "checked" : ""; ?>><?php printMLText('reception_noaction'); ?></label>
-<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="-1" <?php echo in_array(-1, $reception) ? "checked" : ""; ?>><?php printMLText('reception_rejected'); ?></label>
-<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="1" <?php echo in_array(1, $reception) ? "checked" : ""; ?>><?php printMLText('reception_acknowleged'); ?></label>
+<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="missingaction" <?php echo in_array('missingaction', $reception) ? "checked" : ""; ?>><?php printMLText('reception_noaction'); ?></label>
+<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="hasrejection" <?php echo in_array('hasrejection', $reception) ? "checked" : ""; ?>><?php printMLText('reception_rejected'); ?></label>
+<label class="checkbox" for='reception'><input type="checkbox" id="reception" name="reception[]" value="hasacknowledge" <?php echo in_array('hasacknowledge', $reception) ? "checked" : ""; ?>><?php printMLText('reception_acknowleged'); ?></label>
 </td>
 </tr>
-<?php */ ?>
 <tr>
 <td><?php printMLText("expires");?>:</td>
 <td>

From 8b1b9fdb2a3462e6e27334ae52d0e1ee70ad1a15 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2017 17:14:45 +0100
Subject: [PATCH 0667/2006] set $dms in preview()

---
 views/bootstrap/class.ViewDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 5e05e2e8a..d4fda9bfd 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -313,6 +313,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	function preview() { /* {{{ */
+		$dms = $this->params['dms'];
 		$document = $this->params['document'];
 		$timeout = $this->params['timeout'];
 		$showfullpreview = $this->params['showFullPreview'];

From b5f8e9efcc882da14e00f9ebe639c817d0f7fef6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2017 17:23:59 +0100
Subject: [PATCH 0668/2006] readd [post|pre]PreviewDocument hooks

---
 views/bootstrap/class.ViewDocument.php | 43 ++++++++++++++++----------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index d4fda9bfd..d365d952d 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -323,36 +323,47 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			return;
 
 		$accessop = $this->params['accessobject'];
-
 		if($accessop->check_controller_access('Download', array('action'=>'version'))) {
 			$latestContent = $document->getLatestContent();
-			switch($latestContent->getMimeType()) {
-			case 'audio/mpeg':
-			case 'audio/mp3':
-			case 'audio/ogg':
-			case 'audio/wav':
-				$this->contentHeading(getMLText("preview"));
+			$txt = $this->callHook('preDocumentPreview', $latestContent);
+			if(is_string($txt))
+				echo $txt;
+			else {
+				switch($latestContent->getMimeType()) {
+				case 'audio/mpeg':
+				case 'audio/mp3':
+				case 'audio/ogg':
+				case 'audio/wav':
+					$this->contentHeading(getMLText("preview"));
 ?>
 		<audio controls style="width: 100%;">
 		<source  src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="audio/mpeg">
 		</audio>
 <?php
-				break;
-			case 'application/pdf':
-				$this->contentHeading(getMLText("preview"));
+					break;
+				case 'application/pdf':
+					$this->contentHeading(getMLText("preview"));
 ?>
 			<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
 <?php
-				break;
-			case 'image/svg+xml':
-				$this->contentHeading(getMLText("preview"));
+					break;
+				case 'image/svg+xml':
+					$this->contentHeading(getMLText("preview"));
 ?>
 			<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
 <?php
-				break;
-			default:
-				break;
+					break;
+				default:
+					$txt = $this->callHook('additionalDocumentPreview', $latestContent);
+					if(is_string($txt))
+						echo $txt;
+					break;
+				}
 			}
+			$txt = $this->callHook('postDocumentPreview', $latestContent);
+			if(is_string($txt))
+				echo $txt;
+
 			if($converttopdf) {
 				$pdfpreviewer = new SeedDMS_Preview_PdfPreviewer($cachedir, $timeout);
 				if($pdfpreviewer->hasConverter($latestContent->getMimeType())) {

From fbb91c9c3000a17f6b9beca7ea094aa42a1c6317 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2017 18:08:18 +0100
Subject: [PATCH 0669/2006] use form controls

---
 views/bootstrap/class.SetRevisors.php | 49 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 2a2add9fb..06ea7cb21 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -70,18 +70,24 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 
 <?php $this->contentContainerStart(); ?>
 
-<form action="../op/op.SetRevisors.php" method="post" name="form1">
+<form class="form-horizontal" action="../op/op.SetRevisors.php" method="post" name="form1">
 
 <?php $this->contentSubHeading(getMLText("update_revisors"));?>
 
-  <div class="cbSelectTitle"><?php printMLText("revision_date")?>:</div>
-  <span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-    <input class="span4" size="16" name="startdate" type="text" value="<?php if($startdate) echo $startdate; else echo date('Y-m-d'); ?>">
-    <span class="add-on"><i class="icon-calendar"></i></span>
-  </span>
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("revision_date")?>:</label>
+		<div class="controls">
+			<span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+				<input class="span4" size="16" name="startdate" type="text" value="<?php if($startdate) echo $startdate; else echo date('Y-m-d'); ?>">
+				<span class="add-on"><i class="icon-calendar"></i></span>
+			</span>
+		</div>
+	</div>
 
-  <div class="cbSelectTitle"><?php printMLText("individuals")?>:</div>
-  <select class="chzn-select span9" name="indRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("individuals")?>:</label>
+		<div class="controls">
+			<select class="chzn-select span9" name="indRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 
 		foreach ($docAccess["users"] as $usr) {
@@ -107,10 +113,14 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 			}
 		}
 ?>
-  </select>
+			</select>
+		</div>
+	</div>
 
-  <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
-  <select class="chzn-select span9" name="grpRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("groups")?>:</label>
+		<div class="controls">
+			<select class="chzn-select span9" name="grpRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
 		foreach ($docAccess["groups"] as $group) {
 			if (isset($revisionIndex["g"][$group->getID()])) {
@@ -131,13 +141,18 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 			}
 		}
 ?>
-  </select>
+			</select>
+		</div>
+	</div>
 
-<p>
-<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-<input type="submit" class="btn" value="<?php printMLText("update");?>">
-</p>
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+	<div class="control-group">
+		<label class="control-label"></label>
+		<div class="controls">
+			<input type="submit" class="btn" value="<?php printMLText("update");?>">
+		</div>
+	</div>
 </form>
 <?php
 		$this->contentContainerEnd();

From 72535081d6fd6021466dd9d94860a4efb2db17f2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2017 08:58:37 +0100
Subject: [PATCH 0670/2006] check for return value of mytasks api call

do nothing if data is null
---
 styles/bootstrap/application.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 1d0178610..d94f36c89 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -998,15 +998,17 @@ $(document).ready(function() { /* {{{ */
 			dataType: "json",
 			data: {command: 'mytasks'},
 			success: function(data) {
-				if(approval_count != data.data.approval.length ||
-					 review_count != data.data.review.length ||
-					 receipt_count != data.data.receipt.length ||
-					 revision_count != data.data.revision.length) {
-					$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
-					approval_count = data.data.approval.length;
-					review_count = data.data.review.length;
-					receipt_count = data.data.receipt.length;
-					revision_count = data.data.revision.length;
+				if(data) {
+					if(approval_count != data.data.approval.length ||
+						 review_count != data.data.review.length ||
+						 receipt_count != data.data.receipt.length ||
+						 revision_count != data.data.revision.length) {
+						$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
+						approval_count = data.data.approval.length;
+						review_count = data.data.review.length;
+						receipt_count = data.data.receipt.length;
+						revision_count = data.data.revision.length;
+					}
 				}
 			},
 			timeout: 1000

From fae159a5f33b0412ba7a76b03cab1524f03cc074 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2017 21:33:45 +0100
Subject: [PATCH 0671/2006] set name of file in zip file to
 'docid'-'version'-'docname' (Closes #95)

---
 inc/inc.ClassDownloadMgr.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index b91cec988..770a874e7 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -184,7 +184,15 @@ class SeedDMS_Download_Mgr {
 		foreach($this->items as $item) {
 			$document = $item->getDocument();
 			$dms = $document->_dms;
-			$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($prefixdir."/".$document->getID()."-".$item->getOriginalFileName()));
+			$ext = pathinfo($document->getName(), PATHINFO_EXTENSION);
+			$oext = pathinfo($item->getOriginalFileName(), PATHINFO_EXTENSION);
+			if($ext == $oext)
+				$filename = preg_replace('/[^A-Za-z0-9_.-]/', '_', $document->getName());
+			else {
+				$filename = preg_replace('/[^A-Za-z0-9_-]/', '_', $document->getName()).'.'.$oext;
+			}
+			$filename = $prefixdir."/".$document->getID().'-'.$item->getVersion().'-'.$filename; //$lc->getOriginalFileName();
+			$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($filename));
 		}
 
 		$zip->addFile($file, $prefixdir."/metadata.xls");

From 5584cedce33baa26c2d84486d2b7e74ffb5d3957 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2017 06:36:45 +0100
Subject: [PATCH 0672/2006] fix validation if just file from library is given

---
 views/bootstrap/class.AddDocument.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index c5d485cb6..933c97847 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -77,9 +77,14 @@ $(document).ready(function() {
 	});
 
 	jQuery.validator.addMethod("alternatives", function(value, element, params) {
-		if(value == '' && params.val() == '')
-			return false;
-		return true;
+		if(value != '')
+			return true;
+		var valid = false;
+		$.each(params, function( index, value ) {
+			if(params.val != '')
+				valid = true
+		});
+		return valid;
 	}, "<?php printMLText("js_no_file");?>");
 	$("#form1").validate({
 		invalidHandler: function(e, validator) {
@@ -94,10 +99,10 @@ $(document).ready(function() {
 		},
 		rules: {
 			'userfile[]': {
-				alternatives: $('#dropfolderfileform1')
+				alternatives: [$('#dropfolderfileform1'), $('#choosedocsearch')]
 			},
 			dropfolderfileform1: {
-				 alternatives: $(".btn-file input")
+				 alternatives: [$(".btn-file input"), $('#choosedocsearch')]
 			}
 		},
 		messages: {

From b27b8ba7fd5f177017d2a89eac8d73df354963fe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2017 06:58:07 +0100
Subject: [PATCH 0673/2006] check access rights in controller, not before

---
 controllers/class.AddDocument.php | 4 +++-
 op/op.AddDocument.php             | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 271982b3b..3c0c8ebbf 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -86,10 +86,12 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 			}
 			/* Check if additional notification shall be added */
 			foreach($notificationusers as $notuser) {
+				if($document->getAccessMode($user) >= M_READ)
 					$res = $document->addNotify($notuser->getID(), true);
 			}
 			foreach($notificationgroups as $notgroup) {
-				$res = $document->addNotify($notgroup->getID(), false);
+				if($document->getGroupAccessMode($notgroup) >= M_READ)
+					$res = $document->addNotify($notgroup->getID(), false);
 			}
 
 			if(!$this->callHook('postAddDocument', $document)) {
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index f6d16a63f..3890e49eb 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -299,8 +299,7 @@ if(!empty($_POST['notification_users'])) {
 	foreach($_POST['notification_users'] as $notuserid) {
 		$notuser = $dms->getUser($notuserid);
 		if($notuser) {
-			if($document->getAccessMode($user) >= M_READ)
-				$notusers[] = $notuser;
+			$notusers[] = $notuser;
 		}
 	}
 }
@@ -309,8 +308,7 @@ if(!empty($_POST['notification_groups'])) {
 	foreach($_POST['notification_groups'] as $notgroupid) {
 		$notgroup = $dms->getGroup($notgroupid);
 		if($notgroup) {
-			if($document->getGroupAccessMode($notgroup) >= M_READ)
-				$notgroups[] = $notgroup;
+			$notgroups[] = $notgroup;
 		}
 	}
 }

From 05f1919e3cabdfffc2617aa5dd621bb16de47b1d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2017 08:45:21 +0100
Subject: [PATCH 0674/2006] set Content-Disposition even if file type not in
 list of online file types

---
 controllers/class.ViewOnline.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/controllers/class.ViewOnline.php b/controllers/class.ViewOnline.php
index c95ac0f6e..65d5a8d44 100644
--- a/controllers/class.ViewOnline.php
+++ b/controllers/class.ViewOnline.php
@@ -33,8 +33,10 @@ class SeedDMS_Controller_ViewOnline extends SeedDMS_Controller_Common {
 			case "version":
 				if(null === $this->callHook('version')) {
 					header("Content-Type: " . $content->getMimeType());
+					$efilename = rawurlencode($content->getOriginalFileName());
 					if (!isset($settings->_viewOnlineFileTypes) || !is_array($settings->_viewOnlineFileTypes) || !in_array(strtolower($content->getFileType()), $settings->_viewOnlineFileTypes)) {
-						$efilename = rawurlencode($content->getOriginalFileName());
+						header("Content-Disposition: attachment; filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
+					} else {
 						header("Content-Disposition: filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
 					}
 					header("Content-Length: " . filesize($dms->contentDir . $content->getPath()));

From 47f43a47bafc9388fbb9e8e35620320fb47818c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2017 09:23:27 +0100
Subject: [PATCH 0675/2006] fix validation of alternative file upload/import
 fields

---
 views/bootstrap/class.AddDocument.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index b76cb6c9e..d8d1f67f9 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -81,7 +81,7 @@ $(document).ready(function() {
 			return true;
 		var valid = false;
 		$.each(params, function( index, value ) {
-			if(params.val != '')
+			if(value.val() != '' && typeof value.val() != 'undefined')
 				valid = true
 		});
 		return valid;
@@ -113,7 +113,6 @@ $(document).ready(function() {
 		errorPlacement: function( error, element ) {
 			if ( element.is( ":file" ) ) {
 				error.appendTo( element.parent().parent().parent());
-console.log(element);
 			} else {
 				error.appendTo( element.parent());
 			}

From 2d2ebdc887bfa943212dc07840e0dcebd55443bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2017 21:25:15 +0100
Subject: [PATCH 0676/2006] add ordering to all list in getDocumentList()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 85 +++++++++++++++++++++++++-----
 1 file changed, 73 insertions(+), 12 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 4834542f1..ac7b72200 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -809,6 +809,12 @@ class SeedDMS_Core_DMS {
 			break; // }}}
 		case 'ReviewByMe': // Documents I have to review {{{
 			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+
 			// Get document list for the current user.
 			$reviewStatus = $user->getReviewStatus();
 
@@ -834,14 +840,25 @@ class SeedDMS_Core_DMS {
 
 			if (strlen($docCSV)>0) {
 				$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_EXPIRED.") ".
-							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
-							"ORDER BY `statusDate` DESC";
+							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ";
+				//$queryStr .= "ORDER BY `statusDate` DESC";
+				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+				else $queryStr .= "ORDER BY `name`";
+				$queryStr .= " ".$orderdir;
 			} else {
 				$queryStr = '';
 			}
 			break; // }}}
 		case 'ApproveByMe': // Documents I have to approve {{{
 			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+
 			// Get document list for the current user.
 			$approvalStatus = $user->getApprovalStatus();
 
@@ -867,8 +884,13 @@ class SeedDMS_Core_DMS {
 
 			if (strlen($docCSV)>0) {
 				$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_APP.", ".S_EXPIRED.") ".
-							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
-							"ORDER BY `statusDate` DESC";
+							"AND `tblDocuments`.`id` IN (" . $docCSV . ") ";
+				//$queryStr .= "ORDER BY `statusDate` DESC";
+				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+				else $queryStr .= "ORDER BY `name`";
+				$queryStr .= " ".$orderdir;
 			} else {
 				$queryStr = '';
 			}
@@ -907,6 +929,12 @@ class SeedDMS_Core_DMS {
 			break; // }}}
 		case 'ReviseByMe': // Documents I have to receipt {{{
 			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+
 			// Get document list for the current user.
 			$revisionStatus = $user->getRevisionStatus();
 
@@ -929,8 +957,13 @@ class SeedDMS_Core_DMS {
 			}
 
 			if (strlen($docCSV)>0) {
-				$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
-							"ORDER BY `statusDate` DESC";
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ";
+				//$queryStr .= "ORDER BY `statusDate` DESC";
+				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+				else $queryStr .= "ORDER BY `name`";
+				$queryStr .= " ".$orderdir;
 			} else {
 				$queryStr = '';
 			}
@@ -987,14 +1020,33 @@ class SeedDMS_Core_DMS {
 			break; // }}}
 		case 'RejectOwner': // Documents that has been rejected and I'm owning {{{
 			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
 			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
-				"AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") ".
-				"ORDER BY `statusDate` DESC";
+				"AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") ";
+			//$queryStr .= "ORDER BY `statusDate` DESC";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
 			break; // }}}
 		case 'LockedByMe': // Documents locked by me {{{
 			$user = $param1;
-			$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ".
-				"ORDER BY `statusDate` DESC";
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+			$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
 			break; // }}}
 		case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning {{{
 			$user = $param1;
@@ -1018,6 +1070,11 @@ class SeedDMS_Core_DMS {
 			break; // }}}
 		case 'CheckedOutByMe': // Documents I have checked out {{{
 			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
 
 			$qs = 'SELECT document FROM tblDocumentCheckOuts WHERE userID='.$user->getID();
 			$ra = $this->db->getResultArray($qs);
@@ -1030,8 +1087,12 @@ class SeedDMS_Core_DMS {
 			}
 
 			if ($docs) {
-				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ".
-							"ORDER BY `statusDate` DESC";
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
+				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+				else $queryStr .= "ORDER BY `name`";
+				$queryStr .= " ".$orderdir;
 			} else {
 				$queryStr = '';
 			}

From 7a721ee84f1e4736a347a5e53d3c88a50d7fd5ee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2017 21:25:45 +0100
Subject: [PATCH 0677/2006] make all list sortable by fields in header

---
 views/bootstrap/class.MyDocuments.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index c0260137c..e4b1805a7 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -120,6 +120,8 @@ $(document).ready( function() {
 
 		$this->contentHeading(getMLText("documents_to_review"));
 		if($resArr) {
+			$this->printList($resArr, $previewer, 'listReviews');
+			/*
 			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>\n";
@@ -142,6 +144,7 @@ $(document).ready( function() {
 			}
 
 			echo "</tbody>\n</table>\n";
+			 */
 		} else {
 			printMLText("no_docs_to_review");
 		}
@@ -170,6 +173,8 @@ $(document).ready( function() {
 		}
 		$this->contentHeading(getMLText("documents_to_approve"));
 		if($resArr) {
+			$this->printList($resArr, $previewer, 'listApprovals');
+			/*
 			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>\n";
@@ -192,6 +197,7 @@ $(document).ready( function() {
 			}
 
 			echo "</tbody>\n</table>\n";
+			 */
 		} else {
 			printMLText("no_docs_to_approve");
 		}
@@ -403,7 +409,7 @@ $(document).ready( function() {
 
 		$this->contentHeading(getMLText("documents_to_revise"));
 		if($resArr) {
-			$this->printList($resArr, $previewer);
+			$this->printList($resArr, $previewer, 'listRevisions');
 		} else {
 			printMLText("no_docs_to_revise");
 		}
@@ -432,7 +438,7 @@ $(document).ready( function() {
 
 		$this->contentHeading(getMLText("documents_to_receipt"));
 		if($resArr) {
-			$this->printList($resArr, $previewer);
+			$this->printList($resArr, $previewer, 'listReceipts');
 		} else {
 			printMLText("no_docs_to_receipt");
 		}
@@ -465,7 +471,7 @@ $(document).ready( function() {
 
 		$this->contentHeading(getMLText("documents_user_rejected"));
 		if ($resArr) {
-			$this->printList($resArr, $previewer);
+			$this->printList($resArr, $previewer, 'listRejects');
 		}
 		else printMLText("no_docs_rejected");
 
@@ -495,7 +501,7 @@ $(document).ready( function() {
 
 		$this->contentHeading(getMLText("documents_locked_by_you"));
 		if ($resArr) {
-			$this->printList($resArr, $previewer);
+			$this->printList($resArr, $previewer, 'listLockedDocs');
 		}
 		else printMLText("no_docs_locked");
 
@@ -525,7 +531,7 @@ $(document).ready( function() {
 
 		$this->contentHeading(getMLText("documents_checked_out_by_you"));
 		if ($resArr) {
-			$this->printList($resArr, $previewer);
+			$this->printList($resArr, $previewer, 'listCheckedoutDocs');
 		}
 		else printMLText("no_docs_checked_out");
 	} /* }}} */

From 66e6cec4465347c46d511ee9477ee125abf67e08 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Jan 2017 17:49:21 +0100
Subject: [PATCH 0678/2006] add filter for status 'S_DRAFT'

---
 out/out.Search.php               | 3 +++
 views/bootstrap/class.Search.php | 1 +
 2 files changed, 4 insertions(+)

diff --git a/out/out.Search.php b/out/out.Search.php
index 7f0802a5f..7835c7922 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -289,6 +289,9 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 	// status
 	$status = array();
+	if (isset($_GET["draft"])){
+		$status[] = S_DRAFT;
+	}
 	if (isset($_GET["pendingReview"])){
 		$status[] = S_DRAFT_REV;
 	}
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 70877fb47..425f124a4 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -359,6 +359,7 @@ $(document).ready( function() {
 <td><?php printMLText("status");?>:</td>
 <td>
 <?php if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { ?>
+<label class="checkbox" for='draft'><input type="checkbox" id="draft" name="draft" value="1" <?php echo in_array(S_DRAFT, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_DRAFT);?></label>
 <?php if($workflowmode == 'traditional') { ?>
 <label class="checkbox" for='pendingReview'><input type="checkbox" id="pendingReview" name="pendingReview" value="1" <?php echo in_array(S_DRAFT_REV, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_DRAFT_REV);?></label>
 <?php } ?>

From 32da91d1456195b916ca5f761f9e51bf5c389dd4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Jan 2017 18:08:16 +0100
Subject: [PATCH 0679/2006] add item to 5.1.2

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index e04c82033..b2f76d8e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 5.1.2
 --------------------------------------------------------------------------------
 - merge changes up to 5.0.9
+- filter documents by status 'draft' on search page
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1

From ba621af162c2c6fe80b78c2b6f12fd257676b1d3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Jan 2017 18:17:52 +0100
Subject: [PATCH 0680/2006] update tasks in menu only if logged in

---
 styles/bootstrap/application.js     | 4 ----
 views/bootstrap/class.Bootstrap.php | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index d94f36c89..1c093c2ac 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1015,8 +1015,4 @@ $(document).ready(function() { /* {{{ */
 		}); 
 		timeOutId = setTimeout(checkTasks, 10000);
 	}
-$(document).ready(function() {
-//$("#menu-tasks > ul > li").checkTasks();
-	checkTasks();
-}); 
 
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 0ce613c71..2c3d38d4b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -133,6 +133,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo '<script src="../styles/'.$this->theme.'/chosen/js/chosen.jquery.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/select2/js/select2.min.js"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/application.js"></script>'."\n";
+		if(isset($this->params['user']) && $this->params['user']) {
+			$this->addFooterJS('checkTasks();');
+		}
 		if($this->footerjs) {
 			$jscode = "$(document).ready(function () {\n";
 			foreach($this->footerjs as $script) {

From e562ad14cd1bd8954a32f383c493449900f1f67c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 10:16:23 +0100
Subject: [PATCH 0681/2006] take out link to network drive

The URL doesn't contain the username anymore
---
 views/bootstrap/class.UsrMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index d843058b2..a54b43831 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -138,7 +138,7 @@ $(document).ready( function() {
 				$session = array_shift($sessions);
 				echo "<tr><td>".getMLText('lastaccess')."</td><td>".getLongReadableDate($session->getLastAccess())."</td></tr>\n";
 			}
-			echo "<tr><td>".getMLText('network_drive')."</td><td><a href=\"http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot.'checkout/'.preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."\">".preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."</a></td></tr>\n";
+			// echo "<tr><td>".getMLText('network_drive')."</td><td><a href=\"http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot.'checkout/'.preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."\">".preg_replace('/[^A-Za-z0-9_-]/', '', $seluser->getLogin())."</a></td></tr>\n";
 			echo "</table>";
 
 			if($user->isAdmin() && $seluser->getID() != $user->getID())

From ba4a6558b418c79258b265278984ffa23aff2f54 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 13:44:19 +0100
Subject: [PATCH 0682/2006] add new document list ReceiveOwner, list docs with
 revision in AppRevOwner

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 34 ++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 8d8fe20f4..65785a018 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1016,7 +1016,7 @@ class SeedDMS_Core_DMS {
 				$queryStr = '';
 			}
 			break; // }}}
-		case 'AppRevOwner': // Documents waiting for review/approval I'm owning {{{
+		case 'AppRevOwner': // Documents waiting for review/approval/revision I'm owning {{{
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1024,7 +1024,7 @@ class SeedDMS_Core_DMS {
 			else
 				$orderdir = 'ASC';
 			$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."' ".
-				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ";
+				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.", ".S_IN_REVISION.") ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
 			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
@@ -1034,6 +1034,36 @@ class SeedDMS_Core_DMS {
 //				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ".
 //				"ORDER BY `statusDate` DESC";
 			break; // }}}
+		case 'ReceiveOwner': // Documents waiting for reception I'm owning {{{
+			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+
+			$qs = 'SELECT DISTINCT documentID FROM `tblDocumentRecipients` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID`';
+			$ra = $this->db->getResultArray($qs);
+			if (is_bool($ra) && !$ra) {
+				return false;
+			}
+			$docs = array();
+			foreach($ra as $d) {
+				$docs[] = $d['documentID'];
+			}
+
+			if ($docs) {
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
+				$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."'";
+				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+				else $queryStr .= "ORDER BY `name`";
+				$queryStr .= " ".$orderdir;
+			} else {
+				$queryStr = '';
+			}
+			break; // }}}
 		case 'RejectOwner': // Documents that has been rejected and I'm owning {{{
 			$user = $param1;
 			$orderby = $param3;

From 520a783407f2412a1e23af1bf4c965def61cfd31 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 13:44:57 +0100
Subject: [PATCH 0683/2006] add list listReceiveOwner(), group lists in
 sections

---
 views/bootstrap/class.MyDocuments.php | 45 +++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index e4b1805a7..f08778eac 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -252,6 +252,36 @@ $(document).ready( function() {
 		}
 	} /* }}} */
 
+	function listReceiveOwner() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
+		$cachedir = $this->params['cachedir'];
+		$showtree = $this->params['showtree'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of documents owned by current user */
+		$resArr = $dms->getDocumentList('ReceiveOwner', $user, false, $orderby, $orderdir);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("documents_user_reception"));
+		if($resArr) {
+			$this->printList($resArr, $previewer, 'listReveiveOwner');
+		}
+		else printMLText("empty_notify_list");
+	} /* }}} */
+
 	function listMyDocs() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -559,12 +589,22 @@ $(document).ready( function() {
 
 		echo '<div class="row-fluid">';
 		echo '<div class="span3">';
+		$this->contentHeading(getMLText("my_documents"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		$resArr = $dms->getDocumentList('MyDocs', $user);
 		echo '<li class=""><a data-href="#all_documents" data-action="listMyDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("all_documents").'</a></li>';
+		$resArr = $dms->getDocumentList('ReceiveOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_reception" data-action="listReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_reception").'</a></li>';
 		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
+			$resArr = $dms->getDocumentList('RejectOwner', $user);
+			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
+		}
+		echo '</ul>';
+		$this->contentHeading(getMLText("tasks"));
+		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
+		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('ReviewByMe', $user);
 			echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>';
 		}
@@ -579,8 +619,9 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
 		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
 		echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
-		$resArr = $dms->getDocumentList('RejectOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
+		echo '</ul>';
+		$this->contentHeading(getMLText("misc"));
+		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		$resArr = $dms->getDocumentList('LockedByMe', $user);
 		echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
 		$resArr = $dms->getDocumentList('CheckedOutByMe', $user);

From c12eed91b3888383ca604ff68be6bf4cf2d7fc43 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 13:45:16 +0100
Subject: [PATCH 0684/2006] add items for 5.1.2

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 60c8fa27e..e3ec217df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@
 --------------------------------------------------------------------------------
 - merge changes up to 5.0.9
 - filter documents by status 'draft' on search page
+- list of documents to look at now contains documents in revision
+- add list of documents waiting for reception on MyDocuments page
+- group document lists on MyDocuments page into three sections
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1

From 3fee35fd3a3da499369677136611220a249b0b3a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 13:54:26 +0100
Subject: [PATCH 0685/2006] fix typo

---
 views/bootstrap/class.MyDocuments.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index f08778eac..0d7ac2868 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -277,7 +277,7 @@ $(document).ready( function() {
 
 		$this->contentHeading(getMLText("documents_user_reception"));
 		if($resArr) {
-			$this->printList($resArr, $previewer, 'listReveiveOwner');
+			$this->printList($resArr, $previewer, 'listReceiveOwner');
 		}
 		else printMLText("empty_notify_list");
 	} /* }}} */

From 56e7f567c788ad7de9988d0f4f65df1521aa3231 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 14:20:33 +0100
Subject: [PATCH 0686/2006] enable turn off of updating document reception

---
 inc/inc.ClassAccessOperation.php       | 15 +++++++++++++++
 inc/inc.ClassSettings.php              |  4 ++++
 op/op.Settings.php                     |  1 +
 views/bootstrap/class.Settings.php     |  4 ++++
 views/bootstrap/class.ViewDocument.php | 10 ++++++----
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index f70e6656d..9270b71b6 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -355,6 +355,21 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if a review maybe edited
+	 *
+	 * A review may only be updated by the user who originaly addedd the
+	 * review and if it is allowed in the settings
+	 */
+	function mayUpdateReceipt($document, $updateUser) { /* {{{ */
+		if(get_class($document) == 'SeedDMS_Core_Document') {
+			if($this->settings->_enableUpdateReceipt && ($updateUser == $this->user) && !$document->hasExpired()) {
+				return true;
+			}
+		}
+		return false;
+	} /* }}} */
+
 	/**
 	 * Check if document content may be revised
 	 *
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 7feb7f8a0..be3efd286 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -143,6 +143,8 @@ class Settings { /* {{{ */
 	var $_enableSelfRevApp = false;
 	// enable/disable update of a review/approval by the reviewer/approver
 	var $_enableUpdateRevApp = false;
+	// enable/disable update of a receipt by the recipient
+	var $_enableUpdateReceipt = false;
 	// enable/disable listing administrator as recipient
 	var $_enableAdminReceipt = false;
 	// enable/disable listing owner as recipient
@@ -596,6 +598,7 @@ class Settings { /* {{{ */
 		$this->_enableUpdateRevApp = Settings::boolval($tab["enableUpdateRevApp"]);
 		$this->_enableAdminReceipt = Settings::boolval($tab["enableAdminReceipt"]);
 		$this->_enableOwnerReceipt = Settings::boolval($tab["enableOwnerReceipt"]);
+		$this->_enableUpdateReceipt = Settings::boolval($tab["enableUpdateReceipt"]);
 		$this->_presetExpirationDate = strval($tab["presetExpirationDate"]);
 		$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]);
 		$this->_versioningFileName = strval($tab["versioningFileName"]);
@@ -898,6 +901,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableUpdateRevApp", $this->_enableUpdateRevApp);
     $this->setXMLAttributValue($node, "enableAdminReceipt", $this->_enableAdminReceipt);
     $this->setXMLAttributValue($node, "enableOwnerReceipt", $this->_enableOwnerReceipt);
+    $this->setXMLAttributValue($node, "enableUpdateReceipt", $this->_enableUpdateReceipt);
     $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);
     $this->setXMLAttributValue($node, "initialDocumentStatus", $this->_initialDocumentStatus);
     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 7238d97db..64b9c0cf6 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -176,6 +176,7 @@ if ($action == "saveSettings")
   $settings->_enableUpdateRevApp = getBoolValue("enableUpdateRevApp");
   $settings->_enableAdminReceipt = getBoolValue("enableAdminReceipt");
   $settings->_enableOwnerReceipt = getBoolValue("enableOwnerReceipt");
+  $settings->_enableUpdateReceipt = getBoolValue("enableUpdateReceipt");
   $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index a08b8a9b7..5bb031e3f 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -666,6 +666,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableOwnerReceipt");?>:</td>
         <td><input name="enableOwnerReceipt" type="checkbox" <?php if ($settings->_enableOwnerReceipt) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableUpdateReceipt_desc");?>">
+        <td><?php printMLText("settings_enableUpdateReceipt");?>:</td>
+        <td><input name="enableUpdateReceipt" type="checkbox" <?php if ($settings->_enableUpdateReceipt) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableVersionDeletion_desc");?>">
         <td><?php printMLText("settings_enableVersionDeletion");?>:</td>
         <td><input name="enableVersionDeletion" type="checkbox" <?php if ($settings->_enableVersionDeletion) echo "checked" ?> /></td>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8112d8e22..abd1a5bc7 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1172,10 +1172,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<td><ul class=\"unstyled\">";
 
 					if($accessop->mayReceipt($document)) {
-						if ($is_recipient && $r["status"]==0) {
-							print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."</li>";
-						}else if (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-							print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+						if ($is_recipient) {
+							if($r["status"]==0) {
+								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."</li>";
+							} elseif ($accessop->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))) {
+								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+							}
 						}
 					}
 

From 24624f6136f349e2095a6adacfff6a63c9e48262 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 15:15:40 +0100
Subject: [PATCH 0687/2006] split printList() in printListHeader(),
 printListFooter() and printList()

---
 views/bootstrap/class.MyDocuments.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 0d7ac2868..53a312d06 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -54,9 +54,7 @@ $(document).ready( function() {
 <?php
 	} /* }}} */
 
-	protected function printList($resArr, $previewer, $order=false) { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
+	protected function printListHeader($resArr, $previewer, $order=false) { /* {{{ */
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
 
@@ -73,7 +71,17 @@ $(document).ready( function() {
 			print "<th>".getMLText("status")."</th>\n";
 		print "<th>".getMLText("action")."</th>\n";
 		print "</tr>\n</thead>\n<tbody>\n";
+	} /* }}} */
 
+	protected function printListFooter() { /* {{{ */
+		echo "</tbody>\n</table>";
+	} /* }}} */
+
+	protected function printList($resArr, $previewer, $order=false) { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$this->printListHeader($resArr, $previewer, $order);
 		$noaccess = 0;
 		foreach ($resArr as $res) {
 			$document = $dms->getDocument($res["id"]);
@@ -90,7 +98,7 @@ $(document).ready( function() {
 				}
 			}
 		}
-		echo "</tbody>\n</table>";
+		$this->printListFooter();
 
 		if($noaccess) {
 			$this->warningMsg(getMLText('list_contains_no_access_docs', array('count'=>$noaccess)));

From 600cd490a4168cef91ec1f74ff3e0967ffae7e1e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 17:31:44 +0100
Subject: [PATCH 0688/2006] first check if document is accessible before
 calling hook documentListRow()

---
 views/bootstrap/class.MyDocuments.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 53a312d06..24b2fd46d 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -87,15 +87,14 @@ $(document).ready( function() {
 			$document = $dms->getDocument($res["id"]);
 			$document->verifyLastestContentExpriry();
 
-			$txt = $this->callHook('documentListItem', $document, $previewer);
-			if(is_string($txt))
-				echo $txt;
-			else {
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+			if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else
 					echo $this->documentListRow($document, $previewer, false, $res['version']);
-				} else {
-					$noaccess++;
-				}
+			} else {
+				$noaccess++;
 			}
 		}
 		$this->printListFooter();

From 14d2a7263b81e8c72642ba32cb7fe9b9a48fdccd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 18:31:06 +0100
Subject: [PATCH 0689/2006] pass all parameters to hook documentListItem,
 remove old code

---
 views/bootstrap/class.MyDocuments.php | 50 +--------------------------
 1 file changed, 1 insertion(+), 49 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 24b2fd46d..00ac681aa 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -88,7 +88,7 @@ $(document).ready( function() {
 			$document->verifyLastestContentExpriry();
 
 			if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-				$txt = $this->callHook('documentListItem', $document, $previewer);
+				$txt = $this->callHook('documentListItem', $document, $previewer, false, $res['version']);
 				if(is_string($txt))
 					echo $txt;
 				else
@@ -128,30 +128,6 @@ $(document).ready( function() {
 		$this->contentHeading(getMLText("documents_to_review"));
 		if($resArr) {
 			$this->printList($resArr, $previewer, 'listReviews');
-			/*
-			print "<table class=\"table table-condensed\">";
-			print "<thead>\n<tr>\n";
-			print "<th></th>\n";
-			print "<th>".getMLText("name")."</th>\n";
-			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("action")."</th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			// List the documents for which a review has been requested.
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				$document->verifyLastestContentExpriry();
-
-				$txt = $this->callHook('documentListItem', $document, $previewer);
-				if(is_string($txt))
-					echo $txt;
-				else {
-					echo $this->documentListRow($document, $previewer, false, $res['version']);
-				}
-			}
-
-			echo "</tbody>\n</table>\n";
-			 */
 		} else {
 			printMLText("no_docs_to_review");
 		}
@@ -181,30 +157,6 @@ $(document).ready( function() {
 		$this->contentHeading(getMLText("documents_to_approve"));
 		if($resArr) {
 			$this->printList($resArr, $previewer, 'listApprovals');
-			/*
-			print "<table class=\"table table-condensed\">";
-			print "<thead>\n<tr>\n";
-			print "<th></th>\n";
-			print "<th>".getMLText("name")."</th>\n";
-			print "<th>".getMLText("status")."</th>\n";
-			print "<th>".getMLText("action")."</th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			// List the documents for which an approval has been requested.
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				$document->verifyLastestContentExpriry();
-
-				$txt = $this->callHook('documentListItem', $document, $previewer);
-				if(is_string($txt))
-					echo $txt;
-				else {
-					echo $this->documentListRow($document, $previewer, false, $res['version']);
-				}
-			}
-
-			echo "</tbody>\n</table>\n";
-			 */
 		} else {
 			printMLText("no_docs_to_approve");
 		}

From 5e93bea2fdc651cf694f0b725520a079a12aa6c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 18:31:44 +0100
Subject: [PATCH 0690/2006] show status of reception if document is owned by
 current user

---
 views/bootstrap/class.Bootstrap.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 52363192d..849e64340 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2154,6 +2154,23 @@ $(document).ready( function() {
 			} else {
 				$content .= getOverallStatusText($status["status"]);
 			}
+			if($owner->getID() == $user->getID() && $receiptStatus = $latestContent->getReceiptStatus()) {
+				$rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0);
+				$allcomments = array();
+				foreach ($receiptStatus as $r) {
+					$rstat[''.$r['status']]++;
+					if($r['comment'])
+						$allcomments[] = $r['comment'];
+				}
+				$totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1'];
+				$content .= ";
+<div class=\"progress\">
+<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '')."</div>
+	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '')."</div>
+</div>";
+				if($allcomments)
+					$content .= implode('<br />', $allcomments);
+			}
 			$content .= "</small></td>";
 //				$content .= "<td>".$version."</td>";
 			$content .= "<td>";

From 1c281b98e8b9987d11ef200b7a1dddd1fa66029f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 18:32:17 +0100
Subject: [PATCH 0691/2006] replace table layout by form controll

---
 views/bootstrap/class.ReceiptDocument.php | 76 +++++++++++------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index e7d285858..7b15b77ed 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -127,16 +127,17 @@ $(document).ready(function() {
 				print "</tr></tbody></table><br>";
 			}
 ?>
-	<form method="post" action="../op/op.ReceiptDocument.php" id="form1" name="form1">
+	<form class="form-horizontal" method="post" action="../op/op.ReceiptDocument.php" id="form1" name="form1">
 	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("comment")?>:</td>
-			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("receipt_status")?></td>
-			<td>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("comment");?>:</label>
+			<div class="controls">
+				<textarea name="comment" cols="80" rows="4"></textarea>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("receipt_status");?>:</label>
+			<div class="controls">
 				<select name="receiptStatus">
 <?php if($receiptStatus['status'] != 1) { ?>
 					<option value='1'><?php printMLText("status_receipted")?></option>
@@ -145,16 +146,14 @@ $(document).ready(function() {
 					<option value='-1'><?php printMLText("rejected")?></option>
 <?php } ?>
 				</select>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><input type='submit' class="btn" name='indReceipt' value='<?php printMLText("submit_receipt")?>'/></td>
-		</tr>
-	</table>
-	<input type='hidden' name='receiptType' value='ind'/>
-	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+			</div>
+		</div>
+		<div class="controls">
+			<input type='submit' class="btn" name='indReceipt' value='<?php printMLText("submit_receipt")?>'/>
+		<div>
+		<input type='hidden' name='receiptType' value='ind'/>
+		<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+		<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 	</form>
 <?php
 		}
@@ -177,16 +176,17 @@ $(document).ready(function() {
 			}
 
 ?>
-	<form method="post" action="../op/op.ReceiptDocument.php" id="form2" name="form2">
+	<form class="form-horizontal" method="post" action="../op/op.ReceiptDocument.php" id="form2" name="form2">
 	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("comment")?>:</td>
-			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("receipt_status")?>:</td>
-			<td>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("comment");?>:</label>
+			<div class="controls">
+				<textarea name="comment" cols="80" rows="4"></textarea>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><?php printMLText("receipt_status");?>:</label>
+			<div class="controls">
 				<select name="receiptStatus">
 <?php if($receiptStatus['status'] != 1) { ?>
 					<option value='1'><?php printMLText("status_receipted")?></option>
@@ -195,17 +195,15 @@ $(document).ready(function() {
 					<option value='-1'><?php printMLText("rejected")?></option>
 <?php } ?>
 				</select>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><input type='submit' class="btn" name='groupReceipt' value='<?php printMLText("submit_receipt")?>'/></td>
-		</tr>
-	</table>
-	<input type='hidden' name='receiptType' value='grp'/>
-	<input type='hidden' name='receiptGroup' value='<?php echo $receiptStatus['required']; ?>'/>
-	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+			</div>
+		</div>
+		<div class="controls">
+			<input type='submit' class="btn" name='groupReceipt' value='<?php printMLText("submit_receipt")?>'/>
+		</div>
+		<input type='hidden' name='receiptType' value='grp'/>
+		<input type='hidden' name='receiptGroup' value='<?php echo $receiptStatus['required']; ?>'/>
+		<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+		<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 	</form>
 <?php
 		}

From b769ae3805e25eab73403d8615dee6db482e18c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2017 20:40:42 +0100
Subject: [PATCH 0692/2006] use popupbox to show comments of document reception

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c9594912f..e353b889b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2169,7 +2169,7 @@ $(document).ready( function() {
 	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '')."</div>
 </div>";
 				if($allcomments)
-					$content .= implode('<br />', $allcomments);
+					$content .= $this->printPopupBox('kkkk', implode('<br />', $allcomments), true);
 			}
 			$content .= "</small></td>";
 //				$content .= "<td>".$version."</td>";

From 4baa37b2d902d3ecb0c10f1914f260ab9aa1d857 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Jan 2017 08:30:11 +0100
Subject: [PATCH 0693/2006] use translated text for comments popupbox

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 17ef148ca..cbba93e53 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2169,7 +2169,7 @@ $(document).ready( function() {
 	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '')."</div>
 </div>";
 				if($allcomments)
-					$content .= $this->printPopupBox('kkkk', implode('<br />', $allcomments), true);
+					$content .= $this->printPopupBox(getMLText('comments'), implode('<br />', $allcomments), true);
 			}
 			$content .= "</small></td>";
 //				$content .= "<td>".$version."</td>";

From e6e14fb37a6a8bce6d6ba1c25c0cd7ad50685cd5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Jan 2017 08:45:27 +0100
Subject: [PATCH 0694/2006] show comments of reception seperated by
 decline/aknowledge

---
 views/bootstrap/class.Bootstrap.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index cbba93e53..d7cf903cb 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2156,20 +2156,18 @@ $(document).ready( function() {
 			}
 			if($owner->getID() == $user->getID() && $receiptStatus = $latestContent->getReceiptStatus()) {
 				$rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0);
-				$allcomments = array();
+				$allcomments = array('-1'=>array(), '1'=>array());
 				foreach ($receiptStatus as $r) {
 					$rstat[''.$r['status']]++;
 					if($r['comment'])
-						$allcomments[] = $r['comment'];
+						$allcomments[''.$r['status']][] = htmlspecialchars($r['comment']);
 				}
 				$totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1'];
 				$content .= ";
 <div class=\"progress\">
-<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '')."</div>
-	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '')."</div>
+<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', $allcomments['1']), true) : "")."</div>
+	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', $allcomments['-1']), true) : "")."</div>
 </div>";
-				if($allcomments)
-					$content .= $this->printPopupBox(getMLText('comments'), implode('<br />', $allcomments), true);
 			}
 			$content .= "</small></td>";
 //				$content .= "<td>".$version."</td>";

From 17b72a9d0c000a1d363fd8ab6d15dd2fbe22cc1d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Jan 2017 08:46:43 +0100
Subject: [PATCH 0695/2006] add entry to 5.1.2

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 87a215088..4988bcb53 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - list of documents to look at now contains documents in revision
 - add list of documents waiting for reception on MyDocuments page
 - group document lists on MyDocuments page into three sections
+- show progressbar and comments for reception of document in documentlist
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1

From 16342981ebd2f6bae17b2e916ba7bae0f88454b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Jan 2017 11:00:38 +0100
Subject: [PATCH 0696/2006] output progressbar only if receipts are available

---
 views/bootstrap/class.Bootstrap.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index d7cf903cb..3d6c6c5e3 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2163,11 +2163,13 @@ $(document).ready( function() {
 						$allcomments[''.$r['status']][] = htmlspecialchars($r['comment']);
 				}
 				$totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1'];
-				$content .= ";
+				if($totalreceipts) {
+					$content .= ";
 <div class=\"progress\">
 <div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', $allcomments['1']), true) : "")."</div>
 	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', $allcomments['-1']), true) : "")."</div>
 </div>";
+				}
 			}
 			$content .= "</small></td>";
 //				$content .= "<td>".$version."</td>";

From 825c4378a0613201d5cd6f1868d4d7356601bb51 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Jan 2017 11:08:17 +0100
Subject: [PATCH 0697/2006] add latest version 5.1.2 which somehow got lost

---
 SeedDMS_Core/package.xml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 4450cf615..287a7fa15 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-11-08</date>
+ <date>2017-01-18</date>
  <time>14:06:06</time>
  <version>
-  <release>5.0.9</release>
-  <api>5.0.9</api>
+  <release>5.1.2</release>
+  <api>5.1.2</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- all changes from 5.0.8 merged
+- all changes from 5.0.9 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1278,6 +1278,22 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - all changes from 4.3.31 merged
 	 </notes>
   </release>
+  <release>
+   <date>2016-11-08</date>
+   <time>14:06:06</time>
+   <version>
+	   <release>5.0.9</release>
+	   <api>5.0.9</api>
+   </version>
+   <stability>
+	   <release>stable</release>
+	   <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 4.3.32 merged
+   </notes>
+  </release>
   <release>
    <date>2016-03-09</date>
    <time>09:28:28</time>

From 6513642efb983c20e74e94da60ed9e028be39ede Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Jan 2017 11:39:29 +0100
Subject: [PATCH 0698/2006] change order of lists in section 'tasks'

has now same order like tasks in the header menu
---
 views/bootstrap/class.MyDocuments.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 00ac681aa..78f844ae2 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -574,10 +574,10 @@ $(document).ready( function() {
 			$resArr = $dms->getDocumentList('WorkflowByMe', $user);
 			echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>';
 		}
-		$resArr = $dms->getDocumentList('ReviseByMe', $user);
-		echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
 		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
 		echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
+		$resArr = $dms->getDocumentList('ReviseByMe', $user);
+		echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
 		echo '</ul>';
 		$this->contentHeading(getMLText("misc"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';

From 39bebbdcf67506f32b48a8bba411373c7e9adf47 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Jan 2017 15:08:25 +0100
Subject: [PATCH 0699/2006] switch to new access restrictions

---
 out/out.EditUserData.php | 12 ++++++++++--
 out/out.GroupView.php    |  7 +++++--
 out/out.ManageNotify.php | 11 +++++++++--
 out/out.UsrView.php      |  7 +++++--
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/out/out.EditUserData.php b/out/out.EditUserData.php
index ed49af30f..26c183c14 100644
--- a/out/out.EditUserData.php
+++ b/out/out.EditUserData.php
@@ -27,6 +27,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("edit_user_details"),getMLText("access_denied"));
 }
@@ -36,9 +40,13 @@ if (!$user->isAdmin() && ($settings->_disableSelfEdit)) {
 }
 
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'enableuserimage'=>$settings->_enableUserImage, 'enablelanguageselector'=>$settings->_enableLanguageSelector, 'enablethemeselector'=>$settings->_enableThemeSelector, 'passwordstrength'=>$settings->_passwordStrength, 'httproot'=>$settings->_httpRoot));
 if($view) {
+	$view->setParam('enableuserimage', $settings->_enableUserImage);
+	$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
+	$view->setParam('enablethemeselector', $settings->_enableThemeSelector);
+	$view->setParam('passwordstrength', $settings->_passwordStrength);
+	$view->setParam('httproot', $settings->_httpRoot);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.GroupView.php b/out/out.GroupView.php
index 940b2dd98..645532b6b 100644
--- a/out/out.GroupView.php
+++ b/out/out.GroupView.php
@@ -25,6 +25,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
 }
@@ -43,11 +47,10 @@ if (is_bool($allGroups)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('allusers', $allUsers);
 	$view->setParam('allgroups', $allGroups);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php
index bc3b0acff..725a2e9ba 100644
--- a/out/out.ManageNotify.php
+++ b/out/out.ManageNotify.php
@@ -25,13 +25,20 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'previewconverters'=>$settings->_converters['preview'], 'timeout'=>$settings->_cmdTimeout));
 if($view) {
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.UsrView.php b/out/out.UsrView.php
index 497716b95..10284b079 100644
--- a/out/out.UsrView.php
+++ b/out/out.UsrView.php
@@ -25,6 +25,10 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
 }
@@ -38,12 +42,11 @@ if (is_bool($users)) {
 	UI::exitError(getMLText("my_account"),getMLText("internal_error"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('allusers', $users);
 	$view->setParam('enableuserimage', $settings->_enableUserImage);
 	$view->setParam('httproot', $settings->_httpRoot);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From db22c3f34838544c5a6fc5fe983077a82e231ce9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2017 14:26:55 +0100
Subject: [PATCH 0700/2006] getReviewersStatus() and getReceiptStatus() only
 return last version

the return lists will no longer include a revision, receipt for version
of a document not being the last version
---
 SeedDMS_Core/Core/inc.ClassUser.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 27d4a19ce..5edd89255 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -1223,6 +1223,9 @@ class SeedDMS_Core_User { /* {{{ */
 		$status = array("indstatus"=>array(), "grpstatus"=>array());
 
 		// See if the user is assigned as an individual reviewer.
+		/* FIXME: See query of getRevisionStatus() because it also restricts on
+		 * latest version. This may be needed here too.
+		 */
 		$queryStr = "SELECT `tblDocumentReviewers`.*, `tblDocumentReviewLog`.`status`, ".
 			"`tblDocumentReviewLog`.`comment`, `tblDocumentReviewLog`.`date`, ".
 			"`tblDocumentReviewLog`.`userID` ".
@@ -1310,6 +1313,9 @@ class SeedDMS_Core_User { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$status = array("indstatus"=>array(), "grpstatus"=>array());
+		/* FIXME: See query of getRevisionStatus() because it also restricts on
+		 * latest version. This may be needed here too.
+		 */
 		$queryStr =
    "SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`status`, ".
 			"`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ".
@@ -1390,15 +1396,22 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$status = array("indstatus"=>array(), "grpstatus"=>array());
 
+		if (!$db->createTemporaryTable("ttcontentid")) {
+			return false;
+		}
 		// See if the user is assigned as an individual recipient.
+		// left join with ttcontentid to restrict result on latest version of document
+		// unless a document and version is given
 		$queryStr = "SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`status`, ".
 			"`tblDocumentReceiptLog`.`comment`, `tblDocumentReceiptLog`.`date`, ".
 			"`tblDocumentReceiptLog`.`userID` ".
 			"FROM `tblDocumentRecipients` ".
 			"LEFT JOIN `tblDocumentReceiptLog` USING (`receiptID`) ".
+			"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID` ".
 			"WHERE `tblDocumentRecipients`.`type`='0' ".
 			($documentID==null ? "" : "AND `tblDocumentRecipients`.`documentID` = '". (int) $documentID ."' ").
 			($version==null ? "" : "AND `tblDocumentRecipients`.`version` = '". (int) $version ."' ").
+			($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` " : "").
 			"AND `tblDocumentRecipients`.`required`='". $this->_id ."' ".
 			"ORDER BY `tblDocumentReceiptLog`.`receiptLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);
@@ -1423,10 +1436,12 @@ class SeedDMS_Core_User { /* {{{ */
 			"`tblDocumentReceiptLog`.`userID` ".
 			"FROM `tblDocumentRecipients` ".
 			"LEFT JOIN `tblDocumentReceiptLog` USING (`receiptID`) ".
+			"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID` ".
 			"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentRecipients`.`required` ".
 			"WHERE `tblDocumentRecipients`.`type`='1' ".
 			($documentID==null ? "" : "AND `tblDocumentRecipients`.`documentID` = '". (int) $documentID ."' ").
 			($version==null ? "" : "AND `tblDocumentRecipients`.`version` = '". (int) $version ."' ").
+			($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` " : "").
 			"AND `tblGroupMembers`.`userID`='". $this->_id ."' ".
 			"ORDER BY `tblDocumentReceiptLog`.`receiptLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);
@@ -1470,15 +1485,22 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$status = array("indstatus"=>array(), "grpstatus"=>array());
 
+		if (!$db->createTemporaryTable("ttcontentid")) {
+			return false;
+		}
 		// See if the user is assigned as an individual revisor.
+		// left join with ttcontentid to restrict result on latest version of document
+		// unless a document and version is given
 		$queryStr = "SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`status`, ".
 			"`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ".
 			"`tblDocumentRevisionLog`.`userID` ".
 			"FROM `tblDocumentRevisors` ".
 			"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
+			"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` AND `ttcontentid`.`document` = `tblDocumentRevisors`.`documentID` ".
 			"WHERE `tblDocumentRevisors`.`type`='0' ".
 			($documentID==null ? "" : "AND `tblDocumentRevisors`.`documentID` = '". (int) $documentID ."' ").
 			($version==null ? "" : "AND `tblDocumentRevisors`.`version` = '". (int) $version ."' ").
+			($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` " : "").
 			"AND `tblDocumentRevisors`.`required`='". $this->_id ."' ".
 			"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);
@@ -1505,10 +1527,12 @@ class SeedDMS_Core_User { /* {{{ */
 			"`tblDocumentRevisionLog`.`userID` ".
 			"FROM `tblDocumentRevisors` ".
 			"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
+			"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` AND `ttcontentid`.`document` = `tblDocumentRevisors`.`documentID` ".
 			"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`groupID` = `tblDocumentRevisors`.`required` ".
 			"WHERE `tblDocumentRevisors`.`type`='1' ".
 			($documentID==null ? "" : "AND `tblDocumentRevisors`.`documentID` = '". (int) $documentID ."' ").
 			($version==null ? "" : "AND `tblDocumentRevisors`.`version` = '". (int) $version ."' ").
+			($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` " : "").
 			"AND `tblGroupMembers`.`userID`='". $this->_id ."' ".
 			"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);

From 4191a8feb775bc22eb23ca4652f902cecdec7656 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2017 14:28:30 +0100
Subject: [PATCH 0701/2006] list protocol of receipts and revisions

---
 .../bootstrap/class.DocumentVersionDetail.php  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index cba50629d..190f90ce1 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -410,6 +410,24 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			}
 ?>
 			</div>
+			<?php if($version->getReceiptStatus()) { ?>
+			<div class="row-fluid">
+			<div class="span12">
+<?php
+				$this->printProtocol($version, 'receipt');
+?>
+			</div>
+			</div>
+			<?php } ?>
+			<?php if($version->getRevisionStatus()) { ?>
+			<div class="row-fluid">
+			<div class="span12">
+<?php
+			$this->printProtocol($version, 'revision');
+?>
+			</div>
+			</div>
+			<?php } ?>
 <?php
 		}
 ?>

From c1e38ec059231f5f718cb56ed53947a73b9aaa44 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2017 14:30:26 +0100
Subject: [PATCH 0702/2006] add note to 5.1.2

---
 SeedDMS_Core/package.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f84c188f3..b68cd9576 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,9 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - all changes from 5.0.9 merged
+- SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus()
+only return entries of the latest document version if not specific document and
+version is passed
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 3c05f5f5cbabaed8a84b2ba0619a8786b550f210 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 23 Jan 2017 07:52:19 +0100
Subject: [PATCH 0703/2006] save array in ext configuration as comma separated
 list

---
 inc/inc.ClassSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index d33e30343..8cda50f58 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -989,7 +989,7 @@ class Settings { /* {{{ */
       $this->setXMLAttributValue($extnode, 'name', $name);
 			foreach($GLOBALS['EXT_CONF'][$name]['config'] as $fieldname=>$conf) {
 				$parameter = $extnode->addChild('parameter');
-				$parameter[0] = isset($extension[$fieldname]) ? $extension[$fieldname] : '';
+				$parameter[0] = isset($extension[$fieldname]) ? (is_array($extension[$fieldname]) ? implode(',', $extension[$fieldname]) : $extension[$fieldname]) : '';
 				$this->setXMLAttributValue($parameter, 'name', $fieldname);
 			}
 

From 4108cf1696bd76a1a03f8ec4d25ab5113ab55ec8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 23 Jan 2017 07:53:01 +0100
Subject: [PATCH 0704/2006] =?UTF-8?q?add=20saving=20list=20of=20users=20an?=
 =?UTF-8?q?d=20group=D1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 out/out.Settings.php               |  5 +++++
 views/bootstrap/class.Settings.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/out/out.Settings.php b/out/out.Settings.php
index 5c081ae45..0aefca5b5 100644
--- a/out/out.Settings.php
+++ b/out/out.Settings.php
@@ -36,9 +36,14 @@ if (!$accessop->check_view_access($view, $_GET)) {
 if(!trim($settings->_encryptionKey))
 	$settings->_encryptionKey = md5(uniqid());
 
+$users = $dms->getAllUsers($settings->_sortUsersInList);
+$groups = $dms->getAllGroups();
+
 if($view) {
 	$view->setParam('settings', $settings);
 	$view->setParam('currenttab', (isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : ''));
+	$view->setParam('allusers', $users);
+	$view->setParam('allgroups', $groups);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 0e36e9693..923a4ec6e 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -85,6 +85,8 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$users = $this->params['allusers'];
+		$groups = $this->params['allgroups'];
 		$settings = $this->params['settings'];
 		$currenttab = $this->params['currenttab'];
 
@@ -818,6 +820,32 @@ if(!is_writeable($settings->_configFilePath)) {
         <input type="checkbox" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" value="1" <?php if(isset($settings->_extensions[$extname][$confkey]) && $settings->_extensions[$extname][$confkey]) echo 'checked'; ?> />
 <?php
 								break;
+							case 'database':
+								switch($conf['table']) {
+								case 'users':
+									if(isset($settings->_extensions[$extname][$confkey]))
+										$selusers = explode(',', $settings->_extensions[$extname][$confkey]);
+									else
+										$selusers = array();
+									echo '<select class="chzn-select" multiple="multiple" name="extensions['.$extname.']['.$confkey.'][]" data-placeholder="'.getMLText('select_users').'">';
+									foreach($users as $user) {
+										echo '<option value="'.$user->getID().'"'.(in_array($user->getID(), $selusers) ? ' selected' : '').'>'.$user->getLogin().'</option>';
+									}
+									echo '</select>';
+									break;
+								case 'groups':
+									if(isset($settings->_extensions[$extname][$confkey]))
+										$selgroups = explode(',', $settings->_extensions[$extname][$confkey]);
+									else
+										$selgroups = array();
+									echo '<select class="chzn-select" multiple="multiple" name="extensions['.$extname.']['.$confkey.'][]" data-placeholder="'.getMLText('select_groups').'">';
+									foreach($groups as $group) {
+										echo '<option value="'.$group->getID().'"'.(in_array($group->getID(), $selgroups) ? ' selected' : '').'>'.$group->getName().'</option>';
+									}
+									echo '</select>';
+									break;
+								}
+								break;
 							default:
 ?>
         <input type="text" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" title="<?php echo isset($conf['help']) ? $conf['help'] : ''; ?>" value="<?php if(isset($settings->_extensions[$extname][$confkey])) echo $settings->_extensions[$extname][$confkey]; ?>" size="<?php echo $conf['size']; ?>" />

From 27247438f50985a7da01040608b0b5cc606893be Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 Jan 2017 14:20:10 +0100
Subject: [PATCH 0705/2006] call new hook finishReviseDocument

---
 controllers/class.ReviseDocument.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php
index 391e8ac14..323ee0784 100644
--- a/controllers/class.ReviseDocument.php
+++ b/controllers/class.ReviseDocument.php
@@ -91,6 +91,8 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 				if ($revisionCT == $revisionTotal) {
 					$newStatus=S_RELEASED;
 					if ($content->finishRevision($user, $newStatus, '', getMLText("automatic_status_update"))) {
+						if(!$this->callHook('finishReviseDocument', $content)) {
+						}
 					}
 				} else {
 					$newStatus=S_IN_REVISION;

From b814b07e2ad15fe91efaa06bc0d8124a47057253 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 Jan 2017 14:20:43 +0100
Subject: [PATCH 0706/2006] reorganize page like MyDocuments page

---
 out/out.ObjectCheck.php               |  58 ++++++
 views/bootstrap/class.ObjectCheck.php | 255 +++++++++++++++++++-------
 2 files changed, 249 insertions(+), 64 deletions(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index 0ce8e839c..f54d6b53e 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -35,6 +35,11 @@ if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
+$listtype = 'listRepair';
+if (isset($_GET["list"])) {
+	$listtype = $_GET['list'];
+}
+
 if(isset($_GET['repair']) && $_GET['repair'] == 1) {
 	$repair = 1;
 } else {
@@ -68,8 +73,60 @@ $nochecksumversions = $dms->getNoChecksumDocumentContent();
 $duplicateversions = $dms->getDuplicateDocumentContent();
 $rootfolder = $dms->getFolder($settings->_rootFolderID);
 
+function repair_tree($dms, $user, $folder, $path=':') { /* {{{ */
+	$objects = array();
+
+	/* Don't do folderlist check for root folder */
+	if($path != ':') {
+		/* If the path contains a folder id twice, the a cyclic relation
+		 * exists.
+		 */
+		$tmparr = explode(':', $path);
+		array_shift($tmparr);
+		if(count($tmparr) != count(array_unique($tmparr))) {
+			$objects[] = array('object'=>$folder, 'msg'=>'Folder path contains cyclic relation');
+		}
+		$folderList = $folder->getFolderList();
+		/* Check the folder */
+		if($folderList != $path) {
+			$objects[] = array('object'=>$folder, 'msg'=>"Folderlist is '".$folderList."', should be '".$path);
+		}
+	}
+
+	$subfolders = $folder->getSubFolders();
+	foreach($subfolders as $subfolder) {
+		$objects = array_merge($objects, repair_tree($dms, $user, $subfolder, $path.$folder->getId().':'));
+	}
+	$path .= $folder->getId().':';
+	$documents = $folder->getDocuments();
+	foreach($documents as $document) {
+		/* Check the folder list of the document */
+		$folderList = $document->getFolderList();
+		if($folderList != $path) {
+			$objects[] = array('object'=>$document, 'msg'=>"Folderlist is '".$folderList."', should be '".$path);
+		}
+
+		/* Check if the content is available */
+		$versions = $document->getContent();
+		if($versions) {
+			foreach($versions as $version) {
+				$filepath = $dms->contentDir . $version->getPath();
+				if(!file_exists($filepath)) {
+					$objects[] = array('object'=>$version, 'msg'=>'Document content is missing');
+				}
+			}
+		} else {
+			$objects[] = array('object'=>$version, 'msg'=>'Document has no content at all');
+		}
+	}
+
+	return $objects;
+} /* }}} */
+$repairobjects = repair_tree($dms, $user, $folder);
+
 if($view) {
 	$view->setParam('folder', $folder);
+	$view->setParam('listtype', $listtype);
 	$view->setParam('unlinkedcontent', $unlinkedversions);
 	$view->setParam('unlinkedfolders', $unlinkedfolders);
 	$view->setParam('unlinkeddocuments', $unlinkeddocuments);
@@ -81,6 +138,7 @@ if($view) {
 	$view->setParam('setchecksum', $setchecksum);
 	$view->setParam('repair', $repair);
 	$view->setParam('rootfolder', $rootfolder);
+	$view->setParam('repairobjects', $repairobjects);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index f95189cb5..c8a23232a 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -31,6 +31,57 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 
+	function _tree($dms, $user, $folder, $path=':') { /* {{{ */
+
+		$objects = array();
+
+		/* Don't do folderlist check for root folder */
+		if($path != ':') {
+			/* If the path contains a folder id twice, the a cyclic relation
+			 * exists.
+			 */
+			$tmparr = explode(':', $path);
+			array_shift($tmparr);
+			if(count($tmparr) != count(array_unique($tmparr))) {
+				$objects[] = array('object'=>$folder, 'msg'=>'Folder path contains cyclic relation');
+			}
+			$folderList = $folder->getFolderList();
+			/* Check the folder */
+			if($folderList != $path) {
+				$objects[] = array('object'=>$folder, 'msg'=>"Folderlist is '".$folderList."', should be '".$path);
+			}
+		}
+
+		$subfolders = $folder->getSubFolders();
+		foreach($subfolders as $subfolder) {
+			$objects = array_merge($objects, $this->_tree($dms, $user, $subfolder, $path.$folder->getId().':'));
+		}
+		$path .= $folder->getId().':';
+		$documents = $folder->getDocuments();
+		foreach($documents as $document) {
+			/* Check the folder list of the document */
+			$folderList = $document->getFolderList();
+			if($folderList != $path) {
+				$objects[] = array('object'=>$document, 'msg'=>"Folderlist is '".$folderList."', should be '".$path);
+			}
+
+			/* Check if the content is available */
+			$versions = $document->getContent();
+			if($versions) {
+				foreach($versions as $version) {
+					$filepath = $dms->contentDir . $version->getPath();
+					if(!file_exists($filepath)) {
+						$objects[] = array('object'=>$version, 'msg'=>'Document content is missing');
+					}
+				}
+			} else {
+				$objects[] = array('object'=>$version, 'msg'=>'Document has no content at all');
+			}
+		}
+
+		return $objects;
+	} /* }}} */
+
 	function tree($dms, $folder, $repair, $path=':', $indent='') { /* {{{ */
 		global $user;
 
@@ -185,65 +236,44 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */
 
-	function js() { /* {{{ */
-		$user = $this->params['user'];
-		$folder = $this->params['folder'];
-
-		header('Content-Type: application/javascript; charset=UTF-8');
-
-		$this->printDeleteFolderButtonJs();
-		$this->printDeleteDocumentButtonJs();
-	} /* }}} */
-
-	function show() { /* {{{ */
+	function listRepair() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
-		$unlinkedversions = $this->params['unlinkedcontent'];
-		$unlinkedfolders = $this->params['unlinkedfolders'];
-		$unlinkeddocuments = $this->params['unlinkeddocuments'];
-		$nofilesizeversions = $this->params['nofilesizeversions'];
-		$nochecksumversions = $this->params['nochecksumversions'];
-		$duplicateversions = $this->params['duplicateversions'];
 		$repair = $this->params['repair'];
-		$unlink = $this->params['unlink'];
-		$setfilesize = $this->params['setfilesize'];
-		$setchecksum = $this->params['setchecksum'];
-		$rootfolder = $this->params['rootfolder'];
-		$this->enableClipboard = $this->params['enableclipboard'];
+		$objects = $this->params['repairobjects'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->contentStart();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("objectcheck"));
 
-		if($repair) {
-			echo "<div class=\"alert\">".getMLText('repairing_objects')."</div>";
-		}
-		$this->contentContainerStart();
-		print "<table class=\"table table-condensed\">";
-		print "<thead>\n<tr>\n";
-		print "<th></th>\n";
-		print "<th>".getMLText("name")."</th>\n";
-		print "<th>".getMLText("owner")."</th>\n";
-		print "<th>".getMLText("error")."</th>\n";
-		print "<th></th>\n";
-		print "</tr>\n</thead>\n<tbody>\n";
-		$this->needsrepair = false;
-		$this->tree($dms, $folder, $repair);
-		print "</tbody></table>\n";
+		if($objects) {
+			if($repair) {
+				echo "<div class=\"alert\">".getMLText('repairing_objects')."</div>";
+			}
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>\n";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("owner")."</th>\n";
+			print "<th>".getMLText("error")."</th>\n";
+			print "<th></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+			$this->needsrepair = false;
+			print "</tbody></table>\n";
 
-		if($this->needsrepair && $repair == 0) {
-			echo '<p><a href="out.ObjectCheck.php?repair=1">'.getMLText('do_object_repair').'</a></p>';
+			if($this->needsrepair && $repair == 0) {
+				echo '<p><a href="out.ObjectCheck.php?repair=1">'.getMLText('do_object_repair').'</a></p>';
+			}
 		}
-		$this->contentContainerEnd();
+	} /* }}} */
 
+	function listUnlinkedFolders() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$unlinkedfolders = $this->params['unlinkedfolders'];
+
+		$this->contentHeading(getMLText("unlinked_folders"));
 		if($unlinkedfolders) {
-			$this->contentHeading(getMLText("unlinked_folders"));
-			$this->contentContainerStart();
 			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
@@ -262,12 +292,17 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 				echo "</tr>";
 			}
 			print "</tbody></table>\n";
-			$this->contentContainerEnd();
 		}
+	} /* }}} */
 
+	function listUnlinkedDocuments() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$unlinkeddocuments = $this->params['unlinkeddocuments'];
+
+		$this->contentHeading(getMLText("unlinked_documents"));
 		if($unlinkeddocuments) {
-			$this->contentHeading(getMLText("unlinked_documents"));
-			$this->contentContainerStart();
 			print "<table class=\"table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
@@ -286,16 +321,22 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 				echo "</tr>";
 			}
 			print "</tbody></table>\n";
-			$this->contentContainerEnd();
 		}
+	} /* }}} */
+
+	function listUnlinkedContent() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$unlinkedcontent = $this->params['unlinkedcontent'];
+		$unlink = $this->params['unlink'];
 
 		$this->contentHeading(getMLText("unlinked_content"));
-		$this->contentContainerStart();
 		if($unlink) {
 			echo "<p>".getMLText('unlinking_objects')."</p>";
 		}
 
-		if($unlinkedversions) {
+		if($unlinkedcontent) {
 			print "<table class=\"table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
@@ -304,7 +345,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			print "<th>".getMLText("mimetype")."</th>\n";
 			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
-			foreach($unlinkedversions as $version) {
+			foreach($unlinkedcontent as $version) {
 				$doc = $version->getDocument();
 				print "<tr><td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td>";
 				if($unlink) {
@@ -318,11 +359,15 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			}
 		}
 
-		$this->contentContainerEnd();
+	} /* }}} */
+
+	function listMissingFileSize() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$nofilesizeversions = $this->params['nofilesizeversions'];
 
 		$this->contentHeading(getMLText("missing_filesize"));
-		$this->contentContainerStart();
-
 		if($nofilesizeversions) {
 			print "<table class=\"table-condensed\">";
 			print "<thead>\n<tr>\n";
@@ -347,10 +392,15 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			}
 		}
 
-		$this->contentContainerEnd();
+	} /* }}} */
+
+	function listMissingChecksum() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$nochecksumversions = $this->params['nochecksumversions'];
 
 		$this->contentHeading(getMLText("missing_checksum"));
-		$this->contentContainerStart();
 
 		if($nochecksumversions) {
 			print "<table class=\"table-condensed\">";
@@ -375,14 +425,18 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 				echo '<p><a href="out.ObjectCheck.php?setchecksum=1">'.getMLText('do_object_setchecksum').'</a></p>';
 			}
 		}
+	} /* }}} */
 
-		$this->contentContainerEnd();
+	function listDuplicateContent() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$duplicateversions = $this->params['duplicateversions'];
 
 		$this->contentHeading(getMLText("duplicate_content"));
-		$this->contentContainerStart();
 
 		if($duplicateversions) {
-			print "<table class=\"table-condensed\">";
+			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
@@ -403,8 +457,81 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			}
 			print "</tbody></table>\n";
 		}
+} /* }}} */
+
+	function js() { /* {{{ */
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+
+		header('Content-Type: application/javascript; charset=UTF-8');
+
+		$this->printDeleteFolderButtonJs();
+		$this->printDeleteDocumentButtonJs();
+?>
+$(document).ready( function() {
+	$('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){
+		ev.preventDefault();
+		$('#kkkk.ajax').data('action', $(this).data('action'));
+		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
+	});
+	$('body').on('click', 'table th a', function(ev){
+		ev.preventDefault();
+		$('#kkkk.ajax').data('action', $(this).data('action'));
+		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby'), orderdir: $(this).data('orderdir')});
+	});
+});
+<?php
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$listtype = $this->params['listtype'];
+		$unlinkedcontent = $this->params['unlinkedcontent'];
+		$unlinkedfolders = $this->params['unlinkedfolders'];
+		$unlinkeddocuments = $this->params['unlinkeddocuments'];
+		$nofilesizeversions = $this->params['nofilesizeversions'];
+		$nochecksumversions = $this->params['nochecksumversions'];
+		$duplicateversions = $this->params['duplicateversions'];
+		$repair = $this->params['repair'];
+		$unlink = $this->params['unlink'];
+		$setfilesize = $this->params['setfilesize'];
+		$setchecksum = $this->params['setchecksum'];
+		$rootfolder = $this->params['rootfolder'];
+		$repairobjects = $this->params['repairobjects'];
+		$this->enableClipboard = $this->params['enableclipboard'];
+
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+
+		echo '<div class="row-fluid">';
+		echo '<div class="span3">';
+		$this->contentHeading(getMLText("object_check_critical"));
+		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
+		echo '<li class=""><a data-href="#all_documents" data-action="listRepair"><span class="badge '.($repairobjects ? 'badge-info ' : '').'badge-right">'.count($repairobjects).'</span>'.getMLText("objectcheck").'</a></li>';
+		echo '<li class=""><a data-href="#unlinked_folders" data-action="listUnlinkedFolders"><span class="badge '.($unlinkedfolders ? 'badge-info ' : '').'badge-right">'.count($unlinkedfolders).'</span>'.getMLText("unlinked_folders").'</a></li>';
+		echo '<li class=""><a data-href="#unlinked_documents" data-action="listUnlinkedDocuments"><span class="badge '.($unlinkeddocuments ? 'badge-info ' : '').'badge-right">'.count($unlinkeddocuments).'</span>'.getMLText("unlinked_documents").'</a></li>';
+		echo '<li class=""><a data-href="#unlinked_content" data-action="listUnlinkedContent"><span class="badge '.($unlinkedcontent ? 'badge-info ' : '').'badge-right">'.count($unlinkedcontent).'</span>'.getMLText("unlinked_content").'</a></li>';
+		echo '<li class=""><a data-href="#missing_filesize" data-action="listMissingFileSize"><span class="badge '.($nofilesizeversions ? 'badge-info ' : '').'badge-right">'.count($nofilesizeversions).'</span>'.getMLText("missing_filesize").'</a></li>';
+		echo '<li class=""><a data-href="#missing_checksum" data-action="listMissingFileSize"><span class="badge '.($nochecksumversions ? 'badge-info ' : '').'badge-right">'.count($nochecksumversions).'</span>'.getMLText("missing_checksum").'</a></li>';
+		echo '</ul>';
+		$this->contentHeading(getMLText("object_check_warning"));
+		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
+		echo '<li class=""><a data-href="#duplicate_content" data-action="listDuplicateContent"><span class="badge '.($duplicateversions ? 'badge-info ' : '').'badge-right">'.count($duplicateversions).'</span>'.getMLText("duplicate_content").'</a></li>';
+		echo '</ul>';
+		echo '</div>';
+		echo '<div class="span9">';
+
+		echo '<div id="kkkk" class="ajax" data-view="ObjectCheck" data-action="'.($listtype ? $listtype : 'listRepair').'"></div>';
+
+		echo '</div>';
+		echo '</div>';
 
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From bbcff75b00b7e8c16cd84938b75eb14a55b4bb42 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 09:52:16 +0100
Subject: [PATCH 0707/2006] create temp table for document revisions

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 47 ++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 19ae61706..95935ca4b 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -88,10 +88,15 @@ class SeedDMS_Core_DatabaseAccess {
 	private $_ttcontentid;
 
 	/**
-	 * @var boolean set to true if temp. table for doc content has been created
+	 * @var boolean set to true if temp. table for doc reception has been created
 	 */
 	private $_ttreceiptid;
 
+	/**
+	 * @var boolean set to true if temp. table for doc revision has been created
+	 */
+	private $_ttrevisionid;
+
 	/**
 	 * @var boolean set to true if in a database transaction
 	 */
@@ -157,6 +162,7 @@ class SeedDMS_Core_DatabaseAccess {
 		$this->_ttstatid = false;
 		$this->_ttcontentid = false;
 		$this->_ttreceiptid = false;
+		$this->_ttrevisionid = false;
 		$this->_debug = false;
 	} /* }}} */
 
@@ -341,7 +347,7 @@ class SeedDMS_Core_DatabaseAccess {
 			}
 			return $this->_ttreviewid;
 		}
-		else if (!strcasecmp($tableName, "ttapproveid")) {
+		elseif (!strcasecmp($tableName, "ttapproveid")) {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` AS ".
@@ -374,7 +380,7 @@ class SeedDMS_Core_DatabaseAccess {
 			}
 			return $this->_ttapproveid;
 		}
-		else if (!strcasecmp($tableName, "ttstatid")) {
+		elseif (!strcasecmp($tableName, "ttstatid")) {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` AS ".
@@ -407,7 +413,7 @@ class SeedDMS_Core_DatabaseAccess {
 			}
 			return $this->_ttstatid;
 		}
-		else if (!strcasecmp($tableName, "ttcontentid")) {
+		elseif (!strcasecmp($tableName, "ttcontentid")) {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE `ttcontentid` AS ".
@@ -473,6 +479,39 @@ class SeedDMS_Core_DatabaseAccess {
 			}
 			return $this->_ttreceiptid;
 		}
+		elseif (!strcasecmp($tableName, "ttrevisionid")) {
+			switch($this->_driver) {
+				case 'sqlite':
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` AS ".
+						"SELECT `tblDocumentRevisionLog`.`revisionID`, ".
+						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentRevisionLog` ".
+						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ".
+						"ORDER BY `maxLogID`";
+				break;
+				default:
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` (PRIMARY KEY (`revisionID`), INDEX (`maxLogID`)) ".
+						"SELECT `tblDocumentRevisionLog`.`revisionID`, ".
+						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentRevisionLog` ".
+						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ".
+						"ORDER BY `maxLogID`";
+			}
+			if (!$this->_ttrevisionid) {
+				if (!$this->getResult($queryStr))
+					return false;
+				$this->_ttrevisionid=true;
+			}
+			else {
+				if (is_bool($override) && $override) {
+					if (!$this->getResult("DELETE FROM `ttrevisionid`"))
+						return false;
+					if (!$this->getResult($queryStr))
+						return false;
+				}
+			}
+			return $this->_ttrevisionid;
+		}
 		return false;
 	} /* }}} */
 

From 761247fe0decdd75f775b97a89ec07b46b17eafc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 09:52:48 +0100
Subject: [PATCH 0708/2006] add new methods getDocumentsInReception() and
 getDocumentsInRevision()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 82e08e329..6f1879dc9 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2726,6 +2726,44 @@ class SeedDMS_Core_DMS {
 		return $transition;
 	} /* }}} */
 
+	/**
+	 * Return all documents waiting for or in reception
+	 *
+	 * This function retrieves all documents and its version which are waiting for
+	 * reception
+	 *
+	 * @return object instance of {@link SeedDMS_Core_DocumentContent} or false
+	 */
+	function getDocumentsInReception() { /* {{{ */
+		if (!$this->db->createTemporaryTable("ttreceiptid") || !$this->db->createTemporaryTable("ttcontentid")) {
+			return false;
+		}
+		$queryStr =
+			"SELECT `tblDocumentRecipients`.* FROM `tblDocumentRecipients` LEFT JOIN `ttreceiptid` ON `tblDocumentRecipients`.`receiptID` = `ttreceiptid`.`receiptID` LEFT JOIN `tblDocumentReceiptLog` ON `ttreceiptid`.`maxLogID` = `tblDocumentReceiptLog`.`receiptLogID` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion`=`tblDocumentRecipients`.`version` AND `ttcontentid`.`document`=`tblDocumentRecipients`.`documentID` WHERE `tblDocumentReceiptLog`.`status`=0 AND `ttcontentid`.`maxVersion` IS NOT NULL";
+		$resArr = $this->db->getResultArray($queryStr);
+
+		return $resArr;
+	} /* }}} */
+
+	/**
+	 * Return all documents waiting for or in revision
+	 *
+	 * This function retrieves all documents and its version which are waiting for
+	 * revision or already in revision
+	 *
+	 * @return object instance of {@link SeedDMS_Core_DocumentContent} or false
+	 */
+	function getDocumentsInRevision() { /* {{{ */
+		if (!$this->db->createTemporaryTable("ttrevisionid") || !$this->db->createTemporaryTable("ttcontentid")) {
+			return false;
+		}
+		$queryStr =
+			"SELECT `tblDocumentRevisors`.* FROM `tblDocumentRevisors` LEFT JOIN `ttrevisionid` ON `tblDocumentRevisors`.`revisionID` = `ttrevisionid`.`revisionID` LEFT JOIN `tblDocumentRevisionLog` ON `ttrevisionid`.`maxLogID` = `tblDocumentRevisionLog`.`revisionLogID` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` AND `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` WHERE `tblDocumentRevisionLog`.`status` in (0, -3) AND `ttcontentid`.`maxVersion` IS NOT NULL";
+		$resArr = $this->db->getResultArray($queryStr);
+
+		return $resArr;
+	} /* }}} */
+
 	/**
 	 * Returns document content which is not linked to a document
 	 *

From 69e1bb66ad9647d77f49eec350b214e35a9b04be Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 09:53:18 +0100
Subject: [PATCH 0709/2006] list documents in revision/reception without access

---
 out/out.ObjectCheck.php               | 36 ++++++++++
 views/bootstrap/class.ObjectCheck.php | 98 +++++++++++++++++++++++++++
 2 files changed, 134 insertions(+)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index f54d6b53e..cd764ad20 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -71,6 +71,36 @@ $unlinkeddocuments = $dms->checkDocuments();
 $nofilesizeversions = $dms->getNoFileSizeDocumentContent();
 $nochecksumversions = $dms->getNoChecksumDocumentContent();
 $duplicateversions = $dms->getDuplicateDocumentContent();
+$tmprevs = $dms->getDocumentsInRevision();
+$docsinrevision = array();
+foreach($tmprevs as $rev) {
+	if($doc = $dms->getDocument($rev['documentID'])) {
+		if($rev['type'] == 0) {
+			$ruser = $dms->getUser($rev['required']);
+			$mode = $doc->getAccessMode($ruser);
+		} elseif($rev['type'] == 1) {
+			$rgroup = $dms->getGroup($rev['required']);
+			$mode = $doc->getGroupAccessMode($rgroup);
+		}
+		if($mode < M_READ)
+			$docsinrevision[] = $doc;
+	}
+}
+$tmprevs = $dms->getDocumentsInReception();
+$docsinreception = array();
+foreach($tmprevs as $rev) {
+	if($doc = $dms->getDocument($rev['documentID'])) {
+		if($rev['type'] == 0) {
+			$ruser = $dms->getUser($rev['required']);
+			$mode = $doc->getAccessMode($ruser);
+		} elseif($rev['type'] == 1) {
+			$rgroup = $dms->getGroup($rev['required']);
+			$mode = $doc->getGroupAccessMode($rgroup);
+		}
+		if($mode < M_READ)
+			$docsinreception[] = $doc;
+	}
+}
 $rootfolder = $dms->getFolder($settings->_rootFolderID);
 
 function repair_tree($dms, $user, $folder, $path=':') { /* {{{ */
@@ -133,12 +163,18 @@ if($view) {
 	$view->setParam('nofilesizeversions', $nofilesizeversions);
 	$view->setParam('nochecksumversions', $nochecksumversions);
 	$view->setParam('duplicateversions', $duplicateversions);
+	$view->setParam('docsinrevision', $docsinrevision);
+	$view->setParam('docsinreception', $docsinreception);
 	$view->setParam('unlink', $unlink);
 	$view->setParam('setfilesize', $setfilesize);
 	$view->setParam('setchecksum', $setchecksum);
 	$view->setParam('repair', $repair);
 	$view->setParam('rootfolder', $rootfolder);
 	$view->setParam('repairobjects', $repairobjects);
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index c8a23232a..a234312d7 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ObjectCheck view
  *
@@ -31,6 +36,55 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 
+	protected function printListHeader($resArr, $previewer, $order=false) { /* {{{ */
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
+
+		print "<table class=\"table table-condensed\">";
+		print "<thead>\n<tr>\n";
+		print "<th></th>\n";
+		if($order)
+			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+		else
+			print "<th>".getMLText("name")."</th>\n";
+		if($order)
+			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+		else
+			print "<th>".getMLText("status")."</th>\n";
+		print "<th>".getMLText("action")."</th>\n";
+		print "</tr>\n</thead>\n<tbody>\n";
+	} /* }}} */
+
+	protected function printListFooter() { /* {{{ */
+		echo "</tbody>\n</table>";
+	} /* }}} */
+
+	protected function printList($resArr, $previewer, $order=false) { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$this->printListHeader($resArr, $previewer, $order);
+		$noaccess = 0;
+		foreach ($resArr as $document) {
+			$document->verifyLastestContentExpriry();
+
+			if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+				$txt = $this->callHook('documentListItem', $document, $previewer, false);
+				if(is_string($txt))
+					echo $txt;
+				else
+					echo $this->documentListRow($document, $previewer, false);
+			} else {
+				$noaccess++;
+			}
+		}
+		$this->printListFooter();
+
+		if($noaccess) {
+			$this->warningMsg(getMLText('list_contains_no_access_docs', array('count'=>$noaccess)));
+		}
+	} /* }}} */
+
 	function _tree($dms, $user, $folder, $path=':') { /* {{{ */
 
 		$objects = array();
@@ -459,6 +513,46 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		}
 } /* }}} */
 
+	function listDocsInRevisionNoAccess() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$docsinrevision = $this->params['docsinrevision'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		$this->contentHeading(getMLText("docs_in_revision_no_access"));
+
+		if($docsinrevision) {
+			$this->printList($docsinrevision, $previewer, 'listDocsInRevisionNoAccess');
+		}
+	} /* }}} */
+
+	function listDocsInReceptionNoAccess() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$docsinreception = $this->params['docsinreception'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		$this->contentHeading(getMLText("docs_in_revision_no_access"));
+
+		if($docsinreception) {
+			$this->printList($docsinreception, $previewer, 'listDocsInReceptionNoAccess');
+		}
+	} /* }}} */
+
 	function js() { /* {{{ */
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
@@ -494,6 +588,8 @@ $(document).ready( function() {
 		$nofilesizeversions = $this->params['nofilesizeversions'];
 		$nochecksumversions = $this->params['nochecksumversions'];
 		$duplicateversions = $this->params['duplicateversions'];
+		$docsinrevision = $this->params['docsinrevision'];
+		$docsinreception = $this->params['docsinreception'];
 		$repair = $this->params['repair'];
 		$unlink = $this->params['unlink'];
 		$setfilesize = $this->params['setfilesize'];
@@ -523,6 +619,8 @@ $(document).ready( function() {
 		$this->contentHeading(getMLText("object_check_warning"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		echo '<li class=""><a data-href="#duplicate_content" data-action="listDuplicateContent"><span class="badge '.($duplicateversions ? 'badge-info ' : '').'badge-right">'.count($duplicateversions).'</span>'.getMLText("duplicate_content").'</a></li>';
+		echo '<li class=""><a data-href="#inrevision_no_access" data-action="listDocsInRevisionNoAccess"><span class="badge '.($docsinrevision ? 'badge-info ' : '').'badge-right">'.count($docsinrevision).'</span>'.getMLText("docs_in_revision_no_access").'</a></li>';
+		echo '<li class=""><a data-href="#inreception_no_access" data-action="listDocsInReceptionNoAccess"><span class="badge '.($docsinreception ? 'badge-info ' : '').'badge-right">'.count($docsinreception).'</span>'.getMLText("docs_in_reception_no_access").'</a></li>';
 		echo '</ul>';
 		echo '</div>';
 		echo '<div class="span9">';

From 86530371f4c436d83e18e266db2b7adfc8f83af1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 09:55:15 +0100
Subject: [PATCH 0710/2006] add changes to 5.1.2

---
 SeedDMS_Core/package.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index b68cd9576..f50417b77 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,6 +28,9 @@
 - SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus()
 only return entries of the latest document version if not specific document and
 version is passed
+- temp. table for revisions can be created
+- new methods SeedDMS_Core_DMS::getDocumentsInReception() and
+SeedDMS_Core_DMS::getDocumentsInRevision()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 2077cd6bcb5786164bc852abab8ae9751aff14d4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 09:56:52 +0100
Subject: [PATCH 0711/2006] add items to 5.1.2

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index aa76d4197..1572e8d29 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,8 @@
 - add list of documents waiting for reception on MyDocuments page
 - group document lists on MyDocuments page into three sections
 - show progressbar and comments for reception of document in documentlist
+- restructure page for document/folder check, add check for missing access
+  on documents by recipient or revisor
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1

From 475239e1ba1c547ce615552e1715fbaa93a0cdbb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 10:43:21 +0100
Subject: [PATCH 0712/2006] turn of sorting in lists

---
 views/bootstrap/class.ObjectCheck.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index a234312d7..61284bae8 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -37,15 +37,15 @@ require_once("SeedDMS/Preview.php");
 class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 
 	protected function printListHeader($resArr, $previewer, $order=false) { /* {{{ */
-		$orderby = $this->params['orderby'];
-		$orderdir = $this->params['orderdir'];
-
 		print "<table class=\"table table-condensed\">";
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";
-		if($order)
+		if($order) {
+			$orderby = $this->params['orderby'];
+			$orderdir = $this->params['orderdir'];
+
 			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
-		else
+		} else
 			print "<th>".getMLText("name")."</th>\n";
 		if($order)
 			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
@@ -529,7 +529,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("docs_in_revision_no_access"));
 
 		if($docsinrevision) {
-			$this->printList($docsinrevision, $previewer, 'listDocsInRevisionNoAccess');
+			$this->printList($docsinrevision, $previewer);
 		}
 	} /* }}} */
 

From 99a83c0d9799f921f108d198d248f746f85c35e5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 10:43:43 +0100
Subject: [PATCH 0713/2006] set showtree in view

---
 out/out.ObjectCheck.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index cd764ad20..a55f48876 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -156,6 +156,7 @@ $repairobjects = repair_tree($dms, $user, $folder);
 
 if($view) {
 	$view->setParam('folder', $folder);
+	$view->setParam('showtree', showtree());
 	$view->setParam('listtype', $listtype);
 	$view->setParam('unlinkedcontent', $unlinkedversions);
 	$view->setParam('unlinkedfolders', $unlinkedfolders);

From ec4712b5bfff0e307b1aa30615e5eebec17f1074 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 11:54:36 +0100
Subject: [PATCH 0714/2006] limit sql statement in
 getDuplicateDocumentContent() to 1000 hits

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 6f1879dc9..c1aecad96 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2846,7 +2846,7 @@ class SeedDMS_Core_DMS {
 	 * in version 4.0.0 of SeedDMS for finding duplicates.
 	 */
 	function getDuplicateDocumentContent() { /* {{{ */
-		$queryStr = "SELECT a.*, b.id as dupid FROM tblDocumentContent a LEFT JOIN tblDocumentContent b ON a.checksum=b.checksum where a.id!=b.id ORDER by a.id";
+		$queryStr = "SELECT a.*, b.id as dupid FROM tblDocumentContent a LEFT JOIN tblDocumentContent b ON a.checksum=b.checksum where a.id!=b.id ORDER by a.id LIMIT 1000";
 		$resArr = $this->db->getResultArray($queryStr);
 		if (!$resArr)
 			return false;

From cf3dba89e015cd17760b3a251f0ad6632ccea61d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 11:55:33 +0100
Subject: [PATCH 0715/2006] add note to 5.1.2

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f50417b77..e0b0694c0 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -31,6 +31,7 @@ version is passed
 - temp. table for revisions can be created
 - new methods SeedDMS_Core_DMS::getDocumentsInReception() and
 SeedDMS_Core_DMS::getDocumentsInRevision()
+- limit hits of sql statement in SeedDMЅ_Core_DMS::getDuplicateDocumentContent() to 1000
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From f4648a70233bc690b9694184ad6a646f3c8cab2d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 11:56:01 +0100
Subject: [PATCH 0716/2006] take out old function tree(), fix listing missing
 checksums

---
 views/bootstrap/class.ObjectCheck.php | 207 +-------------------------
 1 file changed, 1 insertion(+), 206 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 61284bae8..ac74a3cf3 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -85,211 +85,6 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */
 
-	function _tree($dms, $user, $folder, $path=':') { /* {{{ */
-
-		$objects = array();
-
-		/* Don't do folderlist check for root folder */
-		if($path != ':') {
-			/* If the path contains a folder id twice, the a cyclic relation
-			 * exists.
-			 */
-			$tmparr = explode(':', $path);
-			array_shift($tmparr);
-			if(count($tmparr) != count(array_unique($tmparr))) {
-				$objects[] = array('object'=>$folder, 'msg'=>'Folder path contains cyclic relation');
-			}
-			$folderList = $folder->getFolderList();
-			/* Check the folder */
-			if($folderList != $path) {
-				$objects[] = array('object'=>$folder, 'msg'=>"Folderlist is '".$folderList."', should be '".$path);
-			}
-		}
-
-		$subfolders = $folder->getSubFolders();
-		foreach($subfolders as $subfolder) {
-			$objects = array_merge($objects, $this->_tree($dms, $user, $subfolder, $path.$folder->getId().':'));
-		}
-		$path .= $folder->getId().':';
-		$documents = $folder->getDocuments();
-		foreach($documents as $document) {
-			/* Check the folder list of the document */
-			$folderList = $document->getFolderList();
-			if($folderList != $path) {
-				$objects[] = array('object'=>$document, 'msg'=>"Folderlist is '".$folderList."', should be '".$path);
-			}
-
-			/* Check if the content is available */
-			$versions = $document->getContent();
-			if($versions) {
-				foreach($versions as $version) {
-					$filepath = $dms->contentDir . $version->getPath();
-					if(!file_exists($filepath)) {
-						$objects[] = array('object'=>$version, 'msg'=>'Document content is missing');
-					}
-				}
-			} else {
-				$objects[] = array('object'=>$version, 'msg'=>'Document has no content at all');
-			}
-		}
-
-		return $objects;
-	} /* }}} */
-
-	function tree($dms, $folder, $repair, $path=':', $indent='') { /* {{{ */
-		global $user;
-
-		/* Don't do folderlist check for root folder */
-		if($path != ':') {
-			/* If the path contains a folder id twice, the a cyclic relation
-			 * exists.
-			 */
-			$tmparr = explode(':', $path);
-			array_shift($tmparr);
-			if(count($tmparr) != count(array_unique($tmparr))) {
-				print "<tr>\n";
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"../out/images/folder_closed.gif\" width=18 height=18 border=0></a></td>";
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
-				print htmlspecialchars($path);
-				print "</a></td>";
-				
-				$owner = $folder->getOwner();
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>Folder path contains cyclic relation</td>";
-				if($repair) {
-					print "<td><span class=\"success\">".getMLText('repaired')."</span></td>\n";
-				} else {
-					print "<td></td>\n";
-				}
-				print "</tr>\n";
-			}
-			$folderList = $folder->getFolderList();
-			/* Check the folder */
-			if($folderList != $path) {
-				print "<tr>\n";
-				$this->needsrepair = true;
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"../out/images/folder_closed.gif\" width=18 height=18 border=0></a></td>";
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
-				$tmppath = $folder->getPath();
-				for ($i = 1; $i  < count($tmppath); $i++) {
-					print "/".htmlspecialchars($tmppath[$i]->getName());
-				}
-				print "</a></td>";
-				
-				$owner = $folder->getOwner();
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>Folderlist is '".$folderList."', should be '".$path."'</td>";
-				if($repair) {
-					$folder->repair();
-					print "<td><span class=\"success\">".getMLText('repaired')."</span></td>\n";
-				} else {
-					print "<td></td>\n";
-				}
-				print "</tr>\n";
-			}
-		}
-
-		$subfolders = $folder->getSubFolders();
-		foreach($subfolders as $subfolder) {
-			$this->tree($dms, $subfolder, $repair, $path.$folder->getId().':', $indent.'  ');
-		}
-		$path .= $folder->getId().':';
-		$documents = $folder->getDocuments();
-		foreach($documents as $document) {
-			/* Check the folder list of the document */
-			$folderList = $document->getFolderList();
-			if($folderList != $path) {
-				print "<tr>\n";
-				$this->needsrepair = true;
-				$lc = $document->getLatestContent();
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><img class=\"mimeicon\" src=\"../out/images/icons/".$this->getMimeIcon($lc->getFileType())."\" title=\"".$lc->getMimeType()."\"></a></td>";
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
-				$folder = $document->getFolder();
-				$tmppath = $folder->getPath();
-				for ($i = 1; $i  < count($tmppath); $i++) {
-					print htmlspecialchars($tmppath[$i]->getName())."/";
-				}
-				print htmlspecialchars($document->getName());
-				print "</a></td>";
-				$owner = $document->getOwner();
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>Folderlist is '".$folderList."', should be '".$path."'</td>";
-				if($repair) {
-					$document->repair();
-					print "<td><span class=\"success\">".getMLText('repaired')."</span></td>\n";
-				} else {
-					print "<td></td>\n";
-				}
-				print "</tr>\n";
-			}
-
-			/* Check if the content is available */
-			$versions = $document->getContent();
-			if($versions) {
-				foreach($versions as $version) {
-					$filepath = $dms->contentDir . $version->getPath();
-					if(!file_exists($filepath)) {
-					print "<tr>\n";
-					print "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".$version->getMimeType()."\"></a></td>";
-					print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
-					$folder = $document->getFolder();
-					$tmppath = $folder->getPath();
-					for ($i = 1; $i  < count($tmppath); $i++) {
-						print htmlspecialchars($tmppath[$i]->getName())."/";
-					}
-					print htmlspecialchars($document->getName());
-					print "</a></td>";
-					$owner = $document->getOwner();
-					print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-					print "<td>Document content of version ".$version->getVersion()." is missing ('".$path."')</td>";
-					if($repair) {
-						print "<td><span class=\"warning\">Cannot repaired</span></td>\n";
-					} else {
-						print "<td></td>\n";
-					}
-					echo "<td>";
-					echo "<div class=\"list-action\">";
-			if($document->getAccessMode($user) >= M_ALL) {
-				echo $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
-			} else {
-				echo '<span style="padding: 2px; color: #CCC;"><i class="icon-remove"></i></span>';
-			}
-			if($document->getAccessMode($user) >= M_READWRITE) {
-				print '<a href="../out/out.EditDocument.php?documentid='.$document->getID().'" title="'.getMLText("edit_document_props").'"><i class="icon-edit"></i></a>';
-			} else {
-				print '<span style="padding: 2px; color: #CCC;"><i class="icon-edit"></i></span>';
-			}
-			if($document->getAccessMode($user) >= M_READWRITE) {
-				print $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true);
-			}
-			if($this->enableClipboard) {
-				print '<a class="addtoclipboard" rel="D'.$document->getID().'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="icon-copy"></i></a>';
-			}
-					echo "</div>";
-					echo "</td>";
-					print "</tr>\n";
-					}
-				}
-			} else {
-				print "<tr>\n";
-				print "<td></td>\n";
-				print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
-				$folder = $document->getFolder();
-				$tmppath = $folder->getPath();
-				for ($i = 1; $i  < count($tmppath); $i++) {
-					print htmlspecialchars($tmppath[$i]->getName())."/";
-				}
-				print htmlspecialchars($document->getName());
-				print "</a></td>";
-				$owner = $document->getOwner();
-				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>Document has no content! Delete the document manually.</td>";
-				print "</tr>\n";
-			}
-		}
-	} /* }}} */
-
 	function listRepair() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -614,7 +409,7 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#unlinked_documents" data-action="listUnlinkedDocuments"><span class="badge '.($unlinkeddocuments ? 'badge-info ' : '').'badge-right">'.count($unlinkeddocuments).'</span>'.getMLText("unlinked_documents").'</a></li>';
 		echo '<li class=""><a data-href="#unlinked_content" data-action="listUnlinkedContent"><span class="badge '.($unlinkedcontent ? 'badge-info ' : '').'badge-right">'.count($unlinkedcontent).'</span>'.getMLText("unlinked_content").'</a></li>';
 		echo '<li class=""><a data-href="#missing_filesize" data-action="listMissingFileSize"><span class="badge '.($nofilesizeversions ? 'badge-info ' : '').'badge-right">'.count($nofilesizeversions).'</span>'.getMLText("missing_filesize").'</a></li>';
-		echo '<li class=""><a data-href="#missing_checksum" data-action="listMissingFileSize"><span class="badge '.($nochecksumversions ? 'badge-info ' : '').'badge-right">'.count($nochecksumversions).'</span>'.getMLText("missing_checksum").'</a></li>';
+		echo '<li class=""><a data-href="#missing_checksum" data-action="listMissingChecksum"><span class="badge '.($nochecksumversions ? 'badge-info ' : '').'badge-right">'.count($nochecksumversions).'</span>'.getMLText("missing_checksum").'</a></li>';
 		echo '</ul>';
 		$this->contentHeading(getMLText("object_check_warning"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';

From 40956e9501e559e0388f4c2dca7710aabda90cce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 12:24:47 +0100
Subject: [PATCH 0717/2006] =?UTF-8?q?pa=D1=95s=20owner=20to=20controller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/class.AddDocument.php | 3 ++-
 op/op.AddDocument.php             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 4a8948fe3..a4e151f89 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -43,6 +43,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 		$expires = $this->getParam('expires');
 		$keywords = $this->getParam('keywords');
 		$cats = $this->getParam('categories');
+		$owner = $this->getParam('owner');
 		$userfiletmp = $this->getParam('userfiletmp');
 		$userfilename = $this->getParam('userfilename');
 		$filetype = $this->getParam('filetype');
@@ -64,7 +65,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 		$result = $this->callHook('addDocument');
 		if($result === null) {
 			$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
-			$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
+			$res = $folder->addDocument($name, $comment, $expires, $owner, $keywords,
 															$cats, $userfiletmp, basename($userfilename),
 	                            $filetype, $userfiletype, $sequence,
 	                            $reviewers, $approvers, $reqversion,
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index fb3fc8d4f..325733b42 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -367,6 +367,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	$controller->setParam('expires', $expires);
 	$controller->setParam('keywords', $keywords);
 	$controller->setParam('categories', $cats);
+	$controller->setParam('owner', $owner);
 	$controller->setParam('userfiletmp', $userfiletmp);
 	$controller->setParam('userfilename', $userfilename);
 	$controller->setParam('filetype', $fileType);

From b07cd2d44297e46bf5d76bbc11180b201d570750 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 14:48:12 +0100
Subject: [PATCH 0718/2006] fix getRevisionStatus()

it didn't always return the last entry of the revision log
---
 SeedDMS_Core/Core/inc.ClassGroup.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 16cafc9bb..3c8afed0f 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -461,18 +461,24 @@ class SeedDMS_Core_Group { /* {{{ */
 
 		$status = array();
 
+		if (!$db->createTemporaryTable("ttcontentid")) {
+			return false;
+		}
 		// See if the group is assigned as a revisor.
 		$queryStr = "SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`status`, ".
 			"`tblDocumentRevisionLog`.`comment`, `tblDocumentRevisionLog`.`date`, ".
 			"`tblDocumentRevisionLog`.`userID` ".
 			"FROM `tblDocumentRevisors` ".
 			"LEFT JOIN `tblDocumentRevisionLog` USING (`revisionID`) ".
+			"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` AND `ttcontentid`.`document` = `tblDocumentRevisors`.`documentID` ".
 			"WHERE `tblDocumentRevisors`.`type`='1' ".
 			($documentID==null ? "" : "AND `tblDocumentRevisors`.`documentID` = '". (int) $documentID ."' ").
 			($version==null ? "" : "AND `tblDocumentRevisors`.`version` = '". (int) $version ."' ").
-			"AND `tblDocumentRevisors`.`required`='". $this->_id ."' ";
+			($documentID==null && $version==null ? "AND `ttcontentid`.`maxVersion` = `tblDocumentRevisors`.`version` " : "").
+			"AND `tblDocumentRevisors`.`required`='". $this->_id ."' ".
+			"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);
-		if (is_bool($resArr) && $resArr == false)
+		if ($resArr === false)
 			return false;
 		if (count($resArr)>0) {
 			$status['status'] = array();

From c98ff369777abfd5df0668505a5ccea915ac3ff9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 14:49:05 +0100
Subject: [PATCH 0719/2006] minor uncrucial corrections

---
 SeedDMS_Core/Core/inc.ClassUser.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 5edd89255..0369cd2ed 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -1504,9 +1504,10 @@ class SeedDMS_Core_User { /* {{{ */
 			"AND `tblDocumentRevisors`.`required`='". $this->_id ."' ".
 			"ORDER BY `tblDocumentRevisionLog`.`revisionLogID` DESC";
 		$resArr = $db->getResultArray($queryStr);
-		if (is_bool($resArr) && $resArr === false)
+		if ($resArr === false)
 			return false;
 		if (count($resArr)>0) {
+			$status['indstatus'] = array();
 			foreach ($resArr as $res) {
 				if($res['date']) {
 					if(isset($status["indstatus"][$res['documentID']])) {

From 0d5f7a607a0d782631deea21fa85e74e0e9c7725 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 14:49:37 +0100
Subject: [PATCH 0720/2006] finishRevision() puts document version in to
 'waiting'

need to be able to start a new revision
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 936c2e4b9..9379ea3fd 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4805,6 +4805,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		/* Does it make sense to put all revisions into sleeping mode? I guess
 		 * not. If a document was released or rejected the revision are useless
 		 * anyway 
+		 */
 		foreach($revisionStatus as $status) {
 			if($status['status'] != S_LOG_SLEEPING && $status['status'] != S_LOG_USER_REMOVED) {
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
@@ -4819,7 +4820,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				}
 			}
 		}
-		 */
 		if(!$this->setStatus($docstatus, $docmsg, $requestUser)) {
 			$db->rollbackTransaction();
 			return false;

From b90d1a6be5958327ec784af0a33f4561d70c1b70 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 14:51:38 +0100
Subject: [PATCH 0721/2006] pass comment to finishRevision()

---
 controllers/class.ReviseDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php
index 323ee0784..7ed205668 100644
--- a/controllers/class.ReviseDocument.php
+++ b/controllers/class.ReviseDocument.php
@@ -52,7 +52,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 			} elseif ($revisiontype == "grp") {
 				if(0 > $content->setRevision($group, $user, $revisionstatus, $comment)) {
 					$this->error = 1;
-					$this->errormsg = "revision_update_failed";
+					$this->errormsg = $ll."revision_update_failed";
 					return false;
 				}
 			}
@@ -90,7 +90,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 				// then release the document otherwise put it back into revision workflow
 				if ($revisionCT == $revisionTotal) {
 					$newStatus=S_RELEASED;
-					if ($content->finishRevision($user, $newStatus, '', getMLText("automatic_status_update"))) {
+					if ($content->finishRevision($user, $newStatus, 'Finished revision workflow', getMLText("automatic_status_update"))) {
 						if(!$this->callHook('finishReviseDocument', $content)) {
 						}
 					}

From a7ea0743287f7f27c0ead471d2c5cb5ed042c91f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 14:53:23 +0100
Subject: [PATCH 0722/2006] set formtoken in button to sustitute user

---
 views/bootstrap/class.UsrMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index a54b43831..5e2e8b8e5 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -142,7 +142,7 @@ $(document).ready( function() {
 			echo "</table>";
 
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
-				echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."\" class=\"btn btn-primary\">".getMLText("substitute_user")."</a>\n";
+				echo "<a class=\"btn btn-primary\" href=\"../op/op.SubstituteUser.php?userid=".((int) $seluser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
 		}
 	} /* }}} */
 

From 247f27fa548ec4c095ffeac1a1df0f92f6e537fc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 14:58:41 +0100
Subject: [PATCH 0723/2006] add more notes to 5.1.2

---
 SeedDMS_Core/package.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index e0b0694c0..20c3ed153 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -32,6 +32,9 @@ version is passed
 - new methods SeedDMS_Core_DMS::getDocumentsInReception() and
 SeedDMS_Core_DMS::getDocumentsInRevision()
 - limit hits of sql statement in SeedDMЅ_Core_DMS::getDuplicateDocumentContent() to 1000
+- finishRevsion() puts all revisors into state waiting, so a new revision can be started
+- fix SeedDMS_Core_Group::getRevisionStatus(), which did not always return the last
+log entry first
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From efa316dbf8b9f2a1c94f2c11a8cc35079f0b331c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 15:09:51 +0100
Subject: [PATCH 0724/2006] propperly set defaultaccess

---
 controllers/class.AddDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index a4e151f89..14cd6448b 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -60,7 +60,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 		$notificationusers = $this->getParam('notificationusers');
 		$initialdocumentstatus = $this->getParam('initialdocumentstatus');
 		$maxsizeforfulltext = $this->getParam('maxsizeforfulltext');
-		$defaultAccessDocs = $this->getParam('defaultaccessdocs');
+		$defaultaccessdocs = $this->getParam('defaultaccessdocs');
 
 		$result = $this->callHook('addDocument');
 		if($result === null) {

From 94cf01710250e24e9b1d44cb52b09179f6aa2296 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2017 15:11:12 +0100
Subject: [PATCH 0725/2006] add entry to 5.1.2

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1572e8d29..912558317 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - show progressbar and comments for reception of document in documentlist
 - restructure page for document/folder check, add check for missing access
   on documents by recipient or revisor
+- overhaul revision workflow, add hook after revision workflow was finished
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.1

From 7401330e811d8637b87031cc286871dc7db9ee70 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Jan 2017 08:11:04 +0100
Subject: [PATCH 0726/2006] do not set date to 0000:00:00 ... use NULL instead

---
 install/create_tables-innodb.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 3cf592221..e3ccac588 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -937,8 +937,8 @@ CREATE TABLE `tblVersion` (
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1);
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2);
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
-INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
-INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '0000-00-00 00:00:00', 0, 0, 0, NULL);
+INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, NULL, 0, 0, 0, NULL);
+INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, NULL, 0, 0, 0, NULL);
 INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', UNIX_TIMESTAMP(), 1, 0, 2, 0);
 INSERT INTO tblVersion VALUES (NOW(), 5, 1, 0);
 INSERT INTO tblCategory VALUES (0, '');

From f6aded242813525bb803d07bbbf0f249769f5b9c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Feb 2017 12:37:26 +0100
Subject: [PATCH 0727/2006] put backticks around identifiers in sql statements

---
 SeedDMS_Core/Core/inc.ClassDMS.php         |  8 ++---
 SeedDMS_Core/Core/inc.ClassDocument.php    | 34 +++++++++++-----------
 SeedDMS_Core/Core/inc.ClassGroup.php       |  2 +-
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 12 ++++----
 SeedDMS_Core/Core/inc.ClassUser.php        | 30 +++++++++----------
 SeedDMS_Core/Core/inc.ClassWorkflow.php    |  2 +-
 6 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index dab03f541..5db8f27ae 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2003,11 +2003,11 @@ class SeedDMS_Core_DMS {
 			return false;
 		}
 
-		$queryStr = "INSERT INTO tblRoles (name, role) VALUES (".$this->db->qstr($name).", ".$role.")";
+		$queryStr = "INSERT INTO `tblRoles` (`name`, `role`) VALUES (".$this->db->qstr($name).", ".$role.")";
 		if (!$this->db->getResult($queryStr))
 			return false;
 
-		return $this->getRole($this->db->getInsertID());
+		return $this->getRole($this->db->getInsertID('tblRoles'));
 	} /* }}} */
 
 	/**
@@ -2056,11 +2056,11 @@ class SeedDMS_Core_DMS {
 			return false;
 		}
 
-		$queryStr = "INSERT INTO tblTransmittals (name, comment, userID) VALUES (".$this->db->qstr($name).", ".$this->db->qstr($comment).", ".$user->getID().")";
+		$queryStr = "INSERT INTO `tblTransmittals` (`name`, `comment`, `userID`) VALUES (".$this->db->qstr($name).", ".$this->db->qstr($comment).", ".$user->getID().")";
 		if (!$this->db->getResult($queryStr))
 			return false;
 
-		return $this->getTransmittal($this->db->getInsertID());
+		return $this->getTransmittal($this->db->getInsertID('tblTransmittals'));
 	} /* }}} */
 
 	function getKeywordCategory($id) { /* {{{ */
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 3e9dfdcf7..7a7ddb3a0 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -758,7 +758,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function isCheckedOut() { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "SELECT * FROM tblDocumentCheckOuts WHERE document = " . (int) $this->_id;
+		$queryStr = "SELECT * FROM `tblDocumentCheckOuts` WHERE `document` = " . (int) $this->_id;
 		$resArr = $db->getResultArray($queryStr);
 		if ((is_bool($resArr) && $resArr==false) || (count($resArr)==0)) {
 			// Could not find a check out for the selected document.
@@ -778,7 +778,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function getCheckOutInfo() { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "SELECT * FROM tblDocumentCheckOuts WHERE document = " . (int) $this->_id;
+		$queryStr = "SELECT * FROM `tblDocumentCheckOuts` WHERE `document` = " . (int) $this->_id;
 		$resArr = $db->getResultArray($queryStr);
 		if ((is_bool($resArr) && $resArr==false) || (count($resArr)==0)) {
 			// Could not find a check out for the selected document.
@@ -823,7 +823,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$filename = preg_replace('/[^A-Za-z0-9_-]/', '_', $this->getName()).'.'.$oext;
 		}
 		$filename = $checkoutdir.$this->getID().'-'.$lc->getVersion().'-'.$filename; //$lc->getOriginalFileName();
-		$queryStr = "INSERT INTO tblDocumentCheckOuts (document, version, userID, date, filename) VALUES (".$this->_id.", ".$lc->getVersion().", ".$user->getID().", ".$db->getCurrentDatetime().", ".$db->qstr($filename).")";
+		$queryStr = "INSERT INTO `tblDocumentCheckOuts` (`document`, `version`, `userID`, `date`, `filename`) VALUES (".$this->_id.", ".$lc->getVersion().", ".$user->getID().", ".$db->getCurrentDatetime().", ".$db->qstr($filename).")";
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -871,7 +871,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		/* If file doesn't exist anymore, then just remove the record from the db */
 		if(!file_exists($info['filename'])) {
-			$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
+			$queryStr = "DELETE FROM `tblDocumentCheckOuts` WHERE `document` = ".$this->_id;
 			$db->getResult($queryStr);
 			return true;
 		}
@@ -894,7 +894,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				if(!$this->_dms->forceRename) {
 					SeedDMS_Core_File::removeFile($info['filename']);
 				}
-				$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
+				$queryStr = "DELETE FROM `tblDocumentCheckOuts` WHERE `document` = ".$this->_id;
 				$db->getResult($queryStr);
 				return $content;
 			} else {
@@ -902,7 +902,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			}
 		} else {
 			SeedDMS_Core_File::removeFile($info['filename']);
-			$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
+			$queryStr = "DELETE FROM `tblDocumentCheckOuts` WHERE `document` = ".$this->_id;
 			$db->getResult($queryStr);
 			return true;
 		}
@@ -924,7 +924,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if($info) {
 			SeedDMS_Core_File::removeFile($info['filename']);
 
-			$queryStr = "DELETE FROM tblDocumentCheckOuts WHERE document = ".$this->_id;
+			$queryStr = "DELETE FROM `tblDocumentCheckOuts` WHERE `document` = ".$this->_id;
 			$db->getResult($queryStr);
 		}
 
@@ -1864,7 +1864,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function getLatestContent() { /* {{{ */
 		if (!$this->_latestContent) {
 			$db = $this->_dms->getDB();
-			$queryStr = "SELECT * FROM tblDocumentContent WHERE document = ".$this->_id." ORDER BY version DESC";
+			$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." ORDER BY `version` DESC";
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$res)
 				return false;
@@ -2001,7 +2001,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		 * This implmentation is different from the above for removing approvals
 		 * and reviews. It doesn't use getReceiptStatus() but reads the database
 		 */
-		$queryStr = "SELECT * FROM tblDocumentRecipients WHERE documentID = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "SELECT * FROM `tblDocumentRecipients` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
 		$resArr = $db->getResultArray($queryStr);
 		if ((is_bool($resArr) && !$resArr)) {
 			$db->rollbackTransaction();
@@ -2030,7 +2030,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		 * This implmentation is different from the above for removing approvals
 		 * and reviews. It doesn't use getRevisionStatus() but reads the database
 		 */
-		$queryStr = "SELECT * FROM tblDocumentRevisors WHERE documentID = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "SELECT * FROM `tblDocumentRevisors` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
 		$resArr = $db->getResultArray($queryStr);
 		if ((is_bool($resArr) && !$resArr)) {
 			$db->rollbackTransaction();
@@ -2810,11 +2810,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		if(!$date)
-			$queryStr = "UPDATE tblDocumentContent SET revisiondate = null WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
+			$queryStr = "UPDATE `tblDocumentContent` SET `revisiondate` = null WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
 		elseif($date == 'now')
-			$queryStr = "UPDATE tblDocumentContent SET revisiondate = ".$db->getCurrentDatetime()." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
+			$queryStr = "UPDATE `tblDocumentContent` SET `revisiondate` = ".$db->getCurrentDatetime()." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
 		else
-			$queryStr = "UPDATE tblDocumentContent SET revisiondate = ".$db->qstr($date)." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
+			$queryStr = "UPDATE `tblDocumentContent` SET `revisiondate` = ".$db->qstr($date)." WHERE `document` = " . $this->_document->getID() .	" AND `version` = " . $this->_version;
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -3264,7 +3264,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (1 || !isset($this->_reviewStatus)) {
 			/* First get a list of all reviews for this document content */
 			$queryStr=
-				"SELECT reviewID FROM tblDocumentReviewers WHERE `version`='".$this->_version
+				"SELECT `reviewID` FROM `tblDocumentReviewers` WHERE `version`='".$this->_version
 				."' AND `documentID` = '". $this->_document->getID() ."' ";
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
@@ -3520,7 +3520,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (1 || !isset($this->_receiptStatus)) {
 			/* First get a list of all receipts for this document content */
 			$queryStr=
-				"SELECT receiptID FROM tblDocumentRecipients WHERE `version`='".$this->_version
+				"SELECT `receiptID` FROM `tblDocumentRecipients` WHERE `version`='".$this->_version
 				."' AND `documentID` = '". $this->_document->getID() ."' ";
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
@@ -3572,7 +3572,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (1 || !isset($this->_revisionStatus)) {
 			/* First get a list of all revisions for this document content */
 			$queryStr=
-				"SELECT revisionID FROM tblDocumentRevisors WHERE `version`='".$this->_version
+				"SELECT `revisionID` FROM `tblDocumentRevisors` WHERE `version`='".$this->_version
 				."' AND `documentID` = '". $this->_document->getID() ."' ";
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
@@ -4681,7 +4681,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		 * user/group from the list of revisors. The first case should not happen.
 		 */
 		if(count($revisionStatus[$field]) == 0) {
-			$queryStr = "DELETE from tblDocumentRevisors WHERE `documentID` = ". $this->_document->getID() ." AND `version` = ".$this->_version." AND `type` = ". $type ." AND `required` = ".$object->getID();
+			$queryStr = "DELETE from `tblDocumentRevisors` WHERE `documentID` = ". $this->_document->getID() ." AND `version` = ".$this->_version." AND `type` = ". $type ." AND `required` = ".$object->getID();
 			echo $queryStr;
 			if (!$db->getResult($queryStr)) {
 				return -1;
diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 3e0881fe2..cb8329f24 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -175,7 +175,7 @@ class SeedDMS_Core_Group { /* {{{ */
 
 		$queryStr = "SELECT `tblUsers`.* FROM `tblUsers` ".
 			"LEFT JOIN `tblGroupMembers` ON `tblGroupMembers`.`userID`=`tblUsers`.`id` ".
-			"WHERE `tblGroupMembers`.`groupID` = '". $this->_id ."' AND tblGroupMembers.manager = 1";
+			"WHERE `tblGroupMembers`.`groupID` = '". $this->_id ."' AND `tblGroupMembers`.`manager` = 1";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
 			return false;
diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index 6f847f446..82fed0ea7 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -171,7 +171,7 @@ class SeedDMS_Core_Transmittal {
 	function setName($newName) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblTransmittals SET name =".$db->qstr($newName)." WHERE id = " . $this->_id;
+		$queryStr = "UPDATE `tblTransmittals` SET `name` =".$db->qstr($newName)." WHERE `id` = " . $this->_id;
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;
@@ -185,7 +185,7 @@ class SeedDMS_Core_Transmittal {
 	function setComment($newComment) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblTransmittals SET comment =".$db->qstr($newComment)." WHERE id = " . $this->_id;
+		$queryStr = "UPDATE `tblTransmittals` SET `comment` =".$db->qstr($newComment)." WHERE `id` = " . $this->_id;
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;
@@ -263,7 +263,7 @@ class SeedDMS_Core_Transmittal {
 	function remove() { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "DELETE FROM tblTransmittals WHERE id = " . $this->_id;
+		$queryStr = "DELETE FROM `tblTransmittals` WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr)) {
 			return false;
 		}
@@ -326,7 +326,7 @@ class SeedDMS_Core_TransmittalItem {
 
 		$db = $dms->getDB();
 
-		$queryStr = "SELECT * FROM tblTransmittalItems WHERE id = " . (int) $id;
+		$queryStr = "SELECT * FROM `tblTransmittalItems` WHERE `id` = " . (int) $id;
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
 			return false;
@@ -360,7 +360,7 @@ class SeedDMS_Core_TransmittalItem {
 		$db = $this->_dms->getDB();
 		$transmittal = $this->_transmittal;
 
-		$queryStr = "DELETE FROM tblTransmittalItems WHERE id = " . $this->_id;
+		$queryStr = "DELETE FROM `tblTransmittalItems` WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr)) {
 			return false;
 		}
@@ -386,7 +386,7 @@ class SeedDMS_Core_TransmittalItem {
 		$document = $this->_content->getDocument();
 		$latestcontent = $document->getLatestContent();
 		if($latestcontent->getVersion() != $this->_content->getVersion()) {
-			$queryStr = "UPDATE tblTransmittalItems set version = ".$latestcontent->getVersion()." WHERE id = " . $this->_id;
+			$queryStr = "UPDATE `tblTransmittalItems` set `version` = ".$latestcontent->getVersion()." WHERE `id` = " . $this->_id;
 			if (!$db->getResult($queryStr)) {
 				return false;
 			}
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 3bd711b08..52dfe4dc6 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -108,9 +108,9 @@ class SeedDMS_Core_Role { /* {{{ */
 		$db = $dms->getDB();
 
 		if($orderby == 'ame')
-			$queryStr = "SELECT * FROM tblRoles ORDER BY name";
+			$queryStr = "SELECT * FROM `tblRoles` ORDER BY `name`";
 		else
-			$queryStr = "SELECT * FROM tblRoles ORDER BY id";
+			$queryStr = "SELECT * FROM `tblRoles` ORDER BY `id`";
 		$resArr = $db->getResultArray($queryStr);
 
 		if (is_bool($resArr) && $resArr == false)
@@ -138,7 +138,7 @@ class SeedDMS_Core_Role { /* {{{ */
 	function setName($newName) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblRoles SET name =".$db->qstr($newName)." WHERE id = " . $this->_id;
+		$queryStr = "UPDATE `tblRoles` SET `name` =".$db->qstr($newName)." WHERE `id` = " . $this->_id;
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;
@@ -156,7 +156,7 @@ class SeedDMS_Core_Role { /* {{{ */
 	function setRole($newrole) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblRoles SET role = " . $newrole . " WHERE id = " . $this->_id;
+		$queryStr = "UPDATE `tblRoles` SET `role` = " . $newrole . " WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -169,7 +169,7 @@ class SeedDMS_Core_Role { /* {{{ */
 	function setNoAccess($noaccess) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblRoles SET noaccess = " . $db->qstr($noaccess ? implode(',',$noaccess) : '') . " WHERE id = " . $this->_id;
+		$queryStr = "UPDATE `tblRoles` SET `noaccess` = " . $db->qstr($noaccess ? implode(',',$noaccess) : '') . " WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -185,7 +185,7 @@ class SeedDMS_Core_Role { /* {{{ */
 	function remove($user) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "DELETE FROM tblRoles WHERE id = " . $this->_id;
+		$queryStr = "DELETE FROM `tblRoles` WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr)) {
 			return false;
 		}
@@ -196,7 +196,7 @@ class SeedDMS_Core_Role { /* {{{ */
 	function isUsed() { /* {{{ */
 		$db = $this->_dms->getDB();
 		
-		$queryStr = "SELECT * FROM tblUsers WHERE role=".$this->_id;
+		$queryStr = "SELECT * FROM `tblUsers` WHERE `role`=".$this->_id;
 		$resArr = $db->getResultArray($queryStr);
 		if (is_array($resArr) && count($resArr) == 0)
 			return false;
@@ -207,7 +207,7 @@ class SeedDMS_Core_Role { /* {{{ */
 		$db = $this->_dms->getDB();
 		
 		if (!isset($this->_users)) {
-			$queryStr = "SELECT * FROM tblUsers WHERE role=".$this->_id;
+			$queryStr = "SELECT * FROM `tblUsers` WHERE `role`=".$this->_id;
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr == false)
 				return false;
@@ -514,7 +514,7 @@ class SeedDMS_Core_User { /* {{{ */
 	function setSecret($newSecret) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblUsers SET secret =".$db->qstr($newSecret)." WHERE id = " . $this->_id;
+		$queryStr = "UPDATE `tblUsers` SET `secret` =".$db->qstr($newSecret)." WHERE `id` = " . $this->_id;
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;
@@ -1907,12 +1907,12 @@ class SeedDMS_Core_User { /* {{{ */
 		if(get_class($substitute) != $this->_dms->getClassname('user'))
 			return false;
 
-		$queryStr = "SELECT * FROM tblUserSubstitutes WHERE user=" . $this->_id . " AND substitute=".$substitute->getID();
+		$queryStr = "SELECT * FROM `tblUserSubstitutes` WHERE `user`=" . $this->_id . " AND `substitute`=".$substitute->getID();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false) return false;
 		if (count($resArr) == 1) return true;
 
-		$queryStr = "INSERT INTO tblUserSubstitutes (user, substitute) VALUES (" . $this->_id . ", ".$substitute->getID().")";
+		$queryStr = "INSERT INTO `tblUserSubstitutes` (`user`, `substitute`) VALUES (" . $this->_id . ", ".$substitute->getID().")";
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -1931,12 +1931,12 @@ class SeedDMS_Core_User { /* {{{ */
 		if(get_class($substitute) != $this->_dms->getClassname('user'))
 			return false;
 
-		$queryStr = "SELECT * FROM tblUserSubstitutes WHERE user=" . $this->_id . " AND substitute=".$substitute->getID();
+		$queryStr = "SELECT * FROM `tblUserSubstitutes` WHERE `user`=" . $this->_id . " AND `substitute`=".$substitute->getID();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false) return false;
 		if (count($resArr) == 0) return true;
 
-		$queryStr = "DELETE FROM tblUserSubstitutes WHERE user=" . $this->_id . " AND substitute=".$substitute->getID();
+		$queryStr = "DELETE FROM `tblUserSubstitutes` WHERE `user`=" . $this->_id . " AND `substitute`=".$substitute->getID();
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -1955,7 +1955,7 @@ class SeedDMS_Core_User { /* {{{ */
 		if(get_class($substitute) != $this->_dms->getClassname('user'))
 			return false;
 
-		$queryStr = "SELECT * FROM tblUserSubstitutes WHERE user=" . $this->_id . " AND substitute=".$substitute->getID();
+		$queryStr = "SELECT * FROM `tblUserSubstitutes` WHERE `user`=" . $this->_id . " AND `substitute`=".$substitute->getID();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false) return false;
 		if (count($resArr) == 1) return true;
@@ -1983,7 +1983,7 @@ class SeedDMS_Core_User { /* {{{ */
 		if(!$this->isAdmin() && $touser->isAdmin())
 			return false;
 
-		$queryStr = "SELECT * FROM tblUserSubstitutes WHERE substitute=" . $this->_id . " AND user=".$touser->getID();
+		$queryStr = "SELECT * FROM `tblUserSubstitutes` WHERE `substitute`=" . $this->_id . " AND `user`=".$touser->getID();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false) return false;
 		if (count($resArr) == 1) return true;
diff --git a/SeedDMS_Core/Core/inc.ClassWorkflow.php b/SeedDMS_Core/Core/inc.ClassWorkflow.php
index 2d3ee3231..5404f6a67 100644
--- a/SeedDMS_Core/Core/inc.ClassWorkflow.php
+++ b/SeedDMS_Core/Core/inc.ClassWorkflow.php
@@ -111,7 +111,7 @@ class SeedDMS_Core_Workflow { /* {{{ */
 	function setLayoutData($newdata) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "UPDATE tblWorkflows SET layoutdata = ".$db->qstr($newdata)." WHERE id = " . $this->_id;
+		$queryStr = "UPDATE `tblWorkflows` SET `layoutdata` = ".$db->qstr($newdata)." WHERE `id` = " . $this->_id;
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;

From 2b91fb06bc893d2453758700029d9d03db2e1714 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Feb 2017 16:51:57 +0100
Subject: [PATCH 0728/2006] put backticks around identifier

---
 inc/inc.ClassAcl.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index 2ea97a3f8..f96f09ed8 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -56,7 +56,7 @@ class SeedDMS_Acl { /* {{{ */
 
 		while($aco) {
 			$acoid = $aco->getID();
-			$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$acoid;
+			$queryStr = "SELECT * FROM `tblArosAcos` WHERE `aro`=".$aro->getID()." AND `aco`=".$acoid;
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr === false)
 				return false;
@@ -71,7 +71,7 @@ class SeedDMS_Acl { /* {{{ */
 
 	public function toggle($aro, $aco) { /* {{{ */
 		$db = $this->_dms->getDB();
-		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+		$queryStr = "SELECT * FROM `tblArosAcos` WHERE `aro`=".$aro->getID()." AND `aco`=".$aco->getID();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return false;
@@ -80,7 +80,7 @@ class SeedDMS_Acl { /* {{{ */
 		$resArr = $resArr[0];
 
 		$newperm = $resArr['read'] == 1 ? -1 : 1;
-		$queryStr = "UPDATE tblArosAcos SET `read`=".$newperm." WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+		$queryStr = "UPDATE `tblArosAcos` SET `read`=".$newperm." WHERE `aro`=".$aro->getID()." AND `aco`=".$aco->getID();
 		if (!$db->getResult($queryStr))
 			return false;
 		return true;
@@ -89,7 +89,7 @@ class SeedDMS_Acl { /* {{{ */
 
 	public function add($aro, $aco, $perm=-1) { /* {{{ */
 		$db = $this->_dms->getDB();
-		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+		$queryStr = "SELECT * FROM `tblArosAcos` WHERE `aro`=".$aro->getID()." AND `aco`=".$aco->getID();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return false;
@@ -97,11 +97,11 @@ class SeedDMS_Acl { /* {{{ */
 			$resArr = $resArr[0];
 
 			$newperm = $resArr['read'] == 1 ? -1 : 1;
-			$queryStr = "UPDATE tblArosAcos SET `read`=".$newperm." WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+			$queryStr = "UPDATE `tblArosAcos` SET `read`=".$newperm." WHERE `aro`=".$aro->getID()." AND `aco`=".$aco->getID();
 			if (!$db->getResult($queryStr))
 				return false;
 		} else {
-			$queryStr = "INSERT INTO tblArosAcos (`aro`, `aco`, `read`) VALUES (".$aro->getID().", ".$aco->getID().", ".$perm.")";
+			$queryStr = "INSERT INTO `tblArosAcos` (`aro`, `aco`, `read`) VALUES (".$aro->getID().", ".$aco->getID().", ".$perm.")";
 			if (!$db->getResult($queryStr))
 				return false;
 		}
@@ -111,7 +111,7 @@ class SeedDMS_Acl { /* {{{ */
 
 	public function remove($aro, $aco) { /* {{{ */
 		$db = $this->_dms->getDB();
-		$queryStr = "DELETE FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$aco->getID();
+		$queryStr = "DELETE FROM `tblArosAcos` WHERE `aro`=".$aro->getID()." AND `aco`=".$aco->getID();
 		if (!$db->getResult($queryStr))
 			return false;
 		return true;
@@ -213,7 +213,7 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 	public static function getInstance($id, $dms) { /* {{{ */
 		$db = $dms->getDB();
 		if(is_int($id)) {
-			$queryStr = "SELECT * FROM tblAros WHERE id = " . (int) $id;
+			$queryStr = "SELECT * FROM `tblAros` WHERE `id` = " . (int) $id;
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr === false)
 				return null;
@@ -223,16 +223,16 @@ class SeedDMS_Aro extends SeedDMS_AroAco { /* {{{ */
 		} elseif(is_object($id)) {
 			if($dms->getClassname('role') == get_class($id)) {
 				$model = 'Role';
-				$queryStr = "SELECT * FROM tblAros WHERE model=".$db->qstr($model)." AND foreignid=".$id->getID();
+				$queryStr = "SELECT * FROM `tblAros` WHERE `model`=".$db->qstr($model)." AND `foreignid`=".$id->getID();
 				$resArr = $db->getResultArray($queryStr);
 				if (is_bool($resArr) && $resArr === false)
 					return null;
 				if (count($resArr) == 0) {
-					$queryStr = "INSERT INTO tblAros (parent, model, foreignid) VALUES (0, ".$db->qstr($model).", ".$id->getID().")";
+					$queryStr = "INSERT INTO `tblAros` (`parent`, `model`, `foreignid`) VALUES (0, ".$db->qstr($model).", ".$id->getID().")";
 					if (!$db->getResult($queryStr))
 						return null;
 					$id = $db->getInsertID();
-					$queryStr = "SELECT * FROM tblAros WHERE id = " . $id;
+					$queryStr = "SELECT * FROM `tblAros` WHERE `id` = " . $id;
 					$resArr = $db->getResultArray($queryStr);
 				}
 				$resArr = $resArr[0];
@@ -277,7 +277,7 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 	public static function getInstance($id, $dms) { /* {{{ */
 		$db = $dms->getDB();
 		if(is_int($id)) {
-			$queryStr = "SELECT * FROM tblAcos WHERE id = " . (int) $id;
+			$queryStr = "SELECT * FROM `tblAcos` WHERE `id` = " . (int) $id;
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr === false)
 				return null;
@@ -289,18 +289,18 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 			$tmp = explode('/', $id);
 			$parentid = 0;
 			foreach($tmp as $part) {
-				$queryStr = "SELECT * FROM tblAcos WHERE alias = " . $db->qstr($part);
+				$queryStr = "SELECT * FROM `tblAcos` WHERE `alias` = " . $db->qstr($part);
 //				if($parentid)
 				$queryStr .= " AND parent=".$parentid;
 				$resArr = $db->getResultArray($queryStr);
 				if (is_bool($resArr) && $resArr === false)
 					return null;
 				if (count($resArr) == 0) {
-					$queryStr = "INSERT INTO tblAcos (parent, alias, model) VALUES (".$parentid.",".$db->qstr($part).", '')";
+					$queryStr = "INSERT INTO `tblAcos` (`parent`, `alias`, `model`) VALUES (".$parentid.",".$db->qstr($part).", '')";
 					if (!$db->getResult($queryStr))
 						return null;
 					$id = $db->getInsertID();
-					$queryStr = "SELECT * FROM tblAcos WHERE id = " . $id;
+					$queryStr = "SELECT * FROM `tblAcos` WHERE `id` = " . $id;
 					$resArr = $db->getResultArray($queryStr);
 				}
 				$parentid = (int) $resArr[0]['id'];
@@ -326,7 +326,7 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 	public function getChildren() { /* {{{ */
 		$dms = $this->getDMS();
 		$db = $dms->getDB();
-		$queryStr = "SELECT * FROM tblAcos WHERE parent = ".$this->_id." ORDER BY alias";
+		$queryStr = "SELECT * FROM `tblAcos` WHERE `parent` = ".$this->_id." ORDER BY `alias`";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return null;
@@ -347,7 +347,7 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 			return 0;
 		$dms = $this->getDMS();
 		$db = $dms->getDB();
-		$queryStr = "SELECT * FROM tblArosAcos WHERE aro=".$aro->getID()." AND aco=".$this->_id;
+		$queryStr = "SELECT * FROM `tblArosAcos` WHERE `aro`=".$aro->getID()." AND `aco`=".$this->_id;
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return false;
@@ -358,7 +358,7 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 
 	public static function getRoot($dms) { /* {{{ */
 		$db = $dms->getDB();
-		$queryStr = "SELECT * FROM tblAcos WHERE parent = 0 ORDER BY alias";
+		$queryStr = "SELECT * FROM `tblAcos` WHERE `parent` = 0 ORDER BY `alias`";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return null;
@@ -375,7 +375,7 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 	public function getParent() { /* {{{ */
 		$dms = $this->getDMS();
 		$db = $dms->getDB();
-		$queryStr = "SELECT * FROM tblAcos WHERE id = ".$this->_parent;
+		$queryStr = "SELECT * FROM `tblAcos` WHERE `id` = ".$this->_parent;
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr === false)
 			return null;

From e74a9a42958535e56cdae5ba598c2fb28dedf78e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Feb 2017 17:32:22 +0100
Subject: [PATCH 0729/2006] add missing backticks around identifier

---
 SeedDMS_Core/Core/inc.ClassDMS.php         | 2 +-
 SeedDMS_Core/Core/inc.ClassDocument.php    | 2 +-
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index e97ab9534..35a3d7bb4 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1122,7 +1122,7 @@ class SeedDMS_Core_DMS {
 			else
 				$orderdir = 'ASC';
 
-			$qs = 'SELECT document FROM tblDocumentCheckOuts WHERE userID='.$user->getID();
+			$qs = 'SELECT `document` FROM `tblDocumentCheckOuts` WHERE `userID`='.$user->getID();
 			$ra = $this->db->getResultArray($qs);
 			if (is_bool($ra) && !$ra) {
 				return false;
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 78029d256..37578b22b 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3392,7 +3392,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (1 || !isset($this->_approvalStatus)) {
 			/* First get a list of all approvals for this document content */
 			$queryStr=
-				"SELECT approveID FROM `tblDocumentApprovers` WHERE `version`='".$this->_version
+				"SELECT `approveID` FROM `tblDocumentApprovers` WHERE `version`='".$this->_version
 				."' AND `documentID` = '". $this->_document->getID() ."' ";
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index 82fed0ea7..e0bb86674 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -143,7 +143,7 @@ class SeedDMS_Core_Transmittal {
 
 		$queryStr = "SELECT * FROM `tblTransmittals`";
 		if($user)
-			$queryStr .= " WHERE userID = " . $user->getID();
+			$queryStr .= " WHERE `userID` = " . $user->getID();
 
 		$resArr = $db->getResultArray($queryStr);
 

From 7dfbad545133fcf49bf33d1c9abe851d6fe73040 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 16:59:52 +0100
Subject: [PATCH 0730/2006] add missing backticks around identifier in sql
 statement

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index dd140fae1..0b358a405 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1042,7 +1042,7 @@ class SeedDMS_Core_DMS {
 			else
 				$orderdir = 'ASC';
 
-			$qs = 'SELECT DISTINCT documentID FROM `tblDocumentRecipients` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID`';
+			$qs = 'SELECT DISTINCT `documentID` FROM `tblDocumentRecipients` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID`';
 			$ra = $this->db->getResultArray($qs);
 			if (is_bool($ra) && !$ra) {
 				return false;

From c1727652a8c41e25b627c81be98c9ca31a92adaa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 17:59:20 +0100
Subject: [PATCH 0731/2006] make mimeType in tblDocumentContent and
 tblDocumentFiles varchar(100)

---
 install/create_tables-sqlite3.sql | 6 +++---
 install/update-5.1.0/update.sql   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 1bb5be09c..4bb4dea8c 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -130,7 +130,7 @@ CREATE TABLE `tblUserImages` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
   `image` blob NOT NULL,
-  `mimeType` varchar(10) NOT NULL default ''
+  `mimeType` varchar(100) NOT NULL default ''
 ) ;
 
 -- --------------------------------------------------------
@@ -248,7 +248,7 @@ CREATE TABLE `tblDocumentContent` (
   `dir` varchar(255) NOT NULL default '',
   `orgFileName` varchar(150) NOT NULL default '',
   `fileType` varchar(10) NOT NULL default '',
-  `mimeType` varchar(70) NOT NULL default '',
+  `mimeType` varchar(100) NOT NULL default '',
   `fileSize` INTEGER,
   `checksum` char(32),
   `revisiondate` TEXT default NULL,
@@ -299,7 +299,7 @@ CREATE TABLE `tblDocumentFiles` (
   `dir` varchar(255) NOT NULL default '',
   `orgFileName` varchar(150) NOT NULL default '',
   `fileType` varchar(10) NOT NULL default '',
-  `mimeType` varchar(70) NOT NULL default ''
+  `mimeType` varchar(100) NOT NULL default ''
 ) ;
 
 -- --------------------------------------------------------
diff --git a/install/update-5.1.0/update.sql b/install/update-5.1.0/update.sql
index 7a9534665..61f6c904c 100644
--- a/install/update-5.1.0/update.sql
+++ b/install/update-5.1.0/update.sql
@@ -2,6 +2,10 @@ START TRANSACTION;
 
 ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` datetime default NULL;
 
+ALTER TABLE `tblDocumentContent` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
+
+ALTER TABLE `tblDocumentFiles` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
+
 ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL AFTER `pwd`;
 
 ALTER TABLE `tblUsers` CHANGE `pwdExpiration` `pwdExpiration` datetime default NULL;

From 784505ce4c61d4c49ab957d427a20999d64a4117 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Feb 2017 08:48:40 +0100
Subject: [PATCH 0732/2006] change version from 5.1.x to 6.0.x

---
 CHANGELOG | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c8f62c075..6f382a04f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-                     Changes in version 5.1.2
+                     Changes in version 6.0.2
 --------------------------------------------------------------------------------
 - merge changes up to 5.0.9
 - filter documents by status 'draft' on search page
@@ -12,7 +12,7 @@
 - overhaul revision workflow, add hook after revision workflow was finished
 
 --------------------------------------------------------------------------------
-                     Changes in version 5.1.1
+                     Changes in version 6.0.1
 --------------------------------------------------------------------------------
 - merge changes up to 5.0.6
 - add two factor authentication based on google authenticator
@@ -22,7 +22,7 @@
 - put more operations under access control
 
 --------------------------------------------------------------------------------
-                     Changes in version 5.1.0
+                     Changes in version 6.0.0
 --------------------------------------------------------------------------------
 - add receipent list for documents
 - add revision of documents

From 38740e3a8b83d916f75c6dd84fe2dac1ad4904e2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Feb 2017 08:59:02 +0100
Subject: [PATCH 0733/2006] move update dir to new version

---
 install/{update-5.1.0 => update-6.0.x}/update-sqlite3.sql | 0
 install/{update-5.1.0 => update-6.0.x}/update.sql         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename install/{update-5.1.0 => update-6.0.x}/update-sqlite3.sql (100%)
 rename install/{update-5.1.0 => update-6.0.x}/update.sql (100%)

diff --git a/install/update-5.1.0/update-sqlite3.sql b/install/update-6.0.x/update-sqlite3.sql
similarity index 100%
rename from install/update-5.1.0/update-sqlite3.sql
rename to install/update-6.0.x/update-sqlite3.sql
diff --git a/install/update-5.1.0/update.sql b/install/update-6.0.x/update.sql
similarity index 100%
rename from install/update-5.1.0/update.sql
rename to install/update-6.0.x/update.sql

From 455014b2c118635048f9c8ea1355057d62d264fd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Feb 2017 09:05:19 +0100
Subject: [PATCH 0734/2006] fix dir name

---
 install/{update-6.0.x => update-6.0.0}/update-sqlite3.sql | 0
 install/{update-6.0.x => update-6.0.0}/update.sql         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename install/{update-6.0.x => update-6.0.0}/update-sqlite3.sql (100%)
 rename install/{update-6.0.x => update-6.0.0}/update.sql (100%)

diff --git a/install/update-6.0.x/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql
similarity index 100%
rename from install/update-6.0.x/update-sqlite3.sql
rename to install/update-6.0.0/update-sqlite3.sql
diff --git a/install/update-6.0.x/update.sql b/install/update-6.0.0/update.sql
similarity index 100%
rename from install/update-6.0.x/update.sql
rename to install/update-6.0.0/update.sql

From 89b0861f9ec5f8b941ddbc46e8f77299e6f10d81 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Feb 2017 09:11:27 +0100
Subject: [PATCH 0735/2006] move db changes back into version 5.1.0

---
 install/update-6.0.0/update.sql | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index 61f6c904c..6cd84e8d5 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -2,24 +2,8 @@ START TRANSACTION;
 
 ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` datetime default NULL;
 
-ALTER TABLE `tblDocumentContent` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
-
-ALTER TABLE `tblDocumentFiles` CHANGE `mimeType` `mimeType` varchar(100) NOT NULL default '';
-
 ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL AFTER `pwd`;
 
-ALTER TABLE `tblUsers` CHANGE `pwdExpiration` `pwdExpiration` datetime default NULL;
-
-ALTER TABLE `tblUserPasswordRequest` CHANGE `date` `date` datetime NOT NULL;
-
-ALTER TABLE `tblUserPasswordHistory` CHANGE `date` `date` datetime NOT NULL;
-
-ALTER TABLE `tblDocumentApproveLog` CHANGE `date` `date` datetime NOT NULL;
-
-ALTER TABLE `tblDocumentReviewLog` CHANGE `date` `date` datetime NOT NULL;
-
-ALTER TABLE `tblDocumentStatusLog` CHANGE `date` `date` datetime NOT NULL;
-
 ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text default NULL AFTER `initstate`;
 
 CREATE TABLE `tblUserSubstitutes` (

From e1fdfdbef6a260ae97d5a7fcb06a68c9721cd533 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Feb 2017 17:10:47 +0100
Subject: [PATCH 0736/2006] set version to 6.0.0

---
 install/update-6.0.0/update-sqlite3.sql | 2 +-
 install/update-6.0.0/update.sql         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql
index c982e592f..9629b1aeb 100644
--- a/install/update-6.0.0/update-sqlite3.sql
+++ b/install/update-6.0.0/update-sqlite3.sql
@@ -144,6 +144,6 @@ CREATE TABLE `tblArosAcos` (
   UNIQUE (aco, aro)
 ) ;
 
-UPDATE tblVersion set major=5, minor=1, subminor=0;
+UPDATE tblVersion set major=6, minor=0, subminor=0;
 
 COMMIT;
diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index 6cd84e8d5..90ab48f56 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -147,7 +147,7 @@ CREATE TABLE `tblArosAcos` (
   CONSTRAINT `tblArosAcos_aros` FOREIGN KEY (`aro`) REFERENCES `tblAros` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-UPDATE tblVersion set major=5, minor=1, subminor=0;
+UPDATE tblVersion set major=6, minor=0, subminor=0;
 
 COMMIT;
 

From c55b595ae9567aa975cb97ba04f63507ee2d455d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 11 Feb 2017 15:19:36 +0100
Subject: [PATCH 0737/2006] pass tablename to getInsertID(), add pgsql as new
 db driver

---
 SeedDMS_Core/Core/inc.ClassDMS.php      | 16 ++++++------
 SeedDMS_Core/Core/inc.ClassDocument.php | 34 ++++++++++++-------------
 SeedDMS_Core/Core/inc.ClassFolder.php   |  4 +--
 SeedDMS_Core/Core/inc.ClassObject.php   |  5 +++-
 SeedDMS_Core/Core/inc.ClassWorkflow.php |  2 +-
 SeedDMS_Core/Core/inc.DBAccessPDO.php   | 23 ++++++++++++-----
 6 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 0b358a405..fe587fb04 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1870,7 +1870,7 @@ class SeedDMS_Core_DMS {
 		if (!$res)
 			return false;
 
-		$user = $this->getUser($this->db->getInsertID());
+		$user = $this->getUser($this->db->getInsertID('tblUsers'));
 
 		/* Check if 'onPostAddUser' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddUser'])) {
@@ -1932,7 +1932,7 @@ class SeedDMS_Core_DMS {
 		if (!$this->db->getResult($queryStr))
 			return false;
 
-		$group = $this->getGroup($this->db->getInsertID());
+		$group = $this->getGroup($this->db->getInsertID('tblGroups'));
 
 		/* Check if 'onPostAddGroup' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddGroup'])) {
@@ -2125,7 +2125,7 @@ class SeedDMS_Core_DMS {
 		if (!$this->db->getResult($queryStr))
 			return false;
 
-		$category = $this->getKeywordCategory($this->db->getInsertID());
+		$category = $this->getKeywordCategory($this->db->getInsertID('tblKeywordCategories'));
 
 		/* Check if 'onPostAddKeywordCategory' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddKeywordCategory'])) {
@@ -2201,7 +2201,7 @@ class SeedDMS_Core_DMS {
 		if (!$this->db->getResult($queryStr))
 			return false;
 
-		$category = $this->getDocumentCategory($this->db->getInsertID());
+		$category = $this->getDocumentCategory($this->db->getInsertID('tblCategory'));
 
 		/* Check if 'onPostAddDocumentCategory' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddDocumentCategory'])) {
@@ -2400,7 +2400,7 @@ class SeedDMS_Core_DMS {
 		if (!$res)
 			return false;
 
-		return $this->getAttributeDefinition($this->db->getInsertID());
+		return $this->getAttributeDefinition($this->db->getInsertID('tblAttributeDefinitions'));
 	} /* }}} */
 
 	/**
@@ -2501,7 +2501,7 @@ class SeedDMS_Core_DMS {
 		if (!$res)
 			return false;
 
-		return $this->getWorkflow($db->getInsertID());
+		return $this->getWorkflow($db->getInsertID('tblWorkflows'));
 	} /* }}} */
 
 	/**
@@ -2594,7 +2594,7 @@ class SeedDMS_Core_DMS {
 		if (!$res)
 			return false;
 
-		return $this->getWorkflowState($db->getInsertID());
+		return $this->getWorkflowState($db->getInsertID('tblWorkflowStates'));
 	} /* }}} */
 
 	/**
@@ -2684,7 +2684,7 @@ class SeedDMS_Core_DMS {
 		if (!$res)
 			return false;
 
-		return $this->getWorkflowAction($db->getInsertID());
+		return $this->getWorkflowAction($db->getInsertID('tblWorkflowActions'));
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 20e72a082..f2aa93a91 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1586,7 +1586,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
-		$contentID = $db->getInsertID();
+		$contentID = $db->getInsertID('tblDocumentContent');
 
 		// copy file
 		if (!SeedDMS_Core_File::makeDir($this->_dms->contentDir . $dir)) {
@@ -1632,7 +1632,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
-		$statusID = $db->getInsertID();
+		$statusID = $db->getInsertID('tblDocumentStatus', 'statusID');
 
 		if($workflow)
 			$content->setWorkflow($workflow, $user);
@@ -2271,7 +2271,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			"(".$db->qstr($comment).", ".$db->getCurrentTimestamp().", ".$db->qstr($dir).", ".$this->_id.", ".$db->qstr($fileType).", ".$db->qstr($mimeType).", ".$db->qstr($orgFileName).",".$user->getID().",".$db->qstr($name).")";
 		if (!$db->getResult($queryStr)) return false;
 
-		$id = $db->getInsertID();
+		$id = $db->getInsertID('tblDocumentFiles');
 
 		$file = $this->getDocumentFile($id);
 		if (is_bool($file) && !$file) return false;
@@ -3379,7 +3379,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				$db->rollbackTransaction();
 				return false;
 			}
-			$reviewID = $db->getInsertID();
+			$reviewID = $db->getInsertID('tblDocumentReviewers', 'reviewID');
 			$reviewlog = array_reverse($review['logs']);
 			foreach($reviewlog as $log) {
 				if(!SeedDMS_Core_DMS::checkDate($log['date'], 'Y-m-d H:i:s')) {
@@ -3392,7 +3392,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 					$db->rollbackTransaction();
 					return false;
 				}
-				$reviewLogID = $db->getInsertID();
+				$reviewLogID = $db->getInsertID('tblDocumentReviewLog', 'reviewLogID');
 				if(!empty($log['file'])) {
 					SeedDMS_Core_File::copyFile($log['file'], $this->_dms->contentDir . $this->_document->getDir() . 'r' . $reviewLogID);
 				}
@@ -3507,7 +3507,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				$db->rollbackTransaction();
 				return false;
 			}
-			$reviewID = $db->getInsertID();
+			$reviewID = $db->getInsertID('tblDocumentApprovers', 'approveID');
 			$reviewlog = array_reverse($review['logs']);
 			foreach($reviewlog as $log) {
 				if(!SeedDMS_Core_DMS::checkDate($log['date'], 'Y-m-d H:i:s')) {
@@ -3520,7 +3520,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 					$db->rollbackTransaction();
 					return false;
 				}
-				$approveLogID = $db->getInsertID();
+				$approveLogID = $db->getInsertID('tblDocumentApproveLog', 'approveLogID');
 				if(!empty($log['file'])) {
 					SeedDMS_Core_File::copyFile($log['file'], $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID);
 				}
@@ -3667,7 +3667,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if (is_bool($res) && !$res) {
 				return -1;
 			}
-			$reviewID = $db->getInsertID();
+			$reviewID = $db->getInsertID('tblDocumentReviewers', 'reviewID');
 		}
 		else {
 			$reviewID = isset($indstatus["reviewID"]) ? $indstatus["reviewID"] : NULL;
@@ -3725,7 +3725,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if (is_bool($res) && !$res) {
 				return -1;
 			}
-			$reviewID = $db->getInsertID();
+			$reviewID = $db->getInsertID('tblDocumentReviewers', 'reviewID');
 		}
 		else {
 			$reviewID = isset($reviewStatus[0]["reviewID"])?$reviewStatus[0]["reviewID"]:NULL;
@@ -3795,7 +3795,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($res) && !$res)
 			return -1;
 
-		$reviewLogID = $db->getInsertID();
+		$reviewLogID = $db->getInsertID('tblDocumentReviewLog', 'reviewLogID');
 		if($file) {
 			SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'r' . $reviewLogID);
 		}
@@ -3847,7 +3847,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($res) && !$res)
 			return -1;
 		else {
-			$reviewLogID = $db->getInsertID();
+			$reviewLogID = $db->getInsertID('tblDocumentReviewLog', 'reviewLogID');
 			if($file) {
 				SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'r' . $reviewLogID);
 			}
@@ -3887,7 +3887,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if (is_bool($res) && !$res) {
 				return -1;
 			}
-			$approveID = $db->getInsertID();
+			$approveID = $db->getInsertID('tblDocumentApprovers', 'approveID');
 		}
 		else {
 			$approveID = isset($indstatus["approveID"]) ? $indstatus["approveID"] : NULL;
@@ -3900,7 +3900,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return -1;
 		}
 
-		$approveLogID = $db->getInsertID();
+		$approveLogID = $db->getInsertID('tblDocumentApproveLog', 'approveLogID');
 		return $approveLogID;
 	} /* }}} */
 
@@ -3943,7 +3943,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if (is_bool($res) && !$res) {
 				return -1;
 			}
-			$approveID = $db->getInsertID();
+			$approveID = $db->getInsertID('tblDocumentApprovers', 'approveID');
 		}
 		else {
 			$approveID = isset($approvalStatus[0]["approveID"])?$approvalStatus[0]["approveID"]:NULL;
@@ -3959,7 +3959,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		// Add approver to event notification table.
 		//$this->_document->addNotify($groupID, false);
 
-		$approveLogID = $db->getInsertID();
+		$approveLogID = $db->getInsertID('tblDocumentApproveLog', 'approveLogID');
 		return $approveLogID;
 	} /* }}} */
 
@@ -4017,7 +4017,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($res) && !$res)
 			return -1;
 
-		$approveLogID = $db->getInsertID();
+		$approveLogID = $db->getInsertID('tblDocumentApproveLog', 'approveLogID');
 		if($file) {
 			SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID);
 		}
@@ -4061,7 +4061,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($res) && !$res)
 			return -1;
 
-		$approveLogID = $db->getInsertID();
+		$approveLogID = $db->getInsertID('tblDocumentApproveLog', 'approveLogID');
 		if($file) {
 			SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID);
 		}
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index ad1098c31..001899510 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -520,7 +520,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			$db->rollbackTransaction();
 			return false;
 		}
-		$newFolder = $this->_dms->getFolder($db->getInsertID());
+		$newFolder = $this->_dms->getFolder($db->getInsertID('tblFolders'));
 		unset($this->_subFolders);
 
 		if($attributes) {
@@ -827,7 +827,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			return false;
 		}
 
-		$document = $this->_dms->getDocument($db->getInsertID());
+		$document = $this->_dms->getDocument($db->getInsertID('tblDocuments'));
 
 //		if ($version_comment!="")
 			$res = $document->addContent($version_comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers, $reqversion, $version_attributes, $workflow, $initstate);
diff --git a/SeedDMS_Core/Core/inc.ClassObject.php b/SeedDMS_Core/Core/inc.ClassObject.php
index e0cd1cbfb..4a9df2a30 100644
--- a/SeedDMS_Core/Core/inc.ClassObject.php
+++ b/SeedDMS_Core/Core/inc.ClassObject.php
@@ -223,12 +223,15 @@ class SeedDMS_Core_Object { /* {{{ */
 		if(!isset($this->_attributes[$attrdef->getId()])) {
 			switch(get_class($this)) {
 				case $this->_dms->getClassname('document'):
+					$tablename = 'tblDocumentAttributes';
 					$queryStr = "INSERT INTO `tblDocumentAttributes` (`document`, `attrdef`, `value`) VALUES (".$this->_id.", ".$attrdef->getId().", ".$db->qstr($value).")";
 					break;
 				case $this->_dms->getClassname('documentcontent'):
+					$tablename = 'tblDocumentContentAttributes';
 					$queryStr = "INSERT INTO `tblDocumentContentAttributes` (`content`, `attrdef`, `value`) VALUES (".$this->_id.", ".$attrdef->getId().", ".$db->qstr($value).")";
 					break;
 				case $this->_dms->getClassname('folder'):
+					$tablename = 'tblFolderAttributes';
 					$queryStr = "INSERT INTO `tblFolderAttributes` (`folder`, `attrdef`, `value`) VALUES (".$this->_id.", ".$attrdef->getId().", ".$db->qstr($value).")";
 					break;
 				default:
@@ -238,7 +241,7 @@ class SeedDMS_Core_Object { /* {{{ */
 			if (!$res)
 				return false;
 
-			$attr = new SeedDMS_Core_Attribute($db->getInsertID(), $this, $attrdef, $value);
+			$attr = new SeedDMS_Core_Attribute($db->getInsertID($tablename), $this, $attrdef, $value);
 			$attr->setDMS($this->_dms);
 			$this->_attributes[$attrdef->getId()] = $attr;
 			return true;
diff --git a/SeedDMS_Core/Core/inc.ClassWorkflow.php b/SeedDMS_Core/Core/inc.ClassWorkflow.php
index 5404f6a67..e3e5eab0d 100644
--- a/SeedDMS_Core/Core/inc.ClassWorkflow.php
+++ b/SeedDMS_Core/Core/inc.ClassWorkflow.php
@@ -286,7 +286,7 @@ class SeedDMS_Core_Workflow { /* {{{ */
 		 * transitions are added in a row, without reloading the workflow
 		 */
 		$this->_transitions = array();
-		$transition = $this->getTransition($db->getInsertID());
+		$transition = $this->getTransition($db->getInsertID('tblWorkflowTransitions'));
 
 		foreach($users as $user) {
 			$queryStr = "INSERT INTO `tblWorkflowTransitionUsers` (`transition`, `userid`) VALUES (".$transition->getID().", ".$user->getID().")";
diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 18f64c2de..213199927 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -176,6 +176,7 @@ class SeedDMS_Core_DatabaseAccess {
 			case 'mysql':
 			case 'mysqli':
 			case 'mysqlnd':
+			case 'pgsql':
 				$dsn = $this->_driver.":dbname=".$this->_database.";host=".$this->_hostname;
 				if($this->_port)
 					$dsn .= ";port=".$this->_port;
@@ -234,7 +235,7 @@ class SeedDMS_Core_DatabaseAccess {
 	 * @return string sanitized string
 	 */
 	function rbt($text) { /* {{{ */
-		return str_replace('`', '"');
+		return str_replace('`', '"', $text);
 	} /* }}} */
 
 	/**
@@ -245,9 +246,12 @@ class SeedDMS_Core_DatabaseAccess {
 	 * @param string $queryStr sql query
 	 * @return array/boolean data if query could be executed otherwise false
 	 */
-	function getResultArray($queryStr) { /* {{{ */
+	function getResultArray($queryStr, $retick=true) { /* {{{ */
 		$resArr = array();
 		
+		if($retick && $this->_driver == 'pgsql') {
+			$queryStr = $this->rbt($queryStr);
+		}
 		$res = $this->_conn->query($queryStr);
 		if ($res === false) {
 			if($this->_debug)
@@ -265,11 +269,13 @@ class SeedDMS_Core_DatabaseAccess {
 	 * Call this function only with sql query which do not return data records.
 	 *
 	 * @param string $queryStr sql query
-	 * @param boolean $silent not used anymore. This was used when this method
-	 *        still issued an error message
+	 * @param boolean $retick replace all '`' by '"'
 	 * @return boolean true if query could be executed otherwise false
 	 */
-	function getResult($queryStr, $silent=false) { /* {{{ */
+	function getResult($queryStr, $retick=true) { /* {{{ */
+		if($retick && $this->_driver == 'pgsql') {
+			$queryStr = $this->rbt($queryStr);
+		}
 		$res = $this->_conn->exec($queryStr);
 		if($res === false) {
 			if($this->_debug)
@@ -307,8 +313,11 @@ class SeedDMS_Core_DatabaseAccess {
 	 *
 	 * @return integer id used in last autoincrement
 	 */
-	function getInsertID() { /* {{{ */
-		return $this->_conn->lastInsertId();
+	function getInsertID($tablename='', $fieldname='id') { /* {{{ */
+		if($this->_driver == 'pgsql')
+			return $this->_conn->lastInsertId($tablename.'_'.$fieldname.'_seq');
+		else
+			return $this->_conn->lastInsertId();
 	} /* }}} */
 
 	function getErrorMsg() { /* {{{ */

From 0239edd4eef297a1956caa244e3857d5fd8a9214 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Feb 2017 09:23:12 +0100
Subject: [PATCH 0738/2006] adjust date function to postgresql

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 213199927..d12e723ad 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -549,6 +549,16 @@ class SeedDMS_Core_DatabaseAccess {
 			case 'sqlite':
 				return "strftime(".$this->qstr($format).", `".$fieldname."`, 'unixepoch')";
 				break;
+			case 'pgsql':
+				switch($format) {
+				case '%Y-%m':
+					return "to_char(to_timestamp(`".$fieldname."`), 'YYYY-MM')";
+					break;
+				default:
+					return "to_char(to_timestamp(`".$fieldname."`), 'YYYY-MM-DD')";
+					break;
+				}
+				break;
 		}
 		return '';
 	} /* }}} */
@@ -567,6 +577,9 @@ class SeedDMS_Core_DatabaseAccess {
 			case 'sqlite':
 				return "datetime('now', 'localtime')";
 				break;
+			case 'pgsql':
+				return "now()";
+				break;
 		}
 		return '';
 	} /* }}} */
@@ -584,6 +597,9 @@ class SeedDMS_Core_DatabaseAccess {
 			case 'sqlite':
 				return "strftime('%s', 'now')";
 				break;
+			case 'pgsql':
+				return "date_part('epoch',CURRENT_TIMESTAMP)::int";
+				break;
 		}
 		return '';
 	} /* }}} */

From cafdd457c86669273dfcc42acb0347301528d298 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Feb 2017 15:43:25 +0100
Subject: [PATCH 0739/2006] pass tablename to getInsertID()

---
 SeedDMS_Core/Core/inc.ClassDocument.php    | 12 ++++++------
 SeedDMS_Core/Core/inc.ClassTransmittal.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index f2aa93a91..fdcb37135 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4100,7 +4100,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if (is_bool($res) && !$res) {
 				return -1;
 			}
-			$receiptID = $db->getInsertID();
+			$receiptID = $db->getInsertID('tblDocumentRecipients', 'receiptID');
 		}
 		else {
 			$receiptID = isset($indstatus["receiptID"]) ? $indstatus["receiptID"] : NULL;
@@ -4162,7 +4162,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if (is_bool($res) && !$res) {
 				return -1;
 			}
-			$receiptID = $db->getInsertID();
+			$receiptID = $db->getInsertID('tblDocumentRecipients', 'receiptID');
 		}
 		else {
 			$receiptID = isset($status["receiptID"]) ? $status["receiptID"] : NULL;
@@ -4250,7 +4250,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if (is_bool($res) && !$res) {
 				return -1;
 			}
-			$revisionID = $db->getInsertID();
+			$revisionID = $db->getInsertID('tblDocumentRevisors', 'revisionID');
 		} else {
 			$revisionID = isset($indstatus["revisionID"]) ? $indstatus["revisionID"] : NULL;
 		}
@@ -4328,7 +4328,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($res) && !$res)
 			return -1;
 		else {
-			$receiptLogID = $db->getInsertID();
+			$receiptLogID = $db->getInsertID('tblDocumentReceiptLog', 'receiptLogID');
 			return $receiptLogID;
 		}
  } /* }}} */
@@ -4377,7 +4377,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($res) && !$res)
 			return -1;
 		else {
-			$receiptLogID = $db->getInsertID();
+			$receiptLogID = $db->getInsertID('tblDocumentReceiptLog', 'receiptLogID');
 			return $receiptLogID;
 		}
  } /* }}} */
@@ -4459,7 +4459,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($res) && !$res)
 			return -1;
 		else {
-			$revisionLogID = $db->getInsertID();
+			$revisionLogID = $db->getInsertID('tblDocumentRevisionLog', 'revisionLogID');
 			return $revisionLogID;
 		}
  } /* }}} */
diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index e0bb86674..cd63cfbe0 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -255,7 +255,7 @@ class SeedDMS_Core_Transmittal {
 		if(!$res) {
 			return false;
 		}
-		$itemID = $db->getInsertID();
+		$itemID = $db->getInsertID('tblTransmittalItems');
 
 		return SeedDMS_Core_TransmittalItem::getInstance($itemID, $this->_dms);
 	} /* }}} */

From 7467df155dc4a3a3d1096224e1eef55df7554ed5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Feb 2017 17:30:25 +0100
Subject: [PATCH 0740/2006] fix getInsertID() for identifier in upper/lower
 case

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index d12e723ad..dbd28de73 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -314,9 +314,9 @@ class SeedDMS_Core_DatabaseAccess {
 	 * @return integer id used in last autoincrement
 	 */
 	function getInsertID($tablename='', $fieldname='id') { /* {{{ */
-		if($this->_driver == 'pgsql')
-			return $this->_conn->lastInsertId($tablename.'_'.$fieldname.'_seq');
-		else
+		if($this->_driver == 'pgsql') {
+			return $this->_conn->lastInsertId('"'.$tablename.'_'.$fieldname.'_seq"');
+		} else
 			return $this->_conn->lastInsertId();
 	} /* }}} */
 

From e0f7c16a1075180082a4adefe98c1f61511c21af Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Feb 2017 20:09:43 +0100
Subject: [PATCH 0741/2006] add database layout for postgres

---
 install/create_tables-postgres.sql | 624 +++++++++++++++++++++++++++++
 1 file changed, 624 insertions(+)
 create mode 100644 install/create_tables-postgres.sql

diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
new file mode 100644
index 000000000..467f62f8e
--- /dev/null
+++ b/install/create_tables-postgres.sql
@@ -0,0 +1,624 @@
+-- 
+-- Table structure for table "tblACLs"
+-- 
+
+CREATE TABLE "tblACLs" (
+  "id" SERIAL UNIQUE,
+  "target" INTEGER NOT NULL default '0',
+  "targetType" INTEGER NOT NULL default '0',
+  "userID" INTEGER NOT NULL default '-1',
+  "groupID" INTEGER NOT NULL default '-1',
+  "mode" INTEGER NOT NULL default '0'
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblCategory"
+-- 
+
+CREATE TABLE "tblCategory" (
+  "id" SERIAL UNIQUE,
+  "name" text NOT NULL
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblAttributeDefinitions"
+-- 
+
+CREATE TABLE "tblAttributeDefinitions" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(100) default NULL,
+  "objtype" INTEGER NOT NULL default '0',
+  "type" INTEGER NOT NULL default '0',
+  "multiple" INTEGER NOT NULL default '0',
+  "minvalues" INTEGER NOT NULL default '0',
+  "maxvalues" INTEGER NOT NULL default '0',
+  "valueset" TEXT default NULL,
+  "regex" TEXT DEFAULT NULL,
+  UNIQUE("name")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblUsers"
+-- 
+
+CREATE TABLE "tblUsers" (
+  "id" SERIAL UNIQUE,
+  "login" varchar(50) default NULL,
+  "pwd" varchar(50) default NULL,
+  "fullName" varchar(100) default NULL,
+  "email" varchar(70) default NULL,
+  "language" varchar(32) NOT NULL,
+  "theme" varchar(32) NOT NULL,
+  "comment" text NOT NULL,
+  "role" INTEGER NOT NULL default '0',
+  "hidden" INTEGER NOT NULL default '0',
+  "pwdExpiration" TIMESTAMP default NULL,
+  "loginfailures" INTEGER NOT NULL default '0',
+  "disabled" INTEGER NOT NULL default '0',
+  "quota" INTEGER,
+  "homefolder" INTEGER default NULL,
+  UNIQUE ("login")
+);
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblUserPasswordRequest"
+-- 
+
+CREATE TABLE "tblUserPasswordRequest" (
+  "id" SERIAL UNIQUE,
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" (id) ON DELETE CASCADE,
+  "hash" varchar(50) default NULL,
+  "date" TIMESTAMP default NULL
+);
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblUserPasswordHistory"
+-- 
+
+CREATE TABLE "tblUserPasswordHistory" (
+  "id" SERIAL UNIQUE,
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "pwd" varchar(50) default NULL,
+  "date" TIMESTAMP default NULL
+);
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblUserImages"
+-- 
+
+CREATE TABLE "tblUserImages" (
+  "id" SERIAL UNIQUE,
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "image" TEXT NOT NULL,
+  "mimeType" varchar(10) NOT NULL default ''
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblFolders"
+-- 
+
+CREATE TABLE "tblFolders" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(70) default NULL,
+  "parent" INTEGER default NULL,
+  "folderList" text NOT NULL,
+  "comment" text,
+  "date" INTEGER default NULL,
+  "owner" INTEGER default NULL REFERENCES "tblUsers" ("id"),
+  "inheritAccess" INTEGER NOT NULL default '1',
+  "defaultAccess" INTEGER NOT NULL default '0',
+  "sequence" REAL NOT NULL default '0'
+) ;
+
+ALTER TABLE "tblUsers" ADD FOREIGN KEY("homefolder") REFERENCES "tblFolders"("id");
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblFolderAttributes"
+-- 
+
+CREATE TABLE "tblFolderAttributes" (
+  "id" SERIAL UNIQUE,
+  "folder" INTEGER default NULL REFERENCES "tblFolders" ("id") ON DELETE CASCADE,
+  "attrdef" INTEGER default NULL REFERENCES "tblAttributeDefinitions" ("id"),
+  "value" text default NULL,
+  UNIQUE (folder, attrdef)
+) ;
+ 
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocuments"
+-- 
+
+CREATE TABLE "tblDocuments" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(150) default NULL,
+  "comment" text,
+  "date" INTEGER default NULL,
+  "expires" INTEGER default NULL,
+  "owner" INTEGER default NULL REFERENCES "tblUsers" ("id"),
+  "folder" INTEGER default NULL REFERENCES "tblFolders" ("id"),
+  "folderList" text NOT NULL,
+  "inheritAccess" INTEGER NOT NULL default '1',
+  "defaultAccess" INTEGER NOT NULL default '0',
+  "locked" INTEGER NOT NULL default '-1',
+  "keywords" text NOT NULL,
+  "sequence" REAL NOT NULL default '0'
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentAttributes"
+-- 
+
+CREATE TABLE "tblDocumentAttributes" (
+  "id" SERIAL UNIQUE,
+  "document" INTEGER default NULL REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "attrdef" INTEGER default NULL REFERENCES "tblAttributeDefinitions" ("id"),
+  "value" text default NULL,
+  UNIQUE (document, attrdef)
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentApprovers"
+-- 
+
+CREATE TABLE "tblDocumentApprovers" (
+  "approveID" SERIAL UNIQUE,
+  "documentID" INTEGER NOT NULL default '0' REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "version" INTEGER NOT NULL default '0',
+  "type" INTEGER NOT NULL default '0',
+  "required" INTEGER NOT NULL default '0',
+  UNIQUE ("documentID","version","type","required")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentApproveLog"
+-- 
+
+CREATE TABLE "tblDocumentApproveLog" (
+  "approveLogID" SERIAL UNIQUE,
+  "approveID" INTEGER NOT NULL default '0' REFERENCES "tblDocumentApprovers" ("approveID") ON DELETE CASCADE,
+  "status" INTEGER NOT NULL default '0',
+  "comment" TEXT NOT NULL,
+  "date" TIMESTAMP default NULL,
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentContent"
+-- 
+
+CREATE TABLE "tblDocumentContent" (
+  "id" SERIAL UNIQUE,
+  "document" INTEGER NOT NULL default '0' REFERENCES "tblDocuments" ("id"),
+  "version" INTEGER NOT NULL,
+  "comment" text,
+  "date" INTEGER default NULL,
+  "createdBy" INTEGER default NULL,
+  "dir" varchar(255) NOT NULL default '',
+  "orgFileName" varchar(150) NOT NULL default '',
+  "fileType" varchar(10) NOT NULL default '',
+  "mimeType" varchar(70) NOT NULL default '',
+  "fileSize" INTEGER,
+  "checksum" char(32),
+  UNIQUE ("document","version")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentContentAttributes"
+-- 
+
+CREATE TABLE "tblDocumentContentAttributes" (
+  "id" SERIAL UNIQUE,
+  "content" INTEGER default NULL REFERENCES "tblDocumentContent" ("id") ON DELETE CASCADE,
+  "attrdef" INTEGER default NULL REFERENCES "tblAttributeDefinitions" ("id"),
+  "value" text default NULL,
+  UNIQUE (content, attrdef)
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentLinks"
+-- 
+
+CREATE TABLE "tblDocumentLinks" (
+  "id" SERIAL UNIQUE,
+  "document" INTEGER NOT NULL default 0 REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "target" INTEGER NOT NULL default 0 REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "userID" INTEGER NOT NULL default 0 REFERENCES "tblUsers" ("id"),
+  "public" INTEGER NOT NULL default 0
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentFiles"
+-- 
+
+CREATE TABLE "tblDocumentFiles" (
+  "id" SERIAL UNIQUE,
+  "document" INTEGER NOT NULL default 0 REFERENCES "tblDocuments" ("id"),
+  "userID" INTEGER NOT NULL default 0 REFERENCES "tblUsers" ("id"),
+  "comment" text,
+  "name" varchar(150) default NULL,
+  "date" INTEGER default NULL,
+  "dir" varchar(255) NOT NULL default '',
+  "orgFileName" varchar(150) NOT NULL default '',
+  "fileType" varchar(10) NOT NULL default '',
+  "mimeType" varchar(70) NOT NULL default ''
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentLocks"
+-- 
+
+CREATE TABLE "tblDocumentLocks" (
+  "document" INTEGER REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentReviewers"
+-- 
+
+CREATE TABLE "tblDocumentReviewers" (
+  "reviewID" SERIAL UNIQUE,
+  "documentID" INTEGER NOT NULL default '0' REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "version" INTEGER NOT NULL default '0',
+  "type" INTEGER NOT NULL default '0',
+  "required" INTEGER NOT NULL default '0',
+  UNIQUE ("documentID","version","type","required")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentReviewLog"
+-- 
+
+CREATE TABLE "tblDocumentReviewLog" (
+  "reviewLogID" SERIAL UNIQUE,
+  "reviewID" INTEGER NOT NULL default 0 REFERENCES "tblDocumentReviewers" ("reviewID") ON DELETE CASCADE,
+  "status" INTEGER NOT NULL default 0,
+  "comment" TEXT NOT NULL,
+  "date" TIMESTAMP NOT NULL,
+  "userID" INTEGER NOT NULL default 0 REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentStatus"
+-- 
+
+CREATE TABLE "tblDocumentStatus" (
+  "statusID" SERIAL UNIQUE,
+  "documentID" INTEGER NOT NULL default '0' REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "version" INTEGER NOT NULL default '0',
+  UNIQUE ("documentID","version")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentStatusLog"
+-- 
+
+CREATE TABLE "tblDocumentStatusLog" (
+  "statusLogID" SERIAL UNIQUE,
+  "statusID" INTEGER NOT NULL default '0' REFERENCES "tblDocumentStatus" ("statusID") ON DELETE CASCADE,
+  "status" INTEGER NOT NULL default '0',
+  "comment" text NOT NULL,
+  "date" TIMESTAMP default NULL,
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblGroups"
+-- 
+
+CREATE TABLE "tblGroups" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(50) default NULL,
+  "comment" text NOT NULL
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblGroupMembers"
+-- 
+
+CREATE TABLE "tblGroupMembers" (
+  "groupID" INTEGER NOT NULL default '0' REFERENCES "tblGroups" ("id") ON DELETE CASCADE,
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "manager" INTEGER NOT NULL default '0',
+  UNIQUE  ("groupID","userID")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblKeywordCategories"
+-- 
+
+CREATE TABLE "tblKeywordCategories" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(255) NOT NULL default '',
+  "owner" INTEGER NOT NULL default '0'
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblKeywords"
+-- 
+
+CREATE TABLE "tblKeywords" (
+  "id" SERIAL UNIQUE,
+  "category" INTEGER NOT NULL default '0' REFERENCES "tblKeywordCategories" ("id") ON DELETE CASCADE,
+  "keywords" text NOT NULL
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentCategory"
+-- 
+
+CREATE TABLE "tblDocumentCategory" (
+  "categoryID" INTEGER NOT NULL default '0' REFERENCES "tblCategory" ("id") ON DELETE CASCADE,
+  "documentID" INTEGER NOT NULL default '0' REFERENCES "tblDocuments" ("id") ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblNotify"
+-- 
+
+CREATE TABLE "tblNotify" (
+  "target" INTEGER NOT NULL default '0',
+  "targetType" INTEGER NOT NULL default '0',
+  "userID" INTEGER NOT NULL default '-1',
+  "groupID" INTEGER NOT NULL default '-1',
+  UNIQUE  ("target","targetType","userID","groupID")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblSessions"
+-- 
+
+CREATE TABLE "tblSessions" (
+  "id" varchar(50) PRIMARY KEY,
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "lastAccess" INTEGER NOT NULL default '0',
+  "theme" varchar(30) NOT NULL default '',
+  "language" varchar(30) NOT NULL default '',
+  "clipboard" text default NULL,
+	"su" INTEGER DEFAULT NULL,
+  "splashmsg" text default NULL
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for mandatory reviewers
+-- 
+
+CREATE TABLE "tblMandatoryReviewers" (
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "reviewerUserID" INTEGER NOT NULL default '0',
+  "reviewerGroupID" INTEGER NOT NULL default '0',
+  UNIQUE ("userID","reviewerUserID","reviewerGroupID")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for mandatory approvers
+-- 
+
+CREATE TABLE "tblMandatoryApprovers" (
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "approverUserID" INTEGER NOT NULL default '0',
+  "approverGroupID" INTEGER NOT NULL default '0',
+  UNIQUE ("userID","approverUserID","approverGroupID")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for events (calendar)
+-- 
+
+CREATE TABLE "tblEvents" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(150) default NULL,
+  "comment" text,
+  "start" INTEGER default NULL,
+  "stop" INTEGER default NULL,
+  "date" INTEGER default NULL,
+  "userID" INTEGER NOT NULL default '0'
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for workflow states
+-- 
+
+CREATE TABLE "tblWorkflowStates" (
+  "id" SERIAL UNIQUE,
+  "name" text NOT NULL,
+  "visibility" INTEGER DEFAULT 0,
+  "maxtime" INTEGER DEFAULT 0,
+  "precondfunc" text DEFAULT NULL,
+  "documentstatus" INTEGER DEFAULT NULL
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for workflow actions
+-- 
+
+CREATE TABLE "tblWorkflowActions" (
+  "id" SERIAL UNIQUE,
+  "name" text NOT NULL
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for workflows
+-- 
+
+CREATE TABLE "tblWorkflows" (
+  "id" SERIAL UNIQUE,
+  "name" text NOT NULL,
+  "initstate" INTEGER NOT NULL REFERENCES "tblWorkflowStates" ("id") ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for workflow transitions
+-- 
+
+CREATE TABLE "tblWorkflowTransitions" (
+  "id" SERIAL UNIQUE,
+  "workflow" INTEGER default NULL REFERENCES "tblWorkflows" ("id") ON DELETE CASCADE,
+  "state" INTEGER default NULL REFERENCES "tblWorkflowStates" ("id") ON DELETE CASCADE,
+  "action" INTEGER default NULL REFERENCES "tblWorkflowActions" ("id") ON DELETE CASCADE,
+  "nextstate" INTEGER default NULL REFERENCES "tblWorkflowStates" ("id") ON DELETE CASCADE,
+  "maxtime" INTEGER DEFAULT 0
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for workflow transition users
+-- 
+
+CREATE TABLE "tblWorkflowTransitionUsers" (
+  "id" SERIAL UNIQUE,
+  "transition" INTEGER default NULL REFERENCES "tblWorkflowTransitions" ("id") ON DELETE CASCADE,
+  "userid" INTEGER default NULL REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for workflow transition groups
+-- 
+
+CREATE TABLE "tblWorkflowTransitionGroups" (
+  "id" SERIAL UNIQUE,
+  "transition" INTEGER default NULL REFERENCES "tblWorkflowTransitions" ("id") ON DELETE CASCADE,
+  "groupid" INTEGER default NULL REFERENCES "tblGroups" ("id") ON DELETE CASCADE,
+  "minusers" INTEGER default NULL
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for workflow log
+-- 
+
+CREATE TABLE "tblWorkflowLog" (
+  "id" SERIAL UNIQUE,
+  "document" INTEGER default NULL REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "version" INTEGER default NULL,
+  "workflow" INTEGER default NULL REFERENCES "tblWorkflows" ("id") ON DELETE CASCADE,
+  "userid" INTEGER default NULL REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "transition" INTEGER default NULL REFERENCES "tblWorkflowTransitions" ("id") ON DELETE CASCADE,
+  "date" TIMESTAMP default NULL,
+  "comment" text
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for workflow document relation
+-- 
+
+CREATE TABLE "tblWorkflowDocumentContent" (
+  "parentworkflow" INTEGER DEFAULT 0,
+  "workflow" INTEGER DEFAULT NULL REFERENCES "tblWorkflows" ("id") ON DELETE CASCADE,
+  "document" INTEGER DEFAULT NULL REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "version" INTEGER DEFAULT NULL,
+  "state" INTEGER DEFAULT NULL REFERENCES "tblWorkflowStates" ("id") ON DELETE CASCADE,
+  "date" TIMESTAMP default NULL
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for mandatory workflows
+-- 
+
+CREATE TABLE "tblWorkflowMandatoryWorkflow" (
+  "userid" INTEGER default NULL REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "workflow" INTEGER default NULL REFERENCES "tblWorkflows" ("id") ON DELETE CASCADE,
+  UNIQUE(userid, workflow)
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for version
+-- 
+
+CREATE TABLE "tblVersion" (
+  "date" TIMESTAMP default NULL,
+  "major" INTEGER,
+  "minor" INTEGER,
+  "subminor" INTEGER
+) ;
+
+-- --------------------------------------------------------
+
+--
+-- Initial content for database
+--
+
+INSERT INTO "tblUsers" VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Administrator', 'address@server.com', '', '', '', 1, 0, NULL, 0, 0, 0, NULL);
+INSERT INTO "tblUsers" VALUES (2, 'guest', NULL, 'Guest User', NULL, '', '', '', 2, 0, NULL, 0, 0, 0, NULL);
+INSERT INTO "tblFolders" VALUES (1, 'DMS', 0, '', 'DMS root', extract(epoch from now()), 1, 0, 2, 0);
+INSERT INTO "tblVersion" VALUES (CURRENT_TIMESTAMP, 5, 0, 0);

From b1bd6663865435bc25fa7499e22b6f4214c35204 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Feb 2017 22:05:15 +0100
Subject: [PATCH 0742/2006] update to 5.1.x

---
 install/create_tables-postgres.sql | 191 ++++++++++++++++++++++++++++-
 1 file changed, 187 insertions(+), 4 deletions(-)

diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index 467f62f8e..347c60ae2 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -43,6 +43,19 @@ CREATE TABLE "tblAttributeDefinitions" (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblUsers`
+-- 
+
+CREATE TABLE "tblRoles" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(50) default NULL,
+  "role" INTEGER NOT NULL default '0',
+  "noaccess" varchar(30) NOT NULL default ''
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table "tblUsers"
 -- 
@@ -51,6 +64,7 @@ CREATE TABLE "tblUsers" (
   "id" SERIAL UNIQUE,
   "login" varchar(50) default NULL,
   "pwd" varchar(50) default NULL,
+  "secret" varchar(50) default NULL,
   "fullName" varchar(100) default NULL,
   "email" varchar(70) default NULL,
   "language" varchar(32) NOT NULL,
@@ -68,6 +82,18 @@ CREATE TABLE "tblUsers" (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblUserSubstitutes`
+-- 
+
+CREATE TABLE "tblUserSubstitutes" (
+  "id" SERIAL UNIQUE,
+  "user" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "substitute" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+);
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table "tblUserPasswordRequest"
 -- 
@@ -225,6 +251,7 @@ CREATE TABLE "tblDocumentContent" (
   "mimeType" varchar(70) NOT NULL default '',
   "fileSize" INTEGER,
   "checksum" char(32),
+  "revisiondate" TIMESTAMP default NULL,
   UNIQUE ("document","version")
 ) ;
 
@@ -288,6 +315,21 @@ CREATE TABLE "tblDocumentLocks" (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblDocumentCheckOuts`
+-- 
+
+CREATE TABLE "tblDocumentCheckOuts" (
+  "document" INTEGER REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "version" INTEGER NOT NULL default '0',
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id"),
+  "date" TEXT NOT NULL,
+  "filename" varchar(255) NOT NULL default '',
+  UNIQUE ("document")
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table "tblDocumentReviewers"
 -- 
@@ -318,6 +360,67 @@ CREATE TABLE "tblDocumentReviewLog" (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for table `tblDocumentRecipients`
+-- 
+
+CREATE TABLE "tblDocumentRecipients" (
+  "receiptID" SERIAL UNIQUE,
+  "documentID" INTEGER NOT NULL default '0' REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "version" INTEGER NOT NULL default '0',
+  "type" INTEGER NOT NULL default '0',
+  "required" INTEGER NOT NULL default '0',
+  UNIQUE ("documentID","version","type","required")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentReceiptLog"
+-- 
+
+CREATE TABLE "tblDocumentReceiptLog" (
+  "receiptLogID" SERIAL UNIQUE,
+  "receiptID" INTEGER NOT NULL default 0 REFERENCES "tblDocumentRecipients" ("receiptID") ON DELETE CASCADE,
+  "status" INTEGER NOT NULL default 0,
+  "comment" TEXT NOT NULL,
+  "date" TEXT NOT NULL,
+  "userID" INTEGER NOT NULL default 0 REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table `tblDocumentRevisors`
+-- 
+
+CREATE TABLE "tblDocumentRevisors" (
+  "revisionID" SERIAL UNIQUE,
+  "documentID" INTEGER NOT NULL default '0' REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "version" INTEGER NOT NULL default '0',
+  "type" INTEGER NOT NULL default '0',
+  "required" INTEGER NOT NULL default '0',
+  "startdate" TIMESTAMP default NULL,
+  UNIQUE ("documentID","version","type","required")
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table "tblDocumentRevisionLog"
+-- 
+
+CREATE TABLE "tblDocumentRevisionLog" (
+  "revisionLogID" SERIAL UNIQUE,
+  "revisionID" INTEGER NOT NULL default 0 REFERENCES "tblDocumentRevisors" ("revisionID") ON DELETE CASCADE,
+  "status" INTEGER NOT NULL default 0,
+  "comment" TEXT NOT NULL,
+  "date" TIMESTAMP default NULL,
+  "userID" INTEGER NOT NULL default 0 REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table "tblDocumentStatus"
 -- 
@@ -512,7 +615,8 @@ CREATE TABLE "tblWorkflowActions" (
 CREATE TABLE "tblWorkflows" (
   "id" SERIAL UNIQUE,
   "name" text NOT NULL,
-  "initstate" INTEGER NOT NULL REFERENCES "tblWorkflowStates" ("id") ON DELETE CASCADE
+  "initstate" INTEGER NOT NULL REFERENCES "tblWorkflowStates" ("id") ON DELETE CASCADE,
+  "layoutdata" text default NULL
 ) ;
 
 -- --------------------------------------------------------
@@ -601,6 +705,82 @@ CREATE TABLE "tblWorkflowMandatoryWorkflow" (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for transmittal
+-- 
+
+CREATE TABLE "tblTransmittals" (
+  "id" SERIAL UNIQUE,
+  "name" text NOT NULL,
+  "comment" text NOT NULL,
+  "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "date" TIMESTAMP default NULL,
+  "public" INTEGER NOT NULL default '0'
+);
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for transmittal item
+-- 
+
+CREATE TABLE "tblTransmittalItems" (
+  "id" SERIAL UNIQUE,
+  "transmittal" INTEGER NOT NULL DEFAULT '0' REFERENCES "tblTransmittals" ("id") ON DELETE CASCADE,
+  "document" INTEGER default NULL REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  "version" INTEGER NOT NULL default '0',
+  "date" TIMESTAMP default NULL,
+  UNIQUE (transmittal, document, version)
+);
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for access request objects
+-- 
+
+CREATE TABLE "tblAros" (
+  "id" SERIAL UNIQUE,
+  "parent" INTEGER,
+  "model" TEXT NOT NULL,
+  "foreignid" INTEGER NOT NULL DEFAULT '0',
+  "alias" TEXT
+) ;
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for access control objects
+-- 
+
+CREATE TABLE "tblAcos" (
+  "id" SERIAL UNIQUE,
+  "parent" INTEGER,
+  "model" TEXT NOT NULL,
+  "foreignid" INTEGER NOT NULL DEFAULT '0',
+  "alias" TEXT
+) ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for acos/aros relation
+-- 
+
+CREATE TABLE "tblArosAcos" (
+  "id" SERIAL UNIQUE,
+  "aro" INTEGER NOT NULL DEFAULT '0' REFERENCES "tblAros" ("id") ON DELETE CASCADE,
+  "aco" INTEGER NOT NULL DEFAULT '0' REFERENCES "tblAcos" ("id") ON DELETE CASCADE,
+  "create" INTEGER NOT NULL DEFAULT '-1',
+  "read" INTEGER NOT NULL DEFAULT '-1',
+  "update" INTEGER NOT NULL DEFAULT '-1',
+  "delete" INTEGER NOT NULL DEFAULT '-1',
+  UNIQUE (aco, aro)
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for version
 -- 
@@ -618,7 +798,10 @@ CREATE TABLE "tblVersion" (
 -- Initial content for database
 --
 
-INSERT INTO "tblUsers" VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Administrator', 'address@server.com', '', '', '', 1, 0, NULL, 0, 0, 0, NULL);
-INSERT INTO "tblUsers" VALUES (2, 'guest', NULL, 'Guest User', NULL, '', '', '', 2, 0, NULL, 0, 0, 0, NULL);
+INSERT INTO "tblRoles" ("id", "name", "role") VALUES (1, 'Admin', 1);
+INSERT INTO "tblRoles" ("id", "name", "role") VALUES (2, 'Guest', 2);
+INSERT INTO "tblRoles" ("id", "name", "role") VALUES (3, 'User', 0);
+INSERT INTO "tblUsers" VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, NULL, 0, 0, 0, NULL);
+INSERT INTO "tblUsers" VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, NULL, 0, 0, 0, NULL);
 INSERT INTO "tblFolders" VALUES (1, 'DMS', 0, '', 'DMS root', extract(epoch from now()), 1, 0, 2, 0);
-INSERT INTO "tblVersion" VALUES (CURRENT_TIMESTAMP, 5, 0, 0);
+INSERT INTO "tblVersion" VALUES (CURRENT_TIMESTAMP, 5, 1, 0);

From 2c775b560fabdb2be2c99ab91862760258786c8b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 07:12:34 +0100
Subject: [PATCH 0743/2006] add creation of temp table ttcontentid

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index dbd28de73..bdbc73b20 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -442,6 +442,14 @@ class SeedDMS_Core_DatabaseAccess {
 						"GROUP BY `tblDocumentContent`.`document` ".
 						"ORDER BY `tblDocumentContent`.`document`";
 					break;
+				case 'pgsql':
+					$queryStr = "CREATE TEMPORARY TABLE `ttcontentid` (`document` INTEGER, `maxVersion` INTEGER, PRIMARY KEY (`document`)); ".
+						"INSERT INTO `ttcontentid` SELECT `tblDocumentContent`.`document` AS `document`, ".
+						"MAX(`tblDocumentContent`.`version`) AS `maxVersion` ".
+						"FROM `tblDocumentContent` ".
+						"GROUP BY `tblDocumentContent`.`document` ".
+						"ORDER BY `tblDocumentContent`.`document`";
+					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttcontentid` (PRIMARY KEY (`document`), INDEX (`maxVersion`)) ".
 						"SELECT `tblDocumentContent`.`document`, ".

From 1a03adebbdedd4844d0e020d313abdd9308e3fa8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 08:18:06 +0100
Subject: [PATCH 0744/2006] add create of temp table ttstatid

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index bdbc73b20..92a3e7c4a 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -409,6 +409,14 @@ class SeedDMS_Core_DatabaseAccess {
 						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
 						"ORDER BY `maxLogID`";
 					break;
+				case 'pgsql':
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` (`statusID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`statusID`));".
+						"INSERT INTO `ttstatid` SELECT `tblDocumentStatusLog`.`statusID`, ".
+						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentStatusLog` ".
+						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
+						"ORDER BY `maxLogID`";
+					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` (PRIMARY KEY (`statusID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentStatusLog`.`statusID`, ".
@@ -443,7 +451,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"ORDER BY `tblDocumentContent`.`document`";
 					break;
 				case 'pgsql':
-					$queryStr = "CREATE TEMPORARY TABLE `ttcontentid` (`document` INTEGER, `maxVersion` INTEGER, PRIMARY KEY (`document`)); ".
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttcontentid` (`document` INTEGER, `maxVersion` INTEGER, PRIMARY KEY (`document`)); ".
 						"INSERT INTO `ttcontentid` SELECT `tblDocumentContent`.`document` AS `document`, ".
 						"MAX(`tblDocumentContent`.`version`) AS `maxVersion` ".
 						"FROM `tblDocumentContent` ".

From 50919f40c162e4302bec827566995e022c4f9238 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 10:38:52 +0100
Subject: [PATCH 0745/2006] add sql for creating temp tables ttreviewid and
 ttapproveid

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 92a3e7c4a..20d6a5474 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -343,6 +343,14 @@ class SeedDMS_Core_DatabaseAccess {
 						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
 						"ORDER BY `maxLogID`";
 				break;
+				case 'pgsql':
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` (`reviewID` INTEGER, `maxLogID` INTEGER, PRIMARY INDEX (`reviewID`));".
+						"INSERT INTO `ttreviewid` SELECT `tblDocumentReviewLog`.`reviewID`, ".
+						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReviewLog` ".
+						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
+						"ORDER BY `maxLogID`";
+				break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` (PRIMARY KEY (`reviewID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentReviewLog`.`reviewID`, ".
@@ -376,6 +384,14 @@ class SeedDMS_Core_DatabaseAccess {
 						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
 						"ORDER BY `maxLogID`";
 					break;
+				case 'pgsql':
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` (`approveID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`approveID`));".
+						"INSERT INTO `ttapproveid` SELECT `tblDocumentApproveLog`.`approveID`, ".
+						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentApproveLog` ".
+						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
+						"ORDER BY `maxLogID`";
+					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` (PRIMARY KEY (`approveID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentApproveLog`.`approveID`, ".

From bfbd845bab885ca831d8dce5849a81c847c23e6a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 10:44:27 +0100
Subject: [PATCH 0746/2006] add sql code for creating temp tables ttreceiptid
 and ttrevisionid

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 20d6a5474..00e5ecfc3 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -507,6 +507,14 @@ class SeedDMS_Core_DatabaseAccess {
 						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ".
 						"ORDER BY `maxLogID`";
 				break;
+				case 'pgsql':
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` (`receiptID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`receiptID`);".
+						"INSERT INTO `ttreceiptid` SELECT `tblDocumentReceiptLog`.`receiptID`, ".
+						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReceiptLog` ".
+						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ".
+						"ORDER BY `maxLogID`";
+				break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` (PRIMARY KEY (`receiptID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentReceiptLog`.`receiptID`, ".
@@ -540,6 +548,14 @@ class SeedDMS_Core_DatabaseAccess {
 						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ".
 						"ORDER BY `maxLogID`";
 				break;
+				case 'pgsql':
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` (`revisionID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`revisionID`));".
+						"INSERT INTO `ttrevisionid` SELECT `tblDocumentRevisionLog`.`revisionID`, ".
+						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentRevisionLog` ".
+						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ".
+						"ORDER BY `maxLogID`";
+				break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` (PRIMARY KEY (`revisionID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentRevisionLog`.`revisionID`, ".

From a18b3c68790f4a230836a35f69759ebcc2197040 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 17:27:38 +0100
Subject: [PATCH 0747/2006] add sql statement for pgsql in TableList()

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 00e5ecfc3..bd9257b48 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -117,6 +117,9 @@ class SeedDMS_Core_DatabaseAccess {
 			case 'sqlite':
 				$sql = "select tbl_name as name from sqlite_master where type='table'";
 				break;
+			case 'pgsql':
+				$sql = "select tablename as name from pg_catalog.pg_tables where schemaname='public'";
+				break;
 			default:
 				return false;
 		}

From 8988bc0098019a7be7355e972f8d50d71144033b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 17:54:22 +0100
Subject: [PATCH 0748/2006] make mimeType varchar(100) in tblDocumentContents
 and tblDocumentFiles

---
 install/create_tables-postgres.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index 347c60ae2..7a9592479 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -248,7 +248,7 @@ CREATE TABLE "tblDocumentContent" (
   "dir" varchar(255) NOT NULL default '',
   "orgFileName" varchar(150) NOT NULL default '',
   "fileType" varchar(10) NOT NULL default '',
-  "mimeType" varchar(70) NOT NULL default '',
+  "mimeType" varchar(100) NOT NULL default '',
   "fileSize" INTEGER,
   "checksum" char(32),
   "revisiondate" TIMESTAMP default NULL,
@@ -299,7 +299,7 @@ CREATE TABLE "tblDocumentFiles" (
   "dir" varchar(255) NOT NULL default '',
   "orgFileName" varchar(150) NOT NULL default '',
   "fileType" varchar(10) NOT NULL default '',
-  "mimeType" varchar(70) NOT NULL default ''
+  "mimeType" varchar(100) NOT NULL default ''
 ) ;
 
 -- --------------------------------------------------------

From a761b0b41791e8b68960f7761f2fce7f59d93e54 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 21:05:29 +0100
Subject: [PATCH 0749/2006] set pwdexpiration to '' if it is '0000-00-00'

---
 utils/xmlimport.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 510284121..261bf279c 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -114,6 +114,8 @@ function insert_user($user) { /* {{{ */
 		$logger->info("User '".$user['attributes']['login']."' already exists");
 	} else {
 		if(in_array('users', $sections)) {
+			if(substr($user['attributes']['pwdexpiration'], 0, 10) == '0000-00-00')
+				$user['attributes']['pwdexpiration'] = '';
 			$newUser = $dms->addUser(
 				$user['attributes']['login'],
 				$user['attributes']['pwd'],
@@ -230,6 +232,7 @@ function insert_role($role) { /* {{{ */
 				$logger->err("Could not add role");
 				return false;
 			}
+			/*
 			if($aro = SeedDMS_Aro::getInstance($newRole, $dms)) {
 				$logger->info("Added aro");
 				if($role['acos']) {
@@ -251,6 +254,7 @@ function insert_role($role) { /* {{{ */
 				$logger->err("Could not add Aro");
 				return false;
 			}
+			 */
 		} else {
 			$newRole = null;
 		}
@@ -1852,6 +1856,7 @@ require_once("SeedDMS/Core.php");
 
 $db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
 $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
+$db->_debug = 1;
 
 $dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {

From d7403d3745359081ce1c87039062ccdd7b17975a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 21:06:06 +0100
Subject: [PATCH 0750/2006] set sequence after insert

---
 install/create_tables-postgres.sql | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index 7a9592479..d2d0f10c0 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -799,9 +799,15 @@ CREATE TABLE "tblVersion" (
 --
 
 INSERT INTO "tblRoles" ("id", "name", "role") VALUES (1, 'Admin', 1);
+SELECT nextval('"tblRoles_id_seq"');
 INSERT INTO "tblRoles" ("id", "name", "role") VALUES (2, 'Guest', 2);
+SELECT nextval('"tblRoles_id_seq"');
 INSERT INTO "tblRoles" ("id", "name", "role") VALUES (3, 'User', 0);
+SELECT nextval('"tblRoles_id_seq"');
 INSERT INTO "tblUsers" VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, NULL, 0, 0, 0, NULL);
+SELECT nextval('"tblUsers_id_seq"');
 INSERT INTO "tblUsers" VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, NULL, 0, 0, 0, NULL);
+SELECT nextval('"tblUsers_id_seq"');
 INSERT INTO "tblFolders" VALUES (1, 'DMS', 0, '', 'DMS root', extract(epoch from now()), 1, 0, 2, 0);
+SELECT nextval('"tblFolders_id_seq"');
 INSERT INTO "tblVersion" VALUES (CURRENT_TIMESTAMP, 5, 1, 0);

From 283c51b19354b3822c71aa28be1640b84aa5e5af Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Feb 2017 21:06:36 +0100
Subject: [PATCH 0751/2006] print_r detailed error msg

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index bd9257b48..d339d40fb 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -257,8 +257,10 @@ class SeedDMS_Core_DatabaseAccess {
 		}
 		$res = $this->_conn->query($queryStr);
 		if ($res === false) {
-			if($this->_debug)
+			if($this->_debug) {
 				echo "error: ".$queryStr."<br />";
+				print_r($this->_conn->errorInfo());
+			}
 			return false;
 		}
 		$resArr = $res->fetchAll(PDO::FETCH_ASSOC);
@@ -281,8 +283,10 @@ class SeedDMS_Core_DatabaseAccess {
 		}
 		$res = $this->_conn->exec($queryStr);
 		if($res === false) {
-			if($this->_debug)
+			if($this->_debug) {
 				echo "error: ".$queryStr."<br />";
+				print_r($this->_conn->errorInfo());
+			}
 			return false;
 		} else
 			return true;

From b03fcc5b6aad77174ff858e1e0388900d95eb797 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Feb 2017 06:20:03 +0100
Subject: [PATCH 0752/2006] fix versions

---
 SeedDMS_Core/package.xml | 43 +++++-----------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 4d5aed9a3..8598d2b58 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -15,7 +15,7 @@
  <date>2017-02-20</date>
  <time>06:23:34</time>
  <version>
-  <release>5.1.0</release>
+  <release>6.0.0</release>
   <api>6.0.0</api>
  </version>
  <stability>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- all changes from 5.0.10 merged
+- all changes from 5.1.0 merged
 - SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus()
 only return entries of the latest document version if not specific document and
 version is passed
@@ -35,7 +35,8 @@ SeedDMS_Core_DMS::getDocumentsInRevision()
 - finishRevsion() puts all revisors into state waiting, so a new revision can be started
 - fix SeedDMS_Core_Group::getRevisionStatus(), which did not always return the last
 log entry first
-- added postgres support
+- add roles
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1335,41 +1336,7 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-- add roles
-- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
-- all changes from 4.3.26 merged
-   </notes>
-  </release>
-  <release>
-   <date>2016-09-06</date>
-   <time>09:28:28</time>
-   <version>
-    <release>5.1.1</release>
-    <api>5.1.1</api>
-   </version>
-   <stability>
-    <release>stable</release>
-    <api>stable</api>
-   </stability>
-   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
-   <notes>
-- all changes till 5.0.6 merged
-   </notes>
-  </release>
-  <release>
-   <date>2017-02-20</date>
-   <time>06:23:34</time>
-   <version>
-    <release>5.0.10</release>
-    <api>5.0.10</api>
-   </version>
-   <stability>
-    <release>stable</release>
-    <api>stable</api>
-   </stability>
-   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
-   <notes>
-- all changes from 4.3.33 merged
+- added postgres support
    </notes>
   </release>
  </changelog>

From 6b8b0993391bedcea1204e303f6954992f6c1ef5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Feb 2017 06:34:22 +0100
Subject: [PATCH 0753/2006] set propper version in tblVersion

---
 install/create_tables-innodb.sql   | 2 +-
 install/create_tables-postgres.sql | 2 +-
 install/create_tables-sqlite3.sql  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 8ae0d6f48..25e1779cb 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -942,4 +942,4 @@ INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
 INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, NULL, 0, 0, 0, NULL);
 INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, NULL, 0, 0, 0, NULL);
 INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', UNIX_TIMESTAMP(), 1, 0, 2, 0);
-INSERT INTO tblVersion VALUES (NOW(), 5, 1, 0);
+INSERT INTO tblVersion VALUES (NOW(), 6, 0, 0);
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index 067d2afa8..b63ad9338 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -829,4 +829,4 @@ INSERT INTO "tblUsers" VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '',
 SELECT nextval('"tblUsers_id_seq"');
 INSERT INTO "tblFolders" VALUES (1, 'DMS', 0, '', 'DMS root', extract(epoch from now()), 1, 0, 2, 0);
 SELECT nextval('"tblFolders_id_seq"');
-INSERT INTO "tblVersion" VALUES (CURRENT_TIMESTAMP, 5, 1, 0);
+INSERT INTO "tblVersion" VALUES (CURRENT_TIMESTAMP, 6, 0, 0);
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 5bc54275f..fa7b3ce0c 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -806,4 +806,4 @@ INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
 INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0, 0);
 INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0, 0);
 INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', strftime('%s','now'), 1, 0, 2, 0);
-INSERT INTO tblVersion VALUES (DATETIME(), 5, 1, 0);
+INSERT INTO tblVersion VALUES (DATETIME(), 6, 0, 0);

From 08e9f14e9d450b099250c608e88c6bd8af09da69 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Feb 2017 06:53:43 +0100
Subject: [PATCH 0754/2006] fix merge error

---
 install/create_tables-postgres.sql | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index b63ad9338..047da6c51 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -93,8 +93,6 @@ CREATE TABLE "tblUsers" (
 -- --------------------------------------------------------
 
 -- 
-<<<<<<< HEAD
-=======
 -- Table structure for table `tblUserSubstitutes`
 -- 
 
@@ -107,7 +105,6 @@ CREATE TABLE "tblUserSubstitutes" (
 -- --------------------------------------------------------
 
 -- 
->>>>>>> seeddms-6.0.x-postgres
 -- Table structure for table "tblUserPasswordRequest"
 -- 
 

From 63920fdce8f51b874ff916800aace88a398b2541 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Feb 2017 06:54:06 +0100
Subject: [PATCH 0755/2006] set ENGINE for tblUserSubstitutes

---
 install/update-6.0.0/update.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index 90ab48f56..1d75831de 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -14,7 +14,7 @@ CREATE TABLE `tblUserSubstitutes` (
   UNIQUE (`user`, `substitute`),
   CONSTRAINT `tblUserSubstitutes_user` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblUserSubstitutes_substitute` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
-);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblDocumentCheckOuts` (
   `document` int(11) NOT NULL default '0',

From 4b1b702fc5d385b859d3d91605af44e67fb18df1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Feb 2017 06:54:53 +0100
Subject: [PATCH 0756/2006] add update for postgresql

---
 install/update-6.0.0/update-postgres.sql | 143 +++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 install/update-6.0.0/update-postgres.sql

diff --git a/install/update-6.0.0/update-postgres.sql b/install/update-6.0.0/update-postgres.sql
new file mode 100644
index 000000000..9e94ab5cc
--- /dev/null
+++ b/install/update-6.0.0/update-postgres.sql
@@ -0,0 +1,143 @@
+START TRANSACTION;
+
+ALTER TABLE "tblDocumentContent" ADD COLUMN "revisiondate" TIMESTAMP default NULL;
+
+ALTER TABLE "tblUsers" ADD COLUMN "secret" varchar(50) default NULL AFTER "pwd";
+
+ALTER TABLE "tblWorkflows" ADD COLUMN "layoutdata" text default NULL AFTER "initstate";
+
+CREATE TABLE "tblUserSubstitutes" (
+  "id" SERIAL UNIQUE,
+  "user" INTEGER default null,
+  "substitute" INTEGER default null,
+  UNIQUE ("user", "substitute"),
+  CONSTRAINT "tblUserSubstitutes_user" FOREIGN KEY ("user") REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  CONSTRAINT "tblUserSubstitutes_substitute" FOREIGN KEY ("user") REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+);
+
+CREATE TABLE "tblDocumentCheckOuts" (
+  "document" INTEGER NOT NULL default '0',
+  "version" INTEGER NOT NULL default '0',
+  "userID" INTEGER NOT NULL default '0',
+  "date" TIMESTAMP NOT NULL,
+  "filename" varchar(255) NOT NULL default '',
+  CONSTRAINT "tblDocumentCheckOuts_document" FOREIGN KEY ("document") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  CONSTRAINT "tblDocumentCheckOuts_user" FOREIGN KEY ("userID") REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+);
+
+CREATE TABLE "tblDocumentRecipients" (
+  "receiptID" SERIAL UNIQUE,
+  "documentID" INTEGER NOT NULL default '0',
+  "version" INTEGER NOT NULL default '0',
+  "type" tinyint(4) NOT NULL default '0',
+  "required" INTEGER NOT NULL default '0',
+  UNIQUE KEY "documentID" ("documentID","version","type","required"),
+  CONSTRAINT "tblDocumentRecipients_document" FOREIGN KEY ("documentID") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE
+);
+
+CREATE TABLE "tblDocumentReceiptLog" (
+  "receiptLogID" SERIAL UNIQUE,
+  "receiptID" INTEGER NOT NULL default '0',
+  "status" tinyint(4) NOT NULL default '0',
+  "comment" text NOT NULL,
+  "date" TIMESTAMP NOT NULL,
+  "userID" INTEGER NOT NULL default '0',
+  CONSTRAINT "tblDocumentReceiptLog_recipient" FOREIGN KEY ("receiptID") REFERENCES "tblDocumentRecipients" ("receiptID") ON DELETE CASCADE,
+  CONSTRAINT "tblDocumentReceiptLog_user" FOREIGN KEY ("userID") REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+);
+
+CREATE TABLE "tblDocumentRevisors" (
+  "revisionID" SERIAL UNIQUE,
+  "documentID" INTEGER NOT NULL default '0',
+  "version" INTEGER NOT NULL default '0',
+  "type" tinyint(4) NOT NULL default '0',
+  "required" INTEGER NOT NULL default '0',
+  "startdate" TIMESTAMP default NULL,
+  UNIQUE KEY "documentID" ("documentID","version","type","required"),
+  CONSTRAINT "tblDocumentRevisors_document" FOREIGN KEY ("documentID") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE
+);
+
+CREATE TABLE "tblDocumentRevisionLog" (
+  "revisionLogID" SERIAL UNIQUE,
+  "revisionID" INTEGER NOT NULL default '0',
+  "status" tinyint(4) NOT NULL default '0',
+  "comment" text NOT NULL,
+  "date" TIMESTAMP NOT NULL,
+  "userID" INTEGER NOT NULL default '0',
+  CONSTRAINT "tblDocumentRevisionLog_revision" FOREIGN KEY ("revisionID") REFERENCES "tblDocumentRevisors" ("revisionID") ON DELETE CASCADE,
+  CONSTRAINT "tblDocumentRevisionLog_user" FOREIGN KEY ("userID") REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+);
+
+CREATE TABLE "tblTransmittals" (
+  "id" SERIAL UNIQUE,
+  "name" text NOT NULL,
+  "comment" text NOT NULL,
+  "userID" INTEGER NOT NULL default '0',
+  "date" TIMESTAMP default NULL,
+  "public" tinyint(1) NOT NULL default '0',
+  CONSTRAINT "tblTransmittals_user" FOREIGN KEY ("userID") REFERENCES "tblUsers" ("id") ON DELETE CASCADE
+);
+
+CREATE TABLE "tblTransmittalItems" (
+  "id" SERIAL UNIQUE,
+	"transmittal" INTEGER NOT NULL DEFAULT '0',
+  "document" INTEGER default NULL,
+  "version" INTEGER unsigned NOT NULL default '0',
+  "date" TIMESTAMP default NULL,
+  UNIQUE (transmittal, document, version),
+  CONSTRAINT "tblTransmittalItems_document" FOREIGN KEY ("document") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
+  CONSTRAINT "tblTransmittalItem_transmittal" FOREIGN KEY ("transmittal") REFERENCES "tblTransmittals" ("id") ON DELETE CASCADE
+);
+
+CREATE TABLE "tblRoles" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(50) default NULL,
+  "role" INTEGER NOT NULL default '0',
+  "noaccess" varchar(30) NOT NULL default '',
+  UNIQUE ("name")
+);
+
+INSERT INTO "tblRoles" ("id", "name", "role") VALUES (1, 'Admin', 1);
+SELECT nextval('"tblRoles_id_seq"');
+INSERT INTO "tblRoles" ("id", "name", "role") VALUES (2, 'Guest', 2);
+SELECT nextval('"tblRoles_id_seq"');
+INSERT INTO "tblRoles" ("id", "name", "role") VALUES (3, 'User', 0);
+SELECT nextval('"tblRoles_id_seq"');
+
+ALTER TABLE "tblUsers" CHANGE "role" "role" INTEGER NOT NULL;
+UPDATE "tblUsers" SET role=3 WHERE role=0;
+ALTER TABLE "tblUsers" ADD CONSTRAINT "tblUsers_role" FOREIGN KEY ("role") REFERENCES "tblRoles" ("id");
+
+CREATE TABLE "tblAros" (
+  "id" SERIAL UNIQUE,
+  "parent" INTEGER,
+  "model" text NOT NULL,
+  "foreignid" INTEGER NOT NULL DEFAULT '0',
+  "alias" varchar(255)
+);
+
+CREATE TABLE "tblAcos" (
+  "id" SERIAL UNIQUE,
+  "parent" INTEGER,
+  "model" text NOT NULL,
+  "foreignid" INTEGER NOT NULL DEFAULT '0',
+  "alias" varchar(255)
+);
+
+CREATE TABLE "tblArosAcos" (
+  "id" SERIAL UNIQUE,
+  "aro" INTEGER NOT NULL DEFAULT '0',
+  "aco" INTEGER NOT NULL DEFAULT '0',
+  "create" tinyint(4) NOT NULL DEFAULT '-1',
+  "read" tinyint(4) NOT NULL DEFAULT '-1',
+  "update" tinyint(4) NOT NULL DEFAULT '-1',
+  "delete" tinyint(4) NOT NULL DEFAULT '-1',
+  UNIQUE (aco, aro),
+  CONSTRAINT "tblArosAcos_acos" FOREIGN KEY ("aco") REFERENCES "tblAcos" ("id") ON DELETE CASCADE,
+  CONSTRAINT "tblArosAcos_aros" FOREIGN KEY ("aro") REFERENCES "tblAros" ("id") ON DELETE CASCADE
+);
+
+UPDATE "tblVersion" set "major"=6, "minor"=0, "subminor"=0;
+
+COMMIT;
+

From 9aadb7f471d2f4b61bcc5a9ef6905e97a390f61e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Feb 2017 07:04:49 +0100
Subject: [PATCH 0757/2006] fix merge errors

---
 install/create_tables-postgres.sql | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index 047da6c51..af8fd53b3 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -44,8 +44,6 @@ CREATE TABLE "tblAttributeDefinitions" (
 -- --------------------------------------------------------
 
 -- 
-<<<<<<< HEAD
-=======
 -- Table structure for table `tblUsers`
 -- 
 
@@ -59,7 +57,6 @@ CREATE TABLE "tblRoles" (
 -- --------------------------------------------------------
 
 -- 
->>>>>>> seeddms-6.0.x-postgres
 -- Table structure for table "tblUsers"
 -- 
 
@@ -67,10 +64,7 @@ CREATE TABLE "tblUsers" (
   "id" SERIAL UNIQUE,
   "login" varchar(50) default NULL,
   "pwd" varchar(50) default NULL,
-<<<<<<< HEAD
-=======
   "secret" varchar(50) default NULL,
->>>>>>> seeddms-6.0.x-postgres
   "fullName" varchar(100) default NULL,
   "email" varchar(70) default NULL,
   "language" varchar(32) NOT NULL,
@@ -81,11 +75,7 @@ CREATE TABLE "tblUsers" (
   "pwdExpiration" TIMESTAMP default NULL,
   "loginfailures" INTEGER NOT NULL default '0',
   "disabled" INTEGER NOT NULL default '0',
-<<<<<<< HEAD
   "quota" BIGINT,
-=======
-  "quota" INTEGER,
->>>>>>> seeddms-6.0.x-postgres
   "homefolder" INTEGER default NULL,
   UNIQUE ("login")
 );
@@ -138,11 +128,7 @@ CREATE TABLE "tblUserImages" (
   "id" SERIAL UNIQUE,
   "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
   "image" TEXT NOT NULL,
-<<<<<<< HEAD
   "mimeType" varchar(100) NOT NULL default ''
-=======
-  "mimeType" varchar(10) NOT NULL default ''
->>>>>>> seeddms-6.0.x-postgres
 ) ;
 
 -- --------------------------------------------------------

From 6006dd3944a50ebfc17b836c8f6bea455280e0f7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Feb 2017 07:23:02 +0100
Subject: [PATCH 0758/2006] fix all sql errors

---
 install/update-6.0.0/update-postgres.sql | 35 ++++++++++++------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/install/update-6.0.0/update-postgres.sql b/install/update-6.0.0/update-postgres.sql
index 9e94ab5cc..0631c9bb3 100644
--- a/install/update-6.0.0/update-postgres.sql
+++ b/install/update-6.0.0/update-postgres.sql
@@ -2,9 +2,9 @@ START TRANSACTION;
 
 ALTER TABLE "tblDocumentContent" ADD COLUMN "revisiondate" TIMESTAMP default NULL;
 
-ALTER TABLE "tblUsers" ADD COLUMN "secret" varchar(50) default NULL AFTER "pwd";
+ALTER TABLE "tblUsers" ADD COLUMN "secret" varchar(50) default NULL;
 
-ALTER TABLE "tblWorkflows" ADD COLUMN "layoutdata" text default NULL AFTER "initstate";
+ALTER TABLE "tblWorkflows" ADD COLUMN "layoutdata" text default NULL;
 
 CREATE TABLE "tblUserSubstitutes" (
   "id" SERIAL UNIQUE,
@@ -29,16 +29,16 @@ CREATE TABLE "tblDocumentRecipients" (
   "receiptID" SERIAL UNIQUE,
   "documentID" INTEGER NOT NULL default '0',
   "version" INTEGER NOT NULL default '0',
-  "type" tinyint(4) NOT NULL default '0',
+  "type" INTEGER NOT NULL default '0',
   "required" INTEGER NOT NULL default '0',
-  UNIQUE KEY "documentID" ("documentID","version","type","required"),
+  UNIQUE ("documentID","version","type","required"),
   CONSTRAINT "tblDocumentRecipients_document" FOREIGN KEY ("documentID") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE
 );
 
 CREATE TABLE "tblDocumentReceiptLog" (
   "receiptLogID" SERIAL UNIQUE,
   "receiptID" INTEGER NOT NULL default '0',
-  "status" tinyint(4) NOT NULL default '0',
+  "status" INTEGER NOT NULL default '0',
   "comment" text NOT NULL,
   "date" TIMESTAMP NOT NULL,
   "userID" INTEGER NOT NULL default '0',
@@ -50,17 +50,17 @@ CREATE TABLE "tblDocumentRevisors" (
   "revisionID" SERIAL UNIQUE,
   "documentID" INTEGER NOT NULL default '0',
   "version" INTEGER NOT NULL default '0',
-  "type" tinyint(4) NOT NULL default '0',
+  "type" INTEGER NOT NULL default '0',
   "required" INTEGER NOT NULL default '0',
   "startdate" TIMESTAMP default NULL,
-  UNIQUE KEY "documentID" ("documentID","version","type","required"),
+  UNIQUE ("documentID","version","type","required"),
   CONSTRAINT "tblDocumentRevisors_document" FOREIGN KEY ("documentID") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE
 );
 
 CREATE TABLE "tblDocumentRevisionLog" (
   "revisionLogID" SERIAL UNIQUE,
   "revisionID" INTEGER NOT NULL default '0',
-  "status" tinyint(4) NOT NULL default '0',
+  "status" INTEGER NOT NULL default '0',
   "comment" text NOT NULL,
   "date" TIMESTAMP NOT NULL,
   "userID" INTEGER NOT NULL default '0',
@@ -74,7 +74,7 @@ CREATE TABLE "tblTransmittals" (
   "comment" text NOT NULL,
   "userID" INTEGER NOT NULL default '0',
   "date" TIMESTAMP default NULL,
-  "public" tinyint(1) NOT NULL default '0',
+  "public" INTEGER NOT NULL default '0',
   CONSTRAINT "tblTransmittals_user" FOREIGN KEY ("userID") REFERENCES "tblUsers" ("id") ON DELETE CASCADE
 );
 
@@ -82,9 +82,9 @@ CREATE TABLE "tblTransmittalItems" (
   "id" SERIAL UNIQUE,
 	"transmittal" INTEGER NOT NULL DEFAULT '0',
   "document" INTEGER default NULL,
-  "version" INTEGER unsigned NOT NULL default '0',
+  "version" INTEGER NOT NULL default '0',
   "date" TIMESTAMP default NULL,
-  UNIQUE (transmittal, document, version),
+  UNIQUE ("transmittal", "document", "version"),
   CONSTRAINT "tblTransmittalItems_document" FOREIGN KEY ("document") REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
   CONSTRAINT "tblTransmittalItem_transmittal" FOREIGN KEY ("transmittal") REFERENCES "tblTransmittals" ("id") ON DELETE CASCADE
 );
@@ -104,7 +104,8 @@ SELECT nextval('"tblRoles_id_seq"');
 INSERT INTO "tblRoles" ("id", "name", "role") VALUES (3, 'User', 0);
 SELECT nextval('"tblRoles_id_seq"');
 
-ALTER TABLE "tblUsers" CHANGE "role" "role" INTEGER NOT NULL;
+ALTER TABLE "tblUsers" ALTER "role" DROP DEFAULT;
+ALTER TABLE "tblUsers" ALTER "role" SET NOT NULL;
 UPDATE "tblUsers" SET role=3 WHERE role=0;
 ALTER TABLE "tblUsers" ADD CONSTRAINT "tblUsers_role" FOREIGN KEY ("role") REFERENCES "tblRoles" ("id");
 
@@ -128,11 +129,11 @@ CREATE TABLE "tblArosAcos" (
   "id" SERIAL UNIQUE,
   "aro" INTEGER NOT NULL DEFAULT '0',
   "aco" INTEGER NOT NULL DEFAULT '0',
-  "create" tinyint(4) NOT NULL DEFAULT '-1',
-  "read" tinyint(4) NOT NULL DEFAULT '-1',
-  "update" tinyint(4) NOT NULL DEFAULT '-1',
-  "delete" tinyint(4) NOT NULL DEFAULT '-1',
-  UNIQUE (aco, aro),
+  "create" INTEGER NOT NULL DEFAULT '-1',
+  "read" INTEGER NOT NULL DEFAULT '-1',
+  "update" INTEGER NOT NULL DEFAULT '-1',
+  "delete" INTEGER NOT NULL DEFAULT '-1',
+  UNIQUE ("aco", "aro"),
   CONSTRAINT "tblArosAcos_acos" FOREIGN KEY ("aco") REFERENCES "tblAcos" ("id") ON DELETE CASCADE,
   CONSTRAINT "tblArosAcos_aros" FOREIGN KEY ("aro") REFERENCES "tblAros" ("id") ON DELETE CASCADE
 );

From 7f28008d5d5d801f1515ef78a015b660b610b888 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Feb 2017 08:16:22 +0100
Subject: [PATCH 0759/2006] get and set secret of user

---
 utils/xmldump.php   | 1 +
 utils/xmlimport.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index 6acf4ce56..25a5975b4 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -567,6 +567,7 @@ if($users) {
 		echo "  <attr name=\"disabled\">".$user->isDisabled()."</attr>\n";
 		echo "  <attr name=\"pwdexpiration\">".$user->getPwdExpiration()."</attr>\n";
 		echo "  <attr name=\"homefolder\">".$user->getHomeFolder()."</attr>\n";
+		echo "  <attr name=\"secret\">".$user->getSecret()."</attr>\n";
 		if($image = $user->getImage()) {
 			echo "  <image id=\"".$image['id']."\">\n";
 			echo "   <attr name=\"mimetype\">".$image['mimeType']."</attr>\n";
diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 261bf279c..ef9360654 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -133,6 +133,8 @@ function insert_user($user) { /* {{{ */
 				$logger->debug($dms->getDB()->getErrorMsg());
 				return false;
 			} else {
+				if($user['attributes']['secret'])
+					$newUser->setSecret($user['attributes']['secret']);
 				$logger->info("Added user '".$user['attributes']['login']."'");
 				if(isset($user['image']) && $user['image']) {
 					$filecontents = base64_decode($user['image']['data']);

From 37fb2e2c475f3c3982963b4e4568b239a81fef68 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Feb 2017 15:37:29 +0100
Subject: [PATCH 0760/2006] pass access object to view, don't use mode anymore

---
 out/out.Calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index c655f0aa0..43c943835 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.php
@@ -33,7 +33,6 @@ if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("calendar"),getMLText("access_denied"));
 }
 
-if ($_GET["mode"]) $mode=$_GET["mode"];
 if (isset($_GET["start"])) $start=$_GET["start"];
 else $start = '';
 if (isset($_GET["end"])) $end=$_GET["end"];
@@ -74,6 +73,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From 32241d14034b9f7f885039f14f073fe14894414e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2017 09:22:06 +0100
Subject: [PATCH 0761/2006] include feedwriter from vendor

---
 views/bootstrap/class.TimelineFeed.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
index 877ab3351..3a9333a7c 100644
--- a/views/bootstrap/class.TimelineFeed.php
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -16,9 +16,7 @@
  */
 require_once("class.Bootstrap.php");
 
-require_once("FeedWriter/Item.php");
-require_once("FeedWriter/Feed.php");
-require_once("FeedWriter/RSS2.php");
+require_once("vendor/autoload.php");
 
 use \FeedWriter\RSS2;
 

From e102f5d6bc8be8f82f18cff7546cce3dfc0f85d5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2017 09:30:10 +0100
Subject: [PATCH 0762/2006] include PHPExcel from vendor directory

---
 inc/inc.ClassDownloadMgr.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 770a874e7..62c4bcbe4 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -13,7 +13,8 @@
  * @version    Release: @package_version@
  */
 
-require_once("PHPExcel.php");
+#require_once("PHPExcel.php");
+require_once("vendor/autoload.php");
 
 /**
  * Class to represent an download manager

From 293091d13d841c2abb487dab4bda86ac8f33527e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2017 09:44:47 +0100
Subject: [PATCH 0763/2006] fix includes

---
 out/out.Calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index fa40d2e27..25e87da58 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.php
@@ -19,12 +19,12 @@
 
 include("../inc/inc.Settings.php");
 include("../inc/inc.ClassCalendar.php");
-include("../inc/inc.DBInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));

From e9c029e8fc04c40a69724e7a23a832bb7397463e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Feb 2017 17:12:27 +0100
Subject: [PATCH 0764/2006] fix syntax error

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 846a3d573..4943f9bee 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1878,7 +1878,7 @@ class SeedDMS_Core_DMS {
 			$role = $role->getID();
 		elseif($role == '')
 			$role = '0';
-		if(trim($pwdexpiration) == '' || trim($pwdexpiration) == 'never')
+		if(trim($pwdexpiration) == '' || trim($pwdexpiration) == 'never') {
 			$pwdexpiration = 'NULL';
 		} elseif(trim($pwdexpiration) == 'now') {
 			$pwdexpiration = $db->qstr(date('Y-m-d H:i:s'));

From 4fe435f45086e856d97c58b124e6bdaaee4cfb08 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Mar 2017 14:09:25 +0100
Subject: [PATCH 0765/2006] fix error msg when access is not allowed

---
 out/out.AddFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.AddFile.php b/out/out.AddFile.php
index 7e9bdd01e..7d1db9f2a 100644
--- a/out/out.AddFile.php
+++ b/out/out.AddFile.php
@@ -33,7 +33,7 @@ $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if (!$accessop->check_view_access($view, $_GET)) {
-	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+	UI::exitError(getMLText("document_title"), getMLText("access_denied"));
 }
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"]<1)) {

From 390a653b94e038e3d9a66ca706636d59d9168d03 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Mar 2017 14:10:03 +0100
Subject: [PATCH 0766/2006] do not show 'AddFile' link if access is not allowed

---
 views/bootstrap/class.ViewDocument.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 45071990e..9e2cf283f 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1524,8 +1524,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		else printMLText("no_attached_files");
 
-		if ($document->getAccessMode($user) >= M_READWRITE){
-			print "<ul class=\"unstyled\"><li>".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."</li></ul>\n";
+		if($this->check_access('AddFile')) {
+			if ($document->getAccessMode($user) >= M_READWRITE){
+				print "<ul class=\"unstyled\"><li>".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."</li></ul>\n";
+			}
 		}
 		$this->contentContainerEnd();
 ?>

From b05a7f2ba5c2435451d50126b83a9b4aea7dfc4b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Mar 2017 22:07:15 +0100
Subject: [PATCH 0767/2006] add method rewriteReceiptLog()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 71 +++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 105b05123..d878680d1 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3593,6 +3593,77 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_receiptStatus;
 	} /* }}} */
 
+	/**
+	 * Rewrites the complete receipt log
+	 * 
+	 * Attention: this function is highly dangerous.
+	 * It removes an existing receipt log and rewrites it.
+	 * This method was added for importing an xml dump.
+	 *
+	 * @param array $receiptlog new status log with the newest log entry first.
+	 * @return boolean true on success, otherwise false
+	 */
+	function rewriteReceiptLog($recipients) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr= "SELECT `tblDocumentRecipients`.* FROM `tblDocumentRecipients` WHERE `tblDocumentRecipients`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentRecipients`.`version` = '". $this->_version ."' ";
+		$res = $db->getResultArray($queryStr);
+		if (is_bool($res) && !$res)
+			return false;
+
+		$db->startTransaction();
+
+		if($res) {
+			foreach($res as $receipt) {
+				$receiptID = $receipt['receiptID'];
+
+				/* First, remove the old entries */
+				$queryStr = "DELETE from `tblDocumentReceiptLog` where `receiptID`=".$receiptID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+
+				$queryStr = "DELETE from `tblDocumentRecipients` where `receiptID`=".$receiptID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
+		}
+
+		/* Second, insert the new entries */
+		foreach($recipients as $receipt) {
+			$queryStr = "INSERT INTO `tblDocumentRecipients` (`documentID`, `version`, `type`, `required`) ".
+				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$receipt['type'] .", ".$receipt['required']->getID().")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$receiptID = $db->getInsertID('tblDocumentRecipients', 'receiptID');
+			$receiptlog = array_reverse($receipt['logs']);
+			foreach($receiptlog as $log) {
+				if(!SeedDMS_Core_DMS::checkDate($log['date'], 'Y-m-d H:i:s')) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('".$receiptID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".$log['user']->getID().")";
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				$receiptLogID = $db->getInsertID('tblDocumentReceiptLog', 'receiptLogID');
+				if(!empty($log['file'])) {
+					SeedDMS_Core_File::copyFile($log['file'], $this->_dms->contentDir . $this->_document->getDir() . 'r' . $receiptLogID);
+				}
+			}
+		}
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
 	/**
 	 * Get the current revision status of the document content
 	 * The revision status is a list of revisions

From 469270882c9a99a6ee26f6354f4bb1534e8eb9b4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Mar 2017 22:09:42 +0100
Subject: [PATCH 0768/2006] add receiptlog

---
 utils/xmlimport.php | 49 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index ef9360654..98b3d7f57 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -40,10 +40,15 @@ function getRevAppLog($reviews) { /* {{{ */
 		if($review['attributes']['type'] == 1) {
 			if(isset($objmap['groups'][(int) $review['attributes']['required']]))
 				$newreview['required'] = $dms->getGroup($objmap['groups'][(int) $review['attributes']['required']]);
+			else
+				$logger->warning("Group ".(int) $review['attributes']['required']." for Log cannot be mapped");
 		} else {
 			if(isset($objmap['users'][(int) $review['attributes']['required']]))
 				$newreview['required'] = $dms->getUser($objmap['users'][(int) $review['attributes']['required']]);
+			else
+				$logger->warning("User ".(int) $review['attributes']['required']." for Log cannot be mapped");
 		}
+		if(isset($newreview['required'])) {
 		$newreview['logs'] = array();
 		foreach($review['logs'] as $j=>$log) {
 			if(!array_key_exists($log['attributes']['user'], $objmap['users'])) {
@@ -64,6 +69,7 @@ function getRevAppLog($reviews) { /* {{{ */
 			}
 		}
 		$newreviews[] = $newreview;
+		}
 	}
 	return $newreviews;
 } /* }}} */
@@ -643,6 +649,10 @@ function insert_document($document) { /* {{{ */
 			$newapprovals = getRevAppLog($initversion['approvals']);
 			$newVersion->rewriteApprovalLog($newapprovals);
 		}
+		if($initversion['receipts']) {
+			$newreceipts = getRevAppLog($initversion['receipts']);
+			$newVersion->rewriteReceiptLog($newreceipts);
+		}
 
 		if($initversion['workflowlogs']) {
 			$newworkflowlogs = getWorkflowLog($initversion['workflowlogs']);
@@ -753,6 +763,10 @@ function insert_document($document) { /* {{{ */
 				$newapprovals = getRevAppLog($version['approvals']);
 				$newVersion->rewriteApprovalLog($newapprovals);
 			}
+			if($version['receipts']) {
+				$newreceipts = getRevAppLog($version['receipts']);
+				$newVersion->rewriteReceiptLog($newreceipts);
+			}
 
 			if($version['workflowlogs']) {
 				$newworkflowlogs = getWorkflowLog($version['workflowlogs']);
@@ -1050,7 +1064,7 @@ function set_mandatory() { /* {{{ */
 } /* }}} */
 
 function startElement($parser, $name, $attrs) { /* {{{ */
-	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
+	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	$parent = end($elementstack);
 	array_push($elementstack, array('name'=>$name, 'attributes'=>$attrs));
@@ -1172,6 +1186,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 			$cur_version['attributes'] = array();
 			$cur_version['approvals'] = array();
 			$cur_version['reviews'] = array();
+			$cur_version['receipts'] = array();
 			$cur_version['statuslogs'] = array();
 			$cur_version['workflowlogs'] = array();
 			break;
@@ -1204,6 +1219,15 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 			$cur_reviewlog = array();
 			$cur_reviewlog['attributes'] = array();
 			break;
+		case "RECEIPT":
+			$cur_receipt = array();
+			$cur_receipt['attributes'] = array();
+			$cur_receipt['logs'] = array();
+			break;
+		case "RECEIPTLOG":
+			$cur_receiptlog = array();
+			$cur_receiptlog['attributes'] = array();
+			break;
 		case 'ATTRIBUTEDEFINITION':
 			$cur_attrdef = array();
 			$cur_attrdef['id'] = (int) $attrs['ID'];
@@ -1235,6 +1259,10 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_review['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'REVIEWLOG') {
 				$cur_reviewlog['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'RECEIPT') {
+				$cur_receipt['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'RECEIPTLOG') {
+				$cur_receiptlog['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'FOLDER') {
 				if(isset($attrs['TYPE']) && $attrs['TYPE'] == 'user') {
 					$cur_folder['user_attributes'][$attrs['ATTRDEF']] = '';
@@ -1427,7 +1455,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 } /* }}} */
 
 function endElement($parser, $name) { /* {{{ */
-	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
+	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	array_pop($elementstack);
 	$parent = end($elementstack);
@@ -1461,6 +1489,12 @@ function endElement($parser, $name) { /* {{{ */
 		case "REVIEWLOG":
 			$cur_review['logs'][] = $cur_reviewlog;
 			break;
+		case "RECEIPT":
+			$cur_version['receipts'][] = $cur_receipt;
+			break;
+		case "RECEIPTLOG":
+			$cur_receipt['logs'][] = $cur_receiptlog;
+			break;
 		case "USER":
 			/* users can be the users data or the member of a group */
 			$first = $elementstack[1];
@@ -1567,7 +1601,7 @@ function endElement($parser, $name) { /* {{{ */
 } /* }}} */
 
 function characterData($parser, $data) { /* {{{ */
-	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
+	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	$current = end($elementstack);
 	$parent = prev($elementstack);
@@ -1637,6 +1671,15 @@ function characterData($parser, $data) { /* {{{ */
 					else
 						$cur_reviewlog['attributes'][$current['attributes']['NAME']] = $data;
 					break;
+				case 'RECEIPT':
+					$cur_receipt['attributes'][$current['attributes']['NAME']] = $data;
+					break;
+				case 'RECEIPTLOG':
+					if(isset($cur_receiptlog['attributes'][$current['attributes']['NAME']]))
+						$cur_receiptlog['attributes'][$current['attributes']['NAME']] .= $data;
+					else
+						$cur_receiptlog['attributes'][$current['attributes']['NAME']] = $data;
+					break;
 				case 'WORKFLOWLOG':
 					if(isset($cur_workflowlog['attributes'][$current['attributes']['NAME']]))
 						$cur_workflowlog['attributes'][$current['attributes']['NAME']] .= $data;

From 322bef00a2c579f2c1c33ef3b0a33e2d88374e55 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 6 Mar 2017 10:56:16 +0100
Subject: [PATCH 0769/2006] include inc/inc.ClassAcl.php

---
 utils/xmldump.php   | 2 ++
 utils/xmlimport.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index da2e560b4..21989ab4a 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -1,8 +1,10 @@
 <?php
 if(isset($_SERVER['SEEDDMS_HOME'])) {
 	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
+	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassAcl.php");
 } else {
 	require_once("../inc/inc.ClassSettings.php");
+	require_once("../inc/inc.ClassAcl.php");
 }
 
 function usage() { /* {{{ */
diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 0a7d05b1c..60be29e99 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -1,8 +1,10 @@
 <?php
 if(isset($_SERVER['SEEDDMS_HOME'])) {
 	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
+	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassAcl.php");
 } else {
 	require_once("../inc/inc.ClassSettings.php");
+	require_once("../inc/inc.ClassAcl.php");
 }
 require("Log.php");
 

From d95943a3651ffcc8e6c8634a10dcd92dc4e65e2b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 8 Mar 2017 21:57:02 +0100
Subject: [PATCH 0770/2006] enlarge interval for checkTask() and timeout of
 ajax call

---
 styles/bootstrap/application.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 488ab66b0..26f8e9613 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1026,8 +1026,8 @@ $(document).ready(function() { /* {{{ */
 					}
 				}
 			},
-			timeout: 1000
+			timeout: 3000
 		}); 
-		timeOutId = setTimeout(checkTasks, 10000);
+		timeOutId = setTimeout(checkTasks, 30000);
 	}
 

From ee4215f89eae5bd9ebfcd49096e0583239cacc30 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Mar 2017 11:14:31 +0100
Subject: [PATCH 0771/2006] rewriteReceiptLog() can handle none exiting users

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index a5e4c6a93..503d3c554 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3635,7 +3635,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		/* Second, insert the new entries */
 		foreach($recipients as $receipt) {
 			$queryStr = "INSERT INTO `tblDocumentRecipients` (`documentID`, `version`, `type`, `required`) ".
-				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$receipt['type'] .", ".$receipt['required']->getID().")";
+				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$receipt['type'] .", ".(is_object($receipt['required']) ? $receipt['required']->getID() : (int) $receipt['required']).")";
 			if (!$db->getResult($queryStr)) {
 				$db->rollbackTransaction();
 				return false;
@@ -3648,7 +3648,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 					return false;
 				}
 				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('".$receiptID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".$log['user']->getID().")";
+					"VALUES ('".$receiptID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".(is_object($log['user']) ? $log['user']->getID() : (int) $log['user']).")";
 				if (!$db->getResult($queryStr)) {
 					$db->rollbackTransaction();
 					return false;

From 43b613c2104826d5833e03ebf285830714b76b4d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Mar 2017 11:33:09 +0100
Subject: [PATCH 0772/2006] add method rewriteRevisionLog()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 71 +++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 503d3c554..09959b0da 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3716,6 +3716,77 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_revisionStatus;
 	} /* }}} */
 
+	/**
+	 * Rewrites the complete revision log
+	 * 
+	 * Attention: this function is highly dangerous.
+	 * It removes an existing receipt log and rewrites it.
+	 * This method was added for importing an xml dump.
+	 *
+	 * @param array $revisionlog new status log with the newest log entry first.
+	 * @return boolean true on success, otherwise false
+	 */
+	function rewriteRevisionLog($revisions) { /* {{{ */
+		$db = $this->_document->_dms->getDB();
+
+		$queryStr= "SELECT `tblDocumentRevisors`.* FROM `tblDocumentRevisors` WHERE `tblDocumentRevisors`.`documentID` = '". $this->_document->getID() ."' AND `tblDocumentRevisors`.`version` = '". $this->_version ."' ";
+		$res = $db->getResultArray($queryStr);
+		if (is_bool($res) && !$res)
+			return false;
+
+		$db->startTransaction();
+
+		if($res) {
+			foreach($res as $revision) {
+				$revisionID = $revision['revisionID'];
+
+				/* First, remove the old entries */
+				$queryStr = "DELETE from `tblDocumentRevisionLog` where `revisionID`=".$revisionID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+
+				$queryStr = "DELETE from `tblDocumentRevisors` where `revisionID`=".$revisionID;
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+			}
+		}
+
+		/* Second, insert the new entries */
+		foreach($revisions as $revision) {
+			$queryStr = "INSERT INTO `tblDocumentRevisors` (`documentID`, `version`, `type`, `required`) ".
+				"VALUES ('".$this->_document->getID()."', '".$this->_version."', ".$revision['type'] .", ".(is_object($revision['required']) ? $revision['required']->getID() : (int) $revision['required']).")";
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$revisionID = $db->getInsertID('tblDocumentRevisors', 'revisionID');
+			$revisionlog = array_reverse($revision['logs']);
+			foreach($revisionlog as $log) {
+				if(!SeedDMS_Core_DMS::checkDate($log['date'], 'Y-m-d H:i:s')) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('".$revisionID ."', '".(int) $log['status']."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".(is_object($log['user']) ? $log['user']->getID() : (int) $log['user']).")";
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				$revisionLogID = $db->getInsertID('tblDocumentRevisionLog', 'revisionLogID');
+				if(!empty($log['file'])) {
+					SeedDMS_Core_File::copyFile($log['file'], $this->_dms->contentDir . $this->_document->getDir() . 'r' . $revisionLogID);
+				}
+			}
+		}
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
 	function addIndReviewer($user, $requestUser) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 

From a65315c537dd8d2c92cfb505426bb9104e95842f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Mar 2017 12:41:21 +0100
Subject: [PATCH 0773/2006] move all task output into own view

---
 op/op.Ajax.php                      |  47 -----
 out/out.Clipboard.php               |   1 -
 out/out.Tasks.php                   |  41 ++++
 styles/bootstrap/application.js     |   6 +-
 views/bootstrap/class.Bootstrap.php | 127 ------------
 views/bootstrap/class.Tasks.php     | 309 ++++++++++++++++++++++++++++
 6 files changed, 353 insertions(+), 178 deletions(-)
 create mode 100644 out/out.Tasks.php
 create mode 100644 views/bootstrap/class.Tasks.php

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 39a8cd544..62830a05a 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -803,53 +803,6 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'mytasks': /* {{{ */
-		if($user) {
-			$startts = microtime(true);
-			$reviews = array();
-			$approvals = array();
-			$receipts = array();
-			$revisions = array();
-			$resArr = $dms->getDocumentList('ApproveByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$approvals[] = array('id'=>$res['id'], 'name'=>$res['name']);
-					}
-				}
-			}
-			$resArr = $dms->getDocumentList('ReviewByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$reviews[] = array('id'=>$res['id'], 'name'=>$res['name']);
-					}
-				}
-			}
-			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$receipts[] = array('id'=>$res['id'], 'name'=>$res['name']);
-					}
-				}
-			}
-			$resArr = $dms->getDocumentList('ReviseByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$revisions[] = array('id'=>$res['id'], 'name'=>$res['name']);
-					}
-				}
-			}
-			header('Content-Type: application/json');
-			echo json_encode(array('error'=>0, 'data'=>array('review'=>$reviews, 'approval'=>$approvals, 'receipt'=>$receipts, 'revision'=>$revisions), 'processing_time'=>microtime(true)-$startts));
-		}
-		break; /* }}} */
 	case 'indexdocument': /* {{{ */
 		if($user && $user->isAdmin()) {
 			if($settings->_enableFullSearch) {
diff --git a/out/out.Clipboard.php b/out/out.Clipboard.php
index 45c2e21fa..0df3d3763 100644
--- a/out/out.Clipboard.php
+++ b/out/out.Clipboard.php
@@ -26,7 +26,6 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
-include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.ClassUI.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
diff --git a/out/out.Tasks.php b/out/out.Tasks.php
new file mode 100644
index 000000000..0df3d3763
--- /dev/null
+++ b/out/out.Tasks.php
@@ -0,0 +1,41 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005 Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
+if($view) {
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view($_GET);
+	exit;
+}
+
+?>
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 9b5f89b31..91cc4fa38 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1017,17 +1017,17 @@ $(document).ready(function() { /* {{{ */
 
 	var approval_count, review_count, receipt_count, revision_count;
 	var checkTasks = function() {
-		$.ajax({url: '../op/op.Ajax.php',
+		$.ajax({url: '../out/out.Tasks.php',
 			type: 'GET',
 			dataType: "json",
-			data: {command: 'mytasks'},
+			data: {action: 'mytasks'},
 			success: function(data) {
 				if(data) {
 					if(approval_count != data.data.approval.length ||
 						 review_count != data.data.review.length ||
 						 receipt_count != data.data.receipt.length ||
 						 revision_count != data.data.revision.length) {
-						$("#menu-tasks > ul > li").html('Loading').hide().load('../op/op.Ajax.php?command=view&view=menutasks').fadeIn('500')
+						$("#menu-tasks > ul > li").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
 						approval_count = data.data.approval.length;
 						review_count = data.data.review.length;
 						receipt_count = data.data.receipt.length;
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 64d265386..44ed8bb43 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -240,45 +240,6 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "</div>\n";
 	} /* }}} */
 
-	/**
-	 * Returns the html needed for the clipboard list in the menu
-	 *
-	 * This function renders the clipboard in a way suitable to be
-	 * used as a menu
-	 *
-	 * @param array $clipboard clipboard containing two arrays for both
-	 *        documents and folders.
-	 * @return string html code
-	 */
-	function menuClipboard($clipboard) { /* {{{ */
-		if ($this->params['user']->isGuest() || (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
-			return '';
-		}
-		$content = '';
-		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
-		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
-		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		foreach($clipboard['folders'] as $folderid) {
-			if($folder = $this->params['dms']->getFolder($folderid))
-				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
-		}
-		foreach($clipboard['docs'] as $docid) {
-			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
-		}
-		$content .= "    <li class=\"divider\"></li>\n";
-		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
-			$content .= "    <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['refferer'])."\">".getMLText("move_clipboard")."</a></li>\n";
-		}
-//		$content .= "    <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
-		$content .= "    <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
-		$content .= "     </ul>\n";
-		$content .= "    </li>\n";
-		$content .= "   </ul>\n";
-		return $content;
-	} /* }}} */
-
 	/**
 	 * Returns the html needed for the clipboard list in the menu
 	 *
@@ -1689,94 +1650,6 @@ $(function() {
 		}
 	} /* }}} */
 
-	/**
-	 * Return clipboard content rendered as html
-	 *
-	 * @param array clipboard
-	 * @return string rendered html content
-	 */
-	function mainClipboard($clipboard, $previewer){ /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$accessop = $this->params['accessobject'];
-		$content = '';
-		$foldercount = $doccount = 0;
-		if($clipboard['folders']) {
-			foreach($clipboard['folders'] as $folderid) {
-				/* FIXME: check for access rights, which could have changed after adding the folder to the clipboard */
-				if($folder = $dms->getFolder($folderid)) {
-					$comment = $folder->getComment();
-					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
-					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
-					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
-					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
-					if($comment) {
-						$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
-					}
-					$content .= "</td>\n";
-					$content .= "<td>\n";
-					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
-					$content .= "</td>\n";
-					$content .= "</tr>\n";
-					$foldercount++;
-				}
-			}
-		}
-		if($clipboard['docs']) {
-			foreach($clipboard['docs'] as $docid) {
-				/* FIXME: check for access rights, which could have changed after adding the document to the clipboard */
-				if($document = $dms->getDocument($docid)) {
-					$comment = $document->getComment();
-					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
-					if($latestContent = $document->getLatestContent()) {
-						$previewer->createPreview($latestContent);
-						$version = $latestContent->getVersion();
-						$status = $latestContent->getStatus();
-						
-						$content .= "<tr draggable=\"true\" rel=\"document_".$docid."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">";
-
-						if (file_exists($dms->contentDir . $latestContent->getPath())) {
-							$content .= "<td>";
-							if($accessop->check_controller_access('Download', array('action'=>'version')))
-								$content .= "<a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docid."&version=".$version."\">";
-							if($previewer->hasPreview($latestContent)) {
-								$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"40\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							} else {
-								$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-							}
-							if($accessop->check_controller_access('Download', array('action'=>'version')))
-								$content .= "</a>";
-							$content .= "</td>";
-						} else
-							$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
-						
-						$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docid."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
-						if($comment) {
-							$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
-						}
-						$content .= "</td>\n";
-						$content .= "<td>\n";
-						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
-						$content .= "</td>\n";
-						$content .= "</tr>";
-						$doccount++;
-					}
-				}
-			}
-		}
-
-		/* $foldercount or $doccount will only count objects which are
-		 * actually available
-		 */
-		if($foldercount || $doccount) {
-			$content = "<table class=\"table\">".$content;
-			$content .= "</table>";
-		} else {
-		}
-		$content .= "<div class=\"alert add-clipboard-area\">".getMLText("drag_icon_here")."</div>";
-		return $content;
-	} /* }}} */
-
 	/**
 	 * Print clipboard in div container
 	 *
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
new file mode 100644
index 000000000..77e694871
--- /dev/null
+++ b/views/bootstrap/class.Tasks.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * Implementation of Tasks view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+/**
+ * Class which outputs the html page for clipboard view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
+
+	private function __myTasks() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$tasks['review'] = array();
+		$tasks['approval'] = array();
+		$tasks['receipt'] = array();
+		$tasks['revision'] = array();
+		$resArr = $dms->getDocumentList('ApproveByMe', $user);
+		if($resArr) {
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+		}
+		$resArr = $dms->getDocumentList('ReviewByMe', $user);
+		if($resArr) {
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+		}
+		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+		if($resArr) {
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+		}
+		$resArr = $dms->getDocumentList('ReviseByMe', $user);
+		if($resArr) {
+			foreach ($resArr as $res) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+				}
+			}
+		}
+		return $tasks;
+	} /* }}} */
+
+	/**
+	 * Returns the html needed for the task list in the menu
+	 *
+	 * This function renders the tasks in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	function myTasks() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$startts = microtime(true);
+
+		$tasks = $this->__myTasks();
+
+		header('Content-Type: application/json');
+		echo json_encode(array('error'=>0, 'data'=>$tasks, 'processing_time'=>microtime(true)-$startts));
+	} /* }}} */
+
+	/**
+	 * Returns the html needed for the task list in the menu
+	 *
+	 * This function renders the tasks in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	function menuTasks() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$tasks = $this->__myTasks();
+
+		$content = '';
+//		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
+//		$content .= "    <li class=\"dropdown\">\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		if($tasks['review']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_review")."</a>\n";
+		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['review'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "      <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if($tasks['approval']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_approve")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['approval'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if($tasks['receipt']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['receipt'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if($tasks['revision']) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['revision'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revision\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
+		if ($this->check_access('MyDocuments')) {
+			$content .= "    <li class=\"divider\"></li>\n";
+			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
+		}
+		$content .= "     </ul>\n";
+//		$content .= "    </li>\n";
+//		$content .= "   </ul>\n";
+		echo $content;
+	} /* }}} */
+
+	/**
+	 * Returns the html needed for the clipboard list in the menu
+	 *
+	 * This function renders the clipboard in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	public function menuClipboard() { /* {{{ */
+		$clipboard = $this->params['session']->getClipboard();
+		if ($this->params['user']->isGuest() || (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
+			return '';
+		}
+		$content = '';
+		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
+		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($clipboard['folders'] as $folderid) {
+			if($folder = $this->params['dms']->getFolder($folderid))
+				$content .= "    <li><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><i class=\"icon-folder-close-alt\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
+		}
+		foreach($clipboard['docs'] as $docid) {
+			if($document = $this->params['dms']->getDocument($docid))
+				$content .= "    <li><a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><i class=\"icon-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
+		}
+		$content .= "    <li class=\"divider\"></li>\n";
+		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
+			$content .= "    <li><a href=\"../op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['refferer'])."\">".getMLText("move_clipboard")."</a></li>\n";
+		}
+//		$content .= "    <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
+		$content .= "    <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
+		$content .= "     </ul>\n";
+		$content .= "    </li>\n";
+		$content .= "   </ul>\n";
+		echo $content;
+	} /* }}} */
+
+	/**
+	 * Return clipboard content rendered as html
+	 *
+	 * @param array clipboard
+	 * @return string rendered html content
+	 */
+	public function mainClipboard() { /* {{{ */
+		$dms = $this->params['dms'];
+		$clipboard = $this->params['session']->getClipboard();
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$content = '';
+		$foldercount = $doccount = 0;
+		if($clipboard['folders']) {
+			foreach($clipboard['folders'] as $folderid) {
+				/* FIXME: check for access rights, which could have changed after adding the folder to the clipboard */
+				if($folder = $dms->getFolder($folderid)) {
+					$comment = $folder->getComment();
+					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
+					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
+					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
+					if($comment) {
+						$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
+					}
+					$content .= "</td>\n";
+					$content .= "<td>\n";
+					$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"F".$folderid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$folderid."&type=folder\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+					$content .= "</td>\n";
+					$content .= "</tr>\n";
+					$foldercount++;
+				}
+			}
+		}
+		if($clipboard['docs']) {
+			foreach($clipboard['docs'] as $docid) {
+				/* FIXME: check for access rights, which could have changed after adding the document to the clipboard */
+				if($document = $dms->getDocument($docid)) {
+					$comment = $document->getComment();
+					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
+					if($latestContent = $document->getLatestContent()) {
+						$previewer->createPreview($latestContent);
+						$version = $latestContent->getVersion();
+						$status = $latestContent->getStatus();
+						
+						$content .= "<tr draggable=\"true\" rel=\"document_".$docid."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">";
+
+						if (file_exists($dms->contentDir . $latestContent->getPath())) {
+							$content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docid."&version=".$version."\">";
+							if($previewer->hasPreview($latestContent)) {
+								$content .= "<img draggable=\"false\" class=\"mimeicon\" width=\"40\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							} else {
+								$content .= "<img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							}
+							$content .= "</a></td>";
+						} else
+							$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
+						
+						$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docid."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
+						if($comment) {
+							$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
+						}
+						$content .= "</td>\n";
+						$content .= "<td>\n";
+						$content .= "<div class=\"list-action\"><a class=\"removefromclipboard\" rel=\"D".$docid."\" msg=\"".getMLText('splash_removed_from_clipboard')."\" _href=\"../op/op.RemoveFromClipboard.php?folderid=".(isset($this->params['folder']) ? $this->params['folder']->getID() : '')."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
+						$content .= "</td>\n";
+						$content .= "</tr>";
+						$doccount++;
+					}
+				}
+			}
+		}
+
+		/* $foldercount or $doccount will only count objects which are
+		 * actually available
+		 */
+		if($foldercount || $doccount) {
+			$content = "<table class=\"table\">".$content;
+			$content .= "</table>";
+		} else {
+		}
+		$content .= "<div class=\"alert add-clipboard-area\">".getMLText("drag_icon_here")."</div>";
+		echo $content;
+	} /* }}} */
+
+}

From 050a2e60dfc86509f47576430a94d33da493a87f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Mar 2017 07:07:57 +0100
Subject: [PATCH 0774/2006] remove some debug echos

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 09959b0da..434d20166 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4864,7 +4864,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		 */
 		if(count($revisionStatus[$field]) == 0) {
 			$queryStr = "DELETE from `tblDocumentRevisors` WHERE `documentID` = ". $this->_document->getID() ." AND `version` = ".$this->_version." AND `type` = ". $type ." AND `required` = ".$object->getID();
-			echo $queryStr;
 			if (!$db->getResult($queryStr)) {
 				return -1;
 			}
@@ -5348,7 +5347,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$this->_workflow->setDMS($this->_document->_dms);
 
 			if($transition) {
-			echo "Trigger transition";
 				if(false === $this->triggerWorkflowTransition($user, $transition, $comment)) {
 					$db->rollbackTransaction();
 					return false;

From c18f09d344631096b5d30bc3828aa9164c3b93a0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Mar 2017 15:22:55 +0100
Subject: [PATCH 0775/2006] start new version 6.0.1

---
 CHANGELOG                          |  4 ++++
 Makefile                           |  2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 28 ++++++++++++++++++++++++++++
 inc/inc.Version.php                |  2 +-
 install/install.php                |  2 +-
 6 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f023bac97..eecc24627 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.1
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0
 --------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 4775ba05b..67e38fbc3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=6.0.0
+VERSION=6.0.1
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 8bc37c0e7..1b7177147 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -442,7 +442,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.0';
+			$this->version = '6.0.1';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ebdebfc90..9d57e424a 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1389,5 +1389,33 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - added postgres support
    </notes>
   </release>
+  <release>
+   <date>2017-02-28</date>
+   <time>06:34:50</time>
+   <version>
+    <release>6.0.0</release>
+    <api>6.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 5.1.1 merged
+- SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus()
+only return entries of the latest document version if not specific document and
+version is passed
+- temp. table for revisions can be created
+- new methods SeedDMS_Core_DMS::getDocumentsInReception() and
+SeedDMS_Core_DMS::getDocumentsInRevision()
+- limit hits of sql statement in SeedDMЅ_Core_DMS::getDuplicateDocumentContent() to 1000
+- finishRevsion() puts all revisors into state waiting, so a new revision can be started
+- fix SeedDMS_Core_Group::getRevisionStatus(), which did not always return the last
+log entry first
+- add roles
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index a258f57dd..db395aba2 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.0";
+	public $_number = "6.0.1";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index 891219391..80d4ce39e 100644
--- a/install/install.php
+++ b/install/install.php
@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "6.0.0");
+define("SEEDDMS_VERSION", "6.0.1");
 
 require_once('../inc/inc.ClassSettings.php');
 

From 3a615b6e061b00033a13b26b58ab0382aded333f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Mar 2017 13:29:00 +0100
Subject: [PATCH 0776/2006] optimize sql code to get locked documents

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 1b7177147..ade326807 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1106,12 +1106,27 @@ class SeedDMS_Core_DMS {
 				$orderdir = 'DESC';
 			else
 				$orderdir = 'ASC';
-			$queryStr .= "AND `tblDocumentLocks`.`userID` = '".$user->getID()."' ";
-			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
-			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
-			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
-			else $queryStr .= "ORDER BY `name`";
-			$queryStr .= " ".$orderdir;
+
+			$qs = 'SELECT `document` FROM `tblDocumentLocks` WHERE `userID`='.$user->getID();
+			$ra = $this->db->getResultArray($qs);
+			if (is_bool($ra) && !$ra) {
+				return false;
+			}
+			$docs = array();
+			foreach($ra as $d) {
+				$docs[] = $d['document'];
+			}
+
+			if ($docs) {
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
+				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+				else $queryStr .= "ORDER BY `name`";
+				$queryStr .= " ".$orderdir;
+			} else {
+				$queryStr = '';
+			}
 			break; // }}}
 		case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning {{{
 			$user = $param1;

From d7af33f579d2ac799a4d3f36448e4ecc1e942bc9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 Apr 2017 07:09:56 +0200
Subject: [PATCH 0777/2006] raw content can be set for files added to archive

Setting the raw content will take the meta data from the document
content but use the file content as passed by the third optional
parameter of addItem()
---
 inc/inc.ClassDownloadMgr.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 62c4bcbe4..116784230 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -51,6 +51,7 @@ class SeedDMS_Download_Mgr {
 		$this->items = array();
 		$this->header = array('Dokumenten-Nr.', 'Dokumentenname', 'Dateiname', 'Status', 'Int. Version', 'Prüfer', 'Prüfdatum', 'Prüfkommentar', 'Prüfstatus', 'Freigeber', 'Freigabedatum', 'Freigabekommentar', 'Freigabestatus');
 		$this->extracols = array();
+		$this->rawcontents = array();
 		$this->extraheader = array();
 	}
 
@@ -58,9 +59,10 @@ class SeedDMS_Download_Mgr {
 		$this->extraheader = $extraheader;
 	} /* }}} */
 
-	public function addItem($item, $extracols) { /* {{{ */
+	public function addItem($item, $extracols=array(), $rawcontent='') { /* {{{ */
 		$this->items[$item->getID()] = $item;
 		$this->extracols[$item->getID()] = $extracols;
+		$this->rawcontents[$item->getID()] = $rawcontent;
 	} /* }}} */
 
 	public function createToc($file) { /* {{{ */
@@ -193,7 +195,10 @@ class SeedDMS_Download_Mgr {
 				$filename = preg_replace('/[^A-Za-z0-9_-]/', '_', $document->getName()).'.'.$oext;
 			}
 			$filename = $prefixdir."/".$document->getID().'-'.$item->getVersion().'-'.$filename; //$lc->getOriginalFileName();
-			$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($filename));
+			if($this->rawcontents[$item->getID()]) {
+				$zip->addFromString(utf8_decode($filename), $this->rawcontents[$item->getID()]);
+			} else
+				$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($filename));
 		}
 
 		$zip->addFile($file, $prefixdir."/metadata.xls");

From 10b62bc7fbbdb30af9e63700ebf4e91eb3b9338c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 Apr 2017 07:11:51 +0200
Subject: [PATCH 0778/2006] call hook 'rawcontent'

---
 controllers/class.TransmittalDownload.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/controllers/class.TransmittalDownload.php b/controllers/class.TransmittalDownload.php
index 37ff3f29d..88534641a 100644
--- a/controllers/class.TransmittalDownload.php
+++ b/controllers/class.TransmittalDownload.php
@@ -31,12 +31,18 @@ class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
 		if($items) {
 			include("../inc/inc.ClassDownloadMgr.php");
 			$downmgr = new SeedDMS_Download_Mgr();
+			if($extraheader = $this->callHook('extraDownloadHeader'))
+				$downmgr->addHeader($extraheader);
 
 			foreach($items as $item) {
 				$content = $item->getContent();
 				$document = $content->getDocument();
 				if ($document->getAccessMode($user) >= M_READ) {
-					$downmgr->addItem($content);
+					$extracols = $this->callHook('extraDownloadColumns', $document);
+					if($rawcontent = $this->callHook('rawcontent', $content)) {
+						$downmgr->addItem($content, $extracols, $rawcontent);
+					} else
+						$downmgr->addItem($content, $extracols);
 				}
 			}
 

From dde99fa1503d87eb01f15477b365525bd4bd6af4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 Apr 2017 07:12:13 +0200
Subject: [PATCH 0779/2006] call hook 'rawcontent' when downloading search
 result with content

---
 views/bootstrap/class.Search.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 3dbfbe165..cc2df42ff 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -82,7 +82,10 @@ $(document).ready( function() {
 		foreach($entries as $entry) {
 			if(get_class($entry) == $dms->getClassname('document')) {
 				$extracols = $this->callHook('extraDownloadColumns', $entry);
-				$downmgr->addItem($entry->getLatestContent(), $extracols);
+				if(isset($_GET['includecontent']) && $_GET['includecontent'] && $rawcontent = $this->callHook('rawcontent', $entry->getLatestContent())) {
+					$downmgr->addItem($entry->getLatestContent(), $extracols, $rawcontent);
+				} else
+					$downmgr->addItem($entry->getLatestContent(), $extracols);
 			}
 		}
 		$filename = tempnam('/tmp', '');

From ffb4f3179de93f008f6349ea46a8a0c63fb2ba13 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 Apr 2017 07:33:58 +0200
Subject: [PATCH 0780/2006] add changes for 6.0.1

---
 CHANGELOG                | 3 +++
 SeedDMS_Core/package.xml | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3f3d3d6f6..faa214514 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.1
 --------------------------------------------------------------------------------
+- call hook 'rawcontent' when downloading transmittal list or search content
+- speed up list of locked documents on MyDocuments page
+- sql queries and execution times can be written to file in database layer
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index d3d83e2f2..07aab7fbf 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,8 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+- speed up getting list of locked documents
+- setting _logfile in inc.DBAccessPDO.php will log execution times in file
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From c1b6fbf11a533c6095d77c71a60b7caab4468d31 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 11 Apr 2017 17:10:32 +0200
Subject: [PATCH 0781/2006] remove duplicate method getUser()

---
 inc/inc.ClassSession.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php
index 89555ce44..e84fcc00a 100644
--- a/inc/inc.ClassSession.php
+++ b/inc/inc.ClassSession.php
@@ -195,15 +195,6 @@ class SeedDMS_Session {
 		return true;
 	} /* }}} */
 
-	/**
-	 * Get language of session
-	 *
-	 * @return string language
-	 */
-	function getUser() { /* {{{ */
-		return $this->data['userid'];
-	} /* }}} */
-
 	/**
 	 * Set language of session
 	 *

From 62a1d2d7ecb5eacec40899cef501d4669faa15b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 11 Apr 2017 17:35:17 +0200
Subject: [PATCH 0782/2006] do not include ClassAccessOperation

---
 out/out.Session.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/out/out.Session.php b/out/out.Session.php
index 4c07bc48c..2c7c9e438 100644
--- a/out/out.Session.php
+++ b/out/out.Session.php
@@ -25,9 +25,8 @@ include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
-include("../inc/inc.Authentication.php");
-include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));

From 72aa0375b723d55250daf4f8e60de71187bfce3f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 May 2017 14:19:10 +0200
Subject: [PATCH 0783/2006] take out old method menuTask()

---
 views/bootstrap/class.Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 0a0534940..5235a9a12 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -251,7 +251,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	 *        documents and folders.
 	 * @return string html code
 	 */
-	function menuTasks($tasks) { /* {{{ */
+	function __menuTasks($tasks) { /* {{{ */
 		$dms = $this->params['dms'];
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
@@ -395,7 +395,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				echo "   <div id=\"menu-tasks\">";
 				echo "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 				echo "    <li class=\"dropdown\">\n";
-				echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
+//				echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
 				echo "    </li>\n";
 				echo "   </ul>\n";
 				echo "   </div>";

From b59b6a0cfb5f1f4214f006ee7cbf2edbeb922c5b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Jun 2017 14:04:38 +0200
Subject: [PATCH 0784/2006] pass initial status from settings to updateDocument

---
 controllers/class.UpdateDocument.php | 3 ++-
 op/op.UpdateDocument.php             | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/controllers/class.UpdateDocument.php b/controllers/class.UpdateDocument.php
index 8cd9ea818..a039e8f68 100644
--- a/controllers/class.UpdateDocument.php
+++ b/controllers/class.UpdateDocument.php
@@ -53,11 +53,12 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
 		$attributes = $this->getParam('attributes');
 		$workflow = $this->getParam('workflow');
 		$maxsizeforfulltext = $this->getParam('maxsizeforfulltext');
+		$initialdocumentstatus = $this->getParam('initialdocumentstatus');
 
 		$result = $this->callHook('updateDocument');
 		if($result === null) {
 			$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
-			$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $filetype, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow);
+			$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $filetype, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow, $initialdocumentstatus);
 
 			if ($this->hasParam('expires')) {
 				if($document->setExpires($this->getParam('expires'))) {
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index b4e52c3cc..2631d48ac 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -317,6 +317,7 @@ default:
 	$controller->setParam('approvers', $approvers);
 	$controller->setParam('attributes', $attributes);
 	$controller->setParam('workflow', $workflow);
+	$controller->setParam('initialdocumentstatus', $settings->_initialDocumentStatus);
 
 	if(!$content = $controller->run()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));

From 977f28c30cbc3e564a391342c0e8082b0487b861 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Jun 2017 16:26:01 +0200
Subject: [PATCH 0785/2006] fix merge errors

---
 views/bootstrap/class.AdminTools.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php
index 906c32869..fe62004c1 100644
--- a/views/bootstrap/class.AdminTools.php
+++ b/views/bootstrap/class.AdminTools.php
@@ -86,11 +86,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('AttributeMgr')) { ?>
 		<a href="../out/out.AttributeMgr.php" class="span3 btn btn-medium"><i class="icon-tags"></i><br /><?php echo getMLText("global_attributedefinitions")?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 3); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 <?php
 	if($this->params['workflowmode'] == 'advanced') {
@@ -104,11 +101,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('WorkflowActionsMgr')) { ?>
 		<a href="../out/out.WorkflowActionsMgr.php" class="span3 btn btn-medium"><i class="icon-bolt"></i><br /><?php echo getMLText("global_workflow_actions"); ?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 4); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 <?php
 		}
@@ -123,11 +117,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('IndexInfo')) { ?>
 		<a href="../out/out.IndexInfo.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("fulltext_info")?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 5); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 <?php
 		}
@@ -144,11 +135,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('Timeline')) { ?>
 		<a href="../out/out.Timeline.php" class="span3 btn btn-medium"><i class="icon-time"></i><br /><?php echo getMLText("timeline")?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 6); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 	<div class="row-fluid">
 <?php if($accessop->check_view_access('Settings')) { ?>
@@ -159,11 +147,8 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 <?php if($accessop->check_view_access('Info')) { ?>
 		<a href="../out/out.Info.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("version_info")?></a>
-<<<<<<< HEAD
 <?php } ?>
-=======
 		<?php echo $this->callHook('endOfRow', 7); ?>
->>>>>>> seeddms-5.1.x
 	</div>
 	<?php echo $this->callHook('afterRows'); ?>
 	</div>

From 2a38d713b840c8236363e97601405038d3bbc4ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Jun 2017 15:34:32 +0200
Subject: [PATCH 0786/2006] get approval status before sending notification
 mails

the approval status was simply not known because part of the code
went into the controller
---
 op/op.ReviewDocument.php | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 45c36916e..3a4c91e76 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -165,26 +165,28 @@ if ($newdocstatus == S_DRAFT_APP) {
 	$requestUser = $document->getOwner();
 
 	if($notifier) {
-		$subject = "approval_request_email_subject";
-		$message = "approval_request_email_body";
-		$params = array();
-		$params['name'] = $document->getName();
-		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['version'] = $version;
-		$params['username'] = $user->getFullName();
-		$params['sitename'] = $settings->_siteName;
-		$params['http_root'] = $settings->_httpRoot;
-		foreach ($docApprovalStatus as $dastat) {
-		
-			if ($dastat["status"] == 0) {
-				if ($dastat["type"] == 0) {
+		if($docApprovalStatus = $content->getApprovalStatus()) {
+			$subject = "approval_request_email_subject";
+			$message = "approval_request_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['version'] = $version;
+			$params['username'] = $user->getFullName();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+			foreach ($docApprovalStatus as $dastat) {
+			
+				if ($dastat["status"] == 0) {
+					if ($dastat["type"] == 0) {
 
-					$approver = $dms->getUser($dastat["required"]);
-					$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
-				} elseif ($dastat["type"] == 1) {
-				
-					$group = $dms->getGroup($dastat["required"]);
-					$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);
+						$approver = $dms->getUser($dastat["required"]);
+						$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
+					} elseif ($dastat["type"] == 1) {
+					
+						$group = $dms->getGroup($dastat["required"]);
+						$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);
+					}
 				}
 			}
 		}

From 1326f825d38d5e8825c1d0d894e4e1a91c18c528 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Jul 2017 10:43:14 +0200
Subject: [PATCH 0787/2006] $dms->noReadForStatus no longer needed

SeedDMS_Core_DocumentContent::getAccessMode() retrieves the role based
access restrictions from the role of the given user
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 37 ++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 9ed473895..cb5432ef8 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1792,7 +1792,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * This functions returns an array of content elements ordered by version.
 	 * Version which are not accessible because of its status, will be filtered
-	 * out.
+	 * out. Access rights based on the document status are calculated for the
+	 * currently logged in user.
 	 *
 	 * @return array list of objects of class SeedDMS_Core_DocumentContent
 	 */
@@ -1826,7 +1827,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * Return the content element of a document with a given version number
 	 *
 	 * This function will check if the version is accessible and return false
-	 * if not.
+	 * if not. Access rights based on the document status are calculated for the
+	 * currently logged in user.
 	 *
 	 * @param integer $version version number of content element
 	 * @return object/boolean object of class {@link SeedDMS_Core_DocumentContent}
@@ -1890,6 +1892,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * {@link SeedDMS_Core_DMS::noReadForStatus} the function will go
 	 * backwards in history until an accessible version is found. If none
 	 * is found null will be returned.
+	 * Access rights based on the document status are calculated for the
+	 * currently logged in user.
 	 *
 	 * @return object object of class {@link SeedDMS_Core_DocumentContent}
 	 */
@@ -3213,7 +3217,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * like a virtual access mode, derived from the status of the document 
 	 * content. The function checks if {@link SeedDMS_Core_DMS::noReadForStatus}
 	 * contains the status of the version and returns M_NONE if it exists and
-	 * the user is not involved in a workflow or review/approval.
+	 * the user is not involved in a workflow or review/approval/revision.
 	 * This method is called by all functions that returns the content e.g.
 	 * {@link SeedDMS_Core_Document::getLatestContent()}
 	 * It is also used by {@link SeedDMS_Core_Document::getAccessMode()} to
@@ -3221,6 +3225,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * FIXME: This function only works propperly if $u is the currently logged in
 	 * user, because noReadForStatus will be set for this user. 
+	 * FIXED: instead of using $dms->noReadForStatus it is take from the user's role
 	 *
 	 * @param object $u user
 	 * @return integer either M_NONE or M_READ
@@ -3229,12 +3234,21 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$dms = $this->_document->_dms;
 		$db = $dms->getDB();
 
+		if(!$u)
+			return M_NONE;
+
 		/* If read access isn't further restricted by status, than grant read access */
+		/* Old code
 		if(!$dms->noReadForStatus)
 			return M_READ;
+		$noReadForStatus = $dms->noReadForStatus;
+		*/
+		$noReadForStatus = $u->getRole()->getNoAccess();
+		if(!$noReadForStatus)
+			return M_READ;
 
 		/* If the current status is not in list of status without read access, then grant read access */
-		if(!in_array($this->getStatus()['status'], $dms->noReadForStatus))
+		if(!in_array($this->getStatus()['status'], $noReadForStatus))
 			return M_READ;
 
 		/* Administrators have unrestricted access */
@@ -3304,6 +3318,21 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			}
 			break;
 		case S_IN_REVISION:
+			$status = $this->getRevisionStatus();
+			foreach ($status as $r) {
+				if($r['status'] != -2) // Check if reviewer was removed
+					switch ($r["type"]) {
+					case 0: // Revisor is an individual.
+						if($u->getId() == $r["required"])
+							return M_READ;
+						break;
+					case 1: // Revisor is a group.
+						$required = $dms->getGroup($r["required"]);
+						if (is_object($required) && $required->isMember($u))
+							return M_READ;
+						break;
+					}
+			}
 			break;
 		case S_REJECTED:
 			break;

From 0e2b8df36bec4ed35fd24559daec84438dd6799c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Jul 2017 10:45:12 +0200
Subject: [PATCH 0788/2006] fix sql statement to create temp table ttrevisionid
 and ttreceiptid

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index cb1b57daa..5254cfd0d 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -552,7 +552,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` AS ".
-						"SELECT `tblDocumentReceiptLog`.`receiptID`, ".
+						"SELECT `tblDocumentReceiptLog`.`receiptID` AS `receiptID`, ".
 						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReceiptLog` ".
 						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ".
@@ -593,7 +593,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` AS ".
-						"SELECT `tblDocumentRevisionLog`.`revisionID`, ".
+						"SELECT `tblDocumentRevisionLog`.`revisionID` AS `revisionID`, ".
 						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentRevisionLog` ".
 						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ".

From 1249d069c761a3b880ea69188e4e603360653254 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Jul 2017 10:47:23 +0200
Subject: [PATCH 0789/2006] add note on deprecated $noReadForStatus

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 9ff818685..8f13c9952 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -149,7 +149,9 @@ class SeedDMS_Core_DMS {
 
 	/**
 	 * @var array $noReadForStatus list of status without read right
-	 *      online
+	 *      online. DO NOT USE ANYMORE. SeedDMS_Core_DocumentContent::getAccessMode()
+	 *      was the only method using it, but it now takes the noReadForStatus info
+	 *      from the user's role
 	 * @access public
 	 */
 	public $noReadForStatus;

From bdcf9d8e9353f1c54d0971462ea06c7d77b04259 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Jul 2017 10:48:03 +0200
Subject: [PATCH 0790/2006] add notes for 6.0.1

---
 SeedDMS_Core/package.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index b5cb5140b..04c5afa7a 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -26,6 +26,8 @@
  <notes>
 - speed up getting list of locked documents
 - setting _logfile in inc.DBAccessPDO.php will log execution times in file
+- fix sql statement to create temp table ttrevisionid and ttreceiptid
+- SeedDMS_Core_DMS::noReadForStatus no longer needed
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From c6f7b03700458498021150c9526ee98b44fc1f1c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Jul 2017 10:48:24 +0200
Subject: [PATCH 0791/2006] also check for access on document content

---
 out/out.ObjectCheck.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index a55f48876..ed91bd287 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -78,11 +78,17 @@ foreach($tmprevs as $rev) {
 		if($rev['type'] == 0) {
 			$ruser = $dms->getUser($rev['required']);
 			$mode = $doc->getAccessMode($ruser);
+			$content = $doc->getContentByVersion($rev['version']);
+			$cmode = $content->getAccessMode($ruser);
 		} elseif($rev['type'] == 1) {
 			$rgroup = $dms->getGroup($rev['required']);
 			$mode = $doc->getGroupAccessMode($rgroup);
+			$cmode = M_READ;
 		}
-		if($mode < M_READ)
+		/* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role
+		 * restrictions of the currently logged in user
+		 */
+		if($mode < M_READ || $cmode < M_READ)
 			$docsinrevision[] = $doc;
 	}
 }
@@ -93,11 +99,17 @@ foreach($tmprevs as $rev) {
 		if($rev['type'] == 0) {
 			$ruser = $dms->getUser($rev['required']);
 			$mode = $doc->getAccessMode($ruser);
+			$content = $doc->getContentByVersion($rev['version']);
+			$cmode = $content->getAccessMode($ruser);
 		} elseif($rev['type'] == 1) {
 			$rgroup = $dms->getGroup($rev['required']);
 			$mode = $doc->getGroupAccessMode($rgroup);
+			$cmode = M_READ;
 		}
-		if($mode < M_READ)
+		/* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role
+		 * restrictions of the currently logged in user
+		 */
+		if($mode < M_READ || $cmode < M_READ)
 			$docsinreception[] = $doc;
 	}
 }

From 310fa41bc25a624364da20c615da7ae740c92f27 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Jul 2017 10:48:56 +0200
Subject: [PATCH 0792/2006] return more entries in printProtocol() for receipt
 list

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 9e00db6c6..3d78bbc32 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2686,7 +2686,7 @@ $(document).ready(function() {
 			$statusList = $latestContent->getRevisionStatus(10);
 			break;
 		case "receipt":
-			$statusList = $latestContent->getReceiptStatus(1);
+			$statusList = $latestContent->getReceiptStatus(10);
 			break;
 		default:
 			$statusList = array();

From bb4c6fe83b5422ef5fbb5e8d11d0545e84300146 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Jul 2017 10:49:39 +0200
Subject: [PATCH 0793/2006] show if user has no access on document he/she has
 to receipt

---
 views/bootstrap/class.ViewDocument.php | 59 ++++++++++++++------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 751f053c7..43ebefaf1 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1169,9 +1169,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$required = null;
 				$is_recipient = false;
 				$stat[''.$r['status']]++;
+				$accesserr = '';
 				switch ($r["type"]) {
 					case 0: // Recipient is an individual.
 						$required = $dms->getUser($r["required"]);
+						if($user->isAdmin() && ($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ))
+							$accesserr = getMLText("access_denied");
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						}
@@ -1206,7 +1209,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
 					print "<td>".getReceiptStatusText($r["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
-
+					if($accesserr)
+						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
 					if($accessop->mayReceipt($document)) {
 						if ($is_recipient) {
 							if($r["status"]==0) {
@@ -1668,32 +1672,35 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			foreach($reverselinks as $link) {
 				$responsibleUser = $link->getUser();
 				$sourceDoc = $link->getDocument();
-				$sourcelc = $sourceDoc->getLatestContent();
-
-				$previewer->createPreview($sourcelc, $previewwidthdetail);
-				print "<tr>";
-				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
-				if($accessop->check_controller_access('Download', array('action'=>'version')))
-					print "<a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
-				if($previewer->hasPreview($sourcelc)) {
-					print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\" src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
-				} else {
-					print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\" src=\"".$this->getMimeIcon($sourcelc->getFileType())."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
+				/* Check if latest content is accessible. Could be that even if the document
+				 * is accessible, the document content isn't because of its status
+				 */
+				if($sourcelc = $sourceDoc->getLatestContent()) {
+					$previewer->createPreview($sourcelc, $previewwidthdetail);
+					print "<tr>";
+					print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
+					if($accessop->check_controller_access('Download', array('action'=>'version')))
+						print "<a href=\"../op/op.Download.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."\">";
+					if($previewer->hasPreview($sourcelc)) {
+						print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\" src=\"../op/op.Preview.php?documentid=".$sourceDoc->getID()."&version=".$sourcelc->getVersion()."&width=".$previewwidthlist."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
+					} else {
+						print "<img class=\"mimeicon\" width=\"".$previewwidthlist."\" src=\"".$this->getMimeIcon($sourcelc->getFileType())."\" title=\"".htmlspecialchars($sourcelc->getMimeType())."\">";
+					}
+					if($accessop->check_controller_access('Download', array('action'=>'run')))
+						print "</a>";
+					print "</td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$sourceDoc->getID()."\" class=\"linklist\">".htmlspecialchars($sourceDoc->getName())."</a></td>";
+					print "<td>".htmlspecialchars($sourceDoc->getComment())."</td>";
+					print "<td>".getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
+					if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
+						print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
+					print "</td>";
+					print "<td><span class=\"actions\">";
+					if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
+						print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
+					print "</span></td>";
+					print "</tr>";
 				}
-				if($accessop->check_controller_access('Download', array('action'=>'run')))
-					print "</a>";
-				print "</td>";
-				print "<td><a href=\"out.ViewDocument.php?documentid=".$sourceDoc->getID()."\" class=\"linklist\">".htmlspecialchars($sourceDoc->getName())."</a></td>";
-				print "<td>".htmlspecialchars($sourceDoc->getComment())."</td>";
-				print "<td>".getMLText("document_link_by")." ".htmlspecialchars($responsibleUser->getFullName());
-				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<br />".getMLText("document_link_public").": ".(($link->isPublic()) ? getMLText("yes") : getMLText("no"));
-				print "</td>";
-				print "<td><span class=\"actions\">";
-				if (($user->getID() == $responsibleUser->getID()) || ($document->getAccessMode($user) == M_ALL ))
-					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
-				print "</span></td>";
-				print "</tr>";
 			}
 			print "</tbody>\n</table>\n";
 			$this->contentContainerEnd();

From 410654cb19d1a8f8d8441d8810af7aac24e10ed8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Jul 2017 14:40:57 +0200
Subject: [PATCH 0794/2006] add more entries for 6.0.1

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 2df1ce1fc..50802f337 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@
 - call hook 'rawcontent' when downloading transmittal list or search content
 - speed up list of locked documents on MyDocuments page
 - sql queries and execution times can be written to file in database layer
+- add document check for docs in revision and missing access rights of revisor
+- add document check for docs requiring receptions but user lacks access right
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0

From c26d13484fcfb8f801c29c9c3d4e9deb5efc16cd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 10 Jul 2017 10:32:21 +0200
Subject: [PATCH 0795/2006] fix regex expression

---
 op/op.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index fa411dda1..c7743cd14 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -215,7 +215,7 @@ if ($action == "saveSettings")
 
 	if(isset($_POST["converters"]["preview"]))
 		$settings->_converters['preview'] = $_POST["converters"]["preview"];
-	$newmimetype = preg_replace('#[^A-Za-z0-9_/+.-*]+#', '', $settings->_converters["preview"]["newmimetype"]);
+	$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']);

From 6e37e1ded6a8ad0da704e64abacbdd3db7d4a201 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Jul 2017 14:11:04 +0200
Subject: [PATCH 0796/2006] fix check for new content status

---
 op/op.ReviewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 3a4c91e76..5e8cc9271 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -161,7 +161,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 }
 
 // Notify approvers, if necessary.
-if ($newdocstatus == S_DRAFT_APP) {
+if ($newdocstatus['status'] == S_DRAFT_APP) {
 	$requestUser = $document->getOwner();
 
 	if($notifier) {

From d6e10dddd68dd7c299964b07e00464145907cb3c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Jul 2017 14:55:51 +0200
Subject: [PATCH 0797/2006] pass $content to controller, not $latestContent

$latestContent and $content are different objects. If $latestContent
is passed to the controller, its status will be updated in the object
but $content has still the old status. Getting the status later on
from $content, still returns the old content.
---
 op/op.ReviewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 5e8cc9271..2e43716bf 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -94,7 +94,7 @@ if($_FILES["reviewfile"]["tmp_name"]) {
 }
 
 $controller->setParam('document', $document);
-$controller->setParam('content', $latestContent);
+$controller->setParam('content', $content);
 $controller->setParam('reviewstatus', $_POST["reviewStatus"]);
 $controller->setParam('reviewtype', $_POST["reviewType"]);
 if ($_POST["reviewType"] == "grp") {

From d7f679428d70ceabe40d6e969b67901b2d3f4e48 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Jul 2017 14:58:47 +0200
Subject: [PATCH 0798/2006] add entry for 6.0.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 516beb753..a1343c643 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.1
 --------------------------------------------------------------------------------
+- fix bug in notification of approver after successful review
 - call hook 'rawcontent' when downloading transmittal list or search content
 - speed up list of locked documents on MyDocuments page
 - sql queries and execution times can be written to file in database layer

From 3213aa168f7cee63e495a47f993768b6c87691bd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 17 Jul 2017 17:51:38 +0200
Subject: [PATCH 0799/2006] more efficient sql code in getDocumentList()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 180 ++++++++++++++++++++++++++++-
 1 file changed, 177 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 8f13c9952..ceffde224 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -784,6 +784,7 @@ class SeedDMS_Core_DMS {
 		/* The following statement retrieves the status of the last version of all
 		 * documents. It must be restricted by further where clauses.
 		 */
+/*
 		$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
 			"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
 			"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
@@ -799,9 +800,33 @@ class SeedDMS_Core_DMS {
 			"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
 			"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
 			"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ";
+ */
+		/* New sql statement which retrieves all documents, its latest version and
+		 * status, the owner and user initiating the latest status.
+		 * It doesn't need the where clause anymore. Hence the statement could be
+		 * extended with further left joins.
+		 */
+		$selectStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
+			"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
+			"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
+			"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ";
+		$queryStr =
+			"FROM `ttcontentid` ".
+			"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `ttcontentid`.`document` ".
+			"LEFT JOIN `tblDocumentContent` ON `tblDocumentContent`.`document` = `ttcontentid`.`document` AND `tblDocumentContent`.`version` = `ttcontentid`.`maxVersion` ".
+			"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID`=`ttcontentid`.`document` AND `tblDocumentStatus`.`version`=`ttcontentid`.`maxVersion` ".
+			"LEFT JOIN `ttstatid` ON `ttstatid`.`statusID` = `tblDocumentStatus`.`statusID` ".
+			"LEFT JOIN `tblDocumentStatusLog` ON `ttstatid`.`statusID` = `tblDocumentStatusLog`.`statusID` AND `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
+			"LEFT JOIN `tblDocumentLocks` ON `ttcontentid`.`document`=`tblDocumentLocks`.`document` ".
+			"LEFT JOIN `tblUsers` `oTbl` ON `oTbl`.`id` = `tblDocuments`.`owner` ".
+			"LEFT JOIN `tblUsers` `sTbl` ON `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ";
+
+//		echo $queryStr;
 
 		switch($listtype) {
 		case 'AppRevByMe': // Documents I have to review/approve {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			// Get document list for the current user.
 			$reviewStatus = $user->getReviewStatus();
@@ -845,6 +870,9 @@ class SeedDMS_Core_DMS {
 			}
 			break; // }}}
 		case 'ReviewByMe': // Documents I have to review {{{
+			if (!$this->db->createTemporaryTable("ttreviewid")) {
+				return false;
+			}
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -852,6 +880,33 @@ class SeedDMS_Core_DMS {
 			else
 				$orderdir = 'ASC';
 
+			$groups = array();
+			$tmp = $user->getGroups();
+			foreach($tmp as $group)
+				$groups[] = $group->getID();
+
+			$selectStr .= ", `tblDocumentReviewLog`.`date` as `duedate` ";
+			$queryStr .=
+				"LEFT JOIN `tblDocumentReviewers` on `ttcontentid`.`document`=`tblDocumentReviewers`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentReviewers`.`version` ".
+				"LEFT JOIN `ttreviewid` ON `ttreviewid`.`reviewID` = `tblDocumentReviewers`.`reviewID` ".
+				"LEFT JOIN `tblDocumentReviewLog` ON `tblDocumentReviewLog`.`reviewLogID`=`ttreviewid`.`maxLogId` ";
+
+			if(0) {
+			$queryStr .= "WHERE (`tblDocumentReviewers`.`type` = 0 AND `tblDocumentReviewers`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentReviewers`.`type` = 1 AND `tblDocumentReviewers`.`required` IN (".implode(',', $groups).") ";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_EXPIRED.") ";
+			if(!$param2)
+				$queryStr .= " AND `tblDocumentReviewLog`.`status` = 0 ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			} else {
+			$queryStr .= "WHERE 1=1 ";
+
 			// Get document list for the current user.
 			$reviewStatus = $user->getReviewStatus();
 
@@ -887,8 +942,12 @@ class SeedDMS_Core_DMS {
 			} else {
 				$queryStr = '';
 			}
+			}
 			break; // }}}
 		case 'ApproveByMe': // Documents I have to approve {{{
+			if (!$this->db->createTemporaryTable("ttapproveid")) {
+				return false;
+			}
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -896,6 +955,33 @@ class SeedDMS_Core_DMS {
 			else
 				$orderdir = 'ASC';
 
+			$groups = array();
+			$tmp = $user->getGroups();
+			foreach($tmp as $group)
+				$groups[] = $group->getID();
+
+			$selectStr .= ", `tblDocumentApproveLog`.`date` as `duedate` ";
+			$queryStr .=
+				"LEFT JOIN `tblDocumentApprovers` on `ttcontentid`.`document`=`tblDocumentApprovers`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentApprovers`.`version` ".
+				"LEFT JOIN `ttapproveid` ON `ttapproveid`.`approveID` = `tblDocumentApprovers`.`approveID` ".
+				"LEFT JOIN `tblDocumentApproveLog` ON `tblDocumentApproveLog`.`approveLogID`=`ttapproveid`.`maxLogId` ";
+
+			if(0) {
+			$queryStr .= "WHERE (`tblDocumentApprovers`.`type` = 0 AND `tblDocumentApprovers`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentApprovers`.`type` = 1 AND `tblDocumentApprovers`.`required` IN (".implode(',', $groups).")";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_APP.", ".S_EXPIRED.") ";
+			if(!$param2)
+				$queryStr .= " AND `tblDocumentApproveLog`.`status` = 0 ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			} else {
+			$queryStr .= "WHERE 1=1 ";
+
 			// Get document list for the current user.
 			$approvalStatus = $user->getApprovalStatus();
 
@@ -931,9 +1017,45 @@ class SeedDMS_Core_DMS {
 			} else {
 				$queryStr = '';
 			}
+			}
 			break; // }}}
 		case 'ReceiptByMe': // Documents I have to receipt {{{
+			if (!$this->db->createTemporaryTable("ttreceiptid")) {
+				return false;
+			}
 			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+
+			$groups = array();
+			$tmp = $user->getGroups();
+			foreach($tmp as $group)
+				$groups[] = $group->getID();
+
+			$selectStr .= ", `tblDocumentReceiptLog`.`date` as `duedate` ";
+			$queryStr .=
+				"LEFT JOIN `tblDocumentRecipients` on `ttcontentid`.`document`=`tblDocumentRecipients`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRecipients`.`version` ".
+				"LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`receiptID` = `tblDocumentRecipients`.`receiptID` ".
+				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentReceiptLog`.`receiptLogID`=`ttreceiptid`.`maxLogId` ";
+
+			if(1) {
+			$queryStr .= "WHERE (`tblDocumentRecipients`.`type` = 0 AND `tblDocumentRecipients`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentRecipients`.`type` = 1 AND `tblDocumentRecipients`.`required` IN (".implode(',', $groups).")";
+			$queryStr .= ") ";
+			if(!$param2)
+				$queryStr .= " AND `tblDocumentReceiptLog`.`status` = 0 ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			} else {
+			$queryStr .= "WHERE 1=1 ";
+
 			// Get document list for the current user.
 			$receiptStatus = $user->getReceiptStatus();
 
@@ -958,13 +1080,22 @@ class SeedDMS_Core_DMS {
 			}
 
 			if (strlen($docCSV)>0) {
-				$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
-							"ORDER BY `statusDate` DESC";
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . $docCSV . ") ";
+//				$queryStr .= "ORDER BY `statusDate` DESC";
+				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+				else $queryStr .= "ORDER BY `name`";
+				$queryStr .= " ".$orderdir;
 			} else {
 				$queryStr = '';
 			}
+			}
 			break; // }}}
 		case 'ReviseByMe': // Documents I have to receipt {{{
+			if (!$this->db->createTemporaryTable("ttrevisionid")) {
+				return false;
+			}
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -972,6 +1103,32 @@ class SeedDMS_Core_DMS {
 			else
 				$orderdir = 'ASC';
 
+			$groups = array();
+			$tmp = $user->getGroups();
+			foreach($tmp as $group)
+				$groups[] = $group->getID();
+
+			$selectStr .= ", `tblDocumentRevisionLog`.`date` as `duedate` ";
+			$queryStr .=
+				"LEFT JOIN `tblDocumentRevisors` on `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` ".
+				"LEFT JOIN `ttrevisionid` ON `ttrevisionid`.`revisionID` = `tblDocumentRevisors`.`revisionID` ".
+				"LEFT JOIN `tblDocumentRevisionLog` ON `tblDocumentRevisionLog`.`revisionLogID`=`ttrevisionid`.`maxLogId` ";
+
+			if(0) {
+			$queryStr .= "WHERE (`tblDocumentRevisors`.`type` = 0 AND `tblDocumentRevisors`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).")";
+			$queryStr .= ") ";
+			if(!$param2)
+				$queryStr .= " AND `tblDocumentRevisionLog`.`status` = 0 ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			} else {
+			$queryStr .= "WHERE 1=1 ";
+
 			// Get document list for the current user.
 			$revisionStatus = $user->getRevisionStatus();
 
@@ -1004,8 +1161,11 @@ class SeedDMS_Core_DMS {
 			} else {
 				$queryStr = '';
 			}
+			}
 			break; // }}}
 		case 'WorkflowByMe': // Documents I to trigger in Worklflow {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			// Get document list for the current user.
 			$workflowStatus = $user->getWorkflowStatus();
@@ -1038,6 +1198,8 @@ class SeedDMS_Core_DMS {
 			}
 			break; // }}}
 		case 'AppRevOwner': // Documents waiting for review/approval/revision I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1056,6 +1218,8 @@ class SeedDMS_Core_DMS {
 //				"ORDER BY `statusDate` DESC";
 			break; // }}}
 		case 'ReceiveOwner': // Documents waiting for reception I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1086,6 +1250,8 @@ class SeedDMS_Core_DMS {
 			}
 			break; // }}}
 		case 'RejectOwner': // Documents that has been rejected and I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1102,6 +1268,8 @@ class SeedDMS_Core_DMS {
 			$queryStr .= " ".$orderdir;
 			break; // }}}
 		case 'LockedByMe': // Documents locked by me {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1131,12 +1299,16 @@ class SeedDMS_Core_DMS {
 			}
 			break; // }}}
 		case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
 				"AND `tblDocumentStatusLog`.`status` IN (".S_IN_WORKFLOW.") ".
 				"ORDER BY `statusDate` DESC";
 			break; // }}}
 		case 'MyDocs': // Documents owned by me {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1151,6 +1323,8 @@ class SeedDMS_Core_DMS {
 			$queryStr .= " ".$orderdir;
 			break; // }}}
 		case 'CheckedOutByMe': // Documents I have checked out {{{
+			$queryStr .= "WHERE 1=1 ";
+
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1182,7 +1356,7 @@ class SeedDMS_Core_DMS {
 		}
 
 		if($queryStr) {
-			$resArr = $this->db->getResultArray($queryStr);
+			$resArr = $this->db->getResultArray($selectStr.$queryStr);
 			if (is_bool($resArr) && !$resArr) {
 				return false;
 			}

From 3fd1dfe87a4a091b1bf43045acc37a440d70a935 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 17 Jul 2017 17:52:19 +0200
Subject: [PATCH 0800/2006] fix sql for creating temp table ttreviewid and
 ttapproveid

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 5c10fece5..1c7a6d180 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -388,7 +388,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` AS ".
-						"SELECT `tblDocumentReviewLog`.`reviewID`, ".
+						"SELECT `tblDocumentReviewLog`.`reviewID` AS `reviewID`, ".
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
 						"GROUP BY `tblDocumentReviewLog`.`reviewID` "; //.
@@ -429,7 +429,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'sqlite':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` AS ".
-						"SELECT `tblDocumentApproveLog`.`approveID`, ".
+						"SELECT `tblDocumentApproveLog`.`approveID` AS `approveID`, ".
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
 						"GROUP BY `tblDocumentApproveLog`.`approveID` "; //.

From a5688a7c3be489fe1d915f1e180a5f4a6cbcacf1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Jul 2017 13:35:01 +0200
Subject: [PATCH 0801/2006] turn on new sql statements in getDocumentList()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index ceffde224..9443842e6 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -891,7 +891,7 @@ class SeedDMS_Core_DMS {
 				"LEFT JOIN `ttreviewid` ON `ttreviewid`.`reviewID` = `tblDocumentReviewers`.`reviewID` ".
 				"LEFT JOIN `tblDocumentReviewLog` ON `tblDocumentReviewLog`.`reviewLogID`=`ttreviewid`.`maxLogId` ";
 
-			if(0) {
+			if(1) {
 			$queryStr .= "WHERE (`tblDocumentReviewers`.`type` = 0 AND `tblDocumentReviewers`.`required` = ".$user->getID()." ";
 			if($groups)
 				$queryStr .= "OR `tblDocumentReviewers`.`type` = 1 AND `tblDocumentReviewers`.`required` IN (".implode(',', $groups).") ";
@@ -966,7 +966,7 @@ class SeedDMS_Core_DMS {
 				"LEFT JOIN `ttapproveid` ON `ttapproveid`.`approveID` = `tblDocumentApprovers`.`approveID` ".
 				"LEFT JOIN `tblDocumentApproveLog` ON `tblDocumentApproveLog`.`approveLogID`=`ttapproveid`.`maxLogId` ";
 
-			if(0) {
+			if(1) {
 			$queryStr .= "WHERE (`tblDocumentApprovers`.`type` = 0 AND `tblDocumentApprovers`.`required` = ".$user->getID()." ";
 			if($groups)
 				$queryStr .= "OR `tblDocumentApprovers`.`type` = 1 AND `tblDocumentApprovers`.`required` IN (".implode(',', $groups).")";
@@ -1114,7 +1114,7 @@ class SeedDMS_Core_DMS {
 				"LEFT JOIN `ttrevisionid` ON `ttrevisionid`.`revisionID` = `tblDocumentRevisors`.`revisionID` ".
 				"LEFT JOIN `tblDocumentRevisionLog` ON `tblDocumentRevisionLog`.`revisionLogID`=`ttrevisionid`.`maxLogId` ";
 
-			if(0) {
+			if(1) {
 			$queryStr .= "WHERE (`tblDocumentRevisors`.`type` = 0 AND `tblDocumentRevisors`.`required` = ".$user->getID()." ";
 			if($groups)
 				$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).")";

From 00b4817bc7b64afdeea0962b97c8a07f01c820fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Jul 2017 13:35:35 +0200
Subject: [PATCH 0802/2006] add formatComment()

used to group comments entered for receiption of document
---
 inc/inc.Utils.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 922610e22..436de5b48 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -586,4 +586,16 @@ function addDirSep($str) { /* {{{ */
 	else
 		return trim($str);
 } /* }}} */
+
+/**
+ * Formats comments for aknowledge of reception.
+ *
+ * Only use in documentListRow()
+ */
+function formatComment($an) { /* {{{ */
+	$t = array();
+	foreach($an as $a)
+		$t[] = $a['n']." × ".$a['c'];
+	return $t;
+} /* }}} */
 ?>

From d879cc611455b8c276600aa96cb870c7727ecfa9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Jul 2017 13:36:28 +0200
Subject: [PATCH 0803/2006] group recepition comments in documentListRow()

---
 views/bootstrap/class.Bootstrap.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 876e23640..76e80312a 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2094,15 +2094,21 @@ $(document).ready( function() {
 				$allcomments = array('-1'=>array(), '1'=>array());
 				foreach ($receiptStatus as $r) {
 					$rstat[''.$r['status']]++;
-					if($r['comment'])
-						$allcomments[''.$r['status']][] = htmlspecialchars($r['comment']);
+					if($r['comment']) {
+//						$allcomments[''.$r['status']][] = htmlspecialchars($r['comment']);
+						$m5 = md5(trim($r['comment']));
+						if($allcomments[''.$r['status']][$m5])
+							$allcomments[''.$r['status']][$m5]['n']++;
+						else
+							$allcomments[''.$r['status']][$m5] = array('n'=>1, 'c'=>htmlspecialchars(trim($r['comment'])));
+					}
 				}
 				$totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1'];
 				if($totalreceipts) {
 					$content .= ";
 <div class=\"progress\">
-<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', $allcomments['1']), true) : "")."</div>
-	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', $allcomments['-1']), true) : "")."</div>
+<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
+	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
 </div>";
 				}
 			}

From 78e1ac7572266c8e94250a526044dfee2ccf8cd0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Jul 2017 13:37:09 +0200
Subject: [PATCH 0804/2006] add filter for doc status 4 and 5

---
 views/bootstrap/class.Timeline.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 3e7f2cda3..6b1d9fd13 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -256,6 +256,8 @@ div.timeline-event-selected {
 			<input type="checkbox" name="skip[]" value="status_change_1" <?php echo ($skip && in_array('status_change_1', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_1') ?><br />
 			<input type="checkbox" name="skip[]" value="status_change_2" <?php echo ($skip && in_array('status_change_2', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_2') ?><br />
 			<input type="checkbox" name="skip[]" value="status_change_3" <?php echo ($skip && in_array('status_change_3', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_3') ?><br />
+			<input type="checkbox" name="skip[]" value="status_change_4" <?php echo ($skip && in_array('status_change_4', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_4') ?><br />
+			<input type="checkbox" name="skip[]" value="status_change_5" <?php echo ($skip && in_array('status_change_5', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_5') ?><br />
 			<input type="checkbox" name="skip[]" value="status_change_-1" <?php echo ($skip && in_array('status_change_-1', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_-1') ?><br />
 			<input type="checkbox" name="skip[]" value="status_change_-3" <?php echo ($skip && in_array('status_change_-3', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_-3') ?><br />
 		</div>

From 0b88f3b30bca8b456035630caa1f6b2cfd7a349c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Jul 2017 08:26:03 +0200
Subject: [PATCH 0805/2006] add script for checking for open tasks of each or
 individual users

---
 utils/open-tasks.php     | 295 +++++++++++++++++++++++++++++++++++++++
 utils/seeddms-open-tasks |   6 +
 2 files changed, 301 insertions(+)
 create mode 100644 utils/open-tasks.php
 create mode 100644 utils/seeddms-open-tasks

diff --git a/utils/open-tasks.php b/utils/open-tasks.php
new file mode 100644
index 000000000..46f6acc47
--- /dev/null
+++ b/utils/open-tasks.php
@@ -0,0 +1,295 @@
+<?php
+if(isset($_SERVER['SEEDDMS_HOME'])) {
+	require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
+} else {
+	require_once("../inc/inc.ClassSettings.php");
+}
+include 'Mail.php';
+include 'Mail/mime.php';
+
+function usage() { /* {{{ */
+	echo "Usage:\n";
+	echo "  seeddms-open-tasks [--config <file>] [-u <users>] [-r receiver] [-h] [-v] [-t] [-q] -d <days> -D <days>\n";
+	echo "\n";
+	echo "Description:\n";
+	echo "  Check for tasks which need to be done by a user.\n";
+	echo "\n";
+	echo "Options:\n";
+	echo "  -h, --help: print usage information and exit.\n";
+	echo "  -v, --version: print version and exit.\n";
+	echo "  --config=<file>: set alternative config file.\n";
+	echo "  -u <users>: comma separated list of user names to check. If not set all\n";
+	echo "             users will be checked.\n";
+	echo "  -r <receiver>: email address where all mails are sent to. If not set the\n";
+	echo "             users themselves are informed.\n";
+	echo "  -f <email>: set From field in notification mail\n";
+	echo "  -b <base>: set base for links in html email. The final link will be\n";
+	echo "             <base><httpRoot>out/out.ViewDocument.php. The default is\n";
+	echo "             http://localhost\n";
+	echo "  -d <days>: check for n days in the future (default 14). Days always\n".
+		   "             start and end at midnight. A value of '1' means today.\n";
+	echo "  -t: run in test mode (will not send any mails)\n";
+	echo "  -q: be quite (just output error messages)\n";
+} /* }}} */
+
+$version = "0.0.1";
+$tableformat = "%-65s %-12s";
+$tableformathtml = "<tr><td>%s</td><td>%s</td></tr>";
+$baseurl = "http://localhost/";
+$mailfrom = "uwe@steinman.cx";
+
+$shortoptions = "u:d:D:f:b:a:A:c:C:m:u:r:tqhv";
+$longoptions = array('help', 'version', 'config:');
+if(false === ($options = getopt($shortoptions, $longoptions))) {
+	usage();
+	exit(0);
+}
+
+/* Print help and exit */
+if(isset($options['h']) || isset($options['help'])) {
+	usage();
+	exit(0);
+}
+
+/* Print version and exit */
+if(isset($options['v']) || isset($options['verѕion'])) {
+	echo $version."\n";
+	exit(0);
+}
+
+/* Set alternative config file */
+if(isset($options['config'])) {
+	$settings = new Settings($options['config']);
+} else {
+	$settings = new Settings();
+}
+include("inc/inc.Language.php");
+include("inc/inc.Extension.php");
+
+$LANG['de_DE']['daylyDigestMail'] = 'Tägliche Benachrichtigungsmail über ausstehende Aufgaben';
+$LANG['en_GB']['daylyDigestMail'] = 'Dayly digest mail with due tasks';
+$LANG['de_DE']['docsNeedToCareAbout'] = 'Dokumente, die seit mehr als [days] Tagen auf ihre Bearbeitung warten.';
+$LANG['en_GB']['docsNeedToCareAbout'] = 'Documents waiting for your attention for more than [days] days.';
+$LANG['de_DE']['waiting_for_review'] = 'Dokumente, die auf ihre Prüfung warten';
+$LANG['de_DE']['waiting_for_approval'] = 'Dokumente, die auf ihre Freigabe warten';
+$LANG['de_DE']['waiting_for_receipt'] = 'Dokumente, die auf ihre Empfangsbestätigung warten';
+$LANG['de_DE']['waiting_for_revision'] = 'Dokumente, die auf ihre Wiederholungsprüfung warten';
+$LANG['de_DE']['duedate'] = 'Fälligkeit';
+
+if(isset($settings->_extraPath))
+	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
+
+require_once("SeedDMS/Core.php");
+
+$days = 14;
+if(isset($options['d'])) {
+	$days = (int) $options['d'];
+}
+$enddays = 0;
+if(isset($options['D'])) {
+	$enddays = (int) $options['D'];
+}
+
+if($enddays >= $days) {
+	echo "Value of -D must be less then value of -d\n";
+	exit(1);
+}
+
+if(isset($options['f'])) {
+	$mailfrom = trim($options['f']);
+}
+
+if(isset($options['b'])) {
+	$baseurl = trim($options['b']);
+}
+
+$username = '';
+if(isset($options['u'])) {
+	$username = trim($options['u']);
+}
+
+$receiver = '';
+if(isset($options['r'])) {
+	$receiver = trim($options['r']);
+}
+
+$dryrun = false;
+if(isset($options['t'])) {
+	$dryrun = true;
+	echo "Running in test mode will not send any mail.\n";
+}
+$quite = false;
+if(isset($options['q'])) {
+	$quite = true;
+}
+
+$showobsolete = false;
+
+$db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
+$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
+$db->_debug = 1;
+
+$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
+if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
+	echo "Database update needed.";
+	exit;
+}
+$dms->setRootFolderID($settings->_rootFolderID);
+$dms->setMaxDirID($settings->_maxDirID);
+$dms->setEnableConverting($settings->_enableConverting);
+$dms->setViewOnlineFileTypes($settings->_viewOnlineFileTypes);
+
+$startts = strtotime("midnight", time());
+if($username) {
+	$users = array();
+	$tmp = explode(',', $username);
+	foreach($tmp as $t) {
+		if($u = $dms->getUserByLogin($t))
+			$users[] = $u;
+	}
+} else {
+	$users = $dms->getAllUsers();
+}
+if(!$users) {
+	echo "No users specified or available.";
+	exit;
+}
+
+foreach($users as $user) {
+	if(!$quite)
+		echo "Checking for tasks of user ".$user->getFullName()." which are due for more than ".$days." days\n\n";
+
+	$sendmail = false; /* Set to true if there is something to report */
+
+	$tasks = array('approval'=>array(), 'review'=>array(), 'receipt'=>array(), 'revision'=>array());
+	$resArr = $dms->getDocumentList('ApproveByMe', $user);
+	if($resArr) {
+		foreach ($resArr as $res) {
+			$tmp = explode(' ', $res['duedate'], 2);
+			if($tmp[0] < date('Y-m-d', $startts-$days*86400)) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name'], 'date'=>$res['duedate']);
+				}
+			}
+		}
+	}
+
+	$resArr = $dms->getDocumentList('ReviewByMe', $user);
+	if($resArr) {
+		foreach ($resArr as $res) {
+			$tmp = explode(' ', $res['duedate'], 2);
+			if($tmp[0] < date('Y-m-d', $startts-$days*86400)) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name'], 'date'=>$res['duedate']);
+				}
+			}
+		}
+	}
+
+	$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+	if($resArr) {
+		foreach ($resArr as $res) {
+			$tmp = explode(' ', $res['duedate'], 2);
+			if($tmp[0] < date('Y-m-d', $startts-$days*86400)) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name'], 'date'=>$res['duedate']);
+				}
+			}
+		}
+	}
+
+	$resArr = $dms->getDocumentList('ReviseByMe', $user);
+	if($resArr) {
+		foreach ($resArr as $res) {
+			$tmp = explode(' ', $res['duedate'], 2);
+			if($tmp[0] < date('Y-m-d', $startts-$days*86400)) {
+				$document = $dms->getDocument($res["id"]);
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name'], 'date'=>$res['duedate']);
+				}
+			}
+		}
+	}
+
+//	print_r($tasks);
+
+	if (count($tasks['approval'])>0 || count($tasks['review'])>0 || count($tasks['receipt'])>0 || count($tasks['revision'])>0) {
+		$bodyhead = "";
+		$bodyhead .= getMLText('docsNeedToCareAbout', array('days'=>$days))."\n";
+		$bodyhead .= "\n";
+
+		$bodyhtmlhead = "<html>\n<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n<title>SeedDMS: ".getMLText('daylyDigestMail')."</title>\n<base href=\"".$baseurl.$settings->_httpRoot."\" />\n</head>\n<body>\n";
+		$bodyhtmlhead .= "<h2>";
+		$bodyhtmlhead .= getMLText('docsNeedToCareAbout', array('days'=>$days))."\n";
+		$bodyhtmlhead .= "</h2>\n";
+		$bodyhtmlhead .= "<h3>";
+		$bodyhtmlhead .= "</h3>\n";
+
+		/* Build an array of mail bodies for receiver in $bodyarr
+		 * $bodyarr['email@domain.de']['plain'] = 'mail body for plain text mail'
+		 * $bodyarr['email@domain.de']['html'] = 'mail body for html mail'
+		 */
+		$email = $user->getEmail();
+		$bodyarr = array($email=>array('plain'=>'', 'html'=>''));
+
+		foreach(array('review', 'approval', 'receipt', 'revision') as $typ) {
+			if(!empty($tasks[$typ])) {
+				$bodyarr[$email]['plain'] .= sprintf($tableformat."\n", getMLText('waiting_for_'.$typ, array()), getMLText("duedate", array()));	
+				$bodyarr[$email]['plain'] .= "---------------------------------------------------------------------------------------\n";
+				$bodyarr[$email]['html'] .= "<h3>".getMLText('waiting_for_'.$typ, array())."</h3>";	
+				$bodyarr[$email]['html'] .= "<table>\n";
+				$bodyarr[$email]['html'] .= sprintf($tableformathtml."\n", getMLText('name', array()), getMLText("duedate", array()));	
+				foreach($tasks[$typ] as $task) {
+					$bodyarr[$email]['plain'] .= sprintf($tableformat."\n", $task["name"], (!$task["date"] ? "-":$task["date"]));	
+					$bodyarr[$email]['html'] .= sprintf($tableformathtml."\n", '<a href="out/out.ViewDocument.php?documentid='.$task["id"].'">'.htmlspecialchars($task["name"]).'</a>', (!$task["date"] ? "-":$task["date"]));	
+				}
+				$bodyarr[$email]['plain'] .= "\n";
+				$bodyarr[$email]['html'] .= "</table>\n";
+			}
+		}
+		$bodyfoot = "\n";
+		$bodyhtmlfoot = "";
+		
+//		echo $body;
+//		echo "----------------------------\n\n\n";
+//		echo $bodyhtml;
+		foreach($bodyarr as $address => $msg) {
+			if(!$quite) {
+				echo "\n=== Send mail to ".trim($address)." =====================================================\n";
+				echo $bodyhead;
+				echo $bodyarr[$address]['plain'];
+				echo $bodyfoot;
+			} else {
+			}
+
+			if(!$dryrun) {
+				$mime = new Mail_mime(array('eol' => "\n"));
+
+				$mime->setTXTBody($bodyhead.$msg['plain'].$bodyfoot);
+				$mime->setHTMLBody($bodyhtmlhead.$msg['html'].$bodyhtmlfoot);
+
+				$body = $mime->get(array(
+					'text_encoding'=>'8bit',
+					'html_encoding'=>'8bit',
+					'head_charset'=>'utf-8',
+					'text_charset'=>'utf-8',
+					'html_charset'=>'utf-8'
+				));
+				$hdrs = $mime->headers(array('From' => $mailfrom, 'Subject' => 'SeedDMS: '.getMLText('daylyDigestMail').($receiver ? " (".trim($address).")" : ""), 'Content-Type' => 'text/plain; charset=UTF-8'));
+
+				$mail = Mail::factory('mail');
+				if($receiver)
+					$mail->send($receiver, $hdrs, $body);
+				else
+					$mail->send(trim($address), $hdrs, $body);
+			}
+		}
+	} else {
+		if(!$quite) {
+			echo "No notification needed\n";
+		}
+	}
+}
diff --git a/utils/seeddms-open-tasks b/utils/seeddms-open-tasks
new file mode 100644
index 000000000..e8363b2de
--- /dev/null
+++ b/utils/seeddms-open-tasks
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z ${SEEDDMS_HOME+x} ]; then
+	echo "Please set SEEDDMS_HOME before running this script";
+	exit 1;
+fi
+php -f ${SEEDDMS_HOME}/utils/open-tasks.php -- $*

From 5d6a56d95c4ae4468ed2ab07863e19bdc4cef908 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 15:00:42 +0200
Subject: [PATCH 0806/2006] add missing engl. translations

---
 utils/open-tasks.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/utils/open-tasks.php b/utils/open-tasks.php
index 46f6acc47..b7216b7db 100644
--- a/utils/open-tasks.php
+++ b/utils/open-tasks.php
@@ -70,10 +70,15 @@ $LANG['de_DE']['daylyDigestMail'] = 'Tägliche Benachrichtigungsmail über ausst
 $LANG['en_GB']['daylyDigestMail'] = 'Dayly digest mail with due tasks';
 $LANG['de_DE']['docsNeedToCareAbout'] = 'Dokumente, die seit mehr als [days] Tagen auf ihre Bearbeitung warten.';
 $LANG['en_GB']['docsNeedToCareAbout'] = 'Documents waiting for your attention for more than [days] days.';
+$LANG['en_GB']['waiting_for_review'] = 'Documents waiting for your review';
 $LANG['de_DE']['waiting_for_review'] = 'Dokumente, die auf ihre Prüfung warten';
+$LANG['en_GB']['waiting_for_approval'] = 'Documents waiting for your approval';
 $LANG['de_DE']['waiting_for_approval'] = 'Dokumente, die auf ihre Freigabe warten';
+$LANG['en_GB']['waiting_for_receipt'] = 'Documents waiting for your reception';
 $LANG['de_DE']['waiting_for_receipt'] = 'Dokumente, die auf ihre Empfangsbestätigung warten';
+$LANG['en_GB']['waiting_for_revision'] = 'Documents waiting for your revision';
 $LANG['de_DE']['waiting_for_revision'] = 'Dokumente, die auf ihre Wiederholungsprüfung warten';
+$LANG['en_GB']['duedate'] = 'Due date';
 $LANG['de_DE']['duedate'] = 'Fälligkeit';
 
 if(isset($settings->_extraPath))

From 9e8730056725d54ae6a54e0f7194766ed747d77c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 17:00:19 +0200
Subject: [PATCH 0807/2006] also check if user is disabled

---
 out/out.ObjectCheck.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index ed91bd287..4e548b5a2 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -75,8 +75,10 @@ $tmprevs = $dms->getDocumentsInRevision();
 $docsinrevision = array();
 foreach($tmprevs as $rev) {
 	if($doc = $dms->getDocument($rev['documentID'])) {
+		$isdisabled = false;
 		if($rev['type'] == 0) {
 			$ruser = $dms->getUser($rev['required']);
+			$isdisabled = $ruser->isDisabled();
 			$mode = $doc->getAccessMode($ruser);
 			$content = $doc->getContentByVersion($rev['version']);
 			$cmode = $content->getAccessMode($ruser);
@@ -88,7 +90,7 @@ foreach($tmprevs as $rev) {
 		/* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role
 		 * restrictions of the currently logged in user
 		 */
-		if($mode < M_READ || $cmode < M_READ)
+		if($mode < M_READ || $cmode < M_READ || $isdisabled)
 			$docsinrevision[] = $doc;
 	}
 }
@@ -96,8 +98,10 @@ $tmprevs = $dms->getDocumentsInReception();
 $docsinreception = array();
 foreach($tmprevs as $rev) {
 	if($doc = $dms->getDocument($rev['documentID'])) {
+		$isdisabled = false;
 		if($rev['type'] == 0) {
 			$ruser = $dms->getUser($rev['required']);
+			$isdisabled = $ruser->isDisabled();
 			$mode = $doc->getAccessMode($ruser);
 			$content = $doc->getContentByVersion($rev['version']);
 			$cmode = $content->getAccessMode($ruser);
@@ -109,7 +113,7 @@ foreach($tmprevs as $rev) {
 		/* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role
 		 * restrictions of the currently logged in user
 		 */
-		if($mode < M_READ || $cmode < M_READ)
+		if($mode < M_READ || $cmode < M_READ || $isdisabled)
 			$docsinreception[] = $doc;
 	}
 }

From c03566336a4c14d91c8dfa2a6ae4c008b09a0f56 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 17:00:41 +0200
Subject: [PATCH 0808/2006] skip user if disabled

---
 utils/open-tasks.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/open-tasks.php b/utils/open-tasks.php
index b7216b7db..480d98ba7 100644
--- a/utils/open-tasks.php
+++ b/utils/open-tasks.php
@@ -161,6 +161,8 @@ if(!$users) {
 }
 
 foreach($users as $user) {
+	if($user->isDisabled())
+		continue;
 	if(!$quite)
 		echo "Checking for tasks of user ".$user->getFullName()." which are due for more than ".$days." days\n\n";
 

From 28e84443d8c4130faadfa7947c3241ad3536c020 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 17:01:25 +0200
Subject: [PATCH 0809/2006] check if comment has been set already in list of
 receiption comments

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 76e80312a..12b3200ab 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2097,7 +2097,7 @@ $(document).ready( function() {
 					if($r['comment']) {
 //						$allcomments[''.$r['status']][] = htmlspecialchars($r['comment']);
 						$m5 = md5(trim($r['comment']));
-						if($allcomments[''.$r['status']][$m5])
+						if(isset($allcomments[''.$r['status']][$m5]))
 							$allcomments[''.$r['status']][$m5]['n']++;
 						else
 							$allcomments[''.$r['status']][$m5] = array('n'=>1, 'c'=>htmlspecialchars(trim($r['comment'])));

From cfc73b11830224d49df4a91e7c99310128761efa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 17:02:09 +0200
Subject: [PATCH 0810/2006] check if user is disabled in list of receiver,
 revisors

---
 views/bootstrap/class.ViewDocument.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 43ebefaf1..fc0945838 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1173,8 +1173,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				switch ($r["type"]) {
 					case 0: // Recipient is an individual.
 						$required = $dms->getUser($r["required"]);
-						if($user->isAdmin() && ($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ))
-							$accesserr = getMLText("access_denied");
+						if($user->isAdmin()) {
+							if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
+								$accesserr = getMLText("access_denied");
+							elseif(is_object($required) && $required->isDisabled())
+								$accesserr = getMLText("login_disabled_title");
+						}
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						}
@@ -1292,9 +1296,16 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			foreach ($revisionStatus as $r) {
 				$required = null;
 				$is_recipient = false;
+				$accesserr = '';
 				switch ($r["type"]) {
 					case 0: // Reviewer is an individual.
 						$required = $dms->getUser($r["required"]);
+						if($user->isAdmin()) {
+							if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
+								$accesserr = getMLText("access_denied");
+							elseif(is_object($required) && $required->isDisabled())
+								$accesserr = getMLText("login_disabled_title");
+						}
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						}
@@ -1325,7 +1336,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".htmlspecialchars($r["comment"])."</td>\n";
 				print "<td>".getRevisionStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
-
+				if($accesserr)
+					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
 				if($accessop->mayRevise($document)) {
 					if ($is_recipient && $r["status"]==0) {
 						print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."</li>";

From 58a90d595fcc35c7c04d017a908be168248e03c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 17:02:37 +0200
Subject: [PATCH 0811/2006] get setfilesize from view

---
 views/bootstrap/class.ObjectCheck.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 419e3ba7f..417c9dbb3 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -215,6 +215,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$nofilesizeversions = $this->params['nofilesizeversions'];
+		$setfilesize = $this->params['setfilesize'];
 
 		$this->contentHeading(getMLText("missing_filesize"));
 		if($nofilesizeversions) {

From bbad4795807d803752cd0c6fc235c1f20d8f3f89 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 18:21:05 +0200
Subject: [PATCH 0812/2006] use define S_LOG_USER_REMOVED

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index cb5432ef8..21999b624 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4705,7 +4705,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $indstatus["reviewID"] ."', '-2', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
+			"VALUES ('". $indstatus["reviewID"] ."', '".S_LOG_USER_REMOVED."', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -4736,7 +4736,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $reviewStatus[0]["reviewID"] ."', '-2', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
+			"VALUES ('". $reviewStatus[0]["reviewID"] ."', '".S_LOG_USER_REMOVED."', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -4768,7 +4768,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $indstatus["approveID"] ."', '-2', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
+			"VALUES ('". $indstatus["approveID"] ."', '".S_LOG_USER_REMOVED."', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -4799,7 +4799,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $approvalStatus[0]["approveID"] ."', '-2', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
+			"VALUES ('". $approvalStatus[0]["approveID"] ."', '".S_LOG_USER_REMOVED."', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -4808,7 +4808,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return 0;
 	} /* }}} */
 
-	function delIndRecipient($user, $requestUser) { /* {{{ */
+	function delIndRecipient($user, $requestUser, $msg='') { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		$userID = $user->getID();
@@ -4831,7 +4831,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $indstatus["receiptID"] ."', '-2', '', ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
+			"VALUES ('". $indstatus["receiptID"] ."', '".S_LOG_USER_REMOVED."', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;
@@ -4840,7 +4840,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return 0;
 	} /* }}} */
 
-	function delGrpRecipient($group, $requestUser) { /* {{{ */
+	function delGrpRecipient($group, $requestUser, $msg='') { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		$groupID = $group->getID();
@@ -4863,7 +4863,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $status["receiptID"] ."', '-2', '', ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
+			"VALUES ('". $status["receiptID"] ."', '".S_LOG_USER_REMOVED."', ".$db->qstr($msg).", ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;

From a846bcf633d97f2bc0f229b5a3712dd5fdc80acd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 18:21:24 +0200
Subject: [PATCH 0813/2006] replace sql statement by function in
 SeedDMS_Core_Document

---
 op/op.SetRecipients.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 7b8eb9e93..926e010a8 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -164,9 +164,7 @@ if (count($receiptIndex["i"]) > 0) {
 			if (!isset($accessIndex["i"][$rx])) {
 				// User does not have any receipt privileges for this document
 				// revision or does not exist.
-				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $receiptStatus[$rv["idx"]]["receiptID"] ."', '".S_LOG_USER_REMOVED."', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
-				$res = $db->getResult($queryStr);
+				$res = $content->delIndRecipient($dms->getUser($rx), $user, getMLText("removed_recipient"));
 			}
 			else {
 				$res = $content->delIndRecipient($accessIndex["i"][$rx], $user);
@@ -270,9 +268,7 @@ if (count($receiptIndex["g"]) > 0) {
 			if (!isset($accessIndex["g"][$rx])) {
 				// Group does not have any receipt privileges for this document
 				// revision or does not exist.
-				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $receiptStatus[$rv["idx"]]["receiptID"] ."', '".S_LOG_USER_REMOVED."', '".getMLText("removed_recipient")."', NOW(), '". $user->getID() ."')";
-				$res = $db->getResult($queryStr);
+				$res = $content->delGrpRecipient($dms->getGroup($rx), $user, getMLText("removed_recipient"));
 			}
 			else {
 				$res = $content->delGrpRecipient($accessIndex["g"][$rx], $user);

From 09dd448b400b627ce7158d3187db797f7e1fbe91 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 18:22:33 +0200
Subject: [PATCH 0814/2006] set right message when removing revisor

---
 op/op.SetRevisors.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 3026a16ce..055735be9 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -161,7 +161,7 @@ if (count($revisionIndex["i"]) > 0) {
 			if (!isset($accessIndex["i"][$rx])) {
 				// User does not have any revision privileges for this document
 				// revision or does not exist.
-				$res = $content->delIndRevisor($dms->getUser($rx), $user, getMLText("removed_recipient"));
+				$res = $content->delIndRevisor($dms->getUser($rx), $user, getMLText("removed_revisor"));
 			}
 			else {
 				$res = $content->delIndRevisor($accessIndex["i"][$rx], $user);
@@ -263,7 +263,7 @@ if (count($revisionIndex["g"]) > 0) {
 			if (!isset($accessIndex["g"][$rx])) {
 				// Group does not have any revision privileges for this document
 				// revision or does not exist.
-				$res = $content->delGrpRevisor($dms->getGroup($rx), $user, getMLText("removed_recipient"));
+				$res = $content->delGrpRevisor($dms->getGroup($rx), $user, getMLText("removed_revisor"));
 			}
 			else {
 				$res = $content->delGrpRevisor($accessIndex["g"][$rx], $user);

From 6aee48fc08a884f44cb99210e1f5025e52f64243 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jul 2017 18:22:58 +0200
Subject: [PATCH 0815/2006] do not try to get orderby and orderdir from view,
 because it is not set

---
 views/bootstrap/class.ObjectCheck.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 417c9dbb3..3d2dd32f4 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -41,8 +41,8 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";
 		if($order) {
-			$orderby = $this->params['orderby'];
-			$orderdir = $this->params['orderdir'];
+			$orderby = ''; //$this->params['orderby'];
+			$orderdir = ''; //$this->params['orderdir'];
 
 			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
 		} else

From 37e03e2e9e262db21a61a6758c8061d59bd691e2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Jul 2017 11:48:01 +0200
Subject: [PATCH 0816/2006] 
 SeedDMS_Core_Document::checkForDueRevisionWorkflow() also checks if there are
 any waiting or pending revisions at all

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 21999b624..051349e62 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -706,6 +706,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * The method will update the document status log database table
 	 * if needed.
 	 *
+	 * FIXME: This method does not check if there are any revisors left. Even
+	 * if all revisors have been removed, it will still start the revision workflow!
+	 *
 	 * @param object $user user requesting the possible automatic change
 	 * @param string $next next date for review
 	 * @return boolean true if status has changed
@@ -716,6 +719,22 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$st=$lc->getStatus();
 
 			if($st["status"] == S_RELEASED) {
+				/* First check if there are any revisors left who need to revise */
+				$pendingRevision=false;
+				unset($this->_revisionStatus);  // force to be reloaded from DB
+				$revisionStatus=$lc->getRevisionStatus();
+				if (is_array($revisionStatus) && count($revisionStatus)>0) {
+					foreach ($revisionStatus as $a){
+						if ($a["status"]==S_LOG_SLEEPING || $a["status"]==S_LOG_SLEEPING){
+							$pendingRevision=true;
+							break;
+						}
+					}
+				}
+				if(!$pendingRevision)
+					return false;
+
+				/* Second check if revision is already due */
 				if($lc->getRevisionDate() && $lc->getRevisionDate() <= date('Y-m-d 00:00:00')) {
 					if($lc->startRevision($user, 'Automatic start of revision workflow')) {
 						if($next) {

From 26cb15fe214128e163135eae0326c5ddca056759 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Jul 2017 11:48:32 +0200
Subject: [PATCH 0817/2006] verify status after setting revisors

---
 op/op.SetRevisors.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 055735be9..f13dbceaa 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -307,6 +307,9 @@ if (count($revisionIndex["g"]) > 0) {
 	}
 }
 
+/* Recheck status, because all revisors could have been removed */
+$content->verifyStatus(false, $user, getMLText('automatic_status_update'));
+
 add_log_line("?documentid=".$documentid);
 header("Location:../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version);
 

From aa162b6601650536ea74aa95aa87eec7703d2801 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Jul 2017 11:48:52 +0200
Subject: [PATCH 0818/2006] add note for 6.0.1

---
 SeedDMS_Core/package.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 6bc9539dc..ab57d1e0e 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,6 +28,8 @@
 - setting _logfile in inc.DBAccessPDO.php will log execution times in file
 - fix sql statement to create temp table ttrevisionid and ttreceiptid
 - SeedDMS_Core_DMS::noReadForStatus no longer needed
+- SeedDMS_Core_Document::checkForDueRevisionWorkflow() also checks if there
+  are any waiting or pending revisions at all
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 6847e1b6db5b20b8c5ad2a584b353f2329a5fa24 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Jul 2017 13:52:57 +0200
Subject: [PATCH 0819/2006] =?UTF-8?q?check=20if=20user=20has=20access=20an?=
 =?UTF-8?q?d=20is=20not=20disabled=20=D1=96f=20reviewer,=20approver,=20etc?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

also check if group has members if set as reviewer, approver, etc.
---
 views/bootstrap/class.ViewDocument.php | 79 ++++++++++++++++++--------
 1 file changed, 55 insertions(+), 24 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index fc0945838..2fc461746 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -771,6 +771,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			foreach ($reviewStatus as $r) {
 				$required = null;
 				$is_reviewer = false;
+				$accesserr = '';
 				switch ($r["type"]) {
 					case 0: // Reviewer is an individual.
 						$required = $dms->getUser($r["required"]);
@@ -778,7 +779,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							if($user->isAdmin()) {
+								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
+									$accesserr = getMLText("access_denied");
+								elseif(is_object($required) && $required->isDisabled())
+									$accesserr = getMLText("login_disabled_title");
+							}
 							if($required->getId() == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_reviewer = true;
 						}
@@ -789,7 +796,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
+							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							if($user->isAdmin()) {
+								$grpusers = $required->getUsers();
+								if(!$grpusers)
+									$accesserr = getMLText("no_group_members");
+							}
 							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_reviewer = true;
 						}
@@ -811,6 +823,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "</td>\n";
 				print "<td>".getReviewStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
+				if($accesserr)
+					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
 
 				if($accessop->mayReview($document)) {
 					if ($is_reviewer) {
@@ -844,6 +858,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			foreach ($approvalStatus as $a) {
 				$required = null;
 				$is_approver = false;
+				$accesserr = '';
 				switch ($a["type"]) {
 					case 0: // Approver is an individual.
 						$required = $dms->getUser($a["required"]);
@@ -851,7 +866,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_user")." '".$a["required"]."'";
 						}
 						else {
-							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							if($user->isAdmin()) {
+								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
+									$accesserr = getMLText("access_denied");
+								elseif(is_object($required) && $required->isDisabled())
+									$accesserr = getMLText("login_disabled_title");
+							}
 							if($required->getId() == $user->getId())
 								$is_approver = true;
 						}
@@ -862,7 +883,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$a["required"]."'";
 						}
 						else {
-							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
+							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							if($user->isAdmin()) {
+								$grpusers = $required->getUsers();
+								if(!$grpusers)
+									$accesserr = getMLText("no_group_members");
+							}
 							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_approver = true;
 						}
@@ -884,6 +910,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				echo "</td>\n";
 				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
+				if($accesserr)
+					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
 
 				if($accessop->mayApprove($document)) {
 					if ($is_approver) {
@@ -1173,17 +1201,16 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				switch ($r["type"]) {
 					case 0: // Recipient is an individual.
 						$required = $dms->getUser($r["required"]);
-						if($user->isAdmin()) {
-							if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
-								$accesserr = getMLText("access_denied");
-							elseif(is_object($required) && $required->isDisabled())
-								$accesserr = getMLText("login_disabled_title");
-						}
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
-						}
-						else {
-							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+						} else {
+							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							if($user->isAdmin()) {
+								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
+									$accesserr = getMLText("access_denied");
+								elseif(is_object($required) && $required->isDisabled())
+									$accesserr = getMLText("login_disabled_title");
+							}
 						}
 						if($r["required"] == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerreceipt == 1)*/)
 							$is_recipient = true;
@@ -1194,7 +1221,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
+							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							if($user->isAdmin()) {
+								$grpusers = $required->getUsers();
+								if(!$grpusers)
+									$accesserr = getMLText("no_group_members");
+							}
 							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerreceipt == 1)*/)
 								$is_recipient = true;
 						}
@@ -1300,17 +1332,16 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				switch ($r["type"]) {
 					case 0: // Reviewer is an individual.
 						$required = $dms->getUser($r["required"]);
-						if($user->isAdmin()) {
-							if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
-								$accesserr = getMLText("access_denied");
-							elseif(is_object($required) && $required->isDisabled())
-								$accesserr = getMLText("login_disabled_title");
-						}
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
-						}
-						else {
-							$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+						} else {
+							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							if($user->isAdmin()) {
+								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
+									$accesserr = getMLText("access_denied");
+								elseif(is_object($required) && $required->isDisabled())
+									$accesserr = getMLText("login_disabled_title");
+							}
 						}
 						if($r["required"] == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 							$is_recipient = true;
@@ -1321,7 +1352,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";
+							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getName());
 							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_recipient = true;
 						}

From 66044f8b4afccd31d2d786cfccd0ba5f613a82c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Jul 2017 13:56:59 +0200
Subject: [PATCH 0820/2006] add entry for 6.0.1

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 65465dbeb..3158c15e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.1
 --------------------------------------------------------------------------------
+- check if user has access on document and is not disabled if set as
+  reviewer, approver, receiver, revisor
+- check if group has members if set as reviewer, approver, receiver, revisor
 - fix bug in notification of approver after successful review
 - call hook 'rawcontent' when downloading transmittal list or search content
 - speed up list of locked documents on MyDocuments page

From d954b4df1dba409e4308df269665d4b708e424df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Jul 2017 14:41:39 +0200
Subject: [PATCH 0821/2006] getReverseSubstitutes() works with roles

---
 SeedDMS_Core/Core/inc.ClassUser.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 743a3d4cd..9642d40d0 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -1877,20 +1877,23 @@ class SeedDMS_Core_User { /* {{{ */
 		if (!isset($this->_rev_substitutes)) {
 			$queryStr = "SELECT `tblUsers`.* FROM `tblUserSubstitutes` ".
 				"LEFT JOIN `tblUsers` ON `tblUserSubstitutes`.`user` = `tblUsers`.`id` ".
+				"LEFT JOIN `tblRoles` ON `tblRoles`.`id`=`tblUsers`.`role` ".
 				"WHERE `tblUserSubstitutes`.`substitute`='". $this->_id ."'";
 			/* None admins can only be substitutes for regular users, otherwise
 			 * regular users can become admin
 			 */
 			if(!$this->isAdmin())
-				$queryStr .= " AND `tblUsers`.`role` = ".SeedDMS_Core_User::role_user;
+				$queryStr .= " AND `tblRoles`.`role` = ".SeedDMS_Core_User::role_user;
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr == false)
 				return false;
 
 			$this->_rev_substitutes = array();
+			$classnamerole = $this->_dms->getClassname('role');
 			$classname = $this->_dms->getClassname('user');
 			foreach ($resArr as $row) {
-				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $row["role"], $row["hidden"], $row["disabled"], $row["pwdExpiration"], $row["loginfailures"], $row["quota"], $row["homefolder"]);
+				$role = $classnamerole::getInstance($row['role'], $this->_dms);
+				$user = new $classname($row["id"], $row["login"], $row["pwd"], $row["fullName"], $row["email"], $row["language"], $row["theme"], $row["comment"], $role, $row["hidden"], $row["disabled"], $row["pwdExpiration"], $row["loginfailures"], $row["quota"], $row["homefolder"]);
 				$user->setDMS($this->_dms);
 				array_push($this->_rev_substitutes, $user);
 			}

From 0483e44ddc7712a343e518157287f025d24d61f6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Jul 2017 14:43:02 +0200
Subject: [PATCH 0822/2006] new note for 6.0.1

---
 SeedDMS_Core/package.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ab57d1e0e..3073e46d8 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -29,7 +29,8 @@
 - fix sql statement to create temp table ttrevisionid and ttreceiptid
 - SeedDMS_Core_DMS::noReadForStatus no longer needed
 - SeedDMS_Core_Document::checkForDueRevisionWorkflow() also checks if there
-  are any waiting or pending revisions at all
+are any waiting or pending revisions at all
+- SeedDMS_Core_User::getReverseSubstitutes() works with new roles
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 29ec0987983cadffafc1a059b75fc9dc791c5d9a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Jul 2017 16:08:04 +0200
Subject: [PATCH 0823/2006] correct entry for 6.0.1

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 29357d5d4..322ef022b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@
                      Changes in version 6.0.1
 --------------------------------------------------------------------------------
 - check if user has access on document and is not disabled if set as
-  reviewer, approver, receiver, revisor
+  receiver, revisor
 - check if group has members if set as reviewer, approver, receiver, revisor
 - fix bug in notification of approver after successful review
 - call hook 'rawcontent' when downloading transmittal list or search content

From 8b848cc05afe38d5c71ba4c3c0d48e14772639b3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Jul 2017 07:55:49 +0200
Subject: [PATCH 0824/2006] set 'showtree' for view

---
 out/out.ApprovalSummary.php | 1 +
 out/out.ReviewSummary.php   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php
index 97633b842..ed250d1a8 100644
--- a/out/out.ApprovalSummary.php
+++ b/out/out.ApprovalSummary.php
@@ -36,6 +36,7 @@ if ($user->isGuest()) {
 }
 
 if($view) {
+	$view->setParam('showtree', showtree());
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php
index 97633b842..ed250d1a8 100644
--- a/out/out.ReviewSummary.php
+++ b/out/out.ReviewSummary.php
@@ -36,6 +36,7 @@ if ($user->isGuest()) {
 }
 
 if($view) {
+	$view->setParam('showtree', showtree());
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);

From 752f4e87602fde76eeac511ceb9c05be70d88aba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Jul 2017 12:14:56 +0200
Subject: [PATCH 0825/2006] take out order by in temp. tables

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 1c7a6d180..f3d98d383 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -555,24 +555,24 @@ class SeedDMS_Core_DatabaseAccess {
 						"SELECT `tblDocumentReceiptLog`.`receiptID` AS `receiptID`, ".
 						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReceiptLog` ".
-						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ";
+//						"ORDER BY `maxLogID`";
 				break;
 				case 'pgsql':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` (`receiptID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`receiptID`);".
 						"INSERT INTO `ttreceiptid` SELECT `tblDocumentReceiptLog`.`receiptID`, ".
 						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReceiptLog` ".
-						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ";
+//						"ORDER BY `maxLogID`";
 				break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` (PRIMARY KEY (`receiptID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentReceiptLog`.`receiptID`, ".
 						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReceiptLog` ".
-						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ";
+//						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttreceiptid) {
 				if (!$this->getResult($queryStr))
@@ -596,24 +596,24 @@ class SeedDMS_Core_DatabaseAccess {
 						"SELECT `tblDocumentRevisionLog`.`revisionID` AS `revisionID`, ".
 						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentRevisionLog` ".
-						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ";
+//						"ORDER BY `maxLogID`";
 				break;
 				case 'pgsql':
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` (`revisionID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`revisionID`));".
 						"INSERT INTO `ttrevisionid` SELECT `tblDocumentRevisionLog`.`revisionID`, ".
 						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentRevisionLog` ".
-						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ";
+//						"ORDER BY `maxLogID`";
 				break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttrevisionid` (PRIMARY KEY (`revisionID`), INDEX (`maxLogID`)) ".
 						"SELECT `tblDocumentRevisionLog`.`revisionID`, ".
 						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentRevisionLog` ".
-						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ".
-						"ORDER BY `maxLogID`";
+						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ";
+//						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttrevisionid) {
 				if (!$this->getResult($queryStr))

From f5333e7c8d401f3206478fd5a11d388d20a758ef Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 12:32:27 +0200
Subject: [PATCH 0826/2006] fix field name in getDocumentList(), 'maxLogId'
 must be 'maxLogID'

otherwise the statement fails for pgsql
---
 SeedDMS_Core/Core/inc.ClassDMS.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 9443842e6..2a378c790 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -889,7 +889,7 @@ class SeedDMS_Core_DMS {
 			$queryStr .=
 				"LEFT JOIN `tblDocumentReviewers` on `ttcontentid`.`document`=`tblDocumentReviewers`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentReviewers`.`version` ".
 				"LEFT JOIN `ttreviewid` ON `ttreviewid`.`reviewID` = `tblDocumentReviewers`.`reviewID` ".
-				"LEFT JOIN `tblDocumentReviewLog` ON `tblDocumentReviewLog`.`reviewLogID`=`ttreviewid`.`maxLogId` ";
+				"LEFT JOIN `tblDocumentReviewLog` ON `tblDocumentReviewLog`.`reviewLogID`=`ttreviewid`.`maxLogID` ";
 
 			if(1) {
 			$queryStr .= "WHERE (`tblDocumentReviewers`.`type` = 0 AND `tblDocumentReviewers`.`required` = ".$user->getID()." ";
@@ -964,7 +964,7 @@ class SeedDMS_Core_DMS {
 			$queryStr .=
 				"LEFT JOIN `tblDocumentApprovers` on `ttcontentid`.`document`=`tblDocumentApprovers`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentApprovers`.`version` ".
 				"LEFT JOIN `ttapproveid` ON `ttapproveid`.`approveID` = `tblDocumentApprovers`.`approveID` ".
-				"LEFT JOIN `tblDocumentApproveLog` ON `tblDocumentApproveLog`.`approveLogID`=`ttapproveid`.`maxLogId` ";
+				"LEFT JOIN `tblDocumentApproveLog` ON `tblDocumentApproveLog`.`approveLogID`=`ttapproveid`.`maxLogID` ";
 
 			if(1) {
 			$queryStr .= "WHERE (`tblDocumentApprovers`.`type` = 0 AND `tblDocumentApprovers`.`required` = ".$user->getID()." ";
@@ -1039,10 +1039,11 @@ class SeedDMS_Core_DMS {
 			$queryStr .=
 				"LEFT JOIN `tblDocumentRecipients` on `ttcontentid`.`document`=`tblDocumentRecipients`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRecipients`.`version` ".
 				"LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`receiptID` = `tblDocumentRecipients`.`receiptID` ".
-				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentReceiptLog`.`receiptLogID`=`ttreceiptid`.`maxLogId` ";
+				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentReceiptLog`.`receiptLogID`=`ttreceiptid`.`maxLogID` ";
 
 			if(1) {
 			$queryStr .= "WHERE (`tblDocumentRecipients`.`type` = 0 AND `tblDocumentRecipients`.`required` = ".$user->getID()." ";
+			/* Checking for groups slows down the statement extremly on sqlite */
 			if($groups)
 				$queryStr .= "OR `tblDocumentRecipients`.`type` = 1 AND `tblDocumentRecipients`.`required` IN (".implode(',', $groups).")";
 			$queryStr .= ") ";
@@ -1112,7 +1113,7 @@ class SeedDMS_Core_DMS {
 			$queryStr .=
 				"LEFT JOIN `tblDocumentRevisors` on `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` ".
 				"LEFT JOIN `ttrevisionid` ON `ttrevisionid`.`revisionID` = `tblDocumentRevisors`.`revisionID` ".
-				"LEFT JOIN `tblDocumentRevisionLog` ON `tblDocumentRevisionLog`.`revisionLogID`=`ttrevisionid`.`maxLogId` ";
+				"LEFT JOIN `tblDocumentRevisionLog` ON `tblDocumentRevisionLog`.`revisionLogID`=`ttrevisionid`.`maxLogID` ";
 
 			if(1) {
 			$queryStr .= "WHERE (`tblDocumentRevisors`.`type` = 0 AND `tblDocumentRevisors`.`required` = ".$user->getID()." ";

From c953d0260484b1907911c67d36bba06d4031886f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 12:34:46 +0200
Subject: [PATCH 0827/2006] views instead of temp. tables can be used

This speeds up many sql statements for mysql and pgsql
---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 295 +++++++++++++++++++++++++-
 1 file changed, 293 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index f3d98d383..16d031a74 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -112,6 +112,11 @@ class SeedDMS_Core_DatabaseAccess {
 	 */
 	private $_logfp;
 
+	/**
+	 * @var boolean set to true if views instead of temp. tables shall be used
+	 */
+	private $_useviews;
+
 	/**
 	 * Return list of all database tables
 	 *
@@ -140,6 +145,34 @@ class SeedDMS_Core_DatabaseAccess {
 		return $res;
 	}	/* }}} */
 
+	/**
+	 * Return list of all database views
+	 *
+	 * This function is used to retrieve a list of database views
+	 *
+	 * @return array list of view names
+	 */
+	public function ViewList() { /* {{{ */
+		switch($this->_driver) {
+			case 'mysql':
+				$sql = "select TABLE_NAME as name from information_schema.views where TABLE_SCHEMA='".$this->_database."'";
+				break;
+			case 'sqlite':
+				$sql = "select tbl_name as name from sqlite_master where type='view'";
+				break;
+			case 'pgsql':
+				$sql = "select viewname as name from pg_catalog.pg_views where schemaname='public'";
+				break;
+			default:
+				return false;
+		}
+		$arr = $this->getResultArray($sql);
+		$res = array();
+		foreach($arr as $tmp)
+			$res[] = $tmp['name'];
+		return $res;
+	}	/* }}} */
+
 	/**
 	 * Constructor of SeedDMS_Core_DatabaseAccess
 	 *
@@ -183,6 +216,7 @@ class SeedDMS_Core_DatabaseAccess {
 		$this->_ttcontentid = false;
 		$this->_ttreceiptid = false;
 		$this->_ttrevisionid = false;
+		$this->_useviews = true;
 		$this->_debug = false;
 	} /* }}} */
 
@@ -240,6 +274,15 @@ class SeedDMS_Core_DatabaseAccess {
 				$this->_conn->exec('PRAGMA foreign_keys = ON');
 				break;
 		}
+		if($this->_useviews) {
+			$tmp = $this->ViewList();
+			foreach(array('ttreviewid', 'ttapproveid', 'ttstatid', 'ttcontentid', 'ttreceiptid', 'ttrevisionid') as $viewname) {
+				if(in_array($viewname, $tmp)) {
+					$this->{"_".$viewname} = true;
+				}
+			}
+		}
+
 		$this->_connected = true;
 		return true;
 	} /* }}} */
@@ -383,7 +426,7 @@ class SeedDMS_Core_DatabaseAccess {
 	/**
 	 * Create various temporary tables to speed up and simplify sql queries
 	 */
-	function createTemporaryTable($tableName, $override=false) { /* {{{ */
+	private function __createTemporaryTable($tableName, $override=false) { /* {{{ */
 		if (!strcasecmp($tableName, "ttreviewid")) {
 			switch($this->_driver) {
 				case 'sqlite':
@@ -559,7 +602,7 @@ class SeedDMS_Core_DatabaseAccess {
 //						"ORDER BY `maxLogID`";
 				break;
 				case 'pgsql':
-					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` (`receiptID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`receiptID`);".
+					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreceiptid` (`receiptID` INTEGER, `maxLogID` INTEGER, PRIMARY KEY (`receiptID`));".
 						"INSERT INTO `ttreceiptid` SELECT `tblDocumentReceiptLog`.`receiptID`, ".
 						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReceiptLog` ".
@@ -633,6 +676,254 @@ class SeedDMS_Core_DatabaseAccess {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Create various temporary tables to speed up and simplify sql queries
+	 */
+	private function __createView($tableName, $override=false) { /* {{{ */
+		if (!strcasecmp($tableName, "ttreviewid")) {
+			switch($this->_driver) {
+				case 'sqlite':
+					$queryStr = "CREATE VIEW `ttreviewid` AS ".
+						"SELECT `tblDocumentReviewLog`.`reviewID` AS `reviewID`, ".
+						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReviewLog` ".
+						"GROUP BY `tblDocumentReviewLog`.`reviewID` "; //.
+				break;
+				case 'pgsql':
+					$queryStr = "CREATE VIEW `ttreviewid` AS ".
+						"SELECT `tblDocumentReviewLog`.`reviewID` AS `reviewID`, ".
+						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReviewLog` ".
+						"GROUP BY `tblDocumentReviewLog`.`reviewID` ";
+				break;
+				default:
+					$queryStr = "CREATE".($override ? " OR REPLACE" : "")." VIEW `ttreviewid` AS ".
+						"SELECT `tblDocumentReviewLog`.`reviewID` AS `reviewID`, ".
+						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReviewLog` ".
+						"GROUP BY `tblDocumentReviewLog`.`reviewID` ";
+			}
+			if (!$this->_ttreviewid) {
+				if (!$this->getResult($queryStr))
+					return false;
+				$this->_ttreviewid=true;
+			}
+			else {
+				if (is_bool($override) && $override) {
+					if (!$this->getResult("DROP VIEW `ttreviewid`"))
+						return false;
+					if (!$this->getResult($queryStr))
+						return false;
+				}
+			}
+			return $this->_ttreviewid;
+		}
+		elseif (!strcasecmp($tableName, "ttapproveid")) {
+			switch($this->_driver) {
+				case 'sqlite':
+					$queryStr = "CREATE VIEW `ttapproveid` AS ".
+						"SELECT `tblDocumentApproveLog`.`approveID` AS `approveID`, ".
+						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentApproveLog` ".
+						"GROUP BY `tblDocumentApproveLog`.`approveID` "; //.
+					break;
+				case 'pgsql':
+					$queryStr = "CREATE VIEW `ttapproveid` AS ".
+						"SELECT `tblDocumentApproveLog`.`approveID` AS `approveID`, ".
+						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentApproveLog` ".
+						"GROUP BY `tblDocumentApproveLog`.`approveID` ";
+					break;
+				default:
+					$queryStr = "CREATE".($override ? " OR REPLACE" : "")." VIEW `ttapproveid` AS ".
+						"SELECT `tblDocumentApproveLog`.`approveID`, ".
+						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentApproveLog` ".
+						"GROUP BY `tblDocumentApproveLog`.`approveID` ";
+			}
+			if (!$this->_ttapproveid) {
+				if (!$this->getResult($queryStr))
+					return false;
+				$this->_ttapproveid=true;
+			}
+			else {
+				if (is_bool($override) && $override) {
+					if (!$this->getResult("DROP VIEW `ttapproveid`"))
+						return false;
+					if (!$this->getResult($queryStr))
+						return false;
+				}
+			}
+			return $this->_ttapproveid;
+		}
+		elseif (!strcasecmp($tableName, "ttstatid")) {
+			switch($this->_driver) {
+				case 'sqlite':
+					$queryStr = "CREATE VIEW `ttstatid` AS ".
+						"SELECT `tblDocumentStatusLog`.`statusID` AS `statusID`, ".
+						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentStatusLog` ".
+						"GROUP BY `tblDocumentStatusLog`.`statusID` ";
+					break;
+				case 'pgsql':
+					$queryStr = "CREATE VIEW `ttstatid` AS ".
+						"SELECT `tblDocumentStatusLog`.`statusID` AS `statusID`, ".
+						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentStatusLog` ".
+						"GROUP BY `tblDocumentStatusLog`.`statusID` ";
+					break;
+				default:
+					$queryStr = "CREATE".($override ? " OR REPLACE" : "")." VIEW `ttstatid` AS ".
+						"SELECT `tblDocumentStatusLog`.`statusID`, ".
+						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentStatusLog` ".
+						"GROUP BY `tblDocumentStatusLog`.`statusID` ";
+			}
+			if (!$this->_ttstatid) {
+				if (!$this->getResult($queryStr))
+					return false;
+				$this->_ttstatid=true;
+			}
+			else {
+				if (is_bool($override) && $override) {
+					if (!$this->getResult("DROP VIEW `ttstatid`"))
+						return false;
+					if (!$this->getResult($queryStr))
+						return false;
+				}
+			}
+			return $this->_ttstatid;
+		}
+		elseif (!strcasecmp($tableName, "ttcontentid")) {
+			switch($this->_driver) {
+				case 'sqlite':
+					$queryStr = "CREATE VIEW `ttcontentid` AS ".
+						"SELECT `tblDocumentContent`.`document` AS `document`, ".
+						"MAX(`tblDocumentContent`.`version`) AS `maxVersion` ".
+						"FROM `tblDocumentContent` ".
+						"GROUP BY `tblDocumentContent`.`document` ".
+						"ORDER BY `tblDocumentContent`.`document`";
+					break;
+				case 'pgsql':
+					$queryStr = "CREATE VIEW `ttcontentid` AS ".
+						"SELECT `tblDocumentContent`.`document` AS `document`, ".
+						"MAX(`tblDocumentContent`.`version`) AS `maxVersion` ".
+						"FROM `tblDocumentContent` ".
+						"GROUP BY `tblDocumentContent`.`document` ".
+						"ORDER BY `tblDocumentContent`.`document`";
+					break;
+				default:
+					$queryStr = "CREATE".($override ? " OR REPLACE" : "")." VIEW `ttcontentid` AS ".
+						"SELECT `tblDocumentContent`.`document`, ".
+						"MAX(`tblDocumentContent`.`version`) AS `maxVersion` ".
+						"FROM `tblDocumentContent` ".
+						"GROUP BY `tblDocumentContent`.`document` ".
+						"ORDER BY `tblDocumentContent`.`document`";
+			}
+			if (!$this->_ttcontentid) {
+				if (!$this->getResult($queryStr))
+					return false;
+				$this->_ttcontentid=true;
+			}
+			else {
+				if (is_bool($override) && $override) {
+					if (!$this->getResult("DROP VIEW `ttcontentid`"))
+						return false;
+					if (!$this->getResult($queryStr))
+						return false;
+				}
+			}
+			return $this->_ttcontentid;
+		}
+		elseif (!strcasecmp($tableName, "ttreceiptid")) {
+			switch($this->_driver) {
+				case 'sqlite':
+					$queryStr = "CREATE VIEW `ttreceiptid` AS ".
+						"SELECT `tblDocumentReceiptLog`.`receiptID` AS `receiptID`, ".
+						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReceiptLog` ".
+						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ";
+				break;
+				case 'pgsql':
+					$queryStr = "CREATE VIEW `ttreceiptid` AS ".
+						"SELECT `tblDocumentReceiptLog`.`receiptID` AS `receiptID`, ".
+						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReceiptLog` ".
+						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ";
+				break;
+				default:
+					$queryStr = "CREATE".($override ? " OR REPLACE" : "")." VIEW `ttreceiptid` AS ".
+						"SELECT `tblDocumentReceiptLog`.`receiptID`, ".
+						"MAX(`tblDocumentReceiptLog`.`receiptLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentReceiptLog` ".
+						"GROUP BY `tblDocumentReceiptLog`.`receiptID` ";
+			}
+			if (!$this->_ttreceiptid) {
+				if (!$this->getResult($queryStr))
+					return false;
+				$this->_ttreceiptid=true;
+			}
+			else {
+				if (is_bool($override) && $override) {
+					if (!$this->getResult("DROP VIEW `ttreceiptid`"))
+						return false;
+					if (!$this->getResult($queryStr))
+						return false;
+				}
+			}
+			return $this->_ttreceiptid;
+		}
+		elseif (!strcasecmp($tableName, "ttrevisionid")) {
+			switch($this->_driver) {
+				case 'sqlite':
+					$queryStr = "CREATE VIEW `ttrevisionid` AS ".
+						"SELECT `tblDocumentRevisionLog`.`revisionID` AS `revisionID`, ".
+						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentRevisionLog` ".
+						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ";
+				break;
+				case 'pgsql':
+					$queryStr = "CREATE VIEW `ttrevisionid` AS ".
+						"SELECT `tblDocumentRevisionLog`.`revisionID` AS `revisionID`, ".
+						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentRevisionLog` ".
+						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ";
+				break;
+				default:
+					$queryStr = "CREATE".($override ? " OR REPLACE" : "")." VIEW `ttrevisionid` AS ".
+						"SELECT `tblDocumentRevisionLog`.`revisionID`, ".
+						"MAX(`tblDocumentRevisionLog`.`revisionLogID`) AS `maxLogID` ".
+						"FROM `tblDocumentRevisionLog` ".
+						"GROUP BY `tblDocumentRevisionLog`.`revisionID` ";
+			}
+			if (!$this->_ttrevisionid) {
+				if (!$this->getResult($queryStr))
+					return false;
+				$this->_ttrevisionid=true;
+			}
+			else {
+				if (is_bool($override) && $override) {
+					if (!$this->getResult("DROP VIEW `ttrevisionid`"))
+						return false;
+					if (!$this->getResult($queryStr))
+						return false;
+				}
+			}
+			return $this->_ttrevisionid;
+		}
+		return false;
+	} /* }}} */
+
+	/**
+	 * Create various temporary tables to speed up and simplify sql queries
+	 */
+	public function createTemporaryTable($tableName, $override=false) { /* {{{ */
+		if($this->_useviews)
+			return $this->__createView($tableName, $override);
+		else
+			return $this->__createTemporaryTable($tableName, $override);
+	} /* }}} */
+
 	/**
 	 * Return sql statement for extracting the date part from a field
 	 * containing a unix timestamp

From 05489891f769eb9b8d7b41f476487669ac9ce43a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 12:36:20 +0200
Subject: [PATCH 0828/2006] getPermission() returns always an int

---
 inc/inc.ClassAcl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAcl.php b/inc/inc.ClassAcl.php
index f96f09ed8..04e9a3bac 100644
--- a/inc/inc.ClassAcl.php
+++ b/inc/inc.ClassAcl.php
@@ -353,7 +353,7 @@ class SeedDMS_Aco extends SeedDMS_AroAco{ /* {{{ */
 			return false;
 		if (count($resArr) != 1)
 			return 0;
-		return $resArr[0]['read'];
+		return (int) $resArr[0]['read'];
 	} /* }}} */
 
 	public static function getRoot($dms) { /* {{{ */

From 9f2fd0e2ec39b88ad81092bab1e4c06afb034f26 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 12:36:42 +0200
Subject: [PATCH 0829/2006] check for int -1 and 1 instead of string "-1" and
 "1"

SeedDMS_Acl_Aro::getPermission() returns int anyway
---
 views/bootstrap/class.Acl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index e616b46f7..2777845f9 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -40,11 +40,11 @@ $('#acostree').tree({
 	closedIcon: '<i class="icon-plus-sign"></i>',
 	onCreateLi: function(node, $li) {
 		switch(node.permission) {
-			case "-1":
+			case -1:
 				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
 				$li.attr('style', 'background-color:#FDD');
 				break;
-			case "1":
+			case 1:
 				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
 				$li.attr('style', 'background-color:#DFD');
 				break;

From aabbb5c25446e011c59e2c4b587e0b142b70095a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 13:27:25 +0200
Subject: [PATCH 0830/2006] add notes for 6.0.1

---
 SeedDMS_Core/package.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 3073e46d8..ece575ffc 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -31,6 +31,8 @@
 - SeedDMS_Core_Document::checkForDueRevisionWorkflow() also checks if there
 are any waiting or pending revisions at all
 - SeedDMS_Core_User::getReverseSubstitutes() works with new roles
+- fix field name in getDocumentList() to make it work for pgsql
+- views instead of temp. tables can be used
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From ffc00a6bebb875d32b875383bedde544169167d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 13:27:37 +0200
Subject: [PATCH 0831/2006] add entry for 6.0.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ccae3e8dd..e70705007 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@
 - sql queries and execution times can be written to file in database layer
 - add document check for docs in revision and missing access rights of revisor
 - add document check for docs requiring receptions but user lacks access right
+- fix Acl manager when using pgsql
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0

From 1f701a84e4d8eff82b4404d800b0f9346daeb426 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 13:42:12 +0200
Subject: [PATCH 0832/2006] group last access sessions by userid

---
 inc/inc.ClassSession.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassSession.php b/inc/inc.ClassSession.php
index e84fcc00a..a57b94dba 100644
--- a/inc/inc.ClassSession.php
+++ b/inc/inc.ClassSession.php
@@ -497,6 +497,7 @@ class SeedDMS_SessionMgr {
 		if(!$ts = makeTsFromLongDate($datetime))
 			return false;
 		$queryStr = "SELECT * FROM `tblSessions` WHERE `lastAccess`>=".$ts;
+		$queryStr .= " GROUP BY `userID` ";
 		$queryStr .= " ORDER BY `lastAccess` DESC";
 		$resArr = $this->db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)

From 88d89c206d7cba74159f9bca63e310fcddfd9eb1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 21:16:38 +0200
Subject: [PATCH 0833/2006] export revision date

---
 utils/xmldump.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/xmldump.php b/utils/xmldump.php
index 5b172c5df..848a321f1 100644
--- a/utils/xmldump.php
+++ b/utils/xmldump.php
@@ -337,6 +337,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
 					echo $indent."   <attr name=\"comment\">".wrapWithCData($version->getComment())."</attr>\n";
 					echo $indent."   <attr name=\"owner\">".$owner->getId()."</attr>\n";
 					echo $indent."   <attr name=\"orgfilename\">".wrapWithCData($version->getOriginalFileName())."</attr>\n";
+					echo $indent."   <attr name=\"revisiondate\" format=\"Y-m-d\">".$version->getRevisionDate()."</attr>\n";
 					if($attributes = $version->getAttributes()) {
 						foreach($attributes as $attribute) {
 							$attrdef = $attribute->getAttributeDefinition();

From dd94898b19146af70eab97ebec4dfc5ee2dbc596 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 21:17:11 +0200
Subject: [PATCH 0834/2006] import revisions

---
 utils/xmlimport.php | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index cf64ef71c..713b91a74 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -631,6 +631,7 @@ function insert_document($document) { /* {{{ */
 
 		$newVersion = $result[1]->getContent();
 		$newVersion->setDate(dateToTimestamp($initversion['attributes']['date']));
+		$newVersion->setRevisionDate($initversion['attributes']['revisiondate']);
 		if($workflowstate)
 			$newVersion->setWorkflowState($workflowstate);
 		$newlogs = array();
@@ -659,6 +660,10 @@ function insert_document($document) { /* {{{ */
 			$newreceipts = getRevAppLog($initversion['receipts']);
 			$newVersion->rewriteReceiptLog($newreceipts);
 		}
+		if($initversion['revisions']) {
+			$newrevisions = getRevAppLog($initversion['revisions']);
+			$newVersion->rewriteRevisionLog($newrevisions);
+		}
 
 		if($initversion['workflowlogs']) {
 			$newworkflowlogs = getWorkflowLog($initversion['workflowlogs']);
@@ -749,6 +754,7 @@ function insert_document($document) { /* {{{ */
 			if($workflowstate)
 				$newVersion->setWorkflowState($workflowstate);
 			$newVersion->setDate(dateToTimestamp($version['attributes']['date']));
+			$newVersion->setRevisionDate($version['attributes']['revisiondate']);
 			$newlogs = array();
 			foreach($version['statuslogs'] as $i=>$log) {
 				if(!array_key_exists($log['attributes']['user'], $objmap['users'])) {
@@ -773,6 +779,10 @@ function insert_document($document) { /* {{{ */
 				$newreceipts = getRevAppLog($version['receipts']);
 				$newVersion->rewriteReceiptLog($newreceipts);
 			}
+			if($version['revisions']) {
+				$newrevisions = getRevAppLog($version['revisions']);
+				$newVersion->rewriteRevisionLog($newrevisions);
+			}
 
 			if($version['workflowlogs']) {
 				$newworkflowlogs = getWorkflowLog($version['workflowlogs']);
@@ -1072,7 +1082,7 @@ function set_mandatory() { /* {{{ */
 } /* }}} */
 
 function startElement($parser, $name, $attrs) { /* {{{ */
-	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
+	global $logger, $dms, $noversioncheck, $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_workflowlog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_revision, $cur_revisionlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	$parent = end($elementstack);
 	array_push($elementstack, array('name'=>$name, 'attributes'=>$attrs));
@@ -1195,6 +1205,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 			$cur_version['approvals'] = array();
 			$cur_version['reviews'] = array();
 			$cur_version['receipts'] = array();
+			$cur_version['revisions'] = array();
 			$cur_version['statuslogs'] = array();
 			$cur_version['workflowlogs'] = array();
 			break;
@@ -1236,6 +1247,15 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 			$cur_receiptlog = array();
 			$cur_receiptlog['attributes'] = array();
 			break;
+		case "REVISION":
+			$cur_revision = array();
+			$cur_revision['attributes'] = array();
+			$cur_revision['logs'] = array();
+			break;
+		case "REVISIONLOG":
+			$cur_revisionlog = array();
+			$cur_revisionlog['attributes'] = array();
+			break;
 		case 'ATTRIBUTEDEFINITION':
 			$cur_attrdef = array();
 			$cur_attrdef['id'] = (int) $attrs['ID'];
@@ -1271,6 +1291,10 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 				$cur_receipt['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'RECEIPTLOG') {
 				$cur_receiptlog['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'REVISION') {
+				$cur_revision['attributes'][$attrs['NAME']] = '';
+			} elseif($parent['name'] == 'REVISIONLOG') {
+				$cur_revisionlog['attributes'][$attrs['NAME']] = '';
 			} elseif($parent['name'] == 'FOLDER') {
 				if(isset($attrs['TYPE']) && $attrs['TYPE'] == 'user') {
 					$cur_folder['user_attributes'][$attrs['ATTRDEF']] = '';
@@ -1463,7 +1487,7 @@ function startElement($parser, $name, $attrs) { /* {{{ */
 } /* }}} */
 
 function endElement($parser, $name) { /* {{{ */
-	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
+	global $logger, $dms, $sections, $rootfolder, $objmap, $elementstack, $users, $groups, $links,$cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_revision, $cur_revisionlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	array_pop($elementstack);
 	$parent = end($elementstack);
@@ -1503,6 +1527,12 @@ function endElement($parser, $name) { /* {{{ */
 		case "RECEIPTLOG":
 			$cur_receipt['logs'][] = $cur_receiptlog;
 			break;
+		case "REVISION":
+			$cur_version['revisions'][] = $cur_revision;
+			break;
+		case "REVISIONLOG":
+			$cur_revision['logs'][] = $cur_revisionlog;
+			break;
 		case "USER":
 			/* users can be the users data or the member of a group */
 			$first = $elementstack[1];
@@ -1609,7 +1639,7 @@ function endElement($parser, $name) { /* {{{ */
 } /* }}} */
 
 function characterData($parser, $data) { /* {{{ */
-	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
+	global $elementstack, $objmap, $cur_user, $cur_group, $cur_folder, $cur_document, $cur_version, $cur_statuslog, $cur_approval, $cur_approvallog, $cur_review, $cur_reviewlog, $cur_receipt, $cur_receiptlog, $cur_revision, $cur_revisionlog, $cur_attrdef, $cur_documentcat, $cur_keyword, $cur_keywordcat, $cur_file, $cur_link, $cur_workflow, $cur_workflowlog, $cur_workflowtransition, $cur_workflowaction, $cur_workflowstate, $cur_transition, $cur_transmittal, $cur_transmittalitem, $cur_role, $cur_acopath, $cur_acos;
 
 	$current = end($elementstack);
 	$parent = prev($elementstack);
@@ -1688,6 +1718,15 @@ function characterData($parser, $data) { /* {{{ */
 					else
 						$cur_receiptlog['attributes'][$current['attributes']['NAME']] = $data;
 					break;
+				case 'REVISION':
+					$cur_revision['attributes'][$current['attributes']['NAME']] = $data;
+					break;
+				case 'REVISIONLOG':
+					if(isset($cur_revisionlog['attributes'][$current['attributes']['NAME']]))
+						$cur_revisionlog['attributes'][$current['attributes']['NAME']] .= $data;
+					else
+						$cur_revisionlog['attributes'][$current['attributes']['NAME']] = $data;
+					break;
 				case 'WORKFLOWLOG':
 					if(isset($cur_workflowlog['attributes'][$current['attributes']['NAME']]))
 						$cur_workflowlog['attributes'][$current['attributes']['NAME']] .= $data;

From ab141b84df699b35cf30e30a02253cda45f78ca7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 21:17:31 +0200
Subject: [PATCH 0835/2006] show last access in online users only to admins

---
 views/bootstrap/class.Session.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Session.php b/views/bootstrap/class.Session.php
index 9146fc901..fa7a86a79 100644
--- a/views/bootstrap/class.Session.php
+++ b/views/bootstrap/class.Session.php
@@ -45,6 +45,7 @@ class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 
 		$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
+		/* Get only sessions which has been active in the last 3600 sec. */
 		$sessions = $sessionmgr->getLastAccessedSessions(date('Y-m-d H:i:s', time()-3600));
 
 		if ($user->isGuest() || count($sessions) == 0) {
@@ -58,7 +59,7 @@ class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
 		foreach($sessions as $session) {
 			if($sesuser = $dms->getUser($session->getUser()))
 				if(!$sesuser->isHidden())
-					$content .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName())." ".getReadableDuration(time()-$session->getLastAccess())."</a></li>\n";
+					$content .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName()).($user->isAdmin() ? " ".getReadableDuration(time()-$session->getLastAccess()) : "")."</a></li>\n";
 		}
 		$content .= "     </ul>\n";
 		$content .= "    </li>\n";

From 268d844b432093a0b16849a4e8ae32b93b6704ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 21:17:58 +0200
Subject: [PATCH 0836/2006] fix some comments

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 051349e62..a6db83983 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3799,7 +3799,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * Rewrites the complete revision log
 	 * 
 	 * Attention: this function is highly dangerous.
-	 * It removes an existing receipt log and rewrites it.
+	 * It removes an existing revision log and rewrites it.
 	 * This method was added for importing an xml dump.
 	 *
 	 * @param array $revisionlog new status log with the newest log entry first.
@@ -4414,10 +4414,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * This function adds a user as a revisor but doesn't start the
 	 * revision workflow by default. This behaviour is different from all
-	 * other workflows (approval, review, receipt), because it doesn't add
-	 * the initial entry in the revision log, which starts the workflow.
-	 * It just adds the revisors to the content. The workflow is started
-	 * at a later point in time by adding the first entry in the revision log.
+	 * other workflows (approval, review, receipt), because it adds
+	 * an initial entry in the revision log, which marks the revision as
+	 * 'sleeping'. The workflow is started at a later point in time by adding 
+	 * the second entry in the revision log which puts it into 'waiting'.
 	 *
 	 * @param object $user user to be added as a revisor
 	 * @param object $requestUser user requesting the addition

From 29bc0c1fda335b75eebd3374d7916c3ee8c7ec56 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 22:10:44 +0200
Subject: [PATCH 0837/2006] getNotifyList() returns only users which are not
 disabled

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 13 +++++++++----
 SeedDMS_Core/Core/inc.ClassFolder.php   | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index a6db83983..efb8af4da 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1329,10 +1329,15 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$this->_notifyList = array("groups" => array(), "users" => array());
 			foreach ($resArr as $row)
 			{
-				if ($row["userID"] != -1)
-					array_push($this->_notifyList["users"], $this->_dms->getUser($row["userID"]) );
-				else //if ($row["groupID"] != -1)
-					array_push($this->_notifyList["groups"], $this->_dms->getGroup($row["groupID"]) );
+				if ($row["userID"] != -1) {
+					$u = $this->_dms->getUser($row["userID"]);
+					if($u && !$u->isDisabled())
+						array_push($this->_notifyList["users"], $u);
+				} else { //if ($row["groupID"] != -1)
+					$g = $this->_dms->getGroup($row["groupID"]);
+					if($g)
+						array_push($this->_notifyList["groups"], $g);
+				}
 			}
 		}
 		return $this->_notifyList;
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index c1d7b9130..bdae11412 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -1251,10 +1251,15 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 			$this->_notifyList = array("groups" => array(), "users" => array());
 			foreach ($resArr as $row)
 			{
-				if ($row["userID"] != -1)
-					array_push($this->_notifyList["users"], $this->_dms->getUser($row["userID"]) );
-				else //if ($row["groupID"] != -1)
-					array_push($this->_notifyList["groups"], $this->_dms->getGroup($row["groupID"]) );
+				if ($row["userID"] != -1) {
+					$u = $this->_dms->getUser($row["userID"]);
+					if($u && !$u->isDisabled())
+						array_push($this->_notifyList["users"], $u);
+				} else {//if ($row["groupID"] != -1)
+					$g = $this->_dms->getGroup($row["groupID"]);
+					if($g)
+						array_push($this->_notifyList["groups"], $g);
+				}
 			}
 		}
 		return $this->_notifyList;

From e851c7967a25cbc9fbdc72cf29a484a61c4ea497 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 22:11:17 +0200
Subject: [PATCH 0838/2006] list number of all open tasks in user info

---
 views/bootstrap/class.UsrMgr.php | 48 ++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index f043922e3..0cb4104d7 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -105,29 +105,49 @@ $(document).ready( function() {
 			$documents = $seluser->getDocumentsLocked();
 			echo "<tr><td>".getMLText('documents_locked')."</td><td>".count($documents)."</td></tr>\n";
 			if($workflowmode == "traditional") {
-				$reviewStatus = $seluser->getReviewStatus();
-				if($reviewStatus['indstatus']) {
-					$i = 0;
-					foreach($reviewStatus['indstatus'] as $rv) {
-						if($rv['status'] == 0) {
-							$i++;
+				$resArr = $dms->getDocumentList('ReviewByMe', $seluser);
+				if($resArr) {
+					foreach ($resArr as $res) {
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 						}
 					}
-					echo "<tr><td>".getMLText('pending_reviews')."</td><td>".$i."</td></tr>\n";
+					echo "<tr><td>".getMLText('pending_reviews')."</td><td>".count($tasks['review'])."</td></tr>\n";
 				}
 			}
 			if($workflowmode == "traditional" || $workflowmode == 'traditional_only_approval') {
-				$approvalStatus = $seluser->getApprovalStatus();
-				if($approvalStatus['indstatus']) {
-					$i = 0;
-					foreach($approvalStatus['indstatus'] as $rv) {
-						if($rv['status'] == 0) {
-							$i++;
+				$resArr = $dms->getDocumentList('ApproveByMe', $seluser);
+				if($resArr) {
+					foreach ($resArr as $res) {
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 						}
 					}
-					echo "<tr><td>".getMLText('pending_approvals')."</td><td>".$i."</td></tr>\n";
+					echo "<tr><td>".getMLText('pending_approvals')."</td><td>".count($tasks['approval'])."</td></tr>\n";
 				}
 			}
+			$resArr = $dms->getDocumentList('ReceiptByMe', $seluser);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
+				}
+				echo "<tr><td>".getMLText('pending_receipt')."</td><td>".count($tasks['receipt'])."</td></tr>\n";
+			}
+			$resArr = $dms->getDocumentList('ReviseByMe', $seluser);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
+				}
+				echo "<tr><td>".getMLText('pending_revision')."</td><td>".count($tasks['revision'])."</td></tr>\n";
+			}
 			if($workflowmode == 'advanced') {
 				$workflowStatus = $seluser->getWorkflowStatus();
 				if($workflowStatus['u'])

From bfd81846484b73be4216d19c56aa84f57159f50e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Jul 2017 22:11:42 +0200
Subject: [PATCH 0839/2006] notes for 6.0.1

---
 CHANGELOG                | 2 ++
 SeedDMS_Core/package.xml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e70705007..60aa3ab83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,8 @@
 - add document check for docs in revision and missing access rights of revisor
 - add document check for docs requiring receptions but user lacks access right
 - fix Acl manager when using pgsql
+- do not notify disabled users
+- list all open tasks of user in user info of user manager
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ece575ffc..d9e412537 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -33,6 +33,8 @@ are any waiting or pending revisions at all
 - SeedDMS_Core_User::getReverseSubstitutes() works with new roles
 - fix field name in getDocumentList() to make it work for pgsql
 - views instead of temp. tables can be used
+- SeedDMS_Core_Document::getNotifyList() and SeedDMS_Core_Folder::getNotifyList()
+returns just users which are not disabled
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 7f76864f41bea98065b70e546bb0504fe649a50e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Jul 2017 11:22:31 +0200
Subject: [PATCH 0840/2006] take out entry from 6.0.1 because feature was added
 in 5.1.3

---
 CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 370038bb5..ee191aa04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,7 +11,6 @@
 - add document check for docs in revision and missing access rights of revisor
 - add document check for docs requiring receptions but user lacks access right
 - fix Acl manager when using pgsql
-- do not notify disabled users
 - list all open tasks of user in user info of user manager
 
 --------------------------------------------------------------------------------

From 114a8a3ac1708c51ee6563d322176c7869d5a0f7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 11:54:24 +0200
Subject: [PATCH 0841/2006] move code in remove() into __removeFromProcesses()

---
 SeedDMS_Core/Core/inc.ClassUser.php | 47 +++++++++++++++--------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 4b92bbcd2..9a8d9767f 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -785,6 +785,31 @@ class SeedDMS_Core_User { /* {{{ */
 				}
 			}
 		}
+
+		$receiptStatus = $this->getReceiptStatus();
+		foreach ($receiptStatus["indstatus"] as $ri) {
+			if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
+				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+				$res=$db->getResult($queryStr);
+				if(!$res) {
+					return false;
+				}
+			}
+		}
+
+		$revisionStatus = $this->getRevisionStatus();
+		foreach ($revisionStatus["indstatus"] as $ri) {
+			if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
+				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
+					"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+				$res=$db->getResult($queryStr);
+				if(!$res) {
+					return false;
+				}
+			}
+		}
+
 		return true;
 	} /* }}} */
 
@@ -1086,28 +1111,6 @@ class SeedDMS_Core_User { /* {{{ */
 				return false;
 		}
 
-		$receiptStatus = $this->getReceiptStatus();
-		foreach ($receiptStatus["indstatus"] as $ri) {
-			$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-			$res=$db->getResult($queryStr);
-			if(!$res) {
-				$db->rollbackTransaction();
-				return false;
-			}
-		}
-
-		$revisionStatus = $this->getRevisionStatus();
-		foreach ($revisionStatus["indstatus"] as $ri) {
-			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-				"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-			$res=$db->getResult($queryStr);
-			if(!$res) {
-				$db->rollbackTransaction();
-				return false;
-			}
-		}
-
 		$db->commitTransaction();
 		return true;
 	} /* }}} */

From acb63375037547ac36bf5e152fc1d8408f7cc0a4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 12:41:28 +0200
Subject: [PATCH 0842/2006] remove receipts and revisions

---
 .../class.RemoveUserFromProcesses.php         | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index 422f07a4c..302faf46d 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -68,6 +68,24 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 			else
 				$tmpa[$ai['status']] = array($ai);
 		}
+
+		$receiptStatus = $rmuser->getReceiptStatus();
+		$tmpb = array();
+		foreach($approvalStatus['indstatus'] as $ai) {
+			if(isset($tmpb[$ai['status']]))
+				$tmpb[$ai['status']][] = $ai;
+			else
+				$tmpb[$ai['status']] = array($ai);
+		}
+
+		$revisionStatus = $rmuser->getRevisionStatus();
+		$tmpc = array();
+		foreach($approvalStatus['indstatus'] as $ai) {
+			if(isset($tmpc[$ai['status']]))
+				$tmpc[$ai['status']][] = $ai;
+			else
+				$tmpc[$ai['status']] = array($ai);
+		}
 ?>
 <?php if(isset($tmpa["0"]) || isset($tmpr["0"])) { ?>
 <div class="control-group">
@@ -97,6 +115,62 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 </div>
 <?php } ?>
 
+<?php if(isset($tmpb["0"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[]" value="0" checked> <?php echo getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))); ?>
+		</label>
+	</div>
+</div>
+<?php } ?>
+<?php if(isset($tmpb["1"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[]" value="1" checked> <?php echo getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))); ?><br />
+		</label>
+	</div>
+</div>
+<?php } ?>
+<?php if(isset($tmpb["-1"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[]" value="-1" checked> <?php echo getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))); ?><br />
+		</label>
+	</div>
+</div>
+<?php } ?>
+
+<?php if(isset($tmpc["0"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[]" value="0" checked> <?php echo getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))); ?>
+		</label>
+	</div>
+</div>
+<?php } ?>
+<?php if(isset($tmpc["1"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[]" value="1" checked> <?php echo getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))); ?><br />
+		</label>
+	</div>
+</div>
+<?php } ?>
+<?php if(isset($tmpc["-1"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[]" value="-1" checked> <?php echo getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))); ?><br />
+		</label>
+	</div>
+</div>
+<?php } ?>
+
 <div class="control-group">
 	<div class="controls">
 <button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_user_from_processes");?></button>

From 07d760d7d8899f19df567ac80344d0ac333964fd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 14:13:02 +0200
Subject: [PATCH 0843/2006] fix remove from process for receipts and revisions

---
 SeedDMS_Core/Core/inc.ClassUser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 353471d91..973e8221e 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -790,7 +790,7 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$receiptStatus = $this->getReceiptStatus();
 		foreach ($receiptStatus["indstatus"] as $ri) {
-			if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
+			if($ri['status'] != -2 && (empty($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
 				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
@@ -802,7 +802,7 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$revisionStatus = $this->getRevisionStatus();
 		foreach ($revisionStatus["indstatus"] as $ri) {
-			if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
+			if($ri['status'] != -2 && (empty($states['revision']) || in_array($ri['status'], $states['revision']))) {
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);

From cda9f99f9e4b5903229a94cd203c208d7467d1c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 14:13:27 +0200
Subject: [PATCH 0844/2006] show right values for receipts and revisions

---
 .../class.RemoveUserFromProcesses.php         | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index e804b4cc4..856c16b67 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -71,7 +71,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 
 		$receiptStatus = $rmuser->getReceiptStatus();
 		$tmpb = array();
-		foreach($approvalStatus['indstatus'] as $ai) {
+		foreach($receiptStatus['indstatus'] as $ai) {
 			if(isset($tmpb[$ai['status']]))
 				$tmpb[$ai['status']][] = $ai;
 			else
@@ -80,7 +80,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 
 		$revisionStatus = $rmuser->getRevisionStatus();
 		$tmpc = array();
-		foreach($approvalStatus['indstatus'] as $ai) {
+		foreach($revisionStatus['indstatus'] as $ai) {
 			if(isset($tmpc[$ai['status']]))
 				$tmpc[$ai['status']][] = $ai;
 			else
@@ -147,7 +147,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[]" value="0" checked> <?php echo getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))); ?>
+	<input type="checkbox" name="status[receipt][]" value="0" checked> <?php echo getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))); ?>
 		</label>
 	</div>
 </div>
@@ -156,7 +156,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[]" value="1" checked> <?php echo getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))); ?><br />
+	<input type="checkbox" name="status[receipt][]" value="1"> <?php echo getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))); ?><br />
 		</label>
 	</div>
 </div>
@@ -165,7 +165,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[]" value="-1" checked> <?php echo getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))); ?><br />
+	<input type="checkbox" name="status[receipt][]" value="-1"> <?php echo getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))); ?><br />
 		</label>
 	</div>
 </div>
@@ -175,7 +175,16 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[]" value="0" checked> <?php echo getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))); ?>
+	<input type="checkbox" name="status[revision][]" value="0" checked> <?php echo getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))); ?>
+		</label>
+	</div>
+</div>
+<?php } ?>
+<?php if(isset($tmpc["-3"])) { ?>
+<div class="control-group">
+	<div class="controls">
+		<label class="checkbox">
+	<input type="checkbox" name="status[revision][]" value="-3" checked> <?php echo getMLText('revisions_pending', array('no_revisions' => count($tmpc["-3"]))); ?>
 		</label>
 	</div>
 </div>
@@ -184,7 +193,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[]" value="1" checked> <?php echo getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))); ?><br />
+	<input type="checkbox" name="status[revision][]" value="1"> <?php echo getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))); ?><br />
 		</label>
 	</div>
 </div>
@@ -193,7 +202,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[]" value="-1" checked> <?php echo getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))); ?><br />
+	<input type="checkbox" name="status[revision][]" value="-1"> <?php echo getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))); ?><br />
 		</label>
 	</div>
 </div>

From 7b5412ff3692b36c18e14a79ee4279a9064e92ce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 14:21:24 +0200
Subject: [PATCH 0845/2006] remove from process only if status[receipt],
 status[revision] is not set

---
 SeedDMS_Core/Core/inc.ClassUser.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 185625515..5ee1bc840 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -767,7 +767,6 @@ class SeedDMS_Core_User { /* {{{ */
 			if($ri['status'] != -2 && (!isset($states['review']) || in_array($ri['status'], $states['review']))) {
 				$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-				echo $queryStr;
 				$res=$db->getResult($queryStr);
 				if(!$res) {
 					return false;
@@ -780,7 +779,6 @@ class SeedDMS_Core_User { /* {{{ */
 			if($ai['status'] != -2 && (!isset($states['approval']) || in_array($ai['status'], $states['approval']))) {
 				$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-				echo $queryStr;
 				$res=$db->getResult($queryStr);
 				if(!$res) {
 					return false;
@@ -790,7 +788,7 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$receiptStatus = $this->getReceiptStatus();
 		foreach ($receiptStatus["indstatus"] as $ri) {
-			if($ri['status'] != -2 && (empty($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
+			if($ri['status'] != -2 && (!isset($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
 				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
@@ -802,7 +800,7 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$revisionStatus = $this->getRevisionStatus();
 		foreach ($revisionStatus["indstatus"] as $ri) {
-			if($ri['status'] != -2 && (empty($states['revision']) || in_array($ri['status'], $states['revision']))) {
+			if($ri['status'] != -2 && (!isset($states['revision']) || in_array($ri['status'], $states['revision']))) {
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);

From 2de7d8931a07b0337b148af3ff3c3a6b29f615b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 14:22:12 +0200
Subject: [PATCH 0846/2006] set status[receipt] and status[revision] to empty
 array if not set

---
 op/op.UsrMgr.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 4cfe1a588..8c23cc26b 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -215,6 +215,10 @@ else if ($action == "removefromprocesses") {
 			$_POST["status"]["review"] = array();
 		if(!isset($_POST["status"]["approval"]))
 			$_POST["status"]["approval"] = array();
+		if(!isset($_POST["status"]["receipt"]))
+			$_POST["status"]["receipt"] = array();
+		if(!isset($_POST["status"]["revision"]))
+			$_POST["status"]["revision"] = array();
 		if (!$userToRemove->removeFromProcesses($user, $_POST['status'])) {
 			UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 		}

From b0dfeca98b86c4ca44cf45256848d2446631cba7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 15:12:12 +0200
Subject: [PATCH 0847/2006] show progress of receptions also to owner of
 document, show numbers

---
 views/bootstrap/class.ViewDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 2fc461746..d34f42352 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1265,16 +1265,16 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		</table>
 <?php
 			$this->contentContainerEnd();
-			if($user->isAdmin()) {
+			if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
 				/* Do not count entries '-2' as they are removed userѕ */
 				$totalreceipts = $stat['-1'] + $stat['0'] + $stat['1'];
 ?>
 			<div class="row-fluid">
 			<div class="span12">
 <div class="progress">
-<div class="bar bar-success" style="width: <?php echo round($stat['1']/$totalreceipts*100); ?>%;"></div>
+<div class="bar bar-success" style="width: <?php echo round($stat['1']/$totalreceipts*100); ?>%;"><?php echo ($stat['1'] ? $stat['1']."/".$totalreceipts : ''); ?></div>
 <!-- div class="bar bar-warning" style="width: <?php echo round($stat['0']/$totalreceipts*100); ?>%;"></div -->
-	<div class="bar bar-danger" style="width: <?php echo round($stat['-1']/$totalreceipts*100); ?>%;"></div>
+	<div class="bar bar-danger" style="width: <?php echo round($stat['-1']/$totalreceipts*100); ?>%;"><?php echo ($stat['-1'] ? $stat['-1']."/".$totalreceipts : ''); ?></div>
 </div>
 			</div>
 			</div>

From b5a7f41a8ed3f3c83557f47ba1165113fe056870 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 15:36:34 +0200
Subject: [PATCH 0848/2006] show logs to owner of document

---
 views/bootstrap/class.DocumentVersionDetail.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 177879438..095f1204b 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -270,6 +270,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		echo "</td>";
 		print "</tr></tbody>\n</table>\n";
 
+		$this->contentContainerEnd();
+		$this->contentContainerStart();
 
 		print "<table class=\"table-condensed\">\n";
 
@@ -456,7 +458,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerEnd();
 		}
 
-		if($user->isAdmin()) {
+		if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
 			$this->contentHeading(getMLText("status"));
 			$this->contentContainerStart();
 			$statuslog = $version->getStatusLog();

From 547eb0672502a85f81498dcd3166a1ae82f04e73 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 15:37:05 +0200
Subject: [PATCH 0849/2006] show logs to owner of document

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index d34f42352..7ed560818 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -932,7 +932,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</table>\n";
 		$this->contentContainerEnd();
 
-		if($user->isAdmin()) {
+		if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
 ?>
 			<div class="row-fluid">
 <?php
@@ -1384,7 +1384,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		</table>
 <?php
 		$this->contentContainerEnd();
-		if($user->isAdmin()) {
+		if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
 ?>
 			<div class="row-fluid">
 			<div class="span12">

From 887612ddf9a188dafff0e656050be19afec0b77d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 15:37:20 +0200
Subject: [PATCH 0850/2006] add entry for 6.0.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index bd26189b6..8c967cce8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
 - add document check for docs requiring receptions but user lacks access right
 - fix Acl manager when using pgsql
 - list all open tasks of user in user info of user manager
+- owner of document may see review/approval/receipt/revision log
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0

From e8b09b3f035e5a2f32573ba8f2db1e36ad4c70c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Aug 2017 08:04:46 +0200
Subject: [PATCH 0851/2006] do not send notification to owner anymore

was sent when current user != owner
---
 op/op.CheckInDocument.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 78459d678..a2855fb9c 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -245,9 +245,6 @@ else
 			foreach ($notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
-			// if user is not owner send notification to owner
-			if ($user->getID() != $document->getOwner()->getID()) 
-				$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
 
 			if($workflow && $settings->_enableNotificationWorkflow) {
 				$subject = "request_workflow_action_email_subject";

From 85cc7c017fcfca2682c0a8bda205f9e51b3fc3dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Aug 2017 08:36:17 +0200
Subject: [PATCH 0852/2006] send mails to reviewer and approver

---
 op/op.CheckInDocument.php | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index a2855fb9c..e3e336741 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -269,6 +269,51 @@ else
 					}
 				}
 			}
+
+			if($settings->_enableNotificationAppRev) {
+				/* Reviewers and approvers will be informed about the new document */
+				if($reviewers['i'] || $reviewers['g']) {
+					$subject = "review_request_email_subject";
+					$message = "review_request_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['version'] = $reqversion;
+					$params['comment'] = $comment;
+					$params['username'] = $user->getFullName();
+					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					foreach($reviewers['i'] as $reviewerid) {
+						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params);
+					}
+					foreach($reviewers['g'] as $reviewergrpid) {
+						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params);
+					}
+				}
+
+				elseif($approvers['i'] || $approvers['g']) {
+					$subject = "approval_request_email_subject";
+					$message = "approval_request_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['version'] = $reqversion;
+					$params['comment'] = $comment;
+					$params['username'] = $user->getFullName();
+					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					foreach($approvers['i'] as $approverid) {
+						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params);
+					}
+					foreach($approvers['g'] as $approvergrpid) {
+						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params);
+					}
+				}
+			}
 		}
 
 		$expires = false;

From 52395af0cec27cbde35394c7a0cd77586b1b24d6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Aug 2017 08:46:34 +0200
Subject: [PATCH 0853/2006] add entry for 6.0.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 8c967cce8..dc9a3b0a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@
 - fix Acl manager when using pgsql
 - list all open tasks of user in user info of user manager
 - owner of document may see review/approval/receipt/revision log
+- fix sending mails to reviewer/approvers after check in
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0

From ed1f74bacaac8bcb9b69485ed88d715024a62cf0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 2 Aug 2017 12:15:13 +0200
Subject: [PATCH 0854/2006] fix merge error

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 5894524ef..4e38dd6df 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -144,7 +144,7 @@ class SeedDMS_AccessOperation {
 					if($r['status'] == 1 || $r['status'] == -1)
 						$hasapproval = true;
 				}
-				if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && !$hasreview) || ($status["status"]==S_DRAFT_APP && !$hasreview && !$hasapproval))) {
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && !$hasreview) || ($status["status"]==S_DRAFT_APP && !$hasreview && !$hasapproval))) {
 					return true;
 				}
 			}

From d82f8c44d1706de27a82cce8144629f4a86f94c5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Aug 2017 07:11:25 +0200
Subject: [PATCH 0855/2006] add receipts and revisions in
 getProcessWithoutUserGroup()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 1b9ae8fc7..e87a6d2cd 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -3078,6 +3078,12 @@ class SeedDMS_Core_DMS {
 		case 'approval':
 			$queryStr = "SELECT a.*, b.`name` FROM `tblDocumentApprovers`";
 			break;
+		case 'receipt':
+			$queryStr = "SELECT a.*, b.`name` FROM `tblDocumentRecipients`";
+			break;
+		case 'revision':
+			$queryStr = "SELECT a.*, b.`name` FROM `tblDocumentRevisors`";
+			break;
 		}
 		$queryStr .= " a LEFT JOIN `tblDocuments` b ON a.`documentID`=b.`id` where";
 		switch($usergroup) {

From 94a48446163fabfa155519fe8e62435c01b78f90 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Aug 2017 07:12:03 +0200
Subject: [PATCH 0856/2006] run check only if required

speeds up calling a single check
---
 out/out.ObjectCheck.php | 46 ++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index 265adbb1c..f3e60a2c1 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -66,18 +66,36 @@ if(isset($_GET['setchecksum']) && $_GET['setchecksum'] == 1) {
 
 $folder = $dms->getFolder($settings->_rootFolderID);
 $unlinkedversions = $dms->getUnlinkedDocumentContent();
-$unlinkedfolders = $dms->checkFolders();
-$unlinkeddocuments = $dms->checkDocuments();
-$nofilesizeversions = $dms->getNoFileSizeDocumentContent();
-$nochecksumversions = $dms->getNoChecksumDocumentContent();
-$duplicateversions = $dms->getDuplicateDocumentContent();
-foreach(array('review', 'approval') as $process) {
+if(!isset($_GET['action']) || $_GET['action'] == 'listUnlinkedFolders')) {
+	$unlinkedfolders = $dms->checkFolders();
+else
+	$unlinkedfolders = null;
+if(!isset($_GET['action']) || $_GET['action'] == 'listUnlinkedDocuments')) {
+	$unlinkeddocuments = $dms->checkDocuments();
+else
+	$unlinkeddocuments = null;
+if(!isset($_GET['action']) || $_GET['action'] == 'listMissingFileSize')) {
+	$nofilesizeversions = $dms->getNoFileSizeDocumentContent();
+else
+	$nofilesizeversions = null;
+if(!isset($_GET['action']) || $_GET['action'] == 'listMissingChecksum')) {
+	$nochecksumversions = $dms->getNoChecksumDocumentContent();
+else
+	$nochecksumversions = null;
+if(!isset($_GET['action']) || $_GET['action'] == 'listDuplicateContent')) {
+	$duplicateversions = $dms->getDuplicateDocumentContent();
+else
+	$duplicateversions = null;
+foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
 	foreach(array('user', 'group') as $ug) {
-		$processwithoutusergroup[$process][$ug] = $dms->getProcessWithoutUserGroup($process, $ug);
+		if(!isset($_GET['action']) || $_GET['action'] == 'list'.ucfirst($process).'Without'.ucfirst($ug)) {
+			$processwithoutusergroup[$process][$ug] = $dms->getProcessWithoutUserGroup($process, $ug);
+		}
 	}
 }
-$tmprevs = $dms->getDocumentsInRevision();
 $docsinrevision = array();
+if(!isset($_GET['action']) || $_GET['action'] == 'listDocsInRevisionNoAccess') {
+$tmprevs = $dms->getDocumentsInRevision();
 foreach($tmprevs as $rev) {
 	if($doc = $dms->getDocument($rev['documentID'])) {
 		$isdisabled = false;
@@ -99,8 +117,11 @@ foreach($tmprevs as $rev) {
 			$docsinrevision[] = $doc;
 	}
 }
-$tmprevs = $dms->getDocumentsInReception();
+}
+
 $docsinreception = array();
+if(!isset($_GET['action']) || $_GET['action'] == 'listDocsInReceptionNoAccess') {
+$tmprevs = $dms->getDocumentsInReception();
 foreach($tmprevs as $rev) {
 	if($doc = $dms->getDocument($rev['documentID'])) {
 		$isdisabled = false;
@@ -122,6 +143,8 @@ foreach($tmprevs as $rev) {
 			$docsinreception[] = $doc;
 	}
 }
+}
+
 $rootfolder = $dms->getFolder($settings->_rootFolderID);
 
 function repair_tree($dms, $user, $folder, $path=':') { /* {{{ */
@@ -173,7 +196,10 @@ function repair_tree($dms, $user, $folder, $path=':') { /* {{{ */
 
 	return $objects;
 } /* }}} */
-$repairobjects = repair_tree($dms, $user, $folder);
+if(!isset($_GET['action']) || $_GET['action'] == 'listRepair')
+	$repairobjects = repair_tree($dms, $user, $folder);
+else
+	$repairobjects = null;
 
 if($view) {
 	$view->setParam('folder', $folder);

From 1886b160b9b8c4be9f3a1096761bc8530d7ed6b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Aug 2017 07:12:46 +0200
Subject: [PATCH 0857/2006] add single checks for process without user/group

---
 views/bootstrap/class.ObjectCheck.php | 51 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 2bdf8c577..9a46a4cb0 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -365,30 +365,25 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
 
-		$this->contentHeading(getMLText("process_without_user_group"));
+		$this->contentHeading(getMLText($process."s_without_".$ug));
 
-		if($processwithoutusergroup) {
+		if($processwithoutusergroup[$process][$ug]) {
 			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("process")."</th>\n";
 			print "<th>".getMLText("user_group")."</th>\n";
 			print "<th>".getMLText("documentid")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
+			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("required")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
-			foreach(array('review', 'approval') as $process) {
-				foreach(array('user', 'group') as $ug) {
-					if($processwithoutusergroup[$process][$ug]) {
-						foreach($processwithoutusergroup[$process][$ug] as $rec) {
-							print "<tr>";
-							print "<td>".$process."</td>";
-							print "<td>".$ug."</td>";
-							print "<td>".$rec['documentID']."</td><td>".$rec['version']."</td><td>".$rec['name']."</td>";
-							print "<td>".$rec['required']."</td>";
-							print "</tr>\n";
-						}
-					}
-				}
+			foreach($processwithoutusergroup[$process][$ug] as $rec) {
+				print "<tr>";
+				print "<td>".$process."</td>";
+				print "<td>".$ug."</td>";
+				print "<td>".$rec['documentID']."</td><td>".$rec['version']."</td><td>".$rec['name']."</td>";
+				print "<td>".$rec['required']."</td>";
+				print "</tr>\n";
 			}
 			print "</tbody></table>\n";
 		}
@@ -410,6 +405,22 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$this->listProcessesWithoutUserGroup('approval', 'group');
 	} /* }}} */
 
+	function listReceiptWithoutUser() { /* {{{ */
+		$this->listProcessesWithoutUserGroup('receipt', 'user');
+	} /* }}} */
+
+	function listReceiptWithoutGroup() { /* {{{ */
+		$this->listProcessesWithoutUserGroup('receipt', 'group');
+	} /* }}} */
+
+	function listRevisionWithoutUser() { /* {{{ */
+		$this->listProcessesWithoutUserGroup('revision', 'user');
+	} /* }}} */
+
+	function listRevisionWithoutGroup() { /* {{{ */
+		$this->listProcessesWithoutUserGroup('revision', 'group');
+	} /* }}} */
+
 	function js() { /* {{{ */
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
@@ -447,6 +458,7 @@ $(document).ready( function() {
 		$duplicateversions = $this->params['duplicateversions'];
 		$docsinrevision = $this->params['docsinrevision'];
 		$docsinreception = $this->params['docsinreception'];
+		$processwithoutusergroup = $this->params['processwithoutusergroup'];
 		$repair = $this->params['repair'];
 		$unlink = $this->params['unlink'];
 		$setfilesize = $this->params['setfilesize'];
@@ -480,10 +492,11 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#inreception_no_access" data-action="listDocsInReceptionNoAccess"><span class="badge '.($docsinreception ? 'badge-info ' : '').'badge-right">'.count($docsinreception).'</span>'.getMLText("docs_in_reception_no_access").'</a></li>';
 		echo '</ul>';
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
-		echo '<li class=""><a data-href="#review_without_user" data-action="listReviewWithoutUser"><span class="badge '.($processwithoutusergroup['review']['user'] ? 'badge-info ' : '').'badge-right">'.count($processwithoutusergroup['review']['user']).'</span>'.getMLText("reviews_without_user").'</a></li>';
-		echo '<li class=""><a data-href="#review_without_group" data-action="listReviewWithoutGroup"><span class="badge '.($processwithoutusergroup['review']['group'] ? 'badge-info ' : '').'badge-right">'.count($processwithoutusergroup['review']['group']).'</span>'.getMLText("reviews_without_group").'</a></li>';
-		echo '<li class=""><a data-href="#approval_without_user" data-action="listApprovalWithoutUser"><span class="badge '.($processwithoutusergroup['approval']['user'] ? 'badge-info ' : '').'badge-right">'.count($processwithoutusergroup['approval']['user']).'</span>'.getMLText("approvals_without_user").'</a></li>';
-		echo '<li class=""><a data-href="#approval_without_group" data-action="listApprovalWithoutGroup"><span class="badge '.($processwithoutusergroup['approval']['group'] ? 'badge-info ' : '').'badge-right">'.count($processwithoutusergroup['approval']['group']).'</span>'.getMLText("approvals_without_group").'</a></li>';
+		foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
+			foreach(array('user', 'group') as $ug) {
+				echo '<li class=""><a data-href="#'.$process.'_without_'.$ug.'" data-action="list'.ucfirst($process).'Without'.ucfirst($ug).'"><span class="badge '.($processwithoutusergroup[$process][$ug] ? 'badge-info ' : '').'badge-right">'.count($processwithoutusergroup[$process][$ug]).'</span>'.getMLText($process."s_without_".$ug).'</a></li>';
+			}
+		}
 		echo '</ul>';
 		echo '</div>';
 		echo '<div class="span9">';

From 4e55911213903e9d8e909be1d225e772b57f9edf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Aug 2017 07:39:22 +0200
Subject: [PATCH 0858/2006] fix syntax errors

---
 out/out.ObjectCheck.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index f3e60a2c1..c90ce494e 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -66,23 +66,23 @@ if(isset($_GET['setchecksum']) && $_GET['setchecksum'] == 1) {
 
 $folder = $dms->getFolder($settings->_rootFolderID);
 $unlinkedversions = $dms->getUnlinkedDocumentContent();
-if(!isset($_GET['action']) || $_GET['action'] == 'listUnlinkedFolders')) {
+if(!isset($_GET['action']) || $_GET['action'] == 'listUnlinkedFolders')
 	$unlinkedfolders = $dms->checkFolders();
 else
 	$unlinkedfolders = null;
-if(!isset($_GET['action']) || $_GET['action'] == 'listUnlinkedDocuments')) {
+if(!isset($_GET['action']) || $_GET['action'] == 'listUnlinkedDocuments')
 	$unlinkeddocuments = $dms->checkDocuments();
 else
 	$unlinkeddocuments = null;
-if(!isset($_GET['action']) || $_GET['action'] == 'listMissingFileSize')) {
+if(!isset($_GET['action']) || $_GET['action'] == 'listMissingFileSize')
 	$nofilesizeversions = $dms->getNoFileSizeDocumentContent();
 else
 	$nofilesizeversions = null;
-if(!isset($_GET['action']) || $_GET['action'] == 'listMissingChecksum')) {
+if(!isset($_GET['action']) || $_GET['action'] == 'listMissingChecksum')
 	$nochecksumversions = $dms->getNoChecksumDocumentContent();
 else
 	$nochecksumversions = null;
-if(!isset($_GET['action']) || $_GET['action'] == 'listDuplicateContent')) {
+if(!isset($_GET['action']) || $_GET['action'] == 'listDuplicateContent')
 	$duplicateversions = $dms->getDuplicateDocumentContent();
 else
 	$duplicateversions = null;

From 7c363ff4ef299933d300be7733261b1266f93fda Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Aug 2017 07:40:42 +0200
Subject: [PATCH 0859/2006] init $processwithoutusergroup

---
 out/out.ObjectCheck.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index c90ce494e..d2b64783e 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -86,6 +86,7 @@ if(!isset($_GET['action']) || $_GET['action'] == 'listDuplicateContent')
 	$duplicateversions = $dms->getDuplicateDocumentContent();
 else
 	$duplicateversions = null;
+$processwithoutusergroup = array();
 foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
 	foreach(array('user', 'group') as $ug) {
 		if(!isset($_GET['action']) || $_GET['action'] == 'list'.ucfirst($process).'Without'.ucfirst($ug)) {

From ccc6112714b12e7630423e4bce7599f03a254588 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Aug 2017 07:44:26 +0200
Subject: [PATCH 0860/2006] fix columns of listProcessesWithoutUserGroup

---
 views/bootstrap/class.ObjectCheck.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 87cee8a2d..bd25e5bac 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -374,7 +374,6 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			print "<th>".getMLText("user_group")."</th>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
-			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("userid_groupid")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($processwithoutusergroup[$process][$ug] as $rec) {

From f54ed82496f8926811c3025dd8440434d2884c01 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Aug 2017 08:12:13 +0200
Subject: [PATCH 0861/2006] put '()' around last access

---
 views/bootstrap/class.Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Session.php b/views/bootstrap/class.Session.php
index fa7a86a79..4d3b5a8a1 100644
--- a/views/bootstrap/class.Session.php
+++ b/views/bootstrap/class.Session.php
@@ -59,7 +59,7 @@ class SeedDMS_View_Session extends SeedDMS_Bootstrap_Style {
 		foreach($sessions as $session) {
 			if($sesuser = $dms->getUser($session->getUser()))
 				if(!$sesuser->isHidden())
-					$content .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName()).($user->isAdmin() ? " ".getReadableDuration(time()-$session->getLastAccess()) : "")."</a></li>\n";
+					$content .= "    <li><a _href=\"\"><i class=\"icon-user\"></i> ".htmlspecialchars($sesuser->getFullName()).($user->isAdmin() ? " (".getReadableDuration(time()-$session->getLastAccess()).")" : "")."</a></li>\n";
 		}
 		$content .= "     </ul>\n";
 		$content .= "    </li>\n";

From f181ca044dc6c351aa4c93dc4b168a2f24b19cec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Aug 2017 12:42:56 +0200
Subject: [PATCH 0862/2006] ReceiveOwner list does not contain old versions
 anymore

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index e87a6d2cd..6d84fc36e 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1218,7 +1218,7 @@ class SeedDMS_Core_DMS {
 //				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ".
 //				"ORDER BY `statusDate` DESC";
 			break; // }}}
-		case 'ReceiveOwner': // Documents waiting for reception I'm owning {{{
+		case 'ReceiveOwner': // Documents having a reception I'm owning {{{
 			$queryStr .= "WHERE 1=1 ";
 
 			$user = $param1;
@@ -1228,7 +1228,9 @@ class SeedDMS_Core_DMS {
 			else
 				$orderdir = 'ASC';
 
-			$qs = 'SELECT DISTINCT `documentID` FROM `tblDocumentRecipients` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID`';
+			//			$qs = 'SELECT DISTINCT `documentID` FROM `tblDocumentRecipients` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID`';
+			// sql statement without older versions of a document
+			$qs = 'SELECT DISTINCT `document` as `documentID` FROM `ttcontentid` a LEFT JOIN `tblDocumentRecipients` b on a.`document`=b.`documentID` AND a.`maxVersion`=b.`version` WHERE b.`receiptID` IS NOT NULL';
 			$ra = $this->db->getResultArray($qs);
 			if (is_bool($ra) && !$ra) {
 				return false;

From 7d0a18861b0e4326ee13c2ff593995b5f8a37aa8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Aug 2017 12:43:25 +0200
Subject: [PATCH 0863/2006] add note for 6.0.1

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 7cb99e4a1..aeef7b744 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -33,6 +33,7 @@ are any waiting or pending revisions at all
 - SeedDMS_Core_User::getReverseSubstitutes() works with new roles
 - fix field name in getDocumentList() to make it work for pgsql
 - views instead of temp. tables can be used
+- ReceiveOwner list does not contain old versions anymore
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 0c8daca8565f6a7f891eacf03e627dc1c755c620 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Aug 2017 13:43:36 +0200
Subject: [PATCH 0864/2006] fix wrong check for extings approval/review file

---
 controllers/class.Download.php | 36 +++++++++++++++-------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index 82a189028..8cda3a36a 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -134,17 +134,15 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 		}
 
 		if(null === $this->callHook('approval')) {
-			if(file_exists($dms->contentDir . $filename)) {
-				$finfo = finfo_open(FILEINFO_MIME_TYPE);
-				$mimetype = finfo_file($finfo, $filename);
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$mimetype = finfo_file($finfo, $filename);
 
-				header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
-				header("Content-Transfer-Encoding: binary");
-				header("Content-Length: " . filesize($filename ));
-				header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
-				header("Cache-Control: must-revalidate");
-				readfile($filename);
-			}
+			header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+			header("Content-Transfer-Encoding: binary");
+			header("Content-Length: " . filesize($filename ));
+			header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+			header("Cache-Control: must-revalidate");
+			readfile($filename);
 		}
 	} /* }}} */
 
@@ -160,17 +158,15 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 		}
 
 		if(null === $this->callHook('review')) {
-			if(file_exists($dms->contentDir . $filename)) {
-				$finfo = finfo_open(FILEINFO_MIME_TYPE);
-				$mimetype = finfo_file($finfo, $filename);
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$mimetype = finfo_file($finfo, $filename);
 
-				header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
-				header("Content-Transfer-Encoding: binary");
-				header("Content-Length: " . filesize($filename ));
-				header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
-				header("Cache-Control: must-revalidate");
-				readfile($filename);
-			}
+			header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+			header("Content-Transfer-Encoding: binary");
+			header("Content-Length: " . filesize($filename ));
+			header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+			header("Cache-Control: must-revalidate");
+			readfile($filename);
 		}
 		return true;
 	} /* }}} */

From c86525e383aac98200c93fc4e692ed26e2c16016 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Aug 2017 13:44:32 +0200
Subject: [PATCH 0865/2006] add entry to 6.0.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index a516243e0..f78ccd3b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@
 - list all open tasks of user in user info of user manager
 - owner of document may see review/approval/receipt/revision log
 - fix sending mails to reviewer/approvers after check in
+- downloading of review/approval files works again
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0

From 0b8666629b59ddeaa00122d9b7c80fe93ee30ff4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Aug 2017 06:20:38 +0200
Subject: [PATCH 0866/2006] minor fix when dropping a key

---
 install/update-3.4.0/update.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/update-3.4.0/update.sql b/install/update-3.4.0/update.sql
index dfc4b7a75..1858d49b2 100644
--- a/install/update-3.4.0/update.sql
+++ b/install/update-3.4.0/update.sql
@@ -99,7 +99,7 @@ CALL DROPFK('tblDocuments', 'tblDocuments_folder');
 
 ALTER TABLE tblDocuments ADD CONSTRAINT `tblDocuments_folder` FOREIGN KEY (`folder`) REFERENCES `tblFolders` (`id`);
 
-CALL DROPFK('tblDocumentContent', 'tblDocumentDocument_document');
+CALL DROPFK('tblDocumentContent', 'tblDocumentContent_document');
 
 ALTER TABLE tblDocumentContent DROP PRIMARY KEY;
 

From 81b153ccd50528ba54b94e8f0350eafb1742dd73 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Aug 2017 18:00:06 +0200
Subject: [PATCH 0867/2006] add removal of receipts and revisions for
 users/group no longer available

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 87ae6af8c..46fa350f4 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -3066,8 +3066,8 @@ class SeedDMS_Core_DMS {
 	} /* }}} */
 
 	/**
-	 * Returns a list of reviews, approvals which are not linked
-	 * to a user, group anymore
+	 * Returns a list of reviews, approvals, receipts, revisions which are not
+	 * linked to a user, group anymore
 	 *
 	 * This method is for finding reviews or approvals whose user
 	 * or group  was deleted and not just removed from the process.
@@ -3100,7 +3100,7 @@ class SeedDMS_Core_DMS {
 	} /* }}} */
 
 	/**
-	 * Removes all reviews, approvals which are not linked
+	 * Removes all reviews, approvals, receipts, revisions which are not linked
 	 * to a user, group anymore
 	 *
 	 * This method is for removing all reviews or approvals whose user
@@ -3118,6 +3118,12 @@ class SeedDMS_Core_DMS {
 		case 'approval':
 			$queryStr = "DELETE FROM tblDocumentApprovers";
 			break;
+		case 'receipt':
+			$queryStr = "DELETE FROM tblDocumentRecipients";
+			break;
+		case 'revision':
+			$queryStr = "DELETE FROM tblDocumentRevisors";
+			break;
 		}
 		$queryStr .= " WHERE";
 		switch($usergroup) {

From 2de2fc00fc740a90d7b95852a174a1b8ba53da23 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Aug 2017 18:00:50 +0200
Subject: [PATCH 0868/2006] add removal of users/groups which has been deleted

---
 out/out.ObjectCheck.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index a82f3a5bb..50167cd55 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -91,6 +91,8 @@ $processwithoutusergroup = array();
 foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
 	foreach(array('user', 'group') as $ug) {
 		if(!isset($_GET['action']) || $_GET['action'] == 'list'.ucfirst($process).'Without'.ucfirst($ug)) {
+			if($_GET['repair'])
+				$dms->removeProcessWithoutUserGroup($process, $ug, isset($_GET['required']) ? $_GET['required'] : '');
 			$processwithoutusergroup[$process][$ug] = $dms->getProcessWithoutUserGroup($process, $ug);
 		}
 	}

From e67e83094689794810607d433c59707e49b2eea3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Aug 2017 18:01:23 +0200
Subject: [PATCH 0869/2006] add links to remove process without a user/group

---
 views/bootstrap/class.ObjectCheck.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index bd25e5bac..bfc81a044 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -361,6 +361,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
+		$repair = $this->params['repair'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
@@ -375,6 +376,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
 			print "<th>".getMLText("userid_groupid")."</th>\n";
+			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($processwithoutusergroup[$process][$ug] as $rec) {
 				print "<tr>";
@@ -382,10 +384,13 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 				print "<td>".$ug."</td>";
 				print "<td><a href=\"../out/out.ViewDocument.php?documentid=".$rec['documentID']."\">".$rec['name']."</a></td><td>".$rec['version']."</td>";
 				print "<td>".$rec['required']."</td>";
+				print "<td><a class=\"repair\" data-action=\"list".ucfirst($process)."Without".ucfirst($ug)."\" data-required=\"".$rec['required']."\">".getMLText('delete')."</a></td>";
 				print "</tr>\n";
 			}
 			print "</tbody></table>\n";
+			return count($processwithoutusergroup[$process][$ug]);
 		}
+		return false;
 	} /* }}} */
 
 	function listReviewWithoutUser() { /* {{{ */
@@ -405,7 +410,9 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	function listReceiptWithoutUser() { /* {{{ */
-		$this->listProcessesWithoutUserGroup('receipt', 'user');
+		if($this->listProcessesWithoutUserGroup('receipt', 'user')) {
+			echo '<div class="repair"><a data-action="listReceiptWithoutUser">'.getMLText('do_object_repair').'</a>';
+		}
 	} /* }}} */
 
 	function listReceiptWithoutGroup() { /* {{{ */
@@ -435,6 +442,16 @@ $(document).ready( function() {
 		$('#kkkk.ajax').data('action', $(this).data('action'));
 		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
 	});
+	$('body').on('click', 'div.repair a', function(ev){
+		ev.preventDefault();
+		$('#kkkk.ajax').data('action', $(this).data('action'));
+		$('#kkkk.ajax').trigger('update', {repair: 1});
+	});
+	$('body').on('click', 'a.repair', function(ev){
+		ev.preventDefault();
+		$('#kkkk.ajax').data('action', $(this).data('action'));
+		$('#kkkk.ajax').trigger('update', {repair: 1, required: $(this).data('required')});
+	});
 	$('body').on('click', 'table th a', function(ev){
 		ev.preventDefault();
 		$('#kkkk.ajax').data('action', $(this).data('action'));

From f3d4b86bae1f10e1c2a92e8e6e63913080828870 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Sep 2017 07:27:43 +0200
Subject: [PATCH 0870/2006] remove unused revisionDate in
 SeedDMS_Core_DocumentFile

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index f4124f587..c70074274 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -6008,11 +6008,6 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
 	 */
 	protected $_mimeType;
 
-	/**
-	 * @var string date when revision starts
-	 */
-	protected $_revisionDate;
-
 	/**
 	 * @var string name of the file that was originally uploaded
 	 */

From 68ccb13a7227fdb6b3796882b2cc62119aafa32d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 16:47:09 +0200
Subject: [PATCH 0871/2006] add 'ExpiredOwner' to getDocumentList()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index bf79f62ac..616c5c248 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -870,6 +870,7 @@ class SeedDMS_Core_DMS {
 	 * @param string $param2 set to true
 	 * if 'AppRevByMe', 'ReviseByMe', 'ReceiptByMe' shall return even documents
 	 * І have already taken care of.
+	 * if 'ExpiredOwner' contains the date in days or as 'yyyy-mm-dd'
 	 * @param string $param3 sort list by this field
 	 * @param string $param4 order direction
 	 * @return array list of documents records
@@ -1402,6 +1403,42 @@ class SeedDMS_Core_DMS {
 				$queryStr = '';
 			}
 			break; // }}}
+		case 'ExpiredOwner': // Documents expired and owned by me {{{
+			if(is_int($param2)) {
+				$ts = mktime(0, 0, 0) + $param2 * 86400;
+			} elseif(is_string($param2)) {
+				$tmp = explode('-', $param2, 3);
+				if(count($tmp) != 3)
+					return false;
+				$ts = mktime(0, 0, 0, $tmp[1], $tmp[2], $tmp[0]);
+			} else
+				$ts = mktime(0, 0, 0)-365*86400; /* Start of today - 1 year */
+
+			$tsnow = mktime(0, 0, 0); /* Start of today */
+			if($ts < $tsnow) { /* Check for docs expired in the past */
+				$startts = $ts;
+				$endts = $tsnow+86400; /* Use end of day */
+			} else { /* Check for docs which will expire in the future */
+				$startts = $tsnow;
+				$endts = $ts+86400; /* Use end of day */
+			}
+
+			$queryStr .= 
+				"WHERE `tblDocuments`.`expires` > ".$startts." AND `tblDocuments`.`expires` < ".$endts." ";
+
+			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+			$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."' ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			break; // }}}
 		case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning {{{
 			$queryStr .= "WHERE 1=1 ";
 

From 3d6dcbd1810a6528fc885784a5ba88aac927aa59 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 16:47:50 +0200
Subject: [PATCH 0872/2006] take out duplicate getLatestContent()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 43 -------------------------
 1 file changed, 43 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 1588c2904..b831453b1 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1957,49 +1957,6 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return $this->_latestContent;
 	} /* }}} */
 
-	/**
-	 * Get the latest version of document
-	 *
-	 * This function returns the latest accessible version of a document.
-	 * If content access has been restricted by setting
-	 * {@link SeedDMS_Core_DMS::noReadForStatus} the function will go
-	 * backwards in history until an accessible version is found. If none
-	 * is found null will be returned.
-	 * Access rights based on the document status are calculated for the
-	 * currently logged in user.
-	 *
-	 * @return object object of class {@link SeedDMS_Core_DocumentContent}
-	 */
-	function getLatestContent() { /* {{{ */
-		if (!$this->_latestContent) {
-			$db = $this->_dms->getDB();
-			$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = ".$this->_id." ORDER BY `version` DESC";
-			$resArr = $db->getResultArray($queryStr);
-			if (is_bool($resArr) && !$res)
-				return false;
-
-			$classname = $this->_dms->getClassname('documentcontent');
-			$user = $this->_dms->getLoggedInUser();
-			foreach ($resArr as $row) {
-				if (!$this->_latestContent) {
-					$content = new $classname($row["id"], $this, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum']);
-					if($user) {
-						/* If the user may even write the document, then also allow to see all content.
-						 * This is needed because the user could upload a new version
-						 */
-						if($content->getAccessMode($user) >= M_READ) {
-							$this->_latestContent = $content;
-						}
-					} else {
-						$this->_latestContent = $content;
-					}
-				}
-			}
-		}
-
-		return $this->_latestContent;
-	} /* }}} */
-
 	/**
 	 * Remove version of document
 	 *

From 36b51b64b138db7de1b11e0b8a49d97dd0b7b0c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 16:48:18 +0200
Subject: [PATCH 0873/2006] add listExpiredOwner()

---
 views/bootstrap/class.MyDocuments.php | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 78f844ae2..30f5ff19c 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -496,6 +496,36 @@ $(document).ready( function() {
 
 	} /* }}} */
 
+	function listExpiredOwner() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of documents expired and owned by current user */
+		$resArr = $dms->getDocumentList('ExpiredOwner', $user, false, $orderby, $orderdir);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("documents_expired"));
+		if ($resArr) {
+			$this->printList($resArr, $previewer, 'listExpiredOwner');
+		}
+		else printMLText("no_docs_expired");
+
+	} /* }}} */
+
 	function listCheckedoutDocs() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -560,6 +590,8 @@ $(document).ready( function() {
 			$resArr = $dms->getDocumentList('RejectOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
 		}
+		$resArr = $dms->getDocumentList('ExpiredOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
 		echo '</ul>';
 		$this->contentHeading(getMLText("tasks"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';

From 5895a6685a1a786decee824654c67a8f8cfe6ca8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 19:41:05 +0200
Subject: [PATCH 0874/2006] check access

---
 out/out.ExpiredDocuments.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/out/out.ExpiredDocuments.php b/out/out.ExpiredDocuments.php
index 4e38a85aa..9a4f06165 100644
--- a/out/out.ExpiredDocuments.php
+++ b/out/out.ExpiredDocuments.php
@@ -28,6 +28,13 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
+}
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("expired_documents"),getMLText("access_denied"));
 }
@@ -37,13 +44,12 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 	$orderby=$_GET["orderby"];
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('orderby', $orderby);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From f5a06f8e697b422c6f6630383de794b8b564f58d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 08:35:30 +0100
Subject: [PATCH 0875/2006] remove empty line

---
 op/op.AddDocument.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 0207873c3..900f97e2e 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -530,5 +530,4 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 }
 
 header("Location:../out/out.ViewFolder.php?folderid=".$folderid."&showtree=".$_POST["showtree"]);
-
 ?>

From 909bfc4a3016c613e062b9c642467bc49a76721f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 08:47:49 +0100
Subject: [PATCH 0876/2006] remove old code, empty lines

---
 op/op.RemoveDocument.php     | 4 ----
 op/op.RemoveDocumentLink.php | 1 -
 2 files changed, 5 deletions(-)

diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index 7240d7e21..afdcceb8b 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -30,10 +30,6 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1]);
-//$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-//if (!$accessop->check_controller_access($controller, $_POST)) {
-//	UI::exitError(getMLText("document_title", array("documentname" => "")),getMLText("access_denied"));
-//}
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('removedocument')) {
diff --git a/op/op.RemoveDocumentLink.php b/op/op.RemoveDocumentLink.php
index bd1a59867..d89c41bb2 100644
--- a/op/op.RemoveDocumentLink.php
+++ b/op/op.RemoveDocumentLink.php
@@ -72,5 +72,4 @@ if (!$document->removeDocumentLink($linkid)) {
 add_log_line("?documentid=".$documentid."&linkid=".$linkid);
 
 header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=links");
-
 ?>

From 60d0a6cae4965c7182b7dd3d83375ea77476c7be Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 10:24:27 +0100
Subject: [PATCH 0877/2006] remove duplicat call of
 $this->printDropFolderChooserJs()

---
 views/bootstrap/class.AddDocument.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 686e6091a..3367b5e63 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -144,7 +144,6 @@ $(document).ready(function() {
 });
 <?php
 			$this->printKeywordChooserJs("form1");
-			$this->printDropFolderChooserJs("form1");
 			if($libraryfolder)
 				$this->printDocumentChooserJs("form1");
 			if($dropfolderdir) {

From 37a3661698cd639d5023ed3f6ad50c436942dd16 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Nov 2017 17:26:11 +0100
Subject: [PATCH 0878/2006] fix some indenting of lines

---
 views/bootstrap/class.Settings.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index e9888e614..8d7eec31a 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -792,14 +792,14 @@ if(!is_writeable($settings->_configFilePath)) {
 ?>
       <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[fulltext][".$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>
+        <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
@@ -808,7 +808,7 @@ if(!is_writeable($settings->_configFilePath)) {
 ?>
       <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[preview][".$mimetype."]", htmlspecialchars($cmd)); ?></td>
       </tr>
 <?php
 		}
@@ -822,7 +822,7 @@ if(!is_writeable($settings->_configFilePath)) {
 <?php		$this->contentContainerEnd(); ?>
   </div>
 
-	  <div class="tab-pane <?php if($currenttab == 'extensions') echo 'active'; ?>" id="extensions">
+  <div class="tab-pane <?php if($currenttab == 'extensions') echo 'active'; ?>" id="extensions">
 <?php		$this->contentContainerStart(); ?>
     <table class="table-condensed">
       <!--
@@ -831,7 +831,7 @@ if(!is_writeable($settings->_configFilePath)) {
 <?php
 				foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) {
 ?>
-			<tr><td><a name="<?php echo $extname;?>"></a><b><?php echo $extconf['title'];?></b></td></tr>
+      <tr><td><a name="<?php echo $extname;?>"></a><b><?php echo $extconf['title'];?></b></td></tr>
 <?php
 					foreach($extconf['config'] as $confkey=>$conf) {
 ?>

From 92d01dcbd3d2bc2b840c6226a253cafece84cead Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Nov 2017 12:06:05 +0100
Subject: [PATCH 0879/2006] fix php error

---
 views/bootstrap/class.Settings.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 3b3a12240..e692d89ca 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -798,7 +798,6 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php $this->showTextField("converters[".$target."][".$mimetype."]", htmlspecialchars($cmd)); ?></td>
       </tr>
 <?php
-		}
 	}
 ?>
       <tr title="">

From 87308a3c216138614d290a38066f24e061bcb642 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Dec 2017 13:01:35 +0100
Subject: [PATCH 0880/2006] fix icon for revision by group

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 0d081bda8..969428d21 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1361,7 +1361,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getName());
+							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
 							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_recipient = true;
 						}

From 0a38435a2df751892ee7e737ce8df5dd7e724b0f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 Dec 2017 10:51:34 +0100
Subject: [PATCH 0881/2006] remove wrong init of $accessop

---
 out/out.RunSubWorkflow.php | 3 ---
 out/out.ViewDocument.php   | 1 -
 2 files changed, 4 deletions(-)

diff --git a/out/out.RunSubWorkflow.php b/out/out.RunSubWorkflow.php
index 77bbaf9d4..9e0c62bd6 100644
--- a/out/out.RunSubWorkflow.php
+++ b/out/out.RunSubWorkflow.php
@@ -70,9 +70,6 @@ if (!is_object($subworkflow)) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 6b5b3c167..9b23d9608 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -43,7 +43,6 @@ if (!is_object($document)) {
 	$view->exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 $folder = $document->getFolder();
 
 if ($document->getAccessMode($user) < M_READ || !$document->getLatestContent()) {

From f4c25576bcca4090e7f254497346fcafbc968ab8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 Dec 2017 10:52:23 +0100
Subject: [PATCH 0882/2006] addRevisor() puts recheck into waiting if recheck
 has already begun

previously it was put into sleeping, which didn't the user/group
to do the recheck.
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index b831453b1..b87c22493 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4547,8 +4547,12 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$revisionID = isset($indstatus["revisionID"]) ? $indstatus["revisionID"] : NULL;
 		}
 
+		/* If a user is added when the revision has already been startet, then
+		 * put it in S_LOG_WAITING already.
+		 */
+		$st=$this->getStatus();
 		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-			"VALUES ('". $revisionID ."', '".S_LOG_SLEEPING."', '', ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
+			"VALUES ('". $revisionID ."', '".($st["status"] == S_IN_REVISION ? S_LOG_WAITING : S_LOG_SLEEPING)."', '', ".$db->getCurrentDatetime().", '". $requestUser->getID() ."')";
 		$res = $db->getResult($queryStr);
 		if (is_bool($res) && !$res) {
 			return -1;

From 2a3b61aadabb6a4b3064c99e02e558326847aae3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Dec 2017 07:26:24 +0100
Subject: [PATCH 0883/2006] do not set revision date if it is '0000'

---
 utils/xmlimport.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/utils/xmlimport.php b/utils/xmlimport.php
index 713b91a74..ad0e9fb3e 100644
--- a/utils/xmlimport.php
+++ b/utils/xmlimport.php
@@ -631,7 +631,8 @@ function insert_document($document) { /* {{{ */
 
 		$newVersion = $result[1]->getContent();
 		$newVersion->setDate(dateToTimestamp($initversion['attributes']['date']));
-		$newVersion->setRevisionDate($initversion['attributes']['revisiondate']);
+		if($initversion['attributes']['revisiondate'] && substr($initversion['attributes']['revisiondate'], 0, 4) != '0000')
+			$newVersion->setRevisionDate($initversion['attributes']['revisiondate']);
 		if($workflowstate)
 			$newVersion->setWorkflowState($workflowstate);
 		$newlogs = array();
@@ -754,7 +755,8 @@ function insert_document($document) { /* {{{ */
 			if($workflowstate)
 				$newVersion->setWorkflowState($workflowstate);
 			$newVersion->setDate(dateToTimestamp($version['attributes']['date']));
-			$newVersion->setRevisionDate($version['attributes']['revisiondate']);
+			if($version['attributes']['revisiondate'] && substr($version['attributes']['revisiondate'], 0, 4) != '0000')
+				$newVersion->setRevisionDate($version['attributes']['revisiondate']);
 			$newlogs = array();
 			foreach($version['statuslogs'] as $i=>$log) {
 				if(!array_key_exists($log['attributes']['user'], $objmap['users'])) {

From a1f98902a518b767c49e393f3d734c399afd1db8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 Dec 2017 13:51:53 +0100
Subject: [PATCH 0884/2006] propperly set version in notification mail

---
 op/op.CheckInDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index e3e336741..0b5b79914 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -278,7 +278,7 @@ else
 					$params = array();
 					$params['name'] = $document->getName();
 					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $reqversion;
+					$params['version'] = $contentResult->getContent()->getVersion();
 					$params['comment'] = $comment;
 					$params['username'] = $user->getFullName();
 					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@@ -299,7 +299,7 @@ else
 					$params = array();
 					$params['name'] = $document->getName();
 					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $reqversion;
+					$params['version'] = $contentResult->getContent()->getVersion();
 					$params['comment'] = $comment;
 					$params['username'] = $user->getFullName();
 					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();

From a4a1100abe95e4311416a3870ce07c34679b48ec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 Dec 2017 13:52:24 +0100
Subject: [PATCH 0885/2006] add preview image only if version is set

---
 views/bootstrap/class.TimelineFeed.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
index 3a9333a7c..0e0f7b9da 100644
--- a/views/bootstrap/class.TimelineFeed.php
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -116,8 +116,6 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
 				if(!$skip || !in_array($classname, $skip)) {
 					$doc = $item['document'];
 					$owner = $doc->getOwner();
-					$version = $doc->getContentByVersion($item['version']);
-					$previewer->createPreview($version);
 					$d = makeTsFromLongDate($item['date']);
 					$newItem = $feed->createNewItem();
 					$newItem->setTitle($doc->getName()." (".$item['msg'].")");
@@ -130,8 +128,12 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
 					$newItem->setDate(date('c', $d));
 					$newItem->setAuthor($owner->getFullName(), $owner->getEmail());
 					$newItem->setId('out/out.ViewDocument.php?documentid='.$doc->getID(), true);
-					if($previewer->hasPreview($version)) {
-						$newItem->addElement('enclosure', null, array('url' => $baseurl.'op/op.Preview.php?documentid='.$item['document']->getId().'&version='.$version->getVersion().'&width='.$previewwidthdetail, 'length'=>$previewer->getFileSize($version), 'type'=>'image/png'));
+					if(!empty($item['version'])) {
+						$version = $doc->getContentByVersion($item['version']);
+						$previewer->createPreview($version);
+						if($previewer->hasPreview($version)) {
+							$newItem->addElement('enclosure', null, array('url' => $baseurl.'op/op.Preview.php?documentid='.$item['document']->getId().'&version='.$version->getVersion().'&width='.$previewwidthdetail, 'length'=>$previewer->getFileSize($version), 'type'=>'image/png'));
+						}
 					}
 					$feed->addItem($newItem);
 				}

From fe6d00b6e1c749397cd86fcc3cbab6ccb1c55369 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 Dec 2017 13:53:33 +0100
Subject: [PATCH 0886/2006] add new function countTasks()

---
 views/bootstrap/class.Tasks.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 77e694871..7fd1d77ea 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -82,6 +82,34 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		return $tasks;
 	} /* }}} */
 
+	/**
+	 * Returns the html needed for the task list in the menu
+	 *
+	 * This function renders the tasks in a way suitable to be
+	 * used as a menu
+	 *
+	 * @param array $clipboard clipboard containing two arrays for both
+	 *        documents and folders.
+	 * @return string html code
+	 */
+	function countTasks() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$startts = microtime(true);
+		$tasks['review'] = 0;
+		$tasks['approval'] = 0;
+		$tasks['receipt'] = 0;
+		$tasks['revision'] = 0;
+
+		$tasks['review'] = $dms->countTasks('ReviewByMe', $user);
+		$tasks['approval'] = $dms->countTasks('ApproveByMe', $user);
+		$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
+		$tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
+
+		header('Content-Type: application/json');
+		echo json_encode(array('error'=>0, 'data'=>$tasks, 'processing_time'=>microtime(true)-$startts));
+	} /* }}} */
+
 	/**
 	 * Returns the html needed for the task list in the menu
 	 *

From a320b3cc39519ffdac1fcff6792bcd8c5b5dda26 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 08:41:31 +0100
Subject: [PATCH 0887/2006] set ind. revisors by selecting a group

---
 views/bootstrap/class.SetRevisors.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 06ea7cb21..1e299b10b 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -117,6 +117,19 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 		</div>
 	</div>
 
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("indivіduals_in_groups")?>:</label>
+		<div class="controls">
+  <select class="chzn-select span9" name="grpIndRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+<?php
+		foreach ($docAccess["groups"] as $group) {
+			print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+		}
+?>
+			</select>
+		</div>
+	</div>
+
 	<div class="control-group">
 		<label class="control-label"><?php printMLText("groups")?>:</label>
 		<div class="controls">

From 8784b1224b143c421b7b5cf7c1d38f4a3ab511ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 08:42:13 +0100
Subject: [PATCH 0888/2006] set ind. revisors by group

---
 op/op.SetRevisors.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index f13dbceaa..e146ea215 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -95,8 +95,20 @@ foreach ($revisionStatus as $i=>$rs) {
 	}
 }
 
-// Get the list of proposed recipients, stripping out any duplicates.
+// Get the list of proposed revisors, stripping out any duplicates.
 $pIndRev = (isset($_POST["indRevisors"]) ? array_values(array_unique($_POST["indRevisors"])) : array());
+// Retrieve the list of revisor groups whose members become individual revisors
+if (isset($_POST["grpIndRevisors"])) {
+	foreach ($_POST["grpIndRevisors"] as $grp) {
+		if($group = $dms->getGroup($grp)) {
+			$members = $group->getUsers();
+			foreach($members as $member) {
+				if(!in_array($member->getID(), $pIndRev))
+					$pIndRev[] = $member->getID();
+			}
+		}
+	}
+}
 $pGrpRev = (isset($_POST["grpRevisors"]) ? array_values(array_unique($_POST["grpRevisors"])) : array());
 foreach ($pIndRev as $p) {
 	if (is_numeric($p)) {
@@ -121,6 +133,7 @@ foreach ($pIndRev as $p) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
+								$params['revisor'] = $accessIndex["i"][$p]->getFullName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
@@ -146,8 +159,8 @@ foreach ($pIndRev as $p) {
 			}
 			else {
 				// Proposed recipient is already in the list of recipients.
-				// Remove recipient from the index of possible recipients. If there are
-				// any recipients left over in the list of possible recipients, they
+				// Remove revisor from the index of possible revisors. If there are
+				// any revisors left over in the list of possible revisors, they
 				// will be removed from the revision process for this document revision.
 				unset($revisionIndex["i"][$p]);
 			}
@@ -179,6 +192,7 @@ if (count($revisionIndex["i"]) > 0) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
+								$params['revisor'] = $accessIndex["i"][$rx]->getFullName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
@@ -226,6 +240,7 @@ foreach ($pGrpRev as $p) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
+								$params['revisor'] = $accessIndex["g"][$p]->getName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
@@ -250,7 +265,7 @@ foreach ($pGrpRev as $p) {
 				}
 			}
 			else {
-				// Remove recipient from the index of possible recipients.
+				// Remove recipient from the index of possible revisors.
 				unset($revisionIndex["g"][$p]);
 			}
 		}
@@ -280,6 +295,7 @@ if (count($revisionIndex["g"]) > 0) {
 								$params['folder_path'] = $folder->getFolderPathPlain();
 								$params['version'] = $content->_version;
 								$params['comment'] = $content->getComment();
+								$params['revisor'] = $accessIndex["g"][$rx]->getName();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;

From 1048e3d181c846b54c2f3d3e9c0f71aaf90c610e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 08:45:31 +0100
Subject: [PATCH 0889/2006] add new method countTasks()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 100 +++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 616c5c248..63a48d501 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -828,6 +828,104 @@ class SeedDMS_Core_DMS {
 		return $version;
 	} /* }}} */
 
+	/**
+	 * Returns all documents with a predefined search criteria
+	 *
+	 * @param string $listtype type of document list, can be 'AppRevByMe',
+	 * 'AppRevOwner', 'ReceiptByMe', 'ReviseByMe', 'LockedByMe', 'MyDocs'
+	 * @param object $user user
+	 * @return array list of documents records
+	 */
+	function countTasks($listtype, $user=null) { /* {{{ */
+		$groups = array();
+		if($user) {
+			$tmp = $user->getGroups();
+			foreach($tmp as $group)
+				$groups[] = $group->getID();
+		}
+		$selectStr = "SELECT count(*) c ";
+		$queryStr = 
+			"FROM `ttcontentid` ".
+			"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID`=`ttcontentid`.`document` AND `tblDocumentStatus`.`version`=`ttcontentid`.`maxVersion` ".
+			"LEFT JOIN `ttstatid` ON `ttstatid`.`statusID` = `tblDocumentStatus`.`statusID` ".
+			"LEFT JOIN `tblDocumentStatusLog` ON `ttstatid`.`statusID` = `tblDocumentStatusLog`.`statusID` AND `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ";
+		switch($listtype) {
+		case 'ReviewByMe': // Documents I have to review {{{
+			if (!$this->db->createTemporaryTable("ttreviewid")) {
+				return false;
+			}
+			$queryStr .=
+				"LEFT JOIN `tblDocumentReviewers` on `ttcontentid`.`document`=`tblDocumentReviewers`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentReviewers`.`version` ".
+				"LEFT JOIN `ttreviewid` ON `ttreviewid`.`reviewID` = `tblDocumentReviewers`.`reviewID` ".
+				"LEFT JOIN `tblDocumentReviewLog` ON `tblDocumentReviewLog`.`reviewLogID`=`ttreviewid`.`maxLogID` ";
+
+			$queryStr .= "WHERE (`tblDocumentReviewers`.`type` = 0 AND `tblDocumentReviewers`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentReviewers`.`type` = 1 AND `tblDocumentReviewers`.`required` IN (".implode(',', $groups).") ";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentReviewLog`.`status` = 0 ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_EXPIRED.") ";
+			break; /* }}} */
+		case 'ApproveByMe': // Documents I have to approve {{{
+			if (!$this->db->createTemporaryTable("ttapproveid")) {
+				return false;
+			}
+			$queryStr .=
+				"LEFT JOIN `tblDocumentApprovers` on `ttcontentid`.`document`=`tblDocumentApprovers`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentApprovers`.`version` ".
+				"LEFT JOIN `ttapproveid` ON `ttapproveid`.`approveID` = `tblDocumentApprovers`.`approveID` ".
+				"LEFT JOIN `tblDocumentApproveLog` ON `tblDocumentApproveLog`.`approveLogID`=`ttapproveid`.`maxLogID` ";
+
+			$queryStr .= "WHERE (`tblDocumentApprovers`.`type` = 0 AND `tblDocumentApprovers`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentApprovers`.`type` = 1 AND `tblDocumentApprovers`.`required` IN (".implode(',', $groups).") ";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentApproveLog`.`status` = 0 ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_APP.", ".S_EXPIRED.") ";
+			break; /* }}} */
+		case 'ReceiptByMe': // Documents I have to receipt {{{
+			if (!$this->db->createTemporaryTable("ttreceiptid")) {
+				return false;
+			}
+			$queryStr .=
+				"LEFT JOIN `tblDocumentRecipients` on `ttcontentid`.`document`=`tblDocumentRecipients`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRecipients`.`version` ".
+				"LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`receiptID` = `tblDocumentRecipients`.`receiptID` ".
+				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentReceiptLog`.`receiptLogID`=`ttreceiptid`.`maxLogID` ";
+
+			$queryStr .= "WHERE (`tblDocumentRecipients`.`type` = 0 AND `tblDocumentRecipients`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentRecipients`.`type` = 1 AND `tblDocumentRecipients`.`required` IN (".implode(',', $groups).") ";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentReceiptLog`.`status` = 0 ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_RELEASED.") ";
+			break; /* }}} */
+		case 'ReviseByMe': // Documents I have to receipt {{{
+			if (!$this->db->createTemporaryTable("ttrevisionid")) {
+				return false;
+			}
+			$queryStr .=
+				"LEFT JOIN `tblDocumentRevisors` on `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` ".
+				"LEFT JOIN `ttrevisionid` ON `ttrevisionid`.`revisionID` = `tblDocumentRevisors`.`revisionID` ".
+				"LEFT JOIN `tblDocumentRevisionLog` ON `tblDocumentRevisionLog`.`revisionLogID`=`ttrevisionid`.`maxLogID` ";
+
+			$queryStr .= "WHERE (`tblDocumentRevisors`.`type` = 0 AND `tblDocumentRevisors`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).") ";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentRevisionLog`.`status` = 0 ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_IN_REVISION.") ";
+			break; /* }}} */
+		}
+		if($queryStr) {
+			$resArr = $this->db->getResultArray($selectStr.$queryStr);
+			if (is_bool($resArr) && !$resArr) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+		return $resArr[0]['c'];
+	} /* }}} */
+
 	/**
 	 * Returns all documents with a predefined search criteria
 	 *
@@ -1149,6 +1247,7 @@ class SeedDMS_Core_DMS {
 			if($groups)
 				$queryStr .= "OR `tblDocumentRecipients`.`type` = 1 AND `tblDocumentRecipients`.`required` IN (".implode(',', $groups).")";
 			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_RELEASED." ";
 			if(!$param2)
 				$queryStr .= " AND `tblDocumentReceiptLog`.`status` = 0 ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
@@ -1222,6 +1321,7 @@ class SeedDMS_Core_DMS {
 			if($groups)
 				$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).")";
 			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_IN_REVISION." ";
 			if(!$param2)
 				$queryStr .= " AND `tblDocumentRevisionLog`.`status` = 0 ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";

From 10cb3e1cb3996b36944c919f7eedd535640ede1f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 08:57:38 +0100
Subject: [PATCH 0890/2006] add various indexes

---
 install/create_tables-innodb.sql  | 4 ++++
 install/create_tables-sqlite3.sql | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 49084ac27..f393d445d 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -414,6 +414,7 @@ CREATE TABLE `tblDocumentReviewers` (
   UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
   CONSTRAINT `tblDocumentReviewers_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE INDEX `indDocumentReviewersRequired` ON `tblDocumentReviewers` (`required`);
 
 -- --------------------------------------------------------
 
@@ -451,6 +452,7 @@ CREATE TABLE `tblDocumentRecipients` (
   UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
   CONSTRAINT `tblDocumentRecipients_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE INDEX `indDocumentRecipientsRequired` ON `tblDocumentRecipients` (`required`);
 
 -- --------------------------------------------------------
 
@@ -487,6 +489,7 @@ CREATE TABLE `tblDocumentRevisors` (
   UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
   CONSTRAINT `tblDocumentRevisors_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE INDEX `indDocumentRevisorsRequired` ON `tblDocumentRevisors` (`required`);
 
 -- --------------------------------------------------------
 
@@ -674,6 +677,7 @@ CREATE TABLE `tblMandatoryApprovers` (
   PRIMARY KEY (`userID`,`approverUserID`,`approverGroupID`),
   CONSTRAINT `tblMandatoryApprovers_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE INDEX `indDocumentApproversRequired` ON `tblDocumentApprovers` (`required`);
 
 -- --------------------------------------------------------
 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index fa7b3ce0c..a4fb6420d 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -216,6 +216,7 @@ CREATE TABLE `tblDocumentApprovers` (
   `required` INTEGER NOT NULL default '0',
   UNIQUE (`documentID`,`version`,`type`,`required`)
 ) ;
+CREATE INDEX `indDocumentApproversRequired` ON `tblDocumentApprovers` (`required`);
 
 -- --------------------------------------------------------
 
@@ -344,6 +345,7 @@ CREATE TABLE `tblDocumentReviewers` (
   `required` INTEGER NOT NULL default '0',
   UNIQUE (`documentID`,`version`,`type`,`required`)
 ) ;
+CREATE INDEX `indDocumentReviewersRequired` ON `tblDocumentReviewers` (`required`);
 
 -- --------------------------------------------------------
 
@@ -374,6 +376,7 @@ CREATE TABLE `tblDocumentRecipients` (
   `required` INTEGER NOT NULL default '0',
   UNIQUE (`documentID`,`version`,`type`,`required`)
 ) ;
+CREATE INDEX `indDocumentRecipientsRequired` ON `tblDocumentRecipients` (`required`);
 
 -- --------------------------------------------------------
 
@@ -405,6 +408,7 @@ CREATE TABLE `tblDocumentRevisors` (
   `startdate` TEXT default NULL,
   UNIQUE (`documentID`,`version`,`type`,`required`)
 ) ;
+CREATE INDEX `indDocumentRevisorsRequired` ON `tblDocumentRevisors` (`required`);
 
 -- --------------------------------------------------------
 

From 6e58e2bb33f3aa74eeef6f2e032037fe1467bf6f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 11:47:24 +0100
Subject: [PATCH 0891/2006] fix typo

---
 out/out.OverrideContentStatus.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.OverrideContentStatus.php b/out/out.OverrideContentStatus.php
index e19ec2878..c1a5bd426 100644
--- a/out/out.OverrideContentStatus.php
+++ b/out/out.OverrideContentStatus.php
@@ -57,7 +57,7 @@ $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if(!$accessop->mayOverwriteStatus($document)) {
+if(!$accessop->mayOverrideStatus($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("cannot_change_final_states"));
 }
 

From 2364d0505bc1a5a6d26d59c01011e78aa0607eba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 12:02:25 +0100
Subject: [PATCH 0892/2006] add entry for 6.0.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 36f5d548a..3bc89584d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@
 - owner of document may see review/approval/receipt/revision log
 - fix sending mails to reviewer/approvers after check in
 - downloading of review/approval files works again
+- optimizing retrieval of open tasks
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0

From 31853c5586587d924060c0de8ef30b4357f43174 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 12:41:18 +0100
Subject: [PATCH 0893/2006] fix documentation, minor code cleanups

---
 views/bootstrap/class.Tasks.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 7fd1d77ea..921e06539 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -96,11 +96,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$startts = microtime(true);
-		$tasks['review'] = 0;
-		$tasks['approval'] = 0;
-		$tasks['receipt'] = 0;
-		$tasks['revision'] = 0;
-
+		$tasks = array();
 		$tasks['review'] = $dms->countTasks('ReviewByMe', $user);
 		$tasks['approval'] = $dms->countTasks('ApproveByMe', $user);
 		$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
@@ -111,14 +107,9 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	/**
-	 * Returns the html needed for the task list in the menu
+	 * Returns a json array of tasks to be done
 	 *
-	 * This function renders the tasks in a way suitable to be
-	 * used as a menu
-	 *
-	 * @param array $clipboard clipboard containing two arrays for both
-	 *        documents and folders.
-	 * @return string html code
+	 * @return string json string
 	 */
 	function myTasks() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -137,8 +128,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	 * This function renders the tasks in a way suitable to be
 	 * used as a menu
 	 *
-	 * @param array $clipboard clipboard containing two arrays for both
-	 *        documents and folders.
 	 * @return string html code
 	 */
 	function menuTasks() { /* {{{ */

From 1538171d312bb7988d66e2055c011e44a29abfd9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 12:41:45 +0100
Subject: [PATCH 0894/2006] use countTasks instead of myTasks for counting open
 tasks

---
 styles/bootstrap/application.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 47da78dca..27cf11b7c 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1008,18 +1008,18 @@ $(document).ready(function() { /* {{{ */
 		$.ajax({url: '../out/out.Tasks.php',
 			type: 'GET',
 			dataType: "json",
-			data: {action: 'mytasks'},
+			data: {action: 'counttasks'},
 			success: function(data) {
 				if(data) {
-					if(approval_count != data.data.approval.length ||
-						 review_count != data.data.review.length ||
-						 receipt_count != data.data.receipt.length ||
-						 revision_count != data.data.revision.length) {
+					if(approval_count != data.data.approval ||
+						 review_count != data.data.review ||
+						 receipt_count != data.data.receipt ||
+						 revision_count != data.data.revision) {
 						$("#menu-tasks > ul > li").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
-						approval_count = data.data.approval.length;
-						review_count = data.data.review.length;
-						receipt_count = data.data.receipt.length;
-						revision_count = data.data.revision.length;
+						approval_count = data.data.approval;
+						review_count = data.data.review;
+						receipt_count = data.data.receipt;
+						revision_count = data.data.revision;
 					}
 				}
 			},

From 6f4577d7b2597970057efe3e5c55ca5e3bc666eb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 13:20:12 +0100
Subject: [PATCH 0895/2006] fix call of SeedDMS_AccessOperation()

---
 out/out.TransferDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.TransferDocument.php b/out/out.TransferDocument.php
index 7d423e1f1..016a60d57 100644
--- a/out/out.TransferDocument.php
+++ b/out/out.TransferDocument.php
@@ -52,7 +52,7 @@ if (is_bool($users)) {
 $folder = $document->getFolder();
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 if($view) {
 	$view->setParam('folder', $folder);

From a42c42f3358c661999c4e2f8a5aef37a29d3fb61 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 13:20:33 +0100
Subject: [PATCH 0896/2006] do not show users removed from process unless admin

---
 views/bootstrap/class.ViewDocument.php | 158 +++++++++++++------------
 1 file changed, 82 insertions(+), 76 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 5a5401032..f924438b1 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -816,37 +816,39 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
-				/* $updateUser is the user who has done the review */
-				$updateUser = $dms->getUser($r["userID"]);
-				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
-				print "<td>".htmlspecialchars($r["comment"]);
-				if($r['file']) {
-					echo "<br />";
-					if($accessop->check_controller_access('Download', array('action'=>'run'))) {
-						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
-					}
-				}
-				print "</td>\n";
-				print "<td>".getReviewStatusText($r["status"])."</td>\n";
-				print "<td><ul class=\"unstyled\">";
-				if($accesserr)
-					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
-
-				if($accessop->mayReview($document)) {
-					if ($is_reviewer) {
-						if ($r["status"]==0) {
-							print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("add_review"), false, true)."</li>";
-						} elseif ($accessop->mayUpdateReview($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))){
-							print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+				if($user->isAdmin() || $r["status"] > -2) {
+					print "<tr>\n";
+					print "<td>".$reqName."</td>\n";
+					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+					/* $updateUser is the user who has done the review */
+					$updateUser = $dms->getUser($r["userID"]);
+					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
+					print "<td>".htmlspecialchars($r["comment"]);
+					if($r['file']) {
+						echo "<br />";
+						if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+							echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
 						}
 					}
-				}
+					print "</td>\n";
+					print "<td>".getReviewStatusText($r["status"])."</td>\n";
+					print "<td><ul class=\"unstyled\">";
+					if($accesserr)
+						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
 
-				print "</ul></td>\n";	
-				print "</tr>\n";
+					if($accessop->mayReview($document)) {
+						if ($is_reviewer) {
+							if ($r["status"]==0) {
+								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("add_review"), false, true)."</li>";
+							} elseif ($accessop->mayUpdateReview($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))){
+								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+							}
+						}
+					}
+
+					print "</ul></td>\n";	
+					print "</tr>\n";
+				}
 			}
 		}
 
@@ -903,38 +905,40 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>";
-				/* $updateUser is the user who has done the approval */
-				$updateUser = $dms->getUser($a["userID"]);
-				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</li></ul></td>";	
-				print "<td>".htmlspecialchars($a["comment"]);
-				if($a['file']) {
-					echo "<br />";
-					if($accessop->check_controller_access('Download', array('action'=>'run'))) {
-						echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
-					}
-				}
-				echo "</td>\n";
-				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
-				print "<td><ul class=\"unstyled\">";
-				if($accesserr)
-					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
-
-				if($accessop->mayApprove($document)) {
-					if ($is_approver) {
-						if ($a['status'] == 0) {
-							print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("add_approval"), false, true)."</li>";
-						} elseif ($accessop->mayUpdateApproval($document, $updateUser) && (($a["status"]==1)||($a["status"]==-1))){
-							print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+				if($user->isAdmin() || $r["status"] > -2) {
+					print "<tr>\n";
+					print "<td>".$reqName."</td>\n";
+					print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>";
+					/* $updateUser is the user who has done the approval */
+					$updateUser = $dms->getUser($a["userID"]);
+					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</li></ul></td>";	
+					print "<td>".htmlspecialchars($a["comment"]);
+					if($a['file']) {
+						echo "<br />";
+						if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+							echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
 						}
 					}
-				}
+					echo "</td>\n";
+					print "<td>".getApprovalStatusText($a["status"])."</td>\n";
+					print "<td><ul class=\"unstyled\">";
+					if($accesserr)
+						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
 
-				print "</ul>";
-				print "</td>\n";	
-				print "</tr>\n";
+					if($accessop->mayApprove($document)) {
+						if ($is_approver) {
+							if ($a['status'] == 0) {
+								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("add_approval"), false, true)."</li>";
+							} elseif ($accessop->mayUpdateApproval($document, $updateUser) && (($a["status"]==1)||($a["status"]==-1))){
+								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+							}
+						}
+					}
+
+					print "</ul>";
+					print "</td>\n";	
+					print "</tr>\n";
+				}
 			}
 		}
 
@@ -1367,27 +1371,29 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr>\n";
-				print "<td>".$reqName."</td>\n";
-				print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
-				/* $updateUser is the user who has done the revision */
-				$updateUser = $dms->getUser($r["userID"]);
-				print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
-				print "<td>".htmlspecialchars($r["comment"])."</td>\n";
-				print "<td>".getRevisionStatusText($r["status"])."</td>\n";
-				print "<td><ul class=\"unstyled\">";
-				if($accesserr)
-					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
-				if($accessop->mayRevise($document)) {
-					if ($is_recipient && $r["status"]==0) {
-						print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."</li>";
-					} elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-						print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+				if($user->isAdmin() || $r["status"] != -2) {
+					print "<tr>\n";
+					print "<td>".$reqName."</td>\n";
+					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+					/* $updateUser is the user who has done the revision */
+					$updateUser = $dms->getUser($r["userID"]);
+					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
+					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
+					print "<td>".getRevisionStatusText($r["status"])."</td>\n";
+					print "<td><ul class=\"unstyled\">";
+					if($accesserr)
+						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+					if($accessop->mayRevise($document)) {
+						if ($is_recipient && $r["status"]==0) {
+							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."</li>";
+						} elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
+							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+						}
 					}
-				}
 
-				print "</ul></td>\n";	
-				print "</tr>\n";
+					print "</ul></td>\n";	
+					print "</tr>\n";
+				}
 			}
 ?>
 		</table>

From 529e546600a8a1c730a8e8bc74f618d41b02d58b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 13:21:04 +0100
Subject: [PATCH 0897/2006] add entry for 6.0.1

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3bc89584d..a6b9f0dd7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@
 - fix sending mails to reviewer/approvers after check in
 - downloading of review/approval files works again
 - optimizing retrieval of open tasks
+- do not show user which has been removed from a process except for admins
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0

From ac09ee377306757a077cdae336bd784f3c08dcff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Dec 2017 14:43:22 +0100
Subject: [PATCH 0898/2006] new version 6.0.2

---
 CHANGELOG                | 13 +++++++++----
 Makefile                 |  2 +-
 SeedDMS_Core/package.xml | 25 +++++++++++++++++++++----
 inc/inc.Version.php      |  2 +-
 install/install.php      |  2 +-
 5 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a6b9f0dd7..fa1641d58 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,13 +1,10 @@
 --------------------------------------------------------------------------------
-                     Changes in version 6.0.1
+                     Changes in version 6.0.2
 --------------------------------------------------------------------------------
 - check if user has access on document and is not disabled if set as
   receiver, revisor
 - check if group has members if set as reviewer, approver, receiver, revisor
 - fix bug in notification of approver after successful review
-- call hook 'rawcontent' when downloading transmittal list or search content
-- speed up list of locked documents on MyDocuments page
-- sql queries and execution times can be written to file in database layer
 - add document check for docs in revision and missing access rights of revisor
 - add document check for docs requiring receptions but user lacks access right
 - fix Acl manager when using pgsql
@@ -17,6 +14,14 @@
 - downloading of review/approval files works again
 - optimizing retrieval of open tasks
 - do not show user which has been removed from a process except for admins
+- merge changes up to 5.1.5
+
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.1
+--------------------------------------------------------------------------------
+- call hook 'rawcontent' when downloading transmittal list or search content
+- speed up list of locked documents on MyDocuments page
+- sql queries and execution times can be written to file in database layer
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0
diff --git a/Makefile b/Makefile
index 06f7e35a0..3787c6034 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=6.0.1
+VERSION=6.0.2
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 01e610263..fe61e5673 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2017-11-07</date>
+ <date>2017-12-18</date>
  <time>09:19:24</time>
  <version>
-  <release>6.0.1</release>
-  <api>6.0.1</api>
+  <release>6.0.2</release>
+  <api>6.0.2</api>
  </version>
  <stability>
   <release>stable</release>
@@ -34,7 +34,7 @@ are any waiting or pending revisions at all
 - fix field name in getDocumentList() to make it work for pgsql
 - views instead of temp. tables can be used
 - ReceiveOwner list does not contain old versions anymore
-- all changes up to 5.1.4 merged
+- all changes up to 5.1.5 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1595,5 +1595,22 @@ log entry first
 - add new method SeedDMS_Core_DMS::getDocumentsExpired()
    </notes>
   </release>
+  <release>
+   <date>2017-05-28</date>
+   <time>06:34:50</time>
+   <version>
+    <release>6.0.1</release>
+    <api>6.0.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- speed up getting list of locked documents
+- setting _logfile in inc.DBAccessPDO.php will log execution times in file
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index db395aba2..4bfdc8bec 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.1";
+	public $_number = "6.0.2";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index 7c64f1456..53416b1fb 100644
--- a/install/install.php
+++ b/install/install.php
@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "6.0.1");
+define("SEEDDMS_VERSION", "6.0.2");
 
 require_once('../inc/inc.ClassSettings.php');
 

From 3b3b5efafe6c392b4fa2775d878def7c409e62f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 08:19:48 +0100
Subject: [PATCH 0899/2006] getTimeline() returns documents with a scheduled
 revision

---
 SeedDMS_Core/Core/inc.ClassDMS.php      | 2 +-
 SeedDMS_Core/Core/inc.ClassDocument.php | 9 +++------
 SeedDMS_Core/package.xml                | 1 +
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 63a48d501..419680a42 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -3475,7 +3475,7 @@ class SeedDMS_Core_DMS {
 			$endts = $startts+86400;
 		$timeline = array();
 
-		$queryStr = "SELECT DISTINCT document FROM `tblDocumentContent` WHERE `date` > ".$startts." AND `date` < ".$endts." UNION SELECT DISTINCT document FROM `tblDocumentFiles` WHERE `date` > ".$startts." AND `date` < ".$endts;
+		$queryStr = "SELECT DISTINCT document FROM `tblDocumentContent` WHERE `date` > ".$startts." AND `date` < ".$endts." OR `revisiondate` > '".date('Y-m-d H:i:s', $startts)."' AND `revisiondate` < '".date('Y-m-d H:i:s', $endts)."' UNION SELECT DISTINCT document FROM `tblDocumentFiles` WHERE `date` > ".$startts." AND `date` < ".$endts;
 		$resArr = $this->db->getResultArray($queryStr);
 		if ($resArr === false)
 			return false;
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 1e6854634..e783dc9dd 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2765,18 +2765,15 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		$timeline = array();
 
-		/* No need to add entries for new version because the status log
-		 * will generate an entry as well.
-		$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = " . $this->_id;
+		$queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id;
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
 			return false;
 
 		foreach ($resArr as $row) {
-			$date = date('Y-m-d H:i:s', $row['date']);
-			$timeline[] = array('date'=>$date, 'msg'=>'Added version '.$row['version'], 'type'=>'add_version', 'version'=>$row['version'], 'document'=>$this, 'params'=>array($row['version']));
+			if($row['revisiondate'])
+				$timeline[] = array('date'=>$row['revisiondate'], 'msg'=>'Scheduled revision of version '.$row['version'], 'type'=>'scheduled_revesion', 'version'=>$row['version'], 'document'=>$this, 'params'=>array($row['version']));
 		}
-		 */
 
 		$queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id;
 		$resArr = $db->getResultArray($queryStr);
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 9d7c48e88..593eae822 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -35,6 +35,7 @@ are any waiting or pending revisions at all
 - views instead of temp. tables can be used
 - ReceiveOwner list does not contain old versions anymore
 - all changes up to 5.1.5 merged
+- getTimeline() also returns data for documents with a scheduled revision
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 228bfffba1ed14f573e42aeaed319834dffa1b3e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 08:26:46 +0100
Subject: [PATCH 0900/2006] set allday flag for scheduled revision

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index e783dc9dd..956377a1d 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2772,7 +2772,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		foreach ($resArr as $row) {
 			if($row['revisiondate'])
-				$timeline[] = array('date'=>$row['revisiondate'], 'msg'=>'Scheduled revision of version '.$row['version'], 'type'=>'scheduled_revesion', 'version'=>$row['version'], 'document'=>$this, 'params'=>array($row['version']));
+				$timeline[] = array('date'=>substr($row['revisiondate'], 0, 10), 'allday'=>true, 'msg'=>'Scheduled revision of version '.$row['version'], 'type'=>'scheduled_revesion', 'version'=>$row['version'], 'document'=>$this, 'params'=>array($row['version']));
 		}
 
 		$queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id;

From d1a6651fa55a568fd7fa812413fb308483e8cada Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 08:27:10 +0100
Subject: [PATCH 0901/2006] check if flag 'allday' is set

---
 views/bootstrap/class.Calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 6b096281d..90c512dd1 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -208,7 +208,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Bootstrap_Style {
 					$arr[] = array(
 						'start'=>$item['date'],
 						'title'=>$item['document']->getName()."\n".$item['msg'],
-						'allDay'=>false,
+						'allDay'=>isset($item['allday']) ? $item['allday'] : false,
 						'color'=>$color,
 						'type'=>$item['type'],
 						'documentid'=> (int) $item['document']->getID(),

From 2f7a91d785265af529710e3101c6fa6c6e13de12 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 08:27:52 +0100
Subject: [PATCH 0902/2006] add entry for 6.0.2

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 698c1df8c..b60aeac9d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@
 - downloading of review/approval files works again
 - optimizing retrieval of open tasks
 - do not show user which has been removed from a process except for admins
+- show scheduled revisions in calendar
 - merge changes up to 5.1.5
 
 --------------------------------------------------------------------------------

From ad336cdd9f96ba4dadab8ed040dfecb9f2363eea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 11:39:18 +0100
Subject: [PATCH 0903/2006] fix html error

---
 views/bootstrap/class.GroupMgr.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index 18dcca8fc..64e6062be 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -304,7 +304,6 @@ $(document).ready( function() {
 ?>
 </select>
 </form>
-</div>
 	<div class="ajax" style="margin-bottom: 15px;" data-view="GroupMgr" data-action="actionmenu" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>
 <?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
 	<div class="ajax" data-view="GroupMgr" data-action="info" <?php echo ($selgroup ? "data-query=\"groupid=".$selgroup->getID()."\"" : "") ?>></div>

From 367039f8b117bd26f77a089641730b2331fd43f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 11:50:38 +0100
Subject: [PATCH 0904/2006] set timeout to 10sec and timer to 60sec

---
 styles/bootstrap/application.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 27cf11b7c..d589759b0 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1023,8 +1023,8 @@ $(document).ready(function() { /* {{{ */
 					}
 				}
 			},
-			timeout: 3000
+			timeout: 10000
 		}); 
-		timeOutId = setTimeout(checkTasks, 30000);
+		timeOutId = setTimeout(checkTasks, 60000);
 	}
 

From 52fbb45df4a9f05be1390aa4a1034c4f3d5267cb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Dec 2017 11:51:03 +0100
Subject: [PATCH 0905/2006] fix html error

---
 views/bootstrap/class.AttributeMgr.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 6b73d419c..6b195aea1 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -334,7 +334,6 @@ $(document).ready( function() {
 ?>
 	</select>
 </form>
-</div>
 	<div class="ajax" style="margin-bottom: 15px;" data-view="AttributeMgr" data-action="actionmenu" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
 <?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
 	<div class="ajax" data-view="AttributeMgr" data-action="info" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>

From d5b4553c907985fb38eb73cd1d34998ebd140568 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 Jan 2018 08:07:42 +0100
Subject: [PATCH 0906/2006] add methods for deleting users and to get a single
 category

---
 restapi/index.php | 71 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 16 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index a9ca1dd2d..2dd729fcb 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -406,7 +406,7 @@ function createFolder($id) { /* {{{ */
     if(!ctype_digit($id) || $id == 0) {
         $app->response()->status(400);
         $app->response()->header('Content-Type', 'application/json');
-        echo json_encode(array('success'=>true, 'message'=>'No parent folder given', 'data'=>''));
+        echo json_encode(array('success'=>false, 'message'=>'No parent folder given', 'data'=>''));
         return;
     }
     $parent = $dms->getFolder($id);
@@ -1413,6 +1413,24 @@ function createUser() { /* {{{ */
     return;
 } /* }}} */
 
+function deleteUser($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+
+    $app->response()->header('Content-Type', 'application/json');
+    if($user = $dms->getUser($id)) {
+        if($result = $user->remove($userobj, $userobj)) {
+            echo json_encode(array('success'=>$result, 'message'=>'', 'data'=>''));
+        } else {
+            $app->response()->status(500);
+            echo json_encode(array('success'=>$result, 'message'=>'Could not delete user', 'data'=>''));
+        }
+    } else {
+        $app->response()->status(404);
+        echo json_encode(array('success'=>false, 'message'=>'No such user', 'data'=>''));
+    }
+} /* }}} */
+
 /**
  * Updates the password of an existing Account, the password must be PUT as a md5 string
  *
@@ -1469,18 +1487,7 @@ function getUserById($id) { /* {{{ */
         $account = $dms->getUserByLogin($id);
     }
     if($account) {
-        $data = array();
-        $data['id'] = (int)$account->getId();
-        $data['login'] = $account->getLogin();
-        $data['fullname'] = $account->getFullName();
-        $data['email'] = $account->getEmail();
-        $data['language'] = $account->getLanguage();
-        $data['theme'] = $account->getTheme();
-        $data['role'] = $account->getRole();
-        $data['comment'] = $account->getComment();
-        $data['isdisabled'] = $account->isDisabled() ? true : false;
-        $data['isguest'] = $account->isGuest() ? true : false;
-        $data['isadmin'] = $account->isAdmin() ? true : false;
+        $data = __getUserData($account);
         $app->response()->header('Content-Type', 'application/json');
         echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
     } else {
@@ -1796,7 +1803,12 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
 function getCategories() { /* {{{ */
     global $app, $dms, $userobj;
 
-    $categories = $dms->getDocumentCategories();
+		if(false === ($categories = $dms->getDocumentCategories())) {
+        $app->response()->status(500);
+	  		$app->response()->header('Content-Type', 'application/json');
+		  	echo json_encode(array('success'=>false, 'message'=>'Could not get categories', 'data'=>null));
+        return;
+		}
     $data = [];
     foreach($categories as $category)
         $data[] = ['id' => (int)$category->getId(), 'name' => $category->getName()];
@@ -1805,6 +1817,28 @@ function getCategories() { /* {{{ */
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
+function getCategory($id) { /* {{{ */
+    global $app, $dms, $userobj;
+
+    if(!ctype_digit($id)) {
+        $app->response()->status(400);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'No such category', 'data'=>''));
+        return;
+    }
+
+    $category = $dms->getDocumentCategory($id);
+    if($category) {
+        $data = array();
+        $data['id'] = (int)$category->getId();
+        $data['name'] = $category->getName();
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    } else {
+        $app->response()->status(404);
+    }
+} /* }}} */
+
 function createCategory() { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
@@ -1841,11 +1875,14 @@ function deleteCategory($id) { /* {{{ */
 
     $app->response()->header('Content-Type', 'application/json');
     if($category = $dms->getDocumentCategory($id)) {
-        if($result = $category->remove())
+        if($result = $category->remove()) {
             echo json_encode(array('success'=>$result, 'message'=>'', 'data'=>''));
-        else
+        } else {
+            $app->response()->status(500);
             echo json_encode(array('success'=>$result, 'message'=>'Could not delete category', 'data'=>''));
+        }
     } else {
+        $app->response()->status(404);
         echo json_encode(array('success'=>false, 'message'=>'No such category', 'data'=>''));
     }
 } /* }}} */
@@ -2029,6 +2066,7 @@ $app->put('/account/fullname', 'setFullName');
 $app->put('/account/email', 'setEmail');
 $app->get('/account/documents/locked', 'getLockedDocuments');
 $app->get('/users', 'getUsers');
+$app->delete('/users/:id', 'deleteUser');
 $app->post('/users', 'createUser');
 $app->get('/users/:id', 'getUserById');
 $app->put('/users/:id/disable', 'setDisabledUser');
@@ -2044,6 +2082,7 @@ $app->put('/folder/:id/access/group/remove', 'removeGroupAccessFromFolder');
 $app->put('/folder/:id/access/user/remove', 'removeUserAccessFromFolder');
 $app->put('/folder/:id/access/clear', 'clearFolderAccessList');
 $app->get('/categories', 'getCategories');
+$app->get('/categories/:id', 'getCategory');
 $app->delete('/categories/:id', 'deleteCategory');
 $app->post('/categories', 'createCategory');
 $app->put('/categories/:id/name', 'changeCategoryName');

From 6e75dd9c44aaf1c27b5b9ffb566c81caea241832 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Jan 2018 14:38:03 +0100
Subject: [PATCH 0907/2006] reviewers/approvers may be set in draft status

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 4e38dd6df..ff46b6607 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -144,7 +144,7 @@ class SeedDMS_AccessOperation {
 					if($r['status'] == 1 || $r['status'] == -1)
 						$hasapproval = true;
 				}
-				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && !$hasreview) || ($status["status"]==S_DRAFT_APP && !$hasreview && !$hasapproval))) {
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && !$hasreview) || ($status["status"]==S_DRAFT_APP && !$hasreview && !$hasapproval) || $status["status"]==S_DRAFT)) {
 					return true;
 				}
 			}

From 62f5dd1a9ff63077cc1b36a5f7da1a2534ee6f96 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jan 2018 15:29:31 +0100
Subject: [PATCH 0908/2006] pass 0 as default to getObjects()

---
 SeedDMS_Core/Core/inc.ClassAttribute.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index b1d74c5e9..8e0dcc450 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -874,12 +874,12 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 	 * @param integer $limit limit number of documents/folders
 	 * @return array array containing list of documents and folders
 	 */
-	public function getObjects($attrvalue, $limit) { /* {{{ */
+	public function getObjects($attrvalue, $limit=0) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$result = array('docs'=>array(), 'folders'=>array(), 'contents'=>array());
 		if($this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_all ||
-		   $this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_document) {
+		  $this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_document) {
 			$queryStr = "SELECT * FROM `tblDocumentAttributes` WHERE `attrdef`=".$this->_id." AND `value`=".$db->qstr($attrvalue);
 			if($limit)
 				$queryStr .= " limit ".(int) $limit;

From 0b8c6692ae215d95bdc6ede2d71d1b7eb9f97371 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jan 2018 15:30:21 +0100
Subject: [PATCH 0909/2006] add hook for modifying action menu of selected user

---
 views/bootstrap/class.UsrMgr.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index c7ec6bf4d..d6d3776d2 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -203,15 +203,24 @@ $(document).ready( function() {
   </a>
   <ul class="dropdown-menu">
 <?php
+			$menuitems = array();
 			if(!in_array($seluser->getID(), $undeluserids) && $this->check_access('RemoveUser')) {
-				echo '<li>'.$this->html_link('RemoveUser', array('userid'=>$seluser->getID()), array('class'=>''), '<i class="icon-remove"></i> '.getMLText("rm_user"), false)."</li>";
+				$menuitems['removeuser'] = array('link'=>$this->html_url('RemoveUser', array('userid'=>$seluser->getID())), 'label'=>'<i class="icon-remove"></i> '.getMLText("rm_user"));
 			}
-			echo '<li><a href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user_from_processes").'</a></li>';
-			echo '<li><a href="../out/out.TransferObjects.php?userid='.$seluser->getID().'"><i class="icon-share-alt"></i> '.getMLText("transfer_objects").'</a></li>';
+			$menuitems['removeuserfromprozess'] = array('link'=>$this->html_url('RemoveUserFromProcesses', array('userid'=>$seluser->getID())), 'label'=>'<i class="icon-remove"></i> '.getMLText("rm_user_from_processes"));
+			$menuitems['transferobjects'] = array('link'=>$this->html_url('TransferObjects', array('userid'=>$seluser->getID())), 'label'=>'<i class="icon-share-alt"></i> '.getMLText("transfer_objects"));
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
-				echo "<li><a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText("substitute_user")."</a></li>\n";
+				$menuitems['substituteuser'] = array('link'=>'../op/op.SubstituteUser.php?userid='.$seluser->getID().'&formtoken='.createFormKey('substituteuser'), 'label'=>'<i class="icon-exchange"></i> '.getMLText("substitute_user"));
 			if($enableemail)
-				echo '<li><a href="../out/out.SendLoginData.php?userid='.$seluser->getID().'"><i class="icon-envelope-alt"></i> '.getMLText("send_login_data").'</a></li>';
+				$menuitems['sendlogindata'] = array('link'=>$this->html_url('SendLoginData',array('userid'=>$seluser->getID())), 'label'=>'<i class="icon-envelope-alt"></i> '.getMLText("send_login_data"));
+
+			/* Check if hook exists because otherwise callHook() will override $menuitems */
+			if($this->hasHook('actionMenu'))
+				$menuitems = $this->callHook('actionMenu', $seluser, $menuitems);
+
+			foreach($menuitems as $menuitem) {
+				echo "<li><a href=\"".$menuitem['link']."\">".$menuitem['label']."</a></li>";
+			}
 ?>
 	</ul>
 </div>

From eed90367daeaf6d9f82697f39d2a370fe19a5b6b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Jan 2018 15:30:47 +0100
Subject: [PATCH 0910/2006] add note for 6.0.3

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 392b50d52..b0303d4f6 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+pass 0 as default to getObjects()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 544e151135fa6898e97a805889b15883fb3a96d9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:03:05 +0100
Subject: [PATCH 0911/2006] getStatistics() returns propper values for each
 single value in a valueset

---
 SeedDMS_Core/Core/inc.ClassAttribute.php | 63 +++++++++++++++++++++---
 1 file changed, 57 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index 8e0dcc450..4da5dd2b5 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -798,10 +798,25 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 					}
 				}
 			}
+			$valueset = $this->getValueSetAsArray();
+			$possiblevalues = array();
+			foreach($valueset as $value) {
+				$possiblevalues[md5($value)] = array('value'=>$value, 'c'=>0);
+			}
 			$queryStr = "SELECT count(*) c, `value` FROM `tblDocumentAttributes` WHERE `attrdef`=".$this->_id." GROUP BY `value` ORDER BY c DESC";
 			$resArr = $db->getResultArray($queryStr);
 			if($resArr) {
-				$result['frequencies']['document'] = $resArr;
+				foreach($resArr as $row) {
+					$tmpattr = new SeedDMS_Core_Attribute(0, null, $this, $row['value']);
+					foreach($tmpattr->getValueAsArray() as $value) {
+						if(isset($possiblevalues[md5($value)])) {
+							$possiblevalues[md5($value)]['c'] += $row['c'];
+						} else {
+							$possiblevalues[md5($value)] = array('value'=>$value, 'c'=>$row['c']);
+						}
+					}
+				}
+				$result['frequencies']['document'] = $possiblevalues;
 			}
 		}
 
@@ -818,10 +833,25 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 					}
 				}
 			}
+			$valueset = $this->getValueSetAsArray();
+			$possiblevalues = array();
+			foreach($valueset as $value) {
+				$possiblevalues[md5($value)] = array('value'=>$value, 'c'=>0);
+			}
 			$queryStr = "SELECT count(*) c, `value` FROM `tblFolderAttributes` WHERE `attrdef`=".$this->_id." GROUP BY `value` ORDER BY c DESC";
 			$resArr = $db->getResultArray($queryStr);
 			if($resArr) {
-				$result['frequencies']['folder'] = $resArr;
+				foreach($resArr as $row) {
+					$tmpattr = new SeedDMS_Core_Attribute(0, null, $this, $row['value']);
+					foreach($tmpattr->getValueAsArray() as $value) {
+						if(isset($possiblevalues[md5($value)])) {
+							$possiblevalues[md5($value)]['c'] += $row['c'];
+						} else {
+							$possiblevalues[md5($value)] = array('value'=>$value, 'c'=>$row['c']);
+						}
+					}
+				}
+				$result['frequencies']['folder'] = $possiblevalues;
 			}
 		}
 
@@ -838,10 +868,25 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 					}
 				}
 			}
+			$valueset = $this->getValueSetAsArray();
+			$possiblevalues = array();
+			foreach($valueset as $value) {
+				$possiblevalues[md5($value)] = array('value'=>$value, 'c'=>0);
+			}
 			$queryStr = "SELECT count(*) c, `value` FROM `tblDocumentContentAttributes` WHERE `attrdef`=".$this->_id." GROUP BY `value` ORDER BY c DESC";
 			$resArr = $db->getResultArray($queryStr);
 			if($resArr) {
-				$result['frequencies']['content'] = $resArr;
+				foreach($resArr as $row) {
+					$tmpattr = new SeedDMS_Core_Attribute(0, null, $this, $row['value']);
+					foreach($tmpattr->getValueAsArray() as $value) {
+						if(isset($possiblevalues[md5($value)])) {
+							$possiblevalues[md5($value)]['c'] += $row['c'];
+						} else {
+							$possiblevalues[md5($value)] = array('value'=>$value, 'c'=>$row['c']);
+						}
+					}
+				}
+				$result['frequencies']['content'] = $possiblevalues;
 			}
 		}
 
@@ -879,8 +924,11 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 
 		$result = array('docs'=>array(), 'folders'=>array(), 'contents'=>array());
 		if($this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_all ||
-		  $this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_document) {
-			$queryStr = "SELECT * FROM `tblDocumentAttributes` WHERE `attrdef`=".$this->_id." AND `value`=".$db->qstr($attrvalue);
+			$this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_document) {
+			if($this->_multiple)
+				$queryStr = "SELECT * FROM `tblDocumentAttributes` WHERE `attrdef`=".$this->_id." AND (`value` like ".$db->qstr("%".$this->getValueSetSeparator().$attrvalue.$this->getValueSetSeparator()."%")." OR `value` like ".$db->qstr("%".$this->getValueSetSeparator().$attrvalue).")";
+			else
+				$queryStr = "SELECT * FROM `tblDocumentAttributes` WHERE `attrdef`=".$this->_id." AND `value`=".$db->qstr($attrvalue);
 			if($limit)
 				$queryStr .= " limit ".(int) $limit;
 			$resArr = $db->getResultArray($queryStr);
@@ -895,7 +943,10 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 
 		if($this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_all ||
 		   $this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_folder) {
-			$queryStr = "SELECT * FROM `tblFolderAttributes` WHERE `attrdef`=".$this->_id." AND `value`=".$db->qstr($attrvalue);
+			if($this->_multiple)
+				$queryStr = "SELECT * FROM `tblFolderAttributes` WHERE `attrdef`=".$this->_id." AND (`value` like ".$db->qstr("%".$this->getValueSetSeparator().$attrvalue.$this->getValueSetSeparator()."%")." OR `value` like ".$db->qstr("%".$this->getValueSetSeparator().$attrvalue).")";
+			else
+				$queryStr = "SELECT * FROM `tblFolderAttributes` WHERE `attrdef`=".$this->_id." AND `value`=".$db->qstr($attrvalue);
 			if($limit)
 				$queryStr .= " limit ".(int) $limit;
 			$resArr = $db->getResultArray($queryStr);

From 903a49101656dc4356df5887c6cbe11adc8fe7d3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:04:53 +0100
Subject: [PATCH 0912/2006] getDocumentList() returns list of documents without
 a receiver

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 34 ++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index d1a9109ba..a9cf1be5c 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1442,6 +1442,40 @@ class SeedDMS_Core_DMS {
 				$docs[] = $d['documentID'];
 			}
 
+			if ($docs) {
+				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
+				$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."'";
+				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+				else $queryStr .= "ORDER BY `name`";
+				$queryStr .= " ".$orderdir;
+			} else {
+				$queryStr = '';
+			}
+			break; // }}}
+		case 'NoReceiveOwner': // Documents *not* having a reception I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
+			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+
+			//			$qs = 'SELECT DISTINCT `documentID` FROM `tblDocumentRecipients` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentRecipients`.`version` AND `ttcontentid`.`document` = `tblDocumentRecipients`.`documentID`';
+			// sql statement without older versions of a document
+			$qs = 'SELECT DISTINCT `document` as `documentID` FROM `ttcontentid` a LEFT JOIN `tblDocumentRecipients` b on a.`document`=b.`documentID` AND a.`maxVersion`=b.`version` WHERE b.`receiptID` IS NULL';
+			$ra = $this->db->getResultArray($qs);
+			if (is_bool($ra) && !$ra) {
+				return false;
+			}
+			$docs = array();
+			foreach($ra as $d) {
+				$docs[] = $d['documentID'];
+			}
+
 			if ($docs) {
 				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
 				$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."'";

From 03690b9f1e07e0f21106e4817248eeb538e0592f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:05:54 +0100
Subject: [PATCH 0913/2006] add notes for 6.0.3

---
 SeedDMS_Core/package.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index b0303d4f6..294dc1f44 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,8 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 pass 0 as default to getObjects()
+SeedDMS_Core_AttributeDefinition::getStatistics() returns propper values for each item in a value set
+SeedDMS_Core_DMS::getDocumentList() returns list of documents without a receiver
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 2b5f9ab3b3bc95c6a75b896aea67b6bed555cc81 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:06:19 +0100
Subject: [PATCH 0914/2006] add callback to
 SeedDMS_Core_Document::getAccessMode()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 4da4abb17..c5e9bf660 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1292,6 +1292,15 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if(!$user)
 			return M_NONE;
 
+		/* Check if 'onCheckAccessDocument' callback is set */
+		if(isset($this->_dms->callbacks['onCheckAccessDocument'])) {
+			foreach($this->_dms->callbacks['onCheckAccessDocument'] as $callback) {
+				if(($ret = call_user_func($callback[0], $callback[1], $this, $user)) > 0) {
+					return $ret;
+				}
+			}
+		}
+
 		/* Administrators have unrestricted access */
 		if ($user->isAdmin()) return M_ALL;
 

From 065fa49cc42597afdb0a8504c2248281b4caed25 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:07:20 +0100
Subject: [PATCH 0915/2006] mayReceive() requires a released document

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index e618a1304..d47e51b87 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -363,7 +363,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ($status["status"]!=S_OBSOLETE) {
+				if ($status["status"]==S_RELEASED) {
 					return true;
 				}
 			}

From fd770b5264cf00959ac54ac28bc7f91afa7a33db Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:11:50 +0100
Subject: [PATCH 0916/2006] check access

---
 op/op.OverrideContentStatus.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php
index ce46dc537..be88140eb 100644
--- a/op/op.OverrideContentStatus.php
+++ b/op/op.OverrideContentStatus.php
@@ -28,6 +28,12 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+//$controller = Controller::factory($tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if(!$accessop->check_controller_access($tmp[1] /*$controller*/)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }

From 48141e11163c5f22104b8db0178efd514663ae37 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:12:47 +0100
Subject: [PATCH 0917/2006] out list of documents without a receiver

---
 views/bootstrap/class.MyDocuments.php | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 30f5ff19c..ce761883f 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -241,6 +241,36 @@ $(document).ready( function() {
 		else printMLText("empty_notify_list");
 	} /* }}} */
 
+	function listNoReceiveOwner() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
+		$cachedir = $this->params['cachedir'];
+		$showtree = $this->params['showtree'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of documents owned by current user */
+		$resArr = $dms->getDocumentList('NoReceiveOwner', $user, false, $orderby, $orderdir);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("documents_user_reception"));
+		if($resArr) {
+			$this->printList($resArr, $previewer, 'listNoReceiveOwner');
+		}
+		else printMLText("empty_notify_list");
+	} /* }}} */
+
 	function listMyDocs() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -584,6 +614,8 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#all_documents" data-action="listMyDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("all_documents").'</a></li>';
 		$resArr = $dms->getDocumentList('ReceiveOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_reception" data-action="listReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_reception").'</a></li>';
+		$resArr = $dms->getDocumentList('NoReceiveOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_no_reception" data-action="listNoReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_no_reception").'</a></li>';
 		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';

From c3e413c47698ba4e33b7efc3a55759f33d8a1c68 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:13:41 +0100
Subject: [PATCH 0918/2006] move many access checks from view into controller

issue message on receive tab if document isn't released yet, but there
are already receivers
---
 views/bootstrap/class.ViewDocument.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 81413bb27..0870d208e 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -650,30 +650,30 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		/* Only admin has the right to remove version in any case or a regular
 		 * user if enableVersionDeletion is on
 		 */
-		if($this->check_access('RemoveVersion'))
+		if($accessop->check_controller_access('RemoveVersion'))
 			if($accessop->mayRemoveVersion($document)) {
 				print "<li>".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-remove\"></i>".getMLText("rm_version"), false, true)."</li>";
 			}
-		if($this->check_access('OverrideContentStatus'))
+		if($accessop->check_controller_access('OverrideContentStatus'))
 			if($accessop->mayOverrideStatus($document)) {
 				print "<li>".$this->html_link('OverrideContentStatus', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-align-justify\"></i>".getMLText("change_status"), false, true)."</li>";
 			}
-		if($this->check_access('SetRecipients'))
+		if($accessop->check_controller_access('SetRecipients'))
 			if($accessop->maySetRecipients($document)) {
 				print "<li>".$this->html_link('SetRecipients', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-check\"></i>".getMLText("change_recipients"), false, true)."</li>";
 			}
-		if($this->check_access('SetRevisors'))
+		if($accessop->check_controller_access('SetRevisors'))
 			if($accessop->maySetRevisors($document)) {
 				print "<li>".$this->html_link('SetRevisors', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-refresh\"></i>".getMLText("change_revisors"), false, true)."</li>";
 			}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
-			if($this->check_access('SetReviewersApprovers'))
+			if($accessop->check_controller_access('SetReviewersApprovers'))
 				if($accessop->maySetReviewersApprovers($document)) {
 					print "<li>".$this->html_link('SetReviewersApprovers', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("change_assignments"), false, true)."</li>";
 				}
 		} else {
-			if($this->check_access('SetWorkflow'))
+			if($accessop->check_controller_access('SetWorkflow'))
 				if($accessop->maySetWorkflow($document)) {
 					if(!$workflow) {
 						print "<li>".$this->html_link('SetWorkflow', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-random\"></i>".getMLText("set_workflow"), false, true)."</li>";
@@ -685,16 +685,16 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<li>".$this->html_link('SetExpires', array('documentid'=>$documentid), array(), "<i class=\"icon-time\"></i>".getMLText("set_expiry"), false, true)."</li>";
 		}
 		 */
-		if($this->check_access('AddToTransmittal'))
+		if($accessop->check_controller_access('AddToTransmittal'))
 			if($dms->getAllTransmittals($user)) {
 				if($this->check_access('AddToTransmittal'))
 					print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
 			}
-		if($this->check_access('EditComment'))
+		if($accessop->check_controller_access('EditComment'))
 			if($accessop->mayEditComment($document)) {
 				print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";
 			}
-		if($this->check_access('EditAttributes'))
+		if($accessop->check_controller_access('EditAttributes'))
 			if($accessop->mayEditAttributes($document)) {
 				print "<li>".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_attributes"), false, true)."</li>";
 			}
@@ -1191,6 +1191,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		  <div class="tab-pane <?php if($currenttab == 'recipients') echo 'active'; ?>" id="recipients">
 <?php
+			if($status["status"]!=S_RELEASED)
+				echo "<div class=\"alert alert-warning\">".getMLText('info_recipients_tab_not_released')."</div>";
 			$this->contentContainerStart();
 			print "<table class=\"table-condensed\">\n";
 
@@ -1279,7 +1281,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		</table>
 <?php
 			$this->contentContainerEnd();
-			if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
+			if($accessop->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) {
 				/* Do not count entries '-2' as they are removed userѕ */
 				$totalreceipts = $stat['-1'] + $stat['0'] + $stat['1'];
 ?>
@@ -1507,7 +1509,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($accessop->mayRemoveVersion($document)) {
 					print "<li>".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-remove\"></i>".getMLText("rm_version"), false, true)."</li>";
 				}
-				if($this->check_access('AddToTransmittal'))
+				if($accessop->check_controller_access('AddToTransmittal'))
 					print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
 				if($accessop->mayEditComment($document)) {
 					print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";
@@ -1620,7 +1622,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		else printMLText("no_attached_files");
 
-		if($this->check_access('AddFile')) {
+		if($accessop->check_controller_access('AddFile')) {
 			if ($document->getAccessMode($user) >= M_READWRITE){
 				print "<ul class=\"unstyled\"><li>".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."</li></ul>\n";
 			}

From d547fdd05bfa03ffa0adf5e414dff78d00c6a77c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:14:51 +0100
Subject: [PATCH 0919/2006] add changes for 6.0.3

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 603b3ee19..2bef733a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.3
 --------------------------------------------------------------------------------
+- add list of documents without a receiver on MyDocuments page
+- propperly calculate number of documents for each value of value set in attribute mgr
+- output of progress bar for reception of a document can be controlled by access list
+- receiver of a document version can be set when uploading the file
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.2

From e97c3a4b25d05999ccd6cc4f6eba134bf9494eb7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jan 2018 18:15:05 +0100
Subject: [PATCH 0920/2006] allow to set receiver when uploading a document

---
 controllers/class.AddDocument.php         | 17 ++++++
 controllers/class.UpdateDocument.php      | 16 +++++
 inc/inc.ClassSettings.php                 |  8 +++
 op/op.AddDocument.php                     | 32 +++++++++-
 op/op.CheckInDocument.php                 | 43 +++++++++++++
 op/op.Settings.php                        |  2 +
 op/op.UpdateDocument.php                  | 29 +++++++++
 out/out.CheckInDocument.php               |  1 +
 out/out.UpdateDocument.php                |  1 +
 views/bootstrap/class.AddDocument.php     | 74 ++++++++++++++++++++++-
 views/bootstrap/class.Bootstrap.php       |  2 +-
 views/bootstrap/class.CheckInDocument.php | 72 ++++++++++++++++++++++
 views/bootstrap/class.Settings.php        |  8 +++
 views/bootstrap/class.UpdateDocument.php  | 72 ++++++++++++++++++++++
 14 files changed, 374 insertions(+), 3 deletions(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 7ae2135a6..76c2d6ddb 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -53,6 +53,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 		$sequence = $this->getParam('sequence');
 		$reviewers = $this->getParam('reviewers');
 		$approvers = $this->getParam('approvers');
+		$recipients = $this->getParam('recipients');
 		$reqversion = $this->getParam('reqversion');
 		$version_comment = $this->getParam('versioncomment');
 		$attributes = $this->getParam('attributes');
@@ -88,6 +89,22 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 				}
 			}
 
+			$lc = $document->getLatestContent();
+			if($recipients['i']) {
+				foreach($recipients['i'] as $uid) {
+					if($u = $dms->getUser($uid)) {
+						$res = $lc->addIndRecipient($u, $user);
+					}
+				}
+			}
+			if($recipients['g']) {
+				foreach($recipients['g'] as $gid) {
+					if($g = $dms->getGroup($gid)) {
+						$res = $lc->addGrpRecipient($g, $user);
+					}
+				}
+			}
+
 			if($index) {
 				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
 				if(!$this->callHook('preIndexDocument', $document, $idoc)) {
diff --git a/controllers/class.UpdateDocument.php b/controllers/class.UpdateDocument.php
index b97ba2186..36dda66de 100644
--- a/controllers/class.UpdateDocument.php
+++ b/controllers/class.UpdateDocument.php
@@ -50,6 +50,7 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
 		$userfiletype = $this->getParam('userfiletype');
 		$reviewers = $this->getParam('reviewers');
 		$approvers = $this->getParam('approvers');
+		$recipients = $this->getParam('recipients');
 		$reqversion = $this->getParam('reqversion');
 		$comment = $this->getParam('comment');
 		$attributes = $this->getParam('attributes');
@@ -68,6 +69,21 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
 				}
 			}
 
+			if($recipients['i']) {
+				foreach($recipients['i'] as $uid) {
+					if($u = $dms->getUser($uid)) {
+						$res = $contentResult->getContent()->addIndRecipient($u, $user);
+					}
+				}
+			}
+			if($recipients['g']) {
+				foreach($recipients['g'] as $gid) {
+					if($g = $dms->getGroup($gid)) {
+						$res = $contentResult->getContent()->addGrpRecipient($g, $user);
+					}
+				}
+			}
+
 			if($index) {
 				$lucenesearch = new $indexconf['Search']($index);
 				if($hit = $lucenesearch->getDocument((int) $document->getId())) {
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index ca477792a..2a62d87ec 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -145,12 +145,16 @@ class Settings { /* {{{ */
 	var $_enableSelfRevApp = false;
 	// enable/disable update of a review/approval by the reviewer/approver
 	var $_enableUpdateRevApp = false;
+	// enable/disable listing logged in user as recipient
+	var $_enableSelfReceipt = false;
 	// enable/disable update of a receipt by the recipient
 	var $_enableUpdateReceipt = false;
 	// enable/disable listing administrator as recipient
 	var $_enableAdminReceipt = false;
 	// enable/disable listing owner as recipient
 	var $_enableOwnerReceipt = false;
+	// enable/disable filter for receipt by the recipient
+	var $_enableFilterReceipt = false;
 	// enable/disable default notification for owner
 	var $_enableOwnerNotification = false;
 	// enable/disable deleting of versions for regular users
@@ -629,9 +633,11 @@ class Settings { /* {{{ */
 		$this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]);
 		$this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]);
 		$this->_enableUpdateRevApp = Settings::boolval($tab["enableUpdateRevApp"]);
+		$this->_enableSelfReceipt = Settings::boolval($tab["enableSelfReceipt"]);
 		$this->_enableAdminReceipt = Settings::boolval($tab["enableAdminReceipt"]);
 		$this->_enableOwnerReceipt = Settings::boolval($tab["enableOwnerReceipt"]);
 		$this->_enableUpdateReceipt = Settings::boolval($tab["enableUpdateReceipt"]);
+		$this->_enableFilterReceipt = Settings::boolval($tab["enableFilterReceipt"]);
 		$this->_presetExpirationDate = strval($tab["presetExpirationDate"]);
 		$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]);
 		$this->_versioningFileName = strval($tab["versioningFileName"]);
@@ -941,9 +947,11 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp);
     $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp);
     $this->setXMLAttributValue($node, "enableUpdateRevApp", $this->_enableUpdateRevApp);
+    $this->setXMLAttributValue($node, "enableSelfReceipt", $this->_enableSelfReceipt);
     $this->setXMLAttributValue($node, "enableAdminReceipt", $this->_enableAdminReceipt);
     $this->setXMLAttributValue($node, "enableOwnerReceipt", $this->_enableOwnerReceipt);
     $this->setXMLAttributValue($node, "enableUpdateReceipt", $this->_enableUpdateReceipt);
+    $this->setXMLAttributValue($node, "enableFilterReceipt", $this->_enableFilterReceipt);
     $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate);
     $this->setXMLAttributValue($node, "initialDocumentStatus", $this->_initialDocumentStatus);
     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 900f97e2e..b2712175b 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -62,7 +62,8 @@ if($settings->_quota > 0) {
 	}
 }
 
-if($user->isAdmin()) {
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if ($accessop->check_controller_access($controller, array('action'=>'setOwner'))) {
 	$ownerid = (int) $_POST["ownerid"];
 	if($ownerid) {
 		if(!($owner = $dms->getUser($ownerid))) {
@@ -157,10 +158,13 @@ default:
 // Get the list of reviewers and approvers for this document.
 $reviewers = array();
 $approvers = array();
+$recipients = array();
 $reviewers["i"] = array();
 $reviewers["g"] = array();
 $approvers["i"] = array();
 $approvers["g"] = array();
+$recipients["i"] = array();
+$recipients["g"] = array();
 $workflow = null;
 
 if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
@@ -269,6 +273,31 @@ if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'tra
 	}
 }
 
+// Retrieve the list of individual recipients from the form.
+$recipients["i"] = array();
+if (isset($_POST["indRecipients"])) {
+	foreach ($_POST["indRecipients"] as $ind) {
+		$recipients["i"][] = $ind;
+	}
+}
+// Retrieve the list of recipient groups from the form.
+$recipients["g"] = array();
+if (isset($_POST["grpRecipients"])) {
+	foreach ($_POST["grpRecipients"] as $grp) {
+		$recipients["g"][] = $grp;
+	}
+}
+// Retrieve the list of recipient groups whose members become individual recipients
+if (isset($_POST["grpIndRecipients"])) {
+	foreach ($_POST["grpIndRecipients"] as $grp) {
+		if($group = $dms->getGroup($grp)) {
+			$members = $group->getUsers();
+			foreach($members as $member)
+				$recipients["i"][] = $member->getID();
+		}
+	}
+}
+
 $docsource = 'upload';
 
 if($settings->_dropFolderDir) {
@@ -410,6 +439,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	$controller->setParam('sequence', $sequence);
 	$controller->setParam('reviewers', $reviewers);
 	$controller->setParam('approvers', $approvers);
+	$controller->setParam('recipients', $recipients);
 	$controller->setParam('reqversion', $reqversion);
 	$controller->setParam('versioncomment', $version_comment);
 	$controller->setParam('attributes', $attributes);
diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 0b5b79914..8d23a9408 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -65,10 +65,13 @@ else
 	// Get the list of reviewers and approvers for this document.
 	$reviewers = array();
 	$approvers = array();
+	$recipients = array();
 	$reviewers["i"] = array();
 	$reviewers["g"] = array();
 	$approvers["i"] = array();
 	$approvers["g"] = array();
+	$recipients["i"] = array();
+	$recipients["g"] = array();
 	$workflow = null;
 
 	if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
@@ -173,6 +176,31 @@ else
 		}
 	}
 
+	// Retrieve the list of individual recipients from the form.
+	$recipients["i"] = array();
+	if (isset($_POST["indRecipients"])) {
+		foreach ($_POST["indRecipients"] as $ind) {
+			$recipients["i"][] = $ind;
+		}
+	}
+	// Retrieve the list of recipient groups from the form.
+	$recipients["g"] = array();
+	if (isset($_POST["grpRecipients"])) {
+		foreach ($_POST["grpRecipients"] as $grp) {
+			$recipients["g"][] = $grp;
+		}
+	}
+	// Retrieve the list of recipient groups whose members become individual recipients
+	if (isset($_POST["grpIndRecipients"])) {
+		foreach ($_POST["grpIndRecipients"] as $grp) {
+			if($group = $dms->getGroup($grp)) {
+				$members = $group->getUsers();
+				foreach($members as $member)
+					$recipients["i"][] = $member->getID();
+			}
+		}
+	}
+
 	if(isset($_POST["attributes"]) && $_POST["attributes"]) {
 		$attributes = $_POST["attributes"];
 		foreach($attributes as $attrdefid=>$attribute) {
@@ -316,6 +344,21 @@ else
 			}
 		}
 
+		if($recipients['i']) {
+			foreach($recipients['i'] as $uid) {
+				if($u = $dms->getUser($uid)) {
+					$res = $contentResult->getContent()->addIndRecipient($u, $user);
+				}
+			}
+		}
+		if($recipients['g']) {
+			foreach($recipients['g'] as $gid) {
+				if($g = $dms->getGroup($gid)) {
+					$res = $contentResult->getContent()->addGrpRecipient($g, $user);
+				}
+			}
+		}
+
 		$expires = false;
 		if (!isset($_POST['expires']) || $_POST["expires"] != "false") {
 			if($_POST["expdate"]) {
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 6bc460dc6..e0687edbb 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -182,10 +182,12 @@ if ($action == "saveSettings")
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
   $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp");
+  $settings->_enableSelfReceipt = getBoolValue("enableSelfReceipt");
   $settings->_enableUpdateRevApp = getBoolValue("enableUpdateRevApp");
   $settings->_enableAdminReceipt = getBoolValue("enableAdminReceipt");
   $settings->_enableOwnerReceipt = getBoolValue("enableOwnerReceipt");
   $settings->_enableUpdateReceipt = getBoolValue("enableUpdateReceipt");
+  $settings->_enableFilterReceipt = getBoolValue("enableFilterReceipt");
   $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion");
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 6744ecdf4..c1bd55759 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -169,10 +169,13 @@ default:
 	// Get the list of reviewers and approvers for this document.
 	$reviewers = array();
 	$approvers = array();
+	$recipients = array();
 	$reviewers["i"] = array();
 	$reviewers["g"] = array();
 	$approvers["i"] = array();
 	$approvers["g"] = array();
+	$recipients["i"] = array();
+	$recipients["g"] = array();
 	$workflow = null;
 
 	if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
@@ -285,6 +288,31 @@ default:
 		}
 	}
 
+	// Retrieve the list of individual recipients from the form.
+	$recipients["i"] = array();
+	if (isset($_POST["indRecipients"])) {
+		foreach ($_POST["indRecipients"] as $ind) {
+			$recipients["i"][] = $ind;
+		}
+	}
+	// Retrieve the list of recipient groups from the form.
+	$recipients["g"] = array();
+	if (isset($_POST["grpRecipients"])) {
+		foreach ($_POST["grpRecipients"] as $grp) {
+			$recipients["g"][] = $grp;
+		}
+	}
+	// Retrieve the list of recipient groups whose members become individual recipients
+	if (isset($_POST["grpIndRecipients"])) {
+		foreach ($_POST["grpIndRecipients"] as $grp) {
+			if($group = $dms->getGroup($grp)) {
+				$members = $group->getUsers();
+				foreach($members as $member)
+					$recipients["i"][] = $member->getID();
+			}
+		}
+	}
+
 	if(isset($_POST["attributes_version"]) && $_POST["attributes_version"]) {
 		$attributes = $_POST["attributes_version"];
 		foreach($attributes as $attrdefid=>$attribute) {
@@ -315,6 +343,7 @@ default:
 	$controller->setParam('userfiletype', $userfiletype);
 	$controller->setParam('reviewers', $reviewers);
 	$controller->setParam('approvers', $approvers);
+	$controller->setParam('recipients', $recipients);
 	$controller->setParam('attributes', $attributes);
 	$controller->setParam('workflow', $workflow);
 	$controller->setParam('initialdocumentstatus', $settings->_initialDocumentStatus);
diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index 34d456102..a33ee214d 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -72,6 +72,7 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enableselfrec', $settings->_enableSelfReceipt);
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('presetexpiration', $settings->_presetExpirationDate);
diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php
index 0b9c6d5d9..1a300a211 100644
--- a/out/out.UpdateDocument.php
+++ b/out/out.UpdateDocument.php
@@ -71,6 +71,7 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('presetexpiration', $settings->_presetExpirationDate);
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 3367b5e63..c67683c1b 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -169,6 +169,7 @@ $(document).ready(function() {
 		$sortusersinlist = $this->params['sortusersinlist'];
 		$orderby = $this->params['orderby'];
 		$folderid = $folder->getId();
+		$accessop = $this->params['accessobject'];
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js');
 		if($enablelargefileupload) {
@@ -261,7 +262,8 @@ $(document).ready(function() {
 			</td>
 		</tr>
 
-<?php if($user->isAdmin()) { ?>
+<?php //if($user->isAdmin()) { ?>
+<?php if ($accessop->check_controller_access('AddDocument', array('action'=>'setOwner'))) { ?>
 		<tr>
 			<td><?php printMLText("owner");?>:</td>
 			<td>
@@ -695,6 +697,76 @@ $(document).ready(function() {
 <?php
 		}
 ?>
+		<tr>
+			<td colspan="2">
+				<?php $this->contentSubHeading(getMLText("assign_recipents")); ?>
+      </td>
+    </tr>
+    <tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
+      </td>
+			<td>
+        <select id="IndRecipient" class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+				foreach ($docAccess["users"] as $usr) {
+					if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue; 
+					print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
+				}
+?>
+				</select>
+<?php
+				$tmp = array();
+				foreach($receiptStatus as $r) {
+					if($r['type'] == 0) {
+						$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->printSelectPresetButtonHtml("IndRecipient", $tmp);
+				}
+?>
+      </td>
+    </tr>
+      <tr>
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+        <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+			</td>
+			</tr>
+    <tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
+      </td>
+      <td>
+        <select id="GrpRecipient" class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+<?php
+				foreach ($docAccess["groups"] as $grp) {
+					print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+				}
+?>
+			</select>
+<?php
+				$tmp = array();
+				foreach($receiptStatus as $r) {
+					if($r['type'] == 1) {
+						$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp);
+				}
+?>
+      </td>
+		</tr>
 		  <tr>	
         <td>
 		<?php $this->contentSubHeading(getMLText("add_document_notify")); ?>
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index d88ed08fd..a4e657327 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2112,7 +2112,7 @@ $(document).ready( function() {
 			} else {
 				$content .= getOverallStatusText($status["status"]);
 			}
-			if($owner->getID() == $user->getID() && $receiptStatus = $latestContent->getReceiptStatus()) {
+			if($accessop->check_view_access($this, array('action'=>'receptionBar')) /*$owner->getID() == $user->getID()*/ && $receiptStatus = $latestContent->getReceiptStatus()) {
 				$rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0);
 				$allcomments = array('-1'=>array(), '1'=>array());
 				foreach ($receiptStatus as $r) {
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 82696db10..43beb2b9a 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -82,6 +82,7 @@ $(document).ready(function() {
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
+		$enableselfreceipt = $this->params['enableselfreceipt'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$workflowmode = $this->params['workflowmode'];
 		$presetexpiration = $this->params['presetexpiration'];
@@ -142,6 +143,7 @@ $(document).ready(function() {
 		$latestContent = $document->getLatestContent();
 		$reviewStatus = $latestContent->getReviewStatus();
 		$approvalStatus = $latestContent->getApprovalStatus();
+		$receiptStatus = $latestContent->getReceiptStatus();
 		if($workflowmode == 'advanced') {
 			if($status = $latestContent->getStatus()) {
 				if($status["status"] == S_IN_WORKFLOW) {
@@ -568,6 +570,76 @@ $(document).ready(function() {
 <?php
 	}
 ?>
+		<tr>
+			<td colspan="2">
+				<?php $this->contentSubHeading(getMLText("assign_recipents")); ?>
+      </td>
+    </tr>
+    <tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
+      </td>
+			<td>
+        <select id="IndRecipient" class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+				foreach ($docAccess["users"] as $usr) {
+					if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue; 
+					print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
+				}
+?>
+				</select>
+<?php
+				$tmp = array();
+				foreach($receiptStatus as $r) {
+					if($r['type'] == 0) {
+						$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->printSelectPresetButtonHtml("IndRecipient", $tmp);
+				}
+?>
+      </td>
+    </tr>
+      <tr>
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+        <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+			</td>
+			</tr>
+    <tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
+      </td>
+      <td>
+        <select id="GrpRecipient" class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+<?php
+				foreach ($docAccess["groups"] as $grp) {
+					print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+				}
+?>
+			</select>
+<?php
+				$tmp = array();
+				foreach($receiptStatus as $r) {
+					if($r['type'] == 1) {
+						$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp);
+				}
+?>
+      </td>
+		</tr>
 		<tr>
 			<td></td>
 			<td><input type="submit" class="btn" value="<?php printMLText("checkin_document")?>"></td>
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 8102d82ef..6711e4af2 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -703,6 +703,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableUpdateRevApp");?>:</td>
         <td><input name="enableUpdateRevApp" type="checkbox" <?php if ($settings->_enableUpdateRevApp) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableSelfReceipt_desc");?>">
+        <td><?php printMLText("settings_enableSelfReceipt");?>:</td>
+        <td><input name="enableSelfReceipt" type="checkbox" <?php if ($settings->_enableSelfReceipt) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableAdminReceipt_desc");?>">
         <td><?php printMLText("settings_enableAdminReceipt");?>:</td>
         <td><input name="enableAdminReceipt" type="checkbox" <?php if ($settings->_enableAdminReceipt) echo "checked" ?> /></td>
@@ -715,6 +719,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableUpdateReceipt");?>:</td>
         <td><input name="enableUpdateReceipt" type="checkbox" <?php if ($settings->_enableUpdateReceipt) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableFilterReceipt_desc");?>">
+        <td><?php printMLText("settings_enableFilterReceipt");?>:</td>
+        <td><input name="enableFilterReceipt" type="checkbox" <?php if ($settings->_enableFilterReceipt) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableVersionDeletion_desc");?>">
         <td><?php printMLText("settings_enableVersionDeletion");?>:</td>
         <td><input name="enableVersionDeletion" type="checkbox" <?php if ($settings->_enableVersionDeletion) echo "checked" ?> /></td>
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 0af727a01..60576922e 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -146,6 +146,7 @@ console.log(element);
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
+		$enableselfreceipt = $this->params['enableselfreceipt'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$workflowmode = $this->params['workflowmode'];
 		$presetexpiration = $this->params['presetexpiration'];
@@ -189,6 +190,7 @@ console.log(element);
 
 		$latestContent = $document->getLatestContent();
 		$reviewStatus = $latestContent->getReviewStatus();
+		$receiptStatus = $latestContent->getReceiptStatus();
 		$approvalStatus = $latestContent->getApprovalStatus();
 		if($workflowmode == 'advanced') {
 			if($status = $latestContent->getStatus()) {
@@ -715,6 +717,76 @@ console.log(element);
 <?php
 	}
 ?>
+		<tr>
+			<td colspan="2">
+				<?php $this->contentSubHeading(getMLText("assign_recipents")); ?>
+      </td>
+    </tr>
+    <tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
+      </td>
+			<td>
+        <select id="IndRecipient" class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<?php
+				foreach ($docAccess["users"] as $usr) {
+					if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue; 
+					print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
+				}
+?>
+				</select>
+<?php
+				$tmp = array();
+				foreach($receiptStatus as $r) {
+					if($r['type'] == 0) {
+						$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->printSelectPresetButtonHtml("IndRecipient", $tmp);
+				}
+?>
+      </td>
+    </tr>
+      <tr>
+        <td>
+			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+        </td>
+        <td>
+        <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>">
+<?php
+			foreach ($docAccess["groups"] as $grp) {
+				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			}
+?>
+			</select>
+			</td>
+			</tr>
+    <tr>
+      <td>
+				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
+      </td>
+      <td>
+        <select id="GrpRecipient" class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
+<?php
+				foreach ($docAccess["groups"] as $grp) {
+					print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+				}
+?>
+			</select>
+<?php
+				$tmp = array();
+				foreach($receiptStatus as $r) {
+					if($r['type'] == 1) {
+						$tmp[] = $r['required'];
+					}
+				}
+				if($tmp) {
+					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp);
+				}
+?>
+      </td>
+		</tr>
 		<tr>
 			<td></td>
 			<td><input type="submit" class="btn" value="<?php printMLText("update_document")?>"></td>

From 4b8fad4605e2d5d0ca0eeac7be1fbe7bf251286c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 17:27:31 +0100
Subject: [PATCH 0921/2006] set propper date in timeline for scheduled
 revisions

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index c5e9bf660..f60c534b3 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2842,8 +2842,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 
 		foreach ($resArr as $row) {
-			if($row['revisiondate'])
-				$timeline[] = array('date'=>substr($row['revisiondate'], 0, 10), 'allday'=>true, 'msg'=>'Scheduled revision of version '.$row['version'], 'type'=>'scheduled_revesion', 'version'=>$row['version'], 'document'=>$this, 'params'=>array($row['version']));
+			if($row['revisiondate'] && substr($row['revisiondate'], 0, 4) != '0000')
+				$timeline[] = array('date'=>substr($row['revisiondate'], 0, 10)." 00:00:00", 'allday'=>true, 'msg'=>'Scheduled revision of version '.$row['version'], 'type'=>'scheduled_revision', 'version'=>$row['version'], 'document'=>$this, 'params'=>array($row['version']));
 		}
 
 		$queryStr = "SELECT * FROM `tblDocumentFiles` WHERE `document` = " . $this->_id;

From b3c000de451fb6961ca40ffbe82c86ccd9fd58fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 17:28:30 +0100
Subject: [PATCH 0922/2006] use sendfile() instead of readfile()

---
 controllers/class.Download.php | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index 8cda3a36a..9d2da85a3 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -35,7 +35,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 				header("Content-Type: " . $content->getMimeType());
 				header("Cache-Control: must-revalidate");
 
-				readfile($dms->contentDir . $content->getPath());
+				sendFile($dms->contentDir . $content->getPath());
 			}
 		}
 	} /* }}} */
@@ -46,17 +46,13 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 
 		if(null === $this->callHook('file')) {
 			if(file_exists($dms->contentDir . $file->getPath())) {
-				header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
 				header("Content-Transfer-Encoding: binary");
 				header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));
 				header("Content-Disposition: attachment; filename=\"" . $file->getOriginalFileName() . "\"");
-				//header("Expires: 0");
 				header("Content-Type: " . $file->getMimeType());
-				//header("Cache-Control: no-cache, must-revalidate");
 				header("Cache-Control: must-revalidate");
-				//header("Pragma: no-cache");
 
-				readfile($dms->contentDir . $file->getPath());
+				sendFile($dms->contentDir . $file->getPath());
 			}
 		}
 	} /* }}} */
@@ -76,8 +72,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 				header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
 				header("Cache-Control: public");
 				
-				ob_clean();
-				readfile($basedir .$filename );
+				sendFile($basedir .$filename );
 			}
 		}
 	} /* }}} */
@@ -96,8 +91,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 				header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
 				header("Cache-Control: must-revalidate");
 
-				ob_clean();
-				readfile($basedir.$filename);
+				sendFile($basedir.$filename);
 			}
 		}
 	} /* }}} */
@@ -109,15 +103,14 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 
 		if(null === $this->callHook('sqldump')) {
 			if(file_exists($basedir . $filename)) {
-				header("Content-Type: application/zip; name=\"" . $filename . "\"");
+				header("Content-Type: application/zip");
 				header("Content-Transfer-Encoding: binary");
 				header("Content-Length: " . filesize($basedir . $filename ));
 				$efilename = rawurlencode($filename);
 				header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
 				header("Cache-Control: must-revalidate");
 				
-				ob_clean();
-				readfile($basedir.$filename);
+				sendFile($basedir.$filename);
 			}
 		}
 	} /* }}} */
@@ -137,12 +130,12 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			$mimetype = finfo_file($finfo, $filename);
 
-			header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+			header("Content-Type: ".$mimetype);
 			header("Content-Transfer-Encoding: binary");
 			header("Content-Length: " . filesize($filename ));
 			header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
 			header("Cache-Control: must-revalidate");
-			readfile($filename);
+			sendFile($filename);
 		}
 	} /* }}} */
 
@@ -161,12 +154,12 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			$mimetype = finfo_file($finfo, $filename);
 
-			header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+			header("Content-Type: ".$mimetype);
 			header("Content-Transfer-Encoding: binary");
 			header("Content-Length: " . filesize($filename ));
 			header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
 			header("Cache-Control: must-revalidate");
-			readfile($filename);
+			sendFile($filename);
 		}
 		return true;
 	} /* }}} */

From 3502ce5de7c75c05540270f027a095a3df151e77 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 17:29:10 +0100
Subject: [PATCH 0923/2006] show scheduled revisions in timeline

---
 views/bootstrap/class.Timeline.php     | 3 +++
 views/bootstrap/class.ViewDocument.php | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 6b1d9fd13..6c3e37322 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -91,6 +91,9 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
 				case 'status_change':
 					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
 					break;
+				case 'scheduled_revision':
+					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					break;
 				default:
 					$msg = '???';
 				}
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 0870d208e..679826afb 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -160,6 +160,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				case 'status_change':
 					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
 					break;
+				case 'scheduled_revision':
+					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					break;
 				default:
 					$msg = '???';
 				}
@@ -1775,6 +1778,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($user->isAdmin()) {
 			$timeline = $document->getTimeline();
 			if($timeline) {
+				/*
 				$this->contentHeading(getMLText("timeline"));
 				foreach($timeline as &$item) {
 					switch($item['type']) {
@@ -1794,6 +1798,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					}
 					$item['msg'] = $msg;
 				}
+				 */
 //				$this->printTimeline('out.ViewDocument.php?action=timelinedata&documentid='.$document->getID(), 300, '', date('Y-m-d'));
 				$this->printTimelineHtml(300);
 			}

From 3dda280ef8756e29069dd84deeffacf74065f602 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Jan 2018 17:32:38 +0100
Subject: [PATCH 0924/2006] add scheduled revision to skip list

---
 views/bootstrap/class.Timeline.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 6c3e37322..11295434e 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -255,6 +255,7 @@ div.timeline-event-selected {
 		<label class="control-label" for="skip"><?php printMLText('exclude_items') ?></label>
 		<div class="controls">
 			<input type="checkbox" name="skip[]" value="add_file" <?php echo ($skip &&  in_array('add_file', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_add_file') ?><br />
+			<input type="checkbox" name="skip[]" value="scheduled_revision" <?php echo ($skip &&  in_array('scheduled_revision', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_scheduled_revision') ?><br />
 			<input type="checkbox" name="skip[]" value="status_change_0" <?php echo ($skip && in_array('status_change_0', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_0') ?><br />
 			<input type="checkbox" name="skip[]" value="status_change_1" <?php echo ($skip && in_array('status_change_1', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_1') ?><br />
 			<input type="checkbox" name="skip[]" value="status_change_2" <?php echo ($skip && in_array('status_change_2', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_2') ?><br />

From b8632046b7b0cd2a8f485e409904c672aeab5d7b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 21 Jan 2018 13:58:49 +0100
Subject: [PATCH 0925/2006] fix some phrases

---
 views/bootstrap/class.AddDocument.php     | 2 +-
 views/bootstrap/class.CheckInDocument.php | 2 +-
 views/bootstrap/class.MyDocuments.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index c67683c1b..da18fce2d 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -699,7 +699,7 @@ $(document).ready(function() {
 ?>
 		<tr>
 			<td colspan="2">
-				<?php $this->contentSubHeading(getMLText("assign_recipents")); ?>
+				<?php $this->contentSubHeading(getMLText("assign_recipients")); ?>
       </td>
     </tr>
     <tr>
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 43beb2b9a..49380a4f2 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -572,7 +572,7 @@ $(document).ready(function() {
 ?>
 		<tr>
 			<td colspan="2">
-				<?php $this->contentSubHeading(getMLText("assign_recipents")); ?>
+				<?php $this->contentSubHeading(getMLText("assign_recipients")); ?>
       </td>
     </tr>
     <tr>
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index ce761883f..de74dc8bb 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -264,7 +264,7 @@ $(document).ready( function() {
 			exit;
 		}
 
-		$this->contentHeading(getMLText("documents_user_reception"));
+		$this->contentHeading(getMLText("documents_user_no_reception"));
 		if($resArr) {
 			$this->printList($resArr, $previewer, 'listNoReceiveOwner');
 		}

From 81b8d2ae1b63233ab44549ace18091a39a1a697b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 16:42:25 +0100
Subject: [PATCH 0926/2006] export always returns all items, fix display of
 2nd, 3rd, ... page

---
 out/out.Search.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index dc964afb9..ce3977be7 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -379,11 +379,13 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 
 	$entries = array();
 	$fcount = 0;
-	if($resArr['folders']) {
-		foreach ($resArr['folders'] as $entry) {
-			if ($entry->getAccessMode($user) >= M_READ) {
-				$entries[] = $entry;
-				$fcount++;
+	if(!isset($_GET['action']) || $_GET['action'] != 'export') {
+		if($resArr['folders']) {
+			foreach ($resArr['folders'] as $entry) {
+				if ($entry->getAccessMode($user) >= M_READ) {
+					$entries[] = $entry;
+					$fcount++;
+				}
 			}
 		}
 	}
@@ -399,13 +401,13 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 			}
 		}
 	}
-	if (!isset($_GET["pg"]) || strcasecmp($_GET["pg"], "all")) {
+	$totalPages = 1;
+	if ((!isset($_GET['action']) || $_GET['action'] != 'export') && (!isset($_GET["pg"]) || strcasecmp($_GET["pg"], "all"))) {
 		$totalPages = (int) (count($entries)/$limit);
 		if(count($entries)%$limit)
 			$totalPages++;
-		$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
-	} else
-		$totalPages = 1;
+//		$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
+	}
 // }}}
 }
 

From cde0f066ad2f73e6574cb6c987ebf543ea56ebb4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 16:46:10 +0100
Subject: [PATCH 0927/2006] slice entries before view

---
 out/out.Search.php               | 2 +-
 views/bootstrap/class.Search.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index ce3977be7..85438aab6 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -406,7 +406,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 		$totalPages = (int) (count($entries)/$limit);
 		if(count($entries)%$limit)
 			$totalPages++;
-//		$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
+		$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
 	}
 // }}}
 }
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 2e7026a32..8512bc411 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -160,8 +160,8 @@ $(document).ready( function() {
 			}
 		}
 
-		if ($pageNumber != 'all')
-			$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
+//		if ($pageNumber != 'all')
+//			$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 

From e35b732d801f35948a0e5b4642692e8b43c35098 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 16:47:04 +0100
Subject: [PATCH 0928/2006] add items for 6.0.4

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 4cae5e19a..68c4f3c5a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.4
+--------------------------------------------------------------------------------
+- fix export of search and display of 2nd, 3rd, ... search page
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.3
 --------------------------------------------------------------------------------

From 4dfade96f7135d4e2e91ada36feb58871a544d4b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Jan 2018 20:50:44 +0100
Subject: [PATCH 0929/2006] check if $files are given to filterFiles()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index a9cf1be5c..0e9dd4d24 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -405,9 +405,11 @@ class SeedDMS_Core_DMS {
 	 */
 	static function filterDocumentFiles($user, $files) { /* {{{ */
 		$tmp = array();
-		foreach ($files as $file)
-			if ($file->isPublic() || ($file->getUser()->getID() == $user->getID()) || $user->isAdmin() || ($file->getDocument()->getOwner()->getID() == $user->getID()))
-				array_push($tmp, $file);
+		if($files) {
+			foreach ($files as $file)
+				if ($file->isPublic() || ($file->getUser()->getID() == $user->getID()) || $user->isAdmin() || ($file->getDocument()->getOwner()->getID() == $user->getID()))
+					array_push($tmp, $file);
+		}
 		return $tmp;
 	} /* }}} */
 

From cbf7f1a161da3947732b538082a1f2c72232cd99 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jan 2018 09:01:35 +0100
Subject: [PATCH 0930/2006] list of documents without receivers on lists
 released documents

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 0e9dd4d24..a21764a33 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1480,7 +1480,8 @@ class SeedDMS_Core_DMS {
 
 			if ($docs) {
 				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
-				$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."'";
+				$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+					"AND `tblDocumentStatusLog`.`status` IN (".S_RELEASED.") ";
 				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
 				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";

From 85a3041b9bb0edc5860d6d2042f0964a060c9cd3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 28 Jan 2018 07:48:29 +0100
Subject: [PATCH 0931/2006] add lists of drafts and obsolete docs in
 getDocumentList()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index a21764a33..23a394f16 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1576,6 +1576,42 @@ class SeedDMS_Core_DMS {
 			else $queryStr .= "ORDER BY `name`";
 			$queryStr .= " ".$orderdir;
 			break; // }}}
+		case 'ObsoleteOwner': // Documents that are obsolete and I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
+			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_OBSOLETE.") ";
+			//$queryStr .= "ORDER BY `statusDate` DESC";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			break; // }}}
+		case 'DraftOwner': // Documents in draft status and I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
+			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT.") ";
+			//$queryStr .= "ORDER BY `statusDate` DESC";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			break; // }}}
 		case 'WorkflowOwner': // Documents waiting for workflow trigger I'm owning {{{
 			$queryStr .= "WHERE 1=1 ";
 

From d2a0c08633b3a5b69627990781a7f36d2cc5ef59 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 28 Jan 2018 07:49:46 +0100
Subject: [PATCH 0932/2006] allow to set revisors and recipients with
 M_READWRITE access

previously M_ALL was needed
---
 inc/inc.ClassAccessOperation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index d47e51b87..f22975d7a 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -165,7 +165,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED)) {
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED)) {
 					return true;
 				}
 			}
@@ -186,7 +186,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
 					return true;
 				}
 			}

From c768a9150b6c6f0cc39f448c8b28f13fdfb7ff0e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 28 Jan 2018 07:50:38 +0100
Subject: [PATCH 0933/2006] add lists of draft and obsolete documents

---
 views/bootstrap/class.MyDocuments.php | 64 +++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index de74dc8bb..64d5dfb25 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -556,6 +556,66 @@ $(document).ready( function() {
 
 	} /* }}} */
 
+	function listObsoleteOwner() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of obsolete documents and owned by current user */
+		$resArr = $dms->getDocumentList('ObsoleteOwner', $user, false, $orderby, $orderdir);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("documents_user_obsolete"));
+		if ($resArr) {
+			$this->printList($resArr, $previewer, 'listObsoleteOwner');
+		}
+		else printMLText("no_docs_obsolete");
+
+	} /* }}} */
+
+	function listDraftOwner() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of draft documents and owned by current user */
+		$resArr = $dms->getDocumentList('DraftOwner', $user, false, $orderby, $orderdir);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("documents_user_draft"));
+		if ($resArr) {
+			$this->printList($resArr, $previewer, 'listDraftOwner');
+		}
+		else printMLText("no_docs_draft");
+
+	} /* }}} */
+
 	function listCheckedoutDocs() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -616,6 +676,8 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_user_reception" data-action="listReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_reception").'</a></li>';
 		$resArr = $dms->getDocumentList('NoReceiveOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_no_reception" data-action="listNoReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_no_reception").'</a></li>';
+		$resArr = $dms->getDocumentList('DraftOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_draft" data-action="listDraftOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_draft").'</a></li>';
 		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
@@ -624,6 +686,8 @@ $(document).ready( function() {
 		}
 		$resArr = $dms->getDocumentList('ExpiredOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
+		$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_obsolete" data-action="listObsoleteOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_obsolete").'</a></li>';
 		echo '</ul>';
 		$this->contentHeading(getMLText("tasks"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';

From a8fad905a0b09d7ebc76db7a3d24015fbfe64005 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 28 Jan 2018 07:54:36 +0100
Subject: [PATCH 0934/2006] add note for 6.0.3

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 58ae7046a..04356fd25 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -27,6 +27,7 @@
 pass 0 as default to getObjects()
 SeedDMS_Core_AttributeDefinition::getStatistics() returns propper values for each item in a value set
 SeedDMS_Core_DMS::getDocumentList() returns list of documents without a receiver
+add lists of drafts and obsolete docs in SeedDMS_Core_DMS::getDocumentList()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 093a1fa844ce80b4850868795453b59c14f0c29e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Jan 2018 11:39:53 +0100
Subject: [PATCH 0935/2006] get text for new staus S_NEEDS_KORRECTION

---
 inc/inc.Language.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index d2383e300..9f5c2d92e 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -228,6 +228,9 @@ function getRevisionStatusText($status, $date=0) { /* {{{ */
 			case 1:
 				return getMLText("status_revised").($date !=0 ? " ".$date : "");
 				break;
+			case 6:
+				return getMLText("status_needs_correction").($date !=0 ? " ".$date : "");
+				break;
 			default:
 				return getMLText("status_unknown");
 				break;
@@ -322,6 +325,9 @@ function getOverallStatusText($status) { /* {{{ */
 			case S_DRAFT:
 				return getMLText("draft");
 				break;
+			case S_NEEDS_CORRECTION:
+				return getMLText("needs_correction");
+				break;
 			default:
 				return getMLText("status_unknown");
 				break;

From 8931759f840489bb4739511d94d96630729e8bee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Jan 2018 11:40:25 +0100
Subject: [PATCH 0936/2006] new status S_NEEDS_CORRECTION

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index f60c534b3..f435e2d89 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -54,6 +54,13 @@ define("S_IN_REVISION",  4);
  */
 define("S_DRAFT",  5);
 
+/*
+ * Document needs correction after revision. This needs to be different from
+ * the regular S_REJECTED because documents which has been rejected
+ * in revision are not necessarily invalid but just needs correction.
+ */
+define("S_NEEDS_CORRECTION",  6);
+
 /*
  * Document was rejected. A document is in rejected state when
  * the review failed or approval was not given.

From da82cbe8da481a90aa5ee99282b7a1416186ff13 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Jan 2018 11:41:00 +0100
Subject: [PATCH 0937/2006] status can also be set to 6 (needs correction)

---
 views/bootstrap/class.ReviseDocument.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index ba87582d5..3435c8630 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -142,6 +142,9 @@ $(document).ready(function() {
 <?php if($revisionStatus['status'] != 1) { ?>
 					<option value='1'><?php printMLText("status_revised")?></option>
 <?php } ?>
+<?php if($revisionStatus['status'] != 6) { ?>
+					<option value='6'><?php printMLText("status_needs_correction")?></option>
+<?php } ?>
 <?php if($revisionStatus['status'] != -1) { ?>
 					<option value='-1'><?php printMLText("rejected")?></option>
 <?php } ?>
@@ -188,10 +191,13 @@ $(document).ready(function() {
 		<tr>
 			<td><?php printMLText("revision_status")?>:</td>
 			<td>
-				<select name="revisionStatus">
+				<select name="revisionStatus" size="3">
 <?php if($revisionStatus['status'] != 1) { ?>
 					<option value='1'><?php printMLText("status_revised")?></option>
 <?php } ?>
+<?php if($revisionStatus['status'] != 6) { ?>
+					<option value='6'><?php printMLText("status_needs_correction")?></option>
+<?php } ?>
 <?php if($revisionStatus['status'] != -1) { ?>
 					<option value='-1'><?php printMLText("rejected")?></option>
 <?php } ?>

From 593ba16c2df63ba01ae57bdf4acf6294d1578416 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 29 Jan 2018 11:41:40 +0100
Subject: [PATCH 0938/2006] status may also be 6 (needs correction)

---
 op/op.ReviseDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index cd7c65e18..f3b99fe6c 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -82,7 +82,7 @@ if (!$accessop->mayRevise($document)){
 }
 
 if (!isset($_POST["revisionStatus"]) || !is_numeric($_POST["revisionStatus"]) ||
-		(intval($_POST["revisionStatus"])!=1 && intval($_POST["revisionStatus"])!=-1)) {
+		(!in_array(intval($_POST["revisionStatus"]), array(1, -1, 6)))) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_revision_status"));
 }
 

From dc198e383bfdefd5f3782116e6b3eb7449d05dde Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 06:39:38 +0100
Subject: [PATCH 0939/2006] fix typo3 in translation key

---
 views/bootstrap/class.UpdateDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 60576922e..3cf3c0ac2 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -719,7 +719,7 @@ console.log(element);
 ?>
 		<tr>
 			<td colspan="2">
-				<?php $this->contentSubHeading(getMLText("assign_recipents")); ?>
+				<?php $this->contentSubHeading(getMLText("assign_recipients")); ?>
       </td>
     </tr>
     <tr>

From 408c60bc15490f3630dc250027dc08420e0c9dc6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 07:20:23 +0100
Subject: [PATCH 0940/2006] minor corrections of form

---
 views/bootstrap/class.ReviseDocument.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 3435c8630..75061a4ba 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -125,7 +125,7 @@ $(document).ready(function() {
 				print "<td>".htmlspecialchars($revisionStatus["comment"])."</td>";
 				$indUser = $dms->getUser($revisionStatus["userID"]);
 				print "<td>".$revisionStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
-				print "</tr></tbody></table><br>";
+				print "</tr></tbody></table><br>\n";
 			}
 ?>
 	<form method="post" action="../op/op.ReviseDocument.php" id="form1" name="form1">
@@ -136,7 +136,7 @@ $(document).ready(function() {
 			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
 		</tr>
 		<tr>
-			<td><?php printMLText("revision_status")?></td>
+			<td><?php printMLText("revision_status")?>:</td>
 			<td>
 				<select name="revisionStatus">
 <?php if($revisionStatus['status'] != 1) { ?>
@@ -161,9 +161,7 @@ $(document).ready(function() {
 	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 	</form>
 <?php
-		}
-		else if ($revisionStatus['type'] == 1) {
-
+		} elseif ($revisionStatus['type'] == 1) {
 			if($revisionStatus["status"]!=0) {
 
 				print "<table class=\"folderView\"><thead><tr>";
@@ -179,7 +177,6 @@ $(document).ready(function() {
 				print "<td>".$revisionStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
 				print "</tr></tbody></table><br>\n";
 			}
-
 ?>
 	<form method="post" action="../op/op.ReviseDocument.php" id="form2" name="form2">
 	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
@@ -191,7 +188,7 @@ $(document).ready(function() {
 		<tr>
 			<td><?php printMLText("revision_status")?>:</td>
 			<td>
-				<select name="revisionStatus" size="3">
+				<select name="revisionStatus">
 <?php if($revisionStatus['status'] != 1) { ?>
 					<option value='1'><?php printMLText("status_revised")?></option>
 <?php } ?>

From 7eb76b4c9933a0566164ab31b785dc7839d26c2c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 08:08:21 +0100
Subject: [PATCH 0941/2006] fix syntax error introduced by merging

---
 views/bootstrap/class.ViewDocument.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 15c9d84ae..c4a666447 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1669,7 +1669,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<form action=\"../op/op.RemoveDocumentLink.php\" method=\"post\">".createHiddenFieldWithKey('removedocumentlink')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"linkid\" value=\"".$link->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";
 				print "</tr>";
-				}
 			}
 			print "</tbody>\n</table>\n";
 		}

From 83e960fe037868175e0787404f8882acbdce469c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:16:05 +0100
Subject: [PATCH 0942/2006] check if file is actually accessible

---
 views/bootstrap/class.DropFolderChooser.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index 2c9243064..db67e59d3 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -78,14 +78,16 @@ $('.folderselect').click(function(ev) {
 						if($showfolders == 0 && !is_dir($dir.'/'.$entry)) {
 							$c++;
 							$mimetype = finfo_file($finfo, $dir.'/'.$entry);
-							$filecontent .= "<li><a".($folderid ? " href=\"../out/out.AddDocument.php?folderid=".$folderid."&dropfolderfileform1=".urldecode($entry)."\" title=\"".getMLText('menu_upload_from_dropfolder')."\"" : "").">";
-							if($previewwidth) {
-								$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
-								if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-									$filecontent .= "<div style=\"float: left; display:inline; width:40px; max-height:40px;overflow:hidden;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
+							if(file_exists($dir.'/'.$entry)) {
+								$filecontent .= "<li><a".($folderid ? " href=\"../out/out.AddDocument.php?folderid=".$folderid."&dropfolderfileform1=".urldecode($entry)."\" title=\"".getMLText('menu_upload_from_dropfolder')."\"" : "").">";
+								if($previewwidth) {
+									$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
+									if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
+										$filecontent .= "<div style=\"float: left; display:inline; width:40px; max-height:40px;overflow:hidden;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
+									}
 								}
+								$filecontent .= "<div style=\"margin-left:10px; margin-right: 40px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";
 							}
-							$filecontent .= "<div style=\"margin-left:10px; margin-right: 40px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";
 						} elseif($showfolders && is_dir($dir.'/'.$entry)) {
 							$filecontent .= "<li><a _href=\"\">".$entry."</a></li>";
 						}

From 4fa0efa07d666e92ed493347ebc2ff3c88657ff1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:16:34 +0100
Subject: [PATCH 0943/2006] use one form for ind and grp recipients

---
 views/bootstrap/class.ReceiptDocument.php | 104 ++++++----------------
 1 file changed, 28 insertions(+), 76 deletions(-)

diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index 7b15b77ed..46ccdc353 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -37,8 +37,8 @@ class SeedDMS_View_ReceiptDocument extends SeedDMS_Bootstrap_Style {
 function checkIndForm()
 {
 	msg = new Array();
-	if (document.form1.reviewStatus.value == "") msg.push("<?php printMLText("js_no_receipt_status");?>");
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+	if (document.formind.reviewStatus.value == "") msg.push("<?php printMLText("js_no_receipt_status");?>");
+	if (document.formind.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
 	if (msg != "") {
   	noty({
   		text: msg.join('<br />'),
@@ -55,10 +55,10 @@ function checkIndForm()
 }
 function checkGrpForm()
 {
-	msg = "";
-	if (document.form2.reviewGroup.value == "") msg += "<?php printMLText("js_no_receipt_group");?>\n";
-	if (document.form2.reviewStatus.value == "") msg += "<?php printMLText("js_no_receipt_status");?>\n";
-	if (document.form2.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
+	msg = new Array();
+	if (document.formgrp.reviewGroup.value == "") msg.push("<?php printMLText("js_no_receipt_group");?>");
+	if (document.formgrp.reviewStatus.value == "") msg.push("<?php printMLText("js_no_receipt_status");?>");
+	if (document.formgrp.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
 	if (msg != "")
 	{
   	noty({
@@ -75,11 +75,11 @@ function checkGrpForm()
 		return true;
 }
 $(document).ready(function() {
-	$('body').on('submit', '#form1', function(ev){
+	$('body').on('submit', '#formind', function(ev){
 		if(checkIndForm()) return;
 		event.preventDefault();
 	});
-	$('body').on('submit', '#form2', function(ev){
+	$('body').on('submit', '#formgrp', function(ev){
 		if(checkGrpForm()) return;
 		event.preventDefault();
 	});
@@ -110,24 +110,24 @@ $(document).ready(function() {
 		$this->contentContainerStart();
 
 		// Display the Receipt form.
-		if ($receiptStatus['type'] == 0) {
-			if($receiptStatus["status"]!=0) {
+		$receipttype = ($receiptStatus['type'] == 0) ? 'ind' : 'grp';
+		if($receiptStatus["status"]!=0) {
 
-				print "<table class=\"folderView\"><thead><tr>";
-				print "<th>".getMLText("status")."</th>";
-				print "<th>".getMLText("comment")."</th>";
-				print "<th>".getMLText("last_update")."</th>";
-				print "</tr></thead><tbody><tr>";
-				print "<td>";
-				printReceiptStatusText($receiptStatus["status"]);
-				print "</td>";
-				print "<td>".htmlspecialchars($receiptStatus["comment"])."</td>";
-				$indUser = $dms->getUser($receiptStatus["userID"]);
-				print "<td>".$receiptStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
-				print "</tr></tbody></table><br>";
-			}
+			print "<table class=\"folderView\"><thead><tr>";
+			print "<th>".getMLText("status")."</th>";
+			print "<th>".getMLText("comment")."</th>";
+			print "<th>".getMLText("last_update")."</th>";
+			print "</tr></thead><tbody><tr>";
+			print "<td>";
+			printReceiptStatusText($receiptStatus["status"]);
+			print "</td>";
+			print "<td>".htmlspecialchars($receiptStatus["comment"])."</td>";
+			$indUser = $dms->getUser($receiptStatus["userID"]);
+			print "<td>".$receiptStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
+			print "</tr></tbody></table><br>\n";
+		}
 ?>
-	<form class="form-horizontal" method="post" action="../op/op.ReceiptDocument.php" id="form1" name="form1">
+	<form class="form-horizontal" method="post" action="../op/op.ReceiptDocument.php" id="form<?= $receipttype ?>" name="form<?= $receipttype ?>">
 	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
 		<div class="control-group">
 			<label class="control-label"><?php printMLText("comment");?>:</label>
@@ -149,64 +149,16 @@ $(document).ready(function() {
 			</div>
 		</div>
 		<div class="controls">
-			<input type='submit' class="btn" name='indReceipt' value='<?php printMLText("submit_receipt")?>'/>
+			<input type='submit' class="btn" name='<?= $receipttype ?>Receipt' value='<?php printMLText("submit_receipt")?>'/>
 		<div>
-		<input type='hidden' name='receiptType' value='ind'/>
-		<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-		<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-	</form>
-<?php
-		}
-		else if ($receiptStatus['type'] == 1) {
-
-			if($receiptStatus["status"]!=0) {
-
-				print "<table class=\"folderView\"><thead><tr>";
-				print "<th>".getMLText("status")."</th>";
-				print "<th>".getMLText("comment")."</th>";
-				print "<th>".getMLText("last_update")."</th>";
-				print "</tr></thead><tbody><tr>";
-				print "<td>";
-				printReceiptStatusText($receiptStatus["status"]);
-				print "</td>";
-				print "<td>".htmlspecialchars($receiptStatus["comment"])."</td>";
-				$indUser = $dms->getUser($receiptStatus["userID"]);
-				print "<td>".$receiptStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
-				print "</tr></tbody></table><br>\n";
-			}
-
-?>
-	<form class="form-horizontal" method="post" action="../op/op.ReceiptDocument.php" id="form2" name="form2">
-	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("comment");?>:</label>
-			<div class="controls">
-				<textarea name="comment" cols="80" rows="4"></textarea>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("receipt_status");?>:</label>
-			<div class="controls">
-				<select name="receiptStatus">
-<?php if($receiptStatus['status'] != 1) { ?>
-					<option value='1'><?php printMLText("status_receipted")?></option>
-<?php } ?>
-<?php if($receiptStatus['status'] != -1) { ?>
-					<option value='-1'><?php printMLText("rejected")?></option>
-<?php } ?>
-				</select>
-			</div>
-		</div>
-		<div class="controls">
-			<input type='submit' class="btn" name='groupReceipt' value='<?php printMLText("submit_receipt")?>'/>
-		</div>
-		<input type='hidden' name='receiptType' value='grp'/>
+		<input type='hidden' name='receiptType' value='<?= $receipttype ?>'/>
+		<?php if($receipttype == 'grp'): ?>
 		<input type='hidden' name='receiptGroup' value='<?php echo $receiptStatus['required']; ?>'/>
+		<?php endif; ?>
 		<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
 		<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 	</form>
 <?php
-		}
 		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();

From 231af615af21bf636b0a5b51763a9e07c8f31f5d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:17:44 +0100
Subject: [PATCH 0944/2006] status may be S_NEED_CORRECTiON in setStatus()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index f435e2d89..85d51b77f 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -79,6 +79,12 @@ define("S_OBSOLETE", -2);
  */
 define("S_EXPIRED",  -3);
 
+/*
+ * Lowest and highest status that may be set
+ */
+define("S_LOWEST_STATUS",  -3);
+define("S_HIGHEST_STATUS",  6);
+
 /**
  * The different states a workflow log can be in. This is used in
  * all tables tblDocumentXXXLog
@@ -2172,7 +2178,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		/* Remove all revisions of document version.
-		 * This implmentation is different from the above for removing approvals
+		 * This implementation is different from the above for removing approvals
 		 * and reviews. It doesn't use getRevisionStatus() but reads the database
 		 */
 		$queryStr = "SELECT * FROM `tblDocumentRevisors` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
@@ -2988,6 +2994,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED )) return;
 
+		unset($this->_workflow); // force to be reloaded from DB
+		$hasworkflow =  $this->getWorkflow() ? true : false;
+
 		$pendingReview=false;
 		unset($this->_reviewStatus);  // force to be reloaded from DB
 		$reviewStatus=$this->getReviewStatus();
@@ -3022,8 +3031,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			}
 		}
 
-		unset($this->_workflow); // force to be reloaded from DB
-		if ($this->getWorkflow()) $this->setStatus(S_IN_WORKFLOW,$msg,$user);
+		if ($hasworkflow) $this->setStatus(S_IN_WORKFLOW,$msg,$user);
 		elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user);
 		elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user);
 		elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user);
@@ -3326,7 +3334,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		// If the supplied value lies outside of the accepted range, return an
 		// error.
-		if ($status < -3 || $status > 5) {
+		if ($status < S_LOWEST_STATUS || $status > S_HIGHEST_STATUS) {
 			return false;
 		}
 
@@ -4669,7 +4677,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		/* If a user is added when the revision has already been startet, then
-		 * put it in S_LOG_WAITING already.
+		 * put it in S_IN_REVISION otherwise in S_LOG_WAITING.
 		 */
 		$st=$this->getStatus();
 		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".

From bf2ced4c6e906073bbccf98802d8a867e2cc68c7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:18:35 +0100
Subject: [PATCH 0945/2006] status -1 for revision is text
 status_need_correction

---
 inc/inc.Language.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index 9f5c2d92e..9c3843fd7 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -220,6 +220,7 @@ function getRevisionStatusText($status, $date=0) { /* {{{ */
 				return getMLText("status_revisor_removed");
 				break;
 			case -1:
+				return getMLText("status_needs_correction").($date !=0 ? " ".$date : "");
 				return getMLText("status_revision_rejected").($date !=0 ? " ".$date : "");
 				break;
 			case 0:
@@ -228,9 +229,6 @@ function getRevisionStatusText($status, $date=0) { /* {{{ */
 			case 1:
 				return getMLText("status_revised").($date !=0 ? " ".$date : "");
 				break;
-			case 6:
-				return getMLText("status_needs_correction").($date !=0 ? " ".$date : "");
-				break;
 			default:
 				return getMLText("status_unknown");
 				break;

From 7f1f551334d03bf405b0b8eed581cf2aaec0f7be Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:19:07 +0100
Subject: [PATCH 0946/2006] allow to filter by status S_NEED_CORRECTION

---
 out/out.Search.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/out/out.Search.php b/out/out.Search.php
index 85438aab6..1a5f60c44 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -318,6 +318,9 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 	if (isset($_GET["expired"])){
 		$status[] = S_EXPIRED;
 	}
+	if (isset($_GET["needs_correction"])){
+		$status[] = S_NEEDS_CORRECTION;
+	}
 
 	$reception = array();
 	if (isset($_GET["reception"])){

From 0cc14e937db6c0b2a14c2c6158a786337af4b687 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:19:40 +0100
Subject: [PATCH 0947/2006] set doc status S_NEED_CORRECTION when revision
 status -1 is set

---
 controllers/class.ReviseDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php
index 7ed205668..35106984d 100644
--- a/controllers/class.ReviseDocument.php
+++ b/controllers/class.ReviseDocument.php
@@ -64,7 +64,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 		$result = $this->callHook('reviseUpdateDocumentStatus', $content);
 		if($result === null) {
 			if ($revisionstatus == -1){
-				if(!$content->setStatus(S_REJECTED,$comment,$user)) {
+				if(!$content->setStatus(S_NEEDS_CORRECTION,$comment,$user)) {
 					$this->error = 1;
 					$this->errormsg = "revision_update_failed";
 					return false;

From d84d4cfcdb161580ee43c7caae072168b7095d99 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:20:19 +0100
Subject: [PATCH 0948/2006] allow to override with S_NEED_CORRECTION

---
 views/bootstrap/class.OverrideContentStatus.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.OverrideContentStatus.php b/views/bootstrap/class.OverrideContentStatus.php
index 460a27ea1..88443cf08 100644
--- a/views/bootstrap/class.OverrideContentStatus.php
+++ b/views/bootstrap/class.OverrideContentStatus.php
@@ -101,6 +101,7 @@ $(document).ready(function() {
 		if ($overallStatus["status"] != S_RELEASED) echo "<option value='".S_RELEASED."'>".getOverallStatusText(S_RELEASED)."</option>";
 		if ($overallStatus["status"] != S_OBSOLETE) echo "<option value='".S_OBSOLETE."'>".getOverallStatusText(S_OBSOLETE)."</option>";
 		if ($overallStatus["status"] != S_DRAFT) echo "<option value='".S_DRAFT."'>".getOverallStatusText(S_DRAFT)."</option>";
+		if ($overallStatus["status"] != S_NEEDS_CORRECTION) echo "<option value='".S_NEEDS_CORRECTION."'>".getOverallStatusText(S_NEEDS_CORRECTION)."</option>";
 
 	?>
 	</select>

From 9d7b735ff49d2a4862e1bd374d52a43b3a796ce1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:20:51 +0100
Subject: [PATCH 0949/2006] use same form ind and grp revision

---
 views/bootstrap/class.ReviseDocument.php | 164 ++++++++---------------
 1 file changed, 56 insertions(+), 108 deletions(-)

diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 75061a4ba..3a3dbb6db 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -37,8 +37,8 @@ class SeedDMS_View_ReviseDocument extends SeedDMS_Bootstrap_Style {
 function checkIndForm()
 {
 	msg = new Array();
-	if (document.form1.revisionStatus.value == "") msg.push("<?php printMLText("js_no_revision_status");?>");
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
+	if (document.formind.revisionStatus.value == "") msg.push("<?php printMLText("js_no_revision_status");?>");
+	if (document.formind.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
 	if (msg != "") {
   	noty({
   		text: msg.join('<br />'),
@@ -55,10 +55,10 @@ function checkIndForm()
 }
 function checkGrpForm()
 {
-	msg = "";
-	if (document.form2.revisionGroup.value == "") msg += "<?php printMLText("js_no_revision_group");?>\n";
-	if (document.form2.revisionSatus.value == "") msg += "<?php printMLText("js_no_revision_status");?>\n";
-	if (document.form2.comment.value == "") msg += "<?php printMLText("js_no_comment");?>\n";
+	msg = new Array();
+	if (document.formgrp.revisionGroup.value == "") msg.push("<?php printMLText("js_no_revision_group");?>");
+	if (document.formgrp.revisionSatus.value == "") msg.push("<?php printMLText("js_no_revision_status");?>");
+	if (document.formgrp.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
 	if (msg != "")
 	{
   	noty({
@@ -75,11 +75,11 @@ function checkGrpForm()
 		return true;
 }
 $(document).ready(function() {
-	$('body').on('submit', '#form1', function(ev){
+	$('body').on('submit', '#formind', function(ev){
 		if(checkIndForm()) return;
 		event.preventDefault();
 	});
-	$('body').on('submit', '#form2', function(ev){
+	$('body').on('submit', '#formgrp', function(ev){
 		if(checkGrpForm()) return;
 		event.preventDefault();
 	});
@@ -111,108 +111,56 @@ $(document).ready(function() {
 		$this->contentContainerStart();
 
 		// Display the Revision form.
-		if ($revisionStatus['type'] == 0) {
-			if($revisionStatus["status"]!=0) {
+		$revisiontype = ($revisionStatus['type'] == 0) ? 'ind' : 'grp';
+		if($revisionStatus["status"]!=0) {
 
-				print "<table class=\"folderView\"><thead><tr>";
-				print "<th>".getMLText("status")."</th>";
-				print "<th>".getMLText("comment")."</th>";
-				print "<th>".getMLText("last_update")."</th>";
-				print "</tr></thead><tbody><tr>";
-				print "<td>";
-				printRevisionStatusText($revisionStatus["status"]);
-				print "</td>";
-				print "<td>".htmlspecialchars($revisionStatus["comment"])."</td>";
-				$indUser = $dms->getUser($revisionStatus["userID"]);
-				print "<td>".$revisionStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
-				print "</tr></tbody></table><br>\n";
-			}
-?>
-	<form method="post" action="../op/op.ReviseDocument.php" id="form1" name="form1">
-	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("comment")?>:</td>
-			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("revision_status")?>:</td>
-			<td>
-				<select name="revisionStatus">
-<?php if($revisionStatus['status'] != 1) { ?>
-					<option value='1'><?php printMLText("status_revised")?></option>
-<?php } ?>
-<?php if($revisionStatus['status'] != 6) { ?>
-					<option value='6'><?php printMLText("status_needs_correction")?></option>
-<?php } ?>
-<?php if($revisionStatus['status'] != -1) { ?>
-					<option value='-1'><?php printMLText("rejected")?></option>
-<?php } ?>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><input type='submit' class="btn" name='indRevision' value='<?php printMLText("submit_revision")?>'/></td>
-		</tr>
-	</table>
-	<input type='hidden' name='revisionType' value='ind'/>
-	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-	</form>
-<?php
-		} elseif ($revisionStatus['type'] == 1) {
-			if($revisionStatus["status"]!=0) {
-
-				print "<table class=\"folderView\"><thead><tr>";
-				print "<th>".getMLText("status")."</th>";
-				print "<th>".getMLText("comment")."</th>";
-				print "<th>".getMLText("last_update")."</th>";
-				print "</tr></thead><tbody><tr>";
-				print "<td>";
-				printRevisionStatusText($revisionStatus["status"]);
-				print "</td>";
-				print "<td>".htmlspecialchars($revisionStatus["comment"])."</td>";
-				$indUser = $dms->getUser($revisionStatus["userID"]);
-				print "<td>".$revisionStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
-				print "</tr></tbody></table><br>\n";
-			}
-?>
-	<form method="post" action="../op/op.ReviseDocument.php" id="form2" name="form2">
-	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("comment")?>:</td>
-			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("revision_status")?>:</td>
-			<td>
-				<select name="revisionStatus">
-<?php if($revisionStatus['status'] != 1) { ?>
-					<option value='1'><?php printMLText("status_revised")?></option>
-<?php } ?>
-<?php if($revisionStatus['status'] != 6) { ?>
-					<option value='6'><?php printMLText("status_needs_correction")?></option>
-<?php } ?>
-<?php if($revisionStatus['status'] != -1) { ?>
-					<option value='-1'><?php printMLText("rejected")?></option>
-<?php } ?>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><input type='submit' class="btn" name='groupRevision' value='<?php printMLText("submit_revision")?>'/></td>
-		</tr>
-	</table>
-	<input type='hidden' name='revisionType' value='grp'/>
-	<input type='hidden' name='revisionGroup' value='<?php echo $revisionStatus['required']; ?>'/>
-	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-	</form>
-<?php
+			print "<table class=\"folderView\"><thead><tr>";
+			print "<th>".getMLText("status")."</th>";
+			print "<th>".getMLText("comment")."</th>";
+			print "<th>".getMLText("last_update")."</th>";
+			print "</tr></thead><tbody><tr>";
+			print "<td>";
+			printRevisionStatusText($revisionStatus["status"]);
+			print "</td>";
+			print "<td>".htmlspecialchars($revisionStatus["comment"])."</td>";
+			$indUser = $dms->getUser($revisionStatus["userID"]);
+			print "<td>".$revisionStatus["date"]." - ". htmlspecialchars($indUser->getFullname()) ."</td>";
+			print "</tr></tbody></table><br>\n";
 		}
+?>
+	<form method="post" action="../op/op.ReviseDocument.php" id="form<?= $revisiontype ?>" name="form<?= $revisiontype ?>">
+	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
+	<table class="table-condensed">
+		<tr>
+			<td><?php printMLText("comment")?>:</td>
+			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
+		</tr>
+		<tr>
+			<td><?php printMLText("revision_status")?>:</td>
+			<td>
+				<select name="revisionStatus">
+<?php if($revisionStatus['status'] != 1) { ?>
+					<option value='1'><?php printMLText("status_revised")?></option>
+<?php } ?>
+<?php if($revisionStatus['status'] != -1) { ?>
+					<option value='-1'><?php printMLText("status_needs_correction")?></option>
+<?php } ?>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td><input type='submit' class="btn" name='<?= $revisiontype ?>Revision' value='<?php printMLText("submit_revision")?>'/></td>
+		</tr>
+	</table>
+	<input type='hidden' name='revisionType' value='<?= $revisiontype ?>'/>
+	<?php if($revisiontype == 'grp'): ?>
+	<input type='hidden' name='revisionGroup' value='<?php echo $revisionStatus['required']; ?>'/>
+	<?php endif; ?>
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+	</form>
+<?php
 		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();

From e47ff72ec3a71a01c1b1b9987ba6101f9a8a3066 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:21:21 +0100
Subject: [PATCH 0950/2006] allow to select doc status S_NEED_CORRECTION

---
 views/bootstrap/class.Search.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 8512bc411..5684795fa 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -376,6 +376,7 @@ $(document).ready( function() {
 <label class="checkbox" for='inrevision'><input type="checkbox" id="inrevision" name="inrevision" value="1" <?php echo in_array(S_IN_REVISION, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_IN_REVISION);?></label>
 <label class="checkbox" for='obsolete'><input type="checkbox" id="obsolete" name="obsolete" value="1" <?php echo in_array(S_OBSOLETE, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_OBSOLETE);?></label>
 <label class="checkbox" for='expired'><input type="checkbox" id="expired" name="expired" value="1" <?php echo in_array(S_EXPIRED, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_EXPIRED);?></label>
+<label class="checkbox" for='needs_correction'><input type="checkbox" id="needs_correction" name="needs_correction" value="1" <?php echo in_array(S_NEEDS_CORRECTION, $status) ? "checked" : ""; ?>><?php printOverallStatusText(S_NEEDS_CORRECTION);?></label>
 </td>
 </tr>
 <tr>

From f3e1c56d5d57440b153700e5773dc795414e39db Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jan 2018 19:21:57 +0100
Subject: [PATCH 0951/2006] add S_NEED_CORRECTION as doc status

---
 views/bootstrap/class.RoleMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index aaa40f0ee..65f134046 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -154,7 +154,7 @@ $(document).ready( function() {
 			echo "<tr>";
 			echo "<td>".getMLText('restrict_access')."</td>";
 			echo "<td>";
-			foreach(array(S_DRAFT_REV, S_DRAFT_APP, S_IN_WORKFLOW, S_REJECTED, S_RELEASED, S_IN_REVISION, S_DRAFT, S_EXPIRED, S_OBSOLETE) as $status) {
+			foreach(array(S_DRAFT_REV, S_DRAFT_APP, S_IN_WORKFLOW, S_REJECTED, S_RELEASED, S_IN_REVISION, S_DRAFT, S_EXPIRED, S_OBSOLETE, S_NEEDS_CORRECTION) as $status) {
 				echo "<input type=\"checkbox\" name=\"noaccess[]\" value=\"".$status."\" ".(in_array($status, $currRole->getNoAccess()) ? "checked" : "")."> ".getOverallStatusText($status)."<br />";
 			}
 			echo "</td>";

From 39b94d4c756238198b48aee6f9c49b8ed1bf0b9f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Jan 2018 20:03:22 +0100
Subject: [PATCH 0952/2006] add fast sql statement to getReceiptStatus() if
 limit=1

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 85d51b77f..ec3b5a640 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3824,9 +3824,27 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		// Retrieve the current status of each assigned reviewer for the content
 		// represented by this object.
+		// When just the last log entry for each recipient is needed then a single
+		// sql statement is much faster than the code below which first retrieves
+		// all receivers and than the logs
 		// FIXME: caching was turned off to make list of review log in ViewDocument
 		// possible
-		if (1 || !isset($this->_receiptStatus)) {
+		if($limit == 1) {
+			/* The following sql statement is somewhat optimized. The first join is
+			 * crucial because it should first take the table with the least number
+			 * of records and join the other tables. ttreceiptid join tblDocumentRecipients
+			 * is faster than tblDocumentRecipients join ttreceiptid
+			 */
+			$queryStr=
+				"SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`receiptLogID`, `tblDocumentReceiptLog`.`status`, `tblDocumentReceiptLog`.`comment`, `tblDocumentReceiptLog`.`date`, `tblDocumentReceiptLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` FROM `ttreceiptid` LEFT JOIN `tblDocumentRecipients` ON `tblDocumentRecipients`.`receiptID`=`ttreceiptid`.`receiptID` LEFT JOIN `tblDocumentReceiptLog` ON `ttreceiptid`.`maxLogID`=`tblDocumentReceiptLog`.`receiptLogID` LEFT JOIN `tblUsers` ON `tblDocumentRecipients`.`required`=`tblUsers`.`id` LEFT JOIN `tblGroups` ON `tblDocumentRecipients`.`required`=`tblGroups`.`id` WHERE `version`='".$this->_version
+				."' AND `documentID` = '". $this->_document->getID() ."' ";
+			$recs = $db->getResultArray($queryStr);
+			if (is_bool($recs) && !$recs) {
+				unset($this->_receiptStatus);
+				return false;
+			}
+			$this->_receiptStatus = $recs;
+		} elseif (1 || !isset($this->_receiptStatus)) {
 			/* First get a list of all receipts for this document content */
 			$queryStr=
 				"SELECT `receiptID` FROM `tblDocumentRecipients` WHERE `version`='".$this->_version

From 18191000ea2e99dcf3ba80b3f7546ca13e961404 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Jan 2018 20:04:14 +0100
Subject: [PATCH 0953/2006] add indexes on Log tables

---
 install/create_tables-sqlite3.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index a4fb6420d..656ab6413 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -232,6 +232,7 @@ CREATE TABLE `tblDocumentApproveLog` (
   `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
+CREATE INDEX `indDocumentApproveLogReviewID` ON `tblDocumentApproveLog` (`approveID`);
 
 -- --------------------------------------------------------
 
@@ -361,6 +362,7 @@ CREATE TABLE `tblDocumentReviewLog` (
   `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
+CREATE INDEX `indDocumentReviewLogReviewID` ON `tblDocumentReviewLog` (`reviewID`);
 
 -- --------------------------------------------------------
 
@@ -392,6 +394,7 @@ CREATE TABLE `tblDocumentReceiptLog` (
   `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
+CREATE INDEX `indDocumentReceiptLogReceiptID` ON `tblDocumentReceiptLog` (`receiptID`);
 
 -- --------------------------------------------------------
 
@@ -424,6 +427,7 @@ CREATE TABLE `tblDocumentRevisionLog` (
   `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
+CREATE INDEX `indDocumentRevisionLogRevisionID` ON `tblDocumentRevisionLog` (`revisionID`);
 
 -- --------------------------------------------------------
 
@@ -452,6 +456,7 @@ CREATE TABLE `tblDocumentStatusLog` (
   `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
+CREATE INDEX `indDocumentStatusLogStatusID` ON `tblDocumentStatusLog` (`StatusID`);
 
 -- --------------------------------------------------------
 

From de689727b0c6421b1c4bb29d051b623866ab58e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Jan 2018 20:04:42 +0100
Subject: [PATCH 0954/2006] remove ';' in string

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index bf824757f..8dc0db5f7 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2128,7 +2128,7 @@ $(document).ready( function() {
 				}
 				$totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1'];
 				if($totalreceipts) {
-					$content .= ";
+					$content .= "
 <div class=\"progress\">
 <div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
 	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>

From 17478a52efe9b6ccaca3e11dc6972808ff17670e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Jan 2018 20:05:34 +0100
Subject: [PATCH 0955/2006] add note for 6.0.4

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 04356fd25..4bef6cfec 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,6 +28,7 @@ pass 0 as default to getObjects()
 SeedDMS_Core_AttributeDefinition::getStatistics() returns propper values for each item in a value set
 SeedDMS_Core_DMS::getDocumentList() returns list of documents without a receiver
 add lists of drafts and obsolete docs in SeedDMS_Core_DMS::getDocumentList()
+add fast sql statement to SeedDMS_Core_Document::getReceiptStatus() if limit=1
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 03e227af4ce576825fbcc4ae36c7a100de8982c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 08:28:00 +0100
Subject: [PATCH 0956/2006] add all remaining changes in 6.0.3

---
 CHANGELOG | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 80ed1b5e1..cfb00c017 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,15 +1,23 @@
---------------------------------------------------------------------------------
-                     Changes in version 6.0.4
---------------------------------------------------------------------------------
-- fix export of search and display of 2nd, 3rd, ... search page
-
 --------------------------------------------------------------------------------
                      Changes in version 6.0.3
 --------------------------------------------------------------------------------
 - add list of documents without a receiver on MyDocuments page
 - propperly calculate number of documents for each value of value set in attribute mgr
 - output of progress bar for reception of a document can be controlled by access list
-- receiver of a document version can be set when uploading the file
+- recipientof a document version can be set when uploading the file
+- fix export of search and display of 2nd, 3rd, ... search page
+- speed up creation of document lists if reception progress bar is shown
+- status of rejected documents can be overriden
+- do not add users from group as recipients if they are the uploader or reviewer
+  of a document
+- add list of documents without a receiver, list of drafts, and list of absolete
+  documents on MyDocuments page
+- add callback onCheckAccessDocument to SeedDMS_Core_Document
+- add new document status 'needs correction', revised documents which do not pass
+  will no longer be in status 'rejected' but 'needs correction'
+- better error handling when indexing documents fails
+- apache xsendfile module is used for downloading documents when installed
+
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.2

From e7bec65b893cfc4b128a734b4ba92e695b32c0fa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 08:28:24 +0100
Subject: [PATCH 0957/2006] document status may be overriden if document is
 rejected

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index f22975d7a..d702d71d7 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -110,7 +110,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE)) {
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_REJECTED || $status["status"]==S_OBSOLETE)) {
 					return true;
 				}
 			}

From 3ad9fe9743c1fee56290cf7f61e4d87a2f1bdaae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 08:28:56 +0100
Subject: [PATCH 0958/2006] do not add uploader and reviewer to recipients when
 added by group

---
 op/op.AddDocument.php     | 7 +++++--
 op/op.CheckInDocument.php | 7 +++++--
 op/op.UpdateDocument.php  | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index b2712175b..463e7cc0a 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -292,8 +292,11 @@ if (isset($_POST["grpIndRecipients"])) {
 	foreach ($_POST["grpIndRecipients"] as $grp) {
 		if($group = $dms->getGroup($grp)) {
 			$members = $group->getUsers();
-			foreach($members as $member)
-				$recipients["i"][] = $member->getID();
+			foreach($members as $member) {
+				/* Do not add the uploader itself and approvers */
+				if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
+					$recipients["i"][] = $member->getID();
+			}
 		}
 	}
 }
diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 8d23a9408..1269e732d 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -195,8 +195,11 @@ else
 		foreach ($_POST["grpIndRecipients"] as $grp) {
 			if($group = $dms->getGroup($grp)) {
 				$members = $group->getUsers();
-				foreach($members as $member)
-					$recipients["i"][] = $member->getID();
+				foreach($members as $member) {
+					/* Do not add the uploader itself and approvers */
+					if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
+						$recipients["i"][] = $member->getID();
+				}
 			}
 		}
 	}
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index c1bd55759..e64dbc1fd 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -307,8 +307,11 @@ default:
 		foreach ($_POST["grpIndRecipients"] as $grp) {
 			if($group = $dms->getGroup($grp)) {
 				$members = $group->getUsers();
-				foreach($members as $member)
-					$recipients["i"][] = $member->getID();
+				foreach($members as $member) {
+					/* Do not add the uploader itself and approvers */
+					if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
+						$recipients["i"][] = $member->getID();
+				}
 			}
 		}
 	}

From 13119773bf3149e9fd8f9bcb011e1732ecae06a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 08:29:27 +0100
Subject: [PATCH 0959/2006] update release date and notes for 6.0.3

---
 SeedDMS_Core/package.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 4bef6cfec..4e6b91358 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-01-18</date>
+ <date>2018-02-01</date>
  <time>09:19:24</time>
  <version>
   <release>6.0.3</release>
@@ -29,6 +29,8 @@ SeedDMS_Core_AttributeDefinition::getStatistics() returns propper values for eac
 SeedDMS_Core_DMS::getDocumentList() returns list of documents without a receiver
 add lists of drafts and obsolete docs in SeedDMS_Core_DMS::getDocumentList()
 add fast sql statement to SeedDMS_Core_Document::getReceiptStatus() if limit=1
+add callback onCheckAccessDocument to SeedDMS_Core_Document::getAccessMode()
+add new document status 'needs correction' (S_NEEDS_CORRECTION)
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From b3c372e2702824082d46d74f6eb163a323125809 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 12:05:48 +0100
Subject: [PATCH 0960/2006] show only released documents in ReceiveOwner list

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 23a394f16..7b8903164 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1447,6 +1447,7 @@ class SeedDMS_Core_DMS {
 			if ($docs) {
 				$queryStr .= "AND `tblDocuments`.`id` IN (" . implode(',', $docs) . ") ";
 				$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."'";
+				$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_RELEASED.") ";
 				if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 				else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
 				else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
@@ -1500,8 +1501,8 @@ class SeedDMS_Core_DMS {
 				$orderdir = 'DESC';
 			else
 				$orderdir = 'ASC';
-			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
-				"AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") ";
+			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_REJECTED.") ";
 			//$queryStr .= "ORDER BY `statusDate` DESC";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";

From d89cfc3f1a97cbbd6f71ea08e2b64c68f4b4bc10 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 14:38:57 +0100
Subject: [PATCH 0961/2006] fix access check

---
 out/out.SetRecipients.php | 14 ++++++++------
 out/out.SetRevisors.php   | 17 ++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/out/out.SetRecipients.php b/out/out.SetRecipients.php
index ee2d26d4d..5d73d66c2 100644
--- a/out/out.SetRecipients.php
+++ b/out/out.SetRecipients.php
@@ -29,6 +29,13 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
+}
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -38,7 +45,7 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-if ($document->getAccessMode($user) < M_ALL) {
+if (!$accessop->maySetRecipients($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
@@ -57,11 +64,6 @@ if(!$settings->_enableVersionModification) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.SetRevisors.php b/out/out.SetRevisors.php
index 4cda3fd41..f9c9cf993 100644
--- a/out/out.SetRevisors.php
+++ b/out/out.SetRevisors.php
@@ -29,6 +29,13 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
+}
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -38,7 +45,7 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-if ($document->getAccessMode($user) < M_ALL) {
+if (!$accessop->maySetRevisors($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
@@ -55,16 +62,8 @@ if(!$settings->_enableVersionModification) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_version_modification"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if (!$accessop->maySetRevisors($document)) {
-	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("cannot_assign_invalid_state"));
-}
-
 $folder = $document->getFolder();
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);

From c7dbe7d16fa69b221fe6d9b2cbd34ae2887b664b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 18:00:05 +0100
Subject: [PATCH 0962/2006] not needed anymore

---
 out/out.AddTransmittal.php               |  39 ---------
 views/bootstrap/class.AddTransmittal.php | 107 -----------------------
 2 files changed, 146 deletions(-)
 delete mode 100644 out/out.AddTransmittal.php
 delete mode 100644 views/bootstrap/class.AddTransmittal.php

diff --git a/out/out.AddTransmittal.php b/out/out.AddTransmittal.php
deleted file mode 100644
index 85aea1b78..000000000
--- a/out/out.AddTransmittal.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-//    MyDMS. Document Management System
-//    Copyright (C) 2002-2005  Markus Westphal
-//    Copyright (C) 2006-2008 Malcolm Cowe
-//    Copyright (C) 2010 Matteo Lucarelli
-//    Copyright (C) 2010-2012 Uwe Steinmann
-//
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-include("../inc/inc.Settings.php");
-include("../inc/inc.Utils.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.Authentication.php");
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-if($view) {
-	$view->setParam('strictformcheck', $settings->_strictFormCheck);
-	$view($_GET);
-	exit;
-}
-
-?>
diff --git a/views/bootstrap/class.AddTransmittal.php b/views/bootstrap/class.AddTransmittal.php
deleted file mode 100644
index aa9528c9e..000000000
--- a/views/bootstrap/class.AddTransmittal.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Implementation of AddTransmittal view
- *
- * @category   DMS
- * @package    SeedDMS
- * @license    GPL 2
- * @version    @version@
- * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-
-/**
- * Include parent class
- */
-require_once("class.Bootstrap.php");
-
-/**
- * Class which outputs the html page for AddTransmittal view
- *
- * @category   DMS
- * @package    SeedDMS
- * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2002-2005 Markus Westphal,
- *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
- *             2010-2012 Uwe Steinmann
- * @version    Release: @package_version@
- */
-class SeedDMS_View_AddTransmittal extends SeedDMS_Bootstrap_Style {
-
-	function js() { /* {{{ */
-		$strictformcheck = $this->params['strictformcheck'];
-		header('Content-Type: application/javascript; charset=UTF-8');
-?>
-function checkForm()
-{
-	msg = new Array();
-	if (document.form1.name.value == "") msg.push("<?php printMLText("js_no_name");?>");
-<?php
-	if ($strictformcheck) {
-?>
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-<?php
-	}
-?>
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-$(document).ready(function() {
-	$('body').on('submit', '#form1', function(ev){
-		if(checkForm()) return;
-		event.preventDefault();
-	});
-});
-<?php
-	} /* }}} */
-
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$strictformcheck = $this->params['strictformcheck'];
-
-		$this->htmlStartPage(getMLText("my_documents"));
-		$this->globalNavigation($folder);
-		$this->contentStart();
-		$this->pageNavigation(getMLText("my_documents"), "my_documents");
-		$this->contentHeading(getMLText("add_transmittal"));
-		$this->contentContainerStart();
-?>
-
-<form action="../op/op.AddTransmittal.php" id="form1" name="form1" method="post">
-	<?php echo createHiddenFieldWithKey('addtransmittal'); ?>
-	<table class="table-condensed">
-		<tr>
-			<td class="inputDescription"><?php printMLText("name");?>:</td>
-			<td><input type="text" name="name" size="60"></td>
-		</tr>
-		<tr>
-			<td class="inputDescription"><?php printMLText("comment");?>:</td>
-			<td><textarea name="comment" rows="4" cols="80"></textarea></td>
-		</tr>
-		<tr>
-			<td></td><td><input type="submit" class="btn" value="<?php printMLText("add_transmittal");?>"></td>
-		</tr>
-	</table>
-</form>
-<?php
-		$this->contentContainerEnd();
-		$this->contentEnd();
-		$this->htmlEndPage();
-	} /* }}} */
-}
-?>

From d824ca30fbaa02c3d22bb730dab5a0a30beb12a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 08:48:53 +0100
Subject: [PATCH 0963/2006] may[Receipt|Review|Approve|Revise] also checks for
 document access

---
 inc/inc.ClassAccessOperation.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index d702d71d7..c9295c6c5 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -225,7 +225,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ((($document->getAccessMode($this->user) == M_ALL) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
+				if ((($document->getAccessMode($this->user) >= M_READWRITE) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
 					return true;
 				}
 			}
@@ -293,7 +293,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ($status["status"]==S_DRAFT_REV) {
+				if ($document->getAccessMode($this->user) >= M_READ && $status["status"]==S_DRAFT_REV) {
 					return true;
 				}
 			}
@@ -309,7 +309,7 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayUpdateReview($document, $updateUser) { /* {{{ */
 		if(get_class($document) == 'SeedDMS_Core_Document') {
-			if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && !$document->hasExpired()) {
+			if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && $document->getAccessMode($this->user) >= M_READ && !$document->hasExpired()) {
 				return true;
 			}
 		}
@@ -324,7 +324,7 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayUpdateApproval($document, $updateUser) { /* {{{ */
 		if(get_class($document) == 'SeedDMS_Core_Document') {
-			if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && !$document->hasExpired()) {
+			if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && $document->getAccessMode($this->user) >= M_READ && !$document->hasExpired()) {
 				return true;
 			}
 		}
@@ -344,7 +344,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ($status["status"]==S_DRAFT_APP) {
+				if ($document->getAccessMode($this->user) >= M_READ && $status["status"]==S_DRAFT_APP) {
 					return true;
 				}
 			}
@@ -363,7 +363,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ($status["status"]==S_RELEASED) {
+				if ($document->getAccessMode($this->user) >= M_READ && $status["status"]==S_RELEASED) {
 					return true;
 				}
 			}
@@ -379,7 +379,7 @@ class SeedDMS_AccessOperation {
 	 */
 	function mayUpdateReceipt($document, $updateUser) { /* {{{ */
 		if(get_class($document) == 'SeedDMS_Core_Document') {
-			if($this->settings->_enableUpdateReceipt && ($updateUser == $this->user) && !$document->hasExpired()) {
+			if($this->settings->_enableUpdateReceipt && ($updateUser == $this->user) && $document->getAccessMode($this->user) >= M_READ && !$document->hasExpired()) {
 				return true;
 			}
 		}
@@ -397,7 +397,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ($status["status"]!=S_OBSOLETE) {
+				if ($document->getAccessMode($this->user) >= M_READ && $status["status"]!=S_OBSOLETE) {
 					return true;
 				}
 			}

From 16e70a0cdd45517c7e7838c9551cc7a54c7bc081 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 08:50:15 +0100
Subject: [PATCH 0964/2006] recipients may be set with read/write access

---
 op/op.SetRecipients.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 926e010a8..554af3267 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -40,7 +40,7 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-if ($document->getAccessMode($user) < M_ALL) {
+if ($document->getAccessMode($user) < M_READWRITE) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 

From 2ad6a04965373c1c21d483fb6a7dffdc5ed449e1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 08:50:39 +0100
Subject: [PATCH 0965/2006] move some code at beginning of file

---
 op/op.ApproveDocument.php | 15 +++++----------
 op/op.ReceiptDocument.php | 16 +++++-----------
 op/op.ReviewDocument.php  | 15 +++++----------
 op/op.ReviseDocument.php  | 15 +++++----------
 4 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index b49f779e6..e9da967e2 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -33,6 +33,7 @@ include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('approvedocument')) {
@@ -50,12 +51,13 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-$folder = $document->getFolder();
-
-if ($document->getAccessMode($user) < M_READ) {
+// verify if document may be approved
+if (!$accessop->mayApprove($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
+$folder = $document->getFolder();
+
 if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
@@ -73,14 +75,7 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
 $olddocstatus = $content->getStatus();
-// verify if document may be approved
-if (!$accessop->mayApprove($document)){
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
-}
 
 if (!isset($_POST["approvalStatus"]) || !is_numeric($_POST["approvalStatus"]) ||
 		(intval($_POST["approvalStatus"])!=1 && intval($_POST["approvalStatus"])!=-1)) {
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index e973019f6..a978a7a2f 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -32,6 +32,7 @@ include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('receiptdocument')) {
@@ -49,12 +50,13 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-$folder = $document->getFolder();
-
-if ($document->getAccessMode($user) < M_READ) {
+// verify if document may be receіpted
+if (!$accessop->mayReceipt($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
+$folder = $document->getFolder();
+
 if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
@@ -72,14 +74,6 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-// verify if document may be receіpted
-if (!$accessop->mayReceipt($document)){
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
-}
-
 if (!isset($_POST["receiptStatus"]) || !is_numeric($_POST["receiptStatus"]) ||
 		(intval($_POST["receiptStatus"])!=1 && intval($_POST["receiptStatus"])!=-1)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_receipt_status"));
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 2e43716bf..da2a1e160 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -33,6 +33,7 @@ include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('reviewdocument')) {
@@ -50,12 +51,13 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-$folder = $document->getFolder();
-
-if ($document->getAccessMode($user) < M_READ) {
+// verify if document may be reviewed
+if (!$accessop->mayReview($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
+$folder = $document->getFolder();
+
 if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
@@ -73,14 +75,7 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
 $olddocstatus = $content->getStatus();
-// verify if document may be reviewed
-if (!$accessop->mayReview($document)){
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
-}
 
 if (!isset($_POST["reviewStatus"]) || !is_numeric($_POST["reviewStatus"]) ||
 		(intval($_POST["reviewStatus"])!=1 && intval($_POST["reviewStatus"])!=-1)) {
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index f3b99fe6c..307550976 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -32,6 +32,7 @@ include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes for a trusted request */
 if(!checkFormKey('revisedocument')) {
@@ -49,12 +50,13 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-$folder = $document->getFolder();
-
-if ($document->getAccessMode($user) < M_READ) {
+// verify if document maybe revised
+if (!$accessop->mayRevise($document)){
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
+$folder = $document->getFolder();
+
 if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
@@ -72,14 +74,7 @@ if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
 $olddocstatus = $content->getStatus();
-// verify if document maybe revised
-if (!$accessop->mayRevise($document)){
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
-}
 
 if (!isset($_POST["revisionStatus"]) || !is_numeric($_POST["revisionStatus"]) ||
 		(!in_array(intval($_POST["revisionStatus"]), array(1, -1, 6)))) {

From 51f3416c70824e66dc097b77da011c2f94443af5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 08:57:05 +0100
Subject: [PATCH 0966/2006] =?UTF-8?q?include=20LogInit,=20move=20inclu?=
 =?UTF-8?q?=D1=95ion=20of=20Preview.php=20into=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 out/out.ReceiptSummary.php               | 7 ++-----
 views/bootstrap/class.ReceiptSummary.php | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php
index 977ff6efd..4b522fc64 100644
--- a/out/out.ReceiptSummary.php
+++ b/out/out.ReceiptSummary.php
@@ -20,6 +20,7 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
@@ -27,11 +28,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
@@ -41,6 +37,7 @@ if ($user->isGuest()) {
 }
 
 if($view) {
+	$view->setParam('showtree', showtree());
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index baaafa224..c7a1aa46d 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ReceiptSummary view
  *

From 28a0860824b0762a4eb0d4374f9fbb40c73034ae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 10:28:06 +0100
Subject: [PATCH 0967/2006] check view access

---
 out/out.ApprovalSummary.php | 3 +++
 out/out.GroupView.php       | 3 +++
 out/out.ReceiptSummary.php  | 3 +++
 out/out.ReviewSummary.php   | 3 +++
 out/out.UsrView.php         | 3 +++
 out/out.WorkflowSummary.php | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php
index 965aedd8f..323c294fa 100644
--- a/out/out.ApprovalSummary.php
+++ b/out/out.ApprovalSummary.php
@@ -31,6 +31,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
+}
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
diff --git a/out/out.GroupView.php b/out/out.GroupView.php
index a5ed5a876..76532fff2 100644
--- a/out/out.GroupView.php
+++ b/out/out.GroupView.php
@@ -29,6 +29,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_account"),getMLText("access_denied"), false, $isajax);
+}
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php
index 4b522fc64..00d8ed5ae 100644
--- a/out/out.ReceiptSummary.php
+++ b/out/out.ReceiptSummary.php
@@ -31,6 +31,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
+}
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php
index 965aedd8f..323c294fa 100644
--- a/out/out.ReviewSummary.php
+++ b/out/out.ReviewSummary.php
@@ -31,6 +31,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
+}
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
diff --git a/out/out.UsrView.php b/out/out.UsrView.php
index 698850bd3..21b048c6a 100644
--- a/out/out.UsrView.php
+++ b/out/out.UsrView.php
@@ -29,6 +29,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_account"),getMLText("access_denied"), false, $isajax);
+}
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php
index 28851c3c1..c6e92ca83 100644
--- a/out/out.WorkflowSummary.php
+++ b/out/out.WorkflowSummary.php
@@ -31,6 +31,9 @@ include("../inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
+}
 
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));

From 2c3dff2a24090c5e9bd778641a3cd01a2a59832f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 10:28:32 +0100
Subject: [PATCH 0968/2006] add check view access

---
 out/out.DocumentAccess.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/out/out.DocumentAccess.php b/out/out.DocumentAccess.php
index 6abe0ed75..241f5a6cc 100644
--- a/out/out.DocumentAccess.php
+++ b/out/out.DocumentAccess.php
@@ -30,6 +30,13 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("document_title"),getMLText("access_denied"));
+}
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -48,11 +55,6 @@ $folder = $document->getFolder();
 $allUsers = $dms->getAllUsers($settings->_sortUsersInList);
 $allGroups = $dms->getAllGroups();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);

From 264147821648ef9946efdc4702c798d9c997d932 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 10:29:53 +0100
Subject: [PATCH 0969/2006] move around code to create view and access object

---
 out/out.DocumentNotify.php          | 12 +++++++-----
 out/out.DocumentVersionDetail.php   |  9 ++++-----
 out/out.EditAttributes.php          | 16 ++++++++--------
 out/out.EditDocument.php            | 14 +++++++++-----
 out/out.EditDocumentFile.php        |  9 ++++-----
 out/out.MoveDocument.php            | 14 ++++++++------
 out/out.OverrideContentStatus.php   | 16 ++++++++--------
 out/out.ReceiptDocument.php         | 18 +++++++++---------
 out/out.RemoveDocument.php          |  9 ++++-----
 out/out.RemoveDocumentFile.php      |  9 ++++-----
 out/out.RemoveEvent.php             |  5 +++--
 out/out.RemoveTransmittal.php       |  5 +++--
 out/out.RemoveUserFromProcesses.php |  5 +++--
 out/out.SetExpires.php              | 11 +++++------
 14 files changed, 79 insertions(+), 73 deletions(-)

diff --git a/out/out.DocumentNotify.php b/out/out.DocumentNotify.php
index 752c7dd6d..5f3fddb16 100644
--- a/out/out.DocumentNotify.php
+++ b/out/out.DocumentNotify.php
@@ -30,6 +30,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"]<1)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -46,12 +50,10 @@ if ($document->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'sortusersinlist'=>$settings->_sortUsersInList));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('sortusersinlist', $settings->_sortUsersInList);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index 5df8f09ec..58885cb04 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -30,6 +30,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -64,11 +68,6 @@ if ($latestContent->getVersion()==$version->getVersion()) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.EditAttributes.php b/out/out.EditAttributes.php
index 1f5c34ec2..f795d6f7d 100644
--- a/out/out.EditAttributes.php
+++ b/out/out.EditAttributes.php
@@ -30,6 +30,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -39,6 +43,10 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+if(!$accessop->mayEditAttributes($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
 $version = $document->getContentByVersion($_GET["version"]);
 
 if (!is_object($version)) {
@@ -47,16 +55,8 @@ if (!is_object($version)) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if(!$accessop->mayEditAttributes($document)) {
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
-}
-
 $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.EditDocument.php b/out/out.EditDocument.php
index f4de9cc4b..225fd9c88 100644
--- a/out/out.EditDocument.php
+++ b/out/out.EditDocument.php
@@ -29,6 +29,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -52,12 +56,12 @@ if($document->isLocked()) {
 $folder = $document->getFolder();
 $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_document, SeedDMS_Core_AttributeDefinition::objtype_all));
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'attrdefs'=>$attrdefs, 'strictformcheck'=>$settings->_strictFormCheck, 'orderby'=>$settings->_sortFoldersDefault));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('attrdefs', $attrdefs);
+	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view->setParam('orderby', $settings->_sortFoldersDefault);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/out/out.EditDocumentFile.php b/out/out.EditDocumentFile.php
index 20499f566..baab461d9 100644
--- a/out/out.EditDocumentFile.php
+++ b/out/out.EditDocumentFile.php
@@ -28,6 +28,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -54,11 +58,6 @@ if (($document->getAccessMode($user) < M_ALL)&&($user->getID()!=$file->getUserID
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.MoveDocument.php b/out/out.MoveDocument.php
index 1e04d9ad0..e0edd0cee 100644
--- a/out/out.MoveDocument.php
+++ b/out/out.MoveDocument.php
@@ -29,6 +29,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -52,7 +56,7 @@ if($document->isLocked()) {
 if(isset($_GET['targetid']) && $_GET['targetid']) {
 	$target = $dms->getFolder($_GET["targetid"]);
 	if (!is_object($target)) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_target_folder"));
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_target_folder"));
 	}
 
 	if ($target->getAccessMode($user) < M_READWRITE) {
@@ -65,12 +69,10 @@ if(isset($_GET['targetid']) && $_GET['targetid']) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'target'=>$target));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('target', $target);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/out/out.OverrideContentStatus.php b/out/out.OverrideContentStatus.php
index c1a5bd426..c21abb68c 100644
--- a/out/out.OverrideContentStatus.php
+++ b/out/out.OverrideContentStatus.php
@@ -29,6 +29,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -39,6 +43,10 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+if(!$accessop->mayOverrideStatus($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("cannot_change_final_states"));
+}
+
 if ($document->getAccessMode($user) < M_ALL) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
@@ -55,14 +63,6 @@ if (!is_object($content)) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-if(!$accessop->mayOverrideStatus($document)) {
-	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("cannot_change_final_states"));
-}
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php
index 8584c2967..cf6f3f955 100644
--- a/out/out.ReceiptDocument.php
+++ b/out/out.ReceiptDocument.php
@@ -28,6 +28,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -38,6 +42,11 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+// verify if document may be receipted
+if (!$accessop->mayReceipt($document)){
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
 $folder = $document->getFolder();
 
 if ($document->getAccessMode($user) < M_READ) {
@@ -58,21 +67,12 @@ $latestContent = $document->getLatestContent();
 if ($latestContent->getVersion()!=$version) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-// verify if document may be receipted
-if (!$accessop->mayReceipt($document)){
-	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
-}
 
 $receipts = $content->getReceiptStatus();
 if(!$receipts) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("no_action"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.RemoveDocument.php b/out/out.RemoveDocument.php
index be20a720c..a76bb323b 100644
--- a/out/out.RemoveDocument.php
+++ b/out/out.RemoveDocument.php
@@ -29,6 +29,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -51,11 +55,6 @@ if($document->isLocked()) {
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.RemoveDocumentFile.php b/out/out.RemoveDocumentFile.php
index bc061aaab..0ffc8c82e 100644
--- a/out/out.RemoveDocumentFile.php
+++ b/out/out.RemoveDocumentFile.php
@@ -28,6 +28,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -54,11 +58,6 @@ if (($document->getAccessMode($user) < M_ALL)&&($user->getID()!=$file->getUserID
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/out/out.RemoveEvent.php b/out/out.RemoveEvent.php
index 5b5c28ec6..abe5a87d6 100644
--- a/out/out.RemoveEvent.php
+++ b/out/out.RemoveEvent.php
@@ -27,6 +27,9 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Calendar.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
 if (!isset($_GET["id"]) || !is_numeric($_GET["id"]) || intval($_GET["id"])<1) {
 	UI::exitError(getMLText("edit_event"),getMLText("error_occured"));
 }
@@ -40,8 +43,6 @@ if (($user->getID()!=$event["userID"])&&(!$user->isAdmin())){
 	UI::exitError(getMLText("edit_event"),getMLText("access_denied"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('event', $event);
 	$view($_GET);
diff --git a/out/out.RemoveTransmittal.php b/out/out.RemoveTransmittal.php
index 3716cc53e..b060ff4d6 100644
--- a/out/out.RemoveTransmittal.php
+++ b/out/out.RemoveTransmittal.php
@@ -26,6 +26,9 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
 if ($user->isGuest()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -39,8 +42,6 @@ if (!is_object($rmtransmittal)) {
 	UI::exitError(getMLText("rm_transmittal"),getMLText("invalid_transmittal_id"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('rmtransmittal', $rmtransmittal);
 	$view($_GET);
diff --git a/out/out.RemoveUserFromProcesses.php b/out/out.RemoveUserFromProcesses.php
index 3948a5d78..0878cdbc0 100644
--- a/out/out.RemoveUserFromProcesses.php
+++ b/out/out.RemoveUserFromProcesses.php
@@ -26,6 +26,9 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
@@ -43,8 +46,6 @@ if ($rmuser->getID()==$user->getID()) {
 	UI::exitError(getMLText("rm_user"),getMLText("cannot_delete_yourself"));
 }
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('rmuser', $rmuser);
 	$view($_GET);
diff --git a/out/out.SetExpires.php b/out/out.SetExpires.php
index c46d7118e..08b2dcefc 100644
--- a/out/out.SetExpires.php
+++ b/out/out.SetExpires.php
@@ -30,6 +30,10 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -39,17 +43,12 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-if ($document->getAccessMode($user) < M_READWRITE) {
+if(!$accessop->maySetExpires($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);

From ceb7d6591348d7573227717fd4a36942d2625a69 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 10:31:07 +0100
Subject: [PATCH 0970/2006] add additional view access checks

DocumentAccess, UsrView, GroupView, ReviewSummary, ApprovalSummary, WorkflowSummary, ReceiptSummary
---
 views/bootstrap/class.Bootstrap.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 8dc0db5f7..8f9abfa8b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -630,7 +630,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		}
 		if ($accessMode == M_ALL) {
 			$menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>'rm_document');
-			$menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>'edit_document_access');
+			if ($this->check_access('DocumentAccess'))
+				$menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>'edit_document_access');
 		}
 		if ($accessMode >= M_READ && !$this->params['user']->isGuest()) {
 			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify');
@@ -679,8 +680,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<li><a href=\"../out/out.Setup2Factor.php\">".getMLText("2_factor_auth")."</a></li>\n";
 
 		if ($this->params['enableusersview']){
-			echo "<li><a href=\"../out/out.UsrView.php\">".getMLText("users")."</a></li>\n";
-			echo "<li><a href=\"../out/out.GroupView.php\">".getMLText("groups")."</a></li>\n";
+			if ($this->check_access('UsrView'))
+				echo "<li><a href=\"../out/out.UsrView.php\">".getMLText("users")."</a></li>\n";
+			if ($this->check_access('GroupView'))
+				echo "<li><a href=\"../out/out.GroupView.php\">".getMLText("groups")."</a></li>\n";
 		}		
 		echo "</ul>\n";
 		echo "</div>\n";
@@ -697,12 +700,16 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 //		echo "<li><a href=\"../out/out.MyDocuments.php\">".getMLText("all_documents")."</a></li>\n";
 		if($this->params['workflowmode'] == 'traditional' || $this->params['workflowmode'] == 'traditional_only_approval') {
 			if($this->params['workflowmode'] == 'traditional')
-				echo "<li><a href=\"../out/out.ReviewSummary.php\">".getMLText("review_summary")."</a></li>\n";
-			echo "<li><a href=\"../out/out.ApprovalSummary.php\">".getMLText("approval_summary")."</a></li>\n";
+				if ($this->check_access('ReviewSummary'))
+					echo "<li><a href=\"../out/out.ReviewSummary.php\">".getMLText("review_summary")."</a></li>\n";
+			if ($this->check_access('ApprovalSummary'))
+				echo "<li><a href=\"../out/out.ApprovalSummary.php\">".getMLText("approval_summary")."</a></li>\n";
 		} else {
-			echo "<li><a href=\"../out/out.WorkflowSummary.php\">".getMLText("workflow_summary")."</a></li>\n";
+			if ($this->check_access('WorkflowSummary'))
+				echo "<li><a href=\"../out/out.WorkflowSummary.php\">".getMLText("workflow_summary")."</a></li>\n";
 		}
-		echo "<li><a href=\"../out/out.ReceiptSummary.php\">".getMLText("receipt_summary")."</a></li>\n";
+		if ($this->check_access('ReceiptSummary'))
+			echo "<li><a href=\"../out/out.ReceiptSummary.php\">".getMLText("receipt_summary")."</a></li>\n";
 		echo "</ul>\n";
 		echo "</div>\n";
 		return;

From 233cf9b1f1eafba9a22404822e02a854fb589f91 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 14:10:18 +0100
Subject: [PATCH 0971/2006] fix error in listing approvers

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index c4a666447..371dce0f5 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -912,7 +912,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				if($user->isAdmin() || $r["status"] > -2) {
+				if($user->isAdmin() || $a["status"] > -2) {
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
 					print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>";

From a1a8abceea66179bd48256a7152b3a8709e01fe0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 15:17:39 +0100
Subject: [PATCH 0972/2006] add entry for 6.0.3

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index cfb00c017..67c47c786 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,7 +17,8 @@
   will no longer be in status 'rejected' but 'needs correction'
 - better error handling when indexing documents fails
 - apache xsendfile module is used for downloading documents when installed
-
+- add view access check for ApprovalSummary, ReviewSummary, ReceiptSummary,
+  WorkflowSummary, DocumentAccess, GroupView, UsrView, WorkflowSummary
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.2

From 7e0b1b690734e9a05234f4995d0489395cad0bb1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Feb 2018 15:19:59 +0100
Subject: [PATCH 0973/2006] start new version 6.0.4

---
 CHANGELOG                          | 4 ++++
 Makefile                           | 2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 inc/inc.Version.php                | 2 +-
 install/install.php                | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 00ea65a5b..5a52e0aed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.4
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.3
 --------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index c401b96b2..f4e499fcb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=6.0.3
+VERSION=6.0.4
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 7b8903164..eff0c6284 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -446,7 +446,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.3';
+			$this->version = '6.0.4';
 	} /* }}} */
 
 	/**
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 6be1396ef..312b32c21 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.3";
+	public $_number = "6.0.4";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index 7ba4923a8..cb2e6bea7 100644
--- a/install/install.php
+++ b/install/install.php
@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "6.0.3");
+define("SEEDDMS_VERSION", "6.0.4");
 
 require_once('../inc/inc.ClassSettings.php');
 

From 57839377f81f0830e81e663a20298c9cf544858e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Feb 2018 22:36:26 +0100
Subject: [PATCH 0974/2006] remove duplicate code

---
 op/op.Ajax.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 106e31fdd..03f7a2b83 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -78,14 +78,6 @@ if (isset($_COOKIE["mydms_session"])) {
 		$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword));
 	}
 
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
-			if(method_exists($notificationObj, 'postAddService')) {
-				$notificationObj->postAddService($notifier);
-			}
-		}
-	}
-
 	if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 		foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
 			if(method_exists($notificationObj, 'postAddService')) {

From 663cbab2c619a9c98dbc7477ea66131653508ef1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Feb 2018 07:24:07 +0100
Subject: [PATCH 0975/2006] add item for 6.0.4

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1e91ea1ad..e1f43bac2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.4
 --------------------------------------------------------------------------------
+- merge changes up to 5.1.5
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.3

From 6ad630edf47774503768e7af3b1c8ffd8c08d3ad Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Feb 2018 17:07:45 +0100
Subject: [PATCH 0976/2006] turn of views as default

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 2 +-
 SeedDMS_Core/package.xml              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 336339a23..ff0776588 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -217,7 +217,7 @@ class SeedDMS_Core_DatabaseAccess {
 		$this->_ttcontentid = false;
 		$this->_ttreceiptid = false;
 		$this->_ttrevisionid = false;
-		$this->_useviews = true;
+		$this->_useviews = false; // turn off views, because they are much slower then temp. tables
 		$this->_debug = false;
 	} /* }}} */
 
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 5f83e1e04..f9670dd16 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -31,6 +31,8 @@ add lists of drafts and obsolete docs in SeedDMS_Core_DMS::getDocumentList()
 add fast sql statement to SeedDMS_Core_Document::getReceiptStatus() if limit=1
 add callback onCheckAccessDocument to SeedDMS_Core_Document::getAccessMode()
 add new document status 'needs correction' (S_NEEDS_CORRECTION)
+do not use views as a replacement for temp. tables anymore, because they are much
+slower.
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 795ca98b8f9f5604ec29301e5f387c94cc95cd69 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Feb 2018 18:32:01 +0100
Subject: [PATCH 0977/2006] create temp table ttreceiptid before using it

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 7b09115e3..c27c479a0 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3894,6 +3894,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			 * of records and join the other tables. ttreceiptid join tblDocumentRecipients
 			 * is faster than tblDocumentRecipients join ttreceiptid
 			 */
+			if (!$db->createTemporaryTable("ttreceiptid")) {
+				return false;
+			}
 			$queryStr=
 				"SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`receiptLogID`, `tblDocumentReceiptLog`.`status`, `tblDocumentReceiptLog`.`comment`, `tblDocumentReceiptLog`.`date`, `tblDocumentReceiptLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` FROM `ttreceiptid` LEFT JOIN `tblDocumentRecipients` ON `tblDocumentRecipients`.`receiptID`=`ttreceiptid`.`receiptID` LEFT JOIN `tblDocumentReceiptLog` ON `ttreceiptid`.`maxLogID`=`tblDocumentReceiptLog`.`receiptLogID` LEFT JOIN `tblUsers` ON `tblDocumentRecipients`.`required`=`tblUsers`.`id` LEFT JOIN `tblGroups` ON `tblDocumentRecipients`.`required`=`tblGroups`.`id` WHERE `version`='".$this->_version
 				."' AND `documentID` = '". $this->_document->getID() ."' ";

From aa4804cf561824c485b514de96b7c1d5e8ca99c7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Feb 2018 10:45:14 +0100
Subject: [PATCH 0978/2006] add missing keys

---
 install/create_tables-innodb.sql | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index f393d445d..ec1cb63c8 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -255,6 +255,7 @@ CREATE TABLE `tblDocumentApprovers` (
   UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
   CONSTRAINT `tblDocumentApprovers_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE INDEX `indDocumentApproversRequired` ON `tblDocumentApprovers` (`required`);
 
 -- --------------------------------------------------------
 
@@ -468,6 +469,8 @@ CREATE TABLE `tblDocumentReceiptLog` (
   `date` datetime NOT NULL,
   `userID` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`receiptLogID`),
+  KEY `tblDocumentReceiptLog_receipt` (`receiptID`),
+  KEY `tblDocumentReceiptLog_user` (`userID`),
   CONSTRAINT `tblDocumentReceiptLog_recipient` FOREIGN KEY (`receiptID`) REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
   CONSTRAINT `tblDocumentReceiptLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -505,6 +508,8 @@ CREATE TABLE `tblDocumentRevisionLog` (
   `date` datetime NOT NULL,
   `userID` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`revisionLogID`),
+  KEY `tblDocumentRevisionLog_revision` (`revisionID`),
+  KEY `tblDocumentRevisionLog_user` (`userID`),
   CONSTRAINT `tblDocumentRevisionLog_revision` FOREIGN KEY (`revisionID`) REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
   CONSTRAINT `tblDocumentRevisionLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -677,7 +682,6 @@ CREATE TABLE `tblMandatoryApprovers` (
   PRIMARY KEY (`userID`,`approverUserID`,`approverGroupID`),
   CONSTRAINT `tblMandatoryApprovers_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-CREATE INDEX `indDocumentApproversRequired` ON `tblDocumentApprovers` (`required`);
 
 -- --------------------------------------------------------
 

From 91b163a8253a392ccc7406d70f78e5a5fa3d8092 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Feb 2018 10:45:31 +0100
Subject: [PATCH 0979/2006] fix typo in index name

---
 install/create_tables-sqlite3.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 90405f89c..3c130dd2f 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -232,7 +232,7 @@ CREATE TABLE `tblDocumentApproveLog` (
   `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
-CREATE INDEX `indDocumentApproveLogReviewID` ON `tblDocumentApproveLog` (`approveID`);
+CREATE INDEX `indDocumentApproveLogApproveID` ON `tblDocumentApproveLog` (`approveID`);
 
 -- --------------------------------------------------------
 

From ffbc685752f560889a7c39026b5a0728408bac90 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Feb 2018 21:49:37 +0100
Subject: [PATCH 0980/2006] add missing indexes

---
 install/update-6.0.0/update-sqlite3.sql | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql
index 9629b1aeb..c33f05c59 100644
--- a/install/update-6.0.0/update-sqlite3.sql
+++ b/install/update-6.0.0/update-sqlite3.sql
@@ -30,6 +30,7 @@ CREATE TABLE `tblDocumentRecipients` (
   `required` INTEGER NOT NULL default '0',
   UNIQUE (`documentID`,`version`,`type`,`required`)
 ) ;
+CREATE INDEX `indDocumentRecipientsRequired` ON `tblDocumentRecipients` (`required`);
 
 CREATE TABLE `tblDocumentReceiptLog` (
   `receiptLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -39,6 +40,7 @@ CREATE TABLE `tblDocumentReceiptLog` (
   `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
+CREATE INDEX `indDocumentReceiptLogReceiptID` ON `tblDocumentReceiptLog` (`receiptID`);
 
 CREATE TABLE `tblDocumentRevisors` (
   `revisionID` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -49,6 +51,7 @@ CREATE TABLE `tblDocumentRevisors` (
   `startdate` TEXT default NULL,
   UNIQUE (`documentID`,`version`,`type`,`required`)
 ) ;
+CREATE INDEX `indDocumentRevisorsRequired` ON `tblDocumentRevisors` (`required`);
 
 CREATE TABLE `tblDocumentRevisionLog` (
   `revisionLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -58,8 +61,9 @@ CREATE TABLE `tblDocumentRevisionLog` (
   `date` TEXT NOT NULL,
   `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ;
+CREATE INDEX `indDocumentRevisionLogRevisionID` ON `tblDocumentRevisionLog` (`revisionID`);
 
-CREATE TABLE tblTransmittals (
+CREATE TABLE `tblTransmittals` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` text NOT NULL,
   `comment` text NOT NULL,
@@ -144,6 +148,12 @@ CREATE TABLE `tblArosAcos` (
   UNIQUE (aco, aro)
 ) ;
 
+CREATE INDEX `indDocumentStatusLogStatusID` ON `tblDocumentStatusLog` (`StatusID`);
+CREATE INDEX `indDocumentApproversRequired` ON `tblDocumentApprovers` (`required`);
+CREATE INDEX `indDocumentApproveLogApproveID` ON `tblDocumentApproveLog` (`approveID`);
+CREATE INDEX `indDocumentReviewersRequired` ON `tblDocumentReviewers` (`required`);
+CREATE INDEX `indDocumentReviewLogReviewID` ON `tblDocumentReviewLog` (`reviewID`);
+
 UPDATE tblVersion set major=6, minor=0, subminor=0;
 
 COMMIT;

From 03b3bfa4e43acbec859eb1287b0bed379f1ecb44 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Feb 2018 21:50:59 +0100
Subject: [PATCH 0981/2006] use upper case for sql keywords

---
 install/update-6.0.0/update.sql | 102 +++++++++++++++++---------------
 1 file changed, 53 insertions(+), 49 deletions(-)

diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index 1d75831de..526c51f33 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -1,15 +1,15 @@
 START TRANSACTION;
 
-ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` datetime default NULL;
+ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` datetime DEFAULT NULL;
 
-ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL AFTER `pwd`;
+ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) DEFAULT NULL AFTER `pwd`;
 
-ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text default NULL AFTER `initstate`;
+ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text DEFAULT NULL AFTER `initstate`;
 
 CREATE TABLE `tblUserSubstitutes` (
-  `id` int(11) NOT NULL auto_increment,
-  `user` int(11) default null,
-  `substitute` int(11) default null,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `user` int(11) DEFAULT null,
+  `substitute` int(11) DEFAULT null,
   PRIMARY KEY (`id`),
   UNIQUE (`user`, `substitute`),
   CONSTRAINT `tblUserSubstitutes_user` FOREIGN KEY (`user`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
@@ -17,80 +17,86 @@ CREATE TABLE `tblUserSubstitutes` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblDocumentCheckOuts` (
-  `document` int(11) NOT NULL default '0',
-  `version` smallint(5) unsigned NOT NULL default '0',
-  `userID` int(11) NOT NULL default '0',
+  `document` int(11) NOT NULL DEFAULT '0',
+  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `userID` int(11) NOT NULL DEFAULT '0',
   `date` datetime NOT NULL,
-  `filename` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`document`),
+  `filename` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`document`),
   CONSTRAINT `tblDocumentCheckOuts_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblDocumentCheckOuts_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblDocumentRecipients` (
-  `receiptID` int(11) NOT NULL auto_increment,
-  `documentID` int(11) NOT NULL default '0',
-  `version` smallint(5) unsigned NOT NULL default '0',
-  `type` tinyint(4) NOT NULL default '0',
-  `required` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`receiptID`),
+  `receiptID` int(11) NOT NULL AUTO_INCREMENT,
+  `documentID` int(11) NOT NULL DEFAULT '0',
+  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(4) NOT NULL DEFAULT '0',
+  `required` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`receiptID`),
   UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
   CONSTRAINT `tblDocumentRecipients_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE INDEX `indDocumentRecipientsRequired` ON `tblDocumentRecipients` (`required`);
 
 CREATE TABLE `tblDocumentReceiptLog` (
-  `receiptLogID` int(11) NOT NULL auto_increment,
-  `receiptID` int(11) NOT NULL default '0',
-  `status` tinyint(4) NOT NULL default '0',
+  `receiptLogID` int(11) NOT NULL AUTO_INCREMENT,
+  `receiptID` int(11) NOT NULL DEFAULT '0',
+  `status` tinyint(4) NOT NULL DEFAULT '0',
   `comment` text NOT NULL,
   `date` datetime NOT NULL,
-  `userID` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`receiptLogID`),
+  `userID` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`receiptLogID`),
+  KEY `tblDocumentReceiptLog_receipt` (`receiptID`),
+  KEY `tblDocumentReceiptLog_user` (`userID`),
   CONSTRAINT `tblDocumentReceiptLog_recipient` FOREIGN KEY (`receiptID`) REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
   CONSTRAINT `tblDocumentReceiptLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblDocumentRevisors` (
-  `revisionID` int(11) NOT NULL auto_increment,
-  `documentID` int(11) NOT NULL default '0',
-  `version` smallint(5) unsigned NOT NULL default '0',
-  `type` tinyint(4) NOT NULL default '0',
-  `required` int(11) NOT NULL default '0',
-  `startdate` datetime default NULL,
-  PRIMARY KEY  (`revisionID`),
+  `revisionID` int(11) NOT NULL AUTO_INCREMENT,
+  `documentID` int(11) NOT NULL DEFAULT '0',
+  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(4) NOT NULL DEFAULT '0',
+  `required` int(11) NOT NULL DEFAULT '0',
+  `startdate` datetime DEFAULT NULL,
+  PRIMARY KEY (`revisionID`),
   UNIQUE KEY `documentID` (`documentID`,`version`,`type`,`required`),
   CONSTRAINT `tblDocumentRevisors_document` FOREIGN KEY (`documentID`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE INDEX `indDocumentRevisorsRequired` ON `tblDocumentRevisors` (`required`);
 
 CREATE TABLE `tblDocumentRevisionLog` (
-  `revisionLogID` int(11) NOT NULL auto_increment,
-  `revisionID` int(11) NOT NULL default '0',
-  `status` tinyint(4) NOT NULL default '0',
+  `revisionLogID` int(11) NOT NULL AUTO_INCREMENT,
+  `revisionID` int(11) NOT NULL DEFAULT '0',
+  `status` tinyint(4) NOT NULL DEFAULT '0',
   `comment` text NOT NULL,
   `date` datetime NOT NULL,
-  `userID` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`revisionLogID`),
+  `userID` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`revisionLogID`),
+  KEY `tblDocumentRevisionLog_revision` (`revisionID`),
+  KEY `tblDocumentRevisionLog_user` (`userID`),
   CONSTRAINT `tblDocumentRevisionLog_revision` FOREIGN KEY (`revisionID`) REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
   CONSTRAINT `tblDocumentRevisionLog_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblTransmittals` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` text NOT NULL,
   `comment` text NOT NULL,
-  `userID` int(11) NOT NULL default '0',
-  `date` datetime default NULL,
-  `public` tinyint(1) NOT NULL default '0',
+  `userID` int(11) NOT NULL DEFAULT '0',
+  `date` datetime DEFAULT NULL,
+  `public` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY  (`id`),
   CONSTRAINT `tblTransmittals_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblTransmittalItems` (
-  `id` int(11) NOT NULL auto_increment,
-	`transmittal` int(11) NOT NULL DEFAULT '0',
-  `document` int(11) default NULL,
-  `version` smallint(5) unsigned NOT NULL default '0',
-  `date` datetime default NULL,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `transmittal` int(11) NOT NULL DEFAULT '0',
+  `document` int(11) DEFAULT NULL,
+  `version` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `date` datetime DEFAULT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE (transmittal, document, version),
   CONSTRAINT `tblTransmittalItems_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
@@ -98,10 +104,10 @@ CREATE TABLE `tblTransmittalItems` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tblRoles` (
-  `id` int(11) NOT NULL auto_increment,
-  `name` varchar(50) default NULL,
-  `role` smallint(1) NOT NULL default '0',
-  `noaccess` varchar(30) NOT NULL default '',
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL,
+  `role` smallint(1) NOT NULL DEFAULT '0',
+  `noaccess` varchar(30) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   UNIQUE (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -150,5 +156,3 @@ CREATE TABLE `tblArosAcos` (
 UPDATE tblVersion set major=6, minor=0, subminor=0;
 
 COMMIT;
-
-

From 981bcaf7d72806353c0444493ab143acf6572e7b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Feb 2018 06:15:15 +0100
Subject: [PATCH 0982/2006] override status may be called on 'needs correction'
 status

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index c9295c6c5..29253874c 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -110,7 +110,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_REJECTED || $status["status"]==S_OBSOLETE)) {
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_REJECTED || $status["status"]==S_OBSOLETE || $status["status"]==S_NEEDS_CORRECTION)) {
 					return true;
 				}
 			}

From af066bb15ba19b27713b2d0f399d39a53d4db3a5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Feb 2018 17:29:16 +0100
Subject: [PATCH 0983/2006] take out reviewers and uploaders from recipients

---
 op/op.SetRecipients.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 554af3267..6bf0436ff 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -85,6 +85,16 @@ foreach ($receiptStatus as $i=>$rs) {
 	}
 }
 
+/* Get List of ind. reviewers, because they are taken out from the receivers
+ * if added as group.
+ */
+$reviewStatus = $latestContent->getReviewStatus();
+$reviewerids = [];
+foreach ($reviewStatus as $r) {
+	if($r["type"] == 0 && $r["status"] > -2) {
+		$reviewerids[] = $r['required'];
+	}
+}
 // Get the list of proposed recipients, stripping out any duplicates.
 $pIndRev = (isset($_POST["indRecipients"]) ? array_values(array_unique($_POST["indRecipients"])) : array());
 // Retrieve the list of recipient groups whose members become individual recipients
@@ -93,8 +103,10 @@ if (isset($_POST["grpIndRecipients"])) {
 		if($group = $dms->getGroup($grp)) {
 			$members = $group->getUsers();
 			foreach($members as $member) {
-				if(!in_array($member->getID(), $pIndRev))
-					$pIndRev[] = $member->getID();
+				/* Do not add the uploader itself and reviewers */
+				if(!$settings->_enableFilterReceipt || ($member->getID() != $latestContent->getUser()->getID() && !in_array($member->getID(), $reviewerids)))
+					if(!in_array($member->getID(), $pIndRev))
+						$pIndRev[] = $member->getID();
 			}
 		}
 	}

From 87519d6d083758025db26cee8b971692c36ed882 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Feb 2018 17:29:49 +0100
Subject: [PATCH 0984/2006] do not add uploader and reviewer as recipient

---
 op/op.AddDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 463e7cc0a..1a89ac2b6 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -293,8 +293,8 @@ if (isset($_POST["grpIndRecipients"])) {
 		if($group = $dms->getGroup($grp)) {
 			$members = $group->getUsers();
 			foreach($members as $member) {
-				/* Do not add the uploader itself and approvers */
-				if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
+				/* Do not add the uploader itself and reviewers */
+				if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
 					$recipients["i"][] = $member->getID();
 			}
 		}

From 414532db25c16585c014025a89b25cd1b5b09ddd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Feb 2018 17:30:29 +0100
Subject: [PATCH 0985/2006] hook extraVersionItem() may return an array or a
 string

---
 views/bootstrap/class.ViewDocument.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f041cc390..c0b8cc56f 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -710,7 +710,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$items = $this->callHook('extraVersionActions', $latestContent);
 		if($items) {
 			foreach($items as $item) {
-				echo "<li>".$item."</li>";
+				if(is_string($item))
+					echo "<li>".$item."</li>";
+				elseif(is_array($item))
+					echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"icon-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
 			}
 		}
 

From cb287741d0bb4d3bd121f9c0051bfd7ee3f669a9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Feb 2018 12:34:51 +0100
Subject: [PATCH 0986/2006] add and use
 SeedDMS_Core_DocumentContent::getInstance()

---
 SeedDMS_Core/Core/inc.ClassDMS.php      | 15 ++---------
 SeedDMS_Core/Core/inc.ClassDocument.php | 34 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index fc8585bc0..d00e647bd 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -823,19 +823,8 @@ class SeedDMS_Core_DMS {
 	 * @return bool|SeedDMS_Core_Document or false
 	 */
 	function getDocumentContent($id) { /* {{{ */
-		if (!is_numeric($id)) return false;
-
-		$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `id` = ".(int) $id;
-		$resArr = $this->db->getResultArray($queryStr);
-		if (is_bool($resArr) && $resArr == false)
-			return false;
-		if (count($resArr) != 1)
-			return false;
-		$row = $resArr[0];
-
-		$document = $this->getDocument($row['document']);
-		$version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum']);
-		return $version;
+		$classname = $this->classnames['documentcontent'];
+		return $classname::getInstance($id, $this);
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index c27c479a0..862a1879a 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3120,6 +3120,40 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$this->_revisionDate = $revisionDate;
 	} /* }}} */
 
+	/**
+	 * Return an document content by its id
+	 *
+	 * @param integer $id id of document
+	 * @param SeedDMS_Core_DMS $dms
+	 * @return bool|SeedDMS_Core_DocumentContent instance of SeedDMS_Core_DocumentContent
+	 * if document content exists, null if document does not exist, false in case of error
+	 */
+	public static function getInstance($id, $dms) { /* {{{ */
+		$db = $dms->getDB();
+
+		$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `id` = " . (int) $id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr) != 1)
+			return null;
+		$row = $resArr[0];
+
+		$classname = $dms->getClassname('documentcontent');
+		$user = $dms->getLoggedInUser();
+		$document = $dms->getDocument($row['document']);
+		$document->setDMS($dms);
+		/** @var SeedDMS_Core_DocumentContent $documentcontent */
+		$content = new $classname($row["id"], $document, $row["version"], $row["comment"], $row["date"], $row["createdBy"], $row["dir"], $row["orgFileName"], $row["fileType"], $row["mimeType"], $row['fileSize'], $row['checksum'], $row['revisiondate']);
+		if($user) {
+			if($content->getAccessMode($user) >= M_READ)
+				return $content;
+		} else {
+			return $content;
+		}
+		return null;
+	} /* }}} */
+
 	function getVersion() { return $this->_version; }
 	function getComment() { return $this->_comment; }
 	function getDate() { return $this->_date; }

From 6548776cb30f65af75143516f521b782f613a039 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Feb 2018 12:39:51 +0100
Subject: [PATCH 0987/2006] new version 6.0.4

---
 SeedDMS_Core/package.xml | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index dc153a7b5..a8400d1c7 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -15,8 +15,8 @@
  <date>2018-02-14</date>
  <time>09:19:24</time>
  <version>
-  <release>6.0.3</release>
-  <api>6.0.3</api>
+  <release>6.0.4</release>
+  <api>6.0.4</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,15 +24,13 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-pass 0 as default to getObjects()
-SeedDMS_Core_AttributeDefinition::getStatistics() returns propper values for each item in a value set
-SeedDMS_Core_DMS::getDocumentList() returns list of documents without a receiver
 add lists of drafts and obsolete docs in SeedDMS_Core_DMS::getDocumentList()
 add fast sql statement to SeedDMS_Core_Document::getReceiptStatus() if limit=1
 add callback onCheckAccessDocument to SeedDMS_Core_Document::getAccessMode()
 add new document status 'needs correction' (S_NEEDS_CORRECTION)
 do not use views as a replacement for temp. tables anymore, because they are much
 slower.
+add SeedDMS_Core_DocumentContent::getInstance()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1661,5 +1659,24 @@ are any waiting or pending revisions at all
 - getTimeline() also returns data for documents with a scheduled revision
    </notes>
   </release>
+  <release>
+   <date>2018-01-23</date>
+   <time>09:19:24</time>
+   <version>
+    <release>6.0.3</release>
+    <api>6.0.3</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+pass 0 as default to getObjects()
+SeedDMS_Core_AttributeDefinition::getStatistics() returns propper values for each item in a value set
+SeedDMS_Core_DMS::getDocumentList() returns list of documents without a receiver
+   </notes>
+  </release>
+ </notes>
  </changelog>
 </package>

From a6d16911e862149ff0c0f033ddd2594f1bde2f95 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Feb 2018 12:40:45 +0100
Subject: [PATCH 0988/2006] fix xml error

---
 SeedDMS_Core/package.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index a8400d1c7..9d5f3e815 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1677,6 +1677,5 @@ SeedDMS_Core_AttributeDefinition::getStatistics() returns propper values for eac
 SeedDMS_Core_DMS::getDocumentList() returns list of documents without a receiver
    </notes>
   </release>
- </notes>
  </changelog>
 </package>

From 656c4b0b7f9937521544893bbea9679a6c630909 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Feb 2018 15:28:27 +0100
Subject: [PATCH 0989/2006] optimize query for searching documents

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index d00e647bd..791e97e66 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2050,13 +2050,13 @@ class SeedDMS_Core_DMS {
 				}
 			}
 
-			$searchQuery = "FROM `tblDocumentContent` ".
-				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
+			$searchQuery = "FROM `tblDocuments` ".
+				"LEFT JOIN `tblDocumentContent` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
 				"LEFT JOIN `tblDocumentAttributes` ON `tblDocuments`.`id` = `tblDocumentAttributes`.`document` ".
 				"LEFT JOIN `tblDocumentContentAttributes` ON `tblDocumentContent`.`id` = `tblDocumentContentAttributes`.`content` ".
 				"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
-				"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
-				"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
+				"LEFT JOIN `ttstatid` ON `ttstatid`.`statusID` = `tblDocumentStatus`.`statusID` ".
+				"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusLogID` = `ttstatid`.`maxLogID` ".
 				"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
 				"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
 				"LEFT JOIN `tblDocumentCategory` ON `tblDocuments`.`id`=`tblDocumentCategory`.`documentID` ".

From 8528cd12ef1c544c4fbe5ce7cd1674bed5e0def8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Feb 2018 17:19:49 +0100
Subject: [PATCH 0990/2006] fix filtering of uploader and reviewers

---
 op/op.SetRecipients.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 6bf0436ff..3ccf5918e 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -88,7 +88,7 @@ foreach ($receiptStatus as $i=>$rs) {
 /* Get List of ind. reviewers, because they are taken out from the receivers
  * if added as group.
  */
-$reviewStatus = $latestContent->getReviewStatus();
+$reviewStatus = $content->getReviewStatus();
 $reviewerids = [];
 foreach ($reviewStatus as $r) {
 	if($r["type"] == 0 && $r["status"] > -2) {
@@ -104,7 +104,7 @@ if (isset($_POST["grpIndRecipients"])) {
 			$members = $group->getUsers();
 			foreach($members as $member) {
 				/* Do not add the uploader itself and reviewers */
-				if(!$settings->_enableFilterReceipt || ($member->getID() != $latestContent->getUser()->getID() && !in_array($member->getID(), $reviewerids)))
+				if(!$settings->_enableFilterReceipt || ($member->getID() != $content->getUser()->getID() && !in_array($member->getID(), $reviewerids)))
 					if(!in_array($member->getID(), $pIndRev))
 						$pIndRev[] = $member->getID();
 			}

From 836bff3ea07f74a847419b873fa76e00f8eb197b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Feb 2018 17:20:47 +0100
Subject: [PATCH 0991/2006] add item for 6.0.4

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d4114c907..9da371041 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,8 @@
 - apache xsendfile module is used for downloading documents when installed
 - add view access check for ApprovalSummary, ReviewSummary, ReceiptSummary,
   WorkflowSummary, DocumentAccess, GroupView, UsrView, WorkflowSummary
+- filter out reviewers and uploader of a document version when setting recipients
+  by user group
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.2

From e3664780e974f4134cf7e0af9b4b60357d836a0d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Feb 2018 07:42:11 +0100
Subject: [PATCH 0992/2006] started new version 6.0.5

---
 Makefile                           |  2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 35 +++++++++++++++++++++---------
 inc/inc.Version.php                |  2 +-
 install/install.php                |  2 +-
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index f4e499fcb..337937e4e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=6.0.4
+VERSION=6.0.5
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 6a30511c3..f1392fceb 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -451,7 +451,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.4';
+			$this->version = '6.0.5';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index fcdf648f7..463c3196e 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-02-14</date>
+ <date>2018-02-27</date>
  <time>09:19:24</time>
  <version>
-  <release>6.0.4</release>
-  <api>6.0.4</api>
+  <release>6.0.5</release>
+  <api>6.0.5</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,13 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-add lists of drafts and obsolete docs in SeedDMS_Core_DMS::getDocumentList()
-add fast sql statement to SeedDMS_Core_Document::getReceiptStatus() if limit=1
-add callback onCheckAccessDocument to SeedDMS_Core_Document::getAccessMode()
-add new document status 'needs correction' (S_NEEDS_CORRECTION)
-do not use views as a replacement for temp. tables anymore, because they are much
-slower.
-add SeedDMS_Core_DocumentContent::getInstance()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1678,5 +1671,27 @@ SeedDMS_Core_AttributeDefinition::getStatistics() returns propper values for eac
 SeedDMS_Core_DMS::getDocumentList() returns list of documents without a receiver
    </notes>
   </release>
+  <release>
+   <date>2018-02-14</date>
+   <time>09:19:24</time>
+   <version>
+    <release>6.0.4</release>
+    <api>6.0.4</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+add lists of drafts and obsolete docs in SeedDMS_Core_DMS::getDocumentList()
+add fast sql statement to SeedDMS_Core_Document::getReceiptStatus() if limit=1
+add callback onCheckAccessDocument to SeedDMS_Core_Document::getAccessMode()
+add new document status 'needs correction' (S_NEEDS_CORRECTION)
+do not use views as a replacement for temp. tables anymore, because they are much
+slower.
+add SeedDMS_Core_DocumentContent::getInstance()
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 312b32c21..5df184501 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.4";
+	public $_number = "6.0.5";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index cb2e6bea7..0998dd492 100644
--- a/install/install.php
+++ b/install/install.php
@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "6.0.4");
+define("SEEDDMS_VERSION", "6.0.5");
 
 require_once('../inc/inc.ClassSettings.php');
 

From 66aa7edbf5904edb60a6e26db4323cec62662bd0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Feb 2018 14:40:19 +0100
Subject: [PATCH 0993/2006] filter out reviewer and uploader from recipients

---
 op/op.CheckInDocument.php | 2 +-
 op/op.UpdateDocument.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 1269e732d..73fdb7f54 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -197,7 +197,7 @@ else
 				$members = $group->getUsers();
 				foreach($members as $member) {
 					/* Do not add the uploader itself and approvers */
-					if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
+					if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
 						$recipients["i"][] = $member->getID();
 				}
 			}
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index e64dbc1fd..aa533fa2b 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -309,7 +309,7 @@ default:
 				$members = $group->getUsers();
 				foreach($members as $member) {
 					/* Do not add the uploader itself and approvers */
-					if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
+					if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
 						$recipients["i"][] = $member->getID();
 				}
 			}

From 0bb10352618ba1e88602548f2ff1ff2676da6071 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Feb 2018 16:12:36 +0100
Subject: [PATCH 0994/2006] sync with UpdateDocument

use same way to select expiration date, call hook
editDocumentContenAttributes, fix checking form
---
 views/bootstrap/class.CheckInDocument.php | 71 +++++++++++++++++------
 1 file changed, 54 insertions(+), 17 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 49380a4f2..751703c34 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -29,18 +29,14 @@ class SeedDMS_View_CheckInDocument extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
-		$dropfolderdir = $this->params['dropfolderdir'];
 		header('Content-Type: application/javascript; charset=UTF-8');
 		$this->printSelectPresetButtonJs();
+		$this->printInputPresetButtonJs();
+		$this->printCheckboxPresetButtonJs();
 ?>
 function checkForm()
 {
 	msg = new Array();
-<?php if($dropfolderdir) { ?>
-	if (document.form1.userfile.value == "" && document.form1.dropfolderfileform1.value == "") msg.push("<?php printMLText("js_no_file");?>");
-<?php } else { ?>
-	if (document.form1.userfile.value == "") msg.push("<?php printMLText("js_no_file");?>");
-<?php } ?>
 <?php
 	if ($strictformcheck) {
 	?>
@@ -68,6 +64,12 @@ $(document).ready(function() {
 		if(checkForm()) return;
 		event.preventDefault();
 	});
+	$('#presetexpdate').on('change', function(ev){
+		if($(this).val() == 'date')
+			$('#control_expdate').show();
+		else
+			$('#control_expdate').hide();
+	});
 });
 <?php
 	} /* }}} */
@@ -83,7 +85,6 @@ $(document).ready(function() {
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
 		$enableselfreceipt = $this->params['enableselfreceipt'];
-		$dropfolderdir = $this->params['dropfolderdir'];
 		$workflowmode = $this->params['workflowmode'];
 		$presetexpiration = $this->params['presetexpiration'];
 		$documentid = $document->getId();
@@ -162,39 +163,75 @@ $(document).ready(function() {
 		<tr>
 			<td><?php printMLText("comment");?>:</td>
 			<td class="standardText">
-				<textarea name="comment" rows="4" cols="80"></textarea>
+				<textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea>
 			</td>
 		</tr>
 <?php
 			if($presetexpiration) {
 				if(!($expts = strtotime($presetexpiration)))
-					$expts = time();
+					$expts = false;
 			} else {
-				$expts = time();
+				$expts = false;
 			}
 ?>
 		<tr>
+			<td><?php printMLText("preset_expires");?>:</td>
+			<td>
+				<select class="span6" name="presetexpdate" id="presetexpdate">
+					<option value="never"><?php printMLText('does_not_expire');?></option>
+					<option value="date"<?php echo ($expts != '' ? " selected" : ""); ?>><?php printMLText('expire_by_date');?></option>
+					<option value="1w"><?php printMLText('expire_in_1w');?></option>
+					<option value="1m"><?php printMLText('expire_in_1m');?></option>
+					<option value="1y"><?php printMLText('expire_in_1y');?></option>
+					<option value="2y"><?php printMLText('expire_in_2y');?></option>
+				</select>
+			</td>
+		</tr>
+		<tr id="control_expdate" <?php echo ($expts == false ? 'style="display: none;"' : ''); ?>>
 			<td><?php printMLText("expires");?>:</td>
 			<td class="standardText">
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y', $expts); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y', $expts); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span3" size="16" name="expdate" type="text" value="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
-        </span><br />
-        <label class="checkbox inline">
-				  <input type="checkbox" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
-        </label>
+        </span>
 			</td>
 		</tr>
 <?php
 	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
 	if($attrdefs) {
 		foreach($attrdefs as $attrdef) {
+			$arr = $this->callHook('editDocumentContentAttribute', $document, $attrdef);
+			if(is_array($arr)) {
+				if($arr) {
+					echo "<tr>";
+					echo "<td>".$arr[0].":</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				}
+			} else {
 ?>
     <tr>
 	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	    <td><?php $this->printAttributeEditField($attrdef, '') ?></td>
+	    <td><?php $this->printAttributeEditField($attrdef, '', 'attributes_version') ?>
+<?php
+			if($latestContent->getAttributeValue($attrdef)) {
+				switch($attrdef->getType()) {
+				case SeedDMS_Core_AttributeDefinition::type_string:
+				case SeedDMS_Core_AttributeDefinition::type_date:
+				case SeedDMS_Core_AttributeDefinition::type_int:
+				case SeedDMS_Core_AttributeDefinition::type_float:
+					$this->printInputPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
+					break;
+				case SeedDMS_Core_AttributeDefinition::type_boolean:
+					$this->printCheckboxPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
+					break;
+				}
+//				print_r($latestContent->getAttributeValue($attrdef));
+			}
+?></td>
     </tr>
 <?php
+			}
 		}
 	}
 	if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {

From 2a234307a3d13a4e2fd8a1f72e28c09689ff696b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Feb 2018 18:11:32 +0100
Subject: [PATCH 0995/2006] fix setting of expiration date

---
 op/op.CheckInDocument.php | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 73fdb7f54..e0c63f32b 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -362,17 +362,35 @@ else
 			}
 		}
 
-		$expires = false;
-		if (!isset($_POST['expires']) || $_POST["expires"] != "false") {
-			if($_POST["expdate"]) {
-				$tmp = explode('-', $_POST["expdate"]);
-				$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
-			} else {
-				$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
-			}
+		$oldexpires = $document->getExpires();
+		switch($_POST["presetexpdate"]) {
+		case "date":
+			$tmp = explode('-', $_POST["expdate"]);
+			$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
+			break;
+		case "1w":
+			$tmp = explode('-', date('Y-m-d'));
+			$expires = mktime(0,0,0, $tmp[1], $tmp[2]+7, $tmp[0]);
+			break;
+		case "1m":
+			$tmp = explode('-', date('Y-m-d'));
+			$expires = mktime(0,0,0, $tmp[1]+1, $tmp[2], $tmp[0]);
+			break;
+		case "1y":
+			$tmp = explode('-', date('Y-m-d'));
+			$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+1);
+			break;
+		case "2y":
+			$tmp = explode('-', date('Y-m-d'));
+			$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
+			break;
+		case "never":
+		default:
+			$expires = null;
+			break;
 		}
 
-		if ($expires) {
+		if($oldexpires != $expires) {
 			if($document->setExpires($expires)) {
 				if($notifier) {
 					$notifyList = $document->getNotifyList();

From 1ea5575fa83623668e87bc8de04897caf7fa99ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Feb 2018 18:12:59 +0100
Subject: [PATCH 0996/2006] fix output of extra actions for previous versions

---
 views/bootstrap/class.ViewDocument.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index c0b8cc56f..8ba83a35d 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1532,7 +1532,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$items = $this->callHook('extraVersionActions', $version);
 				if($items) {
 					foreach($items as $item) {
-						echo "<li>".$item."</li>";
+						if(is_string($item))
+							echo "<li>".$item."</li>";
+						elseif(is_array($item))
+							echo "<li><a href=\"".$item['link']."\">".(!empty($item['icon']) ? "<i class=\"icon-".$item['icon']."\"></i>" : "").getMLText($item['label'])."</a></li>";
 					}
 				}
 				print "</ul>";

From 40dda18f5ab5a50c1f509a99632190dd9be6f5fd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Feb 2018 18:16:22 +0100
Subject: [PATCH 0997/2006] propperly pass enabelSelfReceipt to view

---
 out/out.CheckInDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index a33ee214d..7980a3025 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -72,7 +72,7 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
-	$view->setParam('enableselfrec', $settings->_enableSelfReceipt);
+	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('presetexpiration', $settings->_presetExpirationDate);

From eda033babef4359be2fb6bcc071100dacae819b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Feb 2018 18:16:42 +0100
Subject: [PATCH 0998/2006] start changelog for 6.0.5

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index db9651125..043e697ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.5
+--------------------------------------------------------------------------------
+- sync form for updating document by upload and checkin
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.4
 --------------------------------------------------------------------------------

From 0066d29650da9deda1e862057bb759147f3d65a5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Mar 2018 21:29:12 +0100
Subject: [PATCH 0999/2006] add listNeedsCorrection

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 18 ++++++++++++++++++
 SeedDMS_Core/package.xml           |  1 +
 2 files changed, 19 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index f1392fceb..25e538046 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1592,6 +1592,24 @@ class SeedDMS_Core_DMS {
 			else $queryStr .= "ORDER BY `name`";
 			$queryStr .= " ".$orderdir;
 			break; // }}}
+		case 'NeedsCorrectionOwner': // Documents that needs correction and I'm owning {{{
+			$queryStr .= "WHERE 1=1 ";
+
+			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+			$queryStr .= "AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_NEEDS_CORRECTION.") ";
+			//$queryStr .= "ORDER BY `statusDate` DESC";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			break; // }}}
 		case 'DraftOwner': // Documents in draft status and I'm owning {{{
 			$queryStr .= "WHERE 1=1 ";
 
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 463c3196e..ebb8c5f93 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+add list 'NeedsCorrectionOwner' to SeedDMS_Core_DMS::getDocumentList()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 7008b11f64d44ac608d16cea333a99de13bee789 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Mar 2018 21:29:53 +0100
Subject: [PATCH 1000/2006] add list for documents that need correction

---
 views/bootstrap/class.MyDocuments.php | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 64d5dfb25..822f23534 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -586,6 +586,36 @@ $(document).ready( function() {
 
 	} /* }}} */
 
+	function listNeedsCorrectionOwner() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$orderdir = $this->params['orderdir'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		/* Get list of obsolete documents and owned by current user */
+		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user, false, $orderby, $orderdir);
+		if (is_bool($resArr) && !$resArr) {
+			$this->contentHeading(getMLText("warning"));
+			$this->contentContainer(getMLText("internal_error_exit"));
+			$this->htmlEndPage();
+			exit;
+		}
+
+		$this->contentHeading(getMLText("documents_user_needs_correction"));
+		if ($resArr) {
+			$this->printList($resArr, $previewer, 'listNeedsCorrectionOwner');
+		}
+		else printMLText("no_docs_needs_correction");
+
+	} /* }}} */
+
 	function listDraftOwner() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -688,6 +718,8 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
 		$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_obsolete" data-action="listObsoleteOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_obsolete").'</a></li>';
+		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_needs_correction" data-action="listNeedsCorrectionOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_needs_correction").'</a></li>';
 		echo '</ul>';
 		$this->contentHeading(getMLText("tasks"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';

From d78b165322c93a8e29da6c162bcdd35058e7a654 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Mar 2018 21:30:14 +0100
Subject: [PATCH 1001/2006] add item for 6.0.5

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 043e697ce..eac0d3ffc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.5
 --------------------------------------------------------------------------------
 - sync form for updating document by upload and checkin
+- add list of documents which need correction on MyDocuments page
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.4

From 7fe44b6644319de34b7663015d2a2370a70f2fb4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Mar 2018 21:30:30 +0100
Subject: [PATCH 1002/2006] add newline to last line

---
 styles/bootstrap/noty/layouts/topRight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles/bootstrap/noty/layouts/topRight.js b/styles/bootstrap/noty/layouts/topRight.js
index 8022c4024..9fb3c5c9b 100644
--- a/styles/bootstrap/noty/layouts/topRight.js
+++ b/styles/bootstrap/noty/layouts/topRight.js
@@ -40,4 +40,4 @@
 		addClass: ''
 	};
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);

From 841cd2cfaf80c75336cc6d279a89db496320afca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 17:16:02 +0100
Subject: [PATCH 1003/2006] fix setting attributes

used the wrong field name
---
 views/bootstrap/class.CheckInDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 751703c34..c6310934e 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -212,7 +212,7 @@ $(document).ready(function() {
 ?>
     <tr>
 	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	    <td><?php $this->printAttributeEditField($attrdef, '', 'attributes_version') ?>
+	    <td><?php $this->printAttributeEditField($attrdef, '', 'attributes') ?>
 <?php
 			if($latestContent->getAttributeValue($attrdef)) {
 				switch($attrdef->getType()) {
@@ -220,10 +220,10 @@ $(document).ready(function() {
 				case SeedDMS_Core_AttributeDefinition::type_date:
 				case SeedDMS_Core_AttributeDefinition::type_int:
 				case SeedDMS_Core_AttributeDefinition::type_float:
-					$this->printInputPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
+					$this->printInputPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
 					break;
 				case SeedDMS_Core_AttributeDefinition::type_boolean:
-					$this->printCheckboxPresetButtonHtml('attributes_version_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
+					$this->printCheckboxPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
 					break;
 				}
 //				print_r($latestContent->getAttributeValue($attrdef));

From dda5ec7d13476fb3c8b2ba407208f57abf439f8d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 17:26:11 +0100
Subject: [PATCH 1004/2006] fix comment

---
 op/op.CheckInDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index e0c63f32b..f8b1b2880 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -196,7 +196,7 @@ else
 			if($group = $dms->getGroup($grp)) {
 				$members = $group->getUsers();
 				foreach($members as $member) {
-					/* Do not add the uploader itself and approvers */
+					/* Do not add the uploader itself and reviewers */
 					if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
 						$recipients["i"][] = $member->getID();
 				}

From 9605989054397af72219cf4e586a45006e2d14bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Mar 2018 20:08:04 +0100
Subject: [PATCH 1005/2006] start version 6.0.6

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index eac0d3ffc..d8c09fad9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.6
+--------------------------------------------------------------------------------
+- fix setting attributes when checking in a new document version
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.5
 --------------------------------------------------------------------------------

From 31d3d491b51bafabfbc26368af3714642135cdea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Mar 2018 13:39:08 +0100
Subject: [PATCH 1006/2006] add changelog entry for 6.0.6

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9e27ac956..d5552bb0a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.6
 --------------------------------------------------------------------------------
 - fix setting attributes when checking in a new document version
+- merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.5

From 9b2eecca0ed1f0b937d34d84ea4bbedf80b860a7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Mar 2018 17:51:44 +0100
Subject: [PATCH 1007/2006] rejecting a revision will neccesarily put document
 in need correction status

---
 controllers/class.ReviseDocument.php | 33 +++++++++++++++++++++++-----
 inc/inc.ClassSettings.php            |  4 ++++
 op/op.ReviseDocument.php             |  1 +
 op/op.Settings.php                   |  1 +
 views/bootstrap/class.Settings.php   |  4 ++++
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php
index 35106984d..ccee171e5 100644
--- a/controllers/class.ReviseDocument.php
+++ b/controllers/class.ReviseDocument.php
@@ -33,6 +33,13 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 		$group = $this->params['group'];
 		$comment = $this->params['comment'];
 
+		/* if set to true, a single reject will reject the doc. If set to false
+		 * all revisions will be collected first and afterwards the doc is rejected
+		 * if one has rejected it. So in the very end the doc is rejected, but
+		 * doc remainѕ in S_IN_REVISION until all have revised the doc
+		 */
+		$onevotereject = $this->param['onevotereject'];
+
 		/* Get the document id and name before removing the document */
 		$docname = $document->getName();
 		$documentid = $document->getID();
@@ -63,7 +70,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 		 */
 		$result = $this->callHook('reviseUpdateDocumentStatus', $content);
 		if($result === null) {
-			if ($revisionstatus == -1){
+			if ($onevotereject && $revisionstatus == -1){
 				if(!$content->setStatus(S_NEEDS_CORRECTION,$comment,$user)) {
 					$this->error = 1;
 					$this->errormsg = "revision_update_failed";
@@ -76,24 +83,38 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 					$this->errormsg = "cannot_retrieve_revision_snapshot";
 					return false;
 				}
-				$revisionCT = 0;
+				$revisionok = 0;
+				$revisionnotok = 0;
 				$revisionTotal = 0;
 				foreach ($docRevisionStatus as $drstat) {
 					if ($drstat["status"] == 1) {
-						$revisionCT++;
+						$revisionok++;
+					}
+					if ($drstat["status"] == -1) {
+						$revisionnotok++;
 					}
 					if ($drstat["status"] != -2) {
 						$revisionTotal++;
 					}
 				}
-				// If all revisions have been received and there are no rejections,
-				// then release the document otherwise put it back into revision workflow
-				if ($revisionCT == $revisionTotal) {
+				// If all revisions have been done and there are no rejections,
+				// then release the document. If all revisions have been done but some
+				// of them were rejections then documents needs correction.
+				// Otherwise put it back into revision workflow
+				if ($revisionok == $revisionTotal) {
 					$newStatus=S_RELEASED;
 					if ($content->finishRevision($user, $newStatus, 'Finished revision workflow', getMLText("automatic_status_update"))) {
 						if(!$this->callHook('finishReviseDocument', $content)) {
 						}
 					}
+				} elseif (($revisionok + $revisionnotok) == $revisionTotal) {
+					$newStatus=S_NEEDS_CORRECTION;
+//					if ($content->finishRevision($user, $newStatus, 'Finished revision workflow', getMLText("automatic_status_update"))) {
+					if(!$content->setStatus($newStatus,$comment,$user)) {
+						$this->error = 1;
+						$this->errormsg = "revision_update_failed";
+						return false;
+					}
 				} else {
 					$newStatus=S_IN_REVISION;
 					if(!$content->setStatus($newStatus,$comment,$user)) {
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 0a4d25dfa..2e7bd7253 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -186,6 +186,8 @@ class Settings { /* {{{ */
 	var $_enableAcknowledgeWorkflow = true;
 	// enable/disable revision workflow
 	var $_enableRevisionWorkflow = true;
+	// enable/disable revision on vote reject
+	var $_enableRevisionOnVoteReject = true;
 	// Allow to set just a reviewer in tradional workflow
 	var $_allowReviewerOnly = true;
 	// enable/disable log system
@@ -649,6 +651,7 @@ class Settings { /* {{{ */
 		$this->_workflowMode = strval($tab["workflowMode"]);
 		$this->_enableAcknowledgeWorkflow = strval($tab["enableAcknowledgeWorkflow"]);
 		$this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]);
+		$this->_enableRevisionOnVoteReject = strval($tab["enableRevisionOnVoteReject"]);
 		$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
 		$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
 		$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
@@ -965,6 +968,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
     $this->setXMLAttributValue($node, "enableAcknowledgeWorkflow", $this->_enableAcknowledgeWorkflow);
     $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
+    $this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject);
     $this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);
     $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index 307550976..a96f2b86d 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -92,6 +92,7 @@ if ($_POST["revisionType"] == "grp") {
 }
 $controller->setParam('group', $group);
 $controller->setParam('comment', $_POST["comment"]);
+$controller->setParam('onevotereject', $settins->_enableRevisionOnVoteReject);
 if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 68aa131e0..c665200d8 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -180,6 +180,7 @@ if ($action == "saveSettings")
   $settings->_workflowMode = $_POST["workflowMode"];
   $settings->_enableAcknowledgeWorkflow = getBoolValue("enableAcknowledgeWorkflow");
   $settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow");
+  $settings->_enableRevisionOnVoteReject = getBoolValue("enableRevisionOnVoteReject");
   $settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly");
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 74cb9afc0..65540b35a 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -678,6 +678,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableRevisionWorkflow");?>:</td>
         <td><input name="enableRevisionWorkflow" type="checkbox" <?php if ($settings->_enableRevisionWorkflow) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableRevisionOnVoteReject_desc");?>">
+        <td><?php printMLText("settings_enableRevisionOnVoteReject");?>:</td>
+        <td><input name="enableRevisionOnVoteReject" type="checkbox" <?php if ($settings->_enableRevisionOnVoteReject) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_versioningFileName_desc");?>">
         <td><?php printMLText("settings_versioningFileName");?>:</td>
         <td><?php $this->showTextField("versioningFileName", $settings->_versioningFileName); ?></td>

From edffd85f9445455ccffdc6784f95a3780c57caf5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Mar 2018 17:54:13 +0100
Subject: [PATCH 1008/2006] add entry for 6.0.6

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d5552bb0a..03e70fe26 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
                      Changes in version 6.0.6
 --------------------------------------------------------------------------------
 - fix setting attributes when checking in a new document version
+- setting a document revision to 'needs correction' will no longer set the
+  documents status to 'needѕ correction' if this was turned off in the settings
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From 0c0669fbbda02835c9052b516644c8d39f3dd6da Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Mar 2018 17:05:27 +0100
Subject: [PATCH 1009/2006] do not release a document in verifyStatus() if in
 draft status

---
 CHANGELOG                               |  2 ++
 SeedDMS_Core/Core/inc.ClassDocument.php |  3 ++-
 SeedDMS_Core/package.xml                | 26 +++++++++++++++++++++----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4eb3f0ea1..c5f49d778 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@
 - fix setting attributes when checking in a new document version
 - setting a document revision to 'needs correction' will no longer set the
   documents status to 'needѕ correction' if this was turned off in the settings
+- a document will not leave draft status when setting the approver/reviewer
+  without setting a reviewer/approver
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index f2344ca74..fbe7647a5 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3094,7 +3094,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user);
 		elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user);
 		elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user);
-		else $this->setStatus(S_RELEASED,$msg,$user);
+		/* A document in status S_DRAFT will never go into S_RELEASED */
+		elseif ($st["status"]!=S_DRAFT) $this->setStatus(S_RELEASED,$msg,$user);
 	} /* }}} */
 
 	function __construct($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='', $revisionDate=null) { /* {{{ */
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ebb8c5f93..cd247a9ac 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-02-27</date>
+ <date>2018-03-14</date>
  <time>09:19:24</time>
  <version>
-  <release>6.0.5</release>
-  <api>6.0.5</api>
+  <release>6.0.6</release>
+  <api>6.0.6</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,9 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-add list 'NeedsCorrectionOwner' to SeedDMS_Core_DMS::getDocumentList()
+SeedDMS_Core_DocumentContent::verifyStatus() will not set status to S_RELEASED
+if currently in S_DRAFT status und no workflow, review, approval, or revision
+is pending.
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1694,5 +1696,21 @@ slower.
 add SeedDMS_Core_DocumentContent::getInstance()
    </notes>
   </release>
+  <release>
+   <date>2018-02-27</date>
+   <time>09:19:24</time>
+   <version>
+    <release>6.0.5</release>
+    <api>6.0.5</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+add list 'NeedsCorrectionOwner' to SeedDMS_Core_DMS::getDocumentList()
+   </notes>
+  </release>
  </changelog>
 </package>

From f6ba941e68deecf83a9cc8c7eb69d024e3515307 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 07:25:22 +0100
Subject: [PATCH 1010/2006] do not show groups as reviewer/approver without
 members

---
 views/bootstrap/class.CheckInDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index c6310934e..aebf2df4e 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -341,7 +341,7 @@ $(document).ready(function() {
 					$mandatory=false;
 					foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+					if ($mandatory || !$grp->getUsers()) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
 					else print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
 				}
 ?>
@@ -503,7 +503,7 @@ $(document).ready(function() {
 					$mandatory=false;
 					foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
+					if ($mandatory || !$grp->getUsers()) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
 					else print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
 
 				}

From 6211014896997958f8f3c5513904d86d6acb5d6d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 10:09:23 +0100
Subject: [PATCH 1011/2006] new version 6.0.6

---
 Makefile                           | 2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 inc/inc.Version.php                | 2 +-
 install/install.php                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d0a25fe22..93ffe7c98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=6.0.5
+VERSION=6.0.6
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 25e538046..041205298 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -451,7 +451,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.5';
+			$this->version = '6.0.6';
 	} /* }}} */
 
 	/**
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 5df184501..d0f0cdc70 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.5";
+	public $_number = "6.0.6";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index 1642f2c80..d9dee4f5f 100644
--- a/install/install.php
+++ b/install/install.php
@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "6.0.5");
+define("SEEDDMS_VERSION", "6.0.6");
 
 require_once('../inc/inc.ClassSettings.php');
 

From 20d1a2695b79385fbef3feb9300f832453475ef9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 11:06:11 +0100
Subject: [PATCH 1012/2006] check if _converters['pdf'] is set, before passing
 to view

---
 out/out.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 9b23d9608..f29dbe72d 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -84,7 +84,7 @@ if($view) {
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
 	$view->setParam('previewConverters', $settings->_converters['preview']);
 	$view->setParam('checkOutDir', $settings->_checkOutDir);
-	$view->setParam('pdfConverters', $settings->_converters['pdf']);
+	$view->setParam('pdfConverters', isset($settings->_converters['pdf']) ? $settings->_converters['pdf'] : null);
 	$view->setParam('showFullPreview', $settings->_showFullPreview);
 	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : "");

From 26d3c7a504ad0ca1bd061e9e463248a9f915219b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 11:06:38 +0100
Subject: [PATCH 1013/2006] do not set status for scheduled_revision in
 timeline data

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8ba83a35d..486a22ca5 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -161,7 +161,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
 					break;
 				case 'scheduled_revision':
-					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
 					break;
 				default:
 					$msg = '???';

From 49af6ab171f5e9af7fb4254fd53bfa46b0a59c21 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 11:08:08 +0100
Subject: [PATCH 1014/2006] make sure list of converters is an array, start new
 version 1.2.9

---
 SeedDMS_Preview/Preview/Base.php |  6 +++++-
 SeedDMS_Preview/package.xml      | 22 +++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index 4d6b9cf1f..d00003379 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -55,6 +55,7 @@ class SeedDMS_Preview_Base {
 			$this->previewDir = $previewDir;
 		}
 		$this->timeout = intval($timeout);
+		$this->converters = array();
 	} /* }}} */
 
 	static function execWithTimeout($cmd, $timeout=5) { /* {{{ */
@@ -109,7 +110,10 @@ class SeedDMS_Preview_Base {
 	 * and the value is the command to be called for creating the preview
 	 */
 	function setConverters($arr) { /* {{{ */
-		$this->converters = $arr;
+		if(is_array($arr))
+			$this->converters = $arr;
+		else
+			$this->converters = array();
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 2afd6da7b..9e39935d3 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-03-08</date>
+ <date>2018-03-20</date>
  <time>10:59:39</time>
  <version>
-  <release>1.2.8</release>
+  <release>1.2.9</release>
   <api>1.2.0</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-preview is also created if SeedDMS_Core_DocumentContent has a child class
+make sure list of converters is always an array
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -370,5 +370,21 @@ mod_xsendfile if available
 execWithTimeout() reads data from stderr and returns it together with stdout in array
    </notes>
   </release>
+  <release>
+   <date>2018-03-08</date>
+   <time>10:59:39</time>
+   <version>
+    <release>1.2.8</release>
+    <api>1.2.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+preview is also created if SeedDMS_Core_DocumentContent has a child class
+   </notes>
+  </release>
  </changelog>
 </package>

From 90affe7db1949f3b53b9fc018a8851d33f0949c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 11:16:13 +0100
Subject: [PATCH 1015/2006] pass $dms and $user to Controller::factory()

---
 op/op.ApproveDocument.php       | 2 +-
 op/op.OverrideContentStatus.php | 2 +-
 op/op.ReceiptDocument.php       | 2 +-
 op/op.ReviewDocument.php        | 2 +-
 op/op.ReviseDocument.php        | 2 +-
 op/op.RoleMgr.php               | 2 +-
 op/op.TransmittalDownload.php   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index e9da967e2..7f2754e48 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -32,7 +32,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes from a trusted request */
diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php
index be88140eb..f0bfb14cf 100644
--- a/op/op.OverrideContentStatus.php
+++ b/op/op.OverrideContentStatus.php
@@ -29,7 +29,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-//$controller = Controller::factory($tmp[1]);
+//$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if(!$accessop->check_controller_access($tmp[1] /*$controller*/)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index a978a7a2f..6f955a8ca 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes for a trusted request */
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index da2a1e160..92c8b95f6 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -32,7 +32,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes from a trusted request */
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index a96f2b86d..cc4f1830f 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 /* Check if the form data comes for a trusted request */
diff --git a/op/op.RoleMgr.php b/op/op.RoleMgr.php
index 2bfa947f2..62878bbb7 100644
--- a/op/op.RoleMgr.php
+++ b/op/op.RoleMgr.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if (!$accessop->check_controller_access($controller, $_POST)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
diff --git a/op/op.TransmittalDownload.php b/op/op.TransmittalDownload.php
index 9ddcf6ca2..57abc5b1f 100644
--- a/op/op.TransmittalDownload.php
+++ b/op/op.TransmittalDownload.php
@@ -31,7 +31,7 @@ include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1]);
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 if(isset($_GET["transmittalid"])) {
 	$transmittalid = $_GET["transmittalid"];

From 77c5645ccc1edd84cc045d75089b6149c1a47bfc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 12:16:01 +0100
Subject: [PATCH 1016/2006] check if group recipient is already in list of ind.
 recipients

---
 op/op.AddDocument.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 9e00eefb5..095d12a5d 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -301,7 +301,8 @@ if (isset($_POST["grpIndRecipients"])) {
 			foreach($members as $member) {
 				/* Do not add the uploader itself and reviewers */
 				if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
-					$recipients["i"][] = $member->getID();
+					if(!in_array($member->getID(), $recipients["i"]))
+						$recipients["i"][] = $member->getID();
 			}
 		}
 	}

From 08e3a5aca33152610e88e11b630e926f10a45af6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Mar 2018 12:16:51 +0100
Subject: [PATCH 1017/2006] check if group recipient is already in list of ind.
 recipients, check for reviewer only

---
 op/op.CheckInDocument.php | 9 ++++++++-
 op/op.UpdateDocument.php  | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index f8b1b2880..37ee48e08 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -167,6 +167,12 @@ else
 					}
 			}
 		}
+		if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
+			/* Check if reviewers are send but no approvers */
+			if(($reviewers["i"] || $reviewers["g"]) && !$approvers["i"] && !$approvers["g"]) {
+				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_uploading_reviewer_only"));
+			}
+		}
 	} elseif($settings->_workflowMode == 'advanced') {
 		if(!$workflow = $user->getMandatoryWorkflow()) {
 			if(isset($_POST["workflow"]))
@@ -198,7 +204,8 @@ else
 				foreach($members as $member) {
 					/* Do not add the uploader itself and reviewers */
 					if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
-						$recipients["i"][] = $member->getID();
+						if(!in_array($member->getID(), $recipients["i"]))
+							$recipients["i"][] = $member->getID();
 				}
 			}
 		}
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 0fd0a4486..15616fe21 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -271,6 +271,12 @@ default:
 					}
 			}
 		}
+		if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
+			/* Check if reviewers are send but no approvers */
+			if(($reviewers["i"] || $reviewers["g"]) && !$approvers["i"] && !$approvers["g"]) {
+				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_uploading_reviewer_only"));
+			}
+		}
 	} elseif($settings->_workflowMode == 'advanced') {
 		if(!$workflows = $user->getMandatoryWorkflows()) {
 			if(isset($_POST["workflow"]))
@@ -310,7 +316,8 @@ default:
 				foreach($members as $member) {
 					/* Do not add the uploader itself and approvers */
 					if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
-						$recipients["i"][] = $member->getID();
+						if(!in_array($member->getID(), $recipients["i"]))
+							$recipients["i"][] = $member->getID();
 				}
 			}
 		}

From 939cbd7a5641c68ece2c99ce332bd9257012a07e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:00:20 +0200
Subject: [PATCH 1018/2006] make counted task in menu selectable

---
 inc/inc.ClassSettings.php          | 20 +++++++++++++++++++-
 op/op.Settings.php                 |  1 +
 views/bootstrap/class.Settings.php | 11 +++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index d6747c118..29f3f8ff0 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -214,6 +214,8 @@ class Settings { /* {{{ */
 	var $_enableClipboard = true;
 	// enable/disable list of tasks in main menu
 	var $_enableMenuTasks = true;
+	// select which tasks show up in main menu
+	var $_tasksInMenu = array();
 	// enable/disable list of files in drop folder
 	var $_enableDropFolderList = false;
 	// enable/disable display of the session list
@@ -379,6 +381,18 @@ class Settings { /* {{{ */
 		return $out;
 	} /* }}} */
 
+	/**
+	 * Check if a variable is a string and returns an array
+	 *
+	 * @param array $var value
+	 * @return true/false
+	 */
+	function arrayVal($var) { /* {{{ */
+		if((string) $var)
+			return explode(';', $var);
+		return array();
+	} /* }}} */
+
 	/**
 	 * set $_viewOnlineFileTypes
 	 *
@@ -473,6 +487,7 @@ class Settings { /* {{{ */
 		$this->_enableSessionList = Settings::boolVal($tab["enableSessionList"]);
 		$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
 		$this->_enableMenuTasks = Settings::boolVal($tab["enableMenuTasks"]);
+		$this->_tasksInMenu = Settings::arrayVal($tab["tasksInMenu"]);
 		$this->_enableDropFolderList = Settings::boolVal($tab["enableDropFolderList"]);
 		$this->_enableDropUpload = Settings::boolVal($tab["enableDropUpload"]);
 		$this->_enableMultiUpload = Settings::boolVal($tab["enableMultiUpload"]);
@@ -733,7 +748,9 @@ class Settings { /* {{{ */
         $attributValue = "true";
       else
         $attributValue = "false";
-    }
+		} elseif(is_array($attributValue)) {
+			$attributValue = implode(';', $attributValue);
+		}
 
     if (isset($node[$attributName])) {
       $node[$attributName] = $attributValue;
@@ -808,6 +825,7 @@ class Settings { /* {{{ */
 		$this->setXMLAttributValue($node, "enableSessionList", $this->_enableSessionList);
 		$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
 		$this->setXMLAttributValue($node, "enableMenuTasks", $this->_enableMenuTasks);
+		$this->setXMLAttributValue($node, "tasksInMenu", $this->_tasksInMenu);
 		$this->setXMLAttributValue($node, "enableDropFolderList", $this->_enableDropFolderList);
 		$this->setXMLAttributValue($node, "enableDropUpload", $this->_enableDropUpload);
 		$this->setXMLAttributValue($node, "enableMultiUpload", $this->_enableMultiUpload);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 8c8aec43b..e16129949 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -88,6 +88,7 @@ if ($action == "saveSettings")
   $settings->_enableSessionList = getBoolValue("enableSessionList");
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableMenuTasks = getBoolValue("enableMenuTasks");
+  $settings->_tasksInMenu = $_POST["tasksInMenu"];
   $settings->_enableDropFolderList = getBoolValue("enableDropFolderList");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableMultiUpload = getBoolValue("enableMultiUpload");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 1d924fcf4..748638bda 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -288,6 +288,17 @@ if(!is_writeable($settings->_configFilePath)) {
 	    <tr title="<?php printMLText("settings_enableMenuTasks_desc");?>">
         <td><?php printMLText("settings_enableMenuTasks");?>:</td>
         <td><input name="enableMenuTasks" type="checkbox" <?php if ($settings->_enableMenuTasks) echo "checked" ?> /></td>
+      </tr>
+	    <tr title="<?php printMLText("settings_tasksInMenu_desc");?>">
+        <td><?php printMLText("settings_tasksInMenu");?>:</td>
+				<td>
+				  <select name="tasksInMenu[]" multiple>
+					  <option value="review" <?php if (in_array('review', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_review");?></option>
+					  <option value="approval" <?php if (in_array('approval', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_approval");?></option>
+					  <option value="receipt" <?php if (in_array('receipt', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_receipt");?></option>
+					  <option value="revision" <?php if (in_array('revision', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_revision");?></option>
+					</select>
+				</td>
       </tr>
 	    <tr title="<?php printMLText("settings_enableDropFolderList_desc");?>">
         <td><?php printMLText("settings_enableDropFolderList");?>:</td>

From fb9d04a3a9af54f6c846661009b82b7ea30a58e5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:00:53 +0200
Subject: [PATCH 1019/2006] pass _tasksInMenu to view

---
 inc/inc.ClassUI.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 6a4031449..ee4930d4e 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -105,6 +105,7 @@ class UI extends UI_Default {
 			$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
 			$view->setParam('enableclipboard', $settings->_enableClipboard);
 			$view->setParam('enablemenutasks', $settings->_enableMenuTasks);
+			$view->setParam('tasksinmenu', $settings->_tasksInMenu);
 			$view->setParam('enabledropfolderlist', $settings->_enableDropFolderList);
 			$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 			$view->setParam('enablesessionlist', $settings->_enableSessionList);

From db66dff1919d783000b488f312aae95e402c588b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:02:58 +0200
Subject: [PATCH 1020/2006] reorder lists of documents

---
 views/bootstrap/class.MyDocuments.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 822f23534..cff5e9af7 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -708,18 +708,19 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_user_no_reception" data-action="listNoReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_no_reception").'</a></li>';
 		$resArr = $dms->getDocumentList('DraftOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_draft" data-action="listDraftOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_draft").'</a></li>';
+		echo '</ul>';
+		$this->contentHeading(getMLText("documents_in_process"));
+		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
 			$resArr = $dms->getDocumentList('RejectOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
 		}
-		$resArr = $dms->getDocumentList('ExpiredOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
-		$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_obsolete" data-action="listObsoleteOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_obsolete").'</a></li>';
-		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_needs_correction" data-action="listNeedsCorrectionOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_needs_correction").'</a></li>';
+		$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
+		echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
+		$resArr = $dms->getDocumentList('LockedByMe', $user);
+		echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
 		echo '</ul>';
 		$this->contentHeading(getMLText("tasks"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
@@ -738,13 +739,15 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
 		$resArr = $dms->getDocumentList('ReviseByMe', $user);
 		echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
+		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_needs_correction" data-action="listNeedsCorrectionOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_needs_correction").'</a></li>';
 		echo '</ul>';
-		$this->contentHeading(getMLText("misc"));
+		$this->contentHeading(getMLText("archive"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
-		$resArr = $dms->getDocumentList('LockedByMe', $user);
-		echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
-		$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
-		echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
+		$resArr = $dms->getDocumentList('ExpiredOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
+		$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_obsolete" data-action="listObsoleteOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_obsolete").'</a></li>';
 		echo '</ul>';
 		echo '</div>';
 		echo '<div class="span9">';

From 90bf0f13f480fac75d142a523577f6bb9e00e7ff Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:04:05 +0200
Subject: [PATCH 1021/2006] show counter for tasks only for selected tasks in
 configuration

---
 views/bootstrap/class.Tasks.php | 91 +++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 33 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 921e06539..846aa6219 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -39,43 +39,52 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	private function __myTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$tasks['review'] = array();
-		$tasks['approval'] = array();
-		$tasks['receipt'] = array();
-		$tasks['revision'] = array();
-		$resArr = $dms->getDocumentList('ApproveByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		$tasksinmenu = $this->params['tasksinmenu'];
+		if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
+			$tasks['approval'] = array();
+			$resArr = $dms->getDocumentList('ApproveByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['approval'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 		}
-		$resArr = $dms->getDocumentList('ReviewByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
+			$tasks['review'] = array();
+			$resArr = $dms->getDocumentList('ReviewByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 		}
-		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
+			$tasks['receipt'] = array();
+			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 		}
-		$resArr = $dms->getDocumentList('ReviseByMe', $user);
-		if($resArr) {
-			foreach ($resArr as $res) {
-				$document = $dms->getDocument($res["id"]);
-				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-					$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
+			$tasks['revision'] = array();
+			$resArr = $dms->getDocumentList('ReviseByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
 				}
 			}
 		}
@@ -135,13 +144,28 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 
 		$tasks = $this->__myTasks();
+		if(!$tasks)
+			return '';
 
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 //		$content .= "    <li class=\"dropdown\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (";
+		$ct = array();
+		if(isset($tasks['review']))
+			$ct[] = count($tasks['review']);
+		if(isset($tasks['approval']))
+			$ct[] = count($tasks['approval']);
+		if(isset($tasks['receipt']))
+			$ct[] = count($tasks['receipt']);
+		if(isset($tasks['revision']))
+			$ct[] = count($tasks['revision']);
+		$content .= implode('/', $ct);
+		$content .= ")";
+		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision'])) {
+		$content .= " <i class=\"icon-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		if($tasks['review']) {
+		if(!empty($tasks['review'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_review")."</a>\n";
 		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -152,7 +176,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if($tasks['approval']) {
+		if(!empty($tasks['approval'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_approve")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -163,7 +187,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if($tasks['receipt']) {
+		if(!empty($tasks['receipt'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -174,7 +198,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if($tasks['revision']) {
+		if(!empty($tasks['revision'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n";
 		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
@@ -190,6 +214,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		}
 		$content .= "     </ul>\n";
+		}
 //		$content .= "    </li>\n";
 //		$content .= "   </ul>\n";
 		echo $content;

From c3e59094112378a262d6a69ba1c3f120e4552faf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 10:16:07 +0200
Subject: [PATCH 1022/2006] add item for 6.0.6

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index d4a86c8ac..b2f28ebd5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
   documents status to 'needѕ correction' if this was turned off in the settings
 - a document will not leave draft status when setting the approver/reviewer
   without setting a reviewer/approver
+- tasks to be counted in menu can be configured
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From 0c0472ae3c67e02cfab25409c0b269ab4e42289d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 12:46:50 +0200
Subject: [PATCH 1023/2006] minor adoption because directory ext has to stay in
 www directory

---
 doc/README.Dist-Layout | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/doc/README.Dist-Layout b/doc/README.Dist-Layout
index 5dd8a2d57..6bc98a03e 100644
--- a/doc/README.Dist-Layout
+++ b/doc/README.Dist-Layout
@@ -34,8 +34,6 @@ As MS Windows does not support soft links, this change will only apply to Linux/
 systems. The new layout is the following:
 
 seeddms51x ---+--- data --+-- log
-              |           |
-              |           +-- ext
               |           |
               |           +-- ...
               |
@@ -69,16 +67,16 @@ seeddms51x ---+--- data --+-- log
                          |
                          +-- index.php -> ../seeddms/index.php
                          |
-                         +-- ext -> ../data/ext
+                         +-- ext
 
 In order to convert to this layout you need to do the following in the seeddms51x
-directory:
+directory (replace seeddms-5.1.x with you installed version of seeddms):
 
 ln -s seeddms-5.1.x seeddms
-mv www/conf .
-mv www/ext data
+mv seeddms-5.1.x/conf .
 rm www
-mdkir www
+mkdir www
+mv seeddms-5.1.x/ext www
 cd www
 ln -s ../seeddms/inc
 ln -s ../seeddms/op
@@ -91,4 +89,3 @@ ln -s ../seeddms/webdav
 ln -s ../seeddms/restapi
 ln -s ../seeddms/pdfviewer
 ln -s ../seeddms/index.php
-ln -s ../data/ext

From 3514b0db89aa688ee380fc62afe19e8da6dd19f4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 13:09:13 +0200
Subject: [PATCH 1024/2006] check if $_POST["tasksInMenu"] is set

---
 op/op.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Settings.php b/op/op.Settings.php
index e16129949..4759040e2 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -88,7 +88,7 @@ if ($action == "saveSettings")
   $settings->_enableSessionList = getBoolValue("enableSessionList");
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableMenuTasks = getBoolValue("enableMenuTasks");
-  $settings->_tasksInMenu = $_POST["tasksInMenu"];
+  $settings->_tasksInMenu = isset($_POST["tasksInMenu"]) ? $_POST["tasksInMenu"] : array();
   $settings->_enableDropFolderList = getBoolValue("enableDropFolderList");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableMultiUpload = getBoolValue("enableMultiUpload");

From d40dc681dcc85480c367eaf42e2f751733ad2de3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 13:09:36 +0200
Subject: [PATCH 1025/2006] add list of documents which need correction in menu

---
 views/bootstrap/class.Settings.php |  1 +
 views/bootstrap/class.Tasks.php    | 27 ++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 748638bda..662325981 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -297,6 +297,7 @@ if(!is_writeable($settings->_configFilePath)) {
 					  <option value="approval" <?php if (in_array('approval', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_approval");?></option>
 					  <option value="receipt" <?php if (in_array('receipt', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_receipt");?></option>
 					  <option value="revision" <?php if (in_array('revision', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_revision");?></option>
+					  <option value="needscorrection" <?php if (in_array('needscorrection', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_needscorrection");?></option>
 					</select>
 				</td>
       </tr>
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 846aa6219..c8752e4ab 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -88,6 +88,18 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 				}
 			}
 		}
+		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
+			$tasks['needscorrection'] = array();
+			$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+					}
+				}
+			}
+		}
 		return $tasks;
 	} /* }}} */
 
@@ -160,9 +172,11 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$ct[] = count($tasks['receipt']);
 		if(isset($tasks['revision']))
 			$ct[] = count($tasks['revision']);
+		if(isset($tasks['needscorrection']))
+			$ct[] = count($tasks['needscorrection']);
 		$content .= implode('/', $ct);
 		$content .= ")";
-		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision'])) {
+		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection'])) {
 		$content .= " <i class=\"icon-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if(!empty($tasks['review'])) {
@@ -209,6 +223,17 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
+		if(!empty($tasks['needscorrection'])) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_correct")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['needscorrection'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
 		if ($this->check_access('MyDocuments')) {
 			$content .= "    <li class=\"divider\"></li>\n";
 			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";

From 5506c0ed691627eb4aa615f6b3f0123807f4b4b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 26 Mar 2018 13:22:39 +0200
Subject: [PATCH 1026/2006] add entry for 6.0.6

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index af49a3648..331b07661 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - a document will not leave draft status when setting the approver/reviewer
   without setting a reviewer/approver
 - tasks to be counted in menu can be configured
+- add number of documents which need correction to menu
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From aa416f90ec888eddee3b1863d097078a337d1de0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 13:43:56 +0200
Subject: [PATCH 1027/2006] do not enforce 2facto auth for guest and when
 secret is set

---
 inc/inc.Authentication.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index c29554c71..e1e782af4 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -166,8 +166,8 @@ if (!$user->isAdmin() && $origuser == null) {
  * if secret is not set and 2-factor authentication is turned on. Also check if
  * already on the page Setup2Factor.php and no user substiation has occured.
  */
-if($settings->_enable2FactorAuthentication && $origuser == null && $user->getSecret() == '') {
-	if(basename($_SERVER['SCRIPT_NAME']) != 'out.Setup2Factor.php') {
+if($settings->_enable2FactorAuthentication && $settings->_guestID != $user->getID() && $settings->_autoLoginUser != $user->getID() && $origuser == null && $user->getSecret() == '') {
+	if(basename($_SERVER['SCRIPT_NAME']) != 'out.Setup2Factor.php' && basename($_SERVER['SCRIPT_NAME']) != 'op.Setup2Factor.php') {
 		header("Location: ../out/out.Setup2Factor.php");
 		exit;
 	}

From ab3475f512a6c3ee43c18040a83278f0ccaaf5df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 13:44:48 +0200
Subject: [PATCH 1028/2006] do not set user for controller, because it is not
 set at that time

---
 op/op.Login.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/op/op.Login.php b/op/op.Login.php
index b558e8af9..ddbd82942 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -39,7 +39,7 @@ function _printMessage($heading, $message) { /* {{{ */
 } /* }}} */
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
+$controller = Controller::factory($tmp[1], array('dms'=>$dms));
 
 if (isset($_REQUEST["sesstheme"]) && strlen($_REQUEST["sesstheme"])>0 && is_numeric(array_search($_REQUEST["sesstheme"],UI::getStyles())) ) {
 	$theme = $_REQUEST["sesstheme"];
@@ -131,10 +131,10 @@ if ($user->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $
 }
 
 if($settings->_enable2FactorAuthentication) {
-	if($secret = $user->getSecret()) {
+	if($user->getSecret()) {
 		require "vendor/autoload.php";
 		$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
-		if($tfa->verifyCode($secret, $_POST['twofactauth']) !== true) {
+		if($tfa->verifyCode($user->getSecret(), $_POST['twofactauth']) !== true) {
 			_printMessage(getMLText("login_error_title"),	getMLText("login_error_text"));
 			exit;
 		}

From 1a8a0c3621c715a1d26c48a08cb2dc2995463492 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 13:46:03 +0200
Subject: [PATCH 1029/2006] add item for 6.0.6

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 331b07661..32fff0c8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
   without setting a reviewer/approver
 - tasks to be counted in menu can be configured
 - add number of documents which need correction to menu
+- minor 2 factor auth. fixes when initially setting the secret
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From ad5c4fc332b380bddd84079e9a9df8692773ac44 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 14:04:45 +0200
Subject: [PATCH 1030/2006] check if repository url is set

---
 views/bootstrap/class.ExtensionMgr.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index c4cc0e784..043386afe 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -131,7 +131,6 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		$version = $this->params['version'];
 		$extmgr = $this->params['extmgr'];
 		$currenttab = $this->params['currenttab'];
-		$reposurl = $this->params['reposurl'];
 	
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -234,6 +233,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 
 			<div class="tab-pane <?php if($currenttab == 'repository') echo 'active'; ?>" id="repository">
 <?php
+		if($extmgr->getRepositoryUrl()) {
 		echo "<table class=\"table _table-condensed\">\n";
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";	
@@ -282,7 +282,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 					<input type="hidden" name="forceupdate" value="1" />
           <button type="submit" class="btn btn-delete"><i class="icon-refresh"></i> <?= getMLText('force_update')?></button>
 					</form>
-</div>
+				</div>
+<?php
+		}
+?>
 			</div>
 		</div>
   </div>

From 7be573cac9a17b0e8469246e4f2d409d4f046267 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 14:05:04 +0200
Subject: [PATCH 1031/2006] format error message

---
 op/op.ExtensionMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index 22c33c8bd..dedccbb0f 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -119,7 +119,7 @@ elseif ($action == "getlist") { /* {{{ */
 	$controller->setParam('forceupdate', (isset($_POST['forceupdate']) && $_POST['forceupdate']) ? true : false);
 	$controller->setParam('version', $v->version());
 	if (!$controller($_POST)) {
-		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_extension_getlist').$controller->getErrorMsg(), 'timeout'=>5000));
+		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_extension_getlist').": ".$controller->getErrorMsg(), 'timeout'=>5000));
 	} else {
 		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_getlist')));
 	}

From f6a506ff9236200fd78ad333d3603cd12689496c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 14:05:22 +0200
Subject: [PATCH 1032/2006] new method getRepositoryUrl()

---
 inc/inc.ClassExtensionMgr.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 9d1485e65..eadf445cb 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -119,6 +119,10 @@ class SeedDMS_Extension_Mgr {
 		}
 	} /* }}} */
 
+	public function getRepositoryUrl() { /* {{{ */
+		return $this->reposurl;
+	} /* }}} */
+
 	protected function getExtensionsConfFile() { /* {{{ */
 		return $this->cachedir."/extensions.php";
 	} /* }}} */

From 820b88c9cfd0aef516ad3048607b1a4e642d4c29 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Mar 2018 18:23:00 +0200
Subject: [PATCH 1033/2006] revision and receipt is also availabe in advanced
 workflow mode

---
 views/bootstrap/class.Tasks.php | 83 ++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 43 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 5fa54654a..0bab3c497 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -68,45 +68,42 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					}
 				}
 			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
-				$tasks['receipt'] = array();
-				$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
-						}
+		if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
+			$tasks['receipt'] = array();
+			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 					}
 				}
 			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
-				$tasks['revision'] = array();
-				$resArr = $dms->getDocumentList('ReviseByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
-						}
+		}
+		if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
+			$tasks['revision'] = array();
+			$resArr = $dms->getDocumentList('ReviseByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 					}
 				}
 			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
-				$tasks['needscorrection'] = array();
-				$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']);
-						}
+		}
+		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
+			$tasks['needscorrection'] = array();
+			$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 					}
 				}
 			}
+		}
 		if($workflowmode == 'advanced')
 			if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
 				$tasks['workflow'] = array();
@@ -188,14 +185,14 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$ct[] = count($tasks['review']);
 		if(isset($tasks['approval']))
 			$ct[] = count($tasks['approval']);
+		if(isset($tasks['workflow']))
+			$ct[] = count($tasks['workflow']);
 		if(isset($tasks['receipt']))
 			$ct[] = count($tasks['receipt']);
 		if(isset($tasks['revision']))
 			$ct[] = count($tasks['revision']);
 		if(isset($tasks['needscorrection']))
 			$ct[] = count($tasks['needscorrection']);
-		if(isset($tasks['workflow']))
-			$ct[] = count($tasks['workflow']);
 		$content .= implode('/', $ct);
 		$content .= ")";
 		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow'])) {
@@ -223,17 +220,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if(!empty($tasks['receipt'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
-		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
-		foreach($tasks['receipt'] as $t) {
-			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
-		}
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
-		}
 		if(!empty($tasks['workflow'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_trigger_workflow")."</a>\n";
@@ -245,6 +231,17 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
+		if(!empty($tasks['receipt'])) {
+		$content .= "      <li class=\"dropdown-submenu\">\n";
+		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
+		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		foreach($tasks['receipt'] as $t) {
+			$doc = $dms->getDocument($t['id']);
+			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
+		}
+		$content .= "       </ul>\n";
+		$content .= "      </li>\n";
+		}
 		if(!empty($tasks['revision'])) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
 		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n";

From 3e2931068e31852c7a2c9f47b6d3774320d2b2bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Mar 2018 17:06:10 +0200
Subject: [PATCH 1034/2006] allow CSP worker-src blob:

---
 views/bootstrap/class.Bootstrap.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 444c0bcbc..f43c8ad5d 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -54,12 +54,13 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 			/* We still need unsafe-eval, because printDocumentChooserHtml and
 			 * printFolderChooserHtml will include a javascript file with ajax
 			 * which is evaled by jquery
+			 * worker-src blob: is needed for cytoscape
 			 * X-WebKit-CSP is deprecated, Chrome understands Content-Security-Policy
 			 * since version 25+
 			 * X-Content-Security-Policy is deprecated, Firefox understands
 			 * Content-Security-Policy since version 23+
 			 */
-			$csp_rules = "script-src 'self' 'unsafe-eval';"; // style-src 'self';";
+			$csp_rules = "script-src 'self' 'unsafe-eval'; worker-src blob:;"; // style-src 'self';";
 			foreach (array("X-WebKit-CSP", "X-Content-Security-Policy", "Content-Security-Policy") as $csp) {
 				header($csp . ": " . $csp_rules);
 			}

From 9f211d1fda39e8870e9180d70be254f98b71f1a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Mar 2018 17:06:25 +0200
Subject: [PATCH 1035/2006] init $positions early

---
 views/bootstrap/class.WorkflowGraph.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index fa6e42d24..50503f559 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -42,8 +42,8 @@ class SeedDMS_View_WorkflowGraph extends SeedDMS_Bootstrap_Style {
 		header('Content-Type: application/javascript; charset=UTF-8');
 
 		$renderdata = $this->workflow->getLayoutData();
+		$positions = array();
 		if($renderdata) {
-			$positions = array();
 			$data = json_decode($renderdata);
 			foreach($data->nodes as $node) {
 				if($node->group == 'nodes') {

From bf1473fbb1a78aed724d39d9ced8d84f741e8e03 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Mar 2018 17:06:49 +0200
Subject: [PATCH 1036/2006] fix various errors when intializing the view

---
 out/out.ReturnFromSubWorkflow.php               | 13 ++++++++-----
 out/out.RunSubWorkflow.php                      |  4 +---
 views/bootstrap/class.ReturnFromSubWorkflow.php |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/out/out.ReturnFromSubWorkflow.php b/out/out.ReturnFromSubWorkflow.php
index 61dde19ec..b560347c4 100644
--- a/out/out.ReturnFromSubWorkflow.php
+++ b/out/out.ReturnFromSubWorkflow.php
@@ -23,11 +23,17 @@ include("../inc/inc.Settings.php");
 include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
-include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -64,16 +70,13 @@ if(isset($_POST["transition"]) && $_POST["transition"]) {
 
 $folder = $document->getFolder();
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
 	$view->setParam('version', $version);
 	$view->setParam('transition', $transition);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
 
-?>
-
diff --git a/out/out.RunSubWorkflow.php b/out/out.RunSubWorkflow.php
index 9e0c62bd6..57aaf0d59 100644
--- a/out/out.RunSubWorkflow.php
+++ b/out/out.RunSubWorkflow.php
@@ -32,7 +32,7 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
@@ -70,8 +70,6 @@ if (!is_object($subworkflow)) {
 
 $folder = $document->getFolder();
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/views/bootstrap/class.ReturnFromSubWorkflow.php b/views/bootstrap/class.ReturnFromSubWorkflow.php
index 4bc8842b3..54473ff72 100644
--- a/views/bootstrap/class.ReturnFromSubWorkflow.php
+++ b/views/bootstrap/class.ReturnFromSubWorkflow.php
@@ -117,7 +117,7 @@ $(document).ready(function() {
 	</form>
 	</div>
 	<div id="workflowgraph" class="span8">
-	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $parentworkflow->getID(); ?>&transition=<?php echo $transition->getID(); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
+	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $parentworkflow->getID(); ?>&transition=<?php echo ($transition ? $transition->getID() : ''); ?>&documentid=<?php echo $document->getID(); ?>" width="100%" height="500" style="border: 1px solid #AAA;"></iframe>
 	<h4>Workflow</h4>
 	</div>
 	</div>

From 3976657a66bb8fb12aa30fed44512fe1410ac9c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:10:18 +0200
Subject: [PATCH 1037/2006] remove unneeded code, check if reception of
 document is allowed

---
 out/out.AddDocument.php               |  3 +++
 views/bootstrap/class.AddDocument.php | 35 +++++++--------------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 39196ce7d..cd94ec5bf 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -78,6 +78,9 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enableadminreceipt', $settings->_enableAdminReceipt);
+	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
+	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
 	$view->setParam('libraryfolder', $libfolder);
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view->setParam('dropfolderfile', isset($_REQUEST["dropfolderfileform1"]) ?$_REQUEST["dropfolderfileform1"] : '');
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 7139d9dd5..7f82dc4ff 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -160,6 +160,9 @@ $(document).ready(function() {
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
+		$enableadminreceipt = $this->params['enableadminreceipt'];
+		$enableownerreceipt = $this->params['enableownerreceipt'];
+		$enableselfreceipt = $this->params['enableselfreceipt'];
 		$strictformcheck = $this->params['strictformcheck'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$libraryfolder = $this->params['libraryfolder'];
@@ -186,10 +189,6 @@ $(document).ready(function() {
 		$this->warningMsg($msg);
 		$this->contentHeading(getMLText("add_document"));
 		$this->contentContainerStart();
-		
-		// Retrieve a list of all users and groups that have review / approve
-		// privileges.
-		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 ?>
 		<form action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="form1" name="form1">
 		<?php echo createHiddenFieldWithKey('adddocument'); ?>
@@ -438,6 +437,9 @@ $(document).ready(function() {
 		</tr>	
 <?php
 		} else {
+			// Retrieve a list of all users and groups that have review / approve
+			// privileges.
+			$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 			if($workflowmode == 'traditional') {
 ?>
 		<tr>
@@ -696,6 +698,9 @@ $(document).ready(function() {
 			</tr>	
 <?php
 		}
+		// Retrieve a list of all users and groups that have review / approve
+		// privileges.
+		$docAccess = $folder->getReadAccessList($enableadminreceipt, $enableownerreceipt);
 ?>
 		<tr>
 			<td colspan="2">
@@ -715,17 +720,6 @@ $(document).ready(function() {
 				}
 ?>
 				</select>
-<?php
-				$tmp = array();
-				foreach($receiptStatus as $r) {
-					if($r['type'] == 0) {
-						$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->printSelectPresetButtonHtml("IndRecipient", $tmp);
-				}
-?>
       </td>
     </tr>
       <tr>
@@ -754,17 +748,6 @@ $(document).ready(function() {
 				}
 ?>
 			</select>
-<?php
-				$tmp = array();
-				foreach($receiptStatus as $r) {
-					if($r['type'] == 1) {
-						$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp);
-				}
-?>
       </td>
 		</tr>
 		  <tr>	

From d7e22068afcf5c15c3cf47efad7c4b5cccc06412 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:12:52 +0200
Subject: [PATCH 1038/2006] add item for 6.0.6

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 32fff0c8f..80e85839b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - tasks to be counted in menu can be configured
 - add number of documents which need correction to menu
 - minor 2 factor auth. fixes when initially setting the secret
+- remove ѕome unneeded code from AddDocument which just caused php warnings
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From 8447c87ab09af192b685bf771e3388af98c612ce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:16:39 +0200
Subject: [PATCH 1039/2006] remove empty script tag

---
 views/bootstrap/class.TriggerWorkflow.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index b7880b997..8849b8ef4 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -76,11 +76,6 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("trigger_workflow"));
-?>
-<script language="JavaScript">
-</script>
-
-<?php
 
 		$action = $transition->getAction();
 		$currentstate = $latestContent->getWorkflowState();

From d1ee8004236b2531dbe63a8c09969ad779ab5d6a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:39:10 +0200
Subject: [PATCH 1040/2006] remove formtoken from link to javascript files

---
 views/bootstrap/class.Bootstrap.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f43c8ad5d..1cac407df 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -152,6 +152,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo '<script src="../styles/'.$this->theme.'/select2/js/select2.min.js"></script>'."\n";
 		parse_str($_SERVER['QUERY_STRING'], $tmp);
 		$tmp['action'] = 'webrootjs';
+		if(isset($tmp['formtoken']))
+			unset($tmp['formtoken']);
 		echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
 		echo '<script src="../styles/'.$this->theme.'/application.js"></script>'."\n";
 		if($this->params['enablemenutasks'] && isset($this->params['user']) && $this->params['user']) {

From 05626a47597cae905942a758b8d63e7d9bcc8b0e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:39:39 +0200
Subject: [PATCH 1041/2006] use GET instead of POST

---
 out/out.RemoveWorkflowFromDocument.php |  8 ++++----
 out/out.TriggerWorkflow.php            | 19 +++++++++----------
 views/bootstrap/class.ViewDocument.php |  4 ++--
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/out/out.RemoveWorkflowFromDocument.php b/out/out.RemoveWorkflowFromDocument.php
index cfb92cc2e..73c5413b9 100644
--- a/out/out.RemoveWorkflowFromDocument.php
+++ b/out/out.RemoveWorkflowFromDocument.php
@@ -37,20 +37,20 @@ if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-$document = $dms->getDocument(intval($_POST["documentid"]));
+$document = $dms->getDocument(intval($_GET["documentid"]));
 if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
+if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
 
-$version = $_POST["version"];
+$version = $_GET["version"];
 $version = $document->getContentByVersion($version);
 
 if (!is_object($version)) {
diff --git a/out/out.TriggerWorkflow.php b/out/out.TriggerWorkflow.php
index 81febf72d..608ed7157 100644
--- a/out/out.TriggerWorkflow.php
+++ b/out/out.TriggerWorkflow.php
@@ -30,20 +30,24 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
+if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-$document = $dms->getDocument(intval($_POST["documentid"]));
+$document = $dms->getDocument(intval($_GET["documentid"]));
 if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-if (!isset($_POST["version"]) || !is_numeric($_POST["version"]) || intval($_POST["version"])<1) {
+if (!isset($_GET["version"]) || !is_numeric($_GET["version"]) || intval($_GET["version"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("invalid_version"));
 }
 
-$version = $_POST["version"];
+$version = $_GET["version"];
 $version = $document->getContentByVersion($version);
 
 if (!is_object($version)) {
@@ -55,18 +59,13 @@ if (!is_object($workflow)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("document_has_no_workflow"));
 }
 
-$transition = $dms->getWorkflowTransition($_POST["transition"]);
+$transition = $dms->getWorkflowTransition($_GET["transition"]);
 if (!is_object($transition)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_workflow_transition"));
 }
 
 $folder = $document->getFolder();
 
-/* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
-
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 486a22ca5..12b30b80d 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1004,7 +1004,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			$this->contentContainerStart();
 			if($user->isAdmin()) {
 				if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $latestContent->getWorkflowState())) {
-					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"post\">".createHiddenFieldWithKey('removeworkflowfromdocument')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
+					print "<form action=\"../out/out.RemoveWorkflowFromDocument.php\" method=\"get\">".createHiddenFieldWithKey('removeworkflowfromdocument')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-remove\"></i> ".getMLText('rm_workflow')."</button></form>";
 				} else {
 					print "<form action=\"../out/out.RewindWorkflow.php\" method=\"post\">".createHiddenFieldWithKey('rewindworkflow')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><button type=\"submit\" class=\"btn\"><i class=\"icon-refresh\"></i> ".getMLText('rewind_workflow')."</button></form>";
 				}
@@ -1106,7 +1106,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				echo "<td>";
 				if($latestContent->triggerWorkflowTransitionIsAllowed($user, $transition)) {
 					$action = $transition->getAction();
-					print "<form action=\"../out/out.TriggerWorkflow.php\" method=\"post\">".createHiddenFieldWithKey('triggerworkflow')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><input type=\"hidden\" name=\"transition\" value=\"".$transition->getID()."\" /><input type=\"submit\" class=\"btn\" value=\"".getMLText('action_'.strtolower($action->getName()), array(), $action->getName())."\" /></form>";
+					print "<form action=\"../out/out.TriggerWorkflow.php\" method=\"get\">".createHiddenFieldWithKey('triggerworkflow')."<input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"version\" value=\"".$latestContent->getVersion()."\" /><input type=\"hidden\" name=\"transition\" value=\"".$transition->getID()."\" /><input type=\"submit\" class=\"btn\" value=\"".getMLText('action_'.strtolower($action->getName()), array(), $action->getName())."\" /></form>";
 					$allowedtransitions[] = $transition;
 				}
 				echo "</td>";

From 2259acc3f2ef9ed80bd17c6e9ba621336c1ea5ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 16:30:02 +0200
Subject: [PATCH 1042/2006] add counting documents in workflow and need
 correction in countTasks()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 041205298..4ab83c02f 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -836,6 +836,9 @@ class SeedDMS_Core_DMS {
 	 * @return array list of documents records
 	 */
 	function countTasks($listtype, $user=null) { /* {{{ */
+		if (!$this->db->createTemporaryTable("ttstatid") || !$this->db->createTemporaryTable("ttcontentid")) {
+			return false;
+		}
 		$groups = array();
 		if($user) {
 			$tmp = $user->getGroups();
@@ -913,6 +916,41 @@ class SeedDMS_Core_DMS {
 			$queryStr .= "AND `tblDocumentRevisionLog`.`status` = 0 ";
 			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_IN_REVISION.") ";
 			break; /* }}} */
+		case 'NeedsCorrectionOwner':
+			$queryStr .=
+				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `ttcontentid`.`document` ";
+			$queryStr .= "WHERE `tblDocuments`.`owner` = '".$user->getID()."' ".
+				"AND `tblDocumentStatusLog`.`status` IN (".S_NEEDS_CORRECTION.") ";
+			break; /* }}} */
+		case 'WorkflowByMe':
+			// Get document list for the current user.
+			$workflowStatus = $user->getWorkflowStatus();
+
+			// Create a comma separated list of all the documentIDs whose information is
+			// required.
+			$dList = array();
+			foreach ($workflowStatus["u"] as $st) {
+				if (!in_array($st["document"], $dList)) {
+					$dList[] = $st["document"];
+				}
+			}
+			foreach ($workflowStatus["g"] as $st) {
+				if (!in_array($st["document"], $dList)) {
+					$dList[] = $st["document"];
+				}
+			}
+			$docCSV = "";
+			foreach ($dList as $d) {
+				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
+			}
+
+			if ($dList) {
+				$queryStr .=
+							"WHERE `ttcontentid`.`document` IN (" . implode(',', $dList) . ")";
+			} else {
+				$queryStr = '';
+			}
+			break;
 		}
 		if($queryStr) {
 			$resArr = $this->db->getResultArray($selectStr.$queryStr);

From c0c9f755a83a2496238b6b0004e53c0a3f402794 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 16:30:46 +0200
Subject: [PATCH 1043/2006] countTasks takes workflow mode and tasksinmenu into
 account

---
 views/bootstrap/class.Tasks.php | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 0bab3c497..b3707a97f 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -133,12 +133,29 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	function countTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$workflowmode = $this->params['workflowmode'];
+		$tasksinmenu = $this->params['tasksinmenu'];
+
 		$startts = microtime(true);
 		$tasks = array();
-		$tasks['review'] = $dms->countTasks('ReviewByMe', $user);
-		$tasks['approval'] = $dms->countTasks('ApproveByMe', $user);
-		$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
-		$tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
+		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
+			if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
+				$tasks['approval'] = $dms->countTasks('ApproveByMe', $user);
+			}
+		if($workflowmode == 'traditional')
+			if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
+				$tasks['review'] = $dms->countTasks('ReviewByMe', $user);
+			}
+		if($workflowmode == 'advanced')
+			if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
+				$tasks['workflow'] = $dms->countTasks('WorkflowByMe', $user);
+			}
+		if(!$tasksinmenu || in_array('receipt', $tasksinmenu))
+			$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
+		if(!$tasksinmenu || in_array('revision', $tasksinmenu))
+			$tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
+		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu))
+			$tasks['needscorrection'] = $dms->countTasks('NeedsCorrectionOwner', $user);
 
 		header('Content-Type: application/json');
 		echo json_encode(array('error'=>0, 'data'=>$tasks, 'processing_time'=>microtime(true)-$startts));

From 28c232374427c219a6bcbad75e2b1f535380fe92 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 16:45:39 +0200
Subject: [PATCH 1044/2006] add workflow to list of tasks in menu

---
 views/bootstrap/class.Settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 662325981..8987461ea 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -295,6 +295,7 @@ if(!is_writeable($settings->_configFilePath)) {
 				  <select name="tasksInMenu[]" multiple>
 					  <option value="review" <?php if (in_array('review', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_review");?></option>
 					  <option value="approval" <?php if (in_array('approval', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_approval");?></option>
+					  <option value="workflow" <?php if (in_array('workflow', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_workflow");?></option>
 					  <option value="receipt" <?php if (in_array('receipt', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_receipt");?></option>
 					  <option value="revision" <?php if (in_array('revision', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_revision");?></option>
 					  <option value="needscorrection" <?php if (in_array('needscorrection', $settings->_tasksInMenu)) echo "selected" ?>><?php printMLText("settings_tasksInMenu_needscorrection");?></option>

From 666ced5fea880add75967946fb79776c373d6424 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 17:13:56 +0200
Subject: [PATCH 1045/2006] usage of sendfile can be configured

---
 SeedDMS_Preview/Preview/Base.php | 11 +++++++++--
 SeedDMS_Preview/package.xml      |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index d00003379..9b7554ed8 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -44,7 +44,13 @@ class SeedDMS_Preview_Base {
 	 */
 	protected $timeout;
 
-	function __construct($previewDir, $timeout=5) { /* {{{ */
+	/**
+	 * @var boolean $usesendfile use mod_sendfile if available
+	 * @access protected
+	 */
+	protected $usesendfile;
+
+	function __construct($previewDir, $timeout=5, $usesendfile=true) { /* {{{ */
 		if(!is_dir($previewDir)) {
 			if (!SeedDMS_Core_File::makeDir($previewDir)) {
 				$this->previewDir = '';
@@ -56,6 +62,7 @@ class SeedDMS_Preview_Base {
 		}
 		$this->timeout = intval($timeout);
 		$this->converters = array();
+		$this->usesendfile = $usesendfile;
 	} /* }}} */
 
 	static function execWithTimeout($cmd, $timeout=5) { /* {{{ */
@@ -148,7 +155,7 @@ class SeedDMS_Preview_Base {
  * @param string $filename
  */
 	protected function sendFile($filename) { /* {{{ */
-		if(function_exists('apache_get_modules') && in_array('mod_xsendfile',apache_get_modules())) {
+		if($this->usesendfile && function_exists('apache_get_modules') && in_array('mod_xsendfile',apache_get_modules())) {
 			header("X-Sendfile: ".$filename);
 		} else {
 			/* Make sure output buffering is off */
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 9e39935d3..651422851 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,7 +11,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-03-20</date>
+ <date>2018-03-29</date>
  <time>10:59:39</time>
  <version>
   <release>1.2.9</release>
@@ -24,6 +24,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 make sure list of converters is always an array
+usage of mod_sendfile can be configured
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From c2ecc4adbbaa44b3b2b7c7b4236a53ade8c1d4fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 31 Mar 2018 14:28:57 +0200
Subject: [PATCH 1046/2006] check_controller_access() returns true if !guest
 and adv access controll is off

---
 inc/inc.ClassAccessOperation.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 29253874c..011decf15 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -464,8 +464,12 @@ class SeedDMS_AccessOperation {
 	 * @return boolean true if access is allowed otherwise false
 	 */
 	function check_controller_access($controller, $get=array()) { /* {{{ */
-		if(!$this->settings->_advancedAcl)
-			return false;
+		if(!$this->settings->_advancedAcl) {
+			if($this->user->isGuest())
+				return false;
+			else
+				return true;
+		}
 		if(is_string($controller)) {
 			$scripts = array($controller);
 		} elseif(is_array($controller)) {

From 20a798d9f1811ab7b01bdc58f4d2b30690109c73 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 31 Mar 2018 14:40:05 +0200
Subject: [PATCH 1047/2006] add some mor documentation

---
 inc/inc.ClassAccessOperation.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 011decf15..61481007b 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -458,6 +458,8 @@ class SeedDMS_AccessOperation {
 	 *
 	 * If the parameter $controller is an array then each element is considered the
 	 * name of a controller and true will be returned if one is accesible.
+	 * If advanced access controll is turn off, this function will return false
+	 * for guest users and true otherwise.
 	 *
 	 * @param mixed $controller Instanz of controller, name of controller or array of controller names
 	 * @param string $get query parameters

From ab3fc8ec7c3c490f0564d61a48341e8792574aaa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Apr 2018 19:47:52 +0200
Subject: [PATCH 1048/2006] do not pass status to revision entry

---
 views/bootstrap/class.Timeline.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 11295434e..792a454d3 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -92,7 +92,7 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
 					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
 					break;
 				case 'scheduled_revision':
-					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
 					break;
 				default:
 					$msg = '???';

From fd5920fc8d32edb1b657c777a1c1f3c6f2785f25 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Apr 2018 09:32:36 +0200
Subject: [PATCH 1049/2006] take enable[Revision|Receipt]Workflow into account

---
 inc/inc.ClassSettings.php                 |  6 +--
 op/op.Settings.php                        |  2 +-
 out/out.AddDocument.php                   |  1 +
 out/out.CheckInDocument.php               |  1 +
 out/out.Tasks.php                         |  2 +
 out/out.UpdateDocument.php                |  1 +
 out/out.ViewDocument.php                  |  2 +
 views/bootstrap/class.AddDocument.php     |  5 +++
 views/bootstrap/class.CheckInDocument.php |  5 +++
 views/bootstrap/class.Settings.php        |  6 +--
 views/bootstrap/class.Tasks.php           | 52 +++++++++++++----------
 views/bootstrap/class.UpdateDocument.php  |  5 +++
 views/bootstrap/class.ViewDocument.php    |  6 ++-
 13 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 29f3f8ff0..b0750238a 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -185,7 +185,7 @@ class Settings { /* {{{ */
 	// the mode of workflow
 	var $_workflowMode = "traditional";
 	// enable/disable acknowledge workflow
-	var $_enableAcknowledgeWorkflow = true;
+	var $_enableReceiptWorkflow = true;
 	// enable/disable revision workflow
 	var $_enableRevisionWorkflow = true;
 	// enable/disable revision on vote reject
@@ -667,7 +667,7 @@ class Settings { /* {{{ */
 		$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]);
 		$this->_versioningFileName = strval($tab["versioningFileName"]);
 		$this->_workflowMode = strval($tab["workflowMode"]);
-		$this->_enableAcknowledgeWorkflow = strval($tab["enableAcknowledgeWorkflow"]);
+		$this->_enableReceiptWorkflow = strval($tab["enableReceiptWorkflow"]);
 		$this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]);
 		$this->_enableRevisionOnVoteReject = strval($tab["enableRevisionOnVoteReject"]);
 		$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
@@ -988,7 +988,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "initialDocumentStatus", $this->_initialDocumentStatus);
     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
     $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
-    $this->setXMLAttributValue($node, "enableAcknowledgeWorkflow", $this->_enableAcknowledgeWorkflow);
+    $this->setXMLAttributValue($node, "enableReceiptWorkflow", $this->_enableReceiptWorkflow);
     $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
     $this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject);
     $this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 4759040e2..8bb128224 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -180,7 +180,7 @@ if ($action == "saveSettings")
   $settings->_presetExpirationDate = $_POST["presetExpirationDate"];
   $settings->_initialDocumentStatus = $_POST["initialDocumentStatus"];
   $settings->_workflowMode = $_POST["workflowMode"];
-  $settings->_enableAcknowledgeWorkflow = getBoolValue("enableAcknowledgeWorkflow");
+  $settings->_enableReceiptWorkflow = getBoolValue("enableReceiptWorkflow");
   $settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow");
   $settings->_enableRevisionOnVoteReject = getBoolValue("enableRevisionOnVoteReject");
   $settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly");
diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index cd94ec5bf..77171f88c 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -78,6 +78,7 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
 	$view->setParam('enableadminreceipt', $settings->_enableAdminReceipt);
 	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
 	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index 7980a3025..1544eccd8 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -72,6 +72,7 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
 	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
diff --git a/out/out.Tasks.php b/out/out.Tasks.php
index 3c0df220e..c1edc52a9 100644
--- a/out/out.Tasks.php
+++ b/out/out.Tasks.php
@@ -33,6 +33,8 @@ $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 
 if($view) {
 	$view->setParam('workflowmode', $settings->_workflowMode);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
+	$view->setParam('enablerevisionworkflow', $settings->_enableRevisionWorkflow);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
diff --git a/out/out.UpdateDocument.php b/out/out.UpdateDocument.php
index 1a300a211..6e4bdc7b7 100644
--- a/out/out.UpdateDocument.php
+++ b/out/out.UpdateDocument.php
@@ -71,6 +71,7 @@ if($view) {
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
 	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt);
 	$view->setParam('dropfolderdir', $settings->_dropFolderDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index ea9799396..c2c081bbc 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -76,6 +76,8 @@ if($view) {
 	$view->setParam('showtree', showtree());
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes);
+	$view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow);
+	$view->setParam('enablerevisionworkflow', $settings->_enableRevisionWorkflow);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
 	$view->setParam('cachedir', $settings->_cacheDir);
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 7f82dc4ff..cc7736043 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -160,6 +160,7 @@ $(document).ready(function() {
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
 		$enableadminreceipt = $this->params['enableadminreceipt'];
 		$enableownerreceipt = $this->params['enableownerreceipt'];
 		$enableselfreceipt = $this->params['enableselfreceipt'];
@@ -698,6 +699,7 @@ $(document).ready(function() {
 			</tr>	
 <?php
 		}
+		if($enablereceiptworkflow) {
 		// Retrieve a list of all users and groups that have review / approve
 		// privileges.
 		$docAccess = $folder->getReadAccessList($enableadminreceipt, $enableownerreceipt);
@@ -750,6 +752,9 @@ $(document).ready(function() {
 			</select>
       </td>
 		</tr>
+<?php
+		}
+?>
 		  <tr>	
         <td>
 		<?php $this->contentSubHeading(getMLText("add_document_notify")); ?>
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index aebf2df4e..dd8fba9c9 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -85,6 +85,7 @@ $(document).ready(function() {
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
 		$enableselfreceipt = $this->params['enableselfreceipt'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
 		$workflowmode = $this->params['workflowmode'];
 		$presetexpiration = $this->params['presetexpiration'];
 		$documentid = $document->getId();
@@ -606,6 +607,7 @@ $(document).ready(function() {
 		</tr>	
 <?php
 	}
+	if($enablereceiptworkflow) {
 ?>
 		<tr>
 			<td colspan="2">
@@ -677,6 +679,9 @@ $(document).ready(function() {
 ?>
       </td>
 		</tr>
+<?php
+	}
+?>
 		<tr>
 			<td></td>
 			<td><input type="submit" class="btn" value="<?php printMLText("checkin_document")?>"></td>
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 8987461ea..1b9c9906d 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -686,9 +686,9 @@ if(!is_writeable($settings->_configFilePath)) {
 					</select>
 				</td>
       </tr>
-      <tr title="<?php printMLText("settings_enableAcknowledgeWorkflow_desc");?>">
-        <td><?php printMLText("settings_enableAcknowledgeWorkflow");?>:</td>
-        <td><input name="enableAcknowledgeWorkflow" type="checkbox" <?php if ($settings->_enableAcknowledgeWorkflow) echo "checked" ?> /></td>
+      <tr title="<?php printMLText("settings_enableReceiptWorkflow_desc");?>">
+        <td><?php printMLText("settings_enableReceiptWorkflow");?>:</td>
+        <td><input name="enableReceiptWorkflow" type="checkbox" <?php if ($settings->_enableReceiptWorkflow) echo "checked" ?> /></td>
       </tr>
       <tr title="<?php printMLText("settings_enableRevisionWorkflow_desc");?>">
         <td><?php printMLText("settings_enableRevisionWorkflow");?>:</td>
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index b3707a97f..d01065de8 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -39,6 +39,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	private function __myTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+		$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
 		$workflowmode = $this->params['workflowmode'];
 		$tasksinmenu = $this->params['tasksinmenu'];
 
@@ -68,30 +70,32 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					}
 				}
 			}
-		if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
-			$tasks['receipt'] = array();
-			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if($enablereceiptworkflow)
+			if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
+				$tasks['receipt'] = array();
+				$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+				if($resArr) {
+					foreach ($resArr as $res) {
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+						}
 					}
 				}
 			}
-		}
-		if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
-			$tasks['revision'] = array();
-			$resArr = $dms->getDocumentList('ReviseByMe', $user);
-			if($resArr) {
-				foreach ($resArr as $res) {
-					$document = $dms->getDocument($res["id"]);
-					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+		if($enablerevisionworkflow)
+			if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
+				$tasks['revision'] = array();
+				$resArr = $dms->getDocumentList('ReviseByMe', $user);
+				if($resArr) {
+					foreach ($resArr as $res) {
+						$document = $dms->getDocument($res["id"]);
+						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+							$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
+						}
 					}
 				}
 			}
-		}
 		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
 			$tasks['needscorrection'] = array();
 			$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
@@ -133,6 +137,8 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	function countTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+		$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
 		$workflowmode = $this->params['workflowmode'];
 		$tasksinmenu = $this->params['tasksinmenu'];
 
@@ -150,10 +156,12 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
 				$tasks['workflow'] = $dms->countTasks('WorkflowByMe', $user);
 			}
-		if(!$tasksinmenu || in_array('receipt', $tasksinmenu))
-			$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
-		if(!$tasksinmenu || in_array('revision', $tasksinmenu))
-			$tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
+		if($enablereceiptworkflow)
+			if(!$tasksinmenu || in_array('receipt', $tasksinmenu))
+				$tasks['receipt'] = $dms->countTasks('ReceiptByMe', $user);
+		if($enablerevisionworkflow)
+			if(!$tasksinmenu || in_array('revision', $tasksinmenu))
+				$tasks['revision'] = $dms->countTasks('ReviseByMe', $user);
 		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu))
 			$tasks['needscorrection'] = $dms->countTasks('NeedsCorrectionOwner', $user);
 
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 66eff2560..44249a18e 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -146,6 +146,7 @@ console.log(element);
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
 		$enableselfreceipt = $this->params['enableselfreceipt'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$workflowmode = $this->params['workflowmode'];
@@ -716,6 +717,7 @@ console.log(element);
 		</tr>	
 <?php
 	}
+	if($enablereceiptworkflow) {
 ?>
 		<tr>
 			<td colspan="2">
@@ -787,6 +789,9 @@ console.log(element);
 ?>
       </td>
 		</tr>
+<?php
+	}
+?>
 		<tr>
 			<td></td>
 			<td><input type="submit" class="btn" value="<?php printMLText("update_document")?>"></td>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 12b30b80d..648909c67 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -433,6 +433,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableownerreceipt = $this->params['enableownerreceipt'];
+		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+		$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
 		$workflowmode = $this->params['workflowmode'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidthlist = $this->params['previewWidthList'];
@@ -666,11 +668,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			if($accessop->mayOverrideStatus($document)) {
 				print "<li>".$this->html_link('OverrideContentStatus', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-align-justify\"></i>".getMLText("change_status"), false, true)."</li>";
 			}
-		if($accessop->check_controller_access('SetRecipients'))
+		if($enablereceiptworkflow && $accessop->check_controller_access('SetRecipients'))
 			if($accessop->maySetRecipients($document)) {
 				print "<li>".$this->html_link('SetRecipients', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-check\"></i>".getMLText("change_recipients"), false, true)."</li>";
 			}
-		if($accessop->check_controller_access('SetRevisors'))
+		if($enablerevisionworkflow && $accessop->check_controller_access('SetRevisors'))
 			if($accessop->maySetRevisors($document)) {
 				print "<li>".$this->html_link('SetRevisors', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-refresh\"></i>".getMLText("change_revisors"), false, true)."</li>";
 			}

From 57dc5fa31ab2231e806c5807454e5824d7ee8f2f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Apr 2018 11:27:12 +0200
Subject: [PATCH 1050/2006] do not set the uploader of a document to the owner

use the currently logged in user instead
---
 CHANGELOG                             | 2 ++
 SeedDMS_Core/Core/inc.ClassDMS.php    | 9 +++++----
 SeedDMS_Core/Core/inc.ClassFolder.php | 5 ++---
 SeedDMS_Core/package.xml              | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ec567bbe5..7c83aeef8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,8 @@
 - add number of documents which need correction to menu
 - minor 2 factor auth. fixes when initially setting the secret
 - remove ѕome unneeded code from AddDocument which just caused php warnings
+- do not set the uploader of new documents to owner if the owner is different from
+  the uploader
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 4ab83c02f..959057ba6 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -439,6 +439,7 @@ class SeedDMS_Core_DMS {
 		$this->enableConverting = false;
 		$this->convertFileTypes = array();
 		$this->noReadForStatus = array();
+		$this->user = null;
 		$this->classnames = array();
 		$this->classnames['folder'] = 'SeedDMS_Core_Folder';
 		$this->classnames['document'] = 'SeedDMS_Core_Document';
@@ -620,8 +621,9 @@ class SeedDMS_Core_DMS {
 	/**
 	 * Set the logged in user
 	 *
-	 * If user authentication was done externally, this function can
-	 * be used to tell the dms who is currently logged in.
+	 * This method tells SeeDMS_Core_DMS the currently logged in user. It must be
+	 * called right after instanciating the class, because some methods in
+	 * SeedDMS_Core_Document() require the currently logged in user.
 	 *
 	 * @param object $user
 	 *
@@ -633,8 +635,7 @@ class SeedDMS_Core_DMS {
 	/**
 	 * Get the logged in user
 	 *
-	 * If user authentication was done externally, this function can
-	 * be used to tell the dms who is currently logged in.
+	 * Returns the currently logged in user, as set by setUser()
 	 *
 	 * @return SeedDMS_Core_User $user
 	 *
diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 0761bc6c5..cc7cfa80a 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -917,9 +917,8 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		$document = $this->_dms->getDocument($db->getInsertID('tblDocuments'));
 
-//		if ($version_comment!="")
-			$res = $document->addContent($version_comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers, $reqversion, $version_attributes, $workflow, $initstate);
-//		else $res = $document->addContent($comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers,$reqversion, $version_attributes, $workflow);
+		$curuser = $this->_dms->getLoggedInUser();
+		$res = $document->addContent($version_comment, $curuser ? $curuser : $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers, $reqversion, $version_attributes, $workflow, $initstate);
 
 		if (is_bool($res) && !$res) {
 			$db->rollbackTransaction();
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index cd247a9ac..2095ca85e 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-03-14</date>
+ <date>2018-04-03</date>
  <time>09:19:24</time>
  <version>
   <release>6.0.6</release>
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+SeedDMS_Core_Folder::addContent() uses currently logged in user as uploader instead of owner
 SeedDMS_Core_DocumentContent::verifyStatus() will not set status to S_RELEASED
 if currently in S_DRAFT status und no workflow, review, approval, or revision
 is pending.

From 52f58727ca94b0235661a83789aaecb76dae9f44 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 15:29:32 +0200
Subject: [PATCH 1051/2006] add sql statements for scheduler

---
 install/create_tables-innodb.sql         | 20 ++++++++++++++++++++
 install/create_tables-postgres.sql       | 19 +++++++++++++++++++
 install/create_tables-sqlite3.sql        | 19 +++++++++++++++++++
 install/update-6.0.0/update-postgres.sql | 13 +++++++++++++
 install/update-6.0.0/update-sqlite3.sql  | 13 +++++++++++++
 install/update-6.0.0/update.sql          | 14 ++++++++++++++
 6 files changed, 98 insertions(+)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index ec1cb63c8..245b62487 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -968,6 +968,26 @@ CREATE TABLE `tblArosAcos` (
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table `tblSchedulerTask`
+--
+
+CREATE TABLE `tblSchedulerTask` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) DEFAULT NULL,
+  `description` text DEFAULT NULL,
+  `disabled` smallint(1) NOT NULL DEFAULT '0',
+  `extension` varchar(100) DEFAULT NULL,
+  `task` varchar(100) DEFAULT NULL,
+  `frequency` varchar(100) DEFAULT NULL,
+  `params` text DEFAULT NULL,
+  `nextrun` datetime DEFAULT NULL,
+  `lastrun` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `tblVersion`
 --
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index af8fd53b3..7a36a63b2 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -783,6 +783,25 @@ CREATE TABLE "tblArosAcos" (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for tblSchedulerTask
+-- 
+
+CREATE TABLE "tblSchedulerTask" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(100) DEFAULT NULL,
+  "description" TEXT DEFAULT NULL,
+  "disabled" INTEGER NOT NULL DEFAULT '0',
+  "extension" varchar(100) DEFAULT NULL,
+  "task" varchar(100) DEFAULT NULL,
+  "frequency" varchar(100) DEFAULT NULL,
+  "params" TEXT DEFAULT NULL,
+  "nextrun" TIMESTAMP DEFAULT NULL,
+  "lastrun" TIMESTAMP DEFAULT NULL
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for version
 -- 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 3c130dd2f..15e471de0 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -792,6 +792,25 @@ CREATE TABLE `tblArosAcos` (
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table `tblSchedulerTask`
+--
+
+CREATE TABLE `tblSchedulerTask` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` varchar(100) DEFAULT NULL,
+  `description` TEXT DEFAULT NULL,
+  `disabled` INTEGER NOT NULL DEFAULT '0',
+  `extension` varchar(100) DEFAULT NULL,
+  `task` varchar(100) DEFAULT NULL,
+  `frequency` varchar(100) DEFAULT NULL,
+  `params` TEXT DEFAULT NULL,
+  `nextrun` TEXT DEFAULT NULL,
+  `lastrun` TEXT DEFAULT NULL
+) ;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `tblVersion`
 --
diff --git a/install/update-6.0.0/update-postgres.sql b/install/update-6.0.0/update-postgres.sql
index 0631c9bb3..aa0068bac 100644
--- a/install/update-6.0.0/update-postgres.sql
+++ b/install/update-6.0.0/update-postgres.sql
@@ -138,6 +138,19 @@ CREATE TABLE "tblArosAcos" (
   CONSTRAINT "tblArosAcos_aros" FOREIGN KEY ("aro") REFERENCES "tblAros" ("id") ON DELETE CASCADE
 );
 
+CREATE TABLE "tblSchedulerTask" (
+  "id" SERIAL UNIQUE,
+  "name" varchar(100) DEFAULT NULL,
+  "description" TEXT DEFAULT NULL,
+  "disabled" INTEGER NOT NULL DEFAULT '0',
+  "extension" varchar(100) DEFAULT NULL,
+  "task" varchar(100) DEFAULT NULL,
+  "frequency" varchar(100) DEFAULT NULL,
+  "params" TEXT DEFAULT NULL,
+  "nextrun" TIMESTAMP DEFAULT NULL,
+  "lastrun" TIMESTAMP DEFAULT NULL
+) ;
+
 UPDATE "tblVersion" set "major"=6, "minor"=0, "subminor"=0;
 
 COMMIT;
diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql
index c33f05c59..c55358638 100644
--- a/install/update-6.0.0/update-sqlite3.sql
+++ b/install/update-6.0.0/update-sqlite3.sql
@@ -154,6 +154,19 @@ CREATE INDEX `indDocumentApproveLogApproveID` ON `tblDocumentApproveLog` (`appro
 CREATE INDEX `indDocumentReviewersRequired` ON `tblDocumentReviewers` (`required`);
 CREATE INDEX `indDocumentReviewLogReviewID` ON `tblDocumentReviewLog` (`reviewID`);
 
+CREATE TABLE `tblSchedulerTask` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` varchar(100) DEFAULT NULL,
+  `description` TEXT DEFAULT NULL,
+  `disabled` INTEGER NOT NULL DEFAULT '0',
+  `extension` varchar(100) DEFAULT NULL,
+  `task` varchar(100) DEFAULT NULL,
+  `frequency` varchar(100) DEFAULT NULL,
+  `params` TEXT DEFAULT NULL,
+  `nextrun` TEXT DEFAULT NULL,
+  `lastrun` TEXT DEFAULT NULL
+) ;
+
 UPDATE tblVersion set major=6, minor=0, subminor=0;
 
 COMMIT;
diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index 526c51f33..ea9b70c9a 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -153,6 +153,20 @@ CREATE TABLE `tblArosAcos` (
   CONSTRAINT `tblArosAcos_aros` FOREIGN KEY (`aro`) REFERENCES `tblAros` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `tblSchedulerTask` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) DEFAULT NULL,
+  `description` text DEFAULT NULL,
+  `disabled` smallint(1) NOT NULL DEFAULT '0',
+  `extension` varchar(100) DEFAULT NULL,
+  `task` varchar(100) DEFAULT NULL,
+  `frequency` varchar(100) DEFAULT NULL,
+  `params` text DEFAULT NULL,
+  `nextrun` datetime DEFAULT NULL,
+  `lastrun` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 UPDATE tblVersion set major=6, minor=0, subminor=0;
 
 COMMIT;

From 9ae591bae769ac8e1be1b34c1d4359c7894e581d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 15:31:43 +0200
Subject: [PATCH 1052/2006] add scheduler

---
 inc/inc.ClassScheduler.php                 |  74 +++++
 inc/inc.ClassSchedulerTask.php             | 278 ++++++++++++++++++
 inc/inc.ClassSchedulerTaskBase.php         |  37 +++
 inc/inc.Extension.php                      |   1 +
 inc/inc.Scheduler.php                      |  17 ++
 op/op.SchedulerTaskMgr.php                 | 107 +++++++
 out/out.SchedulerTaskMgr.php               |  67 +++++
 utils/schedulercli.php                     | 108 +++++++
 utils/seeddms-schedulercli                 |   6 +
 views/bootstrap/class.SchedulerTaskMgr.php | 315 +++++++++++++++++++++
 10 files changed, 1010 insertions(+)
 create mode 100644 inc/inc.ClassScheduler.php
 create mode 100644 inc/inc.ClassSchedulerTask.php
 create mode 100644 inc/inc.ClassSchedulerTaskBase.php
 create mode 100644 inc/inc.Scheduler.php
 create mode 100644 op/op.SchedulerTaskMgr.php
 create mode 100644 out/out.SchedulerTaskMgr.php
 create mode 100644 utils/schedulercli.php
 create mode 100644 utils/seeddms-schedulercli
 create mode 100644 views/bootstrap/class.SchedulerTaskMgr.php

diff --git a/inc/inc.ClassScheduler.php b/inc/inc.ClassScheduler.php
new file mode 100644
index 000000000..38aad78de
--- /dev/null
+++ b/inc/inc.ClassScheduler.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Implementation of an SchedulerTask.
+ *
+ * SeedDMS can be extended by extensions. Extension usually implement
+ * hook.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2018 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class to represent a SchedulerTask
+ *
+ * This class provides some very basic methods to manage extensions.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2011 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Scheduler {
+
+	/**
+	 * Instanz of database
+	 */
+	protected $db;
+
+	public function getTask($id) { /* {{{ */
+		return SeedDMS_SchedulerTask::getInstance($id, $this->db);
+	} /* }}} */
+
+	public function getTasksByExtension($extname, $taskname) { /* {{{ */
+		return SeedDMS_SchedulerTask::getInstancesByExtension($extname, $taskname, $this->db);
+	} /* }}} */
+
+	public function getTasks() { /* {{{ */
+		return SeedDMS_SchedulerTask::getInstances($this->db);
+	} /* }}} */
+
+	public function addTask($extname, $taskname, $name, $description, $frequency, $disabled, $params) { /* {{{ */
+		$db = $this->db;
+		if(!$extname)
+			return false;
+		if(!$taskname)
+			return false;
+		try {
+			$cron = Cron\CronExpression::factory($frequency);
+		} catch (Exception $e) {
+			return false;
+		}
+		$nextrun = $cron->getNextRunDate()->format('Y-m-d H:i:s');
+
+		$queryStr = "INSERT INTO `tblSchedulerTask` (`extension`, `task`, `name`, `description`, `frequency`, `disabled`, `params`, `nextrun`, `lastrun`) VALUES (".$db->qstr($extname).", ".$db->qstr($taskname).", ".$db->qstr($name).", ".$db->qstr($description).", ".$db->qstr($frequency).", ".intval($disabled).", ".$db->qstr(json_encode($params)).", '".$nextrun."', NULL)";
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$task = SeedDMS_SchedulerTask::getInstance($db->getInsertID('tblSchedulerTask'), $db);
+
+		return $task;
+	} /* }}} */
+
+	function __construct($db) {
+		$this->db = $db;
+	}
+
+}
diff --git a/inc/inc.ClassSchedulerTask.php b/inc/inc.ClassSchedulerTask.php
new file mode 100644
index 000000000..45017dbc3
--- /dev/null
+++ b/inc/inc.ClassSchedulerTask.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ * Implementation of an SchedulerTask.
+ *
+ * SeedDMS can be extended by extensions. Extension usually implement
+ * hook.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2018 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class to represent a SchedulerTask
+ *
+ * This class provides some very basic methods to manage extensions.
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  2011 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_SchedulerTask {
+	/**
+	 * Instanz of database
+	 */
+	protected $db;
+
+	/**
+	 * @var integer unique id of task
+	 */
+	protected $_id;
+
+	/**
+	 * @var string name of task
+	 */
+	protected $_name;
+
+	/**
+	 * @var string description of task
+	 */
+	protected $_description;
+
+	/**
+	 * @var string extension of task
+	 */
+	protected $_extension;
+
+	/**
+	 * @var string task of task
+	 */
+	protected $_task;
+
+	/**
+	 * @var string frequency of task
+	 */
+	protected $_frequency;
+
+	/**
+	 * @var integer set if disabled
+	 */
+	protected $_disabled;
+
+	/**
+	 * @var integer last run
+	 */
+	protected $_lastrun;
+
+	/**
+	 * @var integer next run
+	 */
+	protected $_nextrun;
+
+	public static function getInstance($id, $db) { /* {{{ */
+		$queryStr = "SELECT * FROM `tblSchedulerTask` WHERE `id` = " . (int) $id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr) != 1)
+			return null;
+		$row = $resArr[0];
+
+		$task = new self($row["id"], $row['name'], $row["description"], $row["extension"], $row["task"], $row["frequency"], $row['disabled'], json_decode($row['params'], true), $row["nextrun"], $row["lastrun"]);
+		$task->setDB($db);
+
+		return $task;
+	} /* }}} */
+
+	public static function getInstances($db) { /* {{{ */
+		$queryStr = "SELECT * FROM `tblSchedulerTask`";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr) == 0)
+			return array();
+
+		$tasks = array();
+		foreach($resArr as $row) {
+			$task = new self($row["id"], $row['name'], $row["description"], $row["extension"], $row["task"], $row["frequency"], $row['disabled'], json_decode($row['params'], true), $row["nextrun"], $row["lastrun"]);
+			$task->setDB($db);
+			$tasks[] = $task;
+		}
+
+		return $tasks;
+	} /* }}} */
+
+	public static function getInstancesByExtension($extname, $taskname, $db) { /* {{{ */
+		$queryStr = "SELECT * FROM `tblSchedulerTask` WHERE `extension` = '".$extname."' AND `task` = '".$taskname."'";
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		if (count($resArr) == 0)
+			return array();
+
+		$tasks = array();
+		foreach($resArr as $row) {
+			$task = new self($row["id"], $row['name'], $row["description"], $row["extension"], $row["task"], $row["frequency"], $row['disabled'], json_decode($row['params'], true), $row["nextrun"], $row["lastrun"]);
+			$task->setDB($db);
+			$tasks[] = $task;
+		}
+
+		return $tasks;
+	} /* }}} */
+
+	function __construct($id, $name, $description, $extension, $task, $frequency, $disabled, $params, $nextrun, $lastrun) {
+		$this->_id = $id;
+		$this->_name = $name;
+		$this->_description = $description;
+		$this->_extension = $extension;
+		$this->_task = $task;
+		$this->_frequency = $frequency;
+		$this->_disabled = $disabled;
+		$this->_params = $params;
+		$this->_nextrun = $nextrun;
+		$this->_lastrun = $lastrun;
+	}
+
+	public function setDB($db) {
+		$this->db = $db;
+	}
+
+	public function getID() {
+		return $this->_id;
+	}
+
+	public function getName() {
+		return $this->_name;
+	}
+
+	public function setName($newName) { /* {{{ */
+		$db = $this->db;
+
+		$queryStr = "UPDATE `tblSchedulerTask` SET `name` =".$db->qstr($newName)." WHERE `id` = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_name = $newName;
+		return true;
+	} /* }}} */
+
+	public function getDescription() {
+		return $this->_description;
+	}
+
+	public function setDescription($newDescripion) { /* {{{ */
+		$db = $this->db;
+
+		$queryStr = "UPDATE `tblSchedulerTask` SET `description` =".$db->qstr($newDescripion)." WHERE `id` = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_description = $newDescripion;
+		return true;
+	} /* }}} */
+
+	public function getExtension() {
+		return $this->_extension;
+	}
+
+	public function getTask() {
+		return $this->_task;
+	}
+
+	public function getFrequency() {
+		return $this->_frequency;
+	}
+
+	public function setFrequency($newFrequency) { /* {{{ */
+		$db = $this->db;
+
+		try {
+			$cron = Cron\CronExpression::factory($newFrequency);
+		} catch (Exception $e) {
+			return false;
+		}
+		$nextrun = $cron->getNextRunDate()->format('Y-m-d H:i:s');
+
+		$queryStr = "UPDATE `tblSchedulerTask` SET `frequency` =".$db->qstr($newFrequency).", `nextrun` = '".$nextrun."' WHERE `id` = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_frequency = $newFrequency;
+		$this->_nextrun = $nextrun;
+		return true;
+	} /* }}} */
+
+	public function getNextRun() {
+		return $this->_nextrun;
+	}
+
+	public function getLastRun() {
+		return $this->_lastrun;
+	}
+
+	public function getDisabled() {
+		return $this->_disabled;
+	}
+
+	public function setDisabled($newDisabled) { /* {{{ */
+		$db = $this->db;
+
+		$queryStr = "UPDATE `tblSchedulerTask` SET `disabled` =".intval($newDisabled)." WHERE `id` = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_disabled = $newDisable;
+		return true;
+	} /* }}} */
+
+	public function setParameter($newParams) { /* {{{ */
+		$db = $this->db;
+
+		$queryStr = "UPDATE `tblSchedulerTask` SET `parameter` =".json_encode($newParams)." WHERE `id` = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_params = $newParams;
+		return true;
+	} /* }}} */
+
+	public function getParameter() {
+		return $this->_params;
+	}
+
+	public function isDue() {
+		return $this->_nextrun < date('Y-m-d H:i:s');
+	}
+
+	public function updateLastNextRun() {
+		$db = $this->db;
+
+		$lastrun = date('Y-m-d H:i:s');
+		try {
+			$cron = Cron\CronExpression::factory($this->_frequency);
+			$nextrun = $cron->getNextRunDate()->format('Y-m-d H:i:s');
+		} catch (Exception $e) {
+			$nextrun = null;
+		}
+
+		$queryStr = "UPDATE `tblSchedulerTask` SET `lastrun`=".$db->qstr($lastrun).", `nextrun`=".($nextrun ? $db->qstr($nextrun) : "NULL")." WHERE `id` = " . $this->_id;
+		$res = $db->getResult($queryStr);
+		if (!$res)
+			return false;
+
+		$this->_lastrun = $lastrun;
+		$this->_nextrun = $nextrun;
+	}
+}
diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
new file mode 100644
index 000000000..c190096a9
--- /dev/null
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -0,0 +1,37 @@
+<?php
+/***************************************************************
+*  Copyright notice
+*
+*  (c) 2018 Uwe Steinmann <uwe@steinmann.cx>
+*  All rights reserved
+*
+*  This script is part of the SeedDMS project. The SeedDMS project is
+*  free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  The GNU General Public License can be found at
+*  http://www.gnu.org/copyleft/gpl.html.
+*
+*  This script is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+
+/**
+ * Base class for scheduler task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ */
+class SeedDMS_SchedulerTaskBase {
+	public function execute($task, $dms) {
+		return true;
+	}
+}
+
+?>
diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php
index b5ba1c203..ceb491587 100644
--- a/inc/inc.Extension.php
+++ b/inc/inc.Extension.php
@@ -12,6 +12,7 @@
  */
 
 require "inc.ClassExtensionMgr.php";
+require_once "inc.ClassSchedulerTaskBase.php";
 require_once "inc.ClassExtBase.php";
 require_once "inc.Version.php";
 require_once "inc.Utils.php";
diff --git a/inc/inc.Scheduler.php b/inc/inc.Scheduler.php
new file mode 100644
index 000000000..e5c2e3aaa
--- /dev/null
+++ b/inc/inc.Scheduler.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Initialize scheduler
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2018 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+require_once "inc.ClassSchedulerTaskBase.php";
+require_once "inc.ClassScheduler.php";
+require_once "inc.ClassSchedulerTask.php";
+
diff --git a/op/op.SchedulerTaskMgr.php b/op/op.SchedulerTaskMgr.php
new file mode 100644
index 000000000..6904da2c7
--- /dev/null
+++ b/op/op.SchedulerTaskMgr.php
@@ -0,0 +1,107 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2012 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Scheduler.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if ($user->isGuest()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+if (isset($_POST["action"])) $action=$_POST["action"];
+else $action=NULL;
+
+$scheduler = new SeedDMS_Scheduler($dms->getDB());
+
+// add new task ---------------------------------------------------
+if ($action == "addtask") { /* {{{ */
+	
+	/* Check if the form data comes for a trusted request */
+	if(!checkFormKey('addtask')) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+	}
+
+	$extension = $_POST["extension"];
+	$task    = $_POST["task"];
+	$name    = $_POST["name"];
+	$description = $_POST["description"];
+	$frequency = $_POST["frequency"];
+	$params = $_POST["params"];
+
+	$newtask = $scheduler->addTask($extension, $task, $name, $description, $frequency, 0, $params);
+	if ($newtask) {
+	}
+	else UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+	
+	$taskid=$newtask->getID();
+	
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_task')));
+
+	add_log_line(".php&action=addtask&name=".$name);
+} /* }}} */
+
+// modify transmittal ----------------------------------------------------
+else if ($action == "edittask") { /* {{{ */
+
+	/* Check if the form data comes for a trusted request */
+	if(!checkFormKey('edittask')) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+	}
+
+	if (!isset($_POST["taskid"]) || !is_numeric($_POST["taskid"]) || intval($_POST["taskid"])<1) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_task"));
+	}
+	
+	$taskid=$_POST["taskid"];
+	$editedtask = $scheduler->getTask($taskid);
+	
+	if (!is_object($editedtask)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_task"));
+	}
+
+	$name = $_POST["name"];
+	$description = $_POST["description"];
+	$frequency = $_POST["frequency"];
+	$disabled = isset($_POST["disabled"]) ? $_POST["disabled"] : 0;
+	$params = $_POST["params"];
+	
+	if ($editedtask->getName() != $name)
+		$editedtask->setName($name);
+	if ($editedtask->getDescription() != $description)
+		$editedtask->setDescription($description);
+	$editedtask->setFrequency($frequency);
+	$editedtask->setDisabled($disabled);
+	$editedtask->setParameter($params);
+
+	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_task')));
+	add_log_line(".php&action=edittask&taskid=".$taskid);
+} /* }}} */
+
+header("Location:../out/out.SchedulerTaskMgr.php");
+
diff --git a/out/out.SchedulerTaskMgr.php b/out/out.SchedulerTaskMgr.php
new file mode 100644
index 000000000..14d95d766
--- /dev/null
+++ b/out/out.SchedulerTaskMgr.php
@@ -0,0 +1,67 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 2013 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Version.php");
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Scheduler.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+if(isset($_GET['task'])) {
+	$taskname = $_GET['task'];
+} else {
+	$taskname = '';
+}
+
+if(isset($_GET['extension'])) {
+	$extname = $_GET['extension'];
+} else {
+	$extname = '';
+}
+
+if(isset($_GET['taskid'])) {
+	$taskid = $_GET['taskid'];
+} else {
+	$taskid = 0;
+}
+
+$scheduler = new SeedDMS_Scheduler($dms->getDB());
+
+if($view) {
+	$view->setParam('scheduler', $scheduler);
+	$view->setParam('accessobject', $accessop);
+	$view->setParam('taskname', $taskname);
+	$view->setParam('extname', $extname);
+	$view->setParam('taskid', $taskid);
+	$view($_GET);
+	exit;
+}
+
+?>
diff --git a/utils/schedulercli.php b/utils/schedulercli.php
new file mode 100644
index 000000000..b5e4a59cc
--- /dev/null
+++ b/utils/schedulercli.php
@@ -0,0 +1,108 @@
+<?php
+if(isset($_SERVER['SEEDDMS_HOME'])) {
+	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = $_SERVER['SEEDDMS_HOME'];
+} else {
+	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = dirname($argv[0]);
+}
+
+
+function usage() { /* {{{ */
+	echo "Usage:\n";
+	echo "  seeddms-schedulercli [-h] [-v] [--config <file>]\n";
+	echo "\n";
+	echo "Description:\n";
+	echo "  Check for scheduled tasks.\n";
+	echo "\n";
+	echo "Options:\n";
+	echo "  -h, --help: print usage information and exit.\n";
+	echo "  -v, --version: print version and exit.\n";
+	echo "  --config: set alternative config file.\n";
+	echo "  --mode: set mode of operation (run, check, list).\n";
+} /* }}} */
+
+$version = "0.0.1";
+$shortoptions = "hvc";
+$longoptions = array('help', 'version', 'config:', 'mode:');
+if(false === ($options = getopt($shortoptions, $longoptions))) {
+	usage();
+	exit(0);
+}
+
+/* Print help and exit */
+if(isset($options['h']) || isset($options['help'])) {
+	usage();
+	exit(0);
+}
+
+/* Print version and exit */
+if(isset($options['v']) || isset($options['verѕion'])) {
+	echo $version."\n";
+	exit(0);
+}
+
+/* Set alternative config file */
+if(isset($options['config'])) {
+	define('SEEDDMS_CONFIG_FILE', $options['config']);
+}
+
+$mode = 'list';
+if(isset($options['mode'])) {
+	if(!in_array($options['mode'], array('run', 'check', 'list'))) {
+		usage();
+		exit(1);
+	}
+	$mode = $options['mode'];
+}
+
+include($myincpath."/inc/inc.Settings.php");
+include($myincpath."/inc/inc.Init.php");
+include($myincpath."/inc/inc.Extension.php");
+include($myincpath."/inc/inc.DBInit.php");
+include($myincpath."/inc/inc.Scheduler.php");
+
+$scheduler = new SeedDMS_Scheduler($db);
+$tasks = $scheduler->getTasks();
+
+foreach($tasks as $task) {
+	if(is_object($taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])) {
+		switch($mode) {
+		case "run":
+			if(method_exists($taskobj, 'execute')) {
+				if(!$task->getDisabled()) {
+					if($taskobj->execute($task, $dms)) {
+						$task->updateLastNextRun();
+					} else {
+						echo "Execution of task failed, task has been disabled\n";
+						$task->setDisabled(1);
+					}
+				}
+			}
+			break;
+		case "check":
+			echo "Checking ".$task->getExtension()."::".$task->getTask().":\n";
+			if(!method_exists($taskobj, 'execute')) {
+				echo "  Missing method execute()\n";
+			}
+			if(get_parent_class($taskobj) != 'SeedDMS_SchedulerTaskBase') {
+				echo "  wrong parent class\n";
+			}
+			break;
+		case "list":
+			if(!$task->getDisabled()) {
+				if($task->isDue())
+					echo "*";
+				else
+					echo " ";
+			} else {
+					echo "-";
+			}
+			echo " ".$task->getExtension()."::".$task->getTask()."";
+			echo " ".$task->getNextRun();
+			echo "\n";
+			break;
+		}
+	}
+
+}
diff --git a/utils/seeddms-schedulercli b/utils/seeddms-schedulercli
new file mode 100644
index 000000000..34bc8b219
--- /dev/null
+++ b/utils/seeddms-schedulercli
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z ${SEEDDMS_HOME+x} ]; then
+	echo "Please set SEEDDMS_HOME before running this script";
+	exit 1;
+fi
+php -f ${SEEDDMS_HOME}/utils/schedulercli.php -- "$@"
diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
new file mode 100644
index 000000000..8ada34273
--- /dev/null
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -0,0 +1,315 @@
+<?php
+/**
+ * Implementation of SchedulerTaskMgr view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for SchedulerTaskMgr view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_SchedulerTaskMgr extends SeedDMS_Bootstrap_Style {
+
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+?>
+$(document).ready( function() {
+	$('body').on('click', '.addtask', function(ev){
+		ev.preventDefault();
+		$('#editaddtask.ajax').trigger('update', {extension: $(this).data('extension'), task: $(this).data('task')});
+	});
+	$('body').on('click', '.listtasks', function(ev){
+		ev.preventDefault();
+		$('#listtasks.ajax').trigger('update', {extension: $(this).data('extension'), task: $(this).data('task')});
+	});
+	$('body').on('click', '.edittask', function(ev){
+		ev.preventDefault();
+		$('#editaddtask.ajax').trigger('update', {taskid: $(this).data('id'), action: $(this).data('action')});
+	});
+	$('#listtasks.ajax').trigger('update', {});
+});
+<?php
+	} /* }}} */
+
+	public function form() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$extname = $this->params['extname'];
+		$taskname = $this->params['taskname'];
+		if($extname && $taskname) {
+			$taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$extname][$taskname];
+			if(method_exists($taskobj, 'getAdditionalParams'))
+				$additionalparams = $taskobj->getAdditionalParams();
+			else
+				$additionalparams = null;
+?>
+	<form action="../op/op.SchedulerTaskMgr.php" method="post" class="form-horizontal">
+	<?=	createHiddenFieldWithKey('addtask') ?>
+	<input type="hidden" name="action" value="addtask">
+	<input type="hidden" name="extension" value="<?= $extname ?>">
+	<input type="hidden" name="task" value="<?= $taskname ?>">
+	<div class="control-group">
+		<label class="control-label" for="extension"><?= getMLText("scheduler_class");?>:</label>
+		<div class="controls">
+		<span class="input uneditable-input"><?= $extname ?>::<?= $taskname ?></span>
+		</div>
+	</div>
+	<div class="control-group">
+		<label class="control-label" for="name"><?php printMLText("task_name");?>:</label>
+		<div class="controls">
+			<input type="text" id="name" name="name" value="">
+		</div>
+	</div>
+	<div class="control-group">
+		<label class="control-label" for="description"><?php printMLText("task_description");?>:</label>
+		<div class="controls">
+			<input type="text" id="description" name="description" value="">
+		</div>
+	</div>
+	<div class="control-group">
+		<label class="control-label" for="frequency"><?php printMLText("task_frequency");?>:</label>
+		<div class="controls">
+			<input type="text" id="frequency" name="frequency" value="">
+		</div>
+	</div>
+<?php
+			if($additionalparams) {
+				foreach($additionalparams as $param) {
+					switch($param['type']) {
+					default:
+?>
+	<div class="control-group">
+	<label class="control-label" for="params_<?= $param['name'] ?>"><?php printMLText($extname."_".$taskname."_".$param['name']);?>:</label>
+		<div class="controls">
+		<input type="text" id="params_<?= $param['name'] ?>" name="params[<?= $param['name'] ?>]" value="">
+		</div>
+	</div>
+<?php
+					break;
+					}
+				}
+			}
+?>
+	<div class="control-group">
+		<label class="control-label" for="login"></label>
+		<div class="controls">
+			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+		</div>
+	</div>
+	</form>
+<?php
+		}
+	} /* }}} */
+
+	public function edittask() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$scheduler = $this->params['scheduler'];
+		$taskid = $this->params['taskid'];
+
+		$task = $scheduler->getTask($taskid);
+		$taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()];
+?>
+	<form action="../op/op.SchedulerTaskMgr.php" method="post" class="form-horizontal">
+	<?=	createHiddenFieldWithKey('edittask') ?>
+	<input type="hidden" name="action" value="edittask">
+	<input type="hidden" name="taskid" value="<?= $taskid ?>">
+	<input type="hidden" name="extension" value="<?= $task->getExtension() ?>">
+	<input type="hidden" name="task" value="<?= $task->getTask() ?>">
+	<div class="control-group">
+		<label class="control-label" for="extension"><?= getMLText("scheduler_class");?>:</label>
+		<div class="controls">
+		<span class="input uneditable-input"><?= $task->getExtension() ?>::<?= $task->getTask() ?></span>
+		</div>
+	</div>
+	<div class="control-group">
+		<label class="control-label" for="name"><?php printMLText("task_name");?>:</label>
+		<div class="controls">
+		<input type="text" id="name" name="name" value="<?= $task->getName() ?>">
+		</div>
+	</div>
+	<div class="control-group">
+		<label class="control-label" for="description"><?php printMLText("task_description");?>:</label>
+		<div class="controls">
+		<input type="text" id="description" name="description" value="<?= $task->getDescription() ?>">
+		</div>
+	</div>
+	<div class="control-group">
+		<label class="control-label" for="frequency"><?php printMLText("task_frequency");?>:</label>
+		<div class="controls">
+		<input type="text" id="frequency" name="frequency" value="<?= $task->getFrequency() ?>">
+		</div>
+	</div>
+	<div class="control-group">
+		<div class="controls">
+			<label class="checkbox">
+				<input type="checkbox" name="disabled" value="1"<?= ($task->getDisabled() ? ' checked' : '') ?>> <?= getMLText('task_disabled'); ?>
+			</label>
+		</div>
+	</div>
+<?php
+		if($additionalparams = $taskobj->getAdditionalParams()) {
+			foreach($additionalparams as $param) {
+				switch($param['type']) {
+				default:
+?>
+	<div class="control-group">
+	<label class="control-label" for="params_<?= $param['name'] ?>"><?php printMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']);?>:</label>
+		<div class="controls">
+		<input type="text" id="params_<?= $param['name'] ?>" name="params[<?= $param['name'] ?>]" value="<?= $task->getParameter()[$param['name']] ?>">
+		</div>
+	</div>
+<?php
+				break;
+				}
+			}
+		}
+?>
+	<div class="control-group">
+		<label class="control-label" for="login"></label>
+		<div class="controls">
+			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+		</div>
+	</div>
+	</form>
+<?php
+	} /* }}} */
+
+	public function tasklist() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$extname = $this->params['extname'];
+		$taskname = $this->params['taskname'];
+		$scheduler = $this->params['scheduler'];
+
+		if($extname && $taskname)
+			$tasks = $scheduler->getTasksByExtension($extname, $taskname);
+		else
+			$tasks = $scheduler->getTasks();
+		if(!$tasks)
+			return;
+		
+		$this->contentHeading(getMLText("scheduler_class_tasks"));
+		echo "<table class=\"table _table-condensed\">\n";
+		print "<thead>\n<tr>\n";
+		print "<th>".getMLText('scheduler_class')."</th>\n";	
+		print "<th>".getMLText('task_name')."</th>\n";	
+		print "<th>".getMLText('task_description')."</th>\n";	
+		print "<th>".getMLText('task_frequency')."</th>\n";	
+		print "<th>".getMLText('task_next_run')."</th>\n";	
+		print "<th>".getMLText('task_last_run')."</th>\n";	
+		print "<th></th>\n";	
+		print "</tr></thead><tbody>\n";
+		foreach($tasks  as $task) {
+			echo "<tr".(!$task->getDisabled() ? " class=\"success\"" : "").">";
+			echo "<td>";
+			echo $task->getExtension()."::".$task->getTask();
+			echo "</td>";
+			echo "<td>";
+			echo $task->getName();
+			echo "</td>";
+			echo "<td width=\"100%\">";
+			echo $task->getDescription();
+			echo "</td>";
+			echo "<td>";
+			echo $task->getFrequency();
+			echo "</td>";
+			echo "<td>";
+			echo $task->getNextRun();
+			echo "</td>";
+			echo "<td>";
+			echo $task->getLastRun();
+			echo "</td>";
+			echo "<td>";
+			print "<div class=\"list-action\">";
+			print "<a class=\"edittask\" data-action=\"edittask\" data-id=\"".$task->getID()."\" href=\"../out/out.SchedulerTaskMgr.php?action=edittask\" title=\"".getMLText("edit_task")."\"><i class=\"icon-edit\"></i></a>";
+			print "</div>";
+			echo "</td>";
+			echo "</tr>";
+		}
+		echo "</tbody></table>\n";
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$extname = $this->params['extname'];
+		$taskname = $this->params['taskname'];
+		$scheduler = $this->params['scheduler'];
+	
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+		$this->contentHeading(getMLText("scheduler_task_manager"));
+?>
+<div class="row-fluid">
+	<div class="span6">
+<?php
+		echo "<table class=\"table _table-condensed\">\n";
+		print "<thead>\n<tr>\n";
+		print "<th>".getMLText('scheduler_class')."</th>\n";	
+		print "<th>".getMLText('scheduler_class_description')."</th>\n";	
+		print "<th>".getMLText('scheduler_class_parameter')."</th>\n";	
+		print "<th></th>\n";	
+		print "</tr></thead><tbody>\n";
+		$errmsgs = array();
+		foreach($GLOBALS['SEEDDMS_SCHEDULER']['tasks'] as $extname=>$tasks) {
+			foreach($tasks as $taskname=>$task) {
+				echo "<tr>";
+				echo "<td>";
+				echo $extname."::".$taskname;
+				echo "</td>";
+				echo "<td width=\"100%\">";
+				echo $task->getDescription();
+				echo "</td>";
+				echo "<td>";
+				$params = $task->getAdditionalParams();
+				foreach($params as $param)
+					$k[] = $param['name'];
+				echo implode(', ', $k);
+				echo "</td>";
+				echo "<td>";
+				print "<div class=\"list-action\">";
+				$t = $scheduler->getTasksByExtension($extname, $taskname);
+				if($t) {
+					print "<a class=\"listtasks\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("list_tasks")."\"><i class=\"icon-list\"></i></a>";
+				}
+				print "<a class=\"addtask\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"icon-plus\"></i></a>";
+				print "</div>";
+				echo "</td>";
+				echo "</tr>";
+			}
+		}
+		echo "</tbody></table>\n";
+?>
+		<div id="listtasks" class="ajax" data-view="SchedulerTaskMgr" data-action="tasklist"></div>
+  </div>
+	<div class="span6">
+		<div id="editaddtask" class="ajax" data-view="SchedulerTaskMgr" data-action="form"></div>
+	</div>
+</div>
+
+<?php
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From 9711cee70a12707318ad28c8d1c46a93573747ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 15:31:57 +0200
Subject: [PATCH 1053/2006] add example for scheduler

---
 ext/example/class.example.php | 17 +++++++++++++++--
 ext/example/lang.php          |  5 +++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ext/example/class.example.php b/ext/example/class.example.php
index fce09e0b0..31c892d95 100644
--- a/ext/example/class.example.php
+++ b/ext/example/class.example.php
@@ -117,8 +117,21 @@ class SeedDMS_ExtExample_ViewFolder {
  * @package SeedDMS
  * @subpackage  example
  */
-class SeedDMS_ExtExample_Task {
-	public function execute() {
+class SeedDMS_ExtExample_Task extends SeedDMS_SchedulerTaskBase {
+	public function execute($task, $dms) {
+		return true;
+	}
+
+	public function getDescription() {
+		return 'Description';
+	}
+
+	public function getAdditionalParams() {
+		return array(array(
+			'name'=>'email',
+			'type'=>'string',
+			'description'=> '',
+		));
 	}
 }
 
diff --git a/ext/example/lang.php b/ext/example/lang.php
index 55b3b860b..aca01c37d 100644
--- a/ext/example/lang.php
+++ b/ext/example/lang.php
@@ -1,5 +1,10 @@
 <?php
 $__lang['de_DE'] = array(
 	'folder_contents' => 'Dies war mal "Ordner enthält". Wurde von sample Extension geändert.',
+	'task_example_example_email' => 'Email',
+);
+$__lang['en_GB'] = array(
+	'folder_contents' => 'This used to be "Folder contents". Was changed by sample Extension.',
+	'task_example_example_email' => 'Email',
 );
 ?>

From eadce9145dd31f6fd2579e8879973508be839d90 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 17:46:44 +0200
Subject: [PATCH 1054/2006] do now allow to set disabled users as owner

---
 views/bootstrap/class.AddDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index cc7736043..048a56941 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -271,7 +271,7 @@ $(document).ready(function() {
 <?php
 	$allUsers = $dms->getAllUsers($sortusersinlist);
 	foreach ($allUsers as $currUser) {
-		if ($currUser->isGuest())
+		if ($currUser->isGuest() || $currUser->isDisabled())
 			continue;
 		print "<option value=\"".$currUser->getID()."\" ".($currUser->getID()==$user->getID() ? 'selected' : '')." data-subtitle=\"".htmlspecialchars($currUser->getFullName())."\"";
 		print ">" . htmlspecialchars($currUser->getLogin()) . "</option>\n";

From 7dc6cba8f207b76b1db962e54772bb76c1d82dc5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 21:46:45 +0200
Subject: [PATCH 1055/2006] make printPopupBox() public

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 1cac407df..e8a26658d 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2983,7 +2983,7 @@ $(document).ready(function() {
 		$this->printTimelineHtml($height);
 	} /* }}} */
 
-	protected function printPopupBox($title, $content, $ret=false) { /* {{{ */
+	public function printPopupBox($title, $content, $ret=false) { /* {{{ */
 		$id = md5(uniqid());
 		/*
 		$this->addFooterJS('

From 6fb4b9b545b6e41ea848341f941ed758894f7f3b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 21:47:14 +0200
Subject: [PATCH 1056/2006] switch list AppRevOwner and DraftOwner

---
 views/bootstrap/class.MyDocuments.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index cff5e9af7..6c0f9cab6 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -706,14 +706,16 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_user_reception" data-action="listReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_reception").'</a></li>';
 		$resArr = $dms->getDocumentList('NoReceiveOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_no_reception" data-action="listNoReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_no_reception").'</a></li>';
-		$resArr = $dms->getDocumentList('DraftOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_draft" data-action="listDraftOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_draft").'</a></li>';
-		echo '</ul>';
-		$this->contentHeading(getMLText("documents_in_process"));
-		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
+		}
+		echo '</ul>';
+		$this->contentHeading(getMLText("documents_in_process"));
+		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
+		$resArr = $dms->getDocumentList('DraftOwner', $user);
+		echo '<li class=""><a data-href="#documents_user_draft" data-action="listDraftOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_draft").'</a></li>';
+		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('RejectOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
 		}

From 86e7b0a13fe7183fc773e1cdce23bd3e26c7ff2f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 21:47:40 +0200
Subject: [PATCH 1057/2006] add hook showVersionComment

---
 views/bootstrap/class.ViewDocument.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 648909c67..93b2e4df2 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -614,7 +614,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "<li>".getLongReadableDate($latestContent->getDate())."</li>";
 
 		print "</ul>\n";
-		print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
+		$txt = $this->callHook('showVersionComment', $latestContent);
+		if($txt) {
+			echo $txt;
+		} else {
+			print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
+		}
 		print "<ul class=\"actions unstyled\">\n";
 		$attributes = $latestContent->getAttributes();
 		if($attributes) {

From 2b62fbcc1b1a47755a921626729b1f0e707a8c05 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 21:47:56 +0200
Subject: [PATCH 1058/2006] set styles for div.popupbox dt and div.popupbox dd

---
 styles/bootstrap/application.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index 9c9f7d3a0..48423d6cc 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -248,6 +248,16 @@ div.popupbox {
 	width: 250px;
 }
 
+div.popupbox dt {
+	font-weight: normal;
+	font-size: 80%;
+}
+
+div.popupbox dd {
+	margin-left: 0px;
+	margin-bottom: 5px;
+}
+
 div.popupbox span.closepopupbox {
 	position: absolute;
 	right: 5px;

From ed48285da588f5e33a36f8f9d11e283c81d21fc0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 21:48:25 +0200
Subject: [PATCH 1059/2006] pass extension config to init() of extension

---
 inc/inc.Extension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php
index ceb491587..b0e915333 100644
--- a/inc/inc.Extension.php
+++ b/inc/inc.Extension.php
@@ -37,7 +37,7 @@ foreach($EXT_CONF as $extname=>$extconf) {
 			include($classfile);
 			$obj = new $extconf['class']['name'];
 			if(method_exists($obj, 'init'))
-				$obj->init();
+				$obj->init(isset($settings->_extensions[$extname]) ? $settings->_extensions[$extname] : null);
 		}
 		if(isset($extconf['language']['file'])) {
 			$langfile = $settings->_rootDir."/ext/".$extname."/".$extconf['language']['file'];

From 867a5b8d7cca0591b37c53289f009763d694493f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 21:49:48 +0200
Subject: [PATCH 1060/2006] add entries for 6.0.6

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 7c83aeef8..44a0f4d37 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,8 @@
 - remove ѕome unneeded code from AddDocument which just caused php warnings
 - do not set the uploader of new documents to owner if the owner is different from
   the uploader
+- add scheduler
+- add hook showVersionComment in out.ViewDocument.php
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From c9d0ac3e73aced6d1c610486e90c8101325b0579 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Apr 2018 07:27:30 +0200
Subject: [PATCH 1061/2006] better error handling for extension list from
 repository

---
 inc/inc.ClassExtensionMgr.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index eadf445cb..8b5081558 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -421,14 +421,15 @@ class SeedDMS_Extension_Mgr {
 		$result = array();
 		$vcache = array(); // keep highest version of extension
 		foreach($list as $e) {
-			if($e[0] != '#') {
-				$re = json_decode($e, true);
-				if(!isset($result[$re['name']])) {
-					$result[$re['name']] = $re;
-					$vcache[$re['name']] = $re['version'];
-				} elseif(self::cmpVersion($re['version'], $vcache[$re['name']]) > 0) {
-					$result[$re['name']] = $re;
-					$vcache[$re['name']] = $re['version'];
+			if($e[0] != '#' && trim($e)) {
+				if($re = json_decode($e, true)) {
+					if(!isset($result[$re['name']])) {
+						$result[$re['name']] = $re;
+						$vcache[$re['name']] = $re['version'];
+					} elseif(self::cmpVersion($re['version'], $vcache[$re['name']]) > 0) {
+						$result[$re['name']] = $re;
+						$vcache[$re['name']] = $re['version'];
+					}
 				}
 			}
 		}

From f9a00de8ee67a234c0b797166ade05c8e30dc4d5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Apr 2018 07:39:27 +0200
Subject: [PATCH 1062/2006] add SchedulerTaskMgr to list

---
 views/bootstrap/class.AdminTools.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php
index fe62004c1..bd17469a6 100644
--- a/views/bootstrap/class.AdminTools.php
+++ b/views/bootstrap/class.AdminTools.php
@@ -145,6 +145,9 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 <?php if($accessop->check_view_access('ExtensionMgr')) { ?>
 		<a href="../out/out.ExtensionMgr.php" class="span3 btn btn-medium"><i class="icon-cogs"></i><br /><?php echo getMLText("extension_manager")?></a>
 <?php } ?>
+<?php if($accessop->check_view_access('SchedulerTaskMgr')) { ?>
+		<a href="../out/out.SchedulerTaskMgr.php" class="span3 btn btn-medium"><i class="icon-time"></i><br /><?php echo getMLText("scheduler_task_mgr")?></a>
+<?php } ?>
 <?php if($accessop->check_view_access('Info')) { ?>
 		<a href="../out/out.Info.php" class="span3 btn btn-medium"><i class="icon-info-sign"></i><br /><?php echo getMLText("version_info")?></a>
 <?php } ?>

From 1ba06eeb277f9a3c3489daf8d7ca2093848f34da Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Apr 2018 07:48:22 +0200
Subject: [PATCH 1063/2006] new icon for timeline

---
 views/bootstrap/class.AdminTools.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.AdminTools.php b/views/bootstrap/class.AdminTools.php
index bd17469a6..487d5e745 100644
--- a/views/bootstrap/class.AdminTools.php
+++ b/views/bootstrap/class.AdminTools.php
@@ -134,7 +134,7 @@ class SeedDMS_View_AdminTools extends SeedDMS_Bootstrap_Style {
 		<a href="../out/out.ObjectCheck.php" class="span3 btn btn-medium"><i class="icon-check"></i><br /><?php echo getMLText("objectcheck")?></a>
 <?php } ?>
 <?php if($accessop->check_view_access('Timeline')) { ?>
-		<a href="../out/out.Timeline.php" class="span3 btn btn-medium"><i class="icon-time"></i><br /><?php echo getMLText("timeline")?></a>
+		<a href="../out/out.Timeline.php" class="span3 btn btn-medium"><i class="icon-signal"></i><br /><?php echo getMLText("timeline")?></a>
 <?php } ?>
 		<?php echo $this->callHook('endOfRow', 6); ?>
 	</div>

From a54f6f416bce6b8021d6c508a0fab33c94b81fd3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Apr 2018 08:16:28 +0200
Subject: [PATCH 1064/2006] minor fixes in translation phrases

---
 views/bootstrap/class.SchedulerTaskMgr.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 8ada34273..345e6ed48 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -96,7 +96,7 @@ $(document).ready( function() {
 					default:
 ?>
 	<div class="control-group">
-	<label class="control-label" for="params_<?= $param['name'] ?>"><?php printMLText($extname."_".$taskname."_".$param['name']);?>:</label>
+	<label class="control-label" for="params_<?= $param['name'] ?>"><?php printMLText('task_'.$extname."_".$taskname."_".$param['name']);?>:</label>
 		<div class="controls">
 		<input type="text" id="params_<?= $param['name'] ?>" name="params[<?= $param['name'] ?>]" value="">
 		</div>
@@ -258,7 +258,7 @@ $(document).ready( function() {
 		$this->globalNavigation();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
-		$this->contentHeading(getMLText("scheduler_task_manager"));
+		$this->contentHeading(getMLText("scheduler_task_mgr"));
 ?>
 <div class="row-fluid">
 	<div class="span6">
@@ -292,7 +292,7 @@ $(document).ready( function() {
 				if($t) {
 					print "<a class=\"listtasks\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("list_tasks")."\"><i class=\"icon-list\"></i></a>";
 				}
-				print "<a class=\"addtask\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"icon-plus\"></i></a>";
+				print "<a class=\"addtask\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("add_task")."\"><i class=\"icon-plus\"></i></a>";
 				print "</div>";
 				echo "</td>";
 				echo "</tr>";

From 276245a39544dec1dad1f0040eace2b3e57de683 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Apr 2018 08:54:08 +0200
Subject: [PATCH 1065/2006] do not show table of scheduler classes if none
 exists

---
 views/bootstrap/class.SchedulerTaskMgr.php | 68 +++++++++++-----------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 345e6ed48..c68f55abf 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -263,42 +263,44 @@ $(document).ready( function() {
 <div class="row-fluid">
 	<div class="span6">
 <?php
-		echo "<table class=\"table _table-condensed\">\n";
-		print "<thead>\n<tr>\n";
-		print "<th>".getMLText('scheduler_class')."</th>\n";	
-		print "<th>".getMLText('scheduler_class_description')."</th>\n";	
-		print "<th>".getMLText('scheduler_class_parameter')."</th>\n";	
-		print "<th></th>\n";	
-		print "</tr></thead><tbody>\n";
-		$errmsgs = array();
-		foreach($GLOBALS['SEEDDMS_SCHEDULER']['tasks'] as $extname=>$tasks) {
-			foreach($tasks as $taskname=>$task) {
-				echo "<tr>";
-				echo "<td>";
-				echo $extname."::".$taskname;
-				echo "</td>";
-				echo "<td width=\"100%\">";
-				echo $task->getDescription();
-				echo "</td>";
-				echo "<td>";
-				$params = $task->getAdditionalParams();
-				foreach($params as $param)
-					$k[] = $param['name'];
-				echo implode(', ', $k);
-				echo "</td>";
-				echo "<td>";
-				print "<div class=\"list-action\">";
-				$t = $scheduler->getTasksByExtension($extname, $taskname);
-				if($t) {
-					print "<a class=\"listtasks\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("list_tasks")."\"><i class=\"icon-list\"></i></a>";
+		if(!empty($GLOBALS['SEEDDMS_SCHEDULER']['tasks'])) {
+			echo "<table class=\"table _table-condensed\">\n";
+			print "<thead>\n<tr>\n";
+			print "<th>".getMLText('scheduler_class')."</th>\n";	
+			print "<th>".getMLText('scheduler_class_description')."</th>\n";	
+			print "<th>".getMLText('scheduler_class_parameter')."</th>\n";	
+			print "<th></th>\n";	
+			print "</tr></thead><tbody>\n";
+			$errmsgs = array();
+			foreach($GLOBALS['SEEDDMS_SCHEDULER']['tasks'] as $extname=>$tasks) {
+				foreach($tasks as $taskname=>$task) {
+					echo "<tr>";
+					echo "<td>";
+					echo $extname."::".$taskname;
+					echo "</td>";
+					echo "<td width=\"100%\">";
+					echo $task->getDescription();
+					echo "</td>";
+					echo "<td>";
+					$params = $task->getAdditionalParams();
+					foreach($params as $param)
+						$k[] = $param['name'];
+					echo implode(', ', $k);
+					echo "</td>";
+					echo "<td>";
+					print "<div class=\"list-action\">";
+					$t = $scheduler->getTasksByExtension($extname, $taskname);
+					if($t) {
+						print "<a class=\"listtasks\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("list_tasks")."\"><i class=\"icon-list\"></i></a>";
+					}
+					print "<a class=\"addtask\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("add_task")."\"><i class=\"icon-plus\"></i></a>";
+					print "</div>";
+					echo "</td>";
+					echo "</tr>";
 				}
-				print "<a class=\"addtask\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("add_task")."\"><i class=\"icon-plus\"></i></a>";
-				print "</div>";
-				echo "</td>";
-				echo "</tr>";
 			}
+			echo "</tbody></table>\n";
 		}
-		echo "</tbody></table>\n";
 ?>
 		<div id="listtasks" class="ajax" data-view="SchedulerTaskMgr" data-action="tasklist"></div>
   </div>

From d47f4c5ca9b79cf55b894cca7ae5ae5c2de1cff3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Apr 2018 11:24:23 +0200
Subject: [PATCH 1066/2006] reopen database after COMMIT

---
 install/update.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install/update.php b/install/update.php
index a99990757..67fac1654 100644
--- a/install/update.php
+++ b/install/update.php
@@ -92,6 +92,10 @@ if($rec = $res->fetch(PDO::FETCH_ASSOC)) {
 							$e = $db->ErrorInfo();
 							$errorMsg .= $query.": ".$e[2] . "<br/>";
 						}
+						if($settings->_dbDriver == 'sqlite' && $query == 'COMMIT') {
+							unset($db);
+							$db = new PDO($dsn, $settings->_dbUser, $settings->_dbPass);
+						}
 					}
 				}
 			}

From 3379a2510cca497d0c6de7c563d7d87c77f634a0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Apr 2018 12:04:07 +0200
Subject: [PATCH 1067/2006] take out reconnect code

not needed anymore
---
 install/update.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/install/update.php b/install/update.php
index 1b610698d..c2674ea7a 100644
--- a/install/update.php
+++ b/install/update.php
@@ -94,10 +94,6 @@ if(!empty($recs)) {
 							$e = $db->ErrorInfo();
 							$errorMsg .= $query.": ".$e[2] . "<br/>";
 						}
-						if($settings->_dbDriver == 'sqlite' && $query == 'COMMIT') {
-							unset($db);
-							$db = new PDO($dsn, $settings->_dbUser, $settings->_dbPass);
-						}
 					}
 				}
 			}

From 5882fc10a998a1426aaf8ee95bbe33708bb5089b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Mar 2018 17:04:39 +0200
Subject: [PATCH 1068/2006] major change of workflow/document management

---
 SeedDMS_Core/Core/inc.ClassDocument.php  | 181 +++++++++++++----------
 install/update-6.0.0/update.sql          |  18 +++
 views/bootstrap/class.RewindWorkflow.php |   2 +-
 views/bootstrap/class.ViewDocument.php   |   7 +-
 4 files changed, 130 insertions(+), 78 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index fbe7647a5..67d4750fa 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2270,11 +2270,14 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
+		/* Will be deleted automatically when record will be deleted
+		 * from tblWorkflowDocumentContent
 		$queryStr = "DELETE FROM `tblWorkflowLog` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
 		}
+		 */
 
 		// remove document files attached to version
 		$res = $this->getDocumentFiles($version->_version);
@@ -5407,7 +5410,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		if($this->_workflow) {
-			$queryStr = "UPDATE `tblWorkflowDocumentContent` set `state`=". $state->getID() ." WHERE `workflow`=". intval($this->_workflow->getID()). " AND `document`=". intval($this->_document->getID()) ." AND version=". intval($this->_version) ."";
+			$queryStr = "UPDATE `tblWorkflowDocumentContent` set `state`=". $state->getID() ." WHERE `id`=". $this->_workflow['id'];
 			if (!$db->getResult($queryStr)) {
 				return false;
 			}
@@ -5434,9 +5437,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if (!$this->_workflowState) {
 			$queryStr=
-				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.id WHERE `workflow`=". intval($this->_workflow->getID())
-				." AND a.`version`='".$this->_version
-				."' AND a.`document` = '". $this->_document->getID() ."' ";
+				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.id WHERE `a`.`id`=". $this->_workflow['id'];
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
 				return false;
@@ -5455,6 +5456,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
 		$this->getWorkflow();
+		if($this->_workflow)
+			return false;
+
 		if($workflow && is_object($workflow)) {
 			$db->startTransaction();
 			$initstate = $workflow->getInitState();
@@ -5463,7 +5467,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				$db->rollbackTransaction();
 				return false;
 			}
-			$this->_workflow = $workflow;
+			$this->getWorkflow();
+			if($workflow->getID() != $this->_workflow['workflow']->getID()) {
+				$db->rollbackTransaction();
+				return false;
+			}
 			if(!$this->setStatus(S_IN_WORKFLOW, "Added workflow '".$workflow->getName()."'", $user)) {
 				$db->rollbackTransaction();
 				return false;
@@ -5471,15 +5479,19 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$db->commitTransaction();
 			return true;
 		}
-		return true;
+		return false;
 	} /* }}} */
 
 	/**
 	 * Get workflow assigned to the document content
 	 *
 	 * The method returns the last workflow if one was assigned.
-	 * If a the document version is in a sub workflow, it will have
+	 * If the document version is in a sub workflow, it will have
 	 * a never date and therefore will be found first.
+	 * The methods also sets $this->_workflow['id'] and
+	 * $this->_workflow['parent']. $this->_workflow['id'] is the
+	 * id from table tblWorkflowDocumentContent which is used to
+	 * get log entries for this workflow.
 	 *
 	 * @return object/boolean an object of class SeedDMS_Core_Workflow
 	 *         or false in case of error, e.g. the version has not a workflow
@@ -5489,18 +5501,19 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if (!isset($this->_workflow)) {
 			$queryStr=
-				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.id WHERE a.`version`='".$this->_version
+				"SELECT a.id as wdcid, a.parent, b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.id WHERE a.`version`='".$this->_version
 				."' AND a.`document` = '". $this->_document->getID() ."' "
+				." AND a.`state` IS NOT NULL"
 				." ORDER BY `date` DESC LIMIT 1";
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
 				return false;
 			if(!$recs)
 				return false;
-			$this->_workflow = new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->_dms->getWorkflowState($recs[0]['initstate']), $recs[0]["layoutdata"]);
-			$this->_workflow->setDMS($this->_document->_dms);
+			$this->_workflow = array('id'=>(int)$recs[0]['wdcid'], 'parent'=>(int)$recs[0]['parent'], 'workflow'=>new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->_dms->getWorkflowState($recs[0]['initstate']), $recs[0]["layoutdata"]));
+			$this->_workflow['workflow']->setDMS($this->_document->_dms);
 		}
-		return $this->_workflow;
+		return $this->_workflow['workflow'];
 	} /* }}} */
 
 	/**
@@ -5516,10 +5529,18 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	function rewriteWorkflowLog($workflowlog) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
+		/* Get the workflowdocumentcontent */
+		$queryStr = "SELECT `id` FROM `tblWorkflowDocumentContent` WHERE `tblWorkflowDocumentContent`.`document` = '". $this->_document->getID() ."' AND `tblWorkflowDocumentContent`.`version` = '". $this->_version ."'";
+		$recs = $db->getResultArray($queryStr);
+		if (is_bool($recs) && !$recs)
+			return false;
+		if (!$recs)
+			return false;
+
 		$db->startTransaction();
 
 		/* First, remove the old entries */
-		$queryStr = "DELETE FROM `tblWorkflowLog` WHERE `tblWorkflowLog`.`document` = '". $this->_document->getID() ."' AND `tblWorkflowLog`.`version` = '". $this->_version ."'";
+		$queryStr = "DELETE FROM `tblWorkflowLog` WHERE `tblWorkflowLog`.`workflowdocumentcontent` IN (SELECT `id` FROM `tblWorkflowDocumentContent` WHERE `tblWorkflowDocumentContent`.`document` = '". $this->_document->getID() ."' AND `tblWorkflowDocumentContent`.`version` = '". $this->_version ."')";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -5532,8 +5553,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				$db->rollbackTransaction();
 				return false;
 			}
-			$queryStr = "INSERT INTO `tblWorkflowLog` (`document`, `version`,	`workflow`, `transition`, `comment`, `date`, `userid`) ".
-				"VALUES ('".$this->_document->getID() ."', '".(int) $this->_version."', '".(int) $log['workflow']->getID()."', '".(int) $log['transition']->getID()."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".$log['user']->getID().")";
+			$queryStr = "INSERT INTO `tblWorkflowLog` (`workflowdocumentcontent`, `transition`, `comment`, `date`, `userid`) ".
+				"VALUES ('".$recs[0]['id'] ."', '".(int) $log['transition']->getID()."', ".$db->qstr($log['comment']) .", ".$db->qstr($log['date']).", ".$log['user']->getID().")";
 			if (!$db->getResult($queryStr)) {
 				$db->rollbackTransaction();
 				return false;
@@ -5558,15 +5579,16 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (!isset($this->_workflow)) {
 			return true;
 		}
+		$workflow = $this->_workflow['workflow'];
 
 		$db->startTransaction();
-		$queryStr = "DELETE from `tblWorkflowLog` WHERE `document` = ". $this->_document->getID() ." AND `version` = ".$this->_version." AND `workflow` = ".$this->_workflow->getID();
+		$queryStr = "DELETE from `tblWorkflowLog` WHERE `workflowdocumentcontent` = ".$this->_workflow['id'];
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
 		}
 
-		$this->setWorkflowState($this->_workflow->getInitState());
+		$this->setWorkflowState($workflow->getInitState());
 		$db->commitTransaction();
 
 		return true;
@@ -5578,7 +5600,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * Fully removing a workflow including entries in the workflow log is
 	 * only allowed if the workflow is still its initial state.
 	 * At a later point of time only unlinking the document from the
-	 * workflow is allowed. It will keep any log entries.
+	 * workflow is allowed. It will keep any log entries and set the state
+	 * to NULL.
 	 * A workflow is unlinked from a document when enterNextState()
 	 * succeeds.
 	 *
@@ -5600,27 +5623,35 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return true;
 		}
 
-		if(SeedDMS_Core_DMS::checkIfEqual($this->_workflow->getInitState(), $this->getWorkflowState()) || $unlink == true) {
+		$workflow = $this->_workflow['workflow'];
+
+		if(SeedDMS_Core_DMS::checkIfEqual($workflow->getInitState(), $this->getWorkflowState()) || $unlink == true) {
 			$db->startTransaction();
-			$queryStr=
-				"DELETE FROM `tblWorkflowDocumentContent` WHERE "
-				."`version`='".$this->_version."' "
-				." AND `document` = '". $this->_document->getID() ."' "
-				." AND `workflow` = '". $this->_workflow->getID() ."' ";
-			if (!$db->getResult($queryStr)) {
-				$db->rollbackTransaction();
-				return false;
-			}
-			if(!$unlink) {
+			if($unlink) {
 				$queryStr=
-					"DELETE FROM `tblWorkflowLog` WHERE "
-					."`version`='".$this->_version."' "
-					." AND `document` = '". $this->_document->getID() ."' "
-					." AND `workflow` = '". $this->_workflow->getID() ."' ";
+					"UPDATE `tblWorkflowDocumentContent` SET `state` = NULL WHERE `id`=".$this->_workflow['id'];
 				if (!$db->getResult($queryStr)) {
 					$db->rollbackTransaction();
 					return false;
 				}
+			} else {
+				$queryStr=
+					"DELETE FROM `tblWorkflowDocumentContent` WHERE `id`=".$this->_workflow['id'];
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				/* will be deleted automatically when tblWorkflowDocumentContent is deleted
+				$queryStr=
+					"DELETE FROM `tblWorkflowLog` WHERE "
+					."`version`='".$this->_version."' "
+					." AND `document` = '". $this->_document->getID() ."' "
+					." AND `workflow` = '". $workflow->getID() ."' ";
+				if (!$db->getResult($queryStr)) {
+					$db->rollbackTransaction();
+					return false;
+				}
+				 */
 			}
 			$this->_workflow = null;
 			$this->_workflowState = null;
@@ -5644,19 +5675,19 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if(!$this->_workflow)
 			return false;
 
+		if(!$this->_workflow['parent'])
+			return false;
+
 		$queryStr=
-			"SELECT * FROM `tblWorkflowDocumentContent` WHERE "
-			."`version`='".$this->_version."' "
-			." AND `document` = '". $this->_document->getID() ."' "
-			." AND `workflow` = '". $this->_workflow->getID() ."' ";
+			"SELECT * FROM `tblWorkflowDocumentContent` WHERE `parent`=".$this->_workflow['parent'];
 		$recs = $db->getResultArray($queryStr);
 		if (is_bool($recs) && !$recs)
 			return false;
 		if(!$recs)
 			return false;
 
-		if($recs[0]['parentworkflow'])
-			return $this->_document->_dms->getWorkflow($recs[0]['parentworkflow']);
+		if($recs[0]['workflow'])
+			return $this->_document->_dms->getWorkflow((int)$recs[0]['workflow']);
 
 		return false;
 	} /* }}} */
@@ -5680,11 +5711,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if($subworkflow) {
 			$initstate = $subworkflow->getInitState();
-			$queryStr = "INSERT INTO `tblWorkflowDocumentContent` (`parentworkflow`, `workflow`, `document`, `version`, `state`, `date`) VALUES (". $this->_workflow->getID(). ", ". $subworkflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", ".$db->getCurrentDatetime().")";
+			$queryStr = "INSERT INTO `tblWorkflowDocumentContent` (`parent`, `workflow`, `document`, `version`, `state`, `date`) VALUES (". $this->_workflow['id']. ", ". $subworkflow->getID(). ", ". $this->_document->getID() .", ". $this->_version .", ".$initstate->getID().", ".$db->getCurrentDatetime().")";
 			if (!$db->getResult($queryStr)) {
 				return false;
 			}
-			$this->_workflow = $subworkflow;
+			$this->_workflow = array('id'=>$db->getInsertID('tblWorkflowDocumentContent'),  'parent'=>$this->_workflow['id'], 'workflow'=>$subworkflow);
 			return true;
 		}
 		return true;
@@ -5709,30 +5740,23 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 
 		if (isset($this->_workflow)) {
+			$workflow = $this->_workflow['workflow'];
 			$db->startTransaction();
 
-			$queryStr=
-				"SELECT * FROM `tblWorkflowDocumentContent` WHERE `workflow`=". intval($this->_workflow->getID())
-				. " AND `version`='".$this->_version
-				."' AND `document` = '". $this->_document->getID() ."' ";
-			$recs = $db->getResultArray($queryStr);
-			if (is_bool($recs) && !$recs) {
-				$db->rollbackTransaction();
-				return false;
-			}
-			if(!$recs) {
-				$db->rollbackTransaction();
-				return false;
-			}
-
-			$queryStr = "DELETE FROM `tblWorkflowDocumentContent` WHERE `workflow` =". intval($this->_workflow->getID())." AND `document` = '". $this->_document->getID() ."' AND `version` = '" . $this->_version."'";
+			$queryStr = "UPDATE `tblWorkflowDocumentContent` SET `state` = NULL WHERE `id` = '" . $this->_workflow['id']."'";
 			if (!$db->getResult($queryStr)) {
 				$db->rollbackTransaction();
 				return false;
 			}
 
-			$this->_workflow = $this->_document->_dms->getWorkflow($recs[0]['parentworkflow']);
-			$this->_workflow->setDMS($this->_document->_dms);
+			/* Calling getWorkflow() should find the parent workflow, better check */
+			$parent = $this->_workflow['parent'];
+			unset($this->_workflow);
+			$this->getWorkflow();
+			if($this->_workflow['id'] != $parent) {
+				$db->rollbackTransaction();
+				return false;
+			}
 
 			if($transition) {
 				if(false === $this->triggerWorkflowTransition($user, $transition, $comment)) {
@@ -5743,7 +5767,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 			$db->commitTransaction();
 		}
-		return $this->_workflow;
+		return $this->_workflow['workflow'];
 	} /* }}} */
 
 	/**
@@ -5770,7 +5794,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		/* Check if the user has already triggered the transition */
 		$queryStr=
-			"SELECT * FROM `tblWorkflowLog` WHERE `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."' AND `workflow` = ". $this->_workflow->getID(). " AND userid = ".$user->getID();
+			"SELECT * FROM `tblWorkflowLog` WHERE `workflowdocumentcontent` = ".$this->_workflow['id']." AND userid = ".$user->getID();
 		$queryStr .= " AND `transition` = ".$transition->getID();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && !$resArr)
@@ -5918,8 +5942,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if(!$this->triggerWorkflowTransitionIsAllowed($user, $transition))
 			return false;
 
-		$state = $this->_workflowState;
-		$queryStr = "INSERT INTO `tblWorkflowLog` (`document`, `version`, `workflow`, `userid`, `transition`, `date`, `comment`) VALUES (".$this->_document->getID().", ".$this->_version.", " . (int) $this->_workflow->getID() . ", " .(int) $user->getID(). ", ".(int) $transition->getID().", ".$db->getCurrentDatetime().", ".$db->qstr($comment).")";
+		$queryStr = "INSERT INTO `tblWorkflowLog` (`workflowdocumentcontent`, `userid`, `transition`, `date`, `comment`) VALUES (".$this->_workflow['id'].", ".(int) $user->getID(). ", ".(int) $transition->getID().", ".$db->getCurrentDatetime().", ".$db->qstr($comment).")";
 		if (!$db->getResult($queryStr))
 			return false;
 
@@ -5970,8 +5993,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			 * the next state will be reached if one of the transitions
 			 * leading to the given state can be processed.
 			 */
-			if($nextstate->getPreCondFunc() == '') {
-				$transitions = $this->_workflow->getPreviousTransitions($nextstate);
+		if($nextstate->getPreCondFunc() == '') {
+			$workflow = $this->_workflow['workflow'];
+				$transitions = $workflow->getPreviousTransitions($nextstate);
 				foreach($transitions as $transition) {
 //				echo "transition ".$transition->getID()." led to state ".$nextstate->getName()."<br />";
 					if($this->executeWorkflowTransitionIsAllowed($transition)) {
@@ -5996,7 +6020,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 						/* make sure the users and groups allowed to trigger the next
 						 * transitions are also allowed to read the document
 						 */
-						$transitions = $this->_workflow->getNextTransitions($nextstate);
+						$transitions = $workflow->getNextTransitions($nextstate);
 						foreach($transitions as $tran) {
 //							echo "checking access for users/groups allowed to trigger transition ".$tran->getID()."<br />";
 							$transusers = $tran->getUsers();
@@ -6035,24 +6059,27 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 	/**
 	 * Get the so far logged operations on the document content within the
-	 * workflow
+	 * workflow. If the document content is currently in a workflow and
+	 * a transition is passed, then the
+	 * log entries will be restricted on the workflow and returned as one
+	 * dimensional list. Without a running workflow the log entries of
+	 * all workflows in the past are returned grouped by workflow.
 	 *
 	 * @return array list of operations
 	 */
 	function getWorkflowLog($transition = null) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
-/*
 		if(!$this->_workflow)
 			$this->getWorkflow();
 
-		if(!$this->_workflow)
-			return false;
-*/
 		$queryStr=
-			"SELECT * FROM `tblWorkflowLog` WHERE `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."'"; // AND `workflow` = ". $this->_workflow->getID();
-		if($transition)
-			$queryStr .= " AND `transition` = ".$transition->getID();
+			"SELECT `a`.`id`, `a`.`userid`, `a`.`transition`, `a`.`date`, `a`.`comment`, `a`.`workflowdocumentcontent`, `b`.`version`, `b`.`document`, `b`.`workflow` FROM `tblWorkflowLog` `a` LEFT JOIN `tblWorkflowDocumentContent` `b` ON `a`.`workflowdocumentcontent` = `b`.`id` WHERE `b`.`version`='".$this->_version ."' AND `b`.`document` = '". $this->_document->getID() ."'"; // AND `workflow` = ". $this->_workflow->getID();
+		if($transition) {
+			$queryStr .= " AND `a`.`transition` = ".$transition->getID();
+		}
+		if($this->_workflow)
+			$queryStr .= " AND `a`.`workflowdocumentcontent` = ".$this->_workflow['id'];
 		$queryStr .= " ORDER BY `date`";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && !$resArr)
@@ -6063,7 +6090,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$workflow = $this->_document->_dms->getWorkflow($resArr[$i]["workflow"]);
 			$workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->_dms->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $workflow, $this->_document->_dms->getUser($resArr[$i]["userid"]), $workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]);
 			$workflowlog->setDMS($this);
-			$workflowlogs[$i] = $workflowlog;
+			if($this->_workflow && $transition)
+				$workflowlogs[] = $workflowlog;
+			else
+				$workflowlogs[$resArr[$i]["workflowdocumentcontent"]][] = $workflowlog;
 		}
 
 		return $workflowlogs;
@@ -6085,7 +6115,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 
 		$queryStr=
-			"SELECT * FROM `tblWorkflowLog` WHERE `version`='".$this->_version ."' AND `document` = '". $this->_document->getID() ."' AND `workflow` = ". $this->_workflow->getID();
+			"SELECT * FROM `tblWorkflowLog` WHERE `workflowdocumentcontent` = ". $this->_workflow['id'];
 		$queryStr .= " ORDER BY `id` DESC LIMIT 1";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && !$resArr)
@@ -6111,10 +6141,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	function needsWorkflowAction($user) { /* {{{ */
 		$needwkflaction = false;
 		if($this->_workflow) {
+			$workflow = $this->_workflow['workflow'];
 			if (!$this->_workflowState)
 				$this->getWorkflowState();
 			$workflowstate = $this->_workflowState;
-			$transitions = $this->_workflow->getNextTransitions($workflowstate);
+			$transitions = $workflow->getNextTransitions($workflowstate);
 			foreach($transitions as $transition) {
 				if($this->triggerWorkflowTransitionIsAllowed($user, $transition)) {
 					$needwkflaction = true;
diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index ea9b70c9a..0c71415fe 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -6,6 +6,24 @@ ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) DEFAULT NULL AFTER `pwd`;
 
 ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text DEFAULT NULL AFTER `initstate`;
 
+ALTER TABLE `tblWorkflowDocumentContent` ADD COLUMN `id` int(11) NOT NULL AUTO_INCREMENT UNIQUE FIRST;
+
+ALTER TABLE `tblWorkflowLog` ADD COLUMN `workflowdocumentcontent` int(11) NOT NULL DEFAULT '0' AFTER `id`;
+
+UPDATE `tblWorkflowLog` a, `tblWorkflowDocumentContent` b SET a.`workflowdocumentcontent` = b.`id` WHERE a.`document` = b.`document` AND a.`version` = b.`version` AND a.`workflow` = b.`workflow`;
+
+INSERT INTO `tblWorkflowDocumentContent` (`parentworkflow`, `workflow`, `document`, `version`, `state`, `date`) SELECT 0 as `parentworkflow`, `workflow`, `document`, `version`, NULL as `state`, max(`date`) as `date` FROM `tblWorkflowLog` WHERE `workflowdocumentcontent` = 0 GROUP BY `workflow`, `document`, `version`;
+
+UPDATE `tblWorkflowLog` a, `tblWorkflowDocumentContent` b SET a.`workflowdocumentcontent` = b.`id` WHERE a.`document` = b.`document` AND a.`version` = b.`version` AND a.`workflow` = b.`workflow`;
+
+ALTER TABLE `tblWorkflowLog` ADD CONSTRAINT `tblWorkflowLog_workflowdocumentcontent` FOREIGN KEY (`workflowdocumentcontent`) REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE;
+
+ALTER TABLE `tblWorkflowDocumentContent` ADD COLUMN `parent` int(11) DEFAULT NULL AFTER `id`;
+
+ALTER TABLE `tblWorkflowDocumentContent` ADD CONSTRAINT `tblWorkflowDocumentContent_parent` FOREIGN KEY (`parent`) REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE;
+
+ALTER TABLE `tblWorkflowDocumentContent` DROP COLUMN `parentworkflow`;
+
 CREATE TABLE `tblUserSubstitutes` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `user` int(11) DEFAULT null,
diff --git a/views/bootstrap/class.RewindWorkflow.php b/views/bootstrap/class.RewindWorkflow.php
index 93bfe0432..7cb405a66 100644
--- a/views/bootstrap/class.RewindWorkflow.php
+++ b/views/bootstrap/class.RewindWorkflow.php
@@ -46,7 +46,7 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("rewind_workflow"));
 
 		$currentstate = $latestContent->getWorkflowState();
-		$wkflog = $latestContent->getWorkflowLog();
+		$wkflog = array_pop($latestContent->getWorkflowLog());
 		$workflow = $latestContent->getWorkflow();
 
 		$msg = "The document is currently in state: ".$currentstate->getName()."<br />";
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 93b2e4df2..a61342d8e 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -750,11 +750,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			if($wkflogs) {
 				$this->contentHeading(getMLText("workflow_summary"));
 				$this->contentContainerStart();
+				foreach($wkflogs as $wkflogt) {
 				echo "<table class=\"table table-condensed\"><thead>";
-				echo "<th>".getMLText('date')."</th><th>".getMLText('action')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
+				echo "<th>".getMLText('workflow')."</th><th>".getMLText('date')."</th><th>".getMLText('action')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
 				echo "</thead><tbody>";
-				foreach($wkflogs as $wkflog) {
+				foreach($wkflogt as $wkflog) {
 					echo "<tr>";
+					echo "<td>".$wkflog->getWorkflow()->getName()."</td>";
 					echo "<td>".$wkflog->getDate()."</td>";
 					echo "<td>".$wkflog->getTransition()->getAction()->getName()."</td>";
 					$loguser = $wkflog->getUser();
@@ -763,6 +765,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					echo "</tr>";
 				}
 				print "</tbody>\n</table>\n";
+				}
 				$this->contentContainerEnd();
 			}
 		}

From 54ce5a7e16bc0a826f3c29a5e754e31cac308aad Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 11:03:34 +0200
Subject: [PATCH 1069/2006] adding sql statements for updating to new workflow
 layout

---
 install/update-6.0.0/update-postgres.sql | 24 ++++++++++++++++
 install/update-6.0.0/update-sqlite3.sql  | 35 ++++++++++++++++++++++++
 install/update-6.0.0/update.sql          |  8 +++++-
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/install/update-6.0.0/update-postgres.sql b/install/update-6.0.0/update-postgres.sql
index aa0068bac..cf5a4c3fd 100644
--- a/install/update-6.0.0/update-postgres.sql
+++ b/install/update-6.0.0/update-postgres.sql
@@ -6,6 +6,30 @@ ALTER TABLE "tblUsers" ADD COLUMN "secret" varchar(50) default NULL;
 
 ALTER TABLE "tblWorkflows" ADD COLUMN "layoutdata" text default NULL;
 
+ALTER TABLE "tblWorkflowDocumentContent" ADD COLUMN "id" SERIAL UNIQUE;
+
+ALTER TABLE "tblWorkflowLog" ADD COLUMN "workflowdocumentcontent" INTEGER NOT NULL DEFAULT '0';
+
+UPDATE "tblWorkflowLog" SET "workflowdocumentcontent" = "tblWorkflowDocumentContent"."id" FROM "tblWorkflowDocumentContent" WHERE "tblWorkflowLog"."document" = "tblWorkflowDocumentContent"."document" AND "tblWorkflowLog"."version" = "tblWorkflowDocumentContent"."version" AND "tblWorkflowLog"."workflow" = "tblWorkflowDocumentContent"."workflow";
+
+INSERT INTO "tblWorkflowDocumentContent" ("parentworkflow", "workflow", "document", "version", "state", "date") SELECT 0 AS "parentworkflow", "workflow", "document", "version", NULL AS "state", max("date") AS "date" FROM "tblWorkflowLog" WHERE "workflowdocumentcontent" = 0 GROUP BY "workflow", "document", "version";
+
+UPDATE "tblWorkflowLog" SET "workflowdocumentcontent" = "tblWorkflowDocumentContent"."id" FROM "tblWorkflowDocumentContent" WHERE "tblWorkflowLog"."document" = "tblWorkflowDocumentContent"."document" AND "tblWorkflowLog"."version" = "tblWorkflowDocumentContent"."version" AND "tblWorkflowLog"."workflow" = "tblWorkflowDocumentContent"."workflow";
+
+ALTER TABLE "tblWorkflowLog" ADD CONSTRAINT "tblWorkflowLog_workflowdocumentcontent" FOREIGN KEY ("workflowdocumentcontent") REFERENCES "tblWorkflowDocumentContent" ("id") ON DELETE CASCADE;
+
+ALTER TABLE "tblWorkflowDocumentContent" ADD COLUMN "parent" INTEGER DEFAULT NULL;
+
+ALTER TABLE "tblWorkflowDocumentContent" ADD CONSTRAINT "tblWorkflowDocumentContent_parent" FOREIGN KEY ("parent") REFERENCES "tblWorkflowDocumentContent" ("id") ON DELETE CASCADE;
+
+ALTER TABLE "tblWorkflowDocumentContent" DROP COLUMN "parentworkflow";
+
+ALTER TABLE "tblWorkflowLog" DROP COLUMN "document";
+
+ALTER TABLE "tblWorkflowLog" DROP COLUMN "version";
+
+ALTER TABLE "tblWorkflowLog" DROP COLUMN "workflow";
+
 CREATE TABLE "tblUserSubstitutes" (
   "id" SERIAL UNIQUE,
   "user" INTEGER default null,
diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql
index c55358638..835206910 100644
--- a/install/update-6.0.0/update-sqlite3.sql
+++ b/install/update-6.0.0/update-sqlite3.sql
@@ -6,6 +6,39 @@ ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL;
 
 ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text default NULL;
 
+CREATE TABLE `new_tblWorkflowDocumentContent` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `parent` INTEGER DEFAULT NULL REFERENCES `new_tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
+  `workflow` INTEGER DEFAULT NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE,
+  `document` INTEGER DEFAULT NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER DEFAULT NULL,
+  `state` INTEGER DEFAULT NULL REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE,
+  `date` datetime NOT NULL
+) ;
+
+INSERT INTO `new_tblWorkflowDocumentContent` (`parent`, `workflow`, `document`, `version`,     `state`, `date`) SELECT NULL as `parent`, `workflow`, `document`, `version`, `state`, `date` FROM `tblWorkflowDocumentContent`;
+
+INSERT INTO `new_tblWorkflowDocumentContent` (`parent`, `workflow`, `document`, `version`, `state`, `date`) SELECT NULL, `a`.`workflow`, `a`.`document`, `a`.`version`, NULL AS `state`, max(`a`.`date`) FROM `tblWorkflowLog` `a` LEFT JOIN `tblWorkflowDocumentContent` `b` ON `a`.`document`=`b`.`document` AND `a`.`version`=`b`.`version` AND `a`.`workflow`=`b`.`workflow` WHERE `b`.`document` IS NULL GROUP BY `a`.`document`, `a`.`version`, `a`.`workflow`;
+
+CREATE TABLE `new_tblWorkflowLog` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+	`workflowdocumentcontent` INTEGER DEFAULT NULL REFERENCES `new_tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
+  `userid` INTEGER default NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `transition` INTEGER default NULL REFERENCES `tblWorkflowTransitions` (`id`) ON DELETE CASCADE,
+  `date` datetime NOT NULL,
+  `comment` text
+) ;
+
+INSERT INTO `new_tblWorkflowLog` (`id`, `workflowdocumentcontent`, `userid`, `transition`, `date`, `comment`) SELECT `a`.`id`, `b`.`id`, `a`.`userid`, `a`.`transition`, `a`.`date`, `a`.`comment` FROM `tblWorkflowLog` `a` LEFT JOIN `new_tblWorkflowDocumentContent` `b` ON `a`.`document`=`b`.`document` AND `a`.`version`=`b`.`version` AND `a`.`workflow`=`b`.`workflow` WHERE `b`.`document` IS NOT NULL;
+
+DROP TABLE `tblWorkflowLog`;
+
+ALTER TABLE `new_tblWorkflowLog` RENAME TO `tblWorkflowLog`;
+
+DROP TABLE `tblWorkflowDocumentContent`;
+
+ALTER TABLE `new_tblWorkflowDocumentContent` RENAME TO `tblWorkflowDocumentContent`;
+
 CREATE TABLE `tblUserSubstitutes` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `user` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
@@ -121,6 +154,8 @@ ALTER TABLE tblUsers RENAME TO old_tblUsers;
 
 ALTER TABLE new_tblUsers RENAME TO tblUsers;
 
+DROP TABLE old_tblUsers;
+
 CREATE TABLE `tblAros` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `parent` INTEGER,
diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index 0c71415fe..54bfe3430 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -12,7 +12,7 @@ ALTER TABLE `tblWorkflowLog` ADD COLUMN `workflowdocumentcontent` int(11) NOT NU
 
 UPDATE `tblWorkflowLog` a, `tblWorkflowDocumentContent` b SET a.`workflowdocumentcontent` = b.`id` WHERE a.`document` = b.`document` AND a.`version` = b.`version` AND a.`workflow` = b.`workflow`;
 
-INSERT INTO `tblWorkflowDocumentContent` (`parentworkflow`, `workflow`, `document`, `version`, `state`, `date`) SELECT 0 as `parentworkflow`, `workflow`, `document`, `version`, NULL as `state`, max(`date`) as `date` FROM `tblWorkflowLog` WHERE `workflowdocumentcontent` = 0 GROUP BY `workflow`, `document`, `version`;
+INSERT INTO `tblWorkflowDocumentContent` (`parentworkflow`, `workflow`, `document`, `version`, `state`, `date`) SELECT 0 AS `parentworkflow`, `workflow`, `document`, `version`, NULL AS `state`, max(`date`) AS `date` FROM `tblWorkflowLog` WHERE `workflowdocumentcontent` = 0 GROUP BY `workflow`, `document`, `version`;
 
 UPDATE `tblWorkflowLog` a, `tblWorkflowDocumentContent` b SET a.`workflowdocumentcontent` = b.`id` WHERE a.`document` = b.`document` AND a.`version` = b.`version` AND a.`workflow` = b.`workflow`;
 
@@ -24,6 +24,12 @@ ALTER TABLE `tblWorkflowDocumentContent` ADD CONSTRAINT `tblWorkflowDocumentCont
 
 ALTER TABLE `tblWorkflowDocumentContent` DROP COLUMN `parentworkflow`;
 
+ALTER TABLE `tblWorkflowLog` DROP COLUMN `document`;
+
+ALTER TABLE `tblWorkflowLog` DROP COLUMN `version`;
+
+ALTER TABLE `tblWorkflowLog` DROP COLUMN `workflow`;
+
 CREATE TABLE `tblUserSubstitutes` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `user` int(11) DEFAULT null,

From 90762b9e1331c3a6f6058d9a3ebbe6db8698ec53 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 14:43:32 +0200
Subject: [PATCH 1070/2006] drop tables after commit

---
 install/update-6.0.0/update-sqlite3.sql | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql
index 835206910..6bc037102 100644
--- a/install/update-6.0.0/update-sqlite3.sql
+++ b/install/update-6.0.0/update-sqlite3.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` TEXT NOT NULL;
+ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` TEXT default NULL;
 
 ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL;
 
@@ -31,11 +31,11 @@ CREATE TABLE `new_tblWorkflowLog` (
 
 INSERT INTO `new_tblWorkflowLog` (`id`, `workflowdocumentcontent`, `userid`, `transition`, `date`, `comment`) SELECT `a`.`id`, `b`.`id`, `a`.`userid`, `a`.`transition`, `a`.`date`, `a`.`comment` FROM `tblWorkflowLog` `a` LEFT JOIN `new_tblWorkflowDocumentContent` `b` ON `a`.`document`=`b`.`document` AND `a`.`version`=`b`.`version` AND `a`.`workflow`=`b`.`workflow` WHERE `b`.`document` IS NOT NULL;
 
-DROP TABLE `tblWorkflowLog`;
+ALTER TABLE `tblWorkflowLog` RENAME TO `old_tblWorkflowLog`;
 
 ALTER TABLE `new_tblWorkflowLog` RENAME TO `tblWorkflowLog`;
 
-DROP TABLE `tblWorkflowDocumentContent`;
+ALTER TABLE `tblWorkflowDocumentContent` RENAME TO `old_tblWorkflowDocumentContent`;
 
 ALTER TABLE `new_tblWorkflowDocumentContent` RENAME TO `tblWorkflowDocumentContent`;
 
@@ -154,8 +154,6 @@ ALTER TABLE tblUsers RENAME TO old_tblUsers;
 
 ALTER TABLE new_tblUsers RENAME TO tblUsers;
 
-DROP TABLE old_tblUsers;
-
 CREATE TABLE `tblAros` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `parent` INTEGER,
@@ -205,3 +203,9 @@ CREATE TABLE `tblSchedulerTask` (
 UPDATE tblVersion set major=6, minor=0, subminor=0;
 
 COMMIT;
+
+DROP TABLE `old_tblUsers`;
+
+DROP TABLE `old_tblWorkflowLog`;
+
+DROP TABLE `old_tblWorkflowDocumentContent`;

From e5376d144d9d3aedecd9f9140286e9d0302a55d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 29 Mar 2018 15:13:21 +0200
Subject: [PATCH 1071/2006] add changelog for 6.0.6

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index ff17ee08a..af70882d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,8 @@
   the uploader
 - add scheduler
 - add hook showVersionComment in out.ViewDocument.php
+- Various minor corrections of database tables tblWorkflowLog and
+  tblWorkflowDocumentContent
 - merge changes up to 5.1.6
 
 --------------------------------------------------------------------------------

From 7c9f5d381984f927df0d4d884f96fc36f6691cf3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 15:32:59 +0200
Subject: [PATCH 1072/2006] some infos about the update

---
 install/update-6.0.0/update.txt | 52 +++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 install/update-6.0.0/update.txt

diff --git a/install/update-6.0.0/update.txt b/install/update-6.0.0/update.txt
new file mode 100644
index 000000000..13fa50e5f
--- /dev/null
+++ b/install/update-6.0.0/update.txt
@@ -0,0 +1,52 @@
+Caution when you update seeddms with workflow mode `advanced`
+=============================================================
+
+The previous database layout for tracking the workflow state of a
+document content was not very well done. It did not allow to run
+the document through another workflow at a later time, expecially
+the same workflow, e.g. for a scheduled revision of a document.
+
+Technical details
+==================
+This update modifies the tables tblWorkflowDocumentContent and
+tblWorkflowLog. It adds a new autoincrement field as a primary key
+(id) to tblWorkflowDocumentContent and references that field in
+tblWorkflowLog (workflowdocumentcontent). Till now the two tables
+where linked by the fields `document`, `version`, and `workflow` which will
+be replaced by the two new fields. The fields `document`, `version`, and
+`workflow` will be removed from tblWorkflowLog. tblWorkflowDocumentContent
+contained just the workflows currently active for a particlar document.
+From now on the table will also contain finished workflows, which
+will have the field `state` set to null. This allows to run even the
+same workflow again and still be able to distinguish the log entries.
+
+MySQL
+------
+
+The update process will first add the new auto incrementing, primary
+field to tblWorkflowDocumentContent and a referencing field to
+tblWorkflowLog. It will then fill out the referencing field with the
+automatically incremented field value from tblWorkflowDocumentContent
+by joining the two tables with its common fields document, version,
+and workflow.  This will not fill out all referencing field values,
+because once a workflow has ended the record in
+tblWorkflowDocumentContent will be deleted and just the records in
+tblWorkflowLog are kept. The still missing records in
+tblWorkflowDocumentContent for already completed workflows will be
+reconstructed from the records in tblWorkflowLog which do not have a
+reference to tblWorkflowDocumentContent yet. Once that is done the
+referencing field in tblWorkflowLog can be filled in a second pass.
+The date of the new records in tblWorkflowDocumentContent will be
+taken from the last record for that workflow in tblWorkflowLog.  The
+state of the new records will be set null, indicating that this
+workflow is no longer active.
+
+SQLite
+-------
+
+The update process will first create new table for tblWorkflowDocumentContent
+containing a new field for the primary key field. It then copies the
+records from the old table to the new table. The missing records for
+workflows which has been finished already are recreated from the old
+table `tblWorkflowLog`. Which is then replaced by a new table having
+the foreign key to table `tblWorkflowDocumentContent`.

From 63a1ae0c134b02c7a0ab8124ca83de9b24f87610 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Apr 2018 17:07:25 +0200
Subject: [PATCH 1073/2006] add sql statements for workflow

---
 install/create_tables-innodb.sql   | 16 +++++++---------
 install/create_tables-postgres.sql |  9 ++++-----
 install/create_tables-sqlite3.sql  |  8 ++++----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 245b62487..3994dba1f 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -811,22 +811,18 @@ CREATE TABLE `tblWorkflowTransitionGroups` (
 
 CREATE TABLE `tblWorkflowLog` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `document` int(11) DEFAULT NULL,
-  `version` smallint(5) DEFAULT NULL,
-  `workflow` int(11) DEFAULT NULL,
+  `workflowdocumentcontent` int(11) NOT NULL DEFAULT '0',
   `userid` int(11) DEFAULT NULL,
   `transition` int(11) DEFAULT NULL,
   `date` datetime NOT NULL,
   `comment` text,
   PRIMARY KEY (`id`),
-  KEY `tblWorkflowLog_document` (`document`),
-  KEY `tblWorkflowLog_workflow` (`workflow`),
   KEY `tblWorkflowLog_userid` (`userid`),
   KEY `tblWorkflowLog_transition` (`transition`),
-  CONSTRAINT `tblWorkflowLog_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  KEY `tblWorkflowLog_workflowdocumentcontent` (`workflowdocumentcontent`),
+  CONSTRAINT `tblWorkflowLog_workflowdocumentcontent` FOREIGN KEY (`workflowdocumentcontent`) REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblWorkflowLog_transition` FOREIGN KEY (`transition`) REFERENCES `tblWorkflowTransitions` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `tblWorkflowLog_userid` FOREIGN KEY (`userid`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `tblWorkflowLog_workflow` FOREIGN KEY (`workflow`) REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE
+  CONSTRAINT `tblWorkflowLog_userid` FOREIGN KEY (`userid`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -836,7 +832,8 @@ CREATE TABLE `tblWorkflowLog` (
 --
 
 CREATE TABLE `tblWorkflowDocumentContent` (
-  `parentworkflow` int(11) DEFAULT '0',
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `parent` int(11) DEFAULT NULL,
   `workflow` int(11) DEFAULT NULL,
   `document` int(11) DEFAULT NULL,
   `version` smallint(5) DEFAULT NULL,
@@ -847,6 +844,7 @@ CREATE TABLE `tblWorkflowDocumentContent` (
   KEY `tblWorkflowDocument_state` (`state`),
   CONSTRAINT `tblWorkflowDocument_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblWorkflowDocument_state` FOREIGN KEY (`state`) REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblWorkflowDocumentContent_parent` FOREIGN KEY (`parent`) REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
   CONSTRAINT `tblWorkflowDocument_workflow` FOREIGN KEY (`workflow`) REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index 7a36a63b2..a1150b0fa 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -536,7 +536,7 @@ CREATE TABLE "tblSessions" (
   "theme" varchar(30) NOT NULL default '',
   "language" varchar(30) NOT NULL default '',
   "clipboard" text default NULL,
-	"su" INTEGER DEFAULT NULL,
+  "su" INTEGER DEFAULT NULL,
   "splashmsg" text default NULL
 ) ;
 
@@ -669,9 +669,7 @@ CREATE TABLE "tblWorkflowTransitionGroups" (
 
 CREATE TABLE "tblWorkflowLog" (
   "id" SERIAL UNIQUE,
-  "document" INTEGER default NULL REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
-  "version" INTEGER default NULL,
-  "workflow" INTEGER default NULL REFERENCES "tblWorkflows" ("id") ON DELETE CASCADE,
+  "workflowdocumentcontent" INTEGER DEFAULT NULL REFERENCES "tblWorkflowDocumentContent" ("id") ON DELETE CASCADE,
   "userid" INTEGER default NULL REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
   "transition" INTEGER default NULL REFERENCES "tblWorkflowTransitions" ("id") ON DELETE CASCADE,
   "date" TIMESTAMP default NULL,
@@ -685,7 +683,8 @@ CREATE TABLE "tblWorkflowLog" (
 -- 
 
 CREATE TABLE "tblWorkflowDocumentContent" (
-  "parentworkflow" INTEGER DEFAULT 0,
+  "id" SERIAL UNIQUE,
+  "parent" INTEGER DEFAULT NULL REFERENCES "tblWorkflowDocumentContent" ("id") ON DELETE CASCADE,
   "workflow" INTEGER DEFAULT NULL REFERENCES "tblWorkflows" ("id") ON DELETE CASCADE,
   "document" INTEGER DEFAULT NULL REFERENCES "tblDocuments" ("id") ON DELETE CASCADE,
   "version" INTEGER DEFAULT NULL,
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 15e471de0..15bddbb78 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -545,7 +545,7 @@ CREATE TABLE `tblSessions` (
   `theme` varchar(30) NOT NULL default '',
   `language` varchar(30) NOT NULL default '',
   `clipboard` text default NULL,
-	`su` INTEGER DEFAULT NULL,
+  `su` INTEGER DEFAULT NULL,
   `splashmsg` text default NULL
 ) ;
 
@@ -678,9 +678,7 @@ CREATE TABLE `tblWorkflowTransitionGroups` (
 
 CREATE TABLE `tblWorkflowLog` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  `version` INTEGER default NULL,
-  `workflow` INTEGER default NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE,
+  `workflowdocumentcontent` INTEGER DEFAULT NULL REFERENCES `tblWorkflowDocumentContent`   (`id`) ON DELETE CASCADE,
   `userid` INTEGER default NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
   `transition` INTEGER default NULL REFERENCES `tblWorkflowTransitions` (`id`) ON DELETE CASCADE,
   `date` datetime NOT NULL,
@@ -694,7 +692,9 @@ CREATE TABLE `tblWorkflowLog` (
 --
 
 CREATE TABLE `tblWorkflowDocumentContent` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `parentworkflow` INTEGER DEFAULT 0,
+  `parent` INTEGER DEFAULT NULL REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
   `workflow` INTEGER DEFAULT NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE,
   `document` INTEGER DEFAULT NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER DEFAULT NULL,

From 8ea8c0086eccc6687173ec89753915916fcc6d14 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Apr 2018 11:19:13 +0200
Subject: [PATCH 1074/2006] set references to right table name

a reference to a temp. table will not be changed when the table name
is changed. Hence, use the right table name from the beginning and
make sure foreign keys are not checked
---
 install/update-6.0.0/update-sqlite3.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql
index 6bc037102..3c4996a3b 100644
--- a/install/update-6.0.0/update-sqlite3.sql
+++ b/install/update-6.0.0/update-sqlite3.sql
@@ -8,7 +8,7 @@ ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text default NULL;
 
 CREATE TABLE `new_tblWorkflowDocumentContent` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `parent` INTEGER DEFAULT NULL REFERENCES `new_tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
+  `parent` INTEGER DEFAULT NULL REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
   `workflow` INTEGER DEFAULT NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE,
   `document` INTEGER DEFAULT NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER DEFAULT NULL,
@@ -22,7 +22,7 @@ INSERT INTO `new_tblWorkflowDocumentContent` (`parent`, `workflow`, `document`,
 
 CREATE TABLE `new_tblWorkflowLog` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-	`workflowdocumentcontent` INTEGER DEFAULT NULL REFERENCES `new_tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
+	`workflowdocumentcontent` INTEGER DEFAULT NULL REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
   `userid` INTEGER default NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
   `transition` INTEGER default NULL REFERENCES `tblWorkflowTransitions` (`id`) ON DELETE CASCADE,
   `date` datetime NOT NULL,

From f1fb23c7e737d9036aed0c3708c109a7760eaf76 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Apr 2018 12:21:09 +0200
Subject: [PATCH 1075/2006] fix sql statement to retrieve workflow log

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 67d4750fa..37c5f2535 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -6080,7 +6080,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 		if($this->_workflow)
 			$queryStr .= " AND `a`.`workflowdocumentcontent` = ".$this->_workflow['id'];
-		$queryStr .= " ORDER BY `date`";
+		$queryStr .= " ORDER BY `a`.`date`";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && !$resArr)
 			return false;

From 801bda35604b7aa625f8fa30f47c9df3abf4a007 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Apr 2018 06:40:29 +0200
Subject: [PATCH 1076/2006] fix typo

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fd5f3335c..87088f07f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,7 +16,7 @@
 - add hook showVersionComment in out.ViewDocument.php
 - Various minor corrections of database tables tblWorkflowLog and
   tblWorkflowDocumentContent
-- merge changes up to 5.1.6
+- merge changes up to 5.1.7
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.5

From 2e647fb4eceba0e539700d4425bdc33fa17129e0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Apr 2018 08:13:06 +0200
Subject: [PATCH 1077/2006] fix update of tblWorkflowLog

foreign key must be removed before droping field
---
 install/update-6.0.0/update.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index 54bfe3430..e4ce97ffc 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -24,10 +24,14 @@ ALTER TABLE `tblWorkflowDocumentContent` ADD CONSTRAINT `tblWorkflowDocumentCont
 
 ALTER TABLE `tblWorkflowDocumentContent` DROP COLUMN `parentworkflow`;
 
+ALTER TABLE `tblWorkflowLog` DROP FOREIGN KEY `tblWorkflowLog_document`;
+
 ALTER TABLE `tblWorkflowLog` DROP COLUMN `document`;
 
 ALTER TABLE `tblWorkflowLog` DROP COLUMN `version`;
 
+ALTER TABLE `tblWorkflowLog` DROP FOREIGN KEY `tblWorkflowLog_workflow`;
+
 ALTER TABLE `tblWorkflowLog` DROP COLUMN `workflow`;
 
 CREATE TABLE `tblUserSubstitutes` (

From 9ea9289fdfe8d8ca70eb827f1d10a3466b5acc78 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Apr 2018 09:32:16 +0200
Subject: [PATCH 1078/2006] fix editing of document attachments

---
 CHANGELOG                    | 6 ++++++
 out/out.EditDocumentFile.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 70d90e774..1fe1294a5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.7
+--------------------------------------------------------------------------------
+- fix editing of document attachments
+- merge changes up to 5.1.7
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.6
 --------------------------------------------------------------------------------
diff --git a/out/out.EditDocumentFile.php b/out/out.EditDocumentFile.php
index baab461d9..0ffc8c82e 100644
--- a/out/out.EditDocumentFile.php
+++ b/out/out.EditDocumentFile.php
@@ -30,7 +30,7 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));

From 2cc48d491e4e86ba6838d3c60906e674dc2a233a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Apr 2018 08:39:01 +0200
Subject: [PATCH 1079/2006] fix output of review/approval log if updating user
 doesn't exist anymore

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f24a9fabc..7f388b82c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2887,7 +2887,7 @@ $(document).ready(function() {
 			echo "<td>";
 			echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
 			$updateuser = $dms->getUser($rec["userID"]);
-			if(!is_object($required))
+			if(!is_object($updateuser))
 				echo getMLText("unknown_user");
 			else
 				echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");

From e592d0e3d00f0253de22a6abfd6c9c6e95955e57 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Apr 2018 09:44:45 +0200
Subject: [PATCH 1080/2006] remove list of documents

---
 views/bootstrap/class.IndexInfo.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.IndexInfo.php b/views/bootstrap/class.IndexInfo.php
index e7a11dd6c..897306cfc 100644
--- a/views/bootstrap/class.IndexInfo.php
+++ b/views/bootstrap/class.IndexInfo.php
@@ -46,6 +46,7 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Bootstrap_Style {
 
 		$numDocs = $index->count();
 		echo "<legend>".$numDocs." ".getMLText('documents')."</legend>";
+		/*
 		$this->contentContainerStart();
 		for ($id = 0; $id < $numDocs; $id++) {
 			if (!$index->isDeleted($id)) {
@@ -54,6 +55,7 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Bootstrap_Style {
 			}
 		}
 		$this->contentContainerEnd();
+		 */
 
 		$terms = $index->terms();
 		echo "<legend>".count($terms)." Terms</legend>";

From 5064c24388dbc6201062e2f5b94a99872d5686aa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Apr 2018 10:20:27 +0200
Subject: [PATCH 1081/2006] show noty message longer in case of an error

---
 views/bootstrap/class.Indexer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 9c850df45..2ef1c4bee 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -82,11 +82,11 @@ function check_queue() {
 					$('#status_'+data.data).html('<?php printMLText('index_error'); ?>');
 					noty({
 						text: data.message,
-						type: (data.success) ? 'success' : 'error',
+						type: 'error',
 						dismissQueue: true,
 						layout: 'topRight',
 						theme: 'defaultTheme',
-						timeout: 1500,
+						timeout: 25000,
 					});
 				}
 			},

From 0d3596d23780bbf1bfbd7ff02f8843ab4b114ec6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Apr 2018 15:31:35 +0200
Subject: [PATCH 1082/2006] better error reporting when indexing fails

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php     | 22 ++++++++++++++++
 SeedDMS_Lucene/package.xml                    | 24 +++++++++++++++---
 .../SQLiteFTS/IndexedDocument.php             | 25 +++++++++++++++++++
 SeedDMS_SQLiteFTS/package.xml                 | 24 +++++++++++++++---
 op/op.Ajax.php                                |  2 +-
 views/bootstrap/class.Indexer.php             |  2 +-
 6 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index c20acdf9f..237150097 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -29,6 +29,16 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 	 */
 	protected $errormsg;
 
+	/**
+	 * @var string
+	 */
+	protected $mimetype;
+
+	/**
+	 * @var string
+	 */
+	protected $cmd;
+
 	/**
 	 * @param $cmd
 	 * @param int $timeout
@@ -88,6 +98,8 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 	 */
 	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) { /* {{{ */
 		$this->errormsg = '';
+		$this->cmd = '';
+		$this->mimetype = '';
 		$_convcmd = array(
 			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
 			'application/postscript' => 'ps2pdf14 %s - | pdftotext -enc UTF-8 -nopgbrk - - | sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
@@ -148,6 +160,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 			$path = $dms->contentDir . $version->getPath();
 			$content = '';
 			$mimetype = $version->getMimeType();
+			$this->mimetype = $mimetype;
 			$cmd = '';
 			$mimeparts = explode('/', $mimetype, 2);
 			if(isset($_convcmd[$mimetype])) {
@@ -158,6 +171,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 				$cmd = sprintf($_convcmd[$mimetype], $path);
 			}
 			if($cmd) {
+				$this->cmd = $cmd;
 				try {
 					$content = self::execWithTimeout($cmd, $timeout);
 					if($content['stdout']) {
@@ -175,5 +189,13 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 	public function getErrorMsg() { /* {{{ */
 		return $this->errormsg;
 	} /* }}} */
+
+	public function getMimeType() { /* {{{ */
+		return $this->mimetype;
+	} /* }}} */
+
+	public function getCmd() { /* {{{ */
+		return $this->cmd;
+	} /* }}} */
 }
 ?>
diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index f0dd0f558..4f55862ad 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-01-30</date>
+ <date>2018-04-11</date>
  <time>10:58:13</time>
  <version>
-  <release>1.1.12</release>
-  <api>1.1.12</api>
+  <release>1.1.13</release>
+  <api>1.1.13</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-execWithTimeout() reads data from stderr and saves it into error msg
+IndexedDocument() remembers cmd and mimetype
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -283,5 +283,21 @@ catch exception in execWithTimeout()
 allow conversion commands for mimetypes with wildcards
    </notes>
   </release>
+  <release>
+   <date>2018-01-30</date>
+   <time>10:58:13</time>
+   <version>
+    <release>1.1.12</release>
+    <api>1.1.12</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+execWithTimeout() reads data from stderr and saves it into error msg
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index cf40b4a95..fb87503b8 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -29,8 +29,21 @@ require_once('Document.php');
  */
 class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 
+	/**
+	 * @var string
+	 */
 	protected $errormsg;
 
+	/**
+	 * @var string
+	 */
+	protected $mimetype;
+
+	/**
+	 * @var string
+	 */
+	protected $cmd;
+
 	static function execWithTimeout($cmd, $timeout=2) { /* {{{ */
 		$descriptorspec = array(
 			0 => array("pipe", "r"),
@@ -79,6 +92,8 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 	 */
 	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) { /* {{{ */
 		$this->errormsg = '';
+		$this->cmd = '';
+		$this->mimetype = '';
 		$_convcmd = array(
 			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
 			'application/postscript' => 'ps2pdf14 %s - | pdftotext -enc UTF-8 -nopgbrk - - | sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
@@ -139,6 +154,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 			$path = $dms->contentDir . $version->getPath();
 			$content = '';
 			$mimetype = $version->getMimeType();
+			$this->mimetype = $mimetype;
 			$cmd = '';
 			$mimeparts = explode('/', $mimetype, 2);
 			if(isset($_convcmd[$mimetype])) {
@@ -149,6 +165,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 				$cmd = sprintf($_convcmd[$mimetype], $path);
 			}
 			if($cmd) {
+				$this->cmd = $cmd;
 				try {
 					$content = self::execWithTimeout($cmd, $timeout);
 					if($content['stdout']) {
@@ -166,5 +183,13 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 	public function getErrorMsg() { /* {{{ */
 		return $this->errormsg;
 	} /* }}} */
+
+	public function getMimeType() { /* {{{ */
+		return $this->mimetype;
+	} /* }}} */
+
+	public function getCmd() { /* {{{ */
+		return $this->cmd;
+	} /* }}} */
 }
 ?>
diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index f83232424..ed2256393 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-01-30</date>
+ <date>2018-04-11</date>
  <time>11:00:40</time>
  <version>
-  <release>1.0.9</release>
-  <api>1.0.9</api>
+  <release>1.0.10</release>
+  <api>1.0.10</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-execWithTimeout() reads data from stderr and saves it into error msg
+IndexedDocument() remembers cmd and mimetype
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -210,5 +210,21 @@ catch exception in execWithTimeout()
 allow conversion commands for mimetypes with wildcards
    </notes>
   </release>
+  <release>
+   <date>2018-01-30</date>
+   <time>11:00:40</time>
+   <version>
+    <release>1.0.9</release>
+    <api>1.0.9</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+execWithTimeout() reads data from stderr and saves it into error msg
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 1c4c60ea6..b36aff730 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -881,7 +881,7 @@ switch($command) {
 								echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_indexed'), 'data'=>$document->getID()));
 							} else {
 								header('Content-Type: application/json');
-								echo json_encode(array('success'=>false, 'message'=>$error, 'data'=>$document->getID()));
+								echo json_encode(array('success'=>false, 'message'=>$error, 'data'=>$document->getID(), 'mimetype'=>$idoc->getMimeType(), 'cmd'=>$idoc->getCmd()));
 							}
 						} else {
 							header('Content-Type: application/json');
diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 2ef1c4bee..de392db62 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -81,7 +81,7 @@ function check_queue() {
 				} else {
 					$('#status_'+data.data).html('<?php printMLText('index_error'); ?>');
 					noty({
-						text: data.message,
+						text: '<p><strong>Docid: ' + data.data + ' (' + data.mimetype + ')</strong></p>' + '<p>Cmd: ' + data.cmd + '</p>' + data.message,
 						type: 'error',
 						dismissQueue: true,
 						layout: 'topRight',

From 18bd1fdf55d7e129452cd3b1896d1838eed43d22 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Apr 2018 16:02:40 +0200
Subject: [PATCH 1083/2006] sync with package file from 5.1.7

---
 SeedDMS_Core/package.xml | 70 ++++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 85277b185..27f467b82 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1244,8 +1244,8 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
     <api>5.0.1</api>
    </version>
    <stability>
-   <release>stable</release>
-   <api>stable</api>
+    <release>stable</release>
+    <api>stable</api>
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
@@ -1253,8 +1253,8 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    </notes>
   </release>
   <release>
-   <date>2016-03-09</date>
-   <time>14:34:58</time>
+   <date>2016-04-26</date>
+   <time>12:04:59</time>
    <version>
     <release>5.0.2</release>
     <api>5.0.2</api>
@@ -1270,7 +1270,7 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
   </release>
   <release>
    <date>2016-04-04</date>
-   <time>14:34:58</time>
+   <time>08:56:33</time>
    <version>
     <release>5.0.3</release>
     <api>5.0.3</api>
@@ -1281,6 +1281,7 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
 - all changes from 4.3.26 merged
    </notes>
   </release>
@@ -1298,7 +1299,7 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - all changes from 4.3.27 merged
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2016-08-09</date>
@@ -1314,7 +1315,7 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - all changes from 4.3.28 merged
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2016-09-06</date>
@@ -1363,18 +1364,18 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - all changes from 4.3.31 merged
-	 </notes>
+   </notes>
   </release>
   <release>
-   <date>2016-11-08</date>
-   <time>14:06:06</time>
+   <date>2016-11-02</date>
+   <time>06:23:34</time>
    <version>
-	   <release>5.0.9</release>
-	   <api>5.0.9</api>
+    <release>5.0.9</release>
+    <api>5.0.9</api>
    </version>
    <stability>
-	   <release>stable</release>
-	   <api>stable</api>
+    <release>stable</release>
+    <api>stable</api>
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
@@ -1476,11 +1477,11 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - all changes from 5.0.11 merged
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2017-03-23</date>
-   <time>07:07:02</time>
+   <time>06:34:50</time>
    <version>
     <release>5.1.2</release>
     <api>5.1.2</api>
@@ -1491,15 +1492,14 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-- all changes from 5.0.12 merged
-- SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
+SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
 if the owner tries to access them
-- Check return value of onPreRemove[Document|Folder], return from calling method if bool
-- Add SeedDMS_Core_DMS::getDocumentList()
-- Limit number of duplicate files to 1000
-- Add hook on(Pre|Post)RemoveContent
-- Add hook onAttributeValidate
-	 </notes>
+Check return value of onPreRemove[Document|Folder], return from calling method if bool
+Add SeedDMS_Core_DMS::getDocumentList()
+Limit number of duplicate files to 1000
+Add hook on(Pre|Post)RemoveContent
+Add hook onAttributeValidate
+   </notes>
   </release>
   <release>
    <date>2017-08-23</date>
@@ -1535,10 +1535,14 @@ returns just users which are not disabled
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
+- add virtual access mode for document links and attachments plus callbacks to
+  check access mode in a hook
+- add new method SeedDMS_Core_DMS::getDocumentsExpired()
+- all changes from 5.0.14 merged
    </notes>
   </release>
   <release>
-   <date>2017-11-24</date>
+   <date>2017-11-07</date>
    <time>09:19:24</time>
    <version>
     <release>5.1.5</release>
@@ -1582,6 +1586,22 @@ add lots of DocBlocks from merge request #8
 add SeedDMS_Core_AttributeDefinition::removeValue()
    </notes>
   </release>
+  <release>
+   <date>2018-04-05</date>
+   <time>09:19:24</time>
+   <version>
+    <release>5.1.7</release>
+    <api>5.1.7</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+just bump version
+   </notes>
+  </release>
   <release>
    <date>2018-04-11</date>
    <time>09:19:24</time>

From 9902445ff183e1d13bea5a2600103f022df4d39a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 May 2018 20:34:37 +0200
Subject: [PATCH 1084/2006] copy inc/inc.ClassExtensionMgr.php into repository
 dist

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index c6268490c..0764d1bab 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,12 @@ webapp:
 repository:
 	mkdir -p tmp/seeddms-repository-$(VERSION)
 	cp -a repository/www repository/utils repository/doc tmp/seeddms-repository-$(VERSION)
+	rm -f tmp/seeddms-repository/utils/update-repository.log
 	mkdir -p tmp/seeddms-repository-$(VERSION)/files
 	mkdir -p tmp/seeddms-repository-$(VERSION)/accounts
 	cp -a repository/files/.htaccess tmp/seeddms-repository-$(VERSION)/files
 	cp -a repository/accounts/.htaccess tmp/seeddms-repository-$(VERSION)/accounts
+	cp inc/inc.ClassExtensionMgr.php tmp/seeddms-repository-$(VERSION)/utils
 	(cd tmp; tar --exclude=.svn -czvf ../seeddms-repository-$(VERSION).tar.gz seeddms-repository-$(VERSION))
 	rm -rf tmp
 

From ded0c29b24d2b49bad145eb76195214d968905ba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Jul 2018 13:55:36 +0200
Subject: [PATCH 1085/2006] add documentation, get parameter in execute()

---
 ext/example/class.example.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ext/example/class.example.php b/ext/example/class.example.php
index 31c892d95..1b8f554bb 100644
--- a/ext/example/class.example.php
+++ b/ext/example/class.example.php
@@ -118,7 +118,16 @@ class SeedDMS_ExtExample_ViewFolder {
  * @subpackage  example
  */
 class SeedDMS_ExtExample_Task extends SeedDMS_SchedulerTaskBase {
+
+	/**
+	 * Run the task
+	 *
+	 * @param $task task to be executed
+	 * @param $dms dms
+	 * @return boolean true if task was executed succesfully, otherwise false
+	 */
 	public function execute($task, $dms) {
+		$taskparams = $task->getParameter();
 		return true;
 	}
 

From aa7daffe46dc63c43556ee7f7431a34b5d36fd83 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Jul 2018 13:56:00 +0200
Subject: [PATCH 1086/2006] fix translation for button

---
 views/bootstrap/class.ReviseDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 3a3dbb6db..a841d0cc9 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -107,7 +107,7 @@ $(document).ready(function() {
 		$this->globalNavigation($folder);
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
-		$this->contentHeading(getMLText("submit_review"));
+		$this->contentHeading(getMLText("submit_revision"));
 		$this->contentContainerStart();
 
 		// Display the Revision form.

From 31e1e48dea300f955722ff22870638056f58929d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Jul 2018 13:56:22 +0200
Subject: [PATCH 1087/2006] list frequency and all parameters of task

---
 utils/schedulercli.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index b5e4a59cc..bf2ddeda4 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -100,7 +100,13 @@ foreach($tasks as $task) {
 			}
 			echo " ".$task->getExtension()."::".$task->getTask()."";
 			echo " ".$task->getNextRun();
+			echo " ".$task->getFrequency();
 			echo "\n";
+			if($params = $task->getParameter()) {
+				foreach($params as $key=>$value) {
+					echo "    ".$key.": ".$value."\n";
+				}
+			}
 			break;
 		}
 	}

From 620dfa6a294eaa8c62c941902ee5df78cb0ad6e1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Jul 2018 20:50:26 +0200
Subject: [PATCH 1088/2006] make executable

---
 utils/seeddms-schedulercli | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 utils/seeddms-schedulercli

diff --git a/utils/seeddms-schedulercli b/utils/seeddms-schedulercli
old mode 100644
new mode 100755

From 40811734425cd0820bfad56dfd65ff352804808d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Jul 2018 11:07:05 +0200
Subject: [PATCH 1089/2006] place in two columns and color table rows

---
 views/bootstrap/class.ReceiptSummary.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index c7a1aa46d..6e7bd8df5 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -52,6 +52,8 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 
+		echo "<div class=\"row-fluid\">\n";
+		echo "<div class=\"span6\">\n";
 		$this->contentHeading(getMLText("receipt_summary"));
 
 		// TODO: verificare scadenza
@@ -89,9 +91,10 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 				if(is_string($txt))
 					echo $txt;
 				else {
-					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
+					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document".$class."\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
 					echo $this->documentListRow($document, $previewer, true, $st['version']);
-					print "<td>".$st["date"]." ". htmlspecialchars($moduser->getFullName()) ."</td>";
+					print "<td><small>".getReceiptStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
 					echo "</tr>";
 				}
 			}
@@ -105,6 +108,8 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_docs_to_receipt");
 		}
 
+		echo "</div>\n";
+		echo "<div class=\"span6\">\n";
 		$this->contentHeading(getMLText("group_receipt_summary"));
 
 		$printheader=true;
@@ -132,9 +137,10 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 				if(is_string($txt))
 					echo $txt;
 				else {
-					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
+					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document".$class."\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
 					echo $this->documentListRow($document, $previewer, true, $st['version']);
-					print "<td>".$st["date"]." ". htmlspecialchars($modgroup->getName()) ."</td>";
+					print "<td><small>".getReceiptStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
 					echo "</tr>";
 				}
 			}
@@ -145,6 +151,8 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_docs_to_receipt");
 		}
 
+		echo "</div>\n";
+		echo "</div>\n";
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 7ec84597ebb24a79b86123e4c7dbe983201f1db0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Jul 2018 11:09:08 +0200
Subject: [PATCH 1090/2006] update

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 643cc53f7..b3cca7600 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,8 @@
                      Changes in version 6.0.7
 --------------------------------------------------------------------------------
 - fix editing of document attachments
-- merge changes up to 5.1.7
+- make receipt summary look like approval/review summary
+- merge changes up to 5.1.9
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.6

From 6553f7a3795c58e4087f1154a1d3b0dc5d53d4b5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Jul 2018 12:27:30 +0200
Subject: [PATCH 1091/2006] call hook showVersionComment() for previous
 versions, check if comment is set at all

---
 views/bootstrap/class.ViewDocument.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 085f0857f..3205a36ab 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -626,7 +626,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($txt) {
 			echo $txt;
 		} else {
-			print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
+			if($latestContent->getComment())
+				print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
 		}
 		print "<ul class=\"actions unstyled\">\n";
 		$attributes = $latestContent->getAttributes();
@@ -1505,8 +1506,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
 				print "<li>".getLongReadableDate($version->getDate())."</li>";
 				print "</ul>\n";
-				if($version->getComment())
-					print "<p style=\"font-style: italic;\">".htmlspecialchars($version->getComment())."</p>";
+				$txt = $this->callHook('showVersionComment', $version);
+				if($txt) {
+					echo $txt;
+				} else {
+					if($version->getComment())
+						print "<p style=\"font-style: italic;\">".htmlspecialchars($version->getComment())."</p>";
+				}
 				print "<ul class=\"actions unstyled\">\n";
 				$attributes = $version->getAttributes();
 				if($attributes) {

From 39a7c269771771125760fd9e0f37004d4e1d79f1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Nov 2018 15:41:26 +0100
Subject: [PATCH 1092/2006] place tblWorkflowLog after
 tblWorkflowDocumentContent

---
 install/create_tables-innodb.sql   | 47 +++++++++++++++---------------
 install/create_tables-postgres.sql | 30 +++++++++----------
 install/create_tables-sqlite3.sql  | 30 +++++++++----------
 3 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 3994dba1f..53af95f62 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -805,6 +805,30 @@ CREATE TABLE `tblWorkflowTransitionGroups` (
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table `tblWorkflowDocumentContent`
+--
+
+CREATE TABLE `tblWorkflowDocumentContent` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `parent` int(11) DEFAULT NULL,
+  `workflow` int(11) DEFAULT NULL,
+  `document` int(11) DEFAULT NULL,
+  `version` smallint(5) DEFAULT NULL,
+  `state` int(11) DEFAULT NULL,
+  `date` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `tblWorkflowDocument_document` (`document`),
+  KEY `tblWorkflowDocument_workflow` (`workflow`),
+  KEY `tblWorkflowDocument_state` (`state`),
+  CONSTRAINT `tblWorkflowDocument_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblWorkflowDocument_state` FOREIGN KEY (`state`) REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblWorkflowDocumentContent_parent` FOREIGN KEY (`parent`) REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `tblWorkflowDocument_workflow` FOREIGN KEY (`workflow`) REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `tblWorkflowLog`
 --
@@ -827,29 +851,6 @@ CREATE TABLE `tblWorkflowLog` (
 
 -- --------------------------------------------------------
 
---
--- Table structure for table `tblWorkflowDocumentContent`
---
-
-CREATE TABLE `tblWorkflowDocumentContent` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `parent` int(11) DEFAULT NULL,
-  `workflow` int(11) DEFAULT NULL,
-  `document` int(11) DEFAULT NULL,
-  `version` smallint(5) DEFAULT NULL,
-  `state` int(11) DEFAULT NULL,
-  `date` datetime NOT NULL,
-  KEY `tblWorkflowDocument_document` (`document`),
-  KEY `tblWorkflowDocument_workflow` (`workflow`),
-  KEY `tblWorkflowDocument_state` (`state`),
-  CONSTRAINT `tblWorkflowDocument_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `tblWorkflowDocument_state` FOREIGN KEY (`state`) REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `tblWorkflowDocumentContent_parent` FOREIGN KEY (`parent`) REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `tblWorkflowDocument_workflow` FOREIGN KEY (`workflow`) REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
 --
 -- Table structure for table `tblWorkflowMandatoryWorkflow`
 --
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index a1150b0fa..d5cf4a184 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -663,21 +663,6 @@ CREATE TABLE "tblWorkflowTransitionGroups" (
 
 -- --------------------------------------------------------
 
--- 
--- Table structure for workflow log
--- 
-
-CREATE TABLE "tblWorkflowLog" (
-  "id" SERIAL UNIQUE,
-  "workflowdocumentcontent" INTEGER DEFAULT NULL REFERENCES "tblWorkflowDocumentContent" ("id") ON DELETE CASCADE,
-  "userid" INTEGER default NULL REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
-  "transition" INTEGER default NULL REFERENCES "tblWorkflowTransitions" ("id") ON DELETE CASCADE,
-  "date" TIMESTAMP default NULL,
-  "comment" text
-) ;
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for workflow document relation
 -- 
@@ -694,6 +679,21 @@ CREATE TABLE "tblWorkflowDocumentContent" (
 
 -- --------------------------------------------------------
 
+-- 
+-- Table structure for workflow log
+-- 
+
+CREATE TABLE "tblWorkflowLog" (
+  "id" SERIAL UNIQUE,
+  "workflowdocumentcontent" INTEGER DEFAULT NULL REFERENCES "tblWorkflowDocumentContent" ("id") ON DELETE CASCADE,
+  "userid" INTEGER default NULL REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
+  "transition" INTEGER default NULL REFERENCES "tblWorkflowTransitions" ("id") ON DELETE CASCADE,
+  "date" TIMESTAMP default NULL,
+  "comment" text
+) ;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for mandatory workflows
 -- 
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 15bddbb78..96c6a5178 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -672,21 +672,6 @@ CREATE TABLE `tblWorkflowTransitionGroups` (
 
 -- --------------------------------------------------------
 
---
--- Table structure for table `tblWorkflowLog`
---
-
-CREATE TABLE `tblWorkflowLog` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `workflowdocumentcontent` INTEGER DEFAULT NULL REFERENCES `tblWorkflowDocumentContent`   (`id`) ON DELETE CASCADE,
-  `userid` INTEGER default NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
-  `transition` INTEGER default NULL REFERENCES `tblWorkflowTransitions` (`id`) ON DELETE CASCADE,
-  `date` datetime NOT NULL,
-  `comment` text
-) ;
-
--- --------------------------------------------------------
-
 --
 -- Table structure for table `tblWorkflowDocumentContent`
 --
@@ -704,6 +689,21 @@ CREATE TABLE `tblWorkflowDocumentContent` (
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table `tblWorkflowLog`
+--
+
+CREATE TABLE `tblWorkflowLog` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `workflowdocumentcontent` INTEGER DEFAULT NULL REFERENCES `tblWorkflowDocumentContent`   (`id`) ON DELETE CASCADE,
+  `userid` INTEGER default NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `transition` INTEGER default NULL REFERENCES `tblWorkflowTransitions` (`id`) ON DELETE CASCADE,
+  `date` datetime NOT NULL,
+  `comment` text
+) ;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `tblWorkflowMandatoryWorkflow`
 --

From 70b45bcd24fac3b42e0196a986fdc41eb9902d88 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Nov 2018 15:49:32 +0100
Subject: [PATCH 1093/2006] new field in tblWorkflowDocumentContent must be a
 primary key

---
 install/update-6.0.0/update.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index e4ce97ffc..480415c4f 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -6,7 +6,7 @@ ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) DEFAULT NULL AFTER `pwd`;
 
 ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text DEFAULT NULL AFTER `initstate`;
 
-ALTER TABLE `tblWorkflowDocumentContent` ADD COLUMN `id` int(11) NOT NULL AUTO_INCREMENT UNIQUE FIRST;
+ALTER TABLE `tblWorkflowDocumentContent` ADD COLUMN `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
 
 ALTER TABLE `tblWorkflowLog` ADD COLUMN `workflowdocumentcontent` int(11) NOT NULL DEFAULT '0' AFTER `id`;
 

From 0f39ccc7c309a174e881ad0d308a522a3fbfddcd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Nov 2018 20:18:27 +0100
Subject: [PATCH 1094/2006] fix merge errors

---
 views/bootstrap/class.Tasks.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 0a67c4e97..d01065de8 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -57,13 +57,9 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					}
 				}
 			}
-<<<<<<< HEAD
 		if($workflowmode == 'traditional')
 			if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
 				$tasks['review'] = array();
-=======
-			if($workflowmode == 'traditional') {
->>>>>>> seeddms-5.1.x
 				$resArr = $dms->getDocumentList('ReviewByMe', $user);
 				if($resArr) {
 					foreach ($resArr as $res) {
@@ -71,7 +67,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
 							$tasks['review'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 						}
-<<<<<<< HEAD
 					}
 				}
 			}
@@ -98,8 +93,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
 							$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 						}
-=======
->>>>>>> seeddms-5.1.x
 					}
 				}
 			}

From 23bec2fe9690ff1c22ea2241b79f677f469217d2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 16 Nov 2018 20:18:52 +0100
Subject: [PATCH 1095/2006] field parentworkflow in tblWorkflowDocumentContent
 is obsolete

---
 install/create_tables-sqlite3.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 96c6a5178..2eff9a797 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -678,7 +678,6 @@ CREATE TABLE `tblWorkflowTransitionGroups` (
 
 CREATE TABLE `tblWorkflowDocumentContent` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `parentworkflow` INTEGER DEFAULT 0,
   `parent` INTEGER DEFAULT NULL REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
   `workflow` INTEGER DEFAULT NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE,
   `document` INTEGER DEFAULT NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,

From 770d9223afc1a43e3b39ed9b7b6a399081616787 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 15 Jan 2019 11:54:06 +0100
Subject: [PATCH 1096/2006] fix syntax error after merge

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 4859a4c2d..56766d22f 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1604,7 +1604,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>";
 				$previewer->createPreview($file, $previewwidthdetail);
 				if($file_exists) {
-					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes)))
+					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes))) {
 						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
 							print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\">";
 						}
@@ -1647,7 +1647,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					if($accessop->check_controller_access('Download', array('action'=>'file'))) {
 						print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a></li>";
 					}
-					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes)))
+					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes))) {
 						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
 							print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
 						}

From 2709231dfc46e9996196d9e6e7a83e5f85c93314 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 15 Jan 2019 18:15:45 +0100
Subject: [PATCH 1097/2006] add dummy notes

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f4e13d298..68a71ded1 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+	 ???
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From d33564ce887674b9737cfa74c7678f6f05d7c750 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 15 Jan 2019 18:24:11 +0100
Subject: [PATCH 1098/2006] fix opened and closed icon of tree

---
 views/bootstrap/class.Acl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index 2777845f9..23b261999 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -36,8 +36,8 @@ class SeedDMS_View_Acl extends SeedDMS_Bootstrap_Style {
 $('#acostree').tree({
 	autoOpen: 0,
 	saveState: 'acostree<?php echo ($selrole ? $selrole->getID() : ''); ?>',
-	openedIcon: '<i class="icon-minus-sign"></i>',
-	closedIcon: '<i class="icon-plus-sign"></i>',
+	openedIcon: $('<i class="icon-minus-sign"></i>'),
+	closedIcon: $('<i class="icon-plus-sign"></i>'),
 	onCreateLi: function(node, $li) {
 		switch(node.permission) {
 			case -1:

From f4a638ce145f15b657304e90819130a841b9fbe2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Jan 2019 17:57:13 +0100
Subject: [PATCH 1099/2006] new version 6.0.7

---
 CHANGELOG                          | 2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 inc/inc.Version.php                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a43379c85..1fdab21d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@
 --------------------------------------------------------------------------------
 - fix editing of document attachments
 - make receipt summary look like approval/review summary
-- merge changes up to 5.1.9
+- merge changes up to 5.1.10
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.6
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 4f06d1ef9..ca6469110 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -452,7 +452,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.6';
+			$this->version = '6.0.7';
 	} /* }}} */
 
 	/**
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 9ad3106cb..60a95ccca 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.6";
+	public $_number = "6.0.7";
 	private $_string = "SeedDMS";
 
 	function __construct() {

From d5ae314dec865260da7608098c1856c57b8ef597 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 26 Jan 2019 15:06:04 +0100
Subject: [PATCH 1100/2006] fix document chooser, which did not open anymore

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index eb92e7804..43e859c23 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1293,7 +1293,7 @@ $(document).ready(function() {
 		$content .= "<a data-target=\"#docChooser".$form."\" href=\"out.DocumentChooser.php?form=".$form."&folderid=".$folderid."&partialtree=".$partialtree."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…</a>\n";
 		$content .= "</div>\n";
 		$content .= '
-<div class="modal hide" id="docChooser<?php echo $form ?>" tabindex="-1" role="dialog" aria-labelledby="docChooserLabel" aria-hidden="true">
+<div class="modal hide" id="docChooser'.$form.'" tabindex="-1" role="dialog" aria-labelledby="docChooserLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="docChooserLabel">'.getMLText("choose_target_document").'</h3>

From 0a256bde298c72edf071213846c1204b1acdf27e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 31 Jan 2019 15:06:22 +0100
Subject: [PATCH 1101/2006] fix typo in translation key

---
 views/bootstrap/class.SetRecipients.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index fd4bb0b9f..7345fb9bb 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -97,7 +97,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
 ?>
   </select>
 
-  <div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups")?>:</div>
+  <div class="cbSelectTitle"><?php printMLText("individuals_in_groups")?>:</div>
   <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
 		foreach ($docAccess["groups"] as $group) {

From fc688441ad4b46cea5f6d12a3fd6f72ee9f47420 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 31 Jan 2019 15:06:45 +0100
Subject: [PATCH 1102/2006] recipients can be set, even if document was not
 released

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 61481007b..de6433251 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -165,7 +165,7 @@ class SeedDMS_AccessOperation {
 		if(get_class($document) == $this->dms->getClassname('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED)) {
+				if (($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) {
 					return true;
 				}
 			}

From 4b1e933c763c27e008be819c05a7999f21ee1083 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 1 Feb 2019 08:59:43 +0100
Subject: [PATCH 1103/2006] add new config option $_allowChangeRevAppInProcess

---
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 1 +
 3 files changed, 6 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 9a78a1535..15246f38c 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -192,6 +192,8 @@ class Settings { /* {{{ */
 	var $_enableRevisionOnVoteReject = true;
 	// Allow to set just a reviewer in tradional workflow
 	var $_allowReviewerOnly = true;
+	// Allow to change reviewer/approver after review/approval has started
+	var $_allowChangeRevAppInProcess = false;
 	// enable/disable log system
 	var $_logFileEnable = true;
 	// the log file rotation
@@ -700,6 +702,7 @@ class Settings { /* {{{ */
 			$this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]);
 			$this->_enableRevisionOnVoteReject = strval($tab["enableRevisionOnVoteReject"]);
 			$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
+			$this->_allowChangeRevAppInProcess = Settings::boolval($tab["allowChangeRevAppInProcess"]);
 			$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
 			$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
 			$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
@@ -1028,6 +1031,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
     $this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject);
     $this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);
+    $this->setXMLAttributValue($node, "allowChangeRevAppInProcess", $this->_allowChangeRevAppInProcess);
     $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
     $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 277310a5b..4be3b94a4 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -187,6 +187,7 @@ if ($action == "saveSettings")
   $settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow");
   $settings->_enableRevisionOnVoteReject = getBoolValue("enableRevisionOnVoteReject");
   $settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly");
+  $settings->_allowChangeRevAppInProcess = getBoolValue("allowChangeRevAppInProcess");
   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp");
   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp");
   $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index cc886a72b..e8df1d457 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -436,6 +436,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigText('settings_presetExpirationDate', 'presetExpirationDate'); ?>
 <?php $this->showConfigOption('settings_initialDocumentStatus', 'initialDocumentStatus', array(' '.S_RELEASED=>'settings_initialDocumentStatus_released', ' '.S_DRAFT=>'settings_initialDocumentStatus_draft'), false, true); ?>
 <?php $this->showConfigCheckbox('settings_allowReviewerOnly', 'allowReviewerOnly'); ?>
+<?php $this->showConfigCheckbox('settings_allowChangeRevAppInProcess', 'allowChangeRevAppInProcess'); ?>
 <?php $this->showConfigCheckbox('settings_enableAdminRevApp', 'enableAdminRevApp'); ?>
 <?php $this->showConfigCheckbox('settings_enableOwnerRevApp', 'enableOwnerRevApp'); ?>
 <?php $this->showConfigCheckbox('settings_enableSelfRevApp', 'enableSelfRevApp'); ?>

From 9e1dff071a26d536fd11318e96b2791a50d41b10 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 1 Feb 2019 09:00:16 +0100
Subject: [PATCH 1104/2006] admis are allowed to change approver/reviewer after
 first approval/review

---
 inc/inc.ClassAccessOperation.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index de6433251..492be5f20 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -125,8 +125,9 @@ class SeedDMS_AccessOperation {
 	 * reviewers/approvers is only allowed if version modification is turned on
 	 * in the settings and the document has not been reviewed/approved by any
 	 * user/group already.
-	 * The admin may even set reviewers/approvers if is disallowed in the
-	 * settings.
+	 * The admin may even set reviewers/approvers after the review/approval
+	 * process has been started, but only if _allowChangeRevAppInProcess
+	 * explicitly allows it.
 	 */
 	function maySetReviewersApprovers($document) { /* {{{ */
 		if(get_class($document) == $this->dms->getClassname('document')) {
@@ -144,7 +145,7 @@ class SeedDMS_AccessOperation {
 					if($r['status'] == 1 || $r['status'] == -1)
 						$hasapproval = true;
 				}
-				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && !$hasreview) || ($status["status"]==S_DRAFT_APP && !$hasreview && !$hasapproval) || $status["status"]==S_DRAFT)) {
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && (!$hasreview || ($this->user->isAdmin() && $this->settings->_allowChangeRevAppInProcess))) || ($status["status"]==S_DRAFT_APP && ((!$hasreview && !$hasapproval) || ($this->user->isAdmin() && $this->settings->_allowChangeRevAppInProcess))) || $status["status"]==S_DRAFT)) {
 					return true;
 				}
 			}

From 8fcfadf5a8433d0400b15471bae3c3e0ad72f809 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 1 Feb 2019 09:01:18 +0100
Subject: [PATCH 1105/2006] fix typo in key for translation

---
 views/bootstrap/class.CheckInDocument.php       | 6 +++---
 views/bootstrap/class.SetReviewersApprovers.php | 4 ++--
 views/bootstrap/class.SetRevisors.php           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index dd8fba9c9..b912c24d7 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -318,7 +318,7 @@ $(document).ready(function() {
     </tr>
       <tr>
         <td>
-			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+			<div class="cbSelectTitle"><?php printMLText("individuals_in_groups");?>:</div>
         </td>
         <td>
         <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_reviewers'); ?>">
@@ -480,7 +480,7 @@ $(document).ready(function() {
 		</tr>
 		  <tr>	
         <td>
-			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+			<div class="cbSelectTitle"><?php printMLText("individuals_in_groups");?>:</div>
         </td>
         <td>
       <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_approvers'); ?>">
@@ -642,7 +642,7 @@ $(document).ready(function() {
     </tr>
       <tr>
         <td>
-			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
+			<div class="cbSelectTitle"><?php printMLText("individuals_in_groups");?>:</div>
         </td>
         <td>
         <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>">
diff --git a/views/bootstrap/class.SetReviewersApprovers.php b/views/bootstrap/class.SetReviewersApprovers.php
index f451861f6..b95e67b35 100644
--- a/views/bootstrap/class.SetReviewersApprovers.php
+++ b/views/bootstrap/class.SetReviewersApprovers.php
@@ -129,7 +129,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 ?>
   </select>
 
-  <div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups")?>:</div>
+  <div class="cbSelectTitle"><?php printMLText("individuals_in_groups")?>:</div>
   <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 
@@ -270,7 +270,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 ?>
   <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
 
-  <div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups")?>:</div>
+  <div class="cbSelectTitle"><?php printMLText("individuals_in_groups")?>:</div>
   <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 
diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 1e299b10b..010693bc2 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -118,7 +118,7 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 	</div>
 
 	<div class="control-group">
-		<label class="control-label"><?php printMLText("indivіduals_in_groups")?>:</label>
+		<label class="control-label"><?php printMLText("individuals_in_groups")?>:</label>
 		<div class="controls">
   <select class="chzn-select span9" name="grpIndRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php

From 22a4160a58d41031c66d8f2f36a0f9d541b81066 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Feb 2019 08:42:06 +0100
Subject: [PATCH 1106/2006] add comment that 'subtree' is deprecated

---
 op/op.Ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index b8c07a535..f0433a53c 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -157,7 +157,7 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'subtree': /* {{{ */
+	case 'subtree': /* {{{ */ /* This operation is deprecated */
 		if($user) {
 			if(empty($_GET['node']))
 				$nodeid = $settings->_rootFolderID;

From 1db49ff2141b5f1afc1b02b62743a103104d231a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Feb 2019 08:42:49 +0100
Subject: [PATCH 1107/2006] add counter for needscorrection

---
 styles/bootstrap/application.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 17ef5367a..2a2447af3 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -990,7 +990,7 @@ $(document).ready(function() { /* {{{ */
 	});
 }); /* }}} */
 
-	var approval_count, review_count, receipt_count, revision_count, workflow_count;
+	var approval_count, review_count, receipt_count, revision_count, workflow_count, needscorrection_count;
 	var checkTasks = function() {
 		$.ajax({url: '../out/out.Tasks.php',
 			type: 'GET',
@@ -1002,12 +1002,14 @@ $(document).ready(function() { /* {{{ */
 						 (typeof data.data.review != 'undefined' && review_count != data.data.review.length) ||
 						 (typeof data.data.receipt != 'undefined' && receipt_count != data.data.receipt.length) ||
 						 (typeof data.data.revision != 'undefined' && revision_count != data.data.revision.length) ||
+						 (typeof data.data.needscorrection != 'undefined' && needscorrection_count != data.data.needscorrection.length) ||
 						 (typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) {
 						$("#menu-tasks > ul > li").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
 						approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0;
 						review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0;
 						receipt_count = typeof data.data.receipt != 'undefined' ? data.data.receipt.length : 0;
 						revision_count = typeof data.data.revision != 'undefined' ? data.data.revision.length : 0;
+						needscorrection_count = typeof data.data.needscorrection != 'undefined' ? data.data.needscorrection.length : 0;
 						workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0;
 					}
 				}

From 64e517a02ed2c640376cc0febaeb7952283d253f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Feb 2019 08:44:13 +0100
Subject: [PATCH 1108/2006] change name of form from 'form1' to 'adddocform'

needed for hooks, to tell which form is currently shown
---
 views/bootstrap/class.AddDocument.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index c26b1a331..2b66b8af5 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -76,7 +76,7 @@ $(document).ready(function() {
 		}
 		return false;
 	}, "<?php printMLText("js_no_file");?>");
-	$("#form1").validate({
+	$("#adddocform").validate({
 		debug: false,
 		ignore: ":hidden:not(.do_validate)",
 		invalidHandler: function(e, validator) {
@@ -107,16 +107,16 @@ $(document).ready(function() {
 		if($enablelargefileupload) {
 ?>
 			'userfile-fine-uploader-uuids': {
-				fineuploader: [ userfileuploader, $('#dropfolderfileform1') ]
+				fineuploader: [ userfileuploader, $('#dropfolderfileadddocform') ]
 			}
 <?php
 		} else {
 ?>
 			'userfile[]': {
-				alternatives: [$('#dropfolderfileform1'), $('#choosedocsearchform1')]
+				alternatives: [$('#dropfolderfileadddocform'), $('#choosedocsearchadddocform')]
 			},
-			dropfolderfileform1: {
-				 alternatives: [$("#userfile"), $('#choosedocsearchform1')]
+			dropfolderfileadddocform: {
+				 alternatives: [$("#userfile"), $('#choosedocsearchadddocform')]
 			}
 <?php
 		}
@@ -143,11 +143,11 @@ $(document).ready(function() {
 	});
 });
 <?php
-			$this->printKeywordChooserJs("form1");
+			$this->printKeywordChooserJs("adddocform");
 			if($libraryfolder)
-				$this->printDocumentChooserJs("form1");
+				$this->printDocumentChooserJs("adddocform");
 			if($dropfolderdir) {
-				$this->printDropFolderChooserJs("form1");
+				$this->printDropFolderChooserJs("adddocform");
 			}
 			$this->printFileChooserJs();
 	} /* }}} */
@@ -196,7 +196,7 @@ $(document).ready(function() {
 			echo $txt;
 		$this->contentContainerStart();
 ?>
-		<form class="form-horizontal" action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="form1" name="form1">
+		<form class="form-horizontal" action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="adddocform" name="adddocform">
 		<?php echo createHiddenFieldWithKey('adddocument'); ?>
 		<input type="hidden" name="folderid" value="<?php print $folderid; ?>">
 		<input type="hidden" name="showtree" value="<?php echo showtree();?>">
@@ -224,7 +224,7 @@ $(document).ready(function() {
 		);
 		$this->formField(
 			getMLText("keywords"),
-				$this->getKeywordChooserHtml('form1')
+				$this->getKeywordChooserHtml('adddocform')
 		);
 		$options = array();
 		$categories = $dms->getDocumentCategories();
@@ -326,13 +326,13 @@ $(document).ready(function() {
 		if($dropfolderdir) {
 			$this->formField(
 				getMLText("dropfolder_file"),
-				$this->getDropFolderChooserHtml("form1", $dropfolderfile)
+				$this->getDropFolderChooserHtml("adddocform", $dropfolderfile)
 			);
 		}
 		if($libraryfolder) {
 			$this->formField(
 				getMLText("librarydoc"),
-				$this->getDocumentChooserHtml("form1", M_READ, -1, null, 'librarydoc', $librarydoc, 1)
+				$this->getDocumentChooserHtml("adddocform", M_READ, -1, null, 'librarydoc', $libraryfolder, 1)
 			);
 		}
 		$this->formField(

From cad94cd18b58bcc576bf1b31307f73cc1a342a7d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Feb 2019 08:46:03 +0100
Subject: [PATCH 1109/2006] call hook to filter documents in folder tree

can be used to show only certain documents, e.g. those which are
released
---
 views/bootstrap/class.Bootstrap.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 43e859c23..44266ef71 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1719,7 +1719,7 @@ $(document).ready(function() {
 	} /* }}} */
 
 	function printNewTreeNavigationHtml($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */
-		echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\" data-url=\"../op/op.Ajax.php?command=subtree&showdocs=".$showdocs."&orderby=".$orderby."\"></div>\n";
+		echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\"></div>\n";
 	} /* }}} */
 
 	/**
@@ -1749,6 +1749,8 @@ $(document).ready(function() {
 						if($showdocs) {
 							$documents = $folder->getDocuments($orderby);
 							$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
+							if($this->hasHook('filterTreeDocuments'))
+								$documents = $this->callHook('filterTreeDocuments', $folder, $documents);
 							foreach($documents as $document) {
 								$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
 								$children[] = $node2;
@@ -1785,6 +1787,8 @@ $(document).ready(function() {
 				if($showdocs) {
 					$documents = $folder->getDocuments($orderby);
 					$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
+					if($this->hasHook('filterTreeDocuments'))
+						$documents = $this->callHook('filterTreeDocuments', $folder, $documents);
 					foreach($documents as $document) {
 						$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
 						$node['children'][] = $node2;
@@ -1795,6 +1799,8 @@ $(document).ready(function() {
 				if($showdocs) {
 					$documents = $folder->getDocuments($orderby);
 					$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
+					if($this->hasHook('filterTreeDocuments'))
+						$documents = $this->callHook('filterTreeDocuments', $folder, $documents);
 					foreach($documents as $document) {
 						$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
 						$node['children'][] = $node2;

From 621dc6fd98b9ae7b3357b0176922f28e55e30b5f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Feb 2019 11:18:44 +0100
Subject: [PATCH 1110/2006] fix filtering approval tasks

---
 views/bootstrap/class.Tasks.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index be7562305..51d46cfb3 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -56,11 +56,11 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 							$docs[] = $document;
 						}
 					}
+					if($this->hasHook('filterApprovalTaskList'))
+						$docs = $this->callHook('filterApprovalTaskList', $docs);
+					foreach($docs as $doc)
+						$tasks['approval'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
 				}
-				if($this->hasHook('filterApprovalTaskList'))
-					$docs = $this->callHook('filterApprovalTaskList', $docs);
-				foreach($docs as $doc)
-					$tasks['approval'][] = array('id'=>$doc->getId(), 'name'=>$doc->getName());
 			}
 		if($workflowmode == 'traditional')
 			if(!$tasksinmenu || in_array('review', $tasksinmenu)) {

From 6e5634cf620fbac563725b84e9af153a03572d92 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Feb 2019 11:19:04 +0100
Subject: [PATCH 1111/2006] path current class to jqtree

---
 views/bootstrap/class.Bootstrap.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 44266ef71..785943d27 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1736,7 +1736,7 @@ $(document).ready(function() {
 	 * @param integer $expandtree level to which the tree shall be opened
 	 */
 	function printNewTreeNavigationJs($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='', $partialtree=false) { /* {{{ */
-		function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) {
+		function jqtree($obj, $path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) {
 			if($path || $expandtree>=$level) {
 				if($path)
 					$pathfolder = array_shift($path);
@@ -1749,14 +1749,14 @@ $(document).ready(function() {
 						if($showdocs) {
 							$documents = $folder->getDocuments($orderby);
 							$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
-							if($this->hasHook('filterTreeDocuments'))
-								$documents = $this->callHook('filterTreeDocuments', $folder, $documents);
+//							if($obj->hasHook('filterTreeDocuments'))
+//								$documents = $obj->callHook('filterTreeDocuments', $folder, $documents);
 							foreach($documents as $document) {
 								$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
 								$children[] = $node2;
 							}
 						}
-						$node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
+						$node['children'] = jqtree($obj, $path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
 					}
 					$children[] = $node;
 				}
@@ -1795,7 +1795,7 @@ $(document).ready(function() {
 					}
 				}
 			} else {
-				$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0);
+				$node['children'] = jqtree($this, $path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0);
 				if($showdocs) {
 					$documents = $folder->getDocuments($orderby);
 					$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);

From 6880901b4a106d62246302d7fbab8652526d9875 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Feb 2019 14:51:19 +0100
Subject: [PATCH 1112/2006] subtree command isn't deprecated

---
 op/op.Ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index f0433a53c..b8c07a535 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -157,7 +157,7 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'subtree': /* {{{ */ /* This operation is deprecated */
+	case 'subtree': /* {{{ */
 		if($user) {
 			if(empty($_GET['node']))
 				$nodeid = $settings->_rootFolderID;

From 6d09865bae9f9a1b4a9abef067c17ccee79c17b1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Feb 2019 14:51:52 +0100
Subject: [PATCH 1113/2006] call hook to filter docs in tree, add data-url to
 jqtree div

---
 views/bootstrap/class.Bootstrap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index a1b214043..05f3722ef 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1719,7 +1719,7 @@ $(document).ready(function() {
 	} /* }}} */
 
 	function printNewTreeNavigationHtml($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */
-		echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\"></div>\n";
+		echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\" data-url=\"../op/op.Ajax.php?command=subtree&showdocs=".$showdocs."&orderby=".$orderby."\"></div>\n";
 	} /* }}} */
 
 	/**
@@ -1750,8 +1750,8 @@ $(document).ready(function() {
 						if($showdocs) {
 							$documents = $subfolder->getDocuments($orderby);
 							$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
-//							if($obj->hasHook('filterTreeDocuments'))
-//								$documents = $obj->callHook('filterTreeDocuments', $folder, $documents);
+							if($obj->hasHook('filterTreeDocuments'))
+								$documents = $obj->callHook('filterTreeDocuments', $folder, $documents);
 							foreach($documents as $document) {
 								$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
 								$node['children'][] = $node2;

From 07d7bb083441b763049ff6224042f35efadb8a7b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 11 Feb 2019 19:20:07 +0100
Subject: [PATCH 1114/2006] return true if operation was succesful

---
 controllers/class.Download.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index 4232aa848..12526c29a 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -38,6 +38,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 				sendFile($dms->contentDir . $content->getPath());
 			}
 		}
+		return true;
 	} /* }}} */
 
 	public function file() { /* {{{ */
@@ -55,6 +56,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 				sendFile($dms->contentDir . $file->getPath());
 			}
 		}
+		return true;
 	} /* }}} */
 
 	public function archive() { /* {{{ */
@@ -75,6 +77,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 				sendFile($basedir .$filename );
 			}
 		}
+		return true;
 	} /* }}} */
 
 	public function log() { /* {{{ */
@@ -94,6 +97,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 				sendFile($basedir.$filename);
 			}
 		}
+		return true;
 	} /* }}} */
 
 	public function sqldump() { /* {{{ */
@@ -113,6 +117,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 				sendFile($basedir.$filename);
 			}
 		}
+		return true;
 	} /* }}} */
 
 	public function approval() { /* {{{ */
@@ -123,7 +128,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 		$filename = $dms->contentDir . $document->getDir().'a'.$logid;
 		if (!file_exists($filename) ) {
 			$this->error = 1;
-			return;
+			return false;
 		}
 
 		if(null === $this->callHook('approval')) {
@@ -137,6 +142,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 			header("Cache-Control: must-revalidate");
 			sendFile($filename);
 		}
+		return true;
 	} /* }}} */
 
 	public function review() { /* {{{ */
@@ -147,7 +153,7 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 		$filename = $dms->contentDir . $document->getDir().'r'.$logid;
 		if (!file_exists($filename) ) {
 			$this->error = 1;
-			return;
+			return false;
 		}
 
 		if(null === $this->callHook('review')) {
@@ -181,25 +187,25 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 		$this->params['content'] = $content;
 		switch($type) {
 			case "version":
-				$this->version();
+				return $this->version();
 				break;
 			case "file":
-				$this->file();
+				return $this->file();
 				break;
 			case "archive":
-				$this->archive();
+				return $this->archive();
 				break;
 			case "log":
-				$this->log();
+				return $this->log();
 				break;
 			case "sqldump":
-				$this->sqldump();
+				return $this->sqldump();
 				break;
 			case "approval":
-				$this->approval();
+				return $this->approval();
 				break;
 			case "review":
-				$this->review();
+				return $this->review();
 				break;
 		}
 	} /* }}} */

From 770daa330c8abb4343f37234da1cc920eacb3fce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Feb 2019 08:18:10 +0100
Subject: [PATCH 1115/2006] SeedDMS_Core_Document::getTimeline() returns
 revision only for latest content

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 0e331afca..d2ebdcd53 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2918,7 +2918,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		$timeline = array();
 
-		$queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id;
+		$lc=$this->getLatestContent();
+		$queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id . " AND	`version` = " . $lc->getVersion();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
 			return false;

From b2fa733a0df4d1b98e89da4ba7cc392baa605ea3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Feb 2019 08:18:16 +0100
Subject: [PATCH 1116/2006] new note for 6.0.7

---
 SeedDMS_Core/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 68a71ded1..00b040a11 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-	 ???
+SeedDMS_Core_Document::getTimeline() returns revision only for latest content
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From feee5600c43dea9295b977e638fd23bc3d5dfe45 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Feb 2019 12:33:11 +0100
Subject: [PATCH 1117/2006] =?UTF-8?q?add=20new=20list=20type=20=C2=B4DueRe?=
 =?UTF-8?q?vision'=20in=20getDocumentList()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 48 +++++++++++++++++++++----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 102f841cc..6ec85ab4c 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -808,7 +808,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	} /* }}} */
 
 	/**
-	 * Check if latest content of the document has a schedult
+	 * Check if latest content of the document has a scheduled
 	 * revision workflow.
 	 * The method will update the document status log database table
 	 * if needed.
@@ -825,8 +825,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if($lc) {
 			$st=$lc->getStatus();
 
+			/* A revision workflow will only be started if the document is released */
 			if($st["status"] == S_RELEASED) {
-				/* First check if there are any revisors left who need to revise */
+				/* First check if there are any scheduled revisions currently sleeping */
 				$pendingRevision=false;
 				unset($this->_revisionStatus);  // force to be reloaded from DB
 				$revisionStatus=$lc->getRevisionStatus();
@@ -841,7 +842,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				if(!$pendingRevision)
 					return false;
 
-				/* Second check if revision is already due */
+				/* We have sleeping revision, next check if the revision is already due */
 				if($lc->getRevisionDate() && $lc->getRevisionDate() <= date('Y-m-d 00:00:00')) {
 					if($lc->startRevision($user, 'Automatic start of revision workflow')) {
 						if($next) {
@@ -3051,23 +3052,30 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * This method will call {@see SeedDMS_Core_DocumentContent::setStatus()}
 	 * which checks if the state has actually changed. This is, why this
 	 * function can be called at any time without harm to the status log.
+	 * The $initialstatus can be set, to define the status set when no other
+	 * status is set. This happens if the document has no
 	 *
 	 * @param boolean $ignorecurrentstatus ignore the current status and
 	 *        recalculate a new status in any case
 	 * @param object $user the user initiating this method
 	 * @param string $msg message stored in status log when status is set
+	 * @param integer $initialstatus status to be set if no other status is set
 	 */
-	function verifyStatus($ignorecurrentstatus=false, $user=null, $msg='') { /* {{{ */
+	function verifyStatus($ignorecurrentstatus=false, $user=null, $msg='', $initialstatus=S_RELEASED) { /* {{{ */
 
 		unset($this->_status);
 		$st=$this->getStatus();
 
+		/* Documents already obsoleted, rejected or expired will not change
+		 * its status anymore, unless explicitly requested.
+		 */
 		if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED )) return;
 
 		unset($this->_workflow); // force to be reloaded from DB
 		$hasworkflow =  $this->getWorkflow() ? true : false;
 
 		$pendingReview=false;
+		$hasReview=false;
 		unset($this->_reviewStatus);  // force to be reloaded from DB
 		$reviewStatus=$this->getReviewStatus();
 		if (is_array($reviewStatus) && count($reviewStatus)>0) {
@@ -3075,10 +3083,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				if ($r["status"]==0){
 					$pendingReview=true;
 					break;
+				} elseif($r["status"]==1){
+					$hasReview=true;
 				}
 			}
 		}
 		$pendingApproval=false;
+		$hasApproval=false;
 		unset($this->_approvalStatus);  // force to be reloaded from DB
 		$approvalStatus=$this->getApprovalStatus();
 		if (is_array($approvalStatus) && count($approvalStatus)>0) {
@@ -3086,10 +3097,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				if ($a["status"]==0){
 					$pendingApproval=true;
 					break;
+				} elseif($a["status"]==1){
+					$hasApproval=true;
 				}
 			}
 		}
 		$pendingRevision=false;
+		$hasRevision=false;
 		unset($this->_revisionStatus);  // force to be reloaded from DB
 		$revsisionStatus=$this->getRevisionStatus();
 		if (is_array($revsisionStatus) && count($revsisionStatus)>0) {
@@ -3097,16 +3111,29 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				if ($a["status"]==0){
 					$pendingRevision=true;
 					break;
+				} elseif($a["status"]==1){
+					$hasRevision=true;
 				}
 			}
 		}
 
+		/* First check for an open review, approval, revision. */
 		if ($hasworkflow) $this->setStatus(S_IN_WORKFLOW,$msg,$user);
 		elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user);
 		elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user);
 		elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user);
-		/* A document in status S_DRAFT will never go into S_RELEASED */
-		elseif ($st["status"]!=S_DRAFT) $this->setStatus(S_RELEASED,$msg,$user);
+		/* Finally decide what to do if either no review, approval, revision was
+		 * ever done or if one of them has been done. In the first case it will
+		 * go to the initial status, in the second case, it will be released.
+		 * A document in status S_DRAFT will never go into S_RELEASED and document
+		 * already released will never go back at this point into the given
+		 * initial status, which can only by S_DRAFT or S_RELEASED
+		 */
+		elseif ($st["status"]!=S_DRAFT && $st["status"]!=S_RELEASED ) {
+			if($hasReview || $hasApproval || $hasRevision) $this->setStatus(S_RELEASED,$msg,$user);
+			else $this->setStatus($initialstatus,$msg,$user);
+		}
+
 	} /* }}} */
 
 	function __construct($id, $document, $version, $comment, $date, $userID, $dir, $orgFileName, $fileType, $mimeType, $fileSize=0, $checksum='', $revisionDate=null) { /* {{{ */
@@ -3398,6 +3425,15 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (is_bool($res) && !$res)
 			return false;
 
+		/* Check if 'onSetStatus' callback is set */
+		if(isset($this->_dms->callbacks['onSetStatus'])) {
+			foreach($this->_dms->callbacks['onSetStatus'] as $callback) {
+				$ret = call_user_func($callback[0], $callback[1], $this, $this->_status["status"], $status);
+				if(is_bool($ret))
+					return $ret;
+			}
+		}
+
 		unset($this->_status);
 		return true;
 	} /* }}} */

From 08fac559c9ade23fa22acdb149e963b8927d9acd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Feb 2019 12:33:50 +0100
Subject: [PATCH 1118/2006] add new list type 'DueRevision' in getDocumentList

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index ca6469110..904baa010 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1331,7 +1331,7 @@ class SeedDMS_Core_DMS {
 			}
 			}
 			break; // }}}
-		case 'ReviseByMe': // Documents I have to receipt {{{
+		case 'ReviseByMe': // Documents I have to revise {{{
 			if (!$this->db->createTemporaryTable("ttrevisionid")) {
 				return false;
 			}
@@ -1403,6 +1403,27 @@ class SeedDMS_Core_DMS {
 			}
 			}
 			break; // }}}
+		case 'DueRevision': // Documents with a due revision, which is not started {{{
+			if (!$this->db->createTemporaryTable("ttrevisionid")) {
+				return false;
+			}
+			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+
+			$selectStr .= ", `tblDocumentContent`.`revisiondate` ";
+			$queryStr .= "WHERE `tblDocumentContent`.`revisiondate` IS NOT NULL AND `tblDocumentContent`.`revisiondate` <= ".$this->db->getCurrentDatetime()." ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_RELEASED." ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			$queryStr .= ", `tblDocumentContent`.`revisiondate` ASC";
+			break; // }}}
 		case 'WorkflowByMe': // Documents I to trigger in Worklflow {{{
 			$queryStr .= "WHERE 1=1 ";
 

From ee8802005464180041139d8ac7c1fcb33457027f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Feb 2019 12:35:18 +0100
Subject: [PATCH 1119/2006] check frequency

---
 op/op.SchedulerTaskMgr.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/op/op.SchedulerTaskMgr.php b/op/op.SchedulerTaskMgr.php
index 6904da2c7..ca0ce4ea2 100644
--- a/op/op.SchedulerTaskMgr.php
+++ b/op/op.SchedulerTaskMgr.php
@@ -95,11 +95,12 @@ else if ($action == "edittask") { /* {{{ */
 		$editedtask->setName($name);
 	if ($editedtask->getDescription() != $description)
 		$editedtask->setDescription($description);
-	$editedtask->setFrequency($frequency);
 	$editedtask->setDisabled($disabled);
 	$editedtask->setParameter($params);
-
-	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_task')));
+	if($editedtask->setFrequency($frequency))
+		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_task')));
+	else
+		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_edit_task')));
 	add_log_line(".php&action=edittask&taskid=".$taskid);
 } /* }}} */
 

From 4b7e9d9c755f740b3868e3d0242e7a2471096215 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Feb 2019 12:35:57 +0100
Subject: [PATCH 1120/2006] log run of execution

---
 utils/schedulercli.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index bf2ddeda4..1a548d172 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -57,7 +57,9 @@ if(isset($options['mode'])) {
 }
 
 include($myincpath."/inc/inc.Settings.php");
+include($myincpath."/inc/inc.LogInit.php");
 include($myincpath."/inc/inc.Init.php");
+include($myincpath."/inc/inc.Language.php");
 include($myincpath."/inc/inc.Extension.php");
 include($myincpath."/inc/inc.DBInit.php");
 include($myincpath."/inc/inc.Scheduler.php");
@@ -72,9 +74,10 @@ foreach($tasks as $task) {
 			if(method_exists($taskobj, 'execute')) {
 				if(!$task->getDisabled()) {
 					if($taskobj->execute($task, $dms)) {
+						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
 						$task->updateLastNextRun();
 					} else {
-						echo "Execution of task failed, task has been disabled\n";
+						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
 						$task->setDisabled(1);
 					}
 				}

From 6d5ce06c9f83498fa32db41f202763b1d0cb3fac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Feb 2019 12:45:39 +0100
Subject: [PATCH 1121/2006] add_log_line() be used from command line scripts
 without errors

---
 inc/inc.Utils.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index e4404c056..28459a7d3 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -343,14 +343,19 @@ function add_log_line($msg="", $priority=null) { /* {{{ */
 
 	if(!$logger) return;
 
+	$ip = "-";
 	if(!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
 		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-	else
+	elseif(!empty($_SERVER['REMOTE_ADDR']))
 		$ip = $_SERVER['REMOTE_ADDR'];
-	if($user)
-		$logger->log($user->getLogin()." (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").($msg ? ' '.$msg : ''), $priority);
+	if(!empty($_SERVER["REQUEST_URI"]))
+		$scriptname = basename($_SERVER["REQUEST_URI"], ".php");
 	else
-		$logger->log("-- (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").($msg ? ' '.$msg : ''), $priority);
+		$scriptname = basename($_SERVER["SCRIPT_NAME"], ".php");
+	if($user)
+		$logger->log($user->getLogin()." (".$ip.") ".$scriptname.($msg ? ' '.$msg : ''), $priority);
+	else
+		$logger->log("-- (".$ip.") ".$scriptname.($msg ? ' '.$msg : ''), $priority);
 } /* }}} */
 
 function _add_log_line($msg="") { /* {{{ */

From 3ccc9f51764ecfcb637be0d91494f3c0184cd981 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Feb 2019 12:46:11 +0100
Subject: [PATCH 1122/2006] add more notes for 6.0.7

---
 SeedDMS_Core/package.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 00b040a11..1b521517e 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,8 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 SeedDMS_Core_Document::getTimeline() returns revision only for latest content
+add callback onSetStatus in SeedDMS_Core_DocumentContent::setStatus()
+add new list type 'DueRevision' in SeedDMS_Core_DMS::getDocumentList()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 695c7c7c44b2a371a7a51dcf28c5e158a9d586d2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Feb 2019 12:47:03 +0100
Subject: [PATCH 1123/2006] pass initial document status to verifyStatus()

---
 op/op.SetReviewersApprovers.php | 2 +-
 op/op.SetRevisors.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php
index f895945dd..f5a4f119a 100644
--- a/op/op.SetReviewersApprovers.php
+++ b/op/op.SetReviewersApprovers.php
@@ -586,7 +586,7 @@ if (count($approvalIndex["g"]) > 0) {
 
 
 
-$content->verifyStatus(false,$user);
+$content->verifyStatus(false, $user, '', $settings->_initialDocumentStatus);
 
 add_log_line("?documentid=".$documentid);
 header("Location:../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version);
diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index e146ea215..0135c4c45 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -324,7 +324,7 @@ if (count($revisionIndex["g"]) > 0) {
 }
 
 /* Recheck status, because all revisors could have been removed */
-$content->verifyStatus(false, $user, getMLText('automatic_status_update'));
+$content->verifyStatus(false, $user, getMLText('automatic_status_update'), $settings->_initialDocumentStatus);
 
 add_log_line("?documentid=".$documentid);
 header("Location:../out/out.DocumentVersionDetail.php?documentid=".$documentid."&version=".$version);

From add79b47d1aaf5ee244265a75955bd5acc33b693 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Feb 2019 11:56:33 +0100
Subject: [PATCH 1124/2006] fix syntax error, run update of index even if
 update hook was called before

---
 controllers/class.UpdateDocument.php | 31 +++++++++-------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/controllers/class.UpdateDocument.php b/controllers/class.UpdateDocument.php
index 09d93987a..602d5eea1 100644
--- a/controllers/class.UpdateDocument.php
+++ b/controllers/class.UpdateDocument.php
@@ -69,32 +69,21 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
 					}
 				}
 
-			if($recipients['i']) {
-				foreach($recipients['i'] as $uid) {
-					if($u = $dms->getUser($uid)) {
-						$res = $contentResult->getContent()->addIndRecipient($u, $user);
+				if($recipients['i']) {
+					foreach($recipients['i'] as $uid) {
+						if($u = $dms->getUser($uid)) {
+							$res = $contentResult->getContent()->addIndRecipient($u, $user);
+						}
 					}
 				}
-			}
-			if($recipients['g']) {
-				foreach($recipients['g'] as $gid) {
-					if($g = $dms->getGroup($gid)) {
-						$res = $contentResult->getContent()->addGrpRecipient($g, $user);
+				if($recipients['g']) {
+					foreach($recipients['g'] as $gid) {
+						if($g = $dms->getGroup($gid)) {
+							$res = $contentResult->getContent()->addGrpRecipient($g, $user);
+						}
 					}
 				}
-			}
 
-			if($index) {
-				$lucenesearch = new $indexconf['Search']($index);
-				if($hit = $lucenesearch->getDocument((int) $document->getId())) {
-					$index->delete($hit->id);
-				}
-				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
-				if(!$this->callHook('preIndexDocument', $document, $idoc)) {
-				}
-
-				if(!$this->callHook('postUpdateDocument', $document, $contentResult->getContent())) {
-				}
 				$content = $contentResult->getContent();
 			} else {
 				$this->errormsg = 'error_update_document';

From ce3bb7d8ca14aa0cba935de59731f1435ebd5120 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Feb 2019 15:40:21 +0100
Subject: [PATCH 1125/2006] fix typo in variable name

---
 op/op.ReviseDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index cc4f1830f..773da2979 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -92,7 +92,7 @@ if ($_POST["revisionType"] == "grp") {
 }
 $controller->setParam('group', $group);
 $controller->setParam('comment', $_POST["comment"]);
-$controller->setParam('onevotereject', $settins->_enableRevisionOnVoteReject);
+$controller->setParam('onevotereject', $settings->_enableRevisionOnVoteReject);
 if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }

From 83e8f900e5e0179fb8261217c3f77104e77ce7ba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 11 Mar 2019 18:27:20 +0100
Subject: [PATCH 1126/2006] fix setting role

---
 SeedDMS_Core/Core/inc.ClassUser.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index f6db633c2..63714308a 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -713,7 +713,6 @@ class SeedDMS_Core_User { /* {{{ */
 	 */
 	function setRole($newrole) { /* {{{ */
 		$db = $this->_dms->getDB();
-		$newrole = intval($newrole);
 
 		if(is_object($newrole))
 			$queryStr = "UPDATE `tblUsers` SET `role` = " . $newrole->getID() . " WHERE `id` = " . $this->_id;

From fd5bfe246f01eec3af0e60342e6f0ae25a6854b3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Mar 2019 09:37:21 +0100
Subject: [PATCH 1127/2006] various minor corrections of sql statements

improves compatibility with postgres
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 6ec85ab4c..082dc67d7 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2920,7 +2920,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$timeline = array();
 
 		$lc=$this->getLatestContent();
-		$queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id . " AND	`version` = " . $lc->getVersion();
+		$queryStr = "SELECT `revisiondate`, `version` FROM `tblDocumentContent` WHERE `document` = " . $this->_id . " AND `version` = " . $lc->getVersion();
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && $resArr == false)
 			return false;
@@ -3325,9 +3325,11 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 *
 	 * @return array latest record from tblDocumentStatusLog
 	 */
-	function getStatus() { /* {{{ */
+	function getStatus($limit=1) { /* {{{ */
 		$db = $this->_document->_dms->getDB();
 
+		if (!is_numeric($limit)) return false;
+
 		// Retrieve the current overall status of the content represented by
 		// this object.
 		if (!isset($this->_status)) {
@@ -3339,7 +3341,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				"LEFT JOIN `tblDocumentStatusLog` USING (`statusID`) ".
 				"WHERE `tblDocumentStatus`.`documentID` = '". $this->_document->getID() ."' ".
 				"AND `tblDocumentStatus`.`version` = '". $this->_version ."' ".
-				"ORDER BY `tblDocumentStatusLog`.`statusLogID` DESC LIMIT 1";
+				"ORDER BY `tblDocumentStatusLog`.`statusLogID` DESC LIMIT ".(int) $limit;
 
 			$res = $db->getResultArray($queryStr);
 			if (is_bool($res) && !$res)
@@ -5418,7 +5420,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if (!$this->_workflowState) {
 			$queryStr=
-				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.`id` WHERE `a`.`id`=". $this->_workflow->getID();
+				"SELECT b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflowStates` b ON a.`state` = b.id WHERE `a`.`id`=". $this->_workflow['id'];
 			$recs = $db->getResultArray($queryStr);
 			if (is_bool($recs) && !$recs)
 				return false;
@@ -5482,7 +5484,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		if (!isset($this->_workflow)) {
 			$queryStr=
-				"SELECT a.`id` as `wdcid`, a.`parent`, b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.id WHERE a.`version`='".$this->_version
+				"SELECT a.`id` as `wdcid`, a.`parent`, b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.`id` WHERE a.`version`='".$this->_version
 				."' AND a.`document` = '". $this->_document->getID() ."' "
 				." AND a.`state` IS NOT NULL"
 				." ORDER BY `date` DESC LIMIT 1";
@@ -5974,8 +5976,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			 * the next state will be reached if one of the transitions
 			 * leading to the given state can be processed.
 			 */
-		if($nextstate->getPreCondFunc() == '') {
-			$workflow = $this->_workflow['workflow'];
+			if($nextstate->getPreCondFunc() == '') {
+				$workflow = $this->_workflow['workflow'];
 				$transitions = $workflow->getPreviousTransitions($nextstate);
 				foreach($transitions as $transition) {
 //				echo "transition ".$transition->getID()." led to state ".$nextstate->getName()."<br />";

From b953ead7963ebd1bae13c87047672bb466a46768 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Mar 2019 06:55:02 +0100
Subject: [PATCH 1128/2006] fix merge errors

---
 doc/README.Dist-Layout | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/doc/README.Dist-Layout b/doc/README.Dist-Layout
index ecdc5e214..0b58c09e2 100644
--- a/doc/README.Dist-Layout
+++ b/doc/README.Dist-Layout
@@ -78,14 +78,7 @@ In order to convert to this layout you need to do the following in the seeddms51
 directory (replace seeddms-5.1.x with you installed version of seeddms):
 
 ln -s seeddms-5.1.x seeddms
-<<<<<<< HEAD
-mv seeddms-5.1.x/conf .
-rm www
-mkdir www
-mv seeddms-5.1.x/ext www
-=======
 mv www/conf .
->>>>>>> seeddms-5.1.x
 cd www
 rm inc op out views controllers styles languages webdav restapi pdfviewer index.php
 ln -s ../seeddms/inc

From cd4eb3d11567a4d8c8c422e562be6866ae4863f8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Mar 2019 15:30:11 +0100
Subject: [PATCH 1129/2006] move code for getting version into method version()

---
 controllers/class.Download.php | 40 ++++++++++++++++------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index a7e19abe2..ad0f2be18 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -24,8 +24,25 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 
 	public function version() { /* {{{ */
 		$dms = $this->params['dms'];
-		$content = $this->params['content'];
-
+		$version = $this->params['version'];
+		$document = $this->params['document'];
+		if($version < 1) {
+			$content = $this->callHook('documentLatestContent', $document);
+			if($content === null)
+				$content = $document->getLatestContent();
+		} else {
+			$content = $this->callHook('documentContent', $document, $version);
+			if($content === null)
+				$content = $document->getContentByVersion($version);
+		}
+		if (!is_object($content)) {
+			$this->errormsg = 'invalid_version';
+			return false;
+		}
+		/* set params['content'] for compatiblity with older extensions which
+		 * expect the content in the controller
+		 */
+		$this->params['content'] = $content;
 		if(null === $this->callHook('version')) {
 			if(file_exists($dms->contentDir . $content->getPath())) {
 				header("Content-Transfer-Encoding: binary");
@@ -174,25 +191,6 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 		$dms = $this->params['dms'];
 		$type = $this->params['type'];
 
-		$version = $this->params['version'];
-		$document = $this->params['document'];
-		if($version < 1) {
-			$content = $this->callHook('documentLatestContent', $document);
-			if($content === null)
-				$content = $document->getLatestContent();
-		} else {
-			$content = $this->callHook('documentContent', $document, $version);
-			if($content === null)
-				$content = $document->getContentByVersion($version);
-		}
-		if (!is_object($content)) {
-			$this->errormsg = 'invalid_version';
-			return false;
-		}
-		/* set params['content'] for compatiblity with older extensions which
-		 * expect the content in the controller
-		 */
-		$this->params['content'] = $content;
 		switch($type) {
 			case "version":
 				return $this->version();

From d2c55cd685add9d1d505d630058c6d40b01805bc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 Apr 2019 10:13:19 +0200
Subject: [PATCH 1130/2006] fix translation string

---
 op/op.SetRevisors.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 0135c4c45..60f963da2 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -150,7 +150,7 @@ foreach ($pIndRev as $p) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 						break;
 					case -3:
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_assigned"));
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("revisor_already_assigned"));
 						break;
 					case -4:
 						// email error

From d0cf90032ff6367fa273818ffd43683308e59f65 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 4 Apr 2019 14:02:46 +0200
Subject: [PATCH 1131/2006] a revision call also be started if some of the
 revisors have already reviewed the document

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 17 +++++++++++++----
 SeedDMS_Core/package.xml                |  3 ++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 082dc67d7..a921f0f1e 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -5289,10 +5289,15 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		/* A new revision may only be started if we are not in the middle of
 		 * revision or the user/group has been removed from the workflow
 		 */
+		/* Taken out, because it happened that a revision wasn't started for each revisor
+		 * but just for some.
+		 * Checking for each revisor not being sleeping prevented a second start of the
+		 * revision for the remaining revisors still sleeping.
 		foreach($revisionStatus as $status) {
 			if($status['status'] != S_LOG_SLEEPING && $status['status'] != S_LOG_USER_REMOVED)
 				return false;
 		}
+		 */
 
 		/* Make sure all Logs will be set to the right status, in order to
 		 * prevent inconsistent states. Actually it could be a feature to
@@ -5300,6 +5305,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		 * this may not be possible.
 		 */
 		$db->startTransaction();
+		$startedrev = false;
 		foreach($revisionStatus as $status) {
 			if($status['status'] == S_LOG_SLEEPING) {
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`,
@@ -5312,12 +5318,15 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 					$db->rollbackTransaction();
 					return false;
 				}
+				$startedrev = true;
 			}
 		}
-		if(!$this->setStatus(S_IN_REVISION, "Started revision", $requestUser)) {
-			$db->rollbackTransaction();
-			return false;
-		}
+		/* Set status only if at least one revision was started */
+		if($startedrev)
+			if(!$this->setStatus(S_IN_REVISION, "Started revision", $requestUser)) {
+				$db->rollbackTransaction();
+				return false;
+			}
 		$db->commitTransaction();
 		return true;
 
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 1b521517e..3348352ea 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2018-11-23</date>
+ <date>2019-04-04</date>
  <time>07:31:17</time>
  <version>
   <release>6.0.7</release>
@@ -27,6 +27,7 @@
 SeedDMS_Core_Document::getTimeline() returns revision only for latest content
 add callback onSetStatus in SeedDMS_Core_DocumentContent::setStatus()
 add new list type 'DueRevision' in SeedDMS_Core_DMS::getDocumentList()
+a revision can also be started if some revisors have already reviewed the document
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From e2c3cbe3cfee1f99f67c2ca3f9461dcb3ac1fea5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 5 Apr 2019 13:23:38 +0200
Subject: [PATCH 1132/2006] do  not show update user for revisions in status 0

---
 CHANGELOG                              | 3 +++
 views/bootstrap/class.ViewDocument.php | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b94525268..c20d3ac0b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,9 @@
 - fix editing of document attachments
 - make receipt summary look like approval/review summary
 - merge changes up to 5.1.10
+- do not show the updating user in a revision workflow if the status is 0
+  this is misleading because the user starting the revision workflow is the one
+  first accessing the document
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.6
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 95474a084..ddbce2d4c 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1430,8 +1430,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<td>".$reqName."</td>\n";
 					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
 					/* $updateUser is the user who has done the revision */
-					$updateUser = $dms->getUser($r["userID"]);
-					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
+					if($r['status'] != 0) {
+						$updateUser = $dms->getUser($r["userID"]);
+						print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li>";
+					}
+					print "</ul></td>";
 					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
 					print "<td>".getRevisionStatusText($r["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";

From f5505e85b203866e431a4b4c6ce39299d078f546 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Apr 2019 10:51:31 +0200
Subject: [PATCH 1133/2006] order documents in tree by name

---
 views/bootstrap/class.DocumentChooser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.DocumentChooser.php b/views/bootstrap/class.DocumentChooser.php
index d4359890b..d3d5da5f0 100644
--- a/views/bootstrap/class.DocumentChooser.php
+++ b/views/bootstrap/class.DocumentChooser.php
@@ -37,7 +37,7 @@ class SeedDMS_View_DocumentChooser extends SeedDMS_Bootstrap_Style {
 		$partialtree = $this->params['partialtree'];
 
 		header('Content-Type: application/javascript');
-		$this->printNewTreeNavigationJs($folder->getID(), M_READ, 1, $form, 0, '', $partialtree);
+		$this->printNewTreeNavigationJs($folder->getID(), M_READ, 1, $form, 0, 'n', $partialtree);
 	} /* }}} */
 
 	function show() { /* {{{ */

From 469370cb428d25cb66eedf5e75427e2163450174 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Apr 2019 10:51:51 +0200
Subject: [PATCH 1134/2006] new config option enableReceiptReject

enables rejection of receipts
---
 inc/inc.ClassSettings.php                 | 10 +++++++---
 op/op.Settings.php                        |  1 +
 out/out.ReceiptDocument.php               |  1 +
 views/bootstrap/class.ReceiptDocument.php |  5 +++++
 views/bootstrap/class.Settings.php        |  1 +
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 99aeb2a69..b6c1a9ba3 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -186,6 +186,8 @@ class Settings { /* {{{ */
 	var $_workflowMode = "traditional";
 	// enable/disable acknowledge workflow
 	var $_enableReceiptWorkflow = true;
+	// enable/disable reject of reception
+	var $_enableReceiptReject = false;
 	// enable/disable revision workflow
 	var $_enableRevisionWorkflow = true;
 	// enable/disable revision on vote reject
@@ -701,9 +703,10 @@ class Settings { /* {{{ */
 			$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]);
 			$this->_versioningFileName = strval($tab["versioningFileName"]);
 			$this->_workflowMode = strval($tab["workflowMode"]);
-			$this->_enableReceiptWorkflow = strval($tab["enableReceiptWorkflow"]);
-			$this->_enableRevisionWorkflow = strval($tab["enableRevisionWorkflow"]);
-			$this->_enableRevisionOnVoteReject = strval($tab["enableRevisionOnVoteReject"]);
+			$this->_enableReceiptWorkflow = Settings::boolval($tab["enableReceiptWorkflow"]);
+			$this->_enableReceiptReject = Settings::boolval($tab["enableReceiptReject"]);
+			$this->_enableRevisionWorkflow = Settings::boolval($tab["enableRevisionWorkflow"]);
+			$this->_enableRevisionOnVoteReject = Settings::boolval($tab["enableRevisionOnVoteReject"]);
 			$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
 			$this->_allowChangeRevAppInProcess = Settings::boolval($tab["allowChangeRevAppInProcess"]);
 			$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
@@ -1032,6 +1035,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName);
     $this->setXMLAttributValue($node, "workflowMode", $this->_workflowMode);
     $this->setXMLAttributValue($node, "enableReceiptWorkflow", $this->_enableReceiptWorkflow);
+    $this->setXMLAttributValue($node, "enableReceiptReject", $this->_enableReceiptReject);
     $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
     $this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject);
     $this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index ce1c9e803..34cf27561 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -185,6 +185,7 @@ if ($action == "saveSettings")
   $settings->_initialDocumentStatus = $_POST["initialDocumentStatus"];
   $settings->_workflowMode = $_POST["workflowMode"];
   $settings->_enableReceiptWorkflow = getBoolValue("enableReceiptWorkflow");
+  $settings->_enableReceiptReject = getBoolValue("enableReceiptReject");
   $settings->_enableRevisionWorkflow = getBoolValue("enableRevisionWorkflow");
   $settings->_enableRevisionOnVoteReject = getBoolValue("enableRevisionOnVoteReject");
   $settings->_allowReviewerOnly = getBoolValue("allowReviewerOnly");
diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php
index cf6f3f955..be568e690 100644
--- a/out/out.ReceiptDocument.php
+++ b/out/out.ReceiptDocument.php
@@ -78,6 +78,7 @@ if($view) {
 	$view->setParam('document', $document);
 	$view->setParam('version', $content);
 	$view->setParam('accessobject', $accessop);
+	$view->setParam('receiptreject', $settings->_enableReceiptReject);
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index 46ccdc353..534de2dcb 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -93,6 +93,7 @@ $(document).ready(function() {
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
 		$content = $this->params['version'];
+		$receiptreject = $this->params['receiptreject'];
 
 		$receipts = $content->getReceiptStatus();
 		foreach($receipts as $receipt) {
@@ -135,6 +136,7 @@ $(document).ready(function() {
 				<textarea name="comment" cols="80" rows="4"></textarea>
 			</div>
 		</div>
+<?php if($receiptreject) { ?>
 		<div class="control-group">
 			<label class="control-label"><?php printMLText("receipt_status");?>:</label>
 			<div class="controls">
@@ -148,6 +150,9 @@ $(document).ready(function() {
 				</select>
 			</div>
 		</div>
+<?php } else { ?>
+		<input type="hidden" name="receiptStatus" value="1" />
+<?php } ?>
 		<div class="controls">
 			<input type='submit' class="btn" name='<?= $receipttype ?>Receipt' value='<?php printMLText("submit_receipt")?>'/>
 		<div>
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index be70fd429..981a21338 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -431,6 +431,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigHeadline('settings_Edition'); ?>
 <?php $this->showConfigOption('settings_workflowMode', 'workflowMode', array('traditional'=>'settings_workflowMode_valtraditional', 'traditional_only_approval'=>'settings_workflowMode_valtraditional_only_approval', 'advanced'=>'settings_workflowMode_valadvanced'), false, true); ?>
 <?php $this->showConfigCheckbox('settings_enableReceiptWorkflow', 'enableReceiptWorkflow'); ?>
+<?php $this->showConfigCheckbox('settings_enableReceiptReject', 'enableReceiptReject'); ?>
 <?php $this->showConfigCheckbox('settings_enableRevisionWorkflow', 'enableRevisionWorkflow'); ?>
 <?php $this->showConfigCheckbox('settings_enableRevisionOnVoteReject', 'enableRevisionOnVoteReject'); ?>
 <?php $this->showConfigText('settings_versioningFileName', 'versioningFileName'); ?>

From 570dc9ca7146fe22c15ae0f4163aa40a77e6b4cf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Apr 2019 11:20:00 +0200
Subject: [PATCH 1135/2006] new items for 6.0.7

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c20d3ac0b..e3a6ba785 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,9 @@
 - do not show the updating user in a revision workflow if the status is 0
   this is misleading because the user starting the revision workflow is the one
   first accessing the document
+- rejection of document receipts are turned off by default, but can be turned
+  on in the settings
+- documents in DocumentChooser are sorted by name
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.6

From 7ceb0e9718dd14a3dd095e5a24862ab3be0d1806 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Apr 2019 08:54:25 +0200
Subject: [PATCH 1136/2006] may not edit reception if rejecting a reception is
 turned off

---
 out/out.ViewDocument.php               | 1 +
 views/bootstrap/class.ViewDocument.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index 5adefe425..8d9387628 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -81,6 +81,7 @@ if($view) {
 	$view->setParam('enablerevisionworkflow', $settings->_enableRevisionWorkflow);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
 	$view->setParam('enableownerreceipt', $settings->_enableOwnerReceipt);
+	$view->setParam('enablereceiptreject', $settings->_enableReceiptReject);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index ddbce2d4c..db2967332 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -443,6 +443,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableownerreceipt = $this->params['enableownerreceipt'];
 		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+		$enablereceiptreject = $this->params['enablereceiptreject'];
 		$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
 		$workflowmode = $this->params['workflowmode'];
 		$cachedir = $this->params['cachedir'];
@@ -1318,7 +1319,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						if ($is_recipient) {
 							if($r["status"]==0) {
 								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."</li>";
-							} elseif ($accessop->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))) {
+							} elseif ($accessop->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1 && $enablereceiptreject)||($r["status"]==-1))) {
 								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 							}
 						}

From 768ff5acb1d3b22c410d5601b7828aa9893a5c58 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Jul 2019 21:36:22 +0200
Subject: [PATCH 1137/2006] update entry for 5.1.12

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index b6f8a352e..d8b20d350 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@
 --------------------------------------------------------------------------------
 - fix editing of document attachments
 - make receipt summary look like approval/review summary
-- merge changes up to 5.1.10
+- merge changes up to 5.1.12
 - do not show the updating user in a revision workflow if the status is 0
   this is misleading because the user starting the revision workflow is the one
   first accessing the document

From 88168d005ee9a7619c8853894223fcac7e9c4891 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Sep 2019 14:32:14 +0200
Subject: [PATCH 1138/2006] take over some changes from 5.1.x

---
 CHANGELOG                             |  16 +-
 inc/inc.ClassAccessOperation.php      |  36 ++---
 inc/inc.ClassViewCommon.php           |  17 +-
 inc/inc.Extension.php                 |  14 +-
 op/op.CreateDump.php                  |   9 +-
 op/op.CreateFolderArchive.php         |  12 +-
 op/op.Download.php                    |  22 ++-
 out/out.DocumentChooser.php           |  28 +++-
 views/bootstrap/class.BackupTools.php | 220 +++++++++++++-------------
 views/bootstrap/class.Bootstrap.php   |  87 ++++++----
 10 files changed, 264 insertions(+), 197 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4364a5903..91201f6d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -116,6 +116,18 @@
 - add document list which can be exported as an archive
 - search results can be exported
 
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.13
+--------------------------------------------------------------------------------
+- make use of backup dir, do not allow backup if backup dir is not set
+- the referer parameter in op/op.Settings.php is turned into an url before used
+  for redirect
+- Import from filesystem can read a file with metadata
+- drop folder chooser can be put multiple times on a page
+- add section in README.Install.md on how to secure the configuration
+- fix php error when removing a version of a document
+- major rework of ViewFolder page, most parts of the page are now loaded by ajax
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.12
 --------------------------------------------------------------------------------
@@ -145,10 +157,10 @@
 --------------------------------------------------------------------------------
 - fix for CVE-2019-12744 (Remote Command Execution through unvalidated
   file upload), add .htaccess file to data directory, better documentation
-       for installing seeddms
+  for installing seeddms
 - fix for CVE-2019-12745 (Persistent or Stored XSS in UsrMgr) and
   CVE-2019-12801 (Persistent or Stored XSS in GroupMgr), propperly escape
-       strings used in Select2 js library used by UsrMgr and GroupMgr
+  strings used in Select2 js library used by UsrMgr and GroupMgr
 - do not show attributes in search results in extra column anymore
 - fix setting language during login (Closes #437)
 - fix indexing documents even if no preIndexDocument hook is set (Closes #437)
diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 492be5f20..230a7ae74 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -27,7 +27,7 @@ class SeedDMS_AccessOperation {
 	 * @var object $dms reference to dms
 	 * @access protected
 	 */
-	protected $dms;
+	private $dms;
 
 	/**
 	 * @var object $user user requesting the access
@@ -63,7 +63,7 @@ class SeedDMS_AccessOperation {
 	 * even if is disallowed in the settings.
 	 */
 	function mayEditVersion($document, $vno=0) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($vno)
 				$version = $document->getContentByVersion($vno);
 			else
@@ -87,7 +87,7 @@ class SeedDMS_AccessOperation {
 	 * even if is disallowed in the settings.
 	 */
 	function mayRemoveVersion($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			$versions = $document->getContent();
 			if ((($this->settings->_enableVersionDeletion && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin() ) && (count($versions) > 1)) {
 				return true;
@@ -107,7 +107,7 @@ class SeedDMS_AccessOperation {
 	 * even if is disallowed in the settings.
 	 */
 	function mayOverrideStatus($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_REJECTED || $status["status"]==S_OBSOLETE || $status["status"]==S_NEEDS_CORRECTION)) {
@@ -130,7 +130,7 @@ class SeedDMS_AccessOperation {
 	 * explicitly allows it.
 	 */
 	function maySetReviewersApprovers($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				$reviewstatus = $latestContent->getReviewStatus();
@@ -163,7 +163,7 @@ class SeedDMS_AccessOperation {
 	 * settings.
 	 */
 	function maySetRecipients($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				if (($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) {
@@ -184,7 +184,7 @@ class SeedDMS_AccessOperation {
 	 * settings.
 	 */
 	function maySetRevisors($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
@@ -205,7 +205,7 @@ class SeedDMS_AccessOperation {
 	 * settings.
 	 */
 	function maySetWorkflow($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$workflow = $latestContent->getWorkflow();
 				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (!$workflow || ($workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
@@ -223,7 +223,7 @@ class SeedDMS_AccessOperation {
 	 * expiration date is only allowed if the document has not been obsoleted.
 	 */
 	function maySetExpires($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				if ((($document->getAccessMode($this->user) >= M_READWRITE) || $this->user->isAdmin()) && ($status["status"]!=S_OBSOLETE)) {
@@ -244,7 +244,7 @@ class SeedDMS_AccessOperation {
 	 * disallowed in the settings.
 	 */
 	function mayEditComment($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($document->isLocked()) {
 				$lockingUser = $document->getLockingUser();
 				if (($lockingUser->getID() != $this->user->getID()) && ($document->getAccessMode($this->user) != M_ALL)) {
@@ -271,7 +271,7 @@ class SeedDMS_AccessOperation {
 	 * disallowed in the settings.
 	 */
 	function mayEditAttributes($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				$workflow = $latestContent->getWorkflow();
@@ -291,7 +291,7 @@ class SeedDMS_AccessOperation {
 	 * account here.
 	 */
 	function mayReview($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				if ($document->getAccessMode($this->user) >= M_READ && $status["status"]==S_DRAFT_REV) {
@@ -309,7 +309,7 @@ class SeedDMS_AccessOperation {
 	 * review and if it is allowed in the settings
 	 */
 	function mayUpdateReview($document, $updateUser) { /* {{{ */
-		if(get_class($document) == 'SeedDMS_Core_Document') {
+		if($this->obj->isType('document')) {
 			if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && $document->getAccessMode($this->user) >= M_READ && !$document->hasExpired()) {
 				return true;
 			}
@@ -324,7 +324,7 @@ class SeedDMS_AccessOperation {
 	 * approval and if it is allowed in the settings
 	 */
 	function mayUpdateApproval($document, $updateUser) { /* {{{ */
-		if(get_class($document) == 'SeedDMS_Core_Document') {
+		if($this->obj->isType('document')) {
 			if($this->settings->_enableUpdateRevApp && ($updateUser == $this->user) && $document->getAccessMode($this->user) >= M_READ && !$document->hasExpired()) {
 				return true;
 			}
@@ -342,7 +342,7 @@ class SeedDMS_AccessOperation {
 	 * account here.
 	 */
 	function mayApprove($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				if ($document->getAccessMode($this->user) >= M_READ && $status["status"]==S_DRAFT_APP) {
@@ -361,7 +361,7 @@ class SeedDMS_AccessOperation {
 	 * account here.
 	 */
 	function mayReceipt($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				if ($document->getAccessMode($this->user) >= M_READ && $status["status"]==S_RELEASED) {
@@ -379,7 +379,7 @@ class SeedDMS_AccessOperation {
 	 * review and if it is allowed in the settings
 	 */
 	function mayUpdateReceipt($document, $updateUser) { /* {{{ */
-		if(get_class($document) == 'SeedDMS_Core_Document') {
+		if($this->obj->isType('document')) {
 			if($this->settings->_enableUpdateReceipt && ($updateUser == $this->user) && $document->getAccessMode($this->user) >= M_READ && !$document->hasExpired()) {
 				return true;
 			}
@@ -395,7 +395,7 @@ class SeedDMS_AccessOperation {
 	 * account here.
 	 */
 	function mayRevise($document) { /* {{{ */
-		if(get_class($document) == $this->dms->getClassname('document')) {
+		if($this->obj->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				if ($document->getAccessMode($this->user) >= M_READ && $status["status"]!=S_OBSOLETE) {
diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index faf097541..73203d106 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -43,6 +43,7 @@ class SeedDMS_View_Common {
 	}
 
 	public function __invoke($get=array()) {
+		$this->callHook('preRun', isset($get['action']) ? $get['action'] : 'show');
 		if(isset($get['action']) && $get['action']) {
 			if(method_exists($this, $get['action'])) {
 				$this->{$get['action']}();
@@ -51,6 +52,7 @@ class SeedDMS_View_Common {
 			}
 		} else
 			$this->show();
+		$this->callHook('postRun', isset($get['action']) ? $get['action'] : 'show');
 	}
 
 	public function setParams($params) {
@@ -97,10 +99,17 @@ class SeedDMS_View_Common {
 	 * function returns
 	 */
 	public function callHook($hook) { /* {{{ */
+		$tmps = array();
 		$tmp = explode('_', get_class($this));
+		$tmps[] = $tmp[2];
+		$tmp = explode('_', get_parent_class($this));
+		$tmps[] = $tmp[2];
+		/* Run array_unique() in case the parent class has the same suffix */
+		$tmps = array_unique($tmps);
 		$ret = null;
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp[2])] as $hookObj) {
+		foreach($tmps as $tmp)
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp)])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['view'][lcfirst($tmp)] as $hookObj) {
 				if (method_exists($hookObj, $hook)) {
 					switch(func_num_args()) {
 						case 1:
@@ -252,12 +261,12 @@ class SeedDMS_View_Common {
 		return $tag;
 	} /* }}} */
 
-	public function jsTranslations($keys) {
+	public function jsTranslations($keys) { /* {{{ */
 		echo "var trans = {\n";
 		foreach($keys as $key) {
 			echo "	'".$key."': '".str_replace("'", "\\\'", getMLText($key))."',\n";
 		}
 		echo "};\n";
-	}
+	} /* }}} */
 }
 ?>
diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php
index b0e915333..f6fcc23f0 100644
--- a/inc/inc.Extension.php
+++ b/inc/inc.Extension.php
@@ -32,12 +32,14 @@ foreach($EXT_CONF as $extname=>$extconf) {
 		}
 	}
 	if(!isset($extconf['disable']) || $extconf['disable'] == false) {
-		$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
-		if(file_exists($classfile)) {
-			include($classfile);
-			$obj = new $extconf['class']['name'];
-			if(method_exists($obj, 'init'))
-				$obj->init(isset($settings->_extensions[$extname]) ? $settings->_extensions[$extname] : null);
+		if(isset($extconf['class']) && isset($extconf['class']['file']) && isset($extconf['class']['name'])) {
+			$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
+			if(file_exists($classfile)) {
+				include($classfile);
+				$obj = new $extconf['class']['name'];
+				if(method_exists($obj, 'init'))
+					$obj->init(isset($settings->_extensions[$extname]) ? $settings->_extensions[$extname] : null);
+			}
 		}
 		if(isset($extconf['language']['file'])) {
 			$langfile = $settings->_rootDir."/ext/".$extname."/".$extconf['language']['file'];
diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php
index 4859d7f18..f96fe84af 100644
--- a/op/op.CreateDump.php
+++ b/op/op.CreateDump.php
@@ -31,13 +31,12 @@ if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
-if($settings->_backupDir && file_exists($settings->_backupDir))
-	$basedir = $settings->_backupDir;
-else
-	$basedir = $settings->_contentDir;
+if (!$settings->_backupDir) {
+	UI::exitError(getMLText("admin_tools"),getMLText("no_backup_dir"));
+}
 
 $v = new SeedDMS_Version;
-$dump_name = $basedir.date('Y-m-d\TH-i-s')."_".$v->_number.".sql";
+$dump_name = addDirSep($settings->_backupDir).date('Y-m-d\TH-i-s')."_".$v->_number.".sql";
 if(!$dms->createDump($dump_name))
 	UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 
diff --git a/op/op.CreateFolderArchive.php b/op/op.CreateFolderArchive.php
index 4877738ad..07c1cb112 100644
--- a/op/op.CreateFolderArchive.php
+++ b/op/op.CreateFolderArchive.php
@@ -167,14 +167,14 @@ if (!is_object($folder)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("invalid_folder_id"));
 }
 
+if (!$settings->_backupDir) {
+	UI::exitError(getMLText("admin_tools"),getMLText("no_backup_dir"));
+}
+
 $human_readable = (isset($_GET["human_readable"]) && $_GET["human_readable"]==1 ? true : false);
 
-if($settings->_backupDir && file_exists($settings->_backupDir))
-	$basedir = $settings->_backupDir;
-else
-	$basedir = $settings->_contentDir;
-if ($human_readable)$ark_name = $basedir.time()."_".$folderid."_HR.tar";
-else $ark_name = $basedir.time()."_".$folderid.".tar";
+if ($human_readable)$ark_name = addDirSep($settings->_backupDir).time()."_".$folderid."_HR.tar";
+else $ark_name = addDirSep($settings->_backupDir).time()."_".$folderid.".tar";
 
 $ark = fopen($ark_name,"w");
 
diff --git a/op/op.Download.php b/op/op.Download.php
index 9124536c0..8451136e3 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -119,16 +119,12 @@ elseif (isset($_GET["arkname"])) { /* {{{ */
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
-	if($settings->_backupDir && file_exists($settings->_backupDir))
-		$basedir = $settings->_backupDir;
-	else
-		$basedir = $settings->_contentDir;
-
-	if (!file_exists($basedir.$filename) ) {
+	$backupdir = addDirSep($settings->_backupDir);
+	if (!file_exists($backupdir.$filename) ) {
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
 
-	$controller->setParam('basedir', $basedir);
+	$controller->setParam('basedir', $backupdir);
 	$controller->setParam('file', $filename);
 	$controller->archive();
 } /* }}} */
@@ -192,16 +188,16 @@ elseif (isset($_GET["dumpname"])) { /* {{{ */
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
-	if($settings->_backupDir && file_exists($settings->_backupDir))
-		$basedir = $settings->_backupDir;
-	else
-		$basedir = $settings->_contentDir;
+	$backupdir = addDirSep($settings->_backupDir);
+	if (!$backupdir) {
+		UI::exitError(getMLText("admin_tools"),getMLText("no_backup_dir"));
+	}
 
-	if (!file_exists($basedir.$filename) ) {
+	if (!file_exists($backupdir.$filename) ) {
 		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
 
-	$controller->setParam('basedir', $basedir);
+	$controller->setParam('basedir', $backupdir);
 	$controller->setParam('file', $filename);
 	$controller->sqldump();
 } /* }}} */
diff --git a/out/out.DocumentChooser.php b/out/out.DocumentChooser.php
index fe14f1042..ba9174ed5 100644
--- a/out/out.DocumentChooser.php
+++ b/out/out.DocumentChooser.php
@@ -29,19 +29,33 @@ require_once("inc/inc.DBInit.php");
 require_once("inc/inc.ClassUI.php");
 require_once("inc/inc.Authentication.php");
 
-$folderid = intval($_GET["folderid"]);
-$form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]);
+if(isset($_GET['action']) && $_GET['action'] == 'subtree') {
+	if (!isset($_GET["node"]) || !is_numeric($_GET["node"]) || intval($_GET["node"])<1) {
+		$nodeid = $settings->_rootFolderID;
+	} else {
+		$nodeid = intval($_GET["node"]);
+	}
 
-if(isset($_GET['partialtree'])) {
-	$partialtree = intval($_GET['partialtree']);
+	$node = $dms->getFolder($nodeid);
+	if (!is_object($node)) {
+		UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))), getMLText("invalid_folder_id"));
+	}
 } else {
-	$partialtree = 0;
+	$folderid = intval($_GET["folderid"]);
+	$folder = $dms->getFolder($folderid);
+	$form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]);
 }
-$folder = $dms->getFolder($folderid);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'form'=>$form, 'partialtree'=>$partialtree));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
+	if(isset($_GET['action']) && $_GET['action'] == 'subtree') {
+		$view->setParam('node', $node);
+		$view->setParam('orderby', $settings->_sortFoldersDefault);
+	} else {
+		$view->setParam('folder', $folder);
+		$view->setParam('form', $form);
+	}
 	$view($_GET);
 	exit;
 }
diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php
index 2d28b42b0..62a31761c 100644
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@@ -75,124 +75,128 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 
 		// archive creation ////////////////////////////////////////////////////////////
 
-		$this->contentHeading(getMLText("archive_creation"));
-		print "<p>".getMLText("archive_creation_warning")."</p>\n";
-		$this->contentContainerStart();
-		if($accessop->check_controller_access('CreateFolderArchive', array('action'=>'run'))) {
-			print "<form action=\"../op/op.CreateFolderArchive.php\" name=\"form2\">";
-			$this->printFolderChooserHtml("form2",M_READWRITE);
-			print "<label class=\"checkbox\"><input type=\"checkbox\" name=\"human_readable\" value=\"1\">".getMLText("human_readable")."</label>";
-			print "<input type='submit' class='btn' name='' value='".getMLText("archive_creation")."'/>";
-			print "</form>\n";
-		}
-
-		// list backup files
-
-		$handle = opendir($backupdir);
-		$entries = array();
-		while ($e = readdir($handle)){
-			if (is_dir($backupdir.$e)) continue;
-			if (strpos($e,".tar.gz")==FALSE) continue;
-			$entries[] = $e;
-		}
-		closedir($handle);
-
-		sort($entries);
-		$entries = array_reverse($entries);
-
-		if($entries) {
-			$this->contentSubHeading(getMLText("backup_list"));
-			print "<table class=\"table-condensed\">\n";
-			print "<thead>\n<tr>\n";
-			print "<th></th>\n";
-			print "<th>".getMLText("folder")."</th>\n";
-			print "<th>".getMLText("creation_date")."</th>\n";
-			print "<th>".getMLText("file_size")."</th>\n";
-			print "<th></th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			foreach ($entries as $entry){
-
-				$folderid=substr($entry,strpos($entry,"_")+1);
-				$folder=$dms->getFolder((int)$folderid);
-						
-				print "<tr>\n";
-				print "<td>";
-				if($accessop->check_controller_access('Download', array('action'=>'archive')))
-					print "<a href=\"../op/op.Download.php?arkname=".$entry."\">".$entry."</a>";
-				else
-					print $entry;
-				print "</td>\n";
-				if (is_object($folder)) print "<td>".htmlspecialchars($folder->getName())."</td>\n";
-				else print "<td>".getMLText("unknown_id")."</td>\n";
-				print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
-				print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
-				print "<td>";
-				if($accessop->check_controller_access('RemoveArchive', array('action'=>'run')))
-					print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
-				print "</td>\n";	
-				print "</tr>\n";
+		if($this->params['hasbackupdir']) {
+			$this->contentHeading(getMLText("archive_creation"));
+			print "<p>".getMLText("archive_creation_warning")."</p>\n";
+			$this->contentContainerStart();
+			if($accessop->check_controller_access('CreateFolderArchive', array('action'=>'run'))) {
+				print "<form action=\"../op/op.CreateFolderArchive.php\" name=\"form2\">";
+				$this->printFolderChooserHtml("form2",M_READWRITE);
+				print "<label class=\"checkbox\"><input type=\"checkbox\" name=\"human_readable\" value=\"1\">".getMLText("human_readable")."</label>";
+				print "<input type='submit' class='btn' name='' value='".getMLText("archive_creation")."'/>";
+				print "</form>\n";
 			}
-			print "</table>\n";
-		}
 
-		$this->contentContainerEnd();
+			// list backup files
 
-		// dump creation ///////////////////////////////////////////////////////////////
+			$handle = opendir($backupdir);
+			$entries = array();
+			while ($e = readdir($handle)){
+				if (is_dir($backupdir.$e)) continue;
+				if (strpos($e,".tar.gz")==FALSE) continue;
+				$entries[] = $e;
+			}
+			closedir($handle);
 
-		$this->contentHeading(getMLText("dump_creation"));
-		print "<p>".getMLText("dump_creation_warning")."</p>\n";
-		$this->contentContainerStart();
+			sort($entries);
+			$entries = array_reverse($entries);
 
-		if($accessop->check_controller_access('CreateDump', array('action'=>'run'))) {
+			if($entries) {
+				$this->contentSubHeading(getMLText("backup_list"));
+				print "<table class=\"table-condensed\">\n";
+				print "<thead>\n<tr>\n";
+				print "<th></th>\n";
+				print "<th>".getMLText("folder")."</th>\n";
+				print "<th>".getMLText("creation_date")."</th>\n";
+				print "<th>".getMLText("file_size")."</th>\n";
+				print "<th></th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+
+				foreach ($entries as $entry){
+
+					$folderid=substr($entry,strpos($entry,"_")+1);
+					$folder=$dms->getFolder((int)$folderid);
+							
+					print "<tr>\n";
+					print "<td>";
+					if($accessop->check_controller_access('Download', array('action'=>'archive')))
+						print "<a href=\"../op/op.Download.php?arkname=".$entry."\">".$entry."</a>";
+					else
+						print $entry;
+					print "</td>\n";
+					if (is_object($folder)) print "<td>".htmlspecialchars($folder->getName())."</td>\n";
+					else print "<td>".getMLText("unknown_id")."</td>\n";
+					print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
+					print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
+					print "<td>";
+					if($accessop->check_controller_access('RemoveArchive', array('action'=>'run')))
+						print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
+					print "</td>\n";	
+					print "</tr>\n";
+				}
+				print "</table>\n";
+			}
+
+			$this->contentContainerEnd();
+
+			// dump creation ///////////////////////////////////////////////////////////////
+
+			$this->contentHeading(getMLText("dump_creation"));
+			print "<p>".getMLText("dump_creation_warning")."</p>\n";
+			$this->contentContainerStart();
+
+			if($accessop->check_controller_access('CreateDump', array('action'=>'run'))) {
 			print "<form action=\"../op/op.CreateDump.php\" name=\"form4\">";
 			print "<input type='submit' class='btn' name='' value='".getMLText("dump_creation")."'/>";
 			print "</form>\n";
-		}
-
-		// list backup files
-		$handle = opendir($backupdir);
-		$entries = array();
-		while ($e = readdir($handle)){
-			if (is_dir($backupdir.$e)) continue;
-			if (strpos($e,".sql.gz")==FALSE) continue;
-			$entries[] = $e;
-		}
-		closedir($handle);
-
-		sort($entries);
-		$entries = array_reverse($entries);
-
-		if($entries) {
-			$this->contentSubHeading(getMLText("dump_list"));
-			print "<table class=\"table-condensed\">\n";
-			print "<thead>\n<tr>\n";
-			print "<th></th>\n";
-			print "<th>".getMLText("creation_date")."</th>\n";
-			print "<th>".getMLText("file_size")."</th>\n";
-			print "<th></th>\n";
-			print "</tr>\n</thead>\n<tbody>\n";
-
-			foreach ($entries as $entry){
-				print "<tr>\n";
-				print "<td>";
-				if($accessop->check_controller_access('Download', array('action'=>'sqldump')))
-					print "<a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a>";
-				else
-					print $entry;
-				print "</td>\n";
-				print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
-				print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
-				print "<td>";
-				if($accessop->check_controller_access('RemoveDump', array('action'=>'run')))
-					print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
-				print "</td>\n";	
-				print "</tr>\n";
 			}
-			print "</table>\n";
-		}
 
-		$this->contentContainerEnd();
+			// list backup files
+			$handle = opendir($backupdir);
+			$entries = array();
+			while ($e = readdir($handle)){
+				if (is_dir($backupdir.$e)) continue;
+				if (strpos($e,".sql.gz")==FALSE) continue;
+				$entries[] = $e;
+			}
+			closedir($handle);
+
+			sort($entries);
+			$entries = array_reverse($entries);
+
+			if($entries) {
+				$this->contentSubHeading(getMLText("dump_list"));
+				print "<table class=\"table-condensed\">\n";
+				print "<thead>\n<tr>\n";
+				print "<th></th>\n";
+				print "<th>".getMLText("creation_date")."</th>\n";
+				print "<th>".getMLText("file_size")."</th>\n";
+				print "<th></th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+
+				foreach ($entries as $entry){
+					print "<tr>\n";
+					print "<td>";
+					if($accessop->check_controller_access('Download', array('action'=>'sqldump')))
+						print "<a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a>";
+					else
+						print $entry;
+					print "</td>\n";
+					print "<td>".getLongReadableDate(filectime($backupdir.$entry))."</td>\n";
+					print "<td>".SeedDMS_Core_File::format_filesize(filesize($backupdir.$entry))."</td>\n";
+					print "<td>";
+					if($accessop->check_controller_access('RemoveDump', array('action'=>'run')))
+						print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
+					print "</td>\n";	
+					print "</tr>\n";
+				}
+				print "</table>\n";
+			}
+
+			$this->contentContainerEnd();
+		} else {
+			$this->warningMsg(getMLText('no_backup_dir'));
+		}
 
 		// files deletion //////////////////////////////////////////////////////////////
 		/*
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 328f1e6f2..458d169ad 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -168,6 +168,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo '<script src="../styles/'.$this->theme.'/application.js"></script>'."\n";
 		if($this->params['enablemenutasks'] && isset($this->params['user']) && $this->params['user']) {
 			$this->addFooterJS('checkTasks();');
+			$this->addFooterJS('updateDropFolder();');
 		}
 		if($this->footerjs) {
 			$jscode = "$(document).ready(function () {\n";
@@ -198,6 +199,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		header('Content-Type: application/javascript');
 		echo "var seeddms_absbaseprefix=\"".$this->params['absbaseprefix']."\";\n";
 		echo "var seeddms_webroot=\"".$this->params['settings']->_httpRoot."\";\n";
+		echo "var seeddms_folder=1;\n";
 	} /* }}} */
 
 	function footerjs() { /* {{{ */
@@ -431,7 +433,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if($this->params['dropfolderdir'] && $this->params['enabledropfolderlist']) {
 				echo "   <div id=\"menu-dropfolder\">";
 				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"DropFolderChooser\" data-action=\"menuList\"";
-				if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder')))
+				if ($folder!=null && is_object($folder) && $folder->isType('folder'))
 					echo " data-query=\"folderid=".$folder->getID()."\"";
 				echo "></div>";
 				echo "   </div>";
@@ -458,7 +460,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			}
 			echo "   </ul>\n";
 			echo "     <form action=\"../out/out.Search.php\" class=\"form-inline navbar-search pull-left\" autocomplete=\"off\">";
-			if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) {
+			if ($folder!=null && is_object($folder) && $folder->isType('folder')) {
 				echo "      <input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\" />";
 			}
 			echo "      <input type=\"hidden\" name=\"navBar\" value=\"1\" />";
@@ -563,7 +565,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	private function folderNavigationBar($folder) { /* {{{ */
 		$dms = $this->params['dms'];
-		if (!is_object($folder) || strcasecmp(get_class($folder), $dms->getClassname('folder'))) {
+		if (!is_object($folder) || !$folder->isType('folder')) {
 			echo "<ul class=\"nav\">\n";
 			echo "</ul>\n";
 			return;
@@ -1190,7 +1192,7 @@ $(document).ready(function() {
 			<div class="input-append">
 				<input type="text" class="form-control" readonly>
 				<span class="btn btn-default btn-file">
-					'.getMLText("browse").'&hellip; <input id="'.$id.'" type="file" name="'.$varname.'"'.($multiple ? " multiple" : "").($accept ? ' accept="'.$accept.'"' : "").'">
+					'.getMLText("browse").'&hellip; <input id="'.$id.'" type="file" name="'.$varname.'"'.($multiple ? " multiple" : "").($accept ? ' accept="'.$accept.'"' : "").'>
 				</span>
 			</div>
 		</div>
@@ -1580,7 +1582,7 @@ $(document).ready(function() {
 		$content =  "<div class=\"input-append\">\n";
 		$content .= "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfilename".$formName."\"><i class=\"icon-remove\"></i></button>";
-		$content .= "<a data-target=\"#dropfolderChooser\" href=\"../out/out.DropFolderChooser.php?form=form1&dropfolderfile=".urlencode($dropfolderfile)."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
+		$content .= "<a data-target=\"#dropfolderChooser\" href=\"../out/out.DropFolderChooser.php?form=".$formName."&dropfolderfile=".urlencode($dropfolderfile)."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
 		$content .= "</div>\n";
 		$content .= '
 <div class="modal hide" id="dropfolderChooser" tabindex="-1" role="dialog" aria-labelledby="dropfolderChooserLabel" aria-hidden="true">
@@ -1603,13 +1605,15 @@ $(document).ready(function() {
 ?>
 /* Set up a callback which is called when a folder in the tree is selected */
 modalDropfolderChooser = $('#dropfolderChooser');
-function fileSelected(name) {
-	$('#dropfolderfile<?php echo $formName ?>').val(name);
+function fileSelected(name, form) {
+//	$('#dropfolderfile<?php echo $formName ?>').val(name);
+	$('#dropfolderfile'+form).val(name);
 	modalDropfolderChooser.modal('hide');
 }
 <?php if($showfolders) { ?>
-function folderSelected(name) {
-	$('#dropfolderfile<?php echo $formName ?>').val(name);
+function folderSelected(name, form) {
+//	$('#dropfolderfile<?php echo $formName ?>').val(name);
+	$('#dropfolderfile'+form).val(name);
 	modalDropfolderChooser.modal('hide');
 }
 <?php } ?>
@@ -1728,7 +1732,8 @@ $(document).ready(function() {
 	} /* }}} */
 
 	function printNewTreeNavigationHtml($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */
-		echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\" data-url=\"../op/op.Ajax.php?command=subtree&showdocs=".$showdocs."&orderby=".$orderby."\"></div>\n";
+		//echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\" data-url=\"../op/op.Ajax.php?command=subtree&showdocs=".$showdocs."&orderby=".$orderby."\"></div>\n";
+		echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\" data-url=\"".$_SERVER['SCRIPT_NAME']."?action=subtree\"></div>\n";
 	} /* }}} */
 
 	/**
@@ -1750,9 +1755,9 @@ $(document).ready(function() {
 			if($path || $expandtree>=$level) {
 				if($path)
 					$pathfolder = array_shift($path);
+				$children = array();
 				$subfolders = $folder->getSubFolders(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 				$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, $accessmode);
-				$children = array();
 				foreach($subfolders as $subfolder) {
 					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs)) ? true : false, 'is_folder'=>true);
 					if($expandtree>=$level || $pathfolder->getID() == $subfolder->getID()) {
@@ -1793,18 +1798,8 @@ $(document).ready(function() {
 			}
 			$node = array('label'=>$folder->getName(), 'id'=>$folder->getID(), 'load_on_demand'=>false, 'is_folder'=>true);
 			if(!$folder->hasSubFolders()) {
-				$node['load_on_demand'] = false;
+				$node['load_on_demand'] = true;
 				$node['children'] = array();
-				if($showdocs) {
-					$documents = $folder->getDocuments($orderby);
-					$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
-					if($this->hasHook('filterTreeDocuments'))
-						$documents = $this->callHook('filterTreeDocuments', $folder, $documents);
-					foreach($documents as $document) {
-						$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
-						$node['children'][] = $node2;
-					}
-				}
 			} else {
 				$node['children'] = jqtree($this, $path, $folder, $this->params['user'], $accessmode, $showdocs, $expandtree, $orderby, 0);
 				if($showdocs) {
@@ -1828,14 +1823,15 @@ $(document).ready(function() {
 			
 		} else {
 			$root = $this->params['dms']->getFolder($this->params['rootfolderid']);
-			$tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>true, 'is_folder'=>true));
+			$tree = array(array('label'=>$root->getName(), 'id'=>$root->getID(), 'load_on_demand'=>false, 'is_folder'=>true));
 		}
-
 ?>
 var data = <?php echo json_encode($tree); ?>;
 $(function() {
-	$('#jqtree<?php echo $formid ?>').tree({
+	const $tree = $('#jqtree<?php echo $formid ?>');
+	$tree.tree({
 //		saveState: true,
+		selectable: false,
 		data: data,
 		saveState: 'jqtree<?php echo $formid; ?>',
 		openedIcon: $('<i class="icon-minus-sign"></i>'),
@@ -1859,17 +1855,19 @@ $(function() {
 	// Unfold node for currently selected folder
 	$('#jqtree<?php echo $formid ?>').tree('openNode', $('#jqtree<?php echo $formid ?>').tree('getNodeById', <?php echo $folderid ?>), false);
   $('#jqtree<?php echo $formid ?>').on(
-		'tree.select',
+		'tree.click',
 		function(event) {
 			var node = event.node;
+			if(!node)
+				return;
 			$('#jqtree<?php echo $formid ?>').tree('openNode', node);
 //			event.preventDefault();
 			if(node.is_folder) {
 				if(typeof node.fetched == 'undefined') {
 					node.fetched = true;
 					$(this).tree('loadDataFromUrl', node, function () {
-						$(this).tree('openNode', node);}
-					);
+						$(this).tree('openNode', node);
+					});
 				}
 				folderSelected<?php echo $formid ?>(node.id, node.name);
 			} else
@@ -1904,6 +1902,39 @@ $(function() {
 <?php
 	} /* }}} */
 
+	/**
+	 * Return json data for sub tree of navigation tree
+	 */
+	function printNewTreeNavigationSubtree($folderid, $showdocs=0, $orderby='') { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		$folder = $dms->getFolder($folderid);
+		if (!is_object($folder)) return '';
+		
+		$subfolders = $folder->getSubFolders($orderby);
+		$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, M_READ);
+		$tree = array();
+		foreach($subfolders as $subfolder) {
+			$loadondemand = $subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs);
+			$level = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>$loadondemand, 'is_folder'=>true);
+			if(!$subfolder->hasSubFolders())
+				$level['children'] = array();
+			$tree[] = $level;
+		}
+		if($showdocs) {
+			$documents = $folder->getDocuments($orderby);
+			$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
+			foreach($documents as $document) {
+				$level = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
+				$tree[] = $level;
+			}
+		}
+
+		header('Content-Type: application/json');
+		echo json_encode($tree);
+	} /* }}} */
+
 	function printTreeNavigation($folderid, $showtree){ /* {{{ */
 		if ($showtree==1){
 			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"icon-minus-sign\"></i></a>", true);

From 68e97f81ce9a44ea1eadd584e75403b742763bc4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Sep 2019 17:15:11 +0200
Subject: [PATCH 1139/2006] add selection for partial tree

---
 out/out.DocumentChooser.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/out/out.DocumentChooser.php b/out/out.DocumentChooser.php
index ba9174ed5..ecd1dc507 100644
--- a/out/out.DocumentChooser.php
+++ b/out/out.DocumentChooser.php
@@ -44,6 +44,11 @@ if(isset($_GET['action']) && $_GET['action'] == 'subtree') {
 	$folderid = intval($_GET["folderid"]);
 	$folder = $dms->getFolder($folderid);
 	$form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]);
+	if(isset($_GET['partialtree'])) {
+		$partialtree = intval($_GET['partialtree']);
+	} else {
+		$partialtree = 0;
+	}
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
@@ -55,6 +60,7 @@ if($view) {
 	} else {
 		$view->setParam('folder', $folder);
 		$view->setParam('form', $form);
+		$view->setParam('partialtree', $partialtree);
 	}
 	$view($_GET);
 	exit;

From 9bc5b737717af3c2481b00fba7b6419e10d00b0f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Sep 2019 17:15:27 +0200
Subject: [PATCH 1140/2006] do not access
 SeedDMS_Core_DocumentContent::_version anymore

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 60f949745..87ad5b3c3 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2181,7 +2181,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
-		$queryStr = "DELETE FROM `tblTransmittalItems` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "DELETE FROM `tblTransmittalItems` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
 			return false;
@@ -2262,7 +2262,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		 * This implmentation is different from the above for removing approvals
 		 * and reviews. It doesn't use getReceiptStatus() but reads the database
 		 */
-		$queryStr = "SELECT * FROM `tblDocumentRecipients` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "SELECT * FROM `tblDocumentRecipients` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		$resArr = $db->getResultArray($queryStr);
 		if ((is_bool($resArr) && !$resArr)) {
 			$db->rollbackTransaction();
@@ -2291,7 +2291,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		 * This implementation is different from the above for removing approvals
 		 * and reviews. It doesn't use getRevisionStatus() but reads the database
 		 */
-		$queryStr = "SELECT * FROM `tblDocumentRevisors` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
+		$queryStr = "SELECT * FROM `tblDocumentRevisors` WHERE `documentID` = '". $this->getID() ."' AND `version` = '" . $version->getVersion()."'";
 		$resArr = $db->getResultArray($queryStr);
 		if ((is_bool($resArr) && !$resArr)) {
 			$db->rollbackTransaction();

From 95aede5c2b9c2ad101662a4de80b2b97b7ade212 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Oct 2019 07:19:51 +0200
Subject: [PATCH 1141/2006] =?UTF-8?q?fix=20SeedDMS=5FCore=5FDocumentConten?=
 =?UTF-8?q?t::verify=D0=85tatus()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the method can now handle revisions with status==-1. Status will not
change if status is already S_NEEDS_CORRECTION
---
 SeedDMS_Core/Core/inc.ClassDocument.php | 44 ++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 183e7b872..799d3f243 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3163,12 +3163,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * If status is draft and there are no approver and no reviewers => set
 	 * status to S_RELEASED
 	 * The status of a document with the current status S_OBSOLETE, S_REJECTED,
-	 * or S_EXPIRED will not be changed unless the parameter
+	 * S_NEEDS_CORRECTION or S_EXPIRED will not be changed unless the parameter
 	 * $ignorecurrentstatus is set to true.
 	 *
 	 * This method may not be called after a negative approval or review to
 	 * recalculated the status, because
-	 * it doesn't take a defeating approval or review into account. It will
+	 * it doesn't take a defeating approval or review into account. This method
+	 * does not set the status to S_REJECTED! It will
 	 * just check for a pending workflow, approval or review and set the status
 	 * accordingly, e.g. after the list of reviewers or appovers has been
 	 * modified. If there is not pending workflow, approval or review the
@@ -3192,15 +3193,19 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		$st=$this->getStatus();
 
 		/* Documents already obsoleted, rejected or expired will not change
-		 * its status anymore, unless explicitly requested.
+		 * its status anymore, unless explicitly requested. Be aware, that
+		 * this method has an unsufficient check for negative reviews and
+		 * approvals. A document in status S_REJECTED may become S_RELEASED
+		 * if there is at least one positive review or approval.
 		 */
-		if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED )) return;
+		if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED || $st["status"]==S_NEEDS_CORRECTION)) return;
 
 		unset($this->_workflow); // force to be reloaded from DB
 		$hasworkflow =  $this->getWorkflow() ? true : false;
 
 		/* $pendingReview will be set when there are still open reviews */
 		$pendingReview=false;
+		/* $hasReview will be set if there is at least one positiv review */
 		$hasReview=false;
 		unset($this->_reviewStatus);  // force to be reloaded from DB
 		$reviewStatus=$this->getReviewStatus();
@@ -3217,6 +3222,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		/* $pendingApproval will be set when there are still open approvals */
 		$pendingApproval=false;
+		/* $hasApproval will be set if there is at least one positiv review */
 		$hasApproval=false;
 		unset($this->_approvalStatus);  // force to be reloaded from DB
 		$approvalStatus=$this->getApprovalStatus();
@@ -3232,6 +3238,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 		$pendingRevision=false;
 		$hasRevision=false;
+		$needsCorrection=false;
 		unset($this->_revisionStatus);  // force to be reloaded from DB
 		$revsisionStatus=$this->getRevisionStatus();
 		if (is_array($revsisionStatus) && count($revsisionStatus)>0) {
@@ -3241,6 +3248,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 					break;
 				} elseif($a["status"]==1){
 					$hasRevision=true;
+				} elseif($a["status"]==-1){
+					$needsCorrection=true;
 				}
 			}
 		}
@@ -3250,16 +3259,33 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		elseif ($pendingReview) $this->setStatus(S_DRAFT_REV,$msg,$user);
 		elseif ($pendingApproval) $this->setStatus(S_DRAFT_APP,$msg,$user);
 		elseif ($pendingRevision) $this->setStatus(S_IN_REVISION,$msg,$user);
-		/* Finally decide what to do if either no review, approval, revision was
-		 * ever done or if one of them has been done. In the first case it will
-		 * go to the initial status, in the second case, it will be released.
+		/* This point will only be reached if there is no pending workflow, review,
+		 * approval or revision but the current status is one of S_DRAFT_REV,
+		 * S_DRAFT_APP or S_IN_REVISION. This can happen if formely set reviewers,
+		 * approvers, revisors are completly removed. In case of S_DRAFT_REV and
+		 * S_DRAFT_APP the document will go back into its initial status. If a
+		 * positive review or approval was found the document will be released.
+		 * Be aware that negative reviews or approvals are not taken into account,
+		 * because in that case the document must have been rejected before calling
+		 * this function. FIXME: this is a problem if the parameter $ignorecurrentstatus
+		 * was set, because an already rejected document may be released with just
+		 * one positive review or approval disregarding any negative reviews or
+		 * approvals.
+		 * A document in status S_IN_REVISION will be treated differently.
+		 * It takes negative revisions into account!
+		 *
 		 * A document in status S_DRAFT will never go into S_RELEASED and document
 		 * already released will never go back at this point into the given
 		 * initial status, which can only by S_DRAFT or S_RELEASED
 		 */
 		elseif ($st["status"]!=S_DRAFT && $st["status"]!=S_RELEASED ) {
-			if($hasReview || $hasApproval || $hasRevision) $this->setStatus(S_RELEASED,$msg,$user);
-			else $this->setStatus($initialstatus,$msg,$user);
+			if($st["status"]==S_DRAFT_REV || $st["status"]==S_DRAFT_APP) {
+				if($hasReview || $hasApproval) $this->setStatus(S_RELEASED,$msg,$user);
+				else $this->setStatus($initialstatus,$msg,$user);
+			} elseif($st["status"]==S_IN_REVISION) {
+				if($needsCorrection) $this->setStatus(S_NEEDS_CORRECTION,$msg,$user);
+				else $this->setStatus(S_RELEASED,$msg,$user);
+			}
 		}
 
 	} /* }}} */

From 7e3f490b57c5006dac938ad4447cddf34fcdd34d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Oct 2019 07:23:20 +0200
Subject: [PATCH 1142/2006] fix getting view parameter 'onevotereject'

---
 controllers/class.ReviseDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/class.ReviseDocument.php b/controllers/class.ReviseDocument.php
index ccee171e5..94f085d6d 100644
--- a/controllers/class.ReviseDocument.php
+++ b/controllers/class.ReviseDocument.php
@@ -38,7 +38,7 @@ class SeedDMS_Controller_ReviseDocument extends SeedDMS_Controller_Common {
 		 * if one has rejected it. So in the very end the doc is rejected, but
 		 * doc remainѕ in S_IN_REVISION until all have revised the doc
 		 */
-		$onevotereject = $this->param['onevotereject'];
+		$onevotereject = $this->params['onevotereject'];
 
 		/* Get the document id and name before removing the document */
 		$docname = $document->getName();

From 40ddfd3ea6c7be093294ef224dd07f20daa122f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Oct 2019 07:24:33 +0200
Subject: [PATCH 1143/2006] allow to set status S_NEEDS_CORRECTION

---
 op/op.OverrideContentStatus.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php
index 172ab9e0f..2b21e45ca 100644
--- a/op/op.OverrideContentStatus.php
+++ b/op/op.OverrideContentStatus.php
@@ -59,7 +59,7 @@ if (!is_object($content)) {
 }
 
 if (!isset($_POST["overrideStatus"]) || !is_numeric($_POST["overrideStatus"]) ||
-		(intval($_POST["overrideStatus"]) != S_RELEASED && intval($_POST["overrideStatus"]) != S_OBSOLETE && intval($_POST["overrideStatus"]) != S_DRAFT)) {
+		(intval($_POST["overrideStatus"]) != S_RELEASED && intval($_POST["overrideStatus"]) != S_OBSOLETE && intval($_POST["overrideStatus"]) != S_DRAFT && intval($_POST["overrideStatus"]) != S_NEEDS_CORRECTION)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_status"));
 }
 

From ffcc53408fbb882ead3352bb4214fde8da76dce3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 18 Oct 2019 07:24:58 +0200
Subject: [PATCH 1144/2006] fix typo in enableRevisionOnVoteReject (must be
 'One')

---
 inc/inc.ClassSettings.php          | 6 +++---
 op/op.ReviseDocument.php           | 2 +-
 views/bootstrap/class.Settings.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 908868998..3f3f8c11a 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -193,7 +193,7 @@ class Settings { /* {{{ */
 	// enable/disable revision workflow
 	var $_enableRevisionWorkflow = true;
 	// enable/disable revision on vote reject
-	var $_enableRevisionOnVoteReject = true;
+	var $_enableRevisionOneVoteReject = true;
 	// Allow to set just a reviewer in tradional workflow
 	var $_allowReviewerOnly = true;
 	// Allow to change reviewer/approver after review/approval has started
@@ -708,7 +708,7 @@ class Settings { /* {{{ */
 			$this->_enableReceiptWorkflow = Settings::boolval($tab["enableReceiptWorkflow"]);
 			$this->_enableReceiptReject = Settings::boolval($tab["enableReceiptReject"]);
 			$this->_enableRevisionWorkflow = Settings::boolval($tab["enableRevisionWorkflow"]);
-			$this->_enableRevisionOnVoteReject = Settings::boolval($tab["enableRevisionOnVoteReject"]);
+			$this->_enableRevisionOneVoteReject = Settings::boolval($tab["enableRevisionOneVoteReject"]);
 			$this->_allowReviewerOnly = Settings::boolval($tab["allowReviewerOnly"]);
 			$this->_allowChangeRevAppInProcess = Settings::boolval($tab["allowChangeRevAppInProcess"]);
 			$this->_enableVersionDeletion = Settings::boolval($tab["enableVersionDeletion"]);
@@ -1040,7 +1040,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableReceiptWorkflow", $this->_enableReceiptWorkflow);
     $this->setXMLAttributValue($node, "enableReceiptReject", $this->_enableReceiptReject);
     $this->setXMLAttributValue($node, "enableRevisionWorkflow", $this->_enableRevisionWorkflow);
-    $this->setXMLAttributValue($node, "enableRevisionOnVoteReject", $this->_enableRevisionOnVoteReject);
+    $this->setXMLAttributValue($node, "enableRevisionOneVoteReject", $this->_enableRevisionOneVoteReject);
     $this->setXMLAttributValue($node, "allowReviewerOnly", $this->_allowReviewerOnly);
     $this->setXMLAttributValue($node, "allowChangeRevAppInProcess", $this->_allowChangeRevAppInProcess);
     $this->setXMLAttributValue($node, "enableVersionDeletion", $this->_enableVersionDeletion);
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index 773da2979..d3fb84d2c 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -92,7 +92,7 @@ if ($_POST["revisionType"] == "grp") {
 }
 $controller->setParam('group', $group);
 $controller->setParam('comment', $_POST["comment"]);
-$controller->setParam('onevotereject', $settings->_enableRevisionOnVoteReject);
+$controller->setParam('onevotereject', $settings->_enableRevisionOneVoteReject);
 if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 3c81166a0..3ccc53e2d 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -433,7 +433,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigCheckbox('settings_enableReceiptWorkflow', 'enableReceiptWorkflow'); ?>
 <?php $this->showConfigCheckbox('settings_enableReceiptReject', 'enableReceiptReject'); ?>
 <?php $this->showConfigCheckbox('settings_enableRevisionWorkflow', 'enableRevisionWorkflow'); ?>
-<?php $this->showConfigCheckbox('settings_enableRevisionOnVoteReject', 'enableRevisionOnVoteReject'); ?>
+<?php $this->showConfigCheckbox('settings_enableRevisionOneVoteReject', 'enableRevisionOneVoteReject'); ?>
 <?php $this->showConfigText('settings_versioningFileName', 'versioningFileName'); ?>
 <?php $this->showConfigText('settings_presetExpirationDate', 'presetExpirationDate'); ?>
 <?php $this->showConfigOption('settings_initialDocumentStatus', 'initialDocumentStatus', array(' '.S_RELEASED=>'settings_initialDocumentStatus_released', ' '.S_DRAFT=>'settings_initialDocumentStatus_draft'), false, true); ?>

From 65212329a74909579110a6af01b71ed2c570c6db Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Oct 2019 08:23:27 +0100
Subject: [PATCH 1145/2006] fix invaled xml

---
 SeedDMS_Core/package.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index a791f4370..9447260fe 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1660,7 +1660,6 @@ fix php warning if workflow state doesn' have next transition
 add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </notes>
   </release>
-  <release>
   <release>
    <date>2019-05-03</date>
    <time>07:31:17</time>

From 1c08d8370421edc907febee773db9050cb21a2a2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 Nov 2019 21:59:02 +0100
Subject: [PATCH 1146/2006] need M_ALL to set revisor

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 14dd07413..fca3e73b1 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -187,7 +187,7 @@ class SeedDMS_AccessOperation {
 		if($document->isType('document')) {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
-				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_IN_REVISION)) {
 					return true;
 				}
 			}

From 7362bf192b176345d7e909b0b952ee8af8221203 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 Nov 2019 08:03:02 +0100
Subject: [PATCH 1147/2006] add method check_access()

just like in SeedDMS_View_Common
---
 inc/inc.ClassControllerCommon.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/inc/inc.ClassControllerCommon.php b/inc/inc.ClassControllerCommon.php
index 618fc1ca3..8b465568c 100644
--- a/inc/inc.ClassControllerCommon.php
+++ b/inc/inc.ClassControllerCommon.php
@@ -246,4 +246,25 @@ class SeedDMS_Controller_Common {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if the access on the contoller with given name or the current
+	 * controller itself may be accessed.
+	 *
+	 * The function requires the parameter 'accessobject' to be available in the
+	 * controller, because it calls SeedDMS_AccessOperation::check_controller_access()
+	 * to check access rights. If the the optional $name is not set the
+	 * current controller is used.
+	 *
+	 * @param string|array $name name of controller or list of controller names
+	 * @return boolean true if access is allowed otherwise false
+	 */
+	protected function check_access($name='') { /* {{{ */
+		if(!$name)
+			$name = $this;
+		if(!isset($this->params['accessobject']))
+			return false;
+		$access = $this->params['accessobject']->check_controller_access($name);
+		return $access;
+	} /* }}} */
+
 }

From 096b117e348fb2e7f4426591980d46c79f9f6e05 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Nov 2019 08:46:43 +0100
Subject: [PATCH 1148/2006] create access object

---
 out/out.RemoveUser.php              | 1 +
 out/out.RemoveUserFromProcesses.php | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/out/out.RemoveUser.php b/out/out.RemoveUser.php
index f2289f49a..08b6b161c 100644
--- a/out/out.RemoveUser.php
+++ b/out/out.RemoveUser.php
@@ -57,6 +57,7 @@ $allusers = $dms->getAllUsers($settings->_sortUsersInList);
 if($view) {
 	$view->setParam('rmuser', $rmuser);
 	$view->setParam('allusers', $allusers);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.RemoveUserFromProcesses.php b/out/out.RemoveUserFromProcesses.php
index 61aedcbb3..682c84219 100644
--- a/out/out.RemoveUserFromProcesses.php
+++ b/out/out.RemoveUserFromProcesses.php
@@ -20,6 +20,7 @@
 
 if(!isset($settings))
 	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
 require_once("inc/inc.Language.php");
 require_once("inc/inc.Init.php");
 require_once("inc/inc.Extension.php");
@@ -29,9 +30,9 @@ require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-
-if (!$user->isAdmin()) {
-	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
 }
 
 if (!isset($_GET["userid"]) || !is_numeric($_GET["userid"]) || intval($_GET["userid"])<1) {
@@ -49,6 +50,7 @@ if ($rmuser->getID()==$user->getID()) {
 
 if($view) {
 	$view->setParam('rmuser', $rmuser);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From e20d4e492f5dcee8847b13717639eb55182d22fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Nov 2019 10:03:55 +0100
Subject: [PATCH 1149/2006] output processes in old versions

---
 .../class.RemoveUserFromProcesses.php         | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index cf01299d1..db1f8ad60 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -81,7 +81,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 
 		$receiptStatus = $rmuser->getReceiptStatus();
 		$tmpb = array();
+		$cb = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0);
 		foreach($receiptStatus['indstatus'] as $ai) {
+			$doc = $dms->getDocument($ai['documentID']);
+			$ai['latest'] = $doc->getLatestContent()->getVersion();
+			if($ai['latest'] == $ai['version'])
+				$cb[$ai['status']]++;
 			if(isset($tmpb[$ai['status']]))
 				$tmpb[$ai['status']][] = $ai;
 			else
@@ -90,7 +95,12 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 
 		$revisionStatus = $rmuser->getRevisionStatus();
 		$tmpc = array();
+		$cc = array("-3"=>0, "-2"=>0, '-1'=>0, '0'=>0, '1'=>0);
 		foreach($revisionStatus['indstatus'] as $ai) {
+			$doc = $dms->getDocument($ai['documentID']);
+			$ai['latest'] = $doc->getLatestContent()->getVersion();
+			if($ai['latest'] == $ai['version'])
+				$cc[$ai['status']]++;
 			if(isset($tmpc[$ai['status']]))
 				$tmpc[$ai['status']][] = $ai;
 			else
@@ -157,7 +167,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[receipt][]" value="0" checked> <?php echo getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))); ?>
+	<input type="checkbox" name="status[receipt][]" value="0" checked> <?php echo getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))); ?> <?php echo getMLText('receipts_not_touched_latest', array('no_receipts' => $cb["0"])); ?>
 		</label>
 	</div>
 </div>
@@ -166,7 +176,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[receipt][]" value="1"> <?php echo getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))); ?><br />
+	<input type="checkbox" name="status[receipt][]" value="1"> <?php echo getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))); ?> <?php echo getMLText('receipts_accepted_latest', array('no_receipts' => $cb["1"])); ?><br />
 		</label>
 	</div>
 </div>
@@ -175,7 +185,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[receipt][]" value="-1"> <?php echo getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))); ?><br />
+	<input type="checkbox" name="status[receipt][]" value="-1"> <?php echo getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))); ?> <?php echo getMLText('receipts_rejected_latest', array('no_receipts' => $cb["-1"])); ?><br />
 		</label>
 	</div>
 </div>
@@ -185,7 +195,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="0" checked> <?php echo getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))); ?>
+	<input type="checkbox" name="status[revision][]" value="0" checked> <?php echo getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))); ?> <?php echo getMLText('revisions_not_touched_latest', array('no_revisions' => $cc["0"])); ?>
 		</label>
 	</div>
 </div>
@@ -194,7 +204,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="-3" checked> <?php echo getMLText('revisions_pending', array('no_revisions' => count($tmpc["-3"]))); ?>
+	<input type="checkbox" name="status[revision][]" value="-3" checked> <?php echo getMLText('revisions_pending', array('no_revisions' => count($tmpc["-3"]))); ?> <?php echo getMLText('revisions_pending_latest', array('no_revisions' => $cc["-3"])); ?>
 		</label>
 	</div>
 </div>
@@ -203,7 +213,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="1"> <?php echo getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))); ?><br />
+	<input type="checkbox" name="status[revision][]" value="1"> <?php echo getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))); ?> <?php echo getMLText('revisions_accepted_latest', array('no_revisions' => $cc["1"])); ?><br />
 		</label>
 	</div>
 </div>
@@ -212,7 +222,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <div class="control-group">
 	<div class="controls">
 		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="-1"> <?php echo getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))); ?><br />
+	<input type="checkbox" name="status[revision][]" value="-1"> <?php echo getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))); ?> <?php echo getMLText('revisions_rejected_latest', array('no_revisions' => $cc["-1"])); ?><br />
 		</label>
 	</div>
 </div>

From ac0824ae37cd9afc12582c32229dee44ef80c6fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Nov 2019 16:07:27 +0100
Subject: [PATCH 1150/2006] set access object

---
 out/out.TransferObjects.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/out/out.TransferObjects.php b/out/out.TransferObjects.php
index b2a0095c8..1118a1305 100644
--- a/out/out.TransferObjects.php
+++ b/out/out.TransferObjects.php
@@ -20,6 +20,7 @@
 
 if(!isset($settings))
 	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
 require_once("inc/inc.Language.php");
 require_once("inc/inc.Init.php");
 require_once("inc/inc.Extension.php");
@@ -27,8 +28,11 @@ require_once("inc/inc.DBInit.php");
 require_once("inc/inc.ClassUI.php");
 require_once("inc/inc.Authentication.php");
 
-if (!$user->isAdmin()) {
-	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
 }
 
 if (!isset($_GET["userid"]) || !is_numeric($_GET["userid"]) || intval($_GET["userid"])<1) {
@@ -46,11 +50,10 @@ if ($rmuser->getID()==$user->getID()) {
 
 $allusers = $dms->getAllUsers($settings->_sortUsersInList);
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
 	$view->setParam('rmuser', $rmuser);
 	$view->setParam('allusers', $allusers);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From d96b3b84a281ca76a7d3235b949996b08f945bc5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Nov 2019 21:03:19 +0100
Subject: [PATCH 1151/2006] add scheduler to menu

---
 views/bootstrap/class.Bootstrap.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 6bf7b63db..e2ea94d18 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -831,6 +831,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$menuitems['misc']['children']['charts'] = array('link'=>"../out/out.Charts.php", 'label'=>'charts');
 		if ($this->check_access('Timeline'))
 		$menuitems['misc']['children']['timeline'] = array('link'=>"../out/out.Timeline.php", 'label'=>'timeline');
+		if ($this->check_access('SchedulerTaskMgr'))
+		$menuitems['misc']['children']['schedulertaskmgr'] = array('link'=>"../out/out.SchedulerTaskMgr.php", 'label'=>'scheduler_task_mgr');
 		if ($this->check_access('ObjectCheck'))
 		$menuitems['misc']['children']['objectcheck'] = array('link'=>"../out/out.ObjectCheck.php", 'label'=>'objectcheck');
 		if ($this->check_access('ExpiredDocuments'))

From d9a4305fd7ef423421771c0c6e1b5c040e673e6e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Nov 2019 21:03:44 +0100
Subject: [PATCH 1152/2006] remove second instance of SeedDMS_AccessOperation

---
 out/out.Calendar.php | 2 --
 out/out.Timeline.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index 325a54066..2920c0c0a 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.php
@@ -49,8 +49,6 @@ if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['docume
 } else
 	$document = null;
 
-$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
-
 $calendar = new SeedDMS_Calendar($dms->getDB(), $user);
 
 if(isset($_GET['eventid']) && $_GET['eventid'] && is_numeric($_GET['eventid'])) {
diff --git a/out/out.Timeline.php b/out/out.Timeline.php
index f71abdfa9..52c47ef03 100644
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@@ -42,8 +42,6 @@ if(isset($_GET['skip']))
 else
 	$skip = array();
 
-$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
-
 $document = null;
 $content = null;
 if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['documentid'])) {

From 270770782f2135aea1d2662a1d2ca53a876f7da9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 13:11:24 +0100
Subject: [PATCH 1153/2006] verifyStatus() handles status change when S_EXPIRED
 is set

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 799d3f243..56603dba3 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3285,7 +3285,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			} elseif($st["status"]==S_IN_REVISION) {
 				if($needsCorrection) $this->setStatus(S_NEEDS_CORRECTION,$msg,$user);
 				else $this->setStatus(S_RELEASED,$msg,$user);
+			} elseif($st["status"]==S_EXPIRED) {
+				$this->setStatus(S_RELEASED,$msg,$user);
 			}
+
 		}
 
 	} /* }}} */

From 43f57637e794ab1468b02a54104ef2d76dec9481 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 13:12:11 +0100
Subject: [PATCH 1154/2006] add method check_view_lecacy_access()

which does the legacy access checking if advanded acl is turned off
---
 inc/inc.ClassAccessOperation.php | 107 +++++++++++++++++++++++++++++--
 1 file changed, 103 insertions(+), 4 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index fca3e73b1..b4d44aae4 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -406,6 +406,108 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 
+	protected function check_view_lecacy_access($view, $get=array()) { /* {{{ */
+		if($this->user->isAdmin())
+			return true;
+
+		if(is_string($view)) {
+			$scripts = array($view);
+		} elseif(is_array($view)) {
+			$scripts = $view;
+		} elseif(is_subclass_of($view, 'SeedDMS_View_Common')) {
+			$scripts = array($view->getParam('class'));
+		} else {
+			return false;
+		}
+		if(array_intersect($scripts, array(
+			'AddDocument',
+			'AddEvent',
+			'AddFile',
+			'AddSubFolder',
+			'AddToTransmittal',
+			'ApprovalSummary',
+			'ApproveDocument',
+			'Calendar',
+			'CategoryChooser',
+			'ChangePassword',
+			'CheckInDocument',
+			'Clipboard',
+			'DocumentAccess',
+			'DocumentChooser',
+			'DocumentNotify',
+			'DocumentVersionDetail',
+			'DropFolderChooser',
+			'EditAttributes',
+			'EditComment',
+			'EditDocumentFile',
+			'EditDocument',
+			'EditEvent',
+			'EditFolder',
+			'EditOnline',
+			'EditUserData',
+			'ErrorDlg',
+			'FolderAccess',
+			'FolderChooser',
+			'FolderNotify',
+			'ForcePasswordChange',
+			'GroupView',
+			'Help',
+			'Info',
+			'KeywordChooser',
+			'Login',
+			'ManageNotify',
+			'MoveDocument',
+			'MoveFolder',
+			'MyAccount',
+			'MyDocuments',
+			'OpensearchDesc',
+			'OverrideContentStatus',
+			'PasswordForgotten',
+			'PasswordSend',
+			'ReceiptDocument',
+			'ReceiptSummary',
+			'RemoveDocumentFile',
+			'RemoveDocument',
+			'RemoveEvent',
+			'RemoveFolderFiles',
+			'RemoveFolder',
+			'RemoveTransmittal',
+			'RemoveVersion',
+			'RemoveWorkflowFromDocument',
+			'ReturnFromSubWorkflow',
+			'ReviewDocument',
+			'ReviewSummary',
+			'ReviseDocument',
+			'RewindWorkflow',
+			'RunSubWorkflow',
+			'SearchForm',
+			'Search',
+			'Session',
+			'SetExpires',
+			'SetRecipients',
+			'SetReviewersApprovers',
+			'SetRevisors',
+			'SetWorkflow',
+			'SubstituteUser',
+			'TimelineFeed',
+			'Timeline',
+			'TransmittalMgr',
+			'TriggerWorkflow',
+			'UpdateDocument',
+			'UserDefaultKeywords',
+			'UserImage',
+			'UserList',
+			'UsrView',
+			'ViewDocument',
+			'ViewEvent',
+			'ViewFolder',
+			'WorkflowGraph',
+			'WorkflowSummary')))
+			return true;
+
+		return false;
+	} /* }}} */
+
 	/**
 	 * Check for access permission on view
 	 *
@@ -426,10 +528,7 @@ class SeedDMS_AccessOperation {
 	 */
 	function check_view_access($view, $get=array()) { /* {{{ */
 		if(!$this->settings->_advancedAcl) {
-			if($this->user->isAdmin())
-				return true;
-			else
-				return false;
+			return $this->check_view_lecacy_access($view, $get);
 		}
 		if(is_string($view)) {
 			$scripts = array($view);

From a493e7645dff0726989d787cfb5a9b1063055bdf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 13:13:07 +0100
Subject: [PATCH 1155/2006] set accessobject already in factory

---
 inc/inc.ClassUI.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 0b9efd8e9..d591e5062 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -45,7 +45,7 @@ class UI extends UI_Default {
 	 * @return object an object of a class implementing the view
 	 */
 	static function factory($theme, $class='', $params=array()) { /* {{{ */
-		global $settings, $session, $EXT_CONF;
+		global $settings, $dms, $user, $session, $EXT_CONF;
 		if(!$class) {
 			$class = 'Bootstrap';
 			$classname = "SeedDMS_Bootstrap_Style";
@@ -105,6 +105,7 @@ class UI extends UI_Default {
 			require($filename);
 			$view = new $classname($params, $theme);
 			/* Set some configuration parameters */
+			$view->setParam('accessobject', new SeedDMS_AccessOperation($dms, $user, $settings));
 			$view->setParam('refferer', $_SERVER['REQUEST_URI']);
 			$view->setParam('absbaseprefix', $settings->_httpRoot.$httpbasedir);
 			$view->setParam('class', $class);

From 1b6a07b73e466d792d490941d2992d9ebbce2ab6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 13:13:28 +0100
Subject: [PATCH 1156/2006] more documentation

---
 inc/inc.ClassViewCommon.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 7f52cd0fc..f32f43259 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -210,6 +210,9 @@ class SeedDMS_View_Common {
 	 * to check access rights. If the the optional $name is not set the
 	 * current view is used.
 	 *
+	 * If $name is an array then just one of the passed objects in the array
+	 * must be accessible for this function to return true.
+	 *
 	 * @param string|array $name name of view or list of view names
 	 * @return boolean true if access is allowed otherwise false
 	 */

From ed32e8e2b2ea0c144e95ac12391874c678585651 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 13:13:51 +0100
Subject: [PATCH 1157/2006] call $accessobject->check_view_access() instead of
 $this->check_access()

---
 views/bootstrap/class.Bootstrap.php | 96 ++++++++++++++++-------------
 1 file changed, 52 insertions(+), 44 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e2ea94d18..abf9207fc 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -281,6 +281,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	 */
 	function __menuTasks($tasks) { /* {{{ */
 		$dms = $this->params['dms'];
+		$accessobject = $this->params['accessobject'];
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 //		$content .= "    <li class=\"dropdown\">\n";
@@ -330,7 +331,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if ($this->check_access('MyDocuments')) {
+		if ($accessobject->check_view_access('MyDocuments')) {
 			$content .= "    <li class=\"divider\"></li>\n";
 			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		}
@@ -342,6 +343,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	function globalNavigation($folder=null) { /* {{{ */
 		$dms = $this->params['dms'];
+		$accessobject = $this->params['accessobject'];
 		echo "<div class=\"navbar navbar-inverse navbar-fixed-top\">\n";
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
@@ -359,11 +361,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			if (!$this->params['user']->isGuest()) {
 				$menuitems = array();
-				if ($this->check_access('MyDocuments'))
+				if ($accessobject->check_view_access('MyDocuments'))
 					$menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php", 'label'=>'my_documents');
-				if ($this->check_access('MyAccount'))
+				if ($accessobject->check_view_access('MyAccount'))
 					$menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account');
-				if ($this->check_access('TransmittalMgr'))
+				if ($accessobject->check_view_access('TransmittalMgr'))
 					$menuitems['my_transmittals'] = array('link'=>"../out/out.TransmittalMgr.php", 'label'=>'my_transmittals');
 				$hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap');
 				foreach($hookObjs as $hookObj) {
@@ -453,8 +455,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo "   <ul class=\"nav\">\n";
 	//		echo "    <li id=\"first\"><a href=\"../out/out.ViewFolder.php?folderid=".$this->params['rootfolderid']."\">".getMLText("content")."</a></li>\n";
 	//		echo "    <li><a href=\"../out/out.SearchForm.php?folderid=".$this->params['rootfolderid']."\">".getMLText("search")."</a></li>\n";
-			if ($this->params['enablecalendar'] && $this->check_access('Calendar')) echo "    <li><a href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
-			if ($this->check_access('AdminTools')) echo "    <li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
+			if ($this->params['enablecalendar'] && $accessobject->check_view_access('Calendar')) echo "    <li><a href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
+			if ($accessobject->check_view_access('AdminTools')) echo "    <li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
 			if($this->params['enablehelp']) {
 			$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 			echo "    <li><a href=\"../out/out.Help.php?context=".$tmp[1]."\">".getMLText("help")."</a></li>\n";
@@ -572,6 +574,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	private function folderNavigationBar($folder) { /* {{{ */
 		$dms = $this->params['dms'];
+		$accessobject = $this->params['accessobject'];
 		if (!is_object($folder) || !$folder->isType('folder')) {
 			echo "<ul class=\"nav\">\n";
 			echo "</ul>\n";
@@ -585,12 +588,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$menuitems = array();
 
 		if ($accessMode == M_READ && !$this->params['user']->isGuest()) {
+			if ($accessobject->check_view_access('FolderNotify'))
 			$menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_notify');
 		}
 		else if ($accessMode >= M_READWRITE) {
-			if ($this->check_access('AddSubFolder'))
+			if ($accessobject->check_view_access('AddSubFolder'))
 				$menuitems['add_subfolder'] = array('link'=>"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_subfolder');
-			if ($this->check_access('AddDocument'))
+			if ($accessobject->check_view_access('AddDocument'))
 				$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_document');
 			if(0 && $this->params['enablelargefileupload'])
 				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'add_multiple_documents');
@@ -623,6 +627,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	private function documentNavigationBar($document)	{ /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		$accessMode = $document->getAccessMode($this->params['user']);
 		$docid=".php?documentid=" . $document->getID();
 		echo "<id=\"first\"><a href=\"../out/out.ViewDocument". $docid ."\" class=\"brand\">".getMLText("document")."</a>\n";
@@ -667,7 +672,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		}
 		if ($accessMode == M_ALL) {
 			$menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>'rm_document');
-			if ($this->check_access('DocumentAccess'))
+			if ($accessobject->check_view_access('DocumentAccess'))
 				$menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>'edit_document_access');
 		}
 		if ($accessMode >= M_READ && !$this->params['user']->isGuest()) {
@@ -701,6 +706,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	private function accountNavigationBar() { /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		echo "<id=\"first\"><a href=\"../out/out.MyAccount.php\" class=\"brand\">".getMLText("my_account")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "<ul class=\"nav\">\n";
@@ -717,9 +723,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'edit_existing_notify');
 
 		if ($this->params['enableusersview']){
-			if ($this->check_access('UsrView'))
+			if ($accessobject->check_view_access('UsrView'))
 				$menuitems['users'] = array('link'=>"../out/out.UsrView.php", 'label'=>'users');
-			if ($this->check_access('GroupView'))
+			if ($accessobject->check_view_access('GroupView'))
 				$menuitems['groups'] = array('link'=>"../out/out.GroupView.php", 'label'=>'groups');
 		}		
 
@@ -735,6 +741,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	private function myDocumentsNavigationBar() { /* {{{ */
+		$accessobject = $this->params['accessobject'];
 
 		echo "<id=\"first\"><a href=\"../out/out.MyDocuments.php\" class=\"brand\">".getMLText("my_documents")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
@@ -763,91 +770,92 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	private function adminToolsNavigationBar() { /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		echo "    <id=\"first\"><a href=\"../out/out.AdminTools.php\" class=\"brand\">".getMLText("admin_tools")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "   <ul class=\"nav\">\n";
 
-		if($this->check_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) {
+		if($accessobject->check_view_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) {
 		$menuitems = array();
 		$menuitems['user_group_management'] = array('link'=>"#", 'label'=>'user_group_management');
-		if ($this->check_access('UsrMgr'))
+		if ($accessobject->check_view_access('UsrMgr'))
 		$menuitems['user_group_management']['children']['user_management'] = array('link'=>"../out/out.UsrMgr.php", 'label'=>'user_management');
-		if ($this->check_access('RoleMgr'))
+		if ($accessobject->check_view_access('RoleMgr'))
 		$menuitems['user_group_management']['children']['role_management'] = array('link'=>"../out/out.RoleMgr.php", 'label'=>'role_management');
-		if ($this->check_access('GroupMgr'))
+		if ($accessobject->check_view_access('GroupMgr'))
 		$menuitems['user_group_management']['children']['group_management'] = array('link'=>"../out/out.GroupMgr.php", 'label'=>'group_management');
-		if ($this->check_access('UserList'))
+		if ($accessobject->check_view_access('UserList'))
 		$menuitems['user_group_management']['children']['user_list'] = array('link'=>"../out/out.UserList.php", 'label'=>'user_list');
-		if ($this->check_access('Acl'))
+		if ($accessobject->check_view_access('Acl'))
 		$menuitems['user_group_management']['children']['access_control'] = array('link'=>"../out/out.Acl.php", 'label'=>'access_control');
 		}
 
-		if($this->check_access(array('DefaultKeywords', 'Categories', 'AttributeMgr', 'WorkflowMgr', 'WorkflowStatesMgr', 'WorkflowActionsMgr'))) {
+		if($accessobject->check_view_access(array('DefaultKeywords', 'Categories', 'AttributeMgr', 'WorkflowMgr', 'WorkflowStatesMgr', 'WorkflowActionsMgr'))) {
 		$menuitems['definitions'] = array('link'=>"#", 'label'=>'definitions');
-		if ($this->check_access('DefaultKeywords'))
+		if ($accessobject->check_view_access('DefaultKeywords'))
 		$menuitems['definitions']['children']['default_keywords'] = array('link'=>"../out/out.DefaultKeywords.php", 'label'=>'global_default_keywords');
-		if ($this->check_access('Categories'))
+		if ($accessobject->check_view_access('Categories'))
 		$menuitems['definitions']['children']['document_categories'] = array('link'=>"../out/out.Categories.php", 'label'=>'global_document_categories');
-		if ($this->check_access('AttributeMgr'))
+		if ($accessobject->check_view_access('AttributeMgr'))
 		$menuitems['definitions']['children']['attribute_definitions'] = array('link'=>"../out/out.AttributeMgr.php", 'label'=>'global_attributedefinitions');
 		if($this->params['workflowmode'] == 'advanced') {
-			if ($this->check_access('WorkflowMgr'))
+			if ($accessobject->check_view_access('WorkflowMgr'))
 			$menuitems['definitions']['children']['workflows'] = array('link'=>"../out/out.WorkflowMgr.php", 'label'=>'global_workflows');
-			if ($this->check_access('WorkflowStatesMgr'))
+			if ($accessobject->check_view_access('WorkflowStatesMgr'))
 			$menuitems['definitions']['children']['workflow_states'] = array('link'=>"../out/out.WorkflowStatesMgr.php", 'label'=>'global_workflow_states');
-			if ($this->check_access('WorkflowActionsMgr'))
+			if ($accessobject->check_view_access('WorkflowActionsMgr'))
 			$menuitems['definitions']['children']['workflow_actions'] = array('link'=>"../out/out.WorkflowActionsMgr.php", 'label'=>'global_workflow_actions');
 		}
 		}
 
 		if($this->params['enablefullsearch']) {
-			if($this->check_access(array('Indexer', 'CreateIndex', 'IndexInfo'))) {
+			if($accessobject->check_view_access(array('Indexer', 'CreateIndex', 'IndexInfo'))) {
 			$menuitems['fulltext'] = array('link'=>"#", 'label'=>'fullsearch');
-			if ($this->check_access('Indexer'))
+			if ($accessobject->check_view_access('Indexer'))
 			$menuitems['fulltext']['children']['update_fulltext_index'] = array('link'=>"../out/out.Indexer.php", 'label'=>'update_fulltext_index');
-			if ($this->check_access('CreateIndex'))
+			if ($accessobject->check_view_access('CreateIndex'))
 			$menuitems['fulltext']['children']['create_fulltext_index'] = array('link'=>"../out/out.CreateIndex.php", 'label'=>'create_fulltext_index');
-			if ($this->check_access('IndexInfo'))
+			if ($accessobject->check_view_access('IndexInfo'))
 			$menuitems['fulltext']['children']['fulltext_info'] = array('link'=>"../out/out.IndexInfo.php", 'label'=>'fulltext_info');
 			}
 		}
 
-		if($this->check_access(array('BackupTools', 'LogManagement'))) {
+		if($accessobject->check_view_access(array('BackupTools', 'LogManagement'))) {
 		$menuitems['backup_log_management'] = array('link'=>"#", 'label'=>'backup_log_management');
-		if ($this->check_access('BackupTools'))
+		if ($accessobject->check_view_access('BackupTools'))
 		$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.BackupTools.php", 'label'=>'backup_tools');
 		if ($this->params['logfileenable'])
-			if ($this->check_access('LogManagement'))
+			if ($accessobject->check_view_access('LogManagement'))
 			$menuitems['backup_log_management']['children'][] = array('link'=>"../out/out.LogManagement.php", 'label'=>'log_management');
 		}
 
-		if($this->check_access(array('Statistic', 'Charts', 'Timeline', 'ObjectCheck', 'ExtensionMgr', 'Info'))) {
+		if($accessobject->check_view_access(array('Statistic', 'Charts', 'Timeline', 'ObjectCheck', 'ExtensionMgr', 'Info'))) {
 		$menuitems['misc'] = array('link'=>"#", 'label'=>'misc');
-		if ($this->check_access('ImportFS'))
+		if ($accessobject->check_view_access('ImportFS'))
 		$menuitems['misc']['children']['import_fs'] = array('link'=>"../out/out.ImportFS.php", 'label'=>'import_fs');
-		if ($this->check_access('Statistic'))
+		if ($accessobject->check_view_access('Statistic'))
 		$menuitems['misc']['children']['folders_and_documents_statistic'] = array('link'=>"../out/out.Statistic.php", 'label'=>'folders_and_documents_statistic');
-		if ($this->check_access('Charts'))
+		if ($accessobject->check_view_access('Charts'))
 		$menuitems['misc']['children']['charts'] = array('link'=>"../out/out.Charts.php", 'label'=>'charts');
-		if ($this->check_access('Timeline'))
+		if ($accessobject->check_view_access('Timeline'))
 		$menuitems['misc']['children']['timeline'] = array('link'=>"../out/out.Timeline.php", 'label'=>'timeline');
-		if ($this->check_access('SchedulerTaskMgr'))
+		if ($accessobject->check_view_access('SchedulerTaskMgr'))
 		$menuitems['misc']['children']['schedulertaskmgr'] = array('link'=>"../out/out.SchedulerTaskMgr.php", 'label'=>'scheduler_task_mgr');
-		if ($this->check_access('ObjectCheck'))
+		if ($accessobject->check_view_access('ObjectCheck'))
 		$menuitems['misc']['children']['objectcheck'] = array('link'=>"../out/out.ObjectCheck.php", 'label'=>'objectcheck');
-		if ($this->check_access('ExpiredDocuments'))
+		if ($accessobject->check_view_access('ExpiredDocuments'))
 		$menuitems['misc']['children']['documents_expired'] = array('link'=>"../out/out.ExpiredDocuments.php", 'label'=>'documents_expired');
-		if ($this->check_access('ExtensionMgr'))
+		if ($accessobject->check_view_access('ExtensionMgr'))
 		$menuitems['misc']['children']['extension_manager'] = array('link'=>"../out/out.ExtensionMgr.php", 'label'=>'extension_manager');
-		if ($this->check_access('ClearCache'))
+		if ($accessobject->check_view_access('ClearCache'))
 		$menuitems['misc']['children']['clear_cache'] = array('link'=>"../out/out.ClearCache.php", 'label'=>'clear_cache');
-		if ($this->check_access('Info'))
+		if ($accessobject->check_view_access('Info'))
 		$menuitems['misc']['children']['version_info'] = array('link'=>"../out/out.Info.php", 'label'=>'version_info');
 		}
 
-		if($this->check_access(array('Hooks'))) {
+		if($accessobject->check_view_access(array('Hooks'))) {
 		$menuitems['debug'] = array('link'=>"#", 'label'=>'debug');
-		if ($this->check_access('Hooks'))
+		if ($accessobject->check_view_access('Hooks'))
 		$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>'list_hooks');
 		}
 

From d2382f437ce1bc1dc7f1ce15928dfa180def60f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 13:37:52 +0100
Subject: [PATCH 1158/2006] set 'onepage' for view

---
 out/out.ReceiptSummary.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php
index 00d8ed5ae..2d51e49e8 100644
--- a/out/out.ReceiptSummary.php
+++ b/out/out.ReceiptSummary.php
@@ -46,6 +46,7 @@ if($view) {
 	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
+	$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
 	$view($_GET);
 	exit;
 }

From 55727bd1a23af7737c22b7b5e847ff426cd6f835 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 13:47:57 +0100
Subject: [PATCH 1159/2006] do not use $this->check_access() anymore

---
 views/bootstrap/class.Acl.php          |   7 +-
 views/bootstrap/class.RoleMgr.php      |   3 +-
 views/bootstrap/class.Tasks.php        |   3 +-
 views/bootstrap/class.UserList.php     |   3 +-
 views/bootstrap/class.UsrMgr.php       |  12 +--
 views/bootstrap/class.ViewDocument.php | 114 ++++++++++++-------------
 6 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index d20321f25..8ccd96601 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -133,6 +133,7 @@ $(document).ready( function() {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$selrole = $this->params['selrole'];
+		$accessobject = $this->params['accessobject'];
 		if($selrole) {
 			$this->contentHeading(getMLText("role_info"));
 
@@ -148,11 +149,11 @@ $(document).ready( function() {
 						echo "<br /><small>".htmlspecialchars($currUser->getComment())."</small>";
 					echo "</td>";
 					echo "<td>";
-					if($this->check_access(array('UsrMgr', 'RemoveUser'))) {
+					if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) {
 						echo "<div class=\"list-action\">";
-						if($this->check_access('UsrMgr'))
+						if($accessobject->check_view_access('UsrMgr'))
 							echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
-						if($this->check_access('RemoveUser'))
+						if($accessobject->check_view_access('RemoveUser'))
 							echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";
 						echo "</div>";
 					}
diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 9011f70e4..15c797e89 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -73,6 +73,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$selrole = $this->params['selrole'];
 		$settings = $this->params['settings'];
+		$accessobject = $this->params['accessobject'];
 
 		if($selrole) {
 			$this->contentHeading(getMLText("role_info"));
@@ -88,7 +89,7 @@ $(document).ready( function() {
 						echo "<br /><small>".htmlspecialchars($currUser->getComment())."</small>";
 					echo "</td>";
 					echo "<td>";
-					if($this->check_access(array('UsrMgr', 'RemoveUser'))) {
+					if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) {
 						echo "<div class=\"list-action\">";
 						echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="icon-edit"></i>', false);
 						echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>', false);
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 53c8c6656..7f85f7556 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -227,6 +227,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 	function menuTasks() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$accessobject = $this->params['accessobject'];
 
 		$tasks = $this->__myTasks();
 		if(!$tasks)
@@ -320,7 +321,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		if ($this->check_access('MyDocuments')) {
+		if ($accessobject->check_view_access('MyDocuments')) {
 			$content .= "    <li class=\"divider\"></li>\n";
 			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		}
diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 263922b07..e6dbb43fc 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -38,6 +38,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 		$httproot = $this->params['httproot'];
 		$quota = $this->params['quota'];
 		$pwdexpiration = $this->params['pwdexpiration'];
+		$accessobject = $this->params['accessobject'];
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -104,7 +105,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</td>";
 			echo "<td>";
-			if($this->check_access(array('UsrMgr', 'RemoveUser'))) {
+			if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) {
 				echo "<div class=\"list-action\">";
 				echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="icon-edit"></i>', false);
 				echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>', false);
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 89f39d80b..5257c23c6 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -194,6 +194,7 @@ $(document).ready( function() {
 		$quota = $this->params['quota'];
 		$undeluserids = $this->params['undeluserids'];
 		$enableemail = $this->params['enableemail'];
+		$accessobject = $this->params['accessobject'];
 
 		if($seluser) {
 ?>
@@ -205,7 +206,7 @@ $(document).ready( function() {
   <ul class="dropdown-menu">
 <?php
 			$menuitems = array();
-			if(!in_array($seluser->getID(), $undeluserids) && $this->check_access('RemoveUser')) {
+			if(!in_array($seluser->getID(), $undeluserids) && $accessobject->check_view_access('RemoveUser')) {
 				$menuitems['removeuser'] = array('link'=>$this->html_url('RemoveUser', array('userid'=>$seluser->getID())), 'label'=>'<i class="icon-remove"></i> '.getMLText("rm_user"));
 			}
 			$menuitems['removeuserfromprozess'] = array('link'=>$this->html_url('RemoveUserFromProcesses', array('userid'=>$seluser->getID())), 'label'=>'<i class="icon-remove"></i> '.getMLText("rm_user_from_processes"));
@@ -248,7 +249,6 @@ $(document).ready( function() {
 		$undeluserids = $this->params['undeluserids'];
 		$workflowmode = $this->params['workflowmode'];
 		$quota = $this->params['quota'];
-		$accessop = $this->params['accessobject'];
 ?>
 	<form class="form-horizontal" action="../op/op.UsrMgr.php" method="post" enctype="multipart/form-data" name="form" id="form">
 <?php
@@ -586,7 +586,7 @@ $(document).ready( function() {
 		$undeluserids = $this->params['undeluserids'];
 		$workflowmode = $this->params['workflowmode'];
 		$quota = $this->params['quota'];
-		$accessop = $this->params['accessobject'];
+		$accessobject = $this->params['accessobject'];
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -616,17 +616,17 @@ $(document).ready( function() {
 		);
 ?>
 </form>
-<?php if($accessop->check_view_access($this, array('action'=>'actionmenu'))) { ?>
+<?php if($accessobject->check_view_access($this, array('action'=>'actionmenu'))) { ?>
 	<div class="ajax" style="margin-bottom: 15px;" data-view="UsrMgr" data-action="actionmenu" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 <?php } ?>
-<?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
+<?php if($accessobject->check_view_access($this, array('action'=>'info'))) { ?>
 	<div class="ajax" data-view="UsrMgr" data-action="info" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 <?php } ?>
 </div>
 
 <div class="span8">
 <?php	$this->contentContainerStart(); ?>
-<?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
+<?php if($accessobject->check_view_access($this, array('action'=>'form'))) { ?>
 		<div class="ajax" data-view="UsrMgr" data-action="form" <?php echo ($seluser ? "data-query=\"userid=".$seluser->getID()."\"" : "") ?>></div>
 <?php } ?>
 	</div>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 365b02065..e1c733b18 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -359,8 +359,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if(!$showfullpreview)
 			return;
 
-		$accessop = $this->params['accessobject'];
-		if($accessop->check_controller_access('ViewOnline', array('action'=>'version'))) {
+		$accessobject = $this->params['accessobject'];
+		if($accessobject->check_controller_access('ViewOnline', array('action'=>'version'))) {
 			$latestContent = $this->callHook('documentLatestContent', $document);
 			if($latestContent === null)
 				$latestContent = $document->getLatestContent();
@@ -444,7 +444,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
-		$accessop = $this->params['accessobject'];
+		$accessobject = $this->params['accessobject'];
 		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableownerreceipt = $this->params['enableownerreceipt'];
@@ -535,7 +535,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if(is_string($txt))
 			echo $txt;
 		$this->documentInfos();
-		if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+		if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) {
 			$this->preview();
 		}
 ?>
@@ -614,11 +614,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$previewer->createPreview($latestContent);
 		if ($file_exists) {
 			if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes))) {
-				if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+				if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) {
 					print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\">";
 				}
 			} else {
-				if($accessop->check_controller_access('Download', array('action'=>'version'))) {
+				if($accessobject->check_controller_access('Download', array('action'=>'version'))) {
 					print "<a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\">";
 				}
 			}
@@ -629,7 +629,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 		}
 		if ($file_exists) {
-			if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run')))
+			if($accessobject->check_controller_access('Download', array('action'=>'run')) || $accessobject->check_controller_access('ViewOnline', array('action'=>'run')))
 				print "</a>";
 		}
 		print "</td>\n";
@@ -682,69 +682,69 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		print "<ul class=\"unstyled actions\">";
 		if ($file_exists){
-			if($accessop->check_controller_access('Download', array('action'=>'version'))) {
+			if($accessobject->check_controller_access('Download', array('action'=>'version'))) {
 				print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a></li>";
 			}
-			if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+			if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) {
 				if ($viewonlinefiletypes && (in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes) || in_array(strtolower($latestContent->getMimeType()), $viewonlinefiletypes)))
 					print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=". $latestContent->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
 			}
 		}
 		print "</ul>";
 		print "<ul class=\"unstyled actions\">";
-		if($this->check_access('EditOnline'))
-			if($accessop->mayEditVersion($document)) {
+		if($accessobject->check_view_access('EditOnline'))
+			if($accessobject->mayEditVersion($document)) {
 				print "<li>".$this->html_link('EditOnline', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_version"), false, true)."</li>";
 			}
 		/* Only admin has the right to remove version in any case or a regular
 		 * user if enableVersionDeletion is on
 		 */
-		if($accessop->check_controller_access('RemoveVersion'))
-			if($accessop->mayRemoveVersion($document)) {
+		if($accessobject->check_controller_access('RemoveVersion'))
+			if($accessobject->mayRemoveVersion($document)) {
 				print "<li>".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-remove\"></i>".getMLText("rm_version"), false, true)."</li>";
 			}
-		if($accessop->check_controller_access('OverrideContentStatus'))
-			if($accessop->mayOverrideStatus($document)) {
+		if($accessobject->check_controller_access('OverrideContentStatus'))
+			if($accessobject->mayOverrideStatus($document)) {
 				print "<li>".$this->html_link('OverrideContentStatus', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-align-justify\"></i>".getMLText("change_status"), false, true)."</li>";
 			}
-		if($enablereceiptworkflow && $accessop->check_controller_access('SetRecipients'))
-			if($accessop->maySetRecipients($document)) {
+		if($enablereceiptworkflow && $accessobject->check_controller_access('SetRecipients'))
+			if($accessobject->maySetRecipients($document)) {
 				print "<li>".$this->html_link('SetRecipients', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-check\"></i>".getMLText("change_recipients"), false, true)."</li>";
 			}
-		if($enablerevisionworkflow && $accessop->check_controller_access('SetRevisors'))
-			if($accessop->maySetRevisors($document)) {
+		if($enablerevisionworkflow && $accessobject->check_controller_access('SetRevisors'))
+			if($accessobject->maySetRevisors($document)) {
 				print "<li>".$this->html_link('SetRevisors', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-refresh\"></i>".getMLText("change_revisors"), false, true)."</li>";
 			}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			// Allow changing reviewers/approvals only if not reviewed
-			if($accessop->check_controller_access('SetReviewersApprovers'))
-				if($accessop->maySetReviewersApprovers($document)) {
+			if($accessobject->check_controller_access('SetReviewersApprovers'))
+				if($accessobject->maySetReviewersApprovers($document)) {
 					print "<li>".$this->html_link('SetReviewersApprovers', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("change_assignments"), false, true)."</li>";
 				}
 		} else {
-			if($accessop->check_controller_access('SetWorkflow'))
-				if($accessop->maySetWorkflow($document)) {
+			if($accessobject->check_controller_access('SetWorkflow'))
+				if($accessobject->maySetWorkflow($document)) {
 					if(!$workflow) {
 						print "<li>".$this->html_link('SetWorkflow', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-random\"></i>".getMLText("set_workflow"), false, true)."</li>";
 					}
 				}
 		}
 		/*
-		if($accessop->maySetExpires($document)) {
+		if($accessobject->maySetExpires($document)) {
 			print "<li>".$this->html_link('SetExpires', array('documentid'=>$documentid), array(), "<i class=\"icon-time\"></i>".getMLText("set_expiry"), false, true)."</li>";
 		}
 		 */
-		if($accessop->check_controller_access('AddToTransmittal'))
+		if($accessobject->check_controller_access('AddToTransmittal'))
 			if($dms->getAllTransmittals($user)) {
-				if($this->check_access('AddToTransmittal'))
+				if($accessobject->check_view_access('AddToTransmittal'))
 					print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
 			}
-		if($accessop->check_controller_access('EditComment'))
-			if($accessop->mayEditComment($document)) {
+		if($accessobject->check_controller_access('EditComment'))
+			if($accessobject->mayEditComment($document)) {
 				print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";
 			}
-		if($accessop->check_controller_access('EditAttributes'))
-			if($accessop->mayEditAttributes($document)) {
+		if($accessobject->check_controller_access('EditAttributes'))
+			if($accessobject->mayEditAttributes($document)) {
 				print "<li>".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_attributes"), false, true)."</li>";
 			}
 
@@ -881,7 +881,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print htmlspecialchars($r["comment"]);
 					if($r['file']) {
 						echo "<br />";
-						if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+						if($accessobject->check_controller_access('Download', array('action'=>'run'))) {
 							echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
 						}
 					}
@@ -891,11 +891,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					if($accesserr)
 						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
 
-					if($accessop->mayReview($document)) {
+					if($accessobject->mayReview($document)) {
 						if ($is_reviewer) {
 							if ($r["status"]==0) {
 								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("add_review"), false, true)."</li>";
-							} elseif ($accessop->mayUpdateReview($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))){
+							} elseif ($accessobject->mayUpdateReview($document, $updateUser) && (($r["status"]==1)||($r["status"]==-1))){
 								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 							}
 						}
@@ -973,7 +973,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print htmlspecialchars($a["comment"]);
 					if($a['file']) {
 						echo "<br />";
-						if($accessop->check_controller_access('Download', array('action'=>'run'))) {
+						if($accessobject->check_controller_access('Download', array('action'=>'run'))) {
 							echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
 						}
 					}
@@ -983,11 +983,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					if($accesserr)
 						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
 
-					if($accessop->mayApprove($document)) {
+					if($accessobject->mayApprove($document)) {
 						if ($is_approver) {
 							if ($a['status'] == 0) {
 								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("add_approval"), false, true)."</li>";
-							} elseif ($accessop->mayUpdateApproval($document, $updateUser) && (($a["status"]==1)||($a["status"]==-1))){
+							} elseif ($accessobject->mayUpdateApproval($document, $updateUser) && (($a["status"]==1)||($a["status"]==-1))){
 								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 							}
 						}
@@ -1045,7 +1045,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		  <div class="tab-pane <?php if($currenttab == 'workflow') echo 'active'; ?>" id="workflow">
 <?php
 			echo "<div class=\"row-fluid\">";
-			if ($user_is_involved && $this->check_access('WorkflowGraph'))
+			if ($user_is_involved && $accessobject->check_view_access('WorkflowGraph'))
 				echo "<div class=\"span6\">";
 			else
 				echo "<div class=\"span12\">";
@@ -1233,7 +1233,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 			$this->contentContainerEnd();
 			echo "</div>";
-			if ($user_is_involved && $this->check_access('WorkflowGraph')) {
+			if ($user_is_involved && $accessobject->check_view_access('WorkflowGraph')) {
 				echo "<div class=\"span6\">";
 ?>
 	<iframe src="out.WorkflowGraph.php?workflow=<?php echo $workflow->getID(); ?><?php if($allowedtransitions) foreach($allowedtransitions as $tr) {echo "&transitions[]=".$tr->getID();} ?>" width="99%" height="661" style="border: 1px solid #AAA;"></iframe>
@@ -1322,11 +1322,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
 						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
-					if($accessop->mayReceipt($document)) {
+					if($accessobject->mayReceipt($document)) {
 						if ($is_recipient) {
 							if($r["status"]==0) {
 								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."</li>";
-							} elseif ($accessop->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1 && $enablereceiptreject)||($r["status"]==-1))) {
+							} elseif ($accessobject->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1 && $enablereceiptreject)||($r["status"]==-1))) {
 								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
 							}
 						}
@@ -1340,7 +1340,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		</table>
 <?php
 			$this->contentContainerEnd();
-			if($accessop->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) {
+			if($accessobject->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) {
 				/* Do not count entries '-2' as they are removed userѕ */
 				$totalreceipts = $stat['-1'] + $stat['0'] + $stat['1'];
 ?>
@@ -1448,7 +1448,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
 						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
-					if($accessop->mayRevise($document)) {
+					if($accessobject->mayRevise($document)) {
 						if ($is_recipient && $r["status"]==0) {
 							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."</li>";
 						} elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
@@ -1505,11 +1505,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
 				if($file_exists) {
 					if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes))) {
-						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+						if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) {
 							print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\">";
 						}
 					} else {
-						if($accessop->check_controller_access('Download', array('action'=>'version'))) {
+						if($accessobject->check_controller_access('Download', array('action'=>'version'))) {
 							print "<a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\">";
 						}
 					}
@@ -1521,7 +1521,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
 				}
 				if($file_exists) {
-					if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run')))
+					if($accessobject->check_controller_access('Download', array('action'=>'run')) || $accessobject->check_controller_access('ViewOnline', array('action'=>'run')))
 						print "</a>\n";
 				}
 				print "</td>\n";
@@ -1560,11 +1560,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>";
 				print "<ul class=\"actions unstyled\">";
 				if ($file_exists){
-					if($accessop->check_controller_access('Download', array('action'=>'version'))) {
+					if($accessobject->check_controller_access('Download', array('action'=>'version'))) {
 						print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-download\"></i>".getMLText("download")."</a>";
 					}
 					if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes)))
-						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+						if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) {
 							print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a>";
 						}
 					print "</ul>";
@@ -1573,15 +1573,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				/* Only admin has the right to remove version in any case or a regular
 				 * user if enableVersionDeletion is on
 				 */
-				if($accessop->mayRemoveVersion($document)) {
+				if($accessobject->mayRemoveVersion($document)) {
 					print "<li>".$this->html_link('RemoveVersion', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-remove\"></i>".getMLText("rm_version"), false, true)."</li>";
 				}
-				if($accessop->check_controller_access('AddToTransmittal'))
+				if($accessobject->check_controller_access('AddToTransmittal'))
 					print "<li>".$this->html_link('AddToTransmittal', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-list\"></i>".getMLText("add_to_transmittal"), false, true)."</li>";
-				if($accessop->mayEditComment($document)) {
+				if($accessobject->mayEditComment($document)) {
 					print "<li>".$this->html_link('EditComment', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-comment\"></i>".getMLText("edit_comment"), false, true)."</li>";
 				}
-				if($accessop->mayEditAttributes($document)) {
+				if($accessobject->mayEditAttributes($document)) {
 					print "<li>".$this->html_link('EditAttributes', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-edit\"></i>".getMLText("edit_attributes"), false, true)."</li>";
 				}
 				print "<li>".$this->html_link('DocumentVersionDetail', array('documentid'=>$documentid, 'version'=>$version->getVersion()), array(), "<i class=\"icon-info-sign\"></i>".getMLText("details"), false, true)."</li>";
@@ -1630,11 +1630,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$previewer->createPreview($file, $previewwidthdetail);
 				if($file_exists) {
 					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes))) {
-						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+						if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) {
 							print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\">";
 						}
 					} else {
-						if($accessop->check_controller_access('Download', array('action'=>'file'))) {
+						if($accessobject->check_controller_access('Download', array('action'=>'file'))) {
 							print "<a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\">";
 						}
 					}
@@ -1645,7 +1645,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
 				}
 				if($file_exists) {
-					if($accessop->check_controller_access('Download', array('action'=>'run')) || $accessop->check_controller_access('ViewOnline', array('action'=>'run')))
+					if($accessobject->check_controller_access('Download', array('action'=>'run')) || $accessobject->check_controller_access('ViewOnline', array('action'=>'run')))
 						print "</a>";
 				}
 				print "</td>";
@@ -1669,11 +1669,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			
 				print "<td><ul class=\"unstyled actions\">";
 				if ($file_exists) {
-					if($accessop->check_controller_access('Download', array('action'=>'file'))) {
+					if($accessobject->check_controller_access('Download', array('action'=>'file'))) {
 						print "<li><a href=\"../op/op.Download.php?documentid=".$documentid."&file=".$file->getID()."\"><i class=\"icon-download\"></i>".getMLText('download')."</a></li>";
 					}
 					if ($viewonlinefiletypes && (in_array(strtolower($file->getFileType()), $viewonlinefiletypes) || in_array(strtolower($file->getMimeType()), $viewonlinefiletypes))) {
-						if($accessop->check_controller_access('ViewOnline', array('action'=>'run'))) {
+						if($accessobject->check_controller_access('ViewOnline', array('action'=>'run'))) {
 							print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
 						}
 					}
@@ -1692,7 +1692,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		else printMLText("no_attached_files");
 
-		if($accessop->check_controller_access('AddFile')) {
+		if($accessobject->check_controller_access('AddFile')) {
 			if ($document->getAccessMode($user) >= M_READWRITE){
 				print "<ul class=\"unstyled\"><li>".$this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn'), getMLText("add"), false, true)."</li></ul>\n";
 			}

From 3012fc52e5df5b8b6bea76ad5f38a0e407ce90ec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 15:09:40 +0100
Subject: [PATCH 1160/2006] include "inc/inc.ClassAccessOperation.php"

---
 out/out.Login.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.Login.php b/out/out.Login.php
index ca47cee0d..e1ee7d0df 100644
--- a/out/out.Login.php
+++ b/out/out.Login.php
@@ -26,6 +26,7 @@ require_once("inc/inc.Utils.php");
 require_once("inc/inc.Language.php");
 require_once("inc/inc.Init.php");
 require_once("inc/inc.Extension.php");
+require_once("inc/inc.ClassAccessOperation.php");
 require_once("inc/inc.ClassUI.php");
 
 include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";

From 85157a8bfe1258ca5c7e5e6ac4c848cea526dbe2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 18:12:26 +0100
Subject: [PATCH 1161/2006] no access on some more scripts

---
 inc/inc.ClassAccessOperation.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index b4d44aae4..51a53626a 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -452,7 +452,6 @@ class SeedDMS_AccessOperation {
 			'ForcePasswordChange',
 			'GroupView',
 			'Help',
-			'Info',
 			'KeywordChooser',
 			'Login',
 			'ManageNotify',
@@ -489,14 +488,11 @@ class SeedDMS_AccessOperation {
 			'SetRevisors',
 			'SetWorkflow',
 			'SubstituteUser',
-			'TimelineFeed',
-			'Timeline',
 			'TransmittalMgr',
 			'TriggerWorkflow',
 			'UpdateDocument',
 			'UserDefaultKeywords',
 			'UserImage',
-			'UserList',
 			'UsrView',
 			'ViewDocument',
 			'ViewEvent',

From 4b55bc4fd8edc91c80622e6c7b33212128b2db52 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 18:14:43 +0100
Subject: [PATCH 1162/2006] allow add to transmittals with only read access on
 document

---
 out/out.AddToTransmittal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.AddToTransmittal.php b/out/out.AddToTransmittal.php
index a8d528eff..a6602608e 100644
--- a/out/out.AddToTransmittal.php
+++ b/out/out.AddToTransmittal.php
@@ -45,7 +45,7 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
-if ($document->getAccessMode($user) < M_ALL) {
+if ($document->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 

From 89d5c988184543d9f84f26fb720b04d777eb2ab4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 18:15:10 +0100
Subject: [PATCH 1163/2006] set onepage for view

---
 out/out.TransmittalMgr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index b43453423..2e7c789ff 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -52,6 +52,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('accessobject', $accessop);
+	$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
 	$view($_GET);
 	exit;
 }

From 04f9edbb39080be92ae46c6bd48f90d8ddc9e268 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Nov 2019 19:39:47 +0100
Subject: [PATCH 1164/2006] make download button primary

---
 views/bootstrap/class.TransmittalMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 6b38414f1..d966a2f62 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -301,7 +301,7 @@ $(document).ready( function() {
 					}
 				}
 				print "</tbody>\n</table>\n";
-				print "<a class=\"btn btn-default\" href=\"../op/op.TransmittalDownload.php?transmittalid=".$seltransmittal->getID()."\">".getMLText('download')."</a>";
+				print "<a class=\"btn btn-primary\" href=\"../op/op.TransmittalDownload.php?transmittalid=".$seltransmittal->getID()."\">".getMLText('download')."</a>";
 			}
 		}
 	} /* }}} */

From 7d9de047bdbfb76215953d23bc9104c35b09f6b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 09:31:56 +0100
Subject: [PATCH 1165/2006] add legacy access rights for groups

---
 inc/inc.ClassAccessOperation.php | 178 +++++++++++++++++--------------
 1 file changed, 96 insertions(+), 82 deletions(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index e03c3f3f4..0584f0a6e 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -406,7 +406,7 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 
-	protected function check_view_lecacy_access($view, $get=array()) { /* {{{ */
+	protected function check_view_legacy_access($view, $get=array()) { /* {{{ */
 		if($this->user->isAdmin())
 			return true;
 
@@ -419,86 +419,100 @@ class SeedDMS_AccessOperation {
 		} else {
 			return false;
 		}
-		if(array_intersect($scripts, array(
-			'AddDocument',
-			'AddEvent',
-			'AddFile',
-			'AddSubFolder',
-			'AddToTransmittal',
-			'ApprovalSummary',
-			'ApproveDocument',
-			'Calendar',
-			'CategoryChooser',
-			'ChangePassword',
-			'CheckInDocument',
-			'Clipboard',
-			'DocumentAccess',
-			'DocumentChooser',
-			'DocumentNotify',
-			'DocumentVersionDetail',
-			'DropFolderChooser',
-			'EditAttributes',
-			'EditComment',
-			'EditDocumentFile',
-			'EditDocument',
-			'EditEvent',
-			'EditFolder',
-			'EditOnline',
-			'EditUserData',
-			'ErrorDlg',
-			'FolderAccess',
-			'FolderChooser',
-			'FolderNotify',
-			'ForcePasswordChange',
-			'GroupView',
-			'Help',
-			'KeywordChooser',
-			'Login',
-			'ManageNotify',
-			'MoveDocument',
-			'MoveFolder',
-			'MyAccount',
-			'MyDocuments',
-			'OpensearchDesc',
-			'OverrideContentStatus',
-			'PasswordForgotten',
-			'PasswordSend',
-			'ReceiptDocument',
-			'ReceiptSummary',
-			'RemoveDocumentFile',
-			'RemoveDocument',
-			'RemoveEvent',
-			'RemoveFolderFiles',
-			'RemoveFolder',
-			'RemoveTransmittal',
-			'RemoveVersion',
-			'RemoveWorkflowFromDocument',
-			'ReturnFromSubWorkflow',
-			'ReviewDocument',
-			'ReviewSummary',
-			'ReviseDocument',
-			'RewindWorkflow',
-			'RunSubWorkflow',
-			'SearchForm',
-			'Search',
-			'Session',
-			'SetExpires',
-			'SetRecipients',
-			'SetReviewersApprovers',
-			'SetRevisors',
-			'SetWorkflow',
-			'SubstituteUser',
-			'TransmittalMgr',
-			'TriggerWorkflow',
-			'UpdateDocument',
-			'UserDefaultKeywords',
-			'UserImage',
-			'UsrView',
-			'ViewDocument',
-			'ViewEvent',
-			'ViewFolder',
-			'WorkflowGraph',
-			'WorkflowSummary')))
+
+		if($this->user->isGuest()) {
+			$user_allowed = array(
+				'Calendar',
+				'ErrorDlg',
+				'Help',
+				'Login',
+				'Search',
+				'ViewDocument',
+				'ViewFolder',
+			);
+		} else {
+			$user_allowed = array(
+				'AddDocument',
+				'AddEvent',
+				'AddFile',
+				'AddSubFolder',
+				'AddToTransmittal',
+				'ApprovalSummary',
+				'ApproveDocument',
+				'Calendar',
+				'CategoryChooser',
+				'ChangePassword',
+				'CheckInDocument',
+				'Clipboard',
+				'DocumentAccess',
+				'DocumentChooser',
+				'DocumentNotify',
+				'DocumentVersionDetail',
+				'DropFolderChooser',
+				'EditAttributes',
+				'EditComment',
+				'EditDocumentFile',
+				'EditDocument',
+				'EditEvent',
+				'EditFolder',
+				'EditOnline',
+				'EditUserData',
+				'ErrorDlg',
+				'FolderAccess',
+				'FolderChooser',
+				'FolderNotify',
+				'ForcePasswordChange',
+				'GroupView',
+				'Help',
+				'KeywordChooser',
+				'Login',
+				'ManageNotify',
+				'MoveDocument',
+				'MoveFolder',
+				'MyAccount',
+				'MyDocuments',
+				'OpensearchDesc',
+				'OverrideContentStatus',
+				'PasswordForgotten',
+				'PasswordSend',
+				'ReceiptDocument',
+				'ReceiptSummary',
+				'RemoveDocumentFile',
+				'RemoveDocument',
+				'RemoveEvent',
+				'RemoveFolderFiles',
+				'RemoveFolder',
+				'RemoveTransmittal',
+				'RemoveVersion',
+				'RemoveWorkflowFromDocument',
+				'ReturnFromSubWorkflow',
+				'ReviewDocument',
+				'ReviewSummary',
+				'ReviseDocument',
+				'RewindWorkflow',
+				'RunSubWorkflow',
+				'Search',
+				'Session',
+				'SetExpires',
+				'SetRecipients',
+				'SetReviewersApprovers',
+				'SetRevisors',
+				'SetWorkflow',
+				'SubstituteUser',
+				'TransmittalMgr',
+				'TriggerWorkflow',
+				'UpdateDocument',
+				'UserDefaultKeywords',
+				'UserImage',
+				'UsrView',
+				'ViewDocument',
+				'ViewEvent',
+				'ViewFolder',
+				'WorkflowGraph',
+				'WorkflowSummary');
+		}
+
+		if(array_intersect($scripts, $user_allowed))
 			return true;
 
 		return false;
@@ -524,7 +538,7 @@ class SeedDMS_AccessOperation {
 	 */
 	function check_view_access($view, $get=array()) { /* {{{ */
 		if(!$this->settings->_advancedAcl) {
-			return $this->check_view_lecacy_access($view, $get);
+			return $this->check_view_legacy_access($view, $get);
 		}
 		if(is_string($view)) {
 			$scripts = array($view);

From 893a8d6d8dd099936ad253276b9d617bdff2d83b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 09:32:32 +0100
Subject: [PATCH 1166/2006] return json even in case of an error

---
 op/op.EditOnline.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/op/op.EditOnline.php b/op/op.EditOnline.php
index b19eb420b..7277f5a1e 100644
--- a/op/op.EditOnline.php
+++ b/op/op.EditOnline.php
@@ -28,28 +28,38 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('EditOnline', $_POST)) {
+	echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied')));
+	exit;
+}
+
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
-	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+	echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id')));
+	exit;
 }
 
 $documentid = $_POST["documentid"];
 $document = $dms->getDocument($documentid);
 
 if (!is_object($document)) {
-	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+	echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_doc_id')));
+	exit;
 }
 
 $folder = $document->getFolder();
 $docPathHTML = getFolderPathHTML($folder, true). " / <a href=\"../out/out.ViewDocument.php?documentid=".$documentid."\">".$document->getName()."</a>";
 
 if ($document->getAccessMode($user, 'editOnline') < M_READWRITE) {
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+	echo json_encode(array('success'=>false, 'message'=>getMLText('access_denied')));
+	exit;
 }
 
 if($document->isLocked()) {
 	$lockingUser = $document->getLockingUser();
 	if (($lockingUser->getID() != $user->getID()) && ($document->getAccessMode($user, 'editOnline') != M_ALL)) {
-		UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName()))));
+		echo json_encode(array('success'=>false, 'message'=>getMLText("lock_message", array("email" => $lockingUser->getEmail(), "username" => htmlspecialchars($lockingUser->getFullName())))));
+		exit;
 	}
 }
 

From b3cc272941e9316cea36c216de88b4ba6bde40be Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 09:33:13 +0100
Subject: [PATCH 1167/2006] check access

---
 op/op.LockDocument.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/op/op.LockDocument.php b/op/op.LockDocument.php
index a72b873fa..b4937e706 100644
--- a/op/op.LockDocument.php
+++ b/op/op.LockDocument.php
@@ -40,6 +40,11 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('LockDocument', $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 $folder = $document->getFolder();
 $docPathHTML = getFolderPathHTML($folder, true). " / <a href=\"../out/out.ViewDocument.php?documentid=".$documentid."\">".$document->getName()."</a>";
 

From 684f27ef8790071d7513fb539620eab4e286d491 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 09:34:12 +0100
Subject: [PATCH 1168/2006] fix output of group name

---
 views/bootstrap/class.ApprovalSummary.php | 2 +-
 views/bootstrap/class.ReceiptSummary.php  | 2 +-
 views/bootstrap/class.ReviewSummary.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index e804fbe61..5a56c1748 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -148,7 +148,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
 				echo $this->documentListRowStart($document, $class);
 				echo $this->documentListRow($document, $previewer, true, $st['version']);
-				print "<td><small>".getApprovalStatusText($st["status"])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
+				print "<td><small>".getApprovalStatusText($st["status"])."<br />".$st["date"]."<br />". htmlspecialchars($modgroup->getName()) ."</small></td>";
 				echo $this->documentListRowEnd($document);
 				}
 			}
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 6e7bd8df5..40305389d 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -140,7 +140,7 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
 					echo "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document".$class."\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
 					echo $this->documentListRow($document, $previewer, true, $st['version']);
-					print "<td><small>".getReceiptStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
+					print "<td><small>".getReceiptStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($modgroup->getName()) ."</small></td>";
 					echo "</tr>";
 				}
 			}
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 2d58207c5..41e6a3ea0 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -151,7 +151,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 //					print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
 					echo $this->documentListRowStart($document, $class);
 					echo $this->documentListRow($document, $previewer, true, $st['version']);
-					print "<td><small>".getReviewStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
+					print "<td><small>".getReviewStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($modgroup->getName()) ."</small></td>";
 					print "</tr>\n";
 				}
 			}

From 79aa6c079c3ee83d3344957c0944c67ed456a9c9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 09:35:05 +0100
Subject: [PATCH 1169/2006] replace check for guest by generic acl check

---
 views/bootstrap/class.Bootstrap.php | 59 ++++++++++++++++-------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 8bef887e2..38c64f423 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -359,7 +359,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo "    <li class=\"dropdown\">\n";
 			echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".($this->params['session']->getSu() ? getMLText("switched_to") : getMLText("signed_in_as"))." '".htmlspecialchars($this->params['user']->getFullName())."' <i class=\"icon-caret-down\"></i></a>\n";
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
-			if (!$this->params['user']->isGuest()) {
+//			if (!$this->params['user']->isGuest()) {
 				$menuitems = array();
 				if ($accessobject->check_view_access('MyDocuments'))
 					$menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php", 'label'=>'my_documents');
@@ -379,7 +379,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					}
 					echo "    <li class=\"divider\"></li>\n";
 				}
-			}
+//			}
 			$showdivider = false;
 			if($this->params['enablelanguageselector']) {
 				$showdivider = true;
@@ -421,16 +421,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo "    </li>\n";
 			echo "   </ul>\n";
 
-			if($this->params['enablemenutasks'] && !$this->params['user']->isGuest()) {
-				echo "   <div id=\"menu-tasks\">";
-				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>";
-//				echo "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
-//				echo "    <li class=\"dropdown\">\n";
-//				echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
-//				echo "    </li>\n";
-//				echo "   </ul>\n";
-				echo "   </div>";
-				//$this->addFooterJS('checkTasks();');
+			if($this->params['enablemenutasks']) {
+				if($accessobject->check_view_access('Tasks', array('action'=>'menuTasks'))) {
+					echo "   <div id=\"menu-tasks\">";
+					echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>";
+	//				echo "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
+	//				echo "    <li class=\"dropdown\">\n";
+	//				echo $this->menuTasks(array('review'=>array(), 'approval'=>array(), 'receipt'=>array(), 'revision'=>array()));
+	//				echo "    </li>\n";
+	//				echo "   </ul>\n";
+					echo "   </div>";
+					//$this->addFooterJS('checkTasks();');
+				}
 			}
 
 			if($this->params['dropfolderdir'] && $this->params['enabledropfolderlist']) {
@@ -587,7 +589,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<ul class=\"nav\">\n";
 		$menuitems = array();
 
-		if ($accessMode == M_READ && !$this->params['user']->isGuest()) {
+		if ($accessMode == M_READ) {
 			if ($accessobject->check_view_access('FolderNotify'))
 			$menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_notify');
 		}
@@ -611,7 +613,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			}
 			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>'edit_existing_notify');
 		}
-		if ($this->params['user']->isAdmin() && $this->params['enablefullsearch']) {
+		if ($accessobject->check_view_access('Indexer') && $this->params['enablefullsearch']) {
 			$menuitems['index_folder'] = array('link'=>"../out/out.Indexer.php?folderid=". $folderID."&showtree=".showtree(), 'label'=>'index_folder');
 		}
 
@@ -638,7 +640,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		if ($accessMode >= M_READWRITE) {
 			if (!$document->isLocked()) {
 				$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
-				$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>'lock_document');
+				if($accessobject->check_controller_access('LockDocument'))
+					$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>'lock_document');
 				if($document->isCheckedOut())
 					$menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>'checkin_document');
 				else {
@@ -653,7 +656,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				$lockingUser = $document->getLockingUser();
 				if (($lockingUser->getID() == $this->params['user']->getID()) || ($document->getAccessMode($this->params['user']) == M_ALL)) {
 					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
-					$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>'unlock_document');
+					if($accessobject->check_controller_access('UnlockDocument'))
+						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>'unlock_document');
 					if($document->isCheckedOut()) {
 						$menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>'checkin_document');
 					} else {
@@ -665,20 +669,22 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 				}
 			}
-			if($this->params['accessobject']->maySetExpires($document)) {
-				$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>'expires');
-			//	$menuitems[''] = array('link'=>"", 'label'=>'');
+			if($accessobject->maySetExpires($document)) {
+				if ($accessobject->check_view_access('SetExpires'))
+					$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>'expires');
 			}
 		}
 		if ($accessMode == M_ALL) {
-			$menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>'rm_document');
+			if ($accessobject->check_view_access('RemoveDocument'))
+				$menuitems['rm_document'] = array('link'=>"../out/out.RemoveDocument".$docid, 'label'=>'rm_document');
 			if ($accessobject->check_view_access('DocumentAccess'))
 				$menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>'edit_document_access');
 		}
-		if ($accessMode >= M_READ && !$this->params['user']->isGuest()) {
-			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify');
+		if ($accessMode >= M_READ) {
+			if ($accessobject->check_view_access('DocumentNotify'))
+				$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>'edit_existing_notify');
 		}
-		if ($this->params['user']->isAdmin()) {
+		if ($accessobject->check_view_access('TransferDocument')) {
 			$menuitems['transfer_document'] = array('link'=>"../out/out.TransferDocument". $docid, 'label'=>'transfer_document');
 		}
 
@@ -712,7 +718,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<ul class=\"nav\">\n";
 
 		$menuitems = array();
-		if ($this->params['user']->isAdmin() || !$this->params['disableselfedit'])
+		if ($accessobject->check_view_access('EditUserData') || !$this->params['disableselfedit'])
 			$menuitems['edit_user_details'] = array('link'=>"../out/out.EditUserData.php", 'label'=>'edit_user_details');
 		
 		if (!$this->params['user']->isAdmin()) 
@@ -881,7 +887,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=w".$ds."\">".getMLText("week_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=m".$ds."\">".getMLText("month_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=y".$ds."\">".getMLText("year_view")."</a></li>\n";
-		if (!$this->params['user']->isGuest()) echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
+		if($accessobject->check_view_access(array('AddEvent')))
+			echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
 		echo "</ul>\n";
 		echo "</div>\n";
 		return;
@@ -894,7 +901,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<ul class=\"nav\">\n";
 
 		$menuitems = array();
-		if (!$this->params['user']->isGuest())
+		if($accessobject->check_view_access(array('AddEvent')))
 			$menuitems['addevent'] = array('link'=>"../out/out.AddEvent.php", 'label'=>'add_event');
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */

From 0d4c970029cc534ce110eb31a0b64884f68625c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 09:35:59 +0100
Subject: [PATCH 1170/2006] replace check for guest by generic acl check

---
 views/bootstrap/class.ViewDocument.php | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index e1c733b18..ab2675a66 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1736,9 +1736,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 			print "</tbody>\n</table>\n";
 		}
-		else printMLText("no_linked_files");
+		else $this->infoMsg(getMLText("no_linked_files"));
 
-		if (!$user->isGuest()){
+		if ($accessobject->check_view_access('AddDocumentLink')){
 			$this->contentContainerStart();
 ?>
 			<br>
@@ -1818,28 +1818,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($user->isAdmin()) {
 			$timeline = $latestContent->getDocument()->getTimeline();
 			if($timeline) {
-				/*
-				$this->contentHeading(getMLText("timeline"));
-				foreach($timeline as &$item) {
-					switch($item['type']) {
-					case 'add_version':
-						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version']));
-						break;
-					case 'add_file':
-						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName()));
-						break;
-					case 'status_change':
-						$msg = getMLText('timeline_'.$item['type'], array('document'=>$item['document']->getName(), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
-						break;
-					default:
-						$msg = $this->callHook('getTimelineMsg', $latestContent->getDocument(), $item);
-						if(!is_string($msg))
-							$msg = '???';
-					}
-					$item['msg'] = $msg;
-				}
-				 */
-//				$this->printTimeline('out.ViewDocument.php?action=timelinedata&documentid='.$document->getID(), 300, '', date('Y-m-d'));
 				$this->printTimelineHtml(300);
 			}
 		}

From cbac16773da93af6b7fdcd63405831a34e84a7b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 09:36:32 +0100
Subject: [PATCH 1171/2006] more checking for access rights

---
 op/op.UnlockDocument.php             | 5 +++++
 out/out.RemoveDocument.php           | 4 ++++
 out/out.SetExpires.php               | 4 ++++
 out/out.TransferDocument.php         | 5 +++--
 views/bootstrap/class.EditOnline.php | 7 ++++++-
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/op/op.UnlockDocument.php b/op/op.UnlockDocument.php
index 7af019958..693fe3d02 100644
--- a/op/op.UnlockDocument.php
+++ b/op/op.UnlockDocument.php
@@ -38,6 +38,11 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('LockDocument', $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 $folder = $document->getFolder();
 $docPathHTML = getFolderPathHTML($folder, true). " / <a href=\"../out/out.ViewDocument.php?documentid=".$documentid."\">".$document->getName()."</a>";
 
diff --git a/out/out.RemoveDocument.php b/out/out.RemoveDocument.php
index 4e36a1278..69cc1cc54 100644
--- a/out/out.RemoveDocument.php
+++ b/out/out.RemoveDocument.php
@@ -43,6 +43,10 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
 if ($document->getAccessMode($user) < M_ALL) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
diff --git a/out/out.SetExpires.php b/out/out.SetExpires.php
index e829e3a10..91154de8f 100644
--- a/out/out.SetExpires.php
+++ b/out/out.SetExpires.php
@@ -44,6 +44,10 @@ if (!is_object($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
 
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
+}
+
 if(!$accessop->maySetExpires($document)) {
 	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
diff --git a/out/out.TransferDocument.php b/out/out.TransferDocument.php
index bfaea3b43..198d46330 100644
--- a/out/out.TransferDocument.php
+++ b/out/out.TransferDocument.php
@@ -32,8 +32,9 @@ require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-if (!$user->isAdmin()) {
-	UI::exitError(getMLText("document"),getMLText("access_denied"));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
 }
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php
index 04f3b3f06..7c0ce25a4 100644
--- a/views/bootstrap/class.EditOnline.php
+++ b/views/bootstrap/class.EditOnline.php
@@ -95,6 +95,7 @@ $(document).ready(function()	{
 		$cachedir = $this->params['cachedir'];
 		$previewwidthlist = $this->params['previewWidthList'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
+		$accessobject = $this->params['accessobject'];
 
 		$set = 'markdown'; //default or markdown
 		$skin = 'simple'; // simple or markitup
@@ -124,9 +125,13 @@ $this->contentHeading(getMLText("content"));
 ?>
 </textarea>
 <?php
-	echo $this->warningMsg(getMLText('edit_online_warning'));
+		if($accessobject->check_controller_access('EditOnline')) {
+			echo $this->warningMsg(getMLText('edit_online_warning'));
 ?>
 <button id="update" type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save"); ?></button>
+<?php
+		}
+?>
 </form>
 <?php
 		echo "</div>\n";

From 10f6606efaa510af72d6b1ddac23e5d1e86a2622 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 11:50:11 +0100
Subject: [PATCH 1172/2006] add RevisionSummary to list of lecacy access rights

---
 inc/inc.ClassAccessOperation.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 0584f0a6e..ae780d6fa 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -489,6 +489,7 @@ class SeedDMS_AccessOperation {
 				'ReviewDocument',
 				'ReviewSummary',
 				'ReviseDocument',
+				'RevisionSummary',
 				'RewindWorkflow',
 				'RunSubWorkflow',
 				'Search',

From e4b934ea76143358a680803bc63e23fbe6fc04f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 11:51:08 +0100
Subject: [PATCH 1173/2006] add js code for one page mode

---
 views/bootstrap/class.MyDocuments.php    | 1 +
 views/bootstrap/class.ReceiptSummary.php | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 2743deb94..a5cc83e5c 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -38,6 +38,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
+		$this->printClickDocumentJs();
 ?>
 $(document).ready( function() {
 	$('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 40305389d..0176d30fe 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -36,6 +36,14 @@ require_once("SeedDMS/Preview.php");
  */
 class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+
+		$this->printDeleteDocumentButtonJs();
+		$this->printClickDocumentJs();
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];

From 293e26c74715bc90d0ecb8521a436ab5026ee004 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 Nov 2019 20:48:11 +0100
Subject: [PATCH 1174/2006] add access checks for summaries, add Revision
 summary

---
 out/out.RevisionSummary.php               |  56 +++++++
 views/bootstrap/class.Bootstrap.php       |   6 +
 views/bootstrap/class.RevisionSummary.php | 176 ++++++++++++++++++++++
 3 files changed, 238 insertions(+)
 create mode 100644 out/out.RevisionSummary.php
 create mode 100644 views/bootstrap/class.RevisionSummary.php

diff --git a/out/out.RevisionSummary.php b/out/out.RevisionSummary.php
new file mode 100644
index 000000000..91140afd7
--- /dev/null
+++ b/out/out.RevisionSummary.php
@@ -0,0 +1,56 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005 Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
+}
+
+if ($user->isGuest()) {
+	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
+}
+
+if($view) {
+	$view->setParam('showtree', showtree());
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
+	$view->setParam('xsendfile', $settings->_enableXsendfile);
+	$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
+	$view($_GET);
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 990d8610a..6722eb165 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -757,12 +757,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$menuitems['inprocess'] = array('link'=>"../out/out.MyDocuments.php?inProcess=1", 'label'=>'documents_in_process');
 		$menuitems['all_documents'] = array('link'=>"../out/out.MyDocuments.php", 'label'=>'all_documents');
 		if($this->params['workflowmode'] == 'traditional' || $this->params['workflowmode'] == 'traditional_only_approval') {
+			if ($accessobject->check_view_access('ReviewSummary'))
 			$menuitems['review_summary'] = array('link'=>"../out/out.ReviewSummary.php", 'label'=>'review_summary');
+			if ($accessobject->check_view_access('ApprovalSummary'))
 			$menuitems['approval_summary'] = array('link'=>"../out/out.ApprovalSummary.php", 'label'=>'approval_summary');
 		} else {
+			if ($accessobject->check_view_access('WorkflowSummary'))
 			$menuitems['workflow_summary'] = array('link'=>"../out/out.WorkflowSummary.php", 'label'=>'workflow_summary');
 		}
+		if ($accessobject->check_view_access('ReceiptSummary'))
 		$menuitems['receipt_summary'] = array('link'=>"../out/out.ReceiptSummary.php", 'label'=>'receipt_summary');
+		if ($accessobject->check_view_access('RevisionSummary'))
+		$menuitems['revision_summary'] = array('link'=>"../out/out.RevisionSummary.php", 'label'=>'revision_summary');
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
 		if($this->hasHook('mydocumentsNavigationBar'))
diff --git a/views/bootstrap/class.RevisionSummary.php b/views/bootstrap/class.RevisionSummary.php
new file mode 100644
index 000000000..7fa86ebc5
--- /dev/null
+++ b/views/bootstrap/class.RevisionSummary.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Implementation of ReviewSummary view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+/**
+ * Class which outputs the html page for ReviewSummary view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
+
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+
+		$this->printDeleteDocumentButtonJs();
+		$this->printClickDocumentJs();
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewconverters'];
+		$timeout = $this->params['timeout'];
+		$xsendfile = $this->params['xsendfile'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+		$previewer->setConverters($previewconverters);
+
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
+		$this->htmlStartPage(getMLText("my_documents"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_documents"), "my_documents");
+
+		echo "<div class=\"row-fluid\">\n";
+		echo "<div class=\"span6\">\n";
+		$this->contentHeading(getMLText("revision_summary"));
+//		$this->contentContainerStart();
+
+		// TODO: verificare scadenza
+
+		// Get document list for the current user.
+		$revisionStatus = $user->getRevisionStatus();
+
+		// reverse order
+		$revisionStatus["indstatus"]=array_reverse($revisionStatus["indstatus"],true);
+		$revisionStatus["grpstatus"]=array_reverse($revisionStatus["grpstatus"],true);
+
+		$printheader=true;
+		$iRev = array();
+		foreach ($revisionStatus["indstatus"] as $st) {
+			$document = $dms->getDocument($st['documentID']);
+			$version = $document->getContentByVersion($st['version']);
+			$moduser = $dms->getUser($st['required']);
+
+			if ($document && $version) {
+
+				if ($printheader){
+					print "<table class=\"table table-condensed\">";
+					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
+					print "<th>".getMLText("name")."</th>\n";
+					print "<th>".getMLText("status")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
+					print "<th>".getMLText("last_update")."</th>\n";
+					print "<th>".getMLText("next_revision_abbr")."</th>\n";
+					print "</tr>\n</thead>\n<tbody>\n";
+					$printheader=false;
+				}
+				$sammel[] = array($document->getID(), $version->getVersion);
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
+					echo $this->documentListRowStart($document, $class);
+					echo $this->documentListRow($document, $previewer, true, $st['version']);
+					print "<td><small>".getRevisionStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($moduser->getFullName()) ."</small></td>";
+					print "<td><small>".$version->getRevisionDate()."</small></td>";
+					echo $this->documentListRowEnd($document);
+				}
+			}
+			if ($st["status"]!=-2) {
+				$iRev[] = $st["documentID"];
+			}
+		}
+		if (!$printheader) {
+			echo "</tbody>\n</table>";
+		} else {
+			printMLText("no_revision_needed");
+		}
+
+//		$this->contentContainerEnd();
+		echo "</div>\n";
+		echo "<div class=\"span6\">\n";
+		$this->contentHeading(getMLText("group_revision_summary"));
+//		$this->contentContainerStart();
+
+		$printheader=true;
+		foreach ($revisionStatus["grpstatus"] as $st) {
+			$document = $dms->getDocument($st['documentID']);
+			$version = $document->getContentByVersion($st['version']);
+			$modgroup = $dms->getGroup($st['required']);
+
+			if (!in_array($st["documentID"], $iRev) && $document && $version) {
+
+				if ($printheader){
+					print "<table class=\"table table-condensed\">";
+					print "<thead>\n<tr>\n";
+					print "<th></th>\n";
+					print "<th>".getMLText("name")."</th>\n";
+					print "<th>".getMLText("status")."</th>\n";
+					print "<th>".getMLText("action")."</th>\n";
+					print "<th>".getMLText("last_update")."</th>\n";
+					print "</tr>\n</thead>\n<tbody>\n";
+					$printheader=false;
+				}		
+			
+				$txt = $this->callHook('documentListItem', $document, $previewer);
+				if(is_string($txt))
+					echo $txt;
+				else {
+					$class = $st['status'] == 1 ? ' success' : ($st['status'] == -1 ? ' error' : ( $st['status'] == -2 ? ' info' : ''));
+//					print "<tr id=\"table-row-document-".$st['documentID']."\" class=\"table-row-document".$class."\" rel=\"document_".$st['documentID']."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
+					echo $this->documentListRowStart($document, $class);
+					echo $this->documentListRow($document, $previewer, true, $st['version']);
+					print "<td><small>".getReviewStatusText($st['status'])."<br />".$st["date"]."<br />". htmlspecialchars($modgroup->getName()) ."</small></td>";
+					print "</tr>\n";
+				}
+			}
+		}
+		if (!$printheader) {
+			echo "</tbody>\n</table>";
+		}else{
+			printMLText("no_revision_needed");
+		}
+
+//		$this->contentContainerEnd();
+		echo "</div>\n";
+		echo "</div>\n";
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From a75d337912d20d4a917be7a199d8240cd932b352 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Nov 2019 17:48:54 +0100
Subject: [PATCH 1175/2006] fix menu item for 2 factor auth

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 14d0fb5e2..b82fd9e02 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -726,7 +726,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		$menuitems['edit_notify'] = array('link'=>"../out/out.ManageNotify.php", 'label'=>'edit_existing_notify');
 
-		$menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'edit_existing_notify');
+		$menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'2_factor_auth');
 
 		if ($this->params['enableusersview']){
 			if ($accessobject->check_view_access('UsrView'))

From d82b59f173d538705f1da0c8195dbf26d2057f05 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Nov 2019 17:49:27 +0100
Subject: [PATCH 1176/2006] add filter field, placeholder in input filter field

---
 views/bootstrap/class.SubstituteUser.php |  2 +-
 views/bootstrap/class.UserList.php       | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index 7ac8a5f14..8cd982193 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -56,7 +56,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 
 		$this->contentHeading(getMLText("substitute_user"));
 ?>
-  <input type="text" id="myInput">
+	<input type="text" id="myInput" placeholder="<?= getMLText('type_to_filter'); ?>">
 	<table id="myTable" class="table table-condensed">
 		<thead>
 		<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('role'); ?></th><th><?php printMLText('groups'); ?></th><th></th></tr>
diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index e6dbb43fc..4cc9317f6 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -31,6 +31,19 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+?>
+		$(document).ready(function(){
+			$("#myInput").on("keyup", function() {
+				var value = $(this).val().toLowerCase();
+				$("#myTable tbody tr").filter(function() {
+					$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+				});
+			});
+		});
+<?php
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -49,7 +62,8 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 		$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
 ?>
 
-	<table class="table table-condensed">
+	<input type="text" id="myInput" placeholder="<?= getMLText('type_to_filter'); ?>">
+	<table id="myTable" class="table table-condensed">
 		<thead><tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('role'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr></thead><tbody>
 <?php
 		foreach ($allUsers as $currUser) {

From 2ec6534079291b79e4b3b5e9dfba950c16cc59dc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Nov 2019 09:15:26 +0100
Subject: [PATCH 1177/2006] fix documentation for rewriteRevisionLog()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 56603dba3..826a0ca11 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4272,7 +4272,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * This method was added for importing an xml dump.
 	 *
 	 * @param array $revisionlog new status log with the newest log entry first.
-	 * @return boolean true on success, otherwise false
+	 * @return boolean 0 on success, otherwise a negativ error number
 	 */
 	function rewriteRevisionLog($revisions) { /* {{{ */
 		$db = $this->_document->_dms->getDB();

From 3011f96372e20792720d7fa0379b436735c876f6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Nov 2019 09:16:23 +0100
Subject: [PATCH 1178/2006] add optional parameter $newuser to
 removeFromProcesses()

if set, the process will be transfered to a new user
---
 SeedDMS_Core/Core/inc.ClassUser.php | 31 +++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 63714308a..9b3cab382 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -899,7 +899,8 @@ class SeedDMS_Core_User { /* {{{ */
 	 *
 	 * This method adds another log entry to the reviews and approvals
 	 * which indicates the user has been deleted from the process. By default it will
-	 * do so for each review/approval regardless of its current state. So even
+	 * do so for each review/approval regardless of its current state unless
+	 * the user has been removed already (status=-2). So even
 	 * reviews/approvals already processed by the user will be added the log
 	 * entry. Only if the last log entry was a removal already, it will not be
 	 * added a second time.
@@ -907,24 +908,42 @@ class SeedDMS_Core_User { /* {{{ */
 	 * @param object $user the user doing the removal (needed for entry in
 	 *        review and approve log).
 	 * @param array $states remove user only from reviews/approvals in one of the states
-	 *        If passing array(0), the method will operate on reviews/approval which
-	 *        has not been touched.
+	 *        e.g. if passing array('review'=>array(0)), the method will operate on
+	 *        reviews which has not been touched yet.
 	 * @return boolean true on success or false in case of an error
 	 */
-	private function __removeFromProcesses($user, $states = array()) { /* {{{ */
+	private function __removeFromProcesses($user, $states = array(), $newuser=null) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$reviewStatus = $this->getReviewStatus();
+//		var_dump($newuser);
+//		print_r($reviewStatus);exit;
+		$db->startTransaction();
 		foreach ($reviewStatus["indstatus"] as $ri) {
 			if($ri['status'] != -2 && (!isset($states['review']) || in_array($ri['status'], $states['review']))) {
 				$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if(!$res) {
+					$db->rollbackTransaction();
 					return false;
 				}
+				/* Only reviews not done already can be transferred to a new user */
+				if($newuser && $ri['status'] == 0) {
+					if($doc = $this->_dms->getDocument($ri['documentID'])) {
+						if($version = $doc->getContentByVersion($ri['version'])) {
+							$ret = $version->addIndReviewer($newuser, $user);
+							/* returns -3 if the user is already a reviewer */ 
+							if($ret != 0 && $ret != -3) {
+								$db->rollbackTransaction();
+								return false;
+							}
+						}
+					}
+				}
 			}
 		}
+		$db->commitTransaction();
 
 		$approvalStatus = $this->getApprovalStatus();
 		foreach ($approvalStatus["indstatus"] as $ai) {
@@ -975,11 +994,11 @@ class SeedDMS_Core_User { /* {{{ */
 	 * @param array $states remove user only from reviews/approvals in one of the states
 	 * @return boolean true on success or false in case of an error
 	 */
-	public function removeFromProcesses($user, $states=array()) { /* {{{ */
+	public function removeFromProcesses($user, $states=array(), $newuser=null) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$db->startTransaction();
-		if(!$this->__removeFromProcesses($user, $states)) {
+		if(!$this->__removeFromProcesses($user, $states, $newuser)) {
 			$db->rollbackTransaction();
 			return false;
 		}

From babba864a18893bcd70b285abe5218f3b8839635 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Nov 2019 09:17:32 +0100
Subject: [PATCH 1179/2006] fix error msg

---
 out/out.TransferObjects.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.TransferObjects.php b/out/out.TransferObjects.php
index 1118a1305..37b6be1c2 100644
--- a/out/out.TransferObjects.php
+++ b/out/out.TransferObjects.php
@@ -45,7 +45,7 @@ if (!is_object($rmuser)) {
 }
 
 if ($rmuser->getID()==$user->getID()) {
-	UI::exitError(getMLText("transfer_objects"),getMLText("cannot_delete_yourself"));
+	UI::exitError(getMLText("transfer_objects"),getMLText("cannot_transfer_your_objects"));
 }
 
 $allusers = $dms->getAllUsers($settings->_sortUsersInList);

From dabf821b6a0d9a368a70a3fa8be7cbbcc600d83d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Nov 2019 09:18:01 +0100
Subject: [PATCH 1180/2006] do not run documentListRow(Start|End) if
 lastContent is null

---
 views/bootstrap/class.Bootstrap.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index b82fd9e02..86cf25c6e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2477,9 +2477,6 @@ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(e
 		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
 		$docID = $document->getID();
 
-		if(!$skipcont)
-			$content .= $this->documentListRowStart($document);
-
 		if($version) {
 			$latestContent = $this->callHook('documentContent', $document, $version);
 			if($latestContent === null)
@@ -2491,6 +2488,9 @@ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(e
 		}
 
 		if($latestContent) {
+			if(!$skipcont)
+				$content .= $this->documentListRowStart($document);
+
 			$previewer->createPreview($latestContent);
 			$version = $latestContent->getVersion();
 			$status = $latestContent->getStatus();
@@ -2610,9 +2610,9 @@ $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(e
 			}
 			$content .= "</div>";
 			$content .= "</td>";
+			if(!$skipcont)
+				$content .= $this->documentListRowEnd($document);
 		}
-		if(!$skipcont)
-			$content .= $this->documentListRowEnd($document);
 		return $content;
 	} /* }}} */
 

From 809f224e7d36ed8eb8505b4d76849597ac431262 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Nov 2019 09:18:42 +0100
Subject: [PATCH 1181/2006] processes can be transfered to a new user

currently only for reviews
---
 op/op.UsrMgr.php                               |  7 ++++++-
 out/out.RemoveUserFromProcesses.php            |  3 +++
 .../class.RemoveUserFromProcesses.php          | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index d5619115c..1fd903e1a 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -205,6 +205,11 @@ else if ($action == "removefromprocesses") {
 		UI::exitError(getMLText("admin_tools"),getMLText("cannot_delete_yourself"));
 	}
 
+	$userToAssign = $dms->getUser($_POST["assignTo"]);
+	if (!is_object($userToAssign)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
+	}
+
 	$userToRemove = $dms->getUser($userid);
 	if (!is_object($userToRemove)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
@@ -219,7 +224,7 @@ else if ($action == "removefromprocesses") {
 			$_POST["status"]["receipt"] = array();
 		if(!isset($_POST["status"]["revision"]))
 			$_POST["status"]["revision"] = array();
-		if (!$userToRemove->removeFromProcesses($user, $_POST['status'])) {
+		if (!$userToRemove->removeFromProcesses($user, $_POST['status'], $userToAssign)) {
 			UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
 		}
 
diff --git a/out/out.RemoveUserFromProcesses.php b/out/out.RemoveUserFromProcesses.php
index 682c84219..db093a08b 100644
--- a/out/out.RemoveUserFromProcesses.php
+++ b/out/out.RemoveUserFromProcesses.php
@@ -48,8 +48,11 @@ if ($rmuser->getID()==$user->getID()) {
 	UI::exitError(getMLText("rm_user"),getMLText("cannot_delete_yourself"));
 }
 
+$allusers = $dms->getAllUsers($settings->_sortUsersInList);
+
 if($view) {
 	$view->setParam('rmuser', $rmuser);
+	$view->setParam('allusers', $allusers);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index 23bfcd13d..abb541416 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -31,6 +31,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$rmuser = $this->params['rmuser'];
+		$allusers = $this->params['allusers'];
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -51,6 +52,23 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <?php echo createHiddenFieldWithKey('removefromprocesses'); ?>
 
 <?php
+		$options = array();
+		foreach ($allusers as $currUser) {
+			if ($currUser->isGuest() || ($currUser->getID() == $rmuser->getID()) )
+				continue;
+
+			if ($rmuser && $currUser->getID()==$rmuser->getID()) $selected=$count;
+			$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName()));
+		}
+		$this->formField(
+			getMLText("transfer_process_to_user"),
+			array(
+				'element'=>'select',
+				'name'=>'assignTo',
+				'class'=>'chzn-select',
+				'options'=>$options
+			)
+		);
 		$reviewStatus = $rmuser->getReviewStatus();
 		$tmpr = array();
 		$cr = array("-2"=>0, '-1'=>0, '0'=>0, '1'=>0);

From df095c63a34fb16f4c37d29236d71bf0a5e6632c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Nov 2019 10:06:48 +0100
Subject: [PATCH 1182/2006] use getBaseUrl()

---
 op/op.CheckInDocument.php | 10 +++++-----
 op/op.ReviewDocument.php  |  2 +-
 op/op.ReviseDocument.php  |  4 ++--
 op/op.SetRecipients.php   |  8 ++++----
 op/op.SetRevisors.php     |  8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 37ee48e08..fd0e40ead 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -276,7 +276,7 @@ else
 			$params['username'] = $user->getFullName();
 			$params['comment'] = $document->getComment();
 			$params['version_comment'] = $contentResult->getContent()->getComment();
-			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
 			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
@@ -296,7 +296,7 @@ else
 				$params['username'] = $user->getFullName();
 				$params['sitename'] = $settings->_siteName;
 				$params['http_root'] = $settings->_httpRoot;
-				$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+				$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 
 				foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
 					foreach($ntransition->getUsers() as $tuser) {
@@ -319,7 +319,7 @@ else
 					$params['version'] = $contentResult->getContent()->getVersion();
 					$params['comment'] = $comment;
 					$params['username'] = $user->getFullName();
-					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
 
@@ -340,7 +340,7 @@ else
 					$params['version'] = $contentResult->getContent()->getVersion();
 					$params['comment'] = $comment;
 					$params['username'] = $user->getFullName();
-					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
 
@@ -410,7 +410,7 @@ else
 					$params['name'] = $document->getName();
 					$params['folder_path'] = $folder->getFolderPathPlain();
 					$params['username'] = $user->getFullName();
-					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
 					$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index fd4b9e050..d78d45ecd 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -144,7 +144,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['status'] = getReviewStatusText(S_REJECTED);
 		$params['username'] = $user->getFullName();
-		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
 		$notifier->toList($user, $nl["users"], $subject, $message, $params);
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index d3fb84d2c..5b43e6d0d 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -109,7 +109,7 @@ if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
 		$params['status'] = getRevisionStatusText($_POST["revisionStatus"]);
 		$params['comment'] = strip_tags($_POST['comment']);
 		$params['username'] = $user->getFullName();
-		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
 		$notifier->toList($user, $nl["users"], $subject, $message, $params);
@@ -133,7 +133,7 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['status'] = getRevisionStatusText(S_REJECTED);
 		$params['username'] = $user->getFullName();
-		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
 		$notifier->toList($user, $nl["users"], $subject, $message, $params);
diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 3ccf5918e..70e10450e 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -137,7 +137,7 @@ foreach ($pIndRev as $p) {
 								$params['comment'] = $content->getComment();
 								$params['recipient'] = $accessIndex["i"][$p]->getFullName();
 								$params['username'] = $user->getFullName();
-								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
@@ -196,7 +196,7 @@ if (count($receiptIndex["i"]) > 0) {
 								$params['comment'] = $content->getComment();
 								$params['recipient'] = $accessIndex["i"][$rx]->getFullName();
 								$params['username'] = $user->getFullName();
-								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
@@ -244,7 +244,7 @@ foreach ($pGrpRev as $p) {
 								$params['comment'] = $content->getComment();
 								$params['recipient'] = $accessIndex["g"][$p]->getName();
 								$params['username'] = $user->getFullName();
-								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
@@ -299,7 +299,7 @@ if (count($receiptIndex["g"]) > 0) {
 								$params['comment'] = $content->getComment();
 								$params['recipient'] = $accessIndex["g"][$rx]->getName();
 								$params['username'] = $user->getFullName();
-								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 60f963da2..3c782d23f 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -135,7 +135,7 @@ foreach ($pIndRev as $p) {
 								$params['comment'] = $content->getComment();
 								$params['revisor'] = $accessIndex["i"][$p]->getFullName();
 								$params['username'] = $user->getFullName();
-								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
@@ -194,7 +194,7 @@ if (count($revisionIndex["i"]) > 0) {
 								$params['comment'] = $content->getComment();
 								$params['revisor'] = $accessIndex["i"][$rx]->getFullName();
 								$params['username'] = $user->getFullName();
-								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
@@ -242,7 +242,7 @@ foreach ($pGrpRev as $p) {
 								$params['comment'] = $content->getComment();
 								$params['revisor'] = $accessIndex["g"][$p]->getName();
 								$params['username'] = $user->getFullName();
-								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
@@ -297,7 +297,7 @@ if (count($revisionIndex["g"]) > 0) {
 								$params['comment'] = $content->getComment();
 								$params['revisor'] = $accessIndex["g"][$rx]->getName();
 								$params['username'] = $user->getFullName();
-								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+								$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							

From 1593ca5f345ed4f0f2a9324003c1d73b9590acfe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Nov 2019 13:48:50 +0100
Subject: [PATCH 1183/2006] removeFromProcess() can transfer to new user for
 all processes

---
 SeedDMS_Core/Core/inc.ClassUser.php | 68 ++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 9b3cab382..5c0870e62 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -897,27 +897,34 @@ class SeedDMS_Core_User { /* {{{ */
 	/**
 	 * Remove user from all processes
 	 *
-	 * This method adds another log entry to the reviews and approvals
+	 * This method adds another log entry to the reviews, approvals, receptions, revisions,
 	 * which indicates the user has been deleted from the process. By default it will
-	 * do so for each review/approval regardless of its current state unless
+	 * do so for each review/approval/reception/revision regardless of its current state unless
 	 * the user has been removed already (status=-2). So even
-	 * reviews/approvals already processed by the user will be added the log
+	 * reviews/approvals/receptions/revisions already processed by the user will be added the log
 	 * entry. Only if the last log entry was a removal already, it will not be
 	 * added a second time.
+	 * This behaviour can be changed by passing a list of states in the optional
+	 * argument $states. Only reviews, etc. in the given state will be affected.
+	 * This allows to remove the user only if the review, etc. has not been done
+	 * (state = 0).
+	 *
+	 * The last optional parameter $newuser is for replacing the user currently in
+	 * charge by another user. 
 	 *
 	 * @param object $user the user doing the removal (needed for entry in
 	 *        review and approve log).
 	 * @param array $states remove user only from reviews/approvals in one of the states
 	 *        e.g. if passing array('review'=>array(0)), the method will operate on
 	 *        reviews which has not been touched yet.
+	 * @param object user who is take over the processes
 	 * @return boolean true on success or false in case of an error
 	 */
 	private function __removeFromProcesses($user, $states = array(), $newuser=null) { /* {{{ */
 		$db = $this->_dms->getDB();
 
+		/* Get a list of all reviews, even those of older document versions */
 		$reviewStatus = $this->getReviewStatus();
-//		var_dump($newuser);
-//		print_r($reviewStatus);exit;
 		$db->startTransaction();
 		foreach ($reviewStatus["indstatus"] as $ri) {
 			if($ri['status'] != -2 && (!isset($states['review']) || in_array($ri['status'], $states['review']))) {
@@ -945,41 +952,92 @@ class SeedDMS_Core_User { /* {{{ */
 		}
 		$db->commitTransaction();
 
+		/* Get a list of all approvals, even those of older document versions */
 		$approvalStatus = $this->getApprovalStatus();
+		$db->startTransaction();
 		foreach ($approvalStatus["indstatus"] as $ai) {
 			if($ai['status'] != -2 && (!isset($states['approval']) || in_array($ai['status'], $states['approval']))) {
 				$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if(!$res) {
+					$db->rollbackTransaction();
 					return false;
 				}
+				/* Only approvals not done already can be transferred to a new user */
+				if($newuser && $ai['status'] == 0) {
+					if($doc = $this->_dms->getDocument($ai['documentID'])) {
+						if($version = $doc->getContentByVersion($ai['version'])) {
+							$ret = $version->addIndReviewer($newuser, $user);
+							/* returns -3 if the user is already a reviewer */ 
+							if($ret != 0 && $ret != -3) {
+								$db->rollbackTransaction();
+								return false;
+							}
+						}
+					}
+				}
 			}
 		}
+		$db->commitTransaction();
 
+		/* Get a list of all receptions, even those of older document versions */
 		$receiptStatus = $this->getReceiptStatus();
+		$db->startTransaction();
 		foreach ($receiptStatus["indstatus"] as $ri) {
 			if($ri['status'] != -2 && (!isset($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
 				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if(!$res) {
+					$db->rollbackTransaction();
 					return false;
 				}
+				/* Only receptions not done already can be transferred to a new user */
+				if($newuser && $ri['status'] == 0) {
+					if($doc = $this->_dms->getDocument($ri['documentID'])) {
+						if($version = $doc->getContentByVersion($ri['version'])) {
+							$ret = $version->addIndRecipient($newuser, $user);
+							/* returns -3 if the user is already a recipient */ 
+							if($ret != 0 && $ret != -3) {
+								$db->rollbackTransaction();
+								return false;
+							}
+						}
+					}
+				}
 			}
 		}
+		$db->commitTransaction();
 
+		/* Get a list of all revisions, even those of older document versions */
 		$revisionStatus = $this->getRevisionStatus();
+		$db->startTransaction();
 		foreach ($revisionStatus["indstatus"] as $ri) {
 			if($ri['status'] != -2 && (!isset($states['revision']) || in_array($ri['status'], $states['revision']))) {
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if(!$res) {
+					$db->rollbackTransaction();
 					return false;
 				}
+				/* Only revisions not done already can be transferred to a new user */
+				if($newuser && $ri['status'] == 0) {
+					if($doc = $this->_dms->getDocument($ri['documentID'])) {
+						if($version = $doc->getContentByVersion($ri['version'])) {
+							$ret = $version->addIndRevisor($newuser, $user);
+							/* returns -3 if the user is already a revisor */ 
+							if($ret != 0 && $ret != -3) {
+								$db->rollbackTransaction();
+								return false;
+							}
+						}
+					}
+				}
 			}
 		}
+		$db->commitTransaction();
 
 		return true;
 	} /* }}} */

From 769b9e5beb7407234ab8dd6232cd20cdb0151be3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Nov 2019 14:07:19 +0100
Subject: [PATCH 1184/2006] add changes for 6.0.7

---
 CHANGELOG                | 3 ++-
 SeedDMS_Core/package.xml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 393743349..7665534b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,13 +3,14 @@
 --------------------------------------------------------------------------------
 - fix editing of document attachments
 - make receipt summary look like approval/review summary
-- merge changes up to 5.1.12
+- merge changes up to 5.1.14
 - do not show the updating user in a revision workflow if the status is 0
   this is misleading because the user starting the revision workflow is the one
   first accessing the document
 - rejection of document receipts are turned off by default, but can be turned
   on in the settings
 - documents in DocumentChooser are sorted by name
+- instead of just removing a user from all processes it can be replace by a new user
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.6
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 9447260fe..da9eaf00c 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,6 +28,7 @@ SeedDMS_Core_Document::getTimeline() returns revision only for latest content
 add callback onSetStatus in SeedDMS_Core_DocumentContent::setStatus()
 add new list type 'DueRevision' in SeedDMS_Core_DMS::getDocumentList()
 a revision can also be started if some revisors have already reviewed the document
+remove a user from all its process can also be used to set a new user
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From cbaa038c55ad375093a360d56104ceaa4085603d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Nov 2019 15:01:36 +0100
Subject: [PATCH 1185/2006] use formField() instead of plain html

---
 .../class.RemoveUserFromProcesses.php         | 154 ++++++++++++------
 1 file changed, 105 insertions(+), 49 deletions(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index 1fd49ea71..fa0ef2c53 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -230,68 +230,124 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <?php } ?>
 
 <?php if(isset($tmpb["0"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[receipt][]" value="0" checked> <?php echo getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))); ?> <?php echo getMLText('receipts_not_touched_latest', array('no_receipts' => $cb["0"])); ?>
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('receipts_not_touched', array('no_receipts' => count($tmpb["0"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[receipt][]',
+				'value'=>'0',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('<label class="checkbox">', getMLText('receipts_not_touched_latest', array('no_receipts' => $cb["0"]))."</label>")
+			)
+		);
+?>
 <?php } ?>
 <?php if(isset($tmpb["1"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[receipt][]" value="1"> <?php echo getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))); ?> <?php echo getMLText('receipts_accepted_latest', array('no_receipts' => $cb["1"])); ?><br />
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('receipts_accepted', array('no_receipts' => count($tmpb["1"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[receipt][]',
+				'value'=>'1',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('<label class="checkbox">', getMLText('receipts_accepted_latest', array('no_receipts' => $cb["1"]))."</label>")
+			)
+		);
+?>
 <?php } ?>
 <?php if(isset($tmpb["-1"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[receipt][]" value="-1"> <?php echo getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))); ?> <?php echo getMLText('receipts_rejected_latest', array('no_receipts' => $cb["-1"])); ?><br />
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('receipts_rejected', array('no_receipts' => count($tmpb["-1"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[receipt][]',
+				'value'=>'-1',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('<label class="checkbox">', getMLText('receipts_rejected_latest', array('no_receipts' => $cb["-1"]))."</label>")
+			)
+		);
+?>
 <?php } ?>
 
 <?php if(isset($tmpc["0"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="0" checked> <?php echo getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))); ?> <?php echo getMLText('revisions_not_touched_latest', array('no_revisions' => $cc["0"])); ?>
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('revisions_not_touched', array('no_revisions' => count($tmpc["0"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[revision][]',
+				'value'=>'0',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('<label class="checkbox">', getMLText('revisions_not_touched_latest', array('no_revisions' => $cc["0"]))."</label>")
+			)
+		);
+?>
 <?php } ?>
 <?php if(isset($tmpc["-3"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="-3" checked> <?php echo getMLText('revisions_pending', array('no_revisions' => count($tmpc["-3"]))); ?> <?php echo getMLText('revisions_pending_latest', array('no_revisions' => $cc["-3"])); ?>
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('revisions_pending', array('no_revisions' => count($tmpc["-3"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[revision][]',
+				'value'=>'-3',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('<label class="checkbox">', getMLText('revisions_pending_latest', array('no_revisions' => $cc["-3"]))."</label>")
+			)
+		);
+?>
 <?php } ?>
 <?php if(isset($tmpc["1"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="1"> <?php echo getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))); ?> <?php echo getMLText('revisions_accepted_latest', array('no_revisions' => $cc["1"])); ?><br />
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('revisions_accepted', array('no_revisions' => count($tmpc["1"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[revision][]',
+				'value'=>'1',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('<label class="checkbox">', getMLText('revisions_accepted_latest', array('no_revisions' => $cc["1"]))."</label>")
+			)
+		);
+?>
 <?php } ?>
 <?php if(isset($tmpc["-1"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[revision][]" value="-1"> <?php echo getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))); ?> <?php echo getMLText('revisions_rejected_latest', array('no_revisions' => $cc["-1"])); ?><br />
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('revisions_rejected', array('no_revisions' => count($tmpc["-1"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[revision][]',
+				'value'=>'-1',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('<label class="checkbox">', getMLText('revisions_rejected_latest', array('no_revisions' => $cc["-1"]))."</label>")
+			)
+		);
+?>
 <?php } ?>
 
 <?php

From 36231f8cf3ee351965c845d7b06c6d2ee64cf6d3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Jan 2020 09:17:45 +0100
Subject: [PATCH 1186/2006] do not include GoogleQRCodeProvider.php anymore

---
 views/bootstrap/class.Login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Login.php b/views/bootstrap/class.Login.php
index 81fbcfcde..68aecf303 100644
--- a/views/bootstrap/class.Login.php
+++ b/views/bootstrap/class.Login.php
@@ -152,7 +152,7 @@ $(document).ready( function() {
 		if($enable2factauth) {
 			require "vendor/robthree/twofactorauth/lib/Providers/Qr/IQRCodeProvider.php";
 			require "vendor/robthree/twofactorauth/lib/Providers/Qr/BaseHTTPQRCodeProvider.php";
-			require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php";
+//			require "vendor/robthree/twofactorauth/lib/Providers/Qr/GoogleQRCodeProvider.php";
 			require "vendor/robthree/twofactorauth/lib/Providers/Rng/IRNGProvider.php";
 			require "vendor/robthree/twofactorauth/lib/Providers/Rng/MCryptRNGProvider.php";
 			require "vendor/robthree/twofactorauth/lib/TwoFactorAuthException.php";

From 481d01977b570a3ba1648b78cd632742093ae6d5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 6 Jan 2020 13:34:38 +0100
Subject: [PATCH 1187/2006] fix typo

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 39eb27b30..7e98bf6dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,7 +10,7 @@
 - rejection of document receipts are turned off by default, but can be turned
   on in the settings
 - documents in DocumentChooser are sorted by name
-- instead of just removing a user from all processes it can be replace by a new user
+- instead of just removing a user from all processes it can be replaced by a new user
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.6

From 8362796339221fea9e1304b9543cd34698fc4653 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Jan 2020 11:26:44 +0100
Subject: [PATCH 1188/2006] fix sql statement for adding a new primary key

---
 install/update-6.0.0/update.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/update-6.0.0/update.sql b/install/update-6.0.0/update.sql
index 480415c4f..74d8eb548 100644
--- a/install/update-6.0.0/update.sql
+++ b/install/update-6.0.0/update.sql
@@ -6,7 +6,7 @@ ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) DEFAULT NULL AFTER `pwd`;
 
 ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text DEFAULT NULL AFTER `initstate`;
 
-ALTER TABLE `tblWorkflowDocumentContent` ADD COLUMN `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
+ALTER TABLE `tblWorkflowDocumentContent` ADD COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`id`);
 
 ALTER TABLE `tblWorkflowLog` ADD COLUMN `workflowdocumentcontent` int(11) NOT NULL DEFAULT '0' AFTER `id`;
 

From 58412c8179ca8b9ac0c111fd940aafe18e97dbc3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Jan 2020 08:53:04 +0100
Subject: [PATCH 1189/2006] use getDMS() instead of access varialbe _dms in
 folder or document

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index ccbd2c7c7..58720b1a7 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -279,7 +279,7 @@ class SeedDMS_Core_DMS {
 		$newArr = array();
 		foreach ($objArr as $obj) {
 			if ($obj->getAccessMode($user) >= $minMode) {
-				$dms = $obj->_dms;
+				$dms = $obj->getDMS();
 				if(get_class($obj) == $dms->getClassname('document')) {
 					if($obj->getLatestContent())
 						array_push($newArr, $obj);

From 3e9d2dc695bcd2032c64f0e8b4644a9b3cc9e554 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Feb 2020 17:01:00 +0100
Subject: [PATCH 1190/2006] get read access list for receipt workflow

---
 views/bootstrap/class.CheckInDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index b912c24d7..8589abc45 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -608,6 +608,7 @@ $(document).ready(function() {
 <?php
 	}
 	if($enablereceiptworkflow) {
+		$docAccess = $folder->getReadAccessList();
 ?>
 		<tr>
 			<td colspan="2">

From 9672f19bc40a894cb3d2d519561871c093a4d74f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Feb 2020 17:01:26 +0100
Subject: [PATCH 1191/2006] call new hook checkOutInfo

---
 views/bootstrap/class.ViewDocument.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 554efc52d..b339eecf8 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -205,7 +205,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$checkoutdir = $this->params['checkOutDir'];
 
 		$this->contentHeading(getMLText("document_infos"));
-		if($info = $document->getCheckOutInfo()) {
+		$txt = $this->callHook('checkOutInfo', $document);
+		if(is_string($txt)) {
+			echo $txt;
+		} elseif($info = $document->getCheckOutInfo()) {
 			echo "<div class=\"alert alert-info\">";
 			$session = $this->params['session'];
 			if($session->getSu()) {

From 7f5908bcf83e1b62e09769ca974c2c27df5ef5a6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Feb 2020 19:01:25 +0100
Subject: [PATCH 1192/2006] add missing ` around names

---
 install/create_tables-sqlite3.sql | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 2eff9a797..42be5dcee 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -163,7 +163,7 @@ CREATE TABLE `tblFolderAttributes` (
   `folder` INTEGER default NULL REFERENCES `tblFolders` (`id`) ON DELETE CASCADE,
   `attrdef` INTEGER default NULL REFERENCES `tblAttributeDefinitions` (`id`),
   `value` text default NULL,
-  UNIQUE (folder, attrdef)
+  UNIQUE (`folder`, `attrdef`)
 ) ;
  
 -- --------------------------------------------------------
@@ -199,7 +199,7 @@ CREATE TABLE `tblDocumentAttributes` (
   `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `attrdef` INTEGER default NULL REFERENCES `tblAttributeDefinitions` (`id`),
   `value` text default NULL,
-  UNIQUE (document, attrdef)
+  UNIQUE (`document`, `attrdef`)
 ) ;
 
 -- --------------------------------------------------------
@@ -268,7 +268,7 @@ CREATE TABLE `tblDocumentContentAttributes` (
   `content` INTEGER default NULL REFERENCES `tblDocumentContent` (`id`) ON DELETE CASCADE,
   `attrdef` INTEGER default NULL REFERENCES `tblAttributeDefinitions` (`id`),
   `value` text default NULL,
-  UNIQUE (content, attrdef)
+  UNIQUE (`content`, `attrdef`)
 ) ;
 
 -- --------------------------------------------------------
@@ -710,7 +710,7 @@ CREATE TABLE `tblWorkflowLog` (
 CREATE TABLE `tblWorkflowMandatoryWorkflow` (
   `userid` INTEGER default NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
   `workflow` INTEGER default NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE,
-  UNIQUE(userid, workflow)
+  UNIQUE(`userid`, `workflow`)
 ) ;
 
 -- --------------------------------------------------------
@@ -719,7 +719,7 @@ CREATE TABLE `tblWorkflowMandatoryWorkflow` (
 -- Table structure for transmittal
 --
 
-CREATE TABLE tblTransmittals (
+CREATE TABLE `tblTransmittals` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` text NOT NULL,
   `comment` text NOT NULL,
@@ -740,7 +740,7 @@ CREATE TABLE `tblTransmittalItems` (
   `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
   `version` INTEGER unsigned NOT NULL default '0',
   `date` TEXT default NULL,
-  UNIQUE (transmittal, document, version)
+  UNIQUE (`transmittal`, `document`, `version`)
 );
 
 -- --------------------------------------------------------
@@ -786,7 +786,7 @@ CREATE TABLE `tblArosAcos` (
   `read` INTEGER NOT NULL DEFAULT '-1',
   `update` INTEGER NOT NULL DEFAULT '-1',
   `delete` INTEGER NOT NULL DEFAULT '-1',
-  UNIQUE (aco, aro)
+  UNIQUE (`aco`, `aro`)
 ) ;
 
 -- --------------------------------------------------------
@@ -830,7 +830,7 @@ CREATE TABLE `tblVersion` (
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1);
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2);
 INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
-INSERT INTO tblUsers VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0, 0);
-INSERT INTO tblUsers VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0, 0);
-INSERT INTO tblFolders VALUES (1, 'DMS', 0, '', 'DMS root', strftime('%s','now'), 1, 0, 2, 0);
-INSERT INTO tblVersion VALUES (DATETIME(), 6, 0, 0);
+INSERT INTO `tblUsers` VALUES (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '', 'Administrator', 'address@server.com', '', '', '', 1, 0, '', 0, 0, 0, 0);
+INSERT INTO `tblUsers` VALUES (2, 'guest', NULL, '', 'Guest User', NULL, '', '', '', 2, 0, '', 0, 0, 0, 0);
+INSERT INTO `tblFolders` VALUES (1, 'DMS', 0, '', 'DMS root', strftime('%s','now'), 1, 0, 2, 0);
+INSERT INTO `tblVersion` VALUES (DATETIME(), 6, 0, 0);

From a97114b77d3c8d2dc6c6bf67c7988e3702776559 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Feb 2020 19:01:46 +0100
Subject: [PATCH 1193/2006] fix update

---
 install/update-6.0.0/update-sqlite3.sql | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/install/update-6.0.0/update-sqlite3.sql b/install/update-6.0.0/update-sqlite3.sql
index 3c4996a3b..3bcaabe61 100644
--- a/install/update-6.0.0/update-sqlite3.sql
+++ b/install/update-6.0.0/update-sqlite3.sql
@@ -31,11 +31,11 @@ CREATE TABLE `new_tblWorkflowLog` (
 
 INSERT INTO `new_tblWorkflowLog` (`id`, `workflowdocumentcontent`, `userid`, `transition`, `date`, `comment`) SELECT `a`.`id`, `b`.`id`, `a`.`userid`, `a`.`transition`, `a`.`date`, `a`.`comment` FROM `tblWorkflowLog` `a` LEFT JOIN `new_tblWorkflowDocumentContent` `b` ON `a`.`document`=`b`.`document` AND `a`.`version`=`b`.`version` AND `a`.`workflow`=`b`.`workflow` WHERE `b`.`document` IS NOT NULL;
 
-ALTER TABLE `tblWorkflowLog` RENAME TO `old_tblWorkflowLog`;
+DROP TABLE `tblWorkflowLog`;
 
 ALTER TABLE `new_tblWorkflowLog` RENAME TO `tblWorkflowLog`;
 
-ALTER TABLE `tblWorkflowDocumentContent` RENAME TO `old_tblWorkflowDocumentContent`;
+DROP TABLE `tblWorkflowDocumentContent`;
 
 ALTER TABLE `new_tblWorkflowDocumentContent` RENAME TO `tblWorkflowDocumentContent`;
 
@@ -150,7 +150,7 @@ CREATE TABLE `new_tblUsers` (
 
 INSERT INTO new_tblUsers SELECT * FROM tblUsers;
 
-ALTER TABLE tblUsers RENAME TO old_tblUsers;
+DROP TABLE tblUsers;
 
 ALTER TABLE new_tblUsers RENAME TO tblUsers;
 
@@ -204,8 +204,3 @@ UPDATE tblVersion set major=6, minor=0, subminor=0;
 
 COMMIT;
 
-DROP TABLE `old_tblUsers`;
-
-DROP TABLE `old_tblWorkflowLog`;
-
-DROP TABLE `old_tblWorkflowDocumentContent`;

From efec0c36bf98193a75cc5f7e1078f5faa28aa923 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Feb 2020 12:19:16 +0100
Subject: [PATCH 1194/2006] add method getWrongFiletypeDocumentContent()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 58720b1a7..ed6e10995 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -3567,6 +3567,46 @@ class SeedDMS_Core_DMS {
 
 	} /* }}} */
 
+	/**
+	 * Returns document content which has the incorrect file type
+	 *
+	 * This method is for finding document content with an incorrect
+	 * or missing file type. It just checks documents contents
+	 * with a certain mime type.
+	 * @return bool|SeedDMS_Core_Document[]
+	 */
+	function getWrongFiletypeDocumentContent() { /* {{{ */
+		$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `mimeType` in ('application/pdf', 'image/png', 'image/gif', 'image/jpg')";
+		$resArr = $this->db->getResultArray($queryStr);
+		if ($resArr === false)
+			return false;
+
+		/** @var SeedDMS_Core_Document[] $versions */
+		$versions = array();
+		foreach($resArr as $row) {
+			$expect = '';
+			switch($row['mimeType']) {
+			case "application/pdf":
+			case "image/png":
+			case "image/gif":
+			case "image/jpg":
+				$expect = substr($row['mimeType'], -3, 3);
+				break;
+			}
+			if($expect) {
+				if($row['fileType'] != '.'.$expect) {
+					/** @var SeedDMS_Core_Document $document */
+					$document = new $this->classnames['document']($row['document'], '', '', '', '', '', '', '', '', '', '', '');
+					$document->setDMS($this);
+					$version = new $this->classnames['documentcontent']($row['id'], $document, $row['version'], $row['comment'], $row['date'], $row['createdBy'], $row['dir'], $row['orgFileName'], $row['fileType'], $row['mimeType'], $row['fileSize'], $row['checksum']);
+					$versions[] = $version;
+				}
+			}
+		}
+		return $versions;
+
+	} /* }}} */
+
 	/**
 	 * Returns document content which is duplicated
 	 *

From 9b2482759897d6bfe6ebbb7aebd9c7b90e14e751 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Feb 2020 12:19:43 +0100
Subject: [PATCH 1195/2006] add new method setFileType()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 56b2c86bc..513c4af71 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3491,6 +3491,40 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Set file type by evaluating the mime type
+	 */
+	function setFileType() { /* {{{ */
+		$mimetype = $this->getMimeType();
+
+		switch($this->_mimeType) {
+		case "application/pdf":
+		case "image/png":
+		case "image/gif":
+		case "image/jpg":
+			$expect = substr($this->_mimeType, -3, 3);
+			break;
+		}
+		if($expect && '.'.$expect != $this->_fileType) {
+			$db = $this->_document->getDMS()->getDB();
+			$db->startTransaction();
+			$queryStr = "UPDATE `tblDocumentContent` SET `fileType`='.".$expect."' WHERE `id` =   ". $this->_id;
+			$res = $db->getResult($queryStr);
+			if ($res) {
+				if(!SeedDMS_Core_File::renameFile($this->_dms->contentDir.$this->_document->getDir() . $this->_version . $this->_fileType, $this->_dms->contentDir.$this->_document->getDir() . $this->_version . '.' . $expect)) {
+					$db->rollbackTransaction();
+				} else {
+					$db->commitTransaction();
+					return true;
+				}
+			} else {
+				$db->rollbackTransaction();
+			}
+		}
+
+		return false;
+	} /* }}} */
+
 	function setComment($newComment) { /* {{{ */
 		$db = $this->_document->getDMS()->getDB();
 

From 450bdc0b7f4ba64bd0b93c0b13e000ecc6a1f575 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Feb 2020 12:20:16 +0100
Subject: [PATCH 1196/2006] add check for wrong file type, fix repairing of
 checksum and filesize

---
 out/out.ObjectCheck.php               | 12 ++++
 views/bootstrap/class.ObjectCheck.php | 98 +++++++++++++++++++++------
 2 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index 4fb1235b9..2d69e2b6a 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -66,6 +66,12 @@ if(isset($_GET['setchecksum']) && $_GET['setchecksum'] == 1) {
 	$setchecksum = 0;
 }
 
+if(isset($_GET['setfiletype']) && $_GET['setfiletype'] == 1) {
+	$setfiletype = 1;
+} else {
+	$setfiletype = 0;
+}
+
 $folder = $dms->getFolder($settings->_rootFolderID);
 $unlinkedversions = $dms->getUnlinkedDocumentContent();
 if(!isset($_GET['action']) || $_GET['action'] == 'listUnlinkedFolders')
@@ -84,6 +90,10 @@ if(!isset($_GET['action']) || $_GET['action'] == 'listMissingChecksum')
 	$nochecksumversions = $dms->getNoChecksumDocumentContent();
 else
 	$nochecksumversions = null;
+if(!isset($_GET['action']) || $_GET['action'] == 'listWrongFiletype')
+	$wrongfiletypeversions = $dms->getWrongFiletypeDocumentContent();
+else
+	$wrongfiletypeversions = null;
 if(!isset($_GET['action']) || $_GET['action'] == 'listDuplicateContent')
 	$duplicateversions = $dms->getDuplicateDocumentContent();
 else
@@ -215,6 +225,7 @@ if($view) {
 	$view->setParam('unlinkeddocuments', $unlinkeddocuments);
 	$view->setParam('nofilesizeversions', $nofilesizeversions);
 	$view->setParam('nochecksumversions', $nochecksumversions);
+	$view->setParam('wrongfiletypeversions', $wrongfiletypeversions);
 	$view->setParam('duplicateversions', $duplicateversions);
 	$view->setParam('docsinrevision', $docsinrevision);
 	$view->setParam('docsinreception', $docsinreception);
@@ -222,6 +233,7 @@ if($view) {
 	$view->setParam('unlink', $unlink);
 	$view->setParam('setfilesize', $setfilesize);
 	$view->setParam('setchecksum', $setchecksum);
+	$view->setParam('setfiletype', $setfiletype);
 	$view->setParam('repair', $repair);
 	$view->setParam('showtree', showtree());
 	$view->setParam('rootfolder', $rootfolder);
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 53c637779..89271526f 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -152,7 +152,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 
 		$this->contentHeading(getMLText("unlinked_documents"));
 		if($unlinkeddocuments) {
-			print "<table class=\"table-condensed\">";
+			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("id")."</th>\n";
@@ -186,7 +186,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		}
 
 		if($unlinkedcontent) {
-			print "<table class=\"table-condensed\">";
+			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
@@ -215,11 +215,11 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$nofilesizeversions = $this->params['nofilesizeversions'];
-		$setfilesize = $this->params['setfilesize'];
+		$repair = $this->params['repair'];
 
 		$this->contentHeading(getMLText("missing_filesize"));
 		if($nofilesizeversions) {
-			print "<table class=\"table-condensed\">";
+			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
@@ -229,18 +229,25 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($nofilesizeversions as $version) {
 				$doc = $version->getDocument();
-				print "<tr><td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td>";
-				echo "<td>";
-				if($setfilesize) {
-					if($version->setFileSize())
-						echo getMLText('repaired');
+				$class = $msg = '';
+				if($repair) {
+					if($version->setFileSize()) {
+						$msg = getMLText('repaired');
+						$class = ' class="success"';
+					} else {
+						$msg = getMLText('not_repaired');
+						$class = ' class="error"';
+					}
 				}
+				print "<tr".$class."><td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td>";
+				echo "<td>";
+				echo $msg;
 				echo "</td>";
 				print "</tr>\n";
 			}
 			print "</tbody></table>\n";
-			if($setfilesize == 0) {
-				echo '<p><a href="out.ObjectCheck.php?setfilesize=1">'.getMLText('do_object_setfilesize').'</a></p>';
+			if($repair == 0) {
+				echo '<div class="repair"><a class="btn btn-primary" data-action="listMissingFileSize">'.getMLText('do_object_setfilesize').'</a></div>';
 			}
 		}
 
@@ -251,11 +258,12 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$nochecksumversions = $this->params['nochecksumversions'];
+		$repair = $this->params['repair'];
 
 		$this->contentHeading(getMLText("missing_checksum"));
 
 		if($nochecksumversions) {
-			print "<table class=\"table-condensed\">";
+			print "<table class=\"table table-condensed\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
@@ -265,18 +273,69 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($nochecksumversions as $version) {
 				$doc = $version->getDocument();
-				print "<tr><td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td>";
-				echo "<td>";
-				if($setchecksum) {
-					if($version->setChecksum())
-						echo getMLText('repaired');
+				$class = $msg = '';
+				if($repair) {
+					if($version->setChecksum()) {
+						$msg = getMLText('repaired');
+						$class = ' class="success"';
+					} else {
+						$msg = getMLText('not_repaired');
+						$class = ' class="error"';
+					}
 				}
+				print "<tr".$class."><td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td>";
+				echo "<td>";
+				echo $msg;
 				echo "</td>";
 				print "</tr>\n";
 			}
 			print "</tbody></table>\n";
-			if($setchecksum == 0) {
-				echo '<p><a href="out.ObjectCheck.php?setchecksum=1">'.getMLText('do_object_setchecksum').'</a></p>';
+			if($repair == 0) {
+				echo '<div class="repair"><a class="btn btn-primary" data-action="listMissingChecksum">'.getMLText('do_object_setchecksum').'</a></div>';
+			}
+		}
+	} /* }}} */
+
+	function listWrongFiletype() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$wrongfiletypeversions = $this->params['wrongfiletypeversions'];
+		$repair = $this->params['repair'];
+
+		$this->contentHeading(getMLText("wrong_filetype"));
+
+		if($wrongfiletypeversions) {
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th>".getMLText("document")."</th>\n";
+			print "<th>".getMLText("version")."</th>\n";
+			print "<th>".getMLText("original_filename")."</th>\n";
+			print "<th>".getMLText("mimetype")."</th>\n";
+			print "<th>".getMLText("filetype")."</th>\n";
+			print "<th></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+			foreach($wrongfiletypeversions as $version) {
+				$doc = $version->getDocument();
+				$class = $msg = '';
+				if($repair) {
+					if($version->setFiletype()) {
+						$msg = getMLText('repaired');
+						$class = ' class="success"';
+					} else {
+						$msg = getMLText('not_repaired');
+						$class = ' class="error"';
+					}
+				}
+				print "<tr".$class."><td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td><td>".$version->getFileType()."</td>";
+				echo "<td>";
+				echo $msg;
+				echo "</td>";
+				print "</tr>\n";
+			}
+			print "</tbody></table>\n";
+			if($repair == 0) {
+				echo '<div class="repair"><a class="btn btn-primary" data-action="listWrongFiletype">'.getMLText('do_object_setfiletype').'</a></div>';
 			}
 		}
 	} /* }}} */
@@ -504,6 +563,7 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#unlinked_content" data-action="listUnlinkedContent"><span class="badge '.($unlinkedcontent ? 'badge-info ' : '').'badge-right">'.count($unlinkedcontent).'</span>'.getMLText("unlinked_content").'</a></li>';
 		echo '<li class=""><a data-href="#missing_filesize" data-action="listMissingFileSize"><span class="badge '.($nofilesizeversions ? 'badge-info ' : '').'badge-right">'.count($nofilesizeversions).'</span>'.getMLText("missing_filesize").'</a></li>';
 		echo '<li class=""><a data-href="#missing_checksum" data-action="listMissingChecksum"><span class="badge '.($nochecksumversions ? 'badge-info ' : '').'badge-right">'.count($nochecksumversions).'</span>'.getMLText("missing_checksum").'</a></li>';
+		echo '<li class=""><a data-href="#wrong_filetype" data-action="listWrongFiletype"><span class="badge '.($wrongfiletypeversions ? 'badge-info ' : '').'badge-right">'.count($wrongfiletypeversions).'</span>'.getMLText("wrong_filetype").'</a></li>';
 		echo '</ul>';
 		$this->contentHeading(getMLText("object_check_warning"));
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';

From dc5d742c45ac3da6385334b1bab5fca491e75eb9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Feb 2020 17:42:53 +0100
Subject: [PATCH 1197/2006] get docs with wrong file type in view, update page
 title when choosing list

---
 views/bootstrap/class.ObjectCheck.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 405ad6be3..ce86b23c5 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -505,6 +505,7 @@ $(document).ready( function() {
 		ev.preventDefault();
 		$('#kkkk.ajax').data('action', $(this).data('action'));
 		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
+		window.history.pushState({"html":"","pageTitle":""},"", '../out/out.ObjectCheck.php?list=' + $(this).data('action'));
 	});
 	$('body').on('click', 'div.repair a', function(ev){
 		ev.preventDefault();
@@ -539,6 +540,7 @@ $(document).ready( function() {
 		$docsinrevision = $this->params['docsinrevision'];
 		$docsinreception = $this->params['docsinreception'];
 		$processwithoutusergroup = $this->params['processwithoutusergroup'];
+		$wrongfiletypeversions = $this->params['wrongfiletypeversions'];
 		$repair = $this->params['repair'];
 		$unlink = $this->params['unlink'];
 		$setfilesize = $this->params['setfilesize'];

From 3d33c1d49c72465ff1cefba6e671f19c503e09d6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Feb 2020 20:57:40 +0100
Subject: [PATCH 1198/2006] get rid of git merge errors

---
 op/op.ReviewDocument.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index d78d45ecd..60654a9e7 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -175,24 +175,9 @@ if ($newdocstatus['status'] == S_DRAFT_APP) {
 				if ($dastat["status"] == 0) {
 					if ($dastat["type"] == 0) {
 
-<<<<<<< HEAD
 						$approver = $dms->getUser($dastat["required"]);
 						$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
 					} elseif ($dastat["type"] == 1) {
-=======
-				if($notifier) {
-					$subject = "approval_request_email_subject";
-					$message = "approval_request_email_body";
-					$params = array();
-					$params['name'] = $document->getName();
-					$params['folder_path'] = $folder->getFolderPathPlain();
-					$params['version'] = $version;
-					$params['username'] = $user->getFullName();
-					$params['sitename'] = $settings->_siteName;
-					$params['http_root'] = $settings->_httpRoot;
-					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-					foreach ($docApprovalStatus as $dastat) {
->>>>>>> seeddms-5.1.x
 					
 						$group = $dms->getGroup($dastat["required"]);
 						$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);

From 7761f5d77bf5d927063881ebe689d6510ce0a683 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Feb 2020 20:58:54 +0100
Subject: [PATCH 1199/2006] get root folder in printTreeNavigationJs() only if
 partialtree is not set

---
 views/bootstrap/class.Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 2811d6ccc..4f9d98ded 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1846,9 +1846,9 @@ $(document).ready(function() {
 			$folder = $this->params['dms']->getFolder($folderid);
 			if(!$partialtree) {
 				$path = $folder->getPath();
+				/* Get the first folder (root folder) of path */
+				$folder = array_shift($path);
 			}
-			/* Get the first folder (root folder) of path */
-			$folder = array_shift($path);
 			$node = array('label'=>$folder->getName(), 'id'=>$folder->getID(), 'load_on_demand'=>false, 'is_folder'=>true);
 			if(!$folder->hasSubFolders()) {
 				$node['load_on_demand'] = true;

From 9733c44ef3185c25cd84e12d7321156ca3f02933 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Feb 2020 20:59:26 +0100
Subject: [PATCH 1200/2006] do not access SeedDMD_Document_Content::_version
 anymore

use SeedDMD_Document_Content::getVersion() instead
---
 op/op.EditComment.php   | 6 +++---
 op/op.SetRecipients.php | 8 ++++----
 op/op.SetRevisors.php   | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/op/op.EditComment.php b/op/op.EditComment.php
index 7dec214f7..38411ba97 100644
--- a/op/op.EditComment.php
+++ b/op/op.EditComment.php
@@ -72,14 +72,14 @@ if (($oldcomment = $version->getComment()) != $comment) {
 			$folder = $document->getFolder();
 
 /*
-			$subject = "###SITENAME###: ".$document->getName().", v.".$version->_version." - ".getMLText("document_comment_changed_email");
+			$subject = "###SITENAME###: ".$document->getName().", v.".$version->getVersion()." - ".getMLText("document_comment_changed_email");
 			$message = getMLText("document_comment_changed_email")."\r\n";
 			$message .= 
 				getMLText("document").": ".$document->getName()."\r\n".
-				getMLText("version").": ".$version->_version."\r\n".
+				getMLText("version").": ".$version->getVersion()."\r\n".
 				getMLText("comment").": ".$comment."\r\n".
 				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".
-				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->_version."\r\n";
+				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."&version=".$version->getVersion()."\r\n";
 
 			if(isset($document->_notifyList["users"])) {
 				$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 70e10450e..5ad1bca18 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -133,7 +133,7 @@ foreach ($pIndRev as $p) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['recipient'] = $accessIndex["i"][$p]->getFullName();
 								$params['username'] = $user->getFullName();
@@ -192,7 +192,7 @@ if (count($receiptIndex["i"]) > 0) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['recipient'] = $accessIndex["i"][$rx]->getFullName();
 								$params['username'] = $user->getFullName();
@@ -240,7 +240,7 @@ foreach ($pGrpRev as $p) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['recipient'] = $accessIndex["g"][$p]->getName();
 								$params['username'] = $user->getFullName();
@@ -295,7 +295,7 @@ if (count($receiptIndex["g"]) > 0) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['recipient'] = $accessIndex["g"][$rx]->getName();
 								$params['username'] = $user->getFullName();
diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 3c782d23f..56cff04d6 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -131,7 +131,7 @@ foreach ($pIndRev as $p) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['revisor'] = $accessIndex["i"][$p]->getFullName();
 								$params['username'] = $user->getFullName();
@@ -190,7 +190,7 @@ if (count($revisionIndex["i"]) > 0) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['revisor'] = $accessIndex["i"][$rx]->getFullName();
 								$params['username'] = $user->getFullName();
@@ -238,7 +238,7 @@ foreach ($pGrpRev as $p) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['revisor'] = $accessIndex["g"][$p]->getName();
 								$params['username'] = $user->getFullName();
@@ -293,7 +293,7 @@ if (count($revisionIndex["g"]) > 0) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['revisor'] = $accessIndex["g"][$rx]->getName();
 								$params['username'] = $user->getFullName();

From 5f71f51644549ade495edb7f03d1ab07126f80ec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Feb 2020 21:14:35 +0100
Subject: [PATCH 1201/2006] add entries for 6.0.8

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1d123d5d2..73c680e8a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
                      Changes in version 6.0.8
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.15
+- fix syntax error in op/op.EditComment.php
+- fix use of private variable in op/op.SetRecipients.php and op/op.SetRevisors.php
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.7

From 9e5f005f054c9d407ad3fe85bdfb9288aca1d6a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Feb 2020 17:45:54 +0100
Subject: [PATCH 1202/2006] do not check checkboxes by default

---
 .../class.RemoveUserFromProcesses.php         | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index fa0ef2c53..a7443c3cc 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -134,7 +134,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[review][]',
 				'value'=>'0',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', ' '.getMLText('reviews_not_touched_latest', array('no_reviews' => $cr["0"]))."</label>")
@@ -151,7 +151,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[approval][]',
 				'value'=>'1',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', ' '.getMLText('reviews_accepted_latest', array('no_reviews' => $cr["1"]))."</label>")
@@ -168,7 +168,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[approval][]',
 				'value'=>'-1',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', ' '.getMLText('reviews_rejected_latest', array('no_reviews' => $cr["-1"]))."</label>")
@@ -186,7 +186,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[approval][]',
 				'value'=>'0',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', getMLText('approvals_not_touched_latest', array('no_approvals' => $ca["0"]))."</label>")
@@ -203,7 +203,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[approval][]',
 				'value'=>'1',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">',getMLText('approvals_accepted_latest', array('no_approvals' => $ca["1"]))."</label>")
@@ -220,7 +220,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[approval][]',
 				'value'=>'-1',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', getMLText('approvals_rejected_latest', array('no_approvals' => $ca["-1"]))."</label>")
@@ -238,7 +238,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[receipt][]',
 				'value'=>'0',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', getMLText('receipts_not_touched_latest', array('no_receipts' => $cb["0"]))."</label>")
@@ -255,7 +255,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[receipt][]',
 				'value'=>'1',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', getMLText('receipts_accepted_latest', array('no_receipts' => $cb["1"]))."</label>")
@@ -272,7 +272,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[receipt][]',
 				'value'=>'-1',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', getMLText('receipts_rejected_latest', array('no_receipts' => $cb["-1"]))."</label>")
@@ -290,7 +290,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[revision][]',
 				'value'=>'0',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', getMLText('revisions_not_touched_latest', array('no_revisions' => $cc["0"]))."</label>")
@@ -307,7 +307,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[revision][]',
 				'value'=>'-3',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', getMLText('revisions_pending_latest', array('no_revisions' => $cc["-3"]))."</label>")
@@ -324,7 +324,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[revision][]',
 				'value'=>'1',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', getMLText('revisions_accepted_latest', array('no_revisions' => $cc["1"]))."</label>")
@@ -341,7 +341,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 				'type'=>'checkbox',
 				'name'=>'status[revision][]',
 				'value'=>'-1',
-				'checked'=>true
+				'checked'=>false
 			),
 			array(
 				'field_wrap' => array('<label class="checkbox">', getMLText('revisions_rejected_latest', array('no_revisions' => $cc["-1"]))."</label>")

From 23a456e7304183daaa756235e4e1098e2e8ef782 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Feb 2020 18:12:53 +0100
Subject: [PATCH 1203/2006] fix various js errors

probably due to new cytoscape version
---
 views/bootstrap/class.WorkflowGraph.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.WorkflowGraph.php b/views/bootstrap/class.WorkflowGraph.php
index 71f46f813..2eb3bcde2 100644
--- a/views/bootstrap/class.WorkflowGraph.php
+++ b/views/bootstrap/class.WorkflowGraph.php
@@ -185,8 +185,8 @@ cy.on('free', 'node', function(evt) {
 });
 
 cy.on('tap', 'node', function(evt) {
-	var node = evt.cyTarget;
-	var scratch = node.scratch('app');
+	var node = evt.target;
+	var scratch = node.scratch('_app');
 	if(typeof scratch !== 'undefined') {
 	noty({
 		text: (scratch.users ? '<p><?= '<i class="icon-user"></i> ' ?> ' + scratch.users + '</p>' : '') + (scratch.groups ? '<?= '<i class="icon-group"></i> ' ?> ' + scratch.groups + '</p>' : ''),
@@ -272,7 +272,7 @@ $(document).ready(function() {
   position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
   classes: 'action".($iscurtransition ? " current" : ($this->curtransitions ? " light" : ""))."'".(!$this->curtransitions || $iscurtransition && $this->curtransitions ? ",
   scratch: {
-    app: {groups: \"".str_replace('"', "\\\"", implode(", ", $gnames))."\", users: \"".str_replace('"', "\\\"", implode(", ", $unames))."\"}
+    _app: {groups: \"".str_replace('"', "\\\"", implode(", ", $gnames))."\", users: \"".str_replace('"', "\\\"", implode(", ", $unames))."\"}
   }" : "")."
 });\n";
 				}
@@ -321,6 +321,7 @@ $(document).ready(function() {
 					echo "cy.add({
 						data: {
 							id: 'E1-".$transition->getID()."',
+							name: '',
 							source: 'S".$state->getID()."',
 							target: 'A".$transition->getID()."-".$action->getID()."'
 						},
@@ -329,6 +330,7 @@ $(document).ready(function() {
 					echo "cy.add({
 						data: {
 							id: 'E2-".$transition->getID()."',
+							name: '',
 							source: 'A".$transition->getID()."-".$action->getID()."',
 							target: 'S".$nextstate->getID()."'
 						},

From 13e27496e09aefb6f432f0a3de9ec0dc77c6dfd3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 29 Feb 2020 15:19:11 +0100
Subject: [PATCH 1204/2006] fix getting workflow log when triggering a
 transition

---
 views/bootstrap/class.TriggerWorkflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index b9a89bbd5..12091106e 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -79,7 +79,7 @@ $(document).ready(function() {
 
 		$action = $transition->getAction();
 		$currentstate = $latestContent->getWorkflowState();
-		$wkflog = $latestContent->getWorkflowLog();
+		$wkflog = array_shift($latestContent->getWorkflowLog());
 		$workflow = $latestContent->getWorkflow();
 
 		$msg = "The document is currently in state: ".$currentstate->getName()."<br />";

From 479214118ef7bd5755646cf5a4f6024e649c7cb3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 29 Feb 2020 15:20:09 +0100
Subject: [PATCH 1205/2006] add entry for 6.0.8

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index c2edec888..f481aeba4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - merge changes up to 5.1.15
 - fix syntax error in op/op.EditComment.php
 - fix use of private variable in op/op.SetRecipients.php and op/op.SetRevisors.php
+- fix triggering a transition in advanced workflow mode
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.7

From 0e7b23ff4c52a978a90ab7554b2f934b9e018b05 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Mar 2020 09:29:53 +0100
Subject: [PATCH 1206/2006] fix error when getting version of document

---
 views/bootstrap/class.RevisionSummary.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RevisionSummary.php b/views/bootstrap/class.RevisionSummary.php
index 7fa86ebc5..30557151f 100644
--- a/views/bootstrap/class.RevisionSummary.php
+++ b/views/bootstrap/class.RevisionSummary.php
@@ -98,7 +98,7 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
 					print "</tr>\n</thead>\n<tbody>\n";
 					$printheader=false;
 				}
-				$sammel[] = array($document->getID(), $version->getVersion);
+				$sammel[] = array($document->getID(), $version->getVersion());
 				$txt = $this->callHook('documentListItem', $document, $previewer);
 				if(is_string($txt))
 					echo $txt;

From 67e5eb5efe6555dcf46e347a9499501553e122f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Mar 2020 11:50:55 +0100
Subject: [PATCH 1207/2006] set notes for 5.1.15

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index a99722c6d..184b51afd 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1744,6 +1744,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
+- no changes, just keep same version as seeddms application
 	 </notes>
   </release>
   <release>

From 6950f7777e5af6444bdbc377d02e0d9e75781d6d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Mar 2020 18:23:11 +0100
Subject: [PATCH 1208/2006] fix bug #465

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 89b056fa2..e63328eab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.9
+--------------------------------------------------------------------------------
+- fix removal of roles (Closes: #465)
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.8
 --------------------------------------------------------------------------------

From d928c439812f507082c6065357876fd05ff488fa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Mar 2020 18:27:10 +0100
Subject: [PATCH 1209/2006] fix bug #465

---
 SeedDMS_Core/Core/inc.ClassUser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 5c0870e62..d5ef069e5 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -182,7 +182,7 @@ class SeedDMS_Core_Role { /* {{{ */
 	 *
 	 * @return boolean true on success or false in case of an error
 	 */
-	function remove($user) { /* {{{ */
+	function remove() { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "DELETE FROM `tblRoles` WHERE `id` = " . $this->_id;

From 0ed11fcb36123176ed2f0c1853a087f90ef00826 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Mar 2020 18:27:24 +0100
Subject: [PATCH 1210/2006] fix bug #458

---
 op/op.ImportFS.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php
index e19389c66..73afdeed4 100644
--- a/op/op.ImportFS.php
+++ b/op/op.ImportFS.php
@@ -61,6 +61,7 @@ function getAttributeData($attrdef, $coldata, $objdata) { /* {{{ */
 function getCategoryData($colname, $coldata, $objdata) { /* {{{ */
 	global $catids;
 	$kk = explode(',', $coldata);
+	$objdata['category'][] = array();
 	foreach($kk as $k) {
 		if(isset($catids[$k]))
 			$objdata['category'][] = $catids[$k];

From 30112e4b21935c986ca1d9cd23677a04978fd95a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Mar 2020 09:43:04 +0100
Subject: [PATCH 1211/2006] use __construct for constructors instead of class
 name

---
 SeedDMS_Core/Core/inc.ClassTransmittal.php | 4 ++--
 SeedDMS_Core/Core/inc.ClassUser.php        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassTransmittal.php b/SeedDMS_Core/Core/inc.ClassTransmittal.php
index cd63cfbe0..719f25131 100644
--- a/SeedDMS_Core/Core/inc.ClassTransmittal.php
+++ b/SeedDMS_Core/Core/inc.ClassTransmittal.php
@@ -79,7 +79,7 @@ class SeedDMS_Core_Transmittal {
 	 */
 	var $_dms;
 
-	function SeedDMS_Core_Transmittal($id, $user, $name, $comment, $isPublic=0, $date='') {
+	function __construct($id, $user, $name, $comment, $isPublic=0, $date='') {
 		$this->_id = $id;
 		$this->_name = $name;
 		$this->_comment = $comment;
@@ -312,7 +312,7 @@ class SeedDMS_Core_TransmittalItem {
 	 */
 	var $_date;
 
-	function SeedDMS_Core_TransmittalItem($id, $transmittal, $content, $date='') {
+	function __construct($id, $transmittal, $content, $date='') {
 		$this->_id = $id;
 		$this->_transmittal = $transmittal;
 		$this->_content = $content;
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index d5ef069e5..201bfcfa9 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -62,7 +62,7 @@ class SeedDMS_Core_Role { /* {{{ */
 	const role_admin = '1';
 	const role_guest = '2';
 
-	function SeedDMS_Core_Role($id, $name, $role, $noaccess=array()) { /* {{{ */
+	function __construct($id, $name, $role, $noaccess=array()) { /* {{{ */
 		$this->_id = $id;
 		$this->_name = $name;
 		$this->_role = $role;

From c6cd1b690075a52df67d1da83f6b9f76a815346f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Mar 2020 09:20:12 +0100
Subject: [PATCH 1212/2006] place delete button below selection menu

---
 views/bootstrap/class.RoleMgr.php | 34 ++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 15c797e89..4efa415ea 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -63,6 +63,7 @@ $(document).ready( function() {
 	});
 	$( "#selector" ).change(function() {
 		$('div.ajax').trigger('update', {roleid: $(this).val()});
+		window.history.pushState({"html":"","pageTitle":""},"", '../out/out.RoleMgr.php?roleid=' + $(this).val());
 	});
 });
 <?php
@@ -103,6 +104,26 @@ $(document).ready( function() {
 		}
 	} /* }}} */
 
+	function actionmenu() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$selrole = $this->params['selrole'];
+		$accessop = $this->params['accessobject'];
+
+		if($selrole) {
+			if(!$selrole->isUsed() && $accessop->check_controller_access('RoleMgr', array('action'=>'removerole'))) {
+?>
+			<form style="display: inline-block;" method="post" action="../op/op.RoleMgr.php" >
+				<?php echo createHiddenFieldWithKey('removerole'); ?>
+				<input type="hidden" name="roleid" value="<?php echo $selrole->getID()?>">
+				<input type="hidden" name="action" value="removerole">
+				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_role")?></button>
+			</form>
+<?php
+			}
+		}
+	} /* }}} */
+
 	function form() { /* {{{ */
 		$selrole = $this->params['selrole'];
 
@@ -113,17 +134,6 @@ $(document).ready( function() {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$accessop = $this->params['accessobject'];
-
-		if($currRole && !$currRole->isUsed() && $accessop->check_controller_access('RoleMgr', array('action'=>'removerole'))) {
-?>
-			<form style="display: inline-block;" method="post" action="../op/op.RoleMgr.php" >
-				<?php echo createHiddenFieldWithKey('removerole'); ?>
-				<input type="hidden" name="roleid" value="<?php echo $currRole->getID()?>">
-				<input type="hidden" name="action" value="removerole">
-				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_role")?></button>
-			</form>
-<?php
-		}
 ?>
 	<form action="../op/op.RoleMgr.php" method="post" enctype="multipart/form-data" name="form" id="form">
 <?php
@@ -212,6 +222,7 @@ $(document).ready( function() {
 		);
 ?>
 </form>
+	<div class="ajax" style="margin-bottom: 15px;" data-view="RoleMgr" data-action="actionmenu" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
 <?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
 	<div class="ajax" data-view="RoleMgr" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
 <?php } ?>
@@ -233,4 +244,3 @@ $(document).ready( function() {
 		$this->htmlEndPage();
 	} /* }}} */
 }
-?>

From 626d9d69c86476a6afa6a46d14cfe1d2f654cf3f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Mar 2020 12:18:01 +0100
Subject: [PATCH 1213/2006] fix to be working in 6.0.x

---
 out/out.PasswordForgotten.php | 12 ++++++++----
 out/out.PasswordSend.php      | 13 ++++++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/out/out.PasswordForgotten.php b/out/out.PasswordForgotten.php
index fddc18050..6afce5959 100644
--- a/out/out.PasswordForgotten.php
+++ b/out/out.PasswordForgotten.php
@@ -24,20 +24,24 @@ require_once("inc/inc.LogInit.php");
 require_once("inc/inc.Language.php");
 require_once("inc/inc.Init.php");
 require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassAccessOperation.php");
 require_once("inc/inc.ClassUI.php");
 
 include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (isset($_REQUEST["referuri"]) && strlen($_REQUEST["referuri"])>0) {
 	$referrer = $_REQUEST["referuri"];
 } else {
 	$referrer = '';
 }
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('referrer'=>$referrer));
 if($view) {
+	$view->setParam('accessobject', $accessop);
+	$view->setParam('referrer', $referrer);
 	$view($_GET);
 	exit;
 }
-
-?>
diff --git a/out/out.PasswordSend.php b/out/out.PasswordSend.php
index fddc18050..d64b8cd88 100644
--- a/out/out.PasswordSend.php
+++ b/out/out.PasswordSend.php
@@ -24,20 +24,23 @@ require_once("inc/inc.LogInit.php");
 require_once("inc/inc.Language.php");
 require_once("inc/inc.Init.php");
 require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassAccessOperation.php");
 require_once("inc/inc.ClassUI.php");
 
 include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1]);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 if (isset($_REQUEST["referuri"]) && strlen($_REQUEST["referuri"])>0) {
 	$referrer = $_REQUEST["referuri"];
 } else {
 	$referrer = '';
 }
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('referrer'=>$referrer));
 if($view) {
+	$view->setParam('accessobject', $accessop);
+	$view->setParam('referrer', $referrer);
 	$view($_GET);
-	exit;
 }
-
-?>

From 2324a67da4926d0b756bff4a26d5d5533e3c99fc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Mar 2020 12:21:44 +0100
Subject: [PATCH 1214/2006] make it work in 6.0.x

---
 out/out.ChangePassword.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/out/out.ChangePassword.php b/out/out.ChangePassword.php
index 5e3365307..3d7153d19 100644
--- a/out/out.ChangePassword.php
+++ b/out/out.ChangePassword.php
@@ -25,6 +25,7 @@ require_once("inc/inc.Language.php");
 require_once("inc/inc.Init.php");
 require_once("inc/inc.Extension.php");
 require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassAccessOperation.php");
 require_once("inc/inc.ClassUI.php");
 
 include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
@@ -43,7 +44,8 @@ if (isset($_REQUEST["hash"]) && strlen($_REQUEST["hash"])>0) {
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'referuri'=>$referuri, 'hash'=>$hash, 'passwordstrength'=>$settings->_passwordStrength));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if($view) {
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
-	exit;
 }

From f21ce1f2ed095890b9d95316b4124efb61b3123d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Mar 2020 12:22:12 +0100
Subject: [PATCH 1215/2006] add entries for 6.0.9, set cmdTimeout to 10

---
 CHANGELOG                  | 1 +
 conf/settings.xml.template | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 426cc4e06..ee0d4785a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.9
 --------------------------------------------------------------------------------
 - fix removal of roles (Closes: #465)
+- fix password forgotten process
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.8
diff --git a/conf/settings.xml.template b/conf/settings.xml.template
index bc69afe77..40ab648eb 100644
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@@ -289,7 +289,7 @@
       updateNotifyTime = "86400"
       extraPath = ""
       maxExecutionTime = "30"
-      cmdTimeout = "1"
+      cmdTimeout = "10"
     />
     <!--
        - enableNotificationAppRev: XXX

From 9c3b34b41eda0f78c1fed6aba9a1386129464e4d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Mar 2020 09:47:35 +0100
Subject: [PATCH 1216/2006] move printAttribute() into parent class

---
 views/bootstrap/class.Bootstrap.php    | 49 ++++++++++++++++++++++++++
 views/bootstrap/class.ViewDocument.php | 38 --------------------
 2 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e72242e3e..4770ddf6e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1556,6 +1556,55 @@ $(document).ready(function() {
 <?php
 	} /* }}} */
 
+	/**
+	 * Output a single attribute in the document info section
+	 *
+	 * @param object $attribute attribute
+	 */
+	protected function printAttributeValue($attribute, $noecho=false) { /* {{{ */
+		$content = '';
+		$attrdef = $attribute->getAttributeDefinition();
+		switch($attrdef->getType()) {
+		case SeedDMS_Core_AttributeDefinition::type_url:
+			$attrs = $attribute->getValueAsArray();
+			$tmp = array();
+			foreach($attrs as $attr) {
+				$tmp[] = '<a href="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
+			}
+			$content .= implode('<br />', $tmp);
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_email:
+			$attrs = $attribute->getValueAsArray();
+			$tmp = array();
+			foreach($attrs as $attr) {
+				$tmp[] = '<a mailto="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
+			}
+			$content .= implode('<br />', $tmp);
+			break;
+		default:
+			$content .= htmlspecialchars(implode(', ', $attribute->getValueAsArray()));
+		}
+		if($noecho)
+			return $content;
+		else
+			echo $content;
+	} /* }}} */
+
+	/**
+	 * Output a single attribute in the document info section
+	 *
+	 * @param object $attribute attribute
+	 */
+	protected function printAttribute($attribute) { /* {{{ */
+		$attrdef = $attribute->getAttributeDefinition();
+?>
+		    <tr>
+					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
+					<td><?php $this->printAttributeValue($attribute); ?></td>
+		    </tr>
+<?php
+	} /* }}} */
+
 	function printAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false) { /* {{{ */
 		echo self::getAttributeEditField($attrdef, $attribute, $fieldname, $norequire);
 	} /* }}} */
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 92498932a..c6c8a2985 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -83,44 +83,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */
 
-	/**
-	 * Output a single attribute in the document info section
-	 *
-	 * @param object $attribute attribute
-	 */
-	protected function printAttribute($attribute) { /* {{{ */
-		$attrdef = $attribute->getAttributeDefinition();
-?>
-		    <tr>
-					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td>
-<?php
-		switch($attrdef->getType()) {
-		case SeedDMS_Core_AttributeDefinition::type_url:
-			$attrs = $attribute->getValueAsArray();
-			$tmp = array();
-			foreach($attrs as $attr) {
-				$tmp[] = '<a href="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
-			}
-			echo implode('<br />', $tmp);
-			break;
-		case SeedDMS_Core_AttributeDefinition::type_email:
-			$attrs = $attribute->getValueAsArray();
-			$tmp = array();
-			foreach($attrs as $attr) {
-				$tmp[] = '<a mailto="'.htmlspecialchars($attr).'">'.htmlspecialchars($attr).'</a>';
-			}
-			echo implode('<br />', $tmp);
-			break;
-		default:
-			echo htmlspecialchars(implode(', ', $attribute->getValueAsArray()));
-		}
-?>
-					</td>
-		    </tr>
-<?php
-	} /* }}} */
-
 	function documentListItem() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];

From cce4be822c58078e2f2059ccd641cd103b93f811 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Mar 2020 09:48:19 +0100
Subject: [PATCH 1217/2006] use parent::printAttribute()

---
 views/bootstrap/class.ViewFolder.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 61492e27c..a7dd48862 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -283,13 +283,7 @@ $('body').on('click', '.order-btn', function(ev) {
 					} elseif(is_string($arr)) {
 						echo $arr;
 					} else {
-						$attrdef = $attribute->getAttributeDefinition();
-			?>
-					<tr>
-					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td><?php echo htmlspecialchars(implode(', ', $attribute->getValueAsArray())); ?></td>
-					</tr>
-<?php
+						$this->printAttribute($attribute);
 					}
 				}
 			}

From bf9a409a718e2961d551a875140193c09c0a2f46 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Mar 2020 10:13:12 +0100
Subject: [PATCH 1218/2006] add new method printVersionAttributes()

---
 views/bootstrap/class.ViewDocument.php | 43 ++++++++++++--------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index c6c8a2985..c65259bae 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -83,6 +83,23 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */
 
+	protected function printVersionAttributes($folder, $version) { /* {{{ */
+			$attributes = $version->getAttributes();
+			if($attributes) {
+				foreach($attributes as $attribute) {
+					$arr = $this->callHook('showDocumentContentAttribute', $version, $attribute);
+					if(is_array($arr)) {
+						print "<li>".$arr[0].": ".$arr[1]."</li>\n";
+					} else {
+						$attrdef = $attribute->getAttributeDefinition();
+						print "<li>".htmlspecialchars($attrdef->getName()).": ";
+						$this->printAttributeValue($attribute);
+						echo "</li>\n";
+					}
+				}
+			}
+	} /* }}} */
+
 	function documentListItem() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -623,18 +640,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
 		}
 		print "<ul class=\"actions unstyled\">\n";
-		$attributes = $latestContent->getAttributes();
-		if($attributes) {
-			foreach($attributes as $attribute) {
-				$arr = $this->callHook('showDocumentContentAttribute', $latestContent, $attribute);
-				if(is_array($arr)) {
-					print "<li>".$arr[0].": ".$arr[1]."</li>\n";
-				} else {
-					$attrdef = $attribute->getAttributeDefinition();
-					print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
-				}
-			}
-		}
+		$this->printVersionAttributes($folder, $latestContent);
 		print "</ul></td>\n";
 
 //		print "<td>".htmlspecialchars($latestContent->getComment())."</td>";
@@ -1510,18 +1516,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						print "<p style=\"font-style: italic;\">".htmlspecialchars($version->getComment())."</p>";
 				}
 				print "<ul class=\"actions unstyled\">\n";
-				$attributes = $version->getAttributes();
-				if($attributes) {
-					foreach($attributes as $attribute) {
-						$arr = $this->callHook('showDocumentContentAttribute', $version, $attribute);
-						if(is_array($arr)) {
-							print "<li>".$arr[0].": ".$arr[1]."</li>\n";
-						} else {
-							$attrdef = $attribute->getAttributeDefinition();
-							print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
-						}
-					}
-				}
+				$this->printVersionAttributes($folder, $version);
 				print "</ul></td>\n";
 //				print "<td>".htmlspecialchars($version->getComment())."</td>";
 				print "<td>".getOverallStatusText($vstat["status"])."</td>";

From feda33c2c85d67eeb87fce92eaee6c2b5c260534 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Mar 2020 11:05:40 +0100
Subject: [PATCH 1219/2006] add some more fold marks

---
 views/bootstrap/class.Search.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 7c8b687d9..c016dae33 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -288,8 +288,9 @@ $(document).ready( function() {
 </table>
 <?php
 		$this->contentContainerEnd();
-// }}}
+		// }}}
 
+		// Seach options for documents {{{
 		/* First check if any of the folder filters are set. If it is,
 		 * open the accordion.
 		 */
@@ -430,6 +431,9 @@ $(document).ready( function() {
   </div>
 </div>
 <?php
+		// }}}
+
+		// Seach options for folders {{{
 		/* First check if any of the folder filters are set. If it is,
 		 * open the accordion.
 		 */
@@ -480,6 +484,10 @@ $(document).ready( function() {
 </form>
 		</div>
 <?php
+		// }}}
+		// }}}
+
+		// Fulltext search Form {{{
 		if($enablefullsearch) {
 	  	echo "<div class=\"tab-pane ".(($fullsearch == true) ? 'active' : '')."\" id=\"fulltext\">\n";
 	$this->contentContainerStart();
@@ -542,6 +550,7 @@ $(document).ready( function() {
 			$this->contentContainerEnd();
 			echo "</div>\n";
 		}
+		// }}}
 ?>
 	</div>
 <?php

From 48ee318921ff497420502fa915991f2d39384b7f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 Mar 2020 09:30:26 +0100
Subject: [PATCH 1220/2006] fix setting and retrieving role of user

---
 restapi/index.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 51d57a90c..63e938700 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -132,7 +132,8 @@ function __getUserData($u) { /* {{{ */
         'email'=>$u->getEmail(),
         'language' => $u->getLanguage(),
         'theme' => $u->getTheme(),
-        'role' => $u->getRole() == SeedDMS_Core_User::role_admin ? 'admin' : ($u->getRole() == SeedDMS_Core_User::role_guest ? 'guest' : 'user'),
+//        'role' => $u->getRole() == SeedDMS_Core_User::role_admin ? 'admin' : ($u->getRole() == SeedDMS_Core_User::role_guest ? 'guest' : 'user'),
+        'role' => array('id'=>$u->getRole()->getId(), 'name'=>$u->getRole()->getName()),
         'hidden'=>$u->isHidden() ? true : false,
         'disabled'=>$u->isDisabled() ? true : false,
         'isguest' => $u->isGuest() ? true : false,
@@ -1459,10 +1460,12 @@ function createUser($request, $response) { /* {{{ */
     $language = isset($params['language']) ? $params['language'] : null;;
     $theme = isset($params['theme']) ? $params['theme'] : null;
     $comment = isset($params['comment']) ? $params['comment'] : null;
-    $role = isset($params['role']) ? $params['role'] : null;
-    $roleid = $role == 'admin' ? SeedDMS_Core_User::role_admin : ($role == 'guest' ? SeedDMS_Core_User::role_guest : SeedDMS_Core_User::role_user);
+		if(isset($params['role']) && $params['role'])
+			$role = SeedDMS_Core_Role::getInstance($params['role'], $dms, ctype_digit($params['role']) ? '' : 'name');
+		else
+			$role = SeedDMS_Core_Role::getInstance('user', $dms, 'name');
 
-    $newAccount = $dms->addUser($userName, $password, $fullname, $email, $language, $theme, $comment, $roleid);
+    $newAccount = $dms->addUser($userName, $password, $fullname, $email, $language, $theme, $comment, $role);
     if ($newAccount === false) {
         return $response->withJson(array('success'=>false, 'message'=>'Account could not be created, maybe it already exists', 'data'=>''), 500);
     }

From 14123cd604b33dd4173e6fbdaacc6f0dd3335105 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 Mar 2020 09:31:16 +0100
Subject: [PATCH 1221/2006] add entry for 6.0.9

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ee0d4785a..d0a158933 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - fix removal of roles (Closes: #465)
 - fix password forgotten process
+- fix setting role of new user and retrieving role of existing user
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.8

From 97f5f73730142fc823209497af42c0eae1b4114c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Mar 2020 08:16:12 +0100
Subject: [PATCH 1222/2006] process of user can be deleted again, instead of
 transfered to another user

---
 CHANGELOG                                         |  2 ++
 op/op.UsrMgr.php                                  | 10 +++++++---
 views/bootstrap/class.RemoveUserFromProcesses.php |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 26255d950..1533979d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@
 - fix removal of roles (Closes: #465)
 - fix password forgotten process
 - fix setting role of new user and retrieving role of existing user
+- processes of users can be deleted again, instead of only transfered to
+  another user
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.8
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index ff1f106dc..f0aef6184 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -205,9 +205,13 @@ else if ($action == "removefromprocesses") {
 		UI::exitError(getMLText("admin_tools"),getMLText("cannot_delete_yourself"));
 	}
 
-	$userToAssign = $dms->getUser($_POST["assignTo"]);
-	if (!is_object($userToAssign)) {
-		UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
+	if(!empty($_POST["assignTo"])) {
+		$userToAssign = $dms->getUser($_POST["assignTo"]);
+		if (!is_object($userToAssign)) {
+			UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
+		}
+	} else {
+		$userToAssign = null;
 	}
 
 	$userToRemove = $dms->getUser($userid);
diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index a7443c3cc..6eb78b68d 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -52,7 +52,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <?php echo createHiddenFieldWithKey('removefromprocesses'); ?>
 
 <?php
-		$options = array();
+		$options = array(array(0, getMLText('do_no_transfer_to_user'));
 		foreach ($allusers as $currUser) {
 			if ($currUser->isGuest() || ($currUser->getID() == $rmuser->getID()) )
 				continue;

From 0fac1646d46fd48038c02e8d4858ac7af5fc8c13 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Apr 2020 16:56:20 +0200
Subject: [PATCH 1223/2006] set $docAccess before checking the workflow mode

---
 views/bootstrap/class.AddDocument.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 9308d235e..c0857ba27 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -192,6 +192,10 @@ $(document).ready(function() {
 		$this->warningMsg($msg);
 		$this->contentHeading(getMLText("add_document"));
 
+		// Retrieve a list of all users and groups that have review / approve
+		// privileges.
+		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
+
 		$txt = $this->callHook('addDocumentPreForm');
 		if(is_string($txt))
 			echo $txt;
@@ -450,9 +454,6 @@ $(document).ready(function() {
 			}
 			$this->warningMsg(getMLText("add_doc_workflow_warning"));
 		} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
-			// Retrieve a list of all users and groups that have review / approve
-			// privileges.
-			$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 			if($workflowmode == 'traditional') {
 				$this->contentSubHeading(getMLText("assign_reviewers"));
 

From c69490daba3baec60abdb196110532ea98b5ea3f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Apr 2020 18:29:11 +0200
Subject: [PATCH 1224/2006] translate headers, use DateTime for Excel dates

---
 inc/inc.ClassDownloadMgr.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 116784230..8e30b9ed1 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -49,7 +49,7 @@ class SeedDMS_Download_Mgr {
 	function __construct($tmpdir = '') {
 		$this->tmpdir = $tmpdir;
 		$this->items = array();
-		$this->header = array('Dokumenten-Nr.', 'Dokumentenname', 'Dateiname', 'Status', 'Int. Version', 'Prüfer', 'Prüfdatum', 'Prüfkommentar', 'Prüfstatus', 'Freigeber', 'Freigabedatum', 'Freigabekommentar', 'Freigabestatus');
+		$this->header = array(getMLText('download_header_document_no'), getMLText('download_header_document_name'), getMLText('download_header_filename'), getMLText('download_header_state'), getMLText('download_header_internal_version'), getMLText('download_header_reviewer'), getMLText('download_header_review_date'), getMLText('download_header_review_comment'), getMLText('download_header_review_state'), getMLText('download_header_approver'), getMLText('download_header_approval_date'), getMLText('download_header_approval_comment'), getMLText('download_header_approval_state'));
 		$this->extracols = array();
 		$this->rawcontents = array();
 		$this->extraheader = array();
@@ -115,7 +115,7 @@ class SeedDMS_Download_Mgr {
 					}
 					$tcol = $col;
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, $reqName);
-					$sheet->setCellValueByColumnAndRow($tcol, $l, ($r['status']==1 || $r['status']==-1) ? PHPExcel_Shared_Date::PHPToExcel(makeTsFromLongDate($r['date'])) : "");
+					$sheet->setCellValueByColumnAndRow($tcol, $l, ($r['status']==1 || $r['status']==-1) ? PHPExcel_Shared_Date::PHPToExcel(new DateTime($r['date'])) : null);
 					$sheet->getStyleByColumnAndRow($tcol++, $l)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22);
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, $r['comment']);
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, getReviewStatusText($r["status"]));
@@ -146,7 +146,7 @@ class SeedDMS_Download_Mgr {
 					}
 					$tcol = $col;
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, $reqName);
-					$sheet->setCellValueByColumnAndRow($tcol, $k, ($r['status']==1 || $r['status']==-1) ?PHPExcel_Shared_Date::PHPToExcel(makeTsFromLongDate($r['date'])) : "");
+					$sheet->setCellValueByColumnAndRow($tcol, $k, ($r['status']==1 || $r['status']==-1) ?PHPExcel_Shared_Date::PHPToExcel(new DateTime($r['date'])) : null);
 					$sheet->getStyleByColumnAndRow($tcol++, $k)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22);
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, $r['comment']);
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, getApprovalStatusText($r["status"]));

From 48cc8d80e8f4bade4ed1cc1c59dad8b163bc05b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Apr 2020 18:29:48 +0200
Subject: [PATCH 1225/2006] use SeedDMS_Core_Document::isType() to check for
 documents

---
 views/bootstrap/class.Search.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index c016dae33..045dc900d 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -83,7 +83,7 @@ $(document).ready( function() {
 		if($extraheader = $this->callHook('extraDownloadHeader'))
 			$downmgr->addHeader($extraheader);
 		foreach($entries as $entry) {
-			if(get_class($entry) == $dms->getClassname('document')) {
+			if($entry->isType('document')) {
 				$extracols = $this->callHook('extraDownloadColumns', $entry);
 				if(isset($_GET['includecontent']) && $_GET['includecontent'] && $rawcontent = $this->callHook('rawcontent', $entry->getLatestContent())) {
 					$downmgr->addItem($entry->getLatestContent(), $extracols, $rawcontent);
@@ -156,10 +156,10 @@ $(document).ready( function() {
 
 		if($showsinglesearchhit && count($entries) == 1) {
 			$entry = $entries[0];
-			if(get_class($entry) == $dms->getClassname('document')) {
+			if($entry->isType('document')) {
 				header('Location: ../out/out.ViewDocument.php?documentid='.$entry->getID());
 				exit;
-			} elseif(get_class($entry) == $dms->getClassname('folder')) {
+			} elseif($entry->isType('folder')) {
 				header('Location: ../out/out.ViewFolder.php?folderid='.$entry->getID());
 				exit;
 			}

From 9f0bc73372316518bdb8162f51937a00880d306e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Apr 2020 18:36:24 +0200
Subject: [PATCH 1226/2006] add item for 6.0.9

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1533979d8..ad76c3db2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - fix setting role of new user and retrieving role of existing user
 - processes of users can be deleted again, instead of only transfered to
   another user
+- fix export of search results, headers of excel file can be translated
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.8

From 2e58a9324f1e56f7b45d22a2fe56dd77e9ad96f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 Apr 2020 08:25:00 +0200
Subject: [PATCH 1227/2006] fix arcordeon for folder parameters

---
 views/bootstrap/class.Search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 045dc900d..4105c51d8 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -317,11 +317,11 @@ $(document).ready( function() {
 <div class="accordion" id="accordion1">
   <div class="accordion-group">
     <div class="accordion-heading">
-      <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapseFolder">
+      <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapseExport">
         <?php printMLText('export'); ?>
       </a>
     </div>
-    <div id="collapseFolder" class="accordion-body">
+    <div id="collapseExport" class="accordion-body">
       <div class="accordion-inner">
 <table class="table-condensed">
 <tr>

From 4538858561803e3af4ba8d3756d8ea6735a08212 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 Apr 2020 08:25:50 +0200
Subject: [PATCH 1228/2006] new entry for 6.0.9

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ad76c3db2..d37e3677d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - processes of users can be deleted again, instead of only transfered to
   another user
 - fix export of search results, headers of excel file can be translated
+- fix arcordeon for folder filters on search page
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.8

From 5d1d406cc10582e989071371bb9c5cdf625335c1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 Apr 2020 08:46:00 +0200
Subject: [PATCH 1229/2006] take out empty opition for owner in fulltext search
 form

---
 views/bootstrap/class.Search.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 4105c51d8..2adabd5ea 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -511,7 +511,6 @@ $(document).ready( function() {
 <td><?php printMLText("owner");?>:</td>
 <td>
 <select class="chzn-select" name="ownerid" data-allow-clear="true" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
-<option value="-1"></option>
 <?php
 			foreach ($allUsers as $userObj) {
 				if ($userObj->isGuest() || ($userObj->isHidden() && $userObj->getID() != $user->getID() && !$user->isAdmin()))

From 6e89a180b12dd83a0fcd16d8a0d35a32589409b3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Apr 2020 17:13:32 +0200
Subject: [PATCH 1230/2006] fix upload from dropfolder

---
 CHANGELOG             | 1 +
 op/op.AddDocument.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d37e3677d..1b18ac4f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
   another user
 - fix export of search results, headers of excel file can be translated
 - fix arcordeon for folder filters on search page
+- fix upload from dropfolder
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.8
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 9341579e4..c8159b6fb 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -319,8 +319,8 @@ if (isset($_POST["grpIndRecipients"])) {
 $docsource = 'upload';
 
 if($settings->_dropFolderDir) {
-	if(isset($_POST["dropfolderfileform1"]) && $_POST["dropfolderfileform1"]) {
-		$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"];
+	if(isset($_POST["dropfolderfileadddocform"]) && $_POST["dropfolderfileadddocform"]) {
+		$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileadddocform"];
 		if(file_exists($fullfile)) {
 			$docsource = 'dropfolder';
 			/* Check if a local file is uploaded as well */
@@ -332,7 +332,7 @@ if($settings->_dropFolderDir) {
 			$mimetype = finfo_file($finfo, $fullfile);
 			$_FILES["userfile"]['tmp_name'][] = $fullfile;
 			$_FILES["userfile"]['type'][] = $mimetype;
-			$_FILES["userfile"]['name'][] = $_POST["dropfolderfileform1"];
+			$_FILES["userfile"]['name'][] = $_POST["dropfolderfileadddocform"];
 			$_FILES["userfile"]['size'][] = filesize($fullfile);
 			$_FILES["userfile"]['error'][] = 0;
 		}

From 7485e0b57a8f563ffbb7272949e113f533426f92 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Apr 2020 18:04:08 +0200
Subject: [PATCH 1231/2006] fix notes

---
 SeedDMS_Core/package.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 566305512..de8b651ab 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,10 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- fix call of hooks in SeedDMS_Core
-- add variable lasterror in SeedDMS_Core_DMS which can be set by hooks to pass an
-  error msg to the calling application
-- better error checking in SeedDMS_Core_Document::addDocumentFile()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1763,7 +1759,10 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-- no changes, just keep same version as seeddms application
+- fix call of hooks in SeedDMS_Core
+- add variable lasterror in SeedDMS_Core_DMS which can be set by hooks to pass an
+  error msg to the calling application
+- better error checking in SeedDMS_Core_Document::addDocumentFile()
    </notes>
   </release>
   <release>

From 20e3826316e45c771b295766187fede41dbdbeeb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Apr 2020 14:09:56 +0200
Subject: [PATCH 1232/2006] add dummy note in 6.0.9

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index de8b651ab..7b44c5935 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+- no changes, just keep same version as seeddms application
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 1aefc633f961ebe84d4bd576618166ae4ba871bd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Apr 2020 07:23:17 +0200
Subject: [PATCH 1233/2006] fix adding new calendar event

---
 CHANGELOG                           | 1 +
 out/out.AddEvent.php                | 1 +
 views/bootstrap/class.Bootstrap.php | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 649fd4685..f1aa4721b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - fix export of search results, headers of excel file can be translated
 - fix arcordeon for folder filters on search page
 - fix upload from dropfolder
+- fix adding new calendar event
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.8
diff --git a/out/out.AddEvent.php b/out/out.AddEvent.php
index 47fc29871..72333fcd4 100644
--- a/out/out.AddEvent.php
+++ b/out/out.AddEvent.php
@@ -39,6 +39,7 @@ if ($user->isGuest()) {
 }
 
 if($view) {
+	$view->setParam('accessobject', $accessop);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
 	$view($_GET);
 	exit;
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 83a5a1f62..dcbafba8f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -899,6 +899,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 	
 	private function calendarOldNavigationBar($d){ /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		$ds="&day=".$d[0]."&month=".$d[1]."&year=".$d[2];
 		echo "<id=\"first\"><a href=\"../out/out.CalendarOld.php?mode=y\" class=\"brand\">".getMLText("calendar")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
@@ -916,6 +917,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	private function calendarNavigationBar($d){ /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		echo "<id=\"first\"><a href=\"../out/out.Calendar.php\" class=\"brand\">".getMLText("calendar")."</a>\n";
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "<ul class=\"nav\">\n";

From 6dddef6efae9f830e357c10af95aadd1b8241c19 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 7 May 2020 09:11:56 +0200
Subject: [PATCH 1234/2006] fix uploading files with fine uploader (Closes:
 #472)

---
 CHANGELOG                             | 1 +
 views/bootstrap/class.AddDocument.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index cea52fc85..7338cdde2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.10
 --------------------------------------------------------------------------------
 - fix list of previous document versions (Closes: #471)
+- fix uploading files with fine uploader (Closes: #472)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.9
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index c0857ba27..4e6168126 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -41,7 +41,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style {
 		header('Content-Type: application/javascript; charset=UTF-8');
 
 		if($enablelargefileupload) {
-			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize, $enablemultiupload);
+			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize, $enablemultiupload, 'userfile', 'adddocform');
 		}
 ?>
 $(document).ready(function() {

From 84aa83d1d921a3760d3b3b53a52a502eff5733ae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 May 2020 12:42:44 +0200
Subject: [PATCH 1235/2006] rework countDocuments()

check if user is actually set, 'WorkflowByMe' now uses a single sql
statement
---
 SeedDMS_Core/Core/inc.ClassDMS.php | 76 ++++++++++++++----------------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 7722c4fbf..332f0657c 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -904,7 +904,7 @@ class SeedDMS_Core_DMS {
 			foreach($tmp as $group)
 				$groups[] = $group->getID();
 		}
-		$selectStr = "SELECT count(*) c ";
+		$selectStr = "count(distinct ttcontentid.document) c ";
 		$queryStr = 
 			"FROM `ttcontentid` ".
 			"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID`=`ttcontentid`.`document` AND `tblDocumentStatus`.`version`=`ttcontentid`.`maxVersion` ".
@@ -936,10 +936,12 @@ class SeedDMS_Core_DMS {
 				"LEFT JOIN `ttapproveid` ON `ttapproveid`.`approveID` = `tblDocumentApprovers`.`approveID` ".
 				"LEFT JOIN `tblDocumentApproveLog` ON `tblDocumentApproveLog`.`approveLogID`=`ttapproveid`.`maxLogID` ";
 
-			$queryStr .= "WHERE (`tblDocumentApprovers`.`type` = 0 AND `tblDocumentApprovers`.`required` = ".$user->getID()." ";
-			if($groups)
-				$queryStr .= "OR `tblDocumentApprovers`.`type` = 1 AND `tblDocumentApprovers`.`required` IN (".implode(',', $groups).") ";
-			$queryStr .= ") ";
+			if($user) {
+				$queryStr .= "WHERE (`tblDocumentApprovers`.`type` = 0 AND `tblDocumentApprovers`.`required` = ".$user->getID()." ";
+				if($groups)
+					$queryStr .= "OR `tblDocumentApprovers`.`type` = 1 AND `tblDocumentApprovers`.`required` IN (".implode(',', $groups).") ";
+				$queryStr .= ") ";
+			}
 			$queryStr .= "AND `tblDocumentApproveLog`.`status` = 0 ";
 			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_APP.", ".S_EXPIRED.") ";
 			break; /* }}} */
@@ -952,10 +954,12 @@ class SeedDMS_Core_DMS {
 				"LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`receiptID` = `tblDocumentRecipients`.`receiptID` ".
 				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentReceiptLog`.`receiptLogID`=`ttreceiptid`.`maxLogID` ";
 
-			$queryStr .= "WHERE (`tblDocumentRecipients`.`type` = 0 AND `tblDocumentRecipients`.`required` = ".$user->getID()." ";
-			if($groups)
-				$queryStr .= "OR `tblDocumentRecipients`.`type` = 1 AND `tblDocumentRecipients`.`required` IN (".implode(',', $groups).") ";
-			$queryStr .= ") ";
+			if($user) {
+				$queryStr .= "WHERE (`tblDocumentRecipients`.`type` = 0 AND `tblDocumentRecipients`.`required` = ".$user->getID()." ";
+				if($groups)
+					$queryStr .= "OR `tblDocumentRecipients`.`type` = 1 AND `tblDocumentRecipients`.`required` IN (".implode(',', $groups).") ";
+				$queryStr .= ") ";
+			}
 			$queryStr .= "AND `tblDocumentReceiptLog`.`status` = 0 ";
 			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_RELEASED.") ";
 			break; /* }}} */
@@ -968,51 +972,40 @@ class SeedDMS_Core_DMS {
 				"LEFT JOIN `ttrevisionid` ON `ttrevisionid`.`revisionID` = `tblDocumentRevisors`.`revisionID` ".
 				"LEFT JOIN `tblDocumentRevisionLog` ON `tblDocumentRevisionLog`.`revisionLogID`=`ttrevisionid`.`maxLogID` ";
 
-			$queryStr .= "WHERE (`tblDocumentRevisors`.`type` = 0 AND `tblDocumentRevisors`.`required` = ".$user->getID()." ";
-			if($groups)
-				$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).") ";
-			$queryStr .= ") ";
+			if($user) {
+				$queryStr .= "WHERE (`tblDocumentRevisors`.`type` = 0 AND `tblDocumentRevisors`.`required` = ".$user->getID()." ";
+				if($groups)
+					$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).") ";
+				$queryStr .= ") ";
+			}
 			$queryStr .= "AND `tblDocumentRevisionLog`.`status` = 0 ";
 			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_IN_REVISION.") ";
 			break; /* }}} */
-		case 'NeedsCorrectionOwner':
+		case 'NeedsCorrectionOwner': // Documents that need to be corrected {{{
 			$queryStr .=
 				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `ttcontentid`.`document` ";
 			$queryStr .= "WHERE `tblDocuments`.`owner` = '".$user->getID()."' ".
 				"AND `tblDocumentStatusLog`.`status` IN (".S_NEEDS_CORRECTION.") ";
 			break; /* }}} */
-		case 'WorkflowByMe':
-			// Get document list for the current user.
-			$workflowStatus = $user->getWorkflowStatus();
+		case 'WorkflowByMe': // Documents which need my workflow action {{{
 
-			// Create a comma separated list of all the documentIDs whose information is
-			// required.
-			$dList = array();
-			foreach ($workflowStatus["u"] as $st) {
-				if (!in_array($st["document"], $dList)) {
-					$dList[] = $st["document"];
-				}
-			}
-			foreach ($workflowStatus["g"] as $st) {
-				if (!in_array($st["document"], $dList)) {
-					$dList[] = $st["document"];
-				}
-			}
-			$docCSV = "";
-			foreach ($dList as $d) {
-				$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
-			}
+			$queryStr .=
+				"LEFT JOIN `tblWorkflowDocumentContent` on `ttcontentid`.`document`=`tblWorkflowDocumentContent`.`document` AND `ttcontentid`.`maxVersion`=`tblWorkflowDocumentContent`.`version` ".
+				"LEFT JOIN `tblWorkflowTransitions` on `tblWorkflowDocumentContent`.`workflow`=`tblWorkflowTransitions`.`workflow` AND `tblWorkflowDocumentContent`.`state`=`tblWorkflowTransitions`.`state` ".
+				"LEFT JOIN `tblWorkflowTransitionUsers` on `tblWorkflowTransitionUsers`.`transition` = `tblWorkflowTransitions`.`id` ".
+				"LEFT JOIN `tblWorkflowTransitionGroups` on `tblWorkflowTransitionGroups`.`transition` = `tblWorkflowTransitions`.`id` ";
 
-			if ($dList) {
-				$queryStr .=
-							"WHERE `ttcontentid`.`document` IN (" . implode(',', $dList) . ")";
-			} else {
-				$queryStr = '';
+			if($user) {
+				$queryStr .= "WHERE (`tblWorkflowTransitionUsers`.`userid` = ".$user->getID()." ";
+				if($groups)
+					$queryStr .= "OR `tblWorkflowTransitionGroups`.`groupid` IN (".implode(',', $groups).")";
+				$queryStr .= ") ";
 			}
-			break;
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_IN_WORKFLOW." ";
+			break; // }}}
 		}
 		if($queryStr) {
-			$resArr = $this->db->getResultArray($selectStr.$queryStr);
+			$resArr = $this->db->getResultArray('SELECT '.$selectStr.$queryStr);
 			if (is_bool($resArr) && !$resArr) {
 				return false;
 			}
@@ -1518,6 +1511,7 @@ class SeedDMS_Core_DMS {
 					$queryStr .= "OR `tblWorkflowTransitionGroups`.`groupid` IN (".implode(',', $groups).")";
 				$queryStr .= ") ";
 			}
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_IN_WORKFLOW." ";
 //			echo 'SELECT '.$selectStr." ".$queryStr;
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";

From 1bf0529a6842df47cc3b2ca009609bf54e72846b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2020 14:33:26 +0200
Subject: [PATCH 1236/2006] add javascript translations

---
 views/bootstrap/class.MyDocuments.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index f32085ae2..69e32c07b 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -38,6 +38,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 		$this->printClickDocumentJs();
 ?>
 $(document).ready( function() {

From 521e3b33801d4473317c9acad68220bd2ae9ddbe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2020 14:38:03 +0200
Subject: [PATCH 1237/2006] propperly include bootbox

---
 views/bootstrap/class.MyDocuments.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 69e32c07b..1bd5a13b9 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -117,8 +117,6 @@ $(document).ready( function() {
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 		$previewer->setConverters($previewconverters);
@@ -713,6 +711,8 @@ $(document).ready( function() {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 		$previewer->setConverters($previewconverters);
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
 		$this->contentStart();

From ae9be17b4d904b6e5a26382ea995f55d351240b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2020 14:51:52 +0200
Subject: [PATCH 1238/2006] support onepage mode, update url after selecting a
 document list

---
 views/bootstrap/class.TransmittalMgr.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index d966a2f62..467566d28 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -32,15 +32,22 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		$showtree = $this->params['showtree'];
+		$onepage = $this->params['onepage'];
+
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 		$this->printDeleteDocumentButtonJs();
 		$this->printDeleteItemButtonJs();
 		$this->printUpdateItemButtonJs();
+		if($onepage)
+			$this->printClickDocumentJs();
 ?>
 $(document).ready( function() {
 	$('body').on('click', '.selecttransmittal', function(ev){
 		ev.preventDefault();
 		$('div.ajax').trigger('update', {transmittalid: $(ev.currentTarget).data('transmittalid')});
+		window.history.pushState({"html":"","pageTitle":""},"", '../out/out.TransmittalMgr.php?transmittalid=' + $(ev.currentTarget).data('transmittalid'));
 	});
 });
 <?php
@@ -285,14 +292,15 @@ $(document).ready( function() {
 						$document = $content->getDocument();
 						$latestcontent = $document->getLatestContent();
 						if ($document->getAccessMode($user) >= M_READ) {
-							echo "<tr id=\"table-row-transmittalitem-".$item->getID()."\">";
+//							echo "<tr id=\"table-row-transmittalitem-".$item->getID()."\">";
+							echo $this->documentListRowStart($document);
 							echo $this->documentListRow($document, $previewer, true, $content->getVersion());
 							echo "<td><div class=\"list-action\">";
 							$this->printDeleteItemButton($item, getMLText('transmittalitem_removed'));
 							if($latestcontent->getVersion() != $content->getVersion())
 								$this->printUpdateItemButton($item, getMLText('transmittalitem_updated', array('prevversion'=>$content->getVersion(), 'newversion'=>$latestcontent->getVersion())));
 							echo "</div></td>";
-							echo "</tr>";
+							echo $this->documentListRowEnd($document);
 						}
 					} else {
 						echo "<tr id=\"table-row-transmittalitem-".$item->getID()."\">";

From a8af1a148b1eed943d0e288f446db5a1330a12c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2020 15:25:43 +0200
Subject: [PATCH 1239/2006] pass showtree to view

---
 out/out.TransmittalMgr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index 2e7c789ff..3ce4fd276 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -47,6 +47,7 @@ if(isset($_GET['transmittalid']) && $_GET['transmittalid']) {
 
 if($view) {
 	$view->setParam('seltransmittal', $seltransmittal);
+	$view->setParam('showtree', showtree());
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);

From 4a88ff342feec91b01cd3c097a3cada42de00707 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 13 May 2020 15:29:14 +0200
Subject: [PATCH 1240/2006] include bootbox

---
 views/bootstrap/class.ReceiptSummary.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 0176d30fe..5d8fc68ab 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -55,6 +55,8 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
 		$this->contentStart();

From bf11f7cc876727ee2e66efc8b542e7aeb934216e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 May 2020 08:05:04 +0200
Subject: [PATCH 1241/2006] clear revision date when all revisors have been
 deleted

---
 CHANGELOG             | 1 +
 op/op.SetRevisors.php | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 53dd80984..6284cea92 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - fix list of previous document versions (Closes: #471)
 - fix uploading files with fine uploader (Closes: #472)
+- clear revision date when all revisors have been deleted
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.9
diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 56cff04d6..8314c506c 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -212,7 +212,7 @@ if (count($revisionIndex["i"]) > 0) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_removed"));
 						break;
 					case -4:
-						// email error
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_was_active"));
 						break;
 				}
 			}
@@ -315,7 +315,7 @@ if (count($revisionIndex["g"]) > 0) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_already_removed"));
 						break;
 					case -4:
-						// email error
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("recipient_was_active"));
 						break;
 				}
 			}
@@ -323,6 +323,11 @@ if (count($revisionIndex["g"]) > 0) {
 	}
 }
 
+/* If all revisors has been removed, then clear the next revision date */
+if(!$pIndRev && !$pGrpRev) {
+	$content->setRevisionDate(false);
+}
+
 /* Recheck status, because all revisors could have been removed */
 $content->verifyStatus(false, $user, getMLText('automatic_status_update'), $settings->_initialDocumentStatus);
 

From a31524df0981876e79640c000a34e67c9fa61c5f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 May 2020 08:05:46 +0200
Subject: [PATCH 1242/2006] delRevisor() returns -4 if user has placed revision
 already

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 025018690..3d591f393 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -879,10 +879,13 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * Check if latest content of the document has a scheduled
 	 * revision workflow.
 	 * The method will update the document status log database table
-	 * if needed.
+	 * if needed and set the revisiondate of the content to $next.
 	 *
 	 * FIXME: This method does not check if there are any revisors left. Even
 	 * if all revisors have been removed, it will still start the revision workflow!
+	 * NOTE: This seems not the case anymore. The status of each revision is
+	 * checked. Only if at least one status is S_LOG_SLEEPING the revision will be
+	 * started. This wouldn't be the case if all revisors had been removed.
 	 *
 	 * @param object $user user requesting the possible automatic change
 	 * @param string $next next date for review
@@ -5495,7 +5498,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if ($indstatus["status"] != S_LOG_WAITING && $indstatus["status"] != S_LOG_SLEEPING) {
 				// User has already submitted a revision or has already been deleted;
 				// return an error.
-				return -3;
+				if($indstatus["status"] == S_LOG_USER_REMOVED)
+					return -3;
+				else
+					return -4;
 			}
 
 			$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".

From 2e31004982f0d19d5b8200e53aa367fb2a4ba31a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 May 2020 17:24:04 +0200
Subject: [PATCH 1243/2006] pass updating user to callback onSetStatus, finish
 revision when document status changes form inrevision to released

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index b30e1ead1..3f05be2e0 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3324,7 +3324,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				else $this->setStatus($initialstatus,$msg,$user);
 			} elseif($st["status"]==S_IN_REVISION) {
 				if($needsCorrection) $this->setStatus(S_NEEDS_CORRECTION,$msg,$user);
-				else $this->setStatus(S_RELEASED,$msg,$user);
+				else {
+					$this->finishRevision($user, S_RELEASED, 'Finished revision workflow', $msg);
+	//				$this->setStatus(S_RELEASED,$msg,$user);
+				}
 			} elseif($st["status"]==S_EXPIRED) {
 				$this->setStatus(S_RELEASED,$msg,$user);
 			}
@@ -3685,7 +3688,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		/* Check if 'onSetStatus' callback is set */
 		if(isset($this->_dms->callbacks['onSetStatus'])) {
 			foreach($this->_dms->callbacks['onSetStatus'] as $callback) {
-				$ret = call_user_func($callback[0], $callback[1], $this, $this->_status["status"], $status);
+				$ret = call_user_func($callback[0], $callback[1], $this, $updateUser, $this->_status["status"], $status);
 				if(is_bool($ret)) {
 					unset($this->_status);
 					if($ret)

From 7ed2660453cf2ec8e3ae6ac2b753fbd0c4b13066 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 15 May 2020 17:25:22 +0200
Subject: [PATCH 1244/2006] check if extension is enabled

---
 utils/schedulercli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 1a548d172..6ebdbca00 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -68,7 +68,7 @@ $scheduler = new SeedDMS_Scheduler($db);
 $tasks = $scheduler->getTasks();
 
 foreach($tasks as $task) {
-	if(is_object($taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])) {
+	if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])) {
 		switch($mode) {
 		case "run":
 			if(method_exists($taskobj, 'execute')) {

From cdf29f754dc4d10d6c48b038acb643a05a4dfc7d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 May 2020 16:21:24 +0200
Subject: [PATCH 1245/2006] remove spaces in empty line

---
 op/op.SchedulerTaskMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.SchedulerTaskMgr.php b/op/op.SchedulerTaskMgr.php
index ca0ce4ea2..6e67f4e54 100644
--- a/op/op.SchedulerTaskMgr.php
+++ b/op/op.SchedulerTaskMgr.php
@@ -90,7 +90,7 @@ else if ($action == "edittask") { /* {{{ */
 	$frequency = $_POST["frequency"];
 	$disabled = isset($_POST["disabled"]) ? $_POST["disabled"] : 0;
 	$params = $_POST["params"];
-	
+
 	if ($editedtask->getName() != $name)
 		$editedtask->setName($name);
 	if ($editedtask->getDescription() != $description)

From 317f10b5d1329ca07dc33986a2d62dd73243c20f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 May 2020 16:21:54 +0200
Subject: [PATCH 1246/2006] fix saving parameters

---
 inc/inc.ClassSchedulerTask.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassSchedulerTask.php b/inc/inc.ClassSchedulerTask.php
index 45017dbc3..eb0ffa2b7 100644
--- a/inc/inc.ClassSchedulerTask.php
+++ b/inc/inc.ClassSchedulerTask.php
@@ -232,14 +232,14 @@ class SeedDMS_SchedulerTask {
 		if (!$res)
 			return false;
 
-		$this->_disabled = $newDisable;
+		$this->_disabled = $newDisabled;
 		return true;
 	} /* }}} */
 
 	public function setParameter($newParams) { /* {{{ */
 		$db = $this->db;
 
-		$queryStr = "UPDATE `tblSchedulerTask` SET `parameter` =".json_encode($newParams)." WHERE `id` = " . $this->_id;
+		$queryStr = "UPDATE `tblSchedulerTask` SET `params` =".$db->qstr(json_encode($newParams))." WHERE `id` = " . $this->_id;
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;

From ff69d6e08ea307f26121c305c21a59aaa5c45032 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 May 2020 16:23:57 +0200
Subject: [PATCH 1247/2006] allow checkboxes for task parameters

---
 views/bootstrap/class.SchedulerTaskMgr.php | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index c68f55abf..0eb5458d5 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -93,6 +93,19 @@ $(document).ready( function() {
 			if($additionalparams) {
 				foreach($additionalparams as $param) {
 					switch($param['type']) {
+					case 'boolean':
+						$this->formField(
+							getMLText("task_".$extname."_".$taskname."_".$param['name']),
+							array(
+								'element'=>'input',
+								'type'=>'checkbox',
+								'id'=>'params_'.$param['name'],
+								'name'=>'params['.$param['name'].']',
+								'value'=>'1',
+								'checked'=>false,
+							)
+						);
+						break;
 					default:
 ?>
 	<div class="control-group">
@@ -168,6 +181,19 @@ $(document).ready( function() {
 		if($additionalparams = $taskobj->getAdditionalParams()) {
 			foreach($additionalparams as $param) {
 				switch($param['type']) {
+				case 'boolean':
+					$this->formField(
+						getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
+						array(
+							'element'=>'input',
+							'type'=>'checkbox',
+							'id'=>'params_'.$param['name'],
+							'name'=>'params['.$param['name'].']',
+							'value'=>'1',
+							'checked'=>$task->getParameter()[$param['name']] == 1,
+						)
+					);
+					break;
 				default:
 ?>
 	<div class="control-group">

From 537327e41db1843d07af20ceb74a8e03f7173221 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 May 2020 16:24:19 +0200
Subject: [PATCH 1248/2006] pass $user to execute() method of task

---
 ext/example/class.example.php      |  2 +-
 inc/inc.ClassSchedulerTaskBase.php |  2 +-
 utils/schedulercli.php             | 13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ext/example/class.example.php b/ext/example/class.example.php
index 5ae864f1e..c2dc22964 100644
--- a/ext/example/class.example.php
+++ b/ext/example/class.example.php
@@ -186,7 +186,7 @@ class SeedDMS_ExtExample_Task extends SeedDMS_SchedulerTaskBase {
 	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
-	public function execute($task, $dms) {
+	public function execute($task, $dms, $user) {
 		$taskparams = $task->getParameter();
 		return true;
 	}
diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index c190096a9..c51c0c0e7 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -29,7 +29,7 @@
  * @package SeedDMS
  */
 class SeedDMS_SchedulerTaskBase {
-	public function execute($task, $dms) {
+	public function execute($task, $dms, $user) {
 		return true;
 	}
 }
diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 6ebdbca00..ca7711842 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -73,11 +73,16 @@ foreach($tasks as $task) {
 		case "run":
 			if(method_exists($taskobj, 'execute')) {
 				if(!$task->getDisabled()) {
-					if($taskobj->execute($task, $dms)) {
-						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
-						$task->updateLastNextRun();
+					if($user = $dms->getUserByLogin('cli_scheduler')) {
+						if($taskobj->execute($task, $dms, $user)) {
+							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
+							$task->updateLastNextRun();
+						} else {
+							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
+							$task->setDisabled(1);
+						}
 					} else {
-						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
+						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);
 						$task->setDisabled(1);
 					}
 				}

From 204387237f07f1a5a30a25e8680631d98f7c3cc3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2020 06:15:13 +0200
Subject: [PATCH 1249/2006] add changelog for 5.1.17

---
 SeedDMS_Core/package.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f19ca585f..0340e9a8d 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1797,6 +1797,22 @@ log entry first
 - add new method SeedDMS_Core_DMS::getDocumentsExpired()
    </notes>
   </release>
+  <release>
+   <date>2020-05-14</date>
+   <time>09:43:12</time>
+   <version>
+    <release>5.1.17</release>
+    <api>5.1.17</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add new callback onSetStatus
+   </notes>
+  </release>
   <release>
    <date>2017-05-28</date>
    <time>06:34:50</time>

From 92bf2e1d69b43a17dd716d31d09b11a5705ebead Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2020 08:06:09 +0200
Subject: [PATCH 1250/2006] add method remove(), add optional parameter to
 getParameter()

---
 inc/inc.ClassSchedulerTask.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassSchedulerTask.php b/inc/inc.ClassSchedulerTask.php
index eb0ffa2b7..f9caf2af2 100644
--- a/inc/inc.ClassSchedulerTask.php
+++ b/inc/inc.ClassSchedulerTask.php
@@ -248,7 +248,9 @@ class SeedDMS_SchedulerTask {
 		return true;
 	} /* }}} */
 
-	public function getParameter() {
+	public function getParameter($name = '') {
+		if($name)
+			return isset($this->_params[$name]) ? $this->_params[$name] : null;
 		return $this->_params;
 	}
 
@@ -275,4 +277,21 @@ class SeedDMS_SchedulerTask {
 		$this->_lastrun = $lastrun;
 		$this->_nextrun = $nextrun;
 	}
+
+	/**
+	 * Delete task
+	 *
+	 * @return boolean true on success or false in case of an error
+	 */
+	function remove() { /* {{{ */
+		$db = $this->db;
+
+		$queryStr = "DELETE FROM `tblSchedulerTask` WHERE `id` = " . $this->_id;
+		if (!$db->getResult($queryStr)) {
+			return false;
+		}
+
+		return true;
+	} /* }}} */
+
 }

From df02d76e56b7e4a60dca6b9ec15592eb40b45714 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2020 08:06:42 +0200
Subject: [PATCH 1251/2006] add removal of task

---
 op/op.SchedulerTaskMgr.php | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/op/op.SchedulerTaskMgr.php b/op/op.SchedulerTaskMgr.php
index 6e67f4e54..8b327b468 100644
--- a/op/op.SchedulerTaskMgr.php
+++ b/op/op.SchedulerTaskMgr.php
@@ -66,7 +66,7 @@ if ($action == "addtask") { /* {{{ */
 	add_log_line(".php&action=addtask&name=".$name);
 } /* }}} */
 
-// modify transmittal ----------------------------------------------------
+// modify task ----------------------------------------------------
 else if ($action == "edittask") { /* {{{ */
 
 	/* Check if the form data comes for a trusted request */
@@ -104,5 +104,40 @@ else if ($action == "edittask") { /* {{{ */
 	add_log_line(".php&action=edittask&taskid=".$taskid);
 } /* }}} */
 
+// delete task -------------------------------------------------------------
+else if ($action == "removetask") { /* {{{ */
+	header('Content-Type: application/json');
+	
+	/* Check if the form data comes from a trusted request */
+	if(!checkFormKey('removetask')) {
+		echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_request_token")));
+		exit;
+	}
+
+	if (!isset($_POST["taskid"]) || !is_numeric($_POST["taskid"]) || intval($_POST["taskid"])<1) {
+		echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_task")));
+		exit;
+	}
+	
+	$taskid=$_POST["taskid"];
+	$task = $scheduler->getTask($taskid);
+	
+	if (!is_object($task)) {
+		echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_task")));
+		exit;
+	}
+
+	if (!$task->remove()) {
+		echo json_encode(array('success'=>false, 'message'=>getMLText("error_occured")));
+		exit;
+	}
+	
+	add_log_line("?taskid=".$_POST["taskid"]."&action=removetask");
+
+	echo json_encode(array('success'=>true, 'message'=>getMLText("task_removed")));
+	exit;
+} /* }}} */
+
+
 header("Location:../out/out.SchedulerTaskMgr.php");
 

From c0f4ea859b6be7ce6fed0708b1d9041727ebc2a3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2020 08:07:21 +0200
Subject: [PATCH 1252/2006] add removal of task

---
 views/bootstrap/class.SchedulerTaskMgr.php | 69 ++++++++++++++++++++--
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 0eb5458d5..8cb227173 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -44,6 +44,52 @@ $(document).ready( function() {
 		$('#editaddtask.ajax').trigger('update', {taskid: $(this).data('id'), action: $(this).data('action')});
 	});
 	$('#listtasks.ajax').trigger('update', {});
+
+	$('body').on('click', '.removetask', function(ev){
+		ev.preventDefault();
+		ev.stopPropagation();
+		id = $(ev.currentTarget).attr('rel');
+		confirmmsg = $(ev.currentTarget).attr('confirmmsg');
+		msg = $(ev.currentTarget).attr('msg');
+		formtoken = '<?= createFormKey('removetask') ?>';
+		bootbox.dialog(confirmmsg, [{
+			"label" : "<i class='icon-remove'></i> <?= getMLText("rm_task") ?>",
+			"class" : "btn-danger",
+			"callback": function() {
+				$.post('../op/op.SchedulerTaskMgr.php',
+					{ action: 'removetask', taskid: id, formtoken: formtoken },
+					function(data) {
+						if(data.success) {
+							$('#table-row-task-'+id).hide('slow');
+							noty({
+								text: msg,
+								type: 'success',
+								dismissQueue: true,
+								layout: 'topRight',
+								theme: 'defaultTheme',
+								timeout: 1500,
+							});
+						} else {
+							noty({
+								text: data.message,
+								type: 'error',
+								dismissQueue: true,
+								layout: 'topRight',
+								theme: 'defaultTheme',
+								timeout: 3500,
+							});
+						}
+					},
+					'json'
+				);
+			}
+		}, {
+			"label" : "<?= getMLText("cancel") ?>",
+			"class" : "btn-cancel",
+			"callback": function() {
+			}
+		}]);
+	});
 });
 <?php
 	} /* }}} */
@@ -138,6 +184,11 @@ $(document).ready( function() {
 		$taskid = $this->params['taskid'];
 
 		$task = $scheduler->getTask($taskid);
+		if(!isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()])) {
+			$this->errorMsg(getMLText('scheduler_extension_not_available'));
+			return;
+		}
+
 		$taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()];
 ?>
 	<form action="../op/op.SchedulerTaskMgr.php" method="post" class="form-horizontal">
@@ -190,7 +241,7 @@ $(document).ready( function() {
 							'id'=>'params_'.$param['name'],
 							'name'=>'params['.$param['name'].']',
 							'value'=>'1',
-							'checked'=>$task->getParameter()[$param['name']] == 1,
+							'checked'=>$task->getParameter($param['name']) == 1,
 						)
 					);
 					break;
@@ -244,7 +295,11 @@ $(document).ready( function() {
 		print "<th></th>\n";	
 		print "</tr></thead><tbody>\n";
 		foreach($tasks  as $task) {
-			echo "<tr".(!$task->getDisabled() ? " class=\"success\"" : "").">";
+			if(!isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]))
+				$class = 'error';
+			else
+				$class = 'success';
+			echo "<tr id=\"table-row-task-".$task->getID()."\" class=\"".(!$task->getDisabled() ? " ".$class : "")."\">";
 			echo "<td>";
 			echo $task->getExtension()."::".$task->getTask();
 			echo "</td>";
@@ -263,9 +318,12 @@ $(document).ready( function() {
 			echo "<td>";
 			echo $task->getLastRun();
 			echo "</td>";
-			echo "<td>";
+			echo "<td nowrap>";
 			print "<div class=\"list-action\">";
-			print "<a class=\"edittask\" data-action=\"edittask\" data-id=\"".$task->getID()."\" href=\"../out/out.SchedulerTaskMgr.php?action=edittask\" title=\"".getMLText("edit_task")."\"><i class=\"icon-edit\"></i></a>";
+			print "<a class=\"removetask\" rel=\"".$task->getID()."\" msg=\"".getMLText('remove_task')."\" confirmmsg=\"".htmlspecialchars(getMLText("confirm_rm_task"), ENT_QUOTES)."\" title=\"".getMLText("remove_task")."\"><i class=\"icon-remove\"></i></a>";
+			if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()])) {
+				print "<a class=\"edittask\" data-action=\"edittask\" data-id=\"".$task->getID()."\" href=\"../out/out.SchedulerTaskMgr.php?action=edittask\" title=\"".getMLText("edit_task")."\"><i class=\"icon-edit\"></i></a>";
+			}
 			print "</div>";
 			echo "</td>";
 			echo "</tr>";
@@ -280,6 +338,8 @@ $(document).ready( function() {
 		$taskname = $this->params['taskname'];
 		$scheduler = $this->params['scheduler'];
 	
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -309,6 +369,7 @@ $(document).ready( function() {
 					echo "</td>";
 					echo "<td>";
 					$params = $task->getAdditionalParams();
+					$k = array();
 					foreach($params as $param)
 						$k[] = $param['name'];
 					echo implode(', ', $k);

From 22d314b87aa1ba11295f5a234d90803208faf504 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2020 08:07:38 +0200
Subject: [PATCH 1253/2006] add entries of 6.0.10 and 6.0.9

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index cb9f46ec2..10d69ad23 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,13 +1,16 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.10
 --------------------------------------------------------------------------------
+- merge changes up to 5.1.17
 - fix list of previous document versions (Closes: #471)
 - fix uploading files with fine uploader (Closes: #472)
 - clear revision date when all revisors have been deleted
+- improve scheduler task management, tasks can be deleted, fix setting parameters
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.9
 --------------------------------------------------------------------------------
+- merge changes up to 5.1.16
 - fix removal of roles (Closes: #465)
 - fix password forgotten process
 - fix setting role of new user and retrieving role of existing user

From 98374b513da2ca224d9d1a3c4bc7c86c630e9731 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2020 11:54:39 +0200
Subject: [PATCH 1254/2006] fix syntax error

---
 views/bootstrap/class.RemoveUserFromProcesses.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index 6eb78b68d..c29d65a8d 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -52,7 +52,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 <?php echo createHiddenFieldWithKey('removefromprocesses'); ?>
 
 <?php
-		$options = array(array(0, getMLText('do_no_transfer_to_user'));
+		$options = array(array(0, getMLText('do_no_transfer_to_user')));
 		foreach ($allusers as $currUser) {
 			if ($currUser->isGuest() || ($currUser->getID() == $rmuser->getID()) )
 				continue;

From 2bd75c6d1f71d1e6ab767a1dc057ec87a3881c6c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 May 2020 17:49:32 +0200
Subject: [PATCH 1255/2006] add mode 'dryrun', actually check if a task is due

---
 utils/schedulercli.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index ca7711842..132613468 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -19,7 +19,7 @@ function usage() { /* {{{ */
 	echo "  -h, --help: print usage information and exit.\n";
 	echo "  -v, --version: print version and exit.\n";
 	echo "  --config: set alternative config file.\n";
-	echo "  --mode: set mode of operation (run, check, list).\n";
+	echo "  --mode: set mode of operation (run, dryrun, check, list).\n";
 } /* }}} */
 
 $version = "0.0.1";
@@ -49,7 +49,7 @@ if(isset($options['config'])) {
 
 $mode = 'list';
 if(isset($options['mode'])) {
-	if(!in_array($options['mode'], array('run', 'check', 'list'))) {
+	if(!in_array($options['mode'], array('run', 'dryrun', 'check', 'list'))) {
 		usage();
 		exit(1);
 	}
@@ -71,15 +71,20 @@ foreach($tasks as $task) {
 	if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])) {
 		switch($mode) {
 		case "run":
+		case "dryrun":
 			if(method_exists($taskobj, 'execute')) {
-				if(!$task->getDisabled()) {
+				if(!$task->getDisabled() && $task->isDue()) {
 					if($user = $dms->getUserByLogin('cli_scheduler')) {
-						if($taskobj->execute($task, $dms, $user)) {
-							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
-							$task->updateLastNextRun();
-						} else {
-							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
-							$task->setDisabled(1);
+						if($mode == 'run') {
+							if($taskobj->execute($task, $dms, $user)) {
+								add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
+								$task->updateLastNextRun();
+							} else {
+								add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
+								$task->setDisabled(1);
+							}
+						} elseif($mode == 'dryrun') {
+							echo "Running ".$task->getExtension()."::".$task->getTask()."\n";
 						}
 					} else {
 						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);

From 2d97c204a84655d52dffc1f576c6a0dd1474ff14 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 May 2020 20:54:34 +0200
Subject: [PATCH 1256/2006] determine SEEDDMS_HOME if not explicitly set

---
 utils/seeddms-schedulercli | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/utils/seeddms-schedulercli b/utils/seeddms-schedulercli
index 34bc8b219..f6f192a1e 100755
--- a/utils/seeddms-schedulercli
+++ b/utils/seeddms-schedulercli
@@ -1,6 +1,9 @@
 #!/bin/sh
 if [ -z ${SEEDDMS_HOME+x} ]; then
-	echo "Please set SEEDDMS_HOME before running this script";
-	exit 1;
+	parentdir=$(dirname "$0")
+	export SEEDDMS_HOME=$(dirname "$parentdir")
+#	echo "Setting SEEDDMS_HOME to:" $SEEDDMS_HOME
+#	echo "Please set SEEDDMS_HOME before running this script";
+#	exit 1;
 fi
 php -f ${SEEDDMS_HOME}/utils/schedulercli.php -- "$@"

From e5477708ad1ff1b9ae15b1030065928c5a46250f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 25 May 2020 17:09:15 +0200
Subject: [PATCH 1257/2006] ???

---
 inc/inc.ClassSchedulerTaskBase.php | 2 +-
 utils/schedulercli.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index c51c0c0e7..8cd8d40c6 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -29,7 +29,7 @@
  * @package SeedDMS
  */
 class SeedDMS_SchedulerTaskBase {
-	public function execute($task, $dms, $user) {
+	public function execute($task, $dms, $user, $settings) {
 		return true;
 	}
 }
diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 132613468..ee7838851 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -76,7 +76,7 @@ foreach($tasks as $task) {
 				if(!$task->getDisabled() && $task->isDue()) {
 					if($user = $dms->getUserByLogin('cli_scheduler')) {
 						if($mode == 'run') {
-							if($taskobj->execute($task, $dms, $user)) {
+							if($taskobj->execute($task, $dms, $user, $settings)) {
 								add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
 								$task->updateLastNextRun();
 							} else {

From 90cf72367d3210f087e8e998d1929b3d3161ef9c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 May 2020 14:12:58 +0200
Subject: [PATCH 1258/2006] put name and description in one column

---
 views/bootstrap/class.SchedulerTaskMgr.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 8cb227173..1c5cec700 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -287,8 +287,7 @@ $(document).ready( function() {
 		echo "<table class=\"table _table-condensed\">\n";
 		print "<thead>\n<tr>\n";
 		print "<th>".getMLText('scheduler_class')."</th>\n";	
-		print "<th>".getMLText('task_name')."</th>\n";	
-		print "<th>".getMLText('task_description')."</th>\n";	
+		print "<th>".getMLText('task_name')."/".getMLText('task_description')."</th>\n";	
 		print "<th>".getMLText('task_frequency')."</th>\n";	
 		print "<th>".getMLText('task_next_run')."</th>\n";	
 		print "<th>".getMLText('task_last_run')."</th>\n";	
@@ -303,10 +302,8 @@ $(document).ready( function() {
 			echo "<td>";
 			echo $task->getExtension()."::".$task->getTask();
 			echo "</td>";
-			echo "<td>";
-			echo $task->getName();
-			echo "</td>";
 			echo "<td width=\"100%\">";
+			echo "<strong>".$task->getName()."</strong></br>";
 			echo $task->getDescription();
 			echo "</td>";
 			echo "<td>";

From 376df1cb2098771654a3ff2e821bff92e258972d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 May 2020 15:12:03 +0200
Subject: [PATCH 1259/2006] include new task for checking for expired documents

---
 inc/inc.DBInit.php |  2 ++
 inc/inc.Tasks.php  | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 inc/inc.Tasks.php

diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index 7d1290604..2d1e181a5 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -65,3 +65,5 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 		}
 	}
 }
+
+require_once('inc/inc.Tasks.php');
diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
new file mode 100644
index 000000000..0f91348bb
--- /dev/null
+++ b/inc/inc.Tasks.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  trash
+ */
+class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
+
+	/**
+	 * Run the task
+	 *
+	 * @param $task task to be executed
+	 * @param $dms dms
+	 * @return boolean true if task was executed succesfully, otherwise false
+	 */
+	public function execute($task, $dms, $user, $settings) {
+		$taskparams = $task->getParameter();
+		$dms->getDocumentsExpired(intval($taskparams['days']));
+		return true;
+	}
+
+	public function getDescription() {
+		return 'Check for expired documents and set the document status';
+	}
+
+	public function getAdditionalParams() {
+		return array(
+			array(
+				'name'=>'days',
+				'type'=>'integer',
+				'description'=> 'Number of days to check for. Negative values will look into the past. 0 will just check for documents expiring the current day. Keep in mind that the document is still valid on the expiration date.',
+			)
+		);
+	}
+} /* }}} */
+
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = new SeedDMS_ExpiredDocumentsTask;

From f4a9182eadb5abb7898152583663b23fa88af78e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 May 2020 16:35:11 +0200
Subject: [PATCH 1260/2006] fix getting document id for image preview

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 47f0dea9d..b3df666a6 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -394,7 +394,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				case 'image/gif':
 					$this->contentHeading(getMLText("preview"));
 ?>
-			<img src="../op/op.ViewOnline.php?documentid=<?php echo $latestContent->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
+			<img src="../op/op.ViewOnline.php?documentid=<?php echo $latestContent->getDocument()->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
 <?php
 					break;
 				default:

From 579b561d9d047304cd3d5271092f98c430c5e9f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 May 2020 22:07:13 +0200
Subject: [PATCH 1261/2006] add script to run scheduled tasks

---
 controllers/class.Cron.php | 62 ++++++++++++++++++++++++++++++++++++++
 op/op.Cron.php             | 43 ++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 controllers/class.Cron.php
 create mode 100644 op/op.Cron.php

diff --git a/controllers/class.Cron.php b/controllers/class.Cron.php
new file mode 100644
index 000000000..631d20253
--- /dev/null
+++ b/controllers/class.Cron.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Implementation of Cron controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2020 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for the regular cron job
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2020 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
+
+	public function run() { /* {{{ */
+		$dms = $this->params['dms'];
+		$settings = $this->params['settings'];
+		$mode = 'run'; //$this->params['mode'];
+		$db = $dms->getDb();
+
+$scheduler = new SeedDMS_Scheduler($db);
+$tasks = $scheduler->getTasks();
+
+foreach($tasks as $task) {
+	if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])) {
+		switch($mode) {
+		case "run":
+			if(method_exists($taskobj, 'execute')) {
+				if(!$task->getDisabled() && $task->isDue()) {
+					if($user = $dms->getUserByLogin('cli_scheduler')) {
+						if($taskobj->execute($task, $dms, $user, $settings)) {
+							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
+							$task->updateLastNextRun();
+						} else {
+							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
+							$task->setDisabled(1);
+						}
+					} else {
+						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);
+						$task->setDisabled(1);
+					}
+				}
+			}
+			break;
+		}
+	}
+
+}
+	return true;
+	} /* }}} */
+}
+
diff --git a/op/op.Cron.php b/op/op.Cron.php
new file mode 100644
index 000000000..b25b1584c
--- /dev/null
+++ b/op/op.Cron.php
@@ -0,0 +1,43 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassController.php");
+include("../inc/inc.Scheduler.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1], array('dms'=>$dms));
+
+$controller->setParam('settings', $settings);
+if(!$controller->run()) {
+	echo getMLText("error_occured");
+	exit;
+}
+
+add_log_line();
+exit();
+

From c59a112917e9c865f6065a5b4d58778ed8275287 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 May 2020 22:08:18 +0200
Subject: [PATCH 1262/2006] add entry for 6.0.10 (adding op.Cron.php)

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9ebb91a65..67aeca945 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - fix uploading files with fine uploader (Closes: #472)
 - clear revision date when all revisors have been deleted
 - improve scheduler task management, tasks can be deleted, fix setting parameters
+- add op.Cron.php for running all scheduled tasks
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.9

From 3a29edff89ff5655b64273a970ff791b5bdaa166 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 May 2020 22:13:47 +0200
Subject: [PATCH 1263/2006] some info on how to set up the cronjob

---
 doc/README.cron | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 doc/README.cron

diff --git a/doc/README.cron b/doc/README.cron
new file mode 100644
index 000000000..09b201b3a
--- /dev/null
+++ b/doc/README.cron
@@ -0,0 +1,42 @@
+Running the scheduler
+======================
+
+Since version 6 of SeedDMS a scheduler is implemented which runs
+scheduled tasks. Such tasks must be implemented in an extension
+and can be scheduled by the administrator within the user interface.
+
+In order to check frequently for tasks ready to run, a system cron job
+must be installed. On Linux this can be done by adding the following line
+to the crontab
+
+*/5 * * * * /var/www/seeddms60x/seeddms/utils/seeddms-schedulercli --mode=run
+
+(Of course you need to change the path to `seeddms-schedulercli`)
+
+This will install a cronjob running every 5 minutes. `seeddms-schedulercli` will check
+for tasks ready to run and execute them in that case. You can decrease the time between
+two calls of the cronjob, but keep in mind that seeddms tasks may take longer and
+are being started again before the previous task has been ended.
+
+If the configuration file of SeedDMS is not found, its path can be passed
+on the command, though this should not be needed in a regular installation
+obeying the directory structure of the quickstart archive.
+
+*/5 * * * * /var/www/seeddms60x/seeddms/utils/seeddms-schedulercli --config /var/www/seeddms60x/seeddms/conf/settings.xml --mode=run
+
+For testing purposes it may be usefull to run `seeddms-schedulercli` in list mode.
+
+seeddms-schedulercli --mode=list
+
+This will just list all tasks and its scheduled exection time. Tasks ready to run,
+because its scheduled execution time is already in the past will be marked with
+a `*`. Tasks which are disabled will be marked with a `-`.
+
+Executing `seeddms-schedulercli` in `dryrun` mode will behave just like in `run` mode
+but instead of running the task it will just issue a line.
+
+Instead of running utils/seeddms-schedulercli you may as well access
+op/op.Cron.php which also runs all scheduled tasks. On Linux you do this
+by setting up a cronjob like
+
+*/5 * * * * wget -q -O - "http://<your domain>/op/op.Cron.php"

From 6f0b8806a18d80d01001b46c7d34d760261c75f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 May 2020 08:10:39 +0200
Subject: [PATCH 1264/2006] include inc.ClassSchedulerTaskBase.php

---
 inc/inc.Tasks.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 0f91348bb..0311c227a 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once("inc/inc.ClassSchedulerTaskBase.php");
+
 /**
  * Class containing methods for running a scheduled task
  *

From cc6fd60168140af49e0b7503870791b5f9076a98 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 5 Jun 2020 17:45:17 +0200
Subject: [PATCH 1265/2006] start new version 6.0.11

---
 SeedDMS_Core/package.xml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 186b8545a..afac0c81b 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2020-05-22</date>
+ <date>2020-06-05</date>
  <time>09:43:12</time>
  <version>
-  <release>6.0.10</release>
-  <api>6.0.10</api>
+  <release>6.0.11</release>
+  <api>6.0.11</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-SeedDMS_Core_DocumentContent::delRevisor() returns -4 if user has already made a revision
+SeedDMS_Core_DMS::filterAccess() properly checks for documents
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -2002,5 +2002,21 @@ remove a user from all its process can also be used to set a new user
 - no changes, just keep same version as seeddms application
    </notes>
   </release>
+  <release>
+   <date>2020-05-22</date>
+   <time>09:43:12</time>
+   <version>
+    <release>6.0.10</release>
+    <api>6.0.10</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+SeedDMS_Core_DocumentContent::delRevisor() returns -4 if user has already made a revision
+   </notes>
+  </release>
  </changelog>
 </package>

From b974f4c4e98d3c1f3de75daa6aa85964713f8f87 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 5 Jun 2020 17:45:31 +0200
Subject: [PATCH 1266/2006] filterAccess() propperly checks for documents

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 899651a08..65484ed44 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -292,7 +292,7 @@ class SeedDMS_Core_DMS {
 		foreach ($objArr as $obj) {
 			if ($obj->getAccessMode($user) >= $minMode) {
 				$dms = $obj->getDMS();
-				if(get_class($obj) == $dms->getClassname('document')) {
+				if($obj->isType('document')) {
 					if($obj->getLatestContent())
 						array_push($newArr, $obj);
 				} else {

From 98734e8ef93caa416084b6bc47a808c4b9bd8fa1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 5 Jun 2020 17:50:26 +0200
Subject: [PATCH 1267/2006] add entry for 6.0.11

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index ab14e69d1..e7e4950af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.11
 --------------------------------------------------------------------------------
+- fix access restriction for roles (content of documents was visible even if the
+  role and status didn't allow it)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.10

From 1c8452eceab7ba7a0f29bf0222e6ac9572e4b3ef Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 6 Jun 2020 16:15:32 +0200
Subject: [PATCH 1268/2006] docs in S_IN_REVISION are in list AppRev (had been
 removed after merge)

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 50a7cf33c..c76c03777 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1580,7 +1580,7 @@ class SeedDMS_Core_DMS {
 				$orderdir = 'ASC';
 			/** @noinspection PhpUndefinedConstantInspection */
 			$queryStr .=	"AND `tblDocuments`.`owner` = '".$user->getID()."' ".
-				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.") ";
+				"AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_DRAFT_APP.", ".S_IN_REVISION.") ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
 			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";

From 550f0ee1f1443090fbd54c8c046cb44f85d299fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jun 2020 07:20:57 +0200
Subject: [PATCH 1269/2006] fix typo in comments

---
 install/create_tables-innodb.sql   | 2 +-
 install/create_tables-postgres.sql | 2 +-
 install/create_tables-sqlite3.sql  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql
index 53af95f62..208392444 100644
--- a/install/create_tables-innodb.sql
+++ b/install/create_tables-innodb.sql
@@ -47,7 +47,7 @@ CREATE TABLE `tblAttributeDefinitions` (
 -- --------------------------------------------------------
 
 --
--- Table structure for table `tblUsers`
+-- Table structure for table `tblRoles`
 --
 
 CREATE TABLE `tblRoles` (
diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index d5cf4a184..dd3b17d20 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -44,7 +44,7 @@ CREATE TABLE "tblAttributeDefinitions" (
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `tblUsers`
+-- Table structure for table `tblRoles`
 -- 
 
 CREATE TABLE "tblRoles" (
diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql
index 42be5dcee..4ec2c976b 100644
--- a/install/create_tables-sqlite3.sql
+++ b/install/create_tables-sqlite3.sql
@@ -44,7 +44,7 @@ CREATE TABLE `tblAttributeDefinitions` (
 -- --------------------------------------------------------
 
 --
--- Table structure for table `tblUsers`
+-- Table structure for table `tblRoles`
 --
 
 CREATE TABLE `tblRoles` (

From 5bb78b6468e0dc80bd1e879a6ff187da20762f0c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 16 Jun 2020 08:29:33 +0200
Subject: [PATCH 1270/2006] fix sorting by name in getInstanceBy(), init _dms
 to null

---
 SeedDMS_Core/Core/inc.ClassUser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 201bfcfa9..ccdb57d69 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -67,7 +67,7 @@ class SeedDMS_Core_Role { /* {{{ */
 		$this->_name = $name;
 		$this->_role = $role;
 		$this->_noaccess = $noaccess;
-		$this->_dms = $role;
+		$this->_dms = null;
 	} /* }}} */
 
 	/**
@@ -107,7 +107,7 @@ class SeedDMS_Core_Role { /* {{{ */
 	public static function getAllInstances($orderby, $dms) { /* {{{ */
 		$db = $dms->getDB();
 
-		if($orderby == 'ame')
+		if($orderby == 'name')
 			$queryStr = "SELECT * FROM `tblRoles` ORDER BY `name`";
 		else
 			$queryStr = "SELECT * FROM `tblRoles` ORDER BY `id`";

From 505bf27d52faacda1d4fb4e72ff662dcc9fe578f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Jun 2020 21:13:22 +0200
Subject: [PATCH 1271/2006] include ClassNotificationService and
 ClassEmailNotify

---
 op/op.Cron.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op/op.Cron.php b/op/op.Cron.php
index b25b1584c..e9b56b111 100644
--- a/op/op.Cron.php
+++ b/op/op.Cron.php
@@ -26,6 +26,8 @@ include("../inc/inc.Utils.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassNotificationService.php");
+include("../inc/inc.ClassEmailNotify.php");
 include("../inc/inc.ClassController.php");
 include("../inc/inc.Scheduler.php");
 
@@ -33,6 +35,7 @@ $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms));
 
 $controller->setParam('settings', $settings);
+header("Content-Type: text/plain");
 if(!$controller->run()) {
 	echo getMLText("error_occured");
 	exit;

From 31720be0feb9a1e03d78f3ca4d5b6f13ddb1e027 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Jun 2020 08:53:34 +0200
Subject: [PATCH 1272/2006] add prototype functions, add
 getAdditionalParametersByName()

---
 inc/inc.ClassSchedulerTaskBase.php | 35 ++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index 8cd8d40c6..726963c04 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -29,9 +29,40 @@
  * @package SeedDMS
  */
 class SeedDMS_SchedulerTaskBase {
-	public function execute($task, $dms, $user, $settings) {
+	var $dms;
+
+	var $user;
+
+	var $settings;
+
+	var $logger;
+
+	public function ____construct($dms, $user, $settings, $logger) { /* {{{ */
+		$this->dms = $dms;
+		$this->user = $user;
+		$this->settings = $settings;
+		$this->logger = $logger;
+	} /* }}} */
+
+	public function execute($task, $dms, $user, $settings) { /* {{{ */
 		return true;
-	}
+	} /* }}} */
+
+	public function getDescription() { /* {{{ */
+		return '';
+	} /* }}} */
+
+	public function getAdditionalParams() { /* {{{ */
+		return array();
+	} /* }}} */
+
+	public function getAdditionalParamByName($name) { /* {{{ */
+		foreach($this->getAdditionalParams() as $param) {
+			if($param['name'] == $name)
+				return $param;
+		}
+		return null;
+	} /* }}} */
 }
 
 ?>

From 619e8a8d309094445637a3e899f66ba13cd10941 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Jun 2020 08:54:10 +0200
Subject: [PATCH 1273/2006] do not output passwords as clear text

---
 utils/schedulercli.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index ee7838851..3b16e9461 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -117,7 +117,8 @@ foreach($tasks as $task) {
 			echo "\n";
 			if($params = $task->getParameter()) {
 				foreach($params as $key=>$value) {
-					echo "    ".$key.": ".$value."\n";
+					$p = $taskobj->getAdditionalParamByName($key);
+					echo "    ".$key.": ".($p['type'] == 'password' ? '********' : $value)."\n";
 				}
 			}
 			break;

From cfc2ca1e243ed3e724fb0bbe4190d708fc51d9b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Jun 2020 08:54:37 +0200
Subject: [PATCH 1274/2006] support for additional parameters of type
 'password'

---
 views/bootstrap/class.SchedulerTaskMgr.php | 70 +++++++++++++++-------
 1 file changed, 50 insertions(+), 20 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 1c5cec700..87e513c4e 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -152,16 +152,30 @@ $(document).ready( function() {
 							)
 						);
 						break;
+					case 'password':
+						$this->formField(
+							getMLText('task_'.$extname."_".$taskname."_".$param['name']),
+							array(
+								'element'=>'input',
+								'type'=>'password',
+								'id'=>'params_'.$param['name'],
+								'name'=>'params['.$param['name'].']',
+								'required'=>false
+							)
+						);
+						break;
 					default:
-?>
-	<div class="control-group">
-	<label class="control-label" for="params_<?= $param['name'] ?>"><?php printMLText('task_'.$extname."_".$taskname."_".$param['name']);?>:</label>
-		<div class="controls">
-		<input type="text" id="params_<?= $param['name'] ?>" name="params[<?= $param['name'] ?>]" value="">
-		</div>
-	</div>
-<?php
-					break;
+						$this->formField(
+							getMLText('task_'.$extname."_".$taskname."_".$param['name']),
+							array(
+								'element'=>'input',
+								'type'=>'text',
+								'id'=>'params_'.$param['name'],
+								'name'=>'params['.$param['name'].']',
+								'required'=>false
+							)
+						);
+						break;
 					}
 				}
 			}
@@ -169,7 +183,7 @@ $(document).ready( function() {
 	<div class="control-group">
 		<label class="control-label" for="login"></label>
 		<div class="controls">
-			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+			<button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
 		</div>
 	</div>
 	</form>
@@ -245,16 +259,32 @@ $(document).ready( function() {
 						)
 					);
 					break;
+				case 'password':
+					$this->formField(
+						getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
+						array(
+							'element'=>'input',
+							'type'=>'password',
+							'id'=>'params_'.$param['name'],
+							'name'=>'params['.$param['name'].']',
+							'value'=>$task->getParameter()[$param['name']],
+							'required'=>false
+						)
+					);
+					break;
 				default:
-?>
-	<div class="control-group">
-	<label class="control-label" for="params_<?= $param['name'] ?>"><?php printMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']);?>:</label>
-		<div class="controls">
-		<input type="text" id="params_<?= $param['name'] ?>" name="params[<?= $param['name'] ?>]" value="<?= $task->getParameter()[$param['name']] ?>">
-		</div>
-	</div>
-<?php
-				break;
+					$this->formField(
+						getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
+						array(
+							'element'=>'input',
+							'type'=>'text',
+							'id'=>'params_'.$param['name'],
+							'name'=>'params['.$param['name'].']',
+							'value'=>$task->getParameter()[$param['name']],
+							'required'=>false
+						)
+					);
+					break;
 				}
 			}
 		}
@@ -262,7 +292,7 @@ $(document).ready( function() {
 	<div class="control-group">
 		<label class="control-label" for="login"></label>
 		<div class="controls">
-			<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save")?></button>
+			<button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
 		</div>
 	</div>
 	</form>

From b14326e1ad33c8db89f94161e3326b951e0ea7e2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 27 Jun 2020 12:27:59 +0200
Subject: [PATCH 1275/2006] more precise check for available task

---
 views/bootstrap/class.SchedulerTaskMgr.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 87e513c4e..5f702d51f 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -312,7 +312,7 @@ $(document).ready( function() {
 			$tasks = $scheduler->getTasks();
 		if(!$tasks)
 			return;
-		
+
 		$this->contentHeading(getMLText("scheduler_class_tasks"));
 		echo "<table class=\"table _table-condensed\">\n";
 		print "<thead>\n<tr>\n";
@@ -323,8 +323,8 @@ $(document).ready( function() {
 		print "<th>".getMLText('task_last_run')."</th>\n";	
 		print "<th></th>\n";	
 		print "</tr></thead><tbody>\n";
-		foreach($tasks  as $task) {
-			if(!isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]))
+		foreach($tasks as $task) {
+			if(!isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()]))
 				$class = 'error';
 			else
 				$class = 'success';

From cd3026a88a36c2f9898f1b11cb7431c3a2898111 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 28 Jun 2020 13:57:34 +0200
Subject: [PATCH 1276/2006] remove spaces

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index c61dab4b8..85ffcab7b 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -764,7 +764,7 @@ class SeedDMS_Core_DMS {
 		if (!$db->createTemporaryTable("ttstatid") || !$db->createTemporaryTable("ttcontentid")) {
 			return false;
 		}
-		
+
 		$tsnow = mktime(0, 0, 0); /* Start of today */
 		if(is_int($date)) {
 			$ts = $tsnow + $date * 86400;

From af9dc81ba485f17f8a2cd171720c3782f9154193 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 28 Jun 2020 13:58:32 +0200
Subject: [PATCH 1277/2006] add method resolveTask()

---
 inc/inc.Utils.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 8390e16c9..e4b2582ab 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -629,6 +629,19 @@ function getToken($length){
 	return $token;
 }
 
+function resolveTask($task) {
+	global $dms, $user, $settings, $logger;
+
+	if(is_object($task))
+		return $task;
+	if(is_string($task)) {
+		if(class_exists($task)) {
+			$task = new $task($dms, $user, $settings, $logger);
+		}
+	}
+	return $task;
+}
+
 class SeedDMS_CSRF {
 
 	protected $secret;

From b44a368d6dca4b08a059bc0298ae205c246f4ca9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 28 Jun 2020 13:59:54 +0200
Subject: [PATCH 1278/2006] use new method resolveTask()

---
 controllers/class.Cron.php                 | 44 +++++++++++-----------
 inc/inc.ClassSchedulerTaskBase.php         |  4 +-
 inc/inc.Tasks.php                          | 10 +++--
 utils/schedulercli.php                     |  4 +-
 views/bootstrap/class.SchedulerTaskMgr.php | 13 +++++--
 5 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/controllers/class.Cron.php b/controllers/class.Cron.php
index 631d20253..2c9d62837 100644
--- a/controllers/class.Cron.php
+++ b/controllers/class.Cron.php
@@ -28,34 +28,34 @@ class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
 		$mode = 'run'; //$this->params['mode'];
 		$db = $dms->getDb();
 
-$scheduler = new SeedDMS_Scheduler($db);
-$tasks = $scheduler->getTasks();
+		$scheduler = new SeedDMS_Scheduler($db);
+		$tasks = $scheduler->getTasks();
 
-foreach($tasks as $task) {
-	if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])) {
-		switch($mode) {
-		case "run":
-			if(method_exists($taskobj, 'execute')) {
-				if(!$task->getDisabled() && $task->isDue()) {
-					if($user = $dms->getUserByLogin('cli_scheduler')) {
-						if($taskobj->execute($task, $dms, $user, $settings)) {
-							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
-							$task->updateLastNextRun();
-						} else {
-							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
-							$task->setDisabled(1);
-						}
-					} else {
-						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);
-						$task->setDisabled(1);
+		foreach($tasks as $task) {
+			if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = resolveTask($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()]))) {
+				switch($mode) {
+				case "run":
+					if(method_exists($taskobj, 'execute')) {
+            if(!$task->getDisabled() && $task->isDue()) {
+							if($user = $dms->getUserByLogin('cli_scheduler')) {
+								if($taskobj->execute($task)) {
+									add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
+									$task->updateLastNextRun();
+								} else {
+									add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
+									$task->setDisabled(1);
+								}
+							} else {
+								add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);
+								$task->setDisabled(1);
+							}
+            }
 					}
+					break;
 				}
 			}
-			break;
 		}
-	}
 
-}
 	return true;
 	} /* }}} */
 }
diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index 726963c04..a596348d9 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -37,14 +37,14 @@ class SeedDMS_SchedulerTaskBase {
 
 	var $logger;
 
-	public function ____construct($dms, $user, $settings, $logger) { /* {{{ */
+	public function __construct($dms=null, $user=null, $settings=null, $logger=null) { /* {{{ */
 		$this->dms = $dms;
 		$this->user = $user;
 		$this->settings = $settings;
 		$this->logger = $logger;
 	} /* }}} */
 
-	public function execute($task, $dms, $user, $settings) { /* {{{ */
+	public function execute($task) { /* {{{ */
 		return true;
 	} /* }}} */
 
diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 0311c227a..34e94537e 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -18,9 +18,13 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
-	public function execute($task, $dms, $user, $settings) {
+	public function execute($task) {
+		$dms = $this->dms;
 		$taskparams = $task->getParameter();
-		$dms->getDocumentsExpired(intval($taskparams['days']));
+		$docs = $dms->getDocumentsExpired(intval($taskparams['days']));
+		foreach($docs as $doc) {
+			echo $doc->getName()."\n";
+		}
 		return true;
 	}
 
@@ -39,4 +43,4 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	}
 } /* }}} */
 
-$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = new SeedDMS_ExpiredDocumentsTask;
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = 'SeedDMS_ExpiredDocumentsTask';
diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 3b16e9461..07a1d44ff 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -68,7 +68,7 @@ $scheduler = new SeedDMS_Scheduler($db);
 $tasks = $scheduler->getTasks();
 
 foreach($tasks as $task) {
-	if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])) {
+	if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = resolveTask($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()]))) {
 		switch($mode) {
 		case "run":
 		case "dryrun":
@@ -76,7 +76,7 @@ foreach($tasks as $task) {
 				if(!$task->getDisabled() && $task->isDue()) {
 					if($user = $dms->getUserByLogin('cli_scheduler')) {
 						if($mode == 'run') {
-							if($taskobj->execute($task, $dms, $user, $settings)) {
+							if($taskobj->execute($task)) {
 								add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
 								$task->updateLastNextRun();
 							} else {
diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 5f702d51f..da2fed19d 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -99,8 +99,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$extname = $this->params['extname'];
 		$taskname = $this->params['taskname'];
-		if($extname && $taskname) {
-			$taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$extname][$taskname];
+		if($extname && $taskname && is_object($taskobj = resolveTask($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$extname][$taskname]))) {
 			if(method_exists($taskobj, 'getAdditionalParams'))
 				$additionalparams = $taskobj->getAdditionalParams();
 			else
@@ -204,6 +203,11 @@ $(document).ready( function() {
 		}
 
 		$taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()];
+		$taskobj = resolveTask($taskobj);
+		if(!is_object($taskobj)) {
+			$this->errorMsg(getMLText('task_class_not_callable'));
+			return;
+		}
 ?>
 	<form action="../op/op.SchedulerTaskMgr.php" method="post" class="form-horizontal">
 	<?=	createHiddenFieldWithKey('edittask') ?>
@@ -324,7 +328,7 @@ $(document).ready( function() {
 		print "<th></th>\n";	
 		print "</tr></thead><tbody>\n";
 		foreach($tasks as $task) {
-			if(!isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()]))
+			if(!isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()]) || !is_object(resolveTask($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])))
 				$class = 'error';
 			else
 				$class = 'success';
@@ -387,6 +391,9 @@ $(document).ready( function() {
 			$errmsgs = array();
 			foreach($GLOBALS['SEEDDMS_SCHEDULER']['tasks'] as $extname=>$tasks) {
 				foreach($tasks as $taskname=>$task) {
+					$task = resolveTask($task);
+					if(!is_object($task))
+						continue;
 					echo "<tr>";
 					echo "<td>";
 					echo $extname."::".$taskname;

From 9a8b13a1ccef6b71d3ae681f37ce6409014b6e77 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 28 Jun 2020 19:23:38 +0200
Subject: [PATCH 1279/2006] check if $recipients is set

---
 controllers/class.AddDocument.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 79a1dca76..6a0ad33ee 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -124,17 +124,19 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 			}
 
 			$lc = $document->getLatestContent();
-			if($recipients['i']) {
-				foreach($recipients['i'] as $uid) {
-					if($u = $dms->getUser($uid)) {
-						$res = $lc->addIndRecipient($u, $user);
+			if($recipients) {
+				if($recipients['i']) {
+					foreach($recipients['i'] as $uid) {
+						if($u = $dms->getUser($uid)) {
+							$res = $lc->addIndRecipient($u, $user);
+						}
 					}
 				}
-			}
-			if($recipients['g']) {
-				foreach($recipients['g'] as $gid) {
-					if($g = $dms->getGroup($gid)) {
-						$res = $lc->addGrpRecipient($g, $user);
+				if($recipients['g']) {
+					foreach($recipients['g'] as $gid) {
+						if($g = $dms->getGroup($gid)) {
+							$res = $lc->addGrpRecipient($g, $user);
+						}
 					}
 				}
 			}

From db668791d1666a2fc50172e537c92414a5c2284c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 28 Jun 2020 19:24:12 +0200
Subject: [PATCH 1280/2006] check for user cli_scheduler before running any
 tasks

---
 utils/schedulercli.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 07a1d44ff..cb49b3b2e 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -63,6 +63,12 @@ include($myincpath."/inc/inc.Language.php");
 include($myincpath."/inc/inc.Extension.php");
 include($myincpath."/inc/inc.DBInit.php");
 include($myincpath."/inc/inc.Scheduler.php");
+include($myincpath."/inc/inc.ClassController.php");
+
+if(!($user = $dms->getUserByLogin('cli_scheduler'))) {
+	add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);
+	exit;
+}
 
 $scheduler = new SeedDMS_Scheduler($db);
 $tasks = $scheduler->getTasks();
@@ -74,21 +80,16 @@ foreach($tasks as $task) {
 		case "dryrun":
 			if(method_exists($taskobj, 'execute')) {
 				if(!$task->getDisabled() && $task->isDue()) {
-					if($user = $dms->getUserByLogin('cli_scheduler')) {
-						if($mode == 'run') {
-							if($taskobj->execute($task)) {
-								add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
-								$task->updateLastNextRun();
-							} else {
-								add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
-								$task->setDisabled(1);
-							}
-						} elseif($mode == 'dryrun') {
-							echo "Running ".$task->getExtension()."::".$task->getTask()."\n";
+					if($mode == 'run') {
+						if($taskobj->execute($task)) {
+							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
+							$task->updateLastNextRun();
+						} else {
+							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
+							$task->setDisabled(1);
 						}
-					} else {
-						add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);
-						$task->setDisabled(1);
+					} elseif($mode == 'dryrun') {
+						echo "Running ".$task->getExtension()."::".$task->getTask()."\n";
 					}
 				}
 			}

From 28aed4d11ac2f25de4729ee0178a5460699ea57b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Jul 2020 09:05:18 +0200
Subject: [PATCH 1281/2006] fix error msg when user cli_scheduler does not
 exists

---
 utils/schedulercli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index cb49b3b2e..d609909d9 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -66,7 +66,7 @@ include($myincpath."/inc/inc.Scheduler.php");
 include($myincpath."/inc/inc.ClassController.php");
 
 if(!($user = $dms->getUserByLogin('cli_scheduler'))) {
-	add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);
+	add_log_line("Execution of tasks failed because of missing user 'cli_scheduler'. Will exit now.", PEAR_LOG_ERR);
 	exit;
 }
 

From fd0a3625788b808f0134f25efcb73ae30d82af62 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Jul 2020 15:52:12 +0200
Subject: [PATCH 1282/2006] allow to disable task when creating

---
 op/op.SchedulerTaskMgr.php                 | 3 ++-
 views/bootstrap/class.SchedulerTaskMgr.php | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/op/op.SchedulerTaskMgr.php b/op/op.SchedulerTaskMgr.php
index 8b327b468..45589660b 100644
--- a/op/op.SchedulerTaskMgr.php
+++ b/op/op.SchedulerTaskMgr.php
@@ -52,9 +52,10 @@ if ($action == "addtask") { /* {{{ */
 	$name    = $_POST["name"];
 	$description = $_POST["description"];
 	$frequency = $_POST["frequency"];
+	$disabled = isset($_POST["disabled"]) ? $_POST["disabled"] : 0;
 	$params = $_POST["params"];
 
-	$newtask = $scheduler->addTask($extension, $task, $name, $description, $frequency, 0, $params);
+	$newtask = $scheduler->addTask($extension, $task, $name, $description, $frequency, $disabled, $params);
 	if ($newtask) {
 	}
 	else UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index da2fed19d..bc523c03f 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -134,6 +134,13 @@ $(document).ready( function() {
 			<input type="text" id="frequency" name="frequency" value="">
 		</div>
 	</div>
+	<div class="control-group">
+		<div class="controls">
+			<label class="checkbox">
+				<input type="checkbox" name="disabled" value="1" checked> <?= getMLText('task_disabled'); ?>
+			</label>
+		</div>
+	</div>
 <?php
 			if($additionalparams) {
 				foreach($additionalparams as $param) {

From 38d8aebb49432b7bf7f987ec5654e65800b19ab5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 Jul 2020 17:19:07 +0200
Subject: [PATCH 1283/2006] allow select menu for task parameters

---
 views/bootstrap/class.SchedulerTaskMgr.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index bc523c03f..8e7c51802 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -170,6 +170,19 @@ $(document).ready( function() {
 							)
 						);
 						break;
+					case 'select':
+						$this->formField(
+							getMLText('task_'.$extname."_".$taskname."_".$param['name']),
+							array(
+								'element'=>'select',
+								'class'=>'chzn-select',
+								'name'=>'params['.$param['name'].']',
+								'multiple'=>false,
+								'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
+								'options'=>$param['options'],
+							)
+						);
+						break;
 					default:
 						$this->formField(
 							getMLText('task_'.$extname."_".$taskname."_".$param['name']),

From 4bd68ac53543d42c6bb6526bc2335bd934ac63b7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 Jul 2020 17:41:09 +0200
Subject: [PATCH 1284/2006] keep documents from being index again unless they
 have really changed

---
 utils/indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/indexer.php b/utils/indexer.php
index c2a825dc8..172dabb0c 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -112,7 +112,7 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 				$created = 0;
 			}
 			$content = $document->getLatestContent();
-			if($created > $content->getDate()) {
+			if($created >= $content->getDate()) {
 				echo $themes->italic(" (Document unchanged)").PHP_EOL;
 			} else {
 				$index->delete($hit->id);

From 8eec73b4be8c4925801a4ce394aa0591469f0faf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Jul 2020 19:30:36 +0200
Subject: [PATCH 1285/2006] add more documentation is addRevisor()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 3859b47eb..5bbd3078f 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -5050,7 +5050,14 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 
 		/* If a user is added when the revision has already been startet, then
-		 * put it in S_IN_REVISION otherwise in S_LOG_WAITING.
+		 * put it into S_LOG_WAITING otherwise into S_LOG_SLEEPING. Attention, if a
+		 * document content is in any other status but S_IN_REVISION, then it will
+		 * end up in S_LOG_SLEEPING. As this method is also called by removeFromProcesses()
+		 * when another user takes over the processes, it may happen that revisions
+		 * of document contents in status e.g. S_OBSOLETE, S_EXPIRED will change its
+		 * status from S_LOG_WAITING to S_LOG_SLEEPING. 
+		 * This could only be fixed if this method could set an initial revision status
+		 * by possibly passing it as another parameter to the method.
 		 */
 		$st=$this->getStatus();
 		$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".

From a34cd8b4ee36745ca36d2e46e621c77da82cbdf2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Jul 2020 19:31:47 +0200
Subject: [PATCH 1286/2006] add new revisor when transfering processes even in
 status 'sleeping'

---
 SeedDMS_Core/Core/inc.ClassUser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 5e666f14e..9bc79d276 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -1022,8 +1022,8 @@ class SeedDMS_Core_User { /* {{{ */
 					$db->rollbackTransaction();
 					return false;
 				}
-				/* Only revisions not done already can be transferred to a new user */
-				if($newuser && $ri['status'] == 0) {
+				/* Only revisions not already done or sleeping can be transferred to a new user */
+				if($newuser && in_array($ri['status'], array(S_LOG_WAITING, S_LOG_SLEEPING))) {
 					if($doc = $this->_dms->getDocument($ri['documentID'])) {
 						if($version = $doc->getContentByVersion($ri['version'])) {
 							$ret = $version->addIndRevisor($newuser, $user);

From 0d4cd6a0be05ead22797a6de796a2483d96d6e53 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Jul 2020 07:17:19 +0200
Subject: [PATCH 1287/2006] check if converters['preview'] exists

---
 out/out.ApprovalSummary.php       | 2 +-
 out/out.DocumentVersionDetail.php | 2 +-
 out/out.ManageNotify.php          | 2 +-
 out/out.MyDocuments.php           | 2 +-
 out/out.ObjectCheck.php           | 2 --
 out/out.ReceiptSummary.php        | 2 +-
 out/out.ReviewSummary.php         | 2 +-
 out/out.RevisionSummary.php       | 2 +-
 out/out.Search.php                | 2 +-
 out/out.TransmittalMgr.php        | 2 +-
 out/out.WorkflowSummary.php       | 2 +-
 11 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php
index 70b4e413c..e2c54d878 100644
--- a/out/out.ApprovalSummary.php
+++ b/out/out.ApprovalSummary.php
@@ -44,7 +44,7 @@ if($view) {
 	$view->setParam('showtree', showtree());
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index ef0372644..b578456ae 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -76,7 +76,7 @@ if($view) {
 	$view->setParam('viewonlinefiletypes', $settings->_viewOnlineFileTypes);
 	$view->setParam('enableversionmodification', $settings->_enableVersionModification);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('showFullPreview', $settings->_showFullPreview);
 	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('cachedir', $settings->_cacheDir);
diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php
index d38ac4f4d..dfc4935e2 100644
--- a/out/out.ManageNotify.php
+++ b/out/out.ManageNotify.php
@@ -38,7 +38,7 @@ if ($user->isGuest()) {
 if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index e053511e4..7c1d1f4d2 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -64,7 +64,7 @@ if($view) {
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index 873a3aa41..f4514164e 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -239,8 +239,6 @@ if($view) {
 	$view->setParam('rootfolder', $rootfolder);
 	$view->setParam('repairobjects', $repairobjects);
 	$view->setParam('cachedir', $settings->_cacheDir);
-	$view->setParam('previewWidthList', $settings->_previewWidthList);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php
index 2d51e49e8..db3e4e26e 100644
--- a/out/out.ReceiptSummary.php
+++ b/out/out.ReceiptSummary.php
@@ -43,7 +43,7 @@ if($view) {
 	$view->setParam('showtree', showtree());
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php
index 70b4e413c..e2c54d878 100644
--- a/out/out.ReviewSummary.php
+++ b/out/out.ReviewSummary.php
@@ -44,7 +44,7 @@ if($view) {
 	$view->setParam('showtree', showtree());
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.RevisionSummary.php b/out/out.RevisionSummary.php
index 91140afd7..1ebffba34 100644
--- a/out/out.RevisionSummary.php
+++ b/out/out.RevisionSummary.php
@@ -44,7 +44,7 @@ if($view) {
 	$view->setParam('showtree', showtree());
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.Search.php b/out/out.Search.php
index 6c982d910..b9e892250 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -501,7 +501,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('workflowmode', $settings->_workflowMode);
 		$view->setParam('enablefullsearch', $settings->_enableFullSearch);
 		$view->setParam('previewWidthList', $settings->_previewWidthList);
-		$view->setParam('previewconverters', $settings->_converters['preview']);
+		$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 		$view->setParam('timeout', $settings->_cmdTimeout);
 		$view->setParam('xsendfile', $settings->_enableXsendfile);
 		$view->setParam('reception', $reception);
diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index 3ce4fd276..7d788635e 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -51,7 +51,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
 	$view($_GET);
diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php
index d1dc2ac32..062765122 100644
--- a/out/out.WorkflowSummary.php
+++ b/out/out.WorkflowSummary.php
@@ -44,7 +44,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
-	$view->setParam('previewconverters', $settings->_converters['preview']);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);

From 508e1b74d39afd1b6739a70295e122d05b8ca632 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Jul 2020 09:26:17 +0200
Subject: [PATCH 1288/2006] fixed name of view parameter previewConverters

---
 views/bootstrap/class.ApprovalSummary.php     |  2 +-
 .../bootstrap/class.DocumentVersionDetail.php |  2 +-
 views/bootstrap/class.ManageNotify.php        |  2 +-
 views/bootstrap/class.MyDocuments.php         | 34 +++++++++----------
 views/bootstrap/class.ObjectCheck.php         |  6 ++--
 views/bootstrap/class.ReceiptSummary.php      |  2 +-
 views/bootstrap/class.ReviewSummary.php       |  2 +-
 views/bootstrap/class.RevisionSummary.php     |  2 +-
 views/bootstrap/class.Search.php              |  2 +-
 views/bootstrap/class.TransmittalMgr.php      |  2 +-
 views/bootstrap/class.WorkflowSummary.php     |  2 +-
 11 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 436632d32..c297aa3ea 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -49,7 +49,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 77d809219..bba75e6a1 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -96,7 +96,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$enableversionmodification = $this->params['enableversionmodification'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index 5ffa237ae..a38901f71 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -145,7 +145,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		$this->user = $this->params['user'];
 		$this->cachedir = $this->params['cachedir'];
 		$this->previewwidth = $this->params['previewWidthList'];
-		$this->previewconverters = $this->params['previewconverters'];
+		$this->previewconverters = $this->params['previewConverters'];
 		$this->db = $this->dms->getDB();
 		$this->timeout = $this->params['timeout'];
 		$this->xsendfile = $this->params['xsendfile'];
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 1bd5a13b9..64e610b31 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -113,7 +113,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -145,7 +145,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -175,7 +175,7 @@ $(document).ready( function() {
 		$workflowmode = $this->params['workflowmode'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -225,7 +225,7 @@ $(document).ready( function() {
 		$cachedir = $this->params['cachedir'];
 		$showtree = $this->params['showtree'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -256,7 +256,7 @@ $(document).ready( function() {
 		$cachedir = $this->params['cachedir'];
 		$showtree = $this->params['showtree'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -287,7 +287,7 @@ $(document).ready( function() {
 		$cachedir = $this->params['cachedir'];
 		$showtree = $this->params['showtree'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -317,7 +317,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -419,7 +419,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -452,7 +452,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -483,7 +483,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -516,7 +516,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -547,7 +547,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -578,7 +578,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -609,7 +609,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -640,7 +640,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -671,7 +671,7 @@ $(document).ready( function() {
 		$orderdir = $this->params['orderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
@@ -703,7 +703,7 @@ $(document).ready( function() {
 		$cachedir = $this->params['cachedir'];
 		$workflowmode = $this->params['workflowmode'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index ce86b23c5..0ab02b195 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -382,7 +382,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$docsinrevision = $this->params['docsinrevision'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
@@ -402,7 +402,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$docsinreception = $this->params['docsinreception'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
@@ -422,7 +422,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$processwithoutusergroup = $this->params['processwithoutusergroup'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$repair = $this->params['repair'];
 
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 5d8fc68ab..4876c9342 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -49,7 +49,7 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 6c87569cc..fa003d596 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -49,7 +49,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
diff --git a/views/bootstrap/class.RevisionSummary.php b/views/bootstrap/class.RevisionSummary.php
index 30557151f..adfc54b55 100644
--- a/views/bootstrap/class.RevisionSummary.php
+++ b/views/bootstrap/class.RevisionSummary.php
@@ -49,7 +49,7 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 2adabd5ea..17f8dec91 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -148,7 +148,7 @@ $(document).ready( function() {
 		$searchin = $this->params['searchin'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 		$reception = $this->params['reception'];
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 467566d28..faaf12b90 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -271,7 +271,7 @@ $(document).ready( function() {
 		$cachedir = $this->params['cachedir'];
 		$timeout = $this->params['timeout'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php
index 64438cda9..7f86eae50 100644
--- a/views/bootstrap/class.WorkflowSummary.php
+++ b/views/bootstrap/class.WorkflowSummary.php
@@ -49,7 +49,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
-		$previewconverters = $this->params['previewconverters'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 

From 9f49460ee9c0095540198c045b69ac0830d615ae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Jul 2020 16:07:51 +0200
Subject: [PATCH 1289/2006] show container around add attachment button only if
 button is visible

---
 views/bootstrap/class.ViewDocument.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index b3df666a6..8c4264208 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1654,14 +1654,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 		else $this->infoMsg(getMLText("no_attached_files"));
 
-		$this->contentContainerStart();
-
 		if($accessobject->check_controller_access('AddFile')) {
+			$this->contentContainerStart();
 			if ($document->getAccessMode($user) >= M_READWRITE){
 				print $this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn btn-primary'), getMLText("add"), false, true)."\n";
 			}
+			$this->contentContainerEnd();
 		}
-		$this->contentContainerEnd();
 ?>
 		  </div>
 		  <div class="tab-pane <?php if($currenttab == 'links') echo 'active'; ?>" id="links">

From 2edf1251c72f516e4784a9d1043d1391360b0f64 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Jul 2020 15:09:25 +0200
Subject: [PATCH 1290/2006] fix select menu for owner

---
 views/bootstrap/class.Search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 17f8dec91..768a51fa9 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -221,7 +221,7 @@ $(document).ready( function() {
 <td><?php printMLText("owner");?>:</td>
 <td>
 <select class="chzn-select" name="ownerid" data-allow-clear="true" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
-<option value="-1"></option>
+<option value=""></option>
 <?php
 		foreach ($allUsers as $userObj) {
 			if ($userObj->isGuest() || ($userObj->isHidden() && $userObj->getID() != $user->getID() && !$user->isAdmin()))
@@ -511,6 +511,7 @@ $(document).ready( function() {
 <td><?php printMLText("owner");?>:</td>
 <td>
 <select class="chzn-select" name="ownerid" data-allow-clear="true" data-placeholder="<?php printMLText('select_users'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
+<option value=""></option>
 <?php
 			foreach ($allUsers as $userObj) {
 				if ($userObj->isGuest() || ($userObj->isHidden() && $userObj->getID() != $user->getID() && !$user->isAdmin()))

From ab8b42f960bfc20bede4a85a4f6df983c1af3786 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Jul 2020 15:33:24 +0200
Subject: [PATCH 1291/2006] add Content-Type to javascript file

---
 views/bootstrap/class.UserList.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 4cc9317f6..5e1a01afc 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		header('Content-Type: application/javascript; charset=UTF-8');
 ?>
 		$(document).ready(function(){
 			$("#myInput").on("keyup", function() {

From 680818a7606caf4c37bc53ab1589f7ce1633e889 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Jul 2020 18:43:27 +0200
Subject: [PATCH 1292/2006] changes for 6.0.11

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 21477f1d7..4326b33b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,10 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.11
 --------------------------------------------------------------------------------
+- merge changes up to 5.1.18
 - fix access restriction for roles (content of documents was visible even if the
   role and status didn't allow it)
+- fix missing Content-Type in UserList (Closes: #480)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.10

From aa3384f28b5ef6d8b784ce98977ac5467483b0c5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Aug 2020 08:48:43 +0200
Subject: [PATCH 1293/2006] update icons from font-awesome 3.2.x to 4.7.x

---
 views/bootstrap/class.Acl.php               | 14 +++++++-------
 views/bootstrap/class.AddToTransmittal.php  |  2 +-
 views/bootstrap/class.Bootstrap.php         |  6 +++---
 views/bootstrap/class.CheckInDocument.php   |  2 +-
 views/bootstrap/class.MyDocuments.php       |  4 ++--
 views/bootstrap/class.ObjectCheck.php       |  4 ++--
 views/bootstrap/class.RemoveTransmittal.php |  2 +-
 views/bootstrap/class.RoleMgr.php           |  8 ++++----
 views/bootstrap/class.SchedulerTaskMgr.php  | 14 +++++++-------
 views/bootstrap/class.Search.php            |  2 +-
 views/bootstrap/class.SetRevisors.php       |  2 +-
 views/bootstrap/class.Timeline.php          |  2 +-
 views/bootstrap/class.TransmittalMgr.php    | 14 +++++++-------
 views/bootstrap/class.ViewDocument.php      |  8 ++++----
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index 8ccd96601..70e830b27 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -36,20 +36,20 @@ class SeedDMS_View_Acl extends SeedDMS_Bootstrap_Style {
 $('#acostree').tree({
 	autoOpen: 0,
 	saveState: 'acostree<?php echo ($selrole ? $selrole->getID() : ''); ?>',
-	openedIcon: $('<i class="icon-minus-sign"></i>'),
-	closedIcon: $('<i class="icon-plus-sign"></i>'),
+	openedIcon: $('<i class="fa fa-minus-circle"></i>'),
+	closedIcon: $('<i class="fa fa-plus-circle"></i>'),
 	onCreateLi: function(node, $li) {
 		switch(node.permission) {
 			case -1:
-				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
+				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-minus-circle"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-exchange"></i></span>');
 				$li.attr('style', 'background-color:#FDD');
 				break;
 			case 1:
-				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-minus-sign"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-exchange"></i></span>');
+				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-remove-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-minus-circle"></i></span> <span style="position: absolute; right:50px;" class="jqtree-toggle-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-exchange"></i></span>');
 				$li.attr('style', 'background-color:#DFD');
 				break;
 			default:
-				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-add-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="icon-plus-sign"></i></span>');
+				$li.find('.jqtree-element span:last-child').after('<span style="position: absolute; right:10px;" class="jqtree-add-permission" data-acoid="'+node.acoid+'" data-aroid="'+node.aroid+'"><i class="fa fa-plus-circle"></i></span>');
 		}
  }
 });
@@ -152,9 +152,9 @@ $(document).ready( function() {
 					if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) {
 						echo "<div class=\"list-action\">";
 						if($accessobject->check_view_access('UsrMgr'))
-							echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
+							echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"fa fa-edit\"></i></a> ";
 						if($accessobject->check_view_access('RemoveUser'))
-							echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";
+							echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"fa fa-remove\"></i></a>";
 						echo "</div>";
 					}
 					echo "</td>";
diff --git a/views/bootstrap/class.AddToTransmittal.php b/views/bootstrap/class.AddToTransmittal.php
index fd11ad092..dd9c665a9 100644
--- a/views/bootstrap/class.AddToTransmittal.php
+++ b/views/bootstrap/class.AddToTransmittal.php
@@ -62,7 +62,7 @@ class SeedDMS_View_AddToTransmittal extends SeedDMS_Bootstrap_Style {
 </select>
 </p>
 
-<p><button type="submit" class="btn"><i class="icon-plus"></i> <?php printMLText("add");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-plus"></i> <?php printMLText("add");?></button></p>
 
 </form>
 <?php
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5c2f36a44..994f8c256 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -298,7 +298,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$content = '';
 //		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
 //		$content .= "    <li class=\"dropdown\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"icon-caret-down\"></i></a>\n";
+		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (".count($tasks['review'])."/".count($tasks['approval'])."/".count($tasks['receipt'])."/".count($tasks['revision']).") <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if($tasks['review']) {
 		$content .= "      <li class=\"dropdown-submenu\">\n";
@@ -2707,8 +2707,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				if($totalreceipts) {
 					$content .= "
 <div class=\"progress\">
-<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
-	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="icon-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
+<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
+	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
 </div>";
 				}
 			}
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 8589abc45..e98d1000e 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -193,7 +193,7 @@ $(document).ready(function() {
 			<td class="standardText">
         <span class="input-append date span12" id="expirationdate" data-date="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
           <input class="span3" size="16" name="expdate" type="text" value="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>">
-          <span class="add-on"><i class="icon-calendar"></i></span>
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
         </span>
 			</td>
 		</tr>
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 64e610b31..089c9da3f 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -64,11 +64,11 @@ $(document).ready( function() {
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";
 		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		else
 			print "<th>".getMLText("name")."</th>\n";
 		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		else
 			print "<th>".getMLText("status")."</th>\n";
 		print "<th>".getMLText("action")."</th>\n";
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 0ab02b195..8078024e4 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -44,11 +44,11 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			$orderby = ''; //$this->params['orderby'];
 			$orderdir = ''; //$this->params['orderdir'];
 
-			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		} else
 			print "<th>".getMLText("name")."</th>\n";
 		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="icon-arrow-up"></i>' :  '<i class="icon-arrow-down"></i>') : '')."</th>\n";
+			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		else
 			print "<th>".getMLText("status")."</th>\n";
 		print "<th>".getMLText("action")."</th>\n";
diff --git a/views/bootstrap/class.RemoveTransmittal.php b/views/bootstrap/class.RemoveTransmittal.php
index d766de17c..c448ab042 100644
--- a/views/bootstrap/class.RemoveTransmittal.php
+++ b/views/bootstrap/class.RemoveTransmittal.php
@@ -52,7 +52,7 @@ class SeedDMS_View_RemoveTransmittal extends SeedDMS_Bootstrap_Style {
 <?php printMLText("confirm_rm_transmittal", array ("name" => htmlspecialchars($rmtransmittal->getName())));?>
 </p>
 
-<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_transmittal");?></button></p>
+<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_transmittal");?></button></p>
 
 </form>
 <?php
diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 4efa415ea..1072f4929 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -92,8 +92,8 @@ $(document).ready( function() {
 					echo "<td>";
 					if($accessobject->check_view_access(array('UsrMgr', 'RemoveUser'))) {
 						echo "<div class=\"list-action\">";
-						echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="icon-edit"></i>', false);
-						echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>', false);
+						echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="fa fa-edit"></i>', false);
+						echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="fa fa-remove"></i>', false);
 						echo "</div>";
 					}
 					echo "</td>";
@@ -117,7 +117,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removerole'); ?>
 				<input type="hidden" name="roleid" value="<?php echo $selrole->getID()?>">
 				<input type="hidden" name="action" value="removerole">
-				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_role")?></button>
+				<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php echo getMLText("rm_role")?></button>
 			</form>
 <?php
 			}
@@ -175,7 +175,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText($currRole ? "save" : "add_role")?></button></td>
+			<td><button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText($currRole ? "save" : "add_role")?></button></td>
 		</tr>
 <?php
 		}
diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 8e7c51802..e2cb2cd38 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -53,7 +53,7 @@ $(document).ready( function() {
 		msg = $(ev.currentTarget).attr('msg');
 		formtoken = '<?= createFormKey('removetask') ?>';
 		bootbox.dialog(confirmmsg, [{
-			"label" : "<i class='icon-remove'></i> <?= getMLText("rm_task") ?>",
+			"label" : "<i class='fa fa-remove'></i> <?= getMLText("rm_task") ?>",
 			"class" : "btn-danger",
 			"callback": function() {
 				$.post('../op/op.SchedulerTaskMgr.php',
@@ -202,7 +202,7 @@ $(document).ready( function() {
 	<div class="control-group">
 		<label class="control-label" for="login"></label>
 		<div class="controls">
-			<button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
+			<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 		</div>
 	</div>
 	</form>
@@ -316,7 +316,7 @@ $(document).ready( function() {
 	<div class="control-group">
 		<label class="control-label" for="login"></label>
 		<div class="controls">
-			<button type="submit" class="btn btn-primary"><i class="icon-save"></i> <?php printMLText("save")?></button>
+			<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
 		</div>
 	</div>
 	</form>
@@ -371,9 +371,9 @@ $(document).ready( function() {
 			echo "</td>";
 			echo "<td nowrap>";
 			print "<div class=\"list-action\">";
-			print "<a class=\"removetask\" rel=\"".$task->getID()."\" msg=\"".getMLText('remove_task')."\" confirmmsg=\"".htmlspecialchars(getMLText("confirm_rm_task"), ENT_QUOTES)."\" title=\"".getMLText("remove_task")."\"><i class=\"icon-remove\"></i></a>";
+			print "<a class=\"removetask\" rel=\"".$task->getID()."\" msg=\"".getMLText('remove_task')."\" confirmmsg=\"".htmlspecialchars(getMLText("confirm_rm_task"), ENT_QUOTES)."\" title=\"".getMLText("remove_task")."\"><i class=\"fa fa-remove\"></i></a>";
 			if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()])) {
-				print "<a class=\"edittask\" data-action=\"edittask\" data-id=\"".$task->getID()."\" href=\"../out/out.SchedulerTaskMgr.php?action=edittask\" title=\"".getMLText("edit_task")."\"><i class=\"icon-edit\"></i></a>";
+				print "<a class=\"edittask\" data-action=\"edittask\" data-id=\"".$task->getID()."\" href=\"../out/out.SchedulerTaskMgr.php?action=edittask\" title=\"".getMLText("edit_task")."\"><i class=\"fa fa-edit\"></i></a>";
 			}
 			print "</div>";
 			echo "</td>";
@@ -432,9 +432,9 @@ $(document).ready( function() {
 					print "<div class=\"list-action\">";
 					$t = $scheduler->getTasksByExtension($extname, $taskname);
 					if($t) {
-						print "<a class=\"listtasks\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("list_tasks")."\"><i class=\"icon-list\"></i></a>";
+						print "<a class=\"listtasks\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("list_tasks")."\"><i class=\"fa fa-list\"></i></a>";
 					}
-					print "<a class=\"addtask\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("add_task")."\"><i class=\"icon-plus\"></i></a>";
+					print "<a class=\"addtask\" data-extension=\"".$extname."\" data-task=\"".$taskname."\" href=\"../out/out.SchedulerTaskMgr.php?extension=".$extname."&task=".$taskname."\" title=\"".getMLText("add_task")."\"><i class=\"fa fa-plus\"></i></a>";
 					print "</div>";
 					echo "</td>";
 					echo "</tr>";
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 0e1d65be5..b74eb0740 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -328,7 +328,7 @@ $(document).ready( function() {
 <td><?= getMLText('content') ?></td><td><label class="checkbox inline"><input id="includecontent" type="checkbox" name="includecontent" value="1"> <?php printMLText("include_content"); ?></label></td>
 </tr>
 <tr>
-<td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&action=export" ?>"><i class="icon-download"></i> Export</a></td>
+<td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&action=export" ?>"><i class="fa fa-download"></i> Export</a></td>
 </tr>
 </table>
       </div>
diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 010693bc2..10f2391fc 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -79,7 +79,7 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
 		<div class="controls">
 			<span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
 				<input class="span4" size="16" name="startdate" type="text" value="<?php if($startdate) echo $startdate; else echo date('Y-m-d'); ?>">
-				<span class="add-on"><i class="icon-calendar"></i></span>
+				<span class="add-on"><i class="fa fa-calendar"></i></span>
 			</span>
 		</div>
 	</div>
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index c2a530ff1..5dcbe1213 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -282,7 +282,7 @@ div.timeline-event-selected {
 		$this->formSubmit('<i class="fa fa-search"></i> '.getMLText('update'), 'update');
 ?>
 </form>
-<a href="out.TimelineFeed.php"><i class="icon-rss"></i> <?php printMLText('subsribe_timelinefeed'); ?></a>
+<a href="out.TimelineFeed.php"><i class="fa fa-rss"></i> <?php printMLText('subsribe_timelinefeed'); ?></a>
 <?php
 		$this->contentContainerEnd();
 		echo "<div class=\"ajax\" data-view=\"Timeline\" data-action=\"iteminfo\" ></div>";
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index faaf12b90..d2305fc0e 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -62,7 +62,7 @@ $(document).ready( function() {
 	protected function printUpdateItemButton($item, $msg, $return=false){ /* {{{ */
 		$itemid = $item->getID();
 		$content = '';
-    $content .= '<a class="update-transmittalitem-btn" transmittal="'.$item->getTransmittal()->getID().'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="icon-refresh"></i></a>';
+    $content .= '<a class="update-transmittalitem-btn" transmittal="'.$item->getTransmittal()->getID().'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-refresh"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -80,7 +80,7 @@ $(document).ready( function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('updatetransmittalitem')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-refresh'></i> ".getMLText("update_transmittalitem")."\",
+					\"label\" : \"<i class='fa fa-refresh'></i> ".getMLText("update_transmittalitem")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.ajax('../op/op.TransmittalMgr.php', {
@@ -140,7 +140,7 @@ $(document).ready( function() {
 	protected function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
 		$itemid = $item->getID();
 		$content = '';
-    $content .= '<a class="delete-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES).'"><i class="icon-remove"></i></a>';
+    $content .= '<a class="delete-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -157,7 +157,7 @@ $(document).ready( function() {
 				msg = $(ev.currentTarget).attr('msg');
 				formtoken = '".createFormKey('removetransmittalitem')."';
 				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='icon-remove'></i> ".getMLText("rm_transmittalitem")."\",
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_transmittalitem")."\",
 					\"class\" : \"btn-danger\",
 					\"callback\": function() {
 						$.ajax('../op/op.TransmittalMgr.php', {
@@ -230,7 +230,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><a class="standardText btn" href="../out/out.RemoveTransmittal.php?transmittalid=<?php print $transmittal->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_transmittal");?></a></td>
+			<td><a class="standardText btn" href="../out/out.RemoveTransmittal.php?transmittalid=<?php print $transmittal->getID();?>"><i class="fa fa-remove"></i> <?php printMLText("rm_transmittal");?></a></td>
 		</tr>
 <?php
 	}
@@ -248,7 +248,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText($transmittal ? "save" : "add_transmittal")?></button></td>
+			<td><button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText($transmittal ? "save" : "add_transmittal")?></button></td>
 		</tr>
 <?php
 		}
@@ -357,7 +357,7 @@ $(document).ready( function() {
 				print "<td>".count($items)." <em>(".SeedDMS_Core_File::format_filesize($transmittal->getSize()).")</em></td>";
 				print "<td>";
 				print "<div class=\"list-action\">";
-				print "<a class=\"selecttransmittal\" data-transmittalid=\"".$transmittal->getID()."\" href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"icon-edit\"></i></a>";
+				print "<a class=\"selecttransmittal\" data-transmittalid=\"".$transmittal->getID()."\" href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"fa fa-edit\"></i></a>";
 				print "</div>";
 				print "</td>";
 				print "</tr>\n";
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f5ad40d4d..2a0683cca 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1274,7 +1274,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						} else {
-							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 							if($user->isAdmin()) {
 								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
 									$accesserr = getMLText("access_denied");
@@ -1291,7 +1291,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 							if($user->isAdmin()) {
 								$grpusers = $required->getUsers();
 								if(!$grpusers)
@@ -1405,7 +1405,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						if (!is_object($required)) {
 							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
 						} else {
-							$reqName = "<i class=\"icon-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
+							$reqName = "<i class=\"fa fa-user\"></i> ".htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
 							if($user->isAdmin()) {
 								if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
 									$accesserr = getMLText("access_denied");
@@ -1422,7 +1422,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
 						}
 						else {
-							$reqName = "<i class=\"icon-group\"></i> ".htmlspecialchars($required->getName());
+							$reqName = "<i class=\"fa fa-group\"></i> ".htmlspecialchars($required->getName());
 							if($required->isMember($user)/* && ($user->getId() != $owner->getId() || $enableownerrevapp == 1)*/)
 								$is_recipient = true;
 						}

From 031408fdae10ff4686b7df52566ddcdd5a1b8a81 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 15:33:59 +0200
Subject: [PATCH 1294/2006] remove duplicate release 5.1.17

---
 SeedDMS_Core/package.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 823d7ab15..8bc578879 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,7 +28,6 @@
 - clear the save content list and latest content in SeedDMS_Core_Document after
   a version has been deleted.
 - new method SeedDMS_Core_Document::isLatestVersion()
-- add new attribute types 'document', 'folder', 'user', 'group'
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1852,22 +1851,6 @@ log entry first
 - add new method SeedDMS_Core_DMS::getDocumentsExpired()
    </notes>
   </release>
-  <release>
-   <date>2020-05-14</date>
-   <time>09:43:12</time>
-   <version>
-    <release>5.1.17</release>
-    <api>5.1.17</api>
-   </version>
-   <stability>
-    <release>stable</release>
-    <api>stable</api>
-   </stability>
-   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
-   <notes>
-- add new callback onSetStatus
-   </notes>
-  </release>
   <release>
    <date>2017-05-28</date>
    <time>06:34:50</time>

From d1ad6383d20ffe2f804c7457e89ac0cdb53aaf11 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 15:37:02 +0200
Subject: [PATCH 1295/2006] update notes for 5.1.19

---
 SeedDMS_Core/package.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 8bc578879..2db2e696a 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1788,7 +1788,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </notes>
   </release>
   <release>
-   <date>2020-06-05</date>
+   <date>2020-05-28</date>
    <time>09:43:12</time>
    <version>
     <release>5.1.18</release>
@@ -1818,6 +1818,11 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
+- add method SeedDMS_Core_Document::setParent() as an alias for setFolder()
+- clear the save content list and latest content in SeedDMS_Core_Document after
+  a version has been deleted.
+- new method SeedDMS_Core_Document::isLatestVersion()
+- add new attribute types 'document', 'folder', 'user', 'group'
    </notes>
   </release>
   <release>

From 9e5224a661b7935989287b561009cae74e34146c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 13:01:40 +0200
Subject: [PATCH 1296/2006] fix typo in var name

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 24adb30f2..3bf68f12d 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -5480,7 +5480,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return -2;
 		}
 		$status = array_pop($receiptStatus["status"]);
-		if ($tatus["status"]!=0) {
+		if ($status["status"]!=0) {
 			// User has already submitted a receipt or has already been deleted;
 			// return an error.
 			return -3;

From 10ecff61427888e033b613bedf0d51121dcb8754 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 13:18:05 +0200
Subject: [PATCH 1297/2006] better check fro repair parameter

---
 out/out.ObjectCheck.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index f4514164e..81e8183f8 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -102,7 +102,7 @@ $processwithoutusergroup = array();
 foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
 	foreach(array('user', 'group') as $ug) {
 		if(!isset($_GET['action']) || $_GET['action'] == 'list'.ucfirst($process).'Without'.ucfirst($ug)) {
-			if($_GET['repair'])
+			if(isset($_GET['repair']) && $_GET['repair'])
 				$dms->removeProcessWithoutUserGroup($process, $ug, isset($_GET['required']) ? $_GET['required'] : '');
 			$processwithoutusergroup[$process][$ug] = $dms->getProcessWithoutUserGroup($process, $ug);
 		}

From 012dbeaf27e54ead5d1d28f89d78e532a74face3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 15:31:29 +0200
Subject: [PATCH 1298/2006] fix access on workflow object

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 3bf68f12d..72ad2850a 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3902,7 +3902,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			if($this->_workflow) {
 				if (!$this->_workflowState)
 					$this->getWorkflowState();
-				$transitions = $this->_workflow->getNextTransitions($this->_workflowState);
+				$transitions = $this->_workflow['workflow']->getNextTransitions($this->_workflowState);
 				foreach($transitions as $transition) {
 					if($this->triggerWorkflowTransitionIsAllowed($u, $transition))
 						return M_READ;
@@ -6428,7 +6428,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		$workflowlogs = array();
 		$i = 0;
-		$workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->getDMS()->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $this->_workflow, $this->_document->getDMS()->getUser($resArr[$i]["userid"]), $this->_workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]);
+		$workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->getDMS()->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $this->_workflow, $this->_document->getDMS()->getUser($resArr[$i]["userid"]), $this->_workflow['workflow']->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]);
 		$workflowlog->setDMS($this);
 
 		return $workflowlog;

From 8865f61a5440a4dd81324b7d66f28124e5d66d9b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 15:35:54 +0200
Subject: [PATCH 1299/2006] show menu tasks in legacy mode (Closes #485)

---
 inc/inc.ClassAccessOperation.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 4e57a2a16..a01abd2f4 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -500,6 +500,7 @@ class SeedDMS_AccessOperation {
 				'SetRevisors',
 				'SetWorkflow',
 				'SubstituteUser',
+				'Tasks',
 				'TransmittalMgr',
 				'TriggerWorkflow',
 				'UpdateDocument',

From ac81ce43353583a161916e093867d2e06d4baaaf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Aug 2020 15:41:24 +0200
Subject: [PATCH 1300/2006] add changes for 6.0.12

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 620cf47a2..7ed2414d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
                      Changes in version 6.0.12
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.19
+- fix various errors concerning workflows
+- show menu tasks even if not admin (Closes: #485)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.11

From 480a13018085aac874c98ccc7e4035084adda77f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Sep 2020 14:22:11 +0200
Subject: [PATCH 1301/2006] fix import of role

---
 op/op.ImportUsers.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index b5f39128a..d59e3be82 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -99,26 +99,21 @@ function renderGroupData($colname, $objdata) { /* {{{ */
 } /* }}} */
 
 function getRoleData($colname, $coldata, $objdata) { /* {{{ */
-	switch($coldata) {
-	case 'admin':
-		$role = 1;
-		break;
-	case 'guest':
-		$role = 2;
-		break;
-	case 'user':
-		$role = 0;
-		break;
-	default:
-		$role = 0;
+	global $dms;
+	if($role = $dms->getRoleByName($coldata)) {
+		$objdata['role'] = $role;
+	} else {
+		$objdata['role'] = null;
 		$objdata['__logs__'][] = array('type'=>'error', 'msg'=> "No such role with name '".$coldata."'");
 	}
-	$objdata['role'] = $role;
 	return $objdata;
 } /* }}} */
 
 function renderRoleData($colname, $objdata) { /* {{{ */
-	return ($objdata[$colname] == 1 ? 'admin' : ($objdata[$colname] == 2 ? 'guest' : 'user'));
+	$html = '';
+	if($objdata[$colname])
+		$html .= $objdata[$colname]->getName();
+	return $html;
 } /* }}} */
 
 if (!$user->isAdmin()) {

From 3d40b1469147bb472eca2bf8cc7c2de1bccb0019 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 3 Sep 2020 16:04:57 +0200
Subject: [PATCH 1302/2006] read env var SEEDDMS_CONFIG_FILE

---
 utils/schedulercli.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index d609909d9..3dcf4a4d4 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -45,6 +45,8 @@ if(isset($options['v']) || isset($options['verѕion'])) {
 /* Set alternative config file */
 if(isset($options['config'])) {
 	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
 }
 
 $mode = 'list';

From 4c64b316db423803088a7e99d6f69eb2ed269140 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 09:43:18 +0200
Subject: [PATCH 1303/2006] create download file in system tmp, better error
 checking (Closes: #487)

---
 controllers/class.TransmittalDownload.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/controllers/class.TransmittalDownload.php b/controllers/class.TransmittalDownload.php
index 88534641a..7af1b226b 100644
--- a/controllers/class.TransmittalDownload.php
+++ b/controllers/class.TransmittalDownload.php
@@ -46,16 +46,18 @@ class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
 				}
 			}
 
-			$filename = tempnam('/tmp', '');
-			$downmgr->createArchive($filename);
-			header("Content-Transfer-Encoding: binary");
-			header("Content-Length: " . filesize($filename));
-			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
-			header("Content-Type: application/zip");
-			header("Cache-Control: must-revalidate");
+			$filename = tempnam(sys_get_temp_dir(), 'transmittal-download');
+			if($filename) {
+				$downmgr->createArchive($filename);
+				header("Content-Transfer-Encoding: binary");
+				header("Content-Length: " . filesize($filename));
+				header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
+				header("Content-Type: application/zip");
+				header("Cache-Control: must-revalidate");
 
-			readfile($filename);
-			unlink($filename);
+				readfile($filename);
+				unlink($filename);
+			}
 			exit;
 		}
 	}

From 131d2b464529dec8b9990738c56d39eb7ba1ecf8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 09:44:49 +0200
Subject: [PATCH 1304/2006] close bug #487 in 6.0.13

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 13fd41306..5e043f061 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.13
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.20
+- create download file for transmittal in system tmp (Closes: #478)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.12

From a736d60df59cd11c38d028a2f471f82d68d96f1f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 14:09:53 +0200
Subject: [PATCH 1305/2006] fix creation of zip files, create temp file in
 sys_get_temp_dir()

---
 inc/inc.ClassDownloadMgr.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 8e30b9ed1..2c4ac4f52 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -174,13 +174,16 @@ class SeedDMS_Download_Mgr {
 			return false;
 		}
 
-		$file = tempnam("/tmp", "export-list-");
+		$file = tempnam(sys_get_temp_dir(), "export-list-");
+		if(!$file)
+			return false;
 		$this->createToc($file);
 
 		$zip = new ZipArchive();
 		$prefixdir = date('Y-m-d', time());
 
-		if($zip->open($filename, ZipArchive::CREATE) !== TRUE) {
+		if(($errcode = $zip->open($filename, ZipArchive::OVERWRITE)) !== TRUE) {
+			echo $errcode;
 			return false;
 		}
 
@@ -204,5 +207,6 @@ class SeedDMS_Download_Mgr {
 		$zip->addFile($file, $prefixdir."/metadata.xls");
 		$zip->close();
 		unlink($file);
+		return true;
 	} /* }}} */
 }

From 8ec772c5047d29cc9d12d4264d8db4ca361bdfcc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 4 Sep 2020 14:10:24 +0200
Subject: [PATCH 1306/2006] check if download file can be created

---
 controllers/class.TransmittalDownload.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/controllers/class.TransmittalDownload.php b/controllers/class.TransmittalDownload.php
index 7af1b226b..13ab05f4d 100644
--- a/controllers/class.TransmittalDownload.php
+++ b/controllers/class.TransmittalDownload.php
@@ -46,16 +46,18 @@ class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
 				}
 			}
 
-			$filename = tempnam(sys_get_temp_dir(), 'transmittal-download');
+			$filename = tempnam(sys_get_temp_dir(), 'transmittal-download-');
 			if($filename) {
-				$downmgr->createArchive($filename);
-				header("Content-Transfer-Encoding: binary");
-				header("Content-Length: " . filesize($filename));
-				header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
-				header("Content-Type: application/zip");
-				header("Cache-Control: must-revalidate");
+				if($downmgr->createArchive($filename)) {
+					header("Content-Transfer-Encoding: binary");
+					header("Content-Length: " . filesize($filename));
+					header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".zip\"");
+					header("Content-Type: application/zip");
+					header("Cache-Control: must-revalidate");
 
-				readfile($filename);
+					readfile($filename);
+				} else {
+				}
 				unlink($filename);
 			}
 			exit;

From 1de3bf1d41e6cd7a7b80e2bd98fbff60e13e1fd4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Sep 2020 11:03:19 +0200
Subject: [PATCH 1307/2006] init $menuitems for menu earlier

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 3dcd4c5d0..c953e93f5 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -830,8 +830,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<div class=\"nav-collapse col2\">\n";
 		echo "   <ul class=\"nav\">\n";
 
-		if($accessobject->check_view_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) {
 		$menuitems = array();
+		if($accessobject->check_view_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) {
 		$menuitems['user_group_management'] = array('link'=>"#", 'label'=>'user_group_management');
 		if ($accessobject->check_view_access('UsrMgr'))
 		$menuitems['user_group_management']['children']['user_management'] = array('link'=>"../out/out.UsrMgr.php", 'label'=>'user_management');

From 62cf4f3fbad9eee3515bfcd1e1c7a563fe1a3dd8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Sep 2020 18:00:34 +0200
Subject: [PATCH 1308/2006] add missing access check for FolderNotify

---
 views/bootstrap/class.Bootstrap.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c953e93f5..98b6f9cc1 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -654,6 +654,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if ($accessMode == M_ALL) {
 				$menuitems['edit_folder_access'] = array('link'=>"../out/out.FolderAccess.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_access');
 			}
+			if ($accessobject->check_view_access('FolderNotify'))
 			$menuitems['edit_existing_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>'edit_existing_notify');
 		}
 		if ($accessobject->check_view_access('Indexer') && $this->params['enablefullsearch']) {
@@ -682,7 +683,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		if ($accessMode >= M_READWRITE) {
 			if (!$document->isLocked()) {
-				$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
+				if($accessobject->check_controller_access('UpdateDocument'))
+					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
 				if($accessobject->check_controller_access('LockDocument'))
 					$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>'lock_document');
 				if($document->isCheckedOut())
@@ -692,13 +694,15 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 						$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>'checkout_document');
 					}
 				}
-				$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>'edit_document_props');
+				if($accessobject->check_controller_access('EditDocument'))
+					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>'edit_document_props');
 				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 			}
 			else {
 				$lockingUser = $document->getLockingUser();
 				if (($lockingUser->getID() == $this->params['user']->getID()) || ($document->getAccessMode($this->params['user']) == M_ALL)) {
-					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
+					if($accessobject->check_controller_access('UpdateDocument'))
+						$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>'update_document');
 					if($accessobject->check_controller_access('UnlockDocument'))
 						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>'unlock_document');
 					if($document->isCheckedOut()) {
@@ -708,7 +712,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 							$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>'checkout_document');
 						}
 					}
-					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>'edit_document_props');
+					if($accessobject->check_controller_access('EditDocument'))
+						$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>'edit_document_props');
 					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 				}
 			}
@@ -2275,9 +2280,11 @@ $(function() {
 	 * @return string html content if $return is true, otherwise an empty string
 	 */
 	function printDeleteDocumentButton($document, $msg, $return=false){ /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		$docid = $document->getID();
 		$content = '';
-    $content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
+		if ($accessobject->check_view_access('RemoveDocument'))
+			$content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2412,12 +2419,17 @@ $(function() {
 	} /* }}} */
 
 	function printLockButton($document, $msglock, $msgunlock, $return=false) { /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		$docid = $document->getID();
 		if($document->isLocked()) {
+			if(!$accessobject->check_controller_access('UnlockDocument'))
+				return '';
 			$icon = 'unlock';
 			$msg = $msgunlock;
 			$title = 'unlock_document';
 		} else {
+			if(!$accessobject->check_controller_access('LockDocument'))
+				return '';
 			$icon = 'lock';
 			$msg = $msglock;
 			$title = 'lock_document';

From 505f0f97b72c43a8d2bb4f6fa508a50aef74da58 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2020 06:59:20 +0200
Subject: [PATCH 1309/2006] check for access on view FolderAccess

---
 views/bootstrap/class.Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 98b6f9cc1..9f378c8f2 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -652,6 +652,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$menuitems['rm_folder'] = array('link'=>"../out/out.RemoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'rm_folder');
 			}
 			if ($accessMode == M_ALL) {
+				if ($accessobject->check_view_access('FolderAccess'))
 				$menuitems['edit_folder_access'] = array('link'=>"../out/out.FolderAccess.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>'edit_folder_access');
 			}
 			if ($accessobject->check_view_access('FolderNotify'))

From 28d45c0270d8f326df91b87dae7550ff6603d57d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2020 11:25:44 +0200
Subject: [PATCH 1310/2006] use 'text-xxx' class from bootstrap instead of own
 classes

---
 views/bootstrap/class.ImportUsers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ImportUsers.php b/views/bootstrap/class.ImportUsers.php
index 5886caccf..cff4b508f 100644
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@@ -102,12 +102,12 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
 				if(isset($newuser['__logs__'])) {
 					foreach($newuser['__logs__'] as $item) {
 						$class = $item['type'] == 'success' ? 'success' : 'error';
-						echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 					}
 				}
 				foreach($log[$uhash] as $item) {
 					$class = $item['type'] == 'success' ? 'success' : 'error';
-					echo "<i class=\"fa fa-circle ".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
+					echo "<i class=\"fa fa-circle text-".$class."\"></i> ".htmlspecialchars($item['msg'])."<br />";
 				}
 				echo "</td>";
 				echo "</tr>\n";

From 467e76b5b0f0989c18d41b7b837fc2a52f6946ba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Sep 2020 11:26:21 +0200
Subject: [PATCH 1311/2006] make button primary

---
 views/bootstrap/class.ReceiptDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index 534de2dcb..de126c47f 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -154,7 +154,7 @@ $(document).ready(function() {
 		<input type="hidden" name="receiptStatus" value="1" />
 <?php } ?>
 		<div class="controls">
-			<input type='submit' class="btn" name='<?= $receipttype ?>Receipt' value='<?php printMLText("submit_receipt")?>'/>
+			<input type='submit' class="btn btn-primary" name='<?= $receipttype ?>Receipt' value='<?php printMLText("submit_receipt")?>'/>
 		<div>
 		<input type='hidden' name='receiptType' value='<?= $receipttype ?>'/>
 		<?php if($receipttype == 'grp'): ?>

From dfad2e581b9c5fb847dab2269058176a5cccca5b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 07:25:31 +0200
Subject: [PATCH 1312/2006] nicer layout for list of revisors and recepients

---
 views/bootstrap/class.ViewDocument.php | 104 +++++++++++++++++--------
 1 file changed, 72 insertions(+), 32 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f91ed2cea..9ed04e789 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -851,6 +851,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($reviewStatus as $r) {
+				$class = '';
+				switch($r['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_reviewer = false;
 				$accesserr = '';
@@ -890,7 +899,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						break;
 				}
 				if($user->isAdmin() || $r["status"] > -2) {
-					print "<tr".($r['status'] == 1 ? ' class="success"' : ($r['status'] == -1 ? ' class="error"' : '')).">\n";
+					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
 					print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
 					/* $updateUser is the user who has done the review */
@@ -904,17 +913,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 					}
 					print "</td>\n";
-					print "<td>".getReviewStatusText($r["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getReviewStatusText($r["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
-						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 
 					if($accessobject->mayReview($latestContent->getDocument())) {
 						if ($is_reviewer) {
 							if ($r["status"]==0) {
-								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("add_review"), false, true)."</li>";
+								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_review"), false, true)."</li>";
 							} elseif ($accessobject->mayUpdateReview($latestContent->getDocument(), $updateUser) && (($r["status"]==1)||($r["status"]==-1))){
-								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
 							}
 						}
 					}
@@ -943,6 +955,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($approvalStatus as $a) {
+				$class = '';
+				switch($a['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_approver = false;
 				$accesserr = '';
@@ -982,7 +1003,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						break;
 				}
 				if($user->isAdmin() || $a["status"] > -2) {
-					print "<tr".($a['status'] == 1 ? ' class="success"' : ($a['status'] == -1 ? ' class="error"' : ($a['status'] == -2 ? ' class=""' : ''))).">\n";
+					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
 					print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>";
 					/* $updateUser is the user who has done the approval */
@@ -996,17 +1017,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 					}
 					echo "</td>\n";
-					print "<td>".getApprovalStatusText($a["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getApprovalStatusText($a["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
-						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 
 					if($accessobject->mayApprove($latestContent->getDocument())) {
 						if ($is_approver) {
 							if ($a['status'] == 0) {
-								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("add_approval"), false, true)."</li>";
+								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_approval"), false, true)."</li>";
 							} elseif ($accessobject->mayUpdateApproval($latestContent->getDocument(), $updateUser) && (($a["status"]==1)||($a["status"]==-1))){
-								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
 							}
 						}
 					}
@@ -1270,12 +1294,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 			if($status["status"]!=S_RELEASED)
 				echo "<div class=\"alert alert-warning\">".getMLText('info_recipients_tab_not_released')."</div>";
-			$this->contentContainerStart();
-			print "<table class=\"table-condensed\">\n";
-
-			print "<tr><td colspan=5>\n";
-			$this->contentSubHeading(getMLText("recipients"));
-			print "</tr>";
+//			$this->contentContainerStart();
+			print "<table class=\"table table-condensed\">\n";
 
 			print "<tr>\n";
 			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
@@ -1329,6 +1349,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				 * unless admin is logged in.
 				 */
 				if($user->isAdmin() || $r["status"] > -2) {
+					$class = '';
+					switch($r['status']) {
+					case '-1':
+						$class = 'error';
+						break;
+					case '1':
+						$class = 'success';
+						break;
+					}
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
 					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
@@ -1336,16 +1365,19 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					$updateUser = $dms->getUser($r["userID"]);
 					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
 					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
-					print "<td>".getReceiptStatusText($r["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getReceiptStatusText($r["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
-						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 					if($accessobject->mayReceipt($document)) {
 						if ($is_recipient) {
 							if($r["status"]==0) {
-								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("add_receipt"), false, true)."</li>";
+								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_receipt"), false, true)."</li>";
 							} elseif ($accessobject->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1 && $enablereceiptreject)||($r["status"]==-1))) {
-								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
 							}
 						}
 					}
@@ -1357,7 +1389,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		</table>
 <?php
-			$this->contentContainerEnd();
+//			$this->contentContainerEnd();
 			if($accessobject->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) {
 				/* Do not count entries '-2' as they are removed userѕ */
 				$totalreceipts = $stat['-1'] + $stat['0'] + $stat['1'];
@@ -1403,12 +1435,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				<div class="alert alert-info"><?= getMLText('no_revision_planed') ?></div>
 <?php
 				} */
-			$this->contentContainerStart();
-			print "<table class=\"table-condensed\">\n";
-
-			print "<tr><td colspan=5>\n";
-			$this->contentSubHeading(getMLText("revisors"));
-			print "</tr>";
+//			$this->contentContainerStart();
+			print "<table class=\"table table-condensed\">\n";
 
 			print "<tr>\n";
 			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
@@ -1419,6 +1447,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($revisionStatus as $r) {
+				$class = '';
+				switch($r['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_recipient = false;
 				$accesserr = '';
@@ -1462,15 +1499,18 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					}
 					print "</ul></td>";
 					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
-					print "<td>".getRevisionStatusText($r["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getRevisionStatusText($r["status"])."</td>\n";
 					print "<td><ul class=\"unstyled\">";
 					if($accesserr)
-						echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 					if($accessobject->mayRevise($document)) {
 						if ($is_recipient && $r["status"]==0) {
-							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."</li>";
+							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_revision"), false, true)."</li>";
 						} elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("edit"), false, true)."</li>";
+							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
 						}
 					}
 
@@ -1481,7 +1521,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 ?>
 		</table>
 <?php
-		$this->contentContainerEnd();
+//		$this->contentContainerEnd();
 		if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
 ?>
 			<div class="row-fluid">

From 76f6500fd40cf7c715f828b21e5a5fb5472e88ee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Sep 2020 08:55:30 +0200
Subject: [PATCH 1313/2006] sync checkin code with update document code

---
 out/out.CheckInDocument.php               |   1 +
 views/bootstrap/class.CheckInDocument.php | 703 +++++++++++-----------
 2 files changed, 352 insertions(+), 352 deletions(-)

diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index 1544eccd8..07d9cc31b 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -68,6 +68,7 @@ if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('document', $document);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view->setParam('nodocumentformfields', $settings->_noDocumentFormFields);
 	$view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload);
 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp);
 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp);
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index e98d1000e..5fa945742 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -80,6 +80,7 @@ $(document).ready(function() {
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
 		$strictformcheck = $this->params['strictformcheck'];
+		$nodocumentformfields = $this->params['nodocumentformfields'];
 		$enablelargefileupload = $this->params['enablelargefileupload'];
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
@@ -157,118 +158,137 @@ $(document).ready(function() {
 		$this->contentContainerStart();
 ?>
 
-<form action="../op/op.CheckInDocument.php" method="post" id="form1" name="form1">
+<form class="form-horizontal" action="../op/op.CheckInDocument.php" method="post" id="form1" name="form1">
+	<?php echo createHiddenFieldWithKey('checkindocument'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
-	<table class="table-condensed">
-	
-		<tr>
-			<td><?php printMLText("comment");?>:</td>
-			<td class="standardText">
-				<textarea name="comment" rows="4" cols="80"<?php echo $strictformcheck ? ' required' : ''; ?>></textarea>
-			</td>
-		</tr>
-<?php
-			if($presetexpiration) {
-				if(!($expts = strtotime($presetexpiration)))
-					$expts = false;
-			} else {
+<?php	
+		if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) {
+		$this->formField(
+			getMLText("comment"),
+			array(
+				'element'=>'textarea',
+				'name'=>'comment',
+				'rows'=>4,
+				'cols'=>80
+			)
+		);
+		}
+		if(!$nodocumentformfields || !in_array('expires', $nodocumentformfields)) {
+		if($presetexpiration) {
+			if(!($expts = strtotime($presetexpiration)))
 				$expts = false;
-			}
-?>
-		<tr>
-			<td><?php printMLText("preset_expires");?>:</td>
-			<td>
-				<select class="span6" name="presetexpdate" id="presetexpdate">
-					<option value="never"><?php printMLText('does_not_expire');?></option>
-					<option value="date"<?php echo ($expts != '' ? " selected" : ""); ?>><?php printMLText('expire_by_date');?></option>
-					<option value="1w"><?php printMLText('expire_in_1w');?></option>
-					<option value="1m"><?php printMLText('expire_in_1m');?></option>
-					<option value="1y"><?php printMLText('expire_in_1y');?></option>
-					<option value="2y"><?php printMLText('expire_in_2y');?></option>
-				</select>
-			</td>
-		</tr>
-		<tr id="control_expdate" <?php echo ($expts == false ? 'style="display: none;"' : ''); ?>>
-			<td><?php printMLText("expires");?>:</td>
-			<td class="standardText">
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="expdate" type="text" value="<?php echo ($expts ? date('Y-m-d', $expts) : ''); ?>">
-          <span class="add-on"><i class="fa fa-calendar"></i></span>
-        </span>
-			</td>
-		</tr>
-<?php
-	$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
-	if($attrdefs) {
-		foreach($attrdefs as $attrdef) {
-			$arr = $this->callHook('editDocumentContentAttribute', $document, $attrdef);
-			if(is_array($arr)) {
-				if($arr) {
-					echo "<tr>";
-					echo "<td>".$arr[0].":</td>";
-					echo "<td>".$arr[1]."</td>";
-					echo "</tr>";
+		} else {
+			$expts = false;
+		}
+		$options = array();
+		$options[] = array('never', getMLText('does_not_expire'));
+		$options[] = array('date', getMLText('expire_by_date'), $expts);
+		$options[] = array('1w', getMLText('expire_in_1w'));
+		$options[] = array('1m', getMLText('expire_in_1m'));
+		$options[] = array('1y', getMLText('expire_in_1y'));
+		$options[] = array('2y', getMLText('expire_in_2y'));
+		$this->formField(
+			getMLText("preset_expires"),
+			array(
+				'element'=>'select',
+				'id'=>'presetexpdate',
+				'name'=>'presetexpdate',
+				'options'=>$options
+			)
+		);
+		$this->formField(
+			getMLText("expires"),
+			$this->getDateChooser(($expts ? date('Y-m-d', $expts) : ''), "expdate", $this->params['session']->getLanguage())
+		);
+		}
+		$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
+		if($attrdefs) {
+			foreach($attrdefs as $attrdef) {
+				$arr = $this->callHook('editDocumentContentAttribute', $document, $attrdef);
+				if(is_array($arr)) {
+					if($arr)
+						$this->formField($arr[0], $arr[1]);
+				} elseif(is_string($arr)) {
+					echo $arr;
+				} else {
+					$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef)));
 				}
-			} else {
-?>
-    <tr>
-	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-	    <td><?php $this->printAttributeEditField($attrdef, '', 'attributes') ?>
-<?php
-			if($latestContent->getAttributeValue($attrdef)) {
-				switch($attrdef->getType()) {
-				case SeedDMS_Core_AttributeDefinition::type_string:
-				case SeedDMS_Core_AttributeDefinition::type_date:
-				case SeedDMS_Core_AttributeDefinition::type_int:
-				case SeedDMS_Core_AttributeDefinition::type_float:
-					$this->printInputPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef), $attrdef->getValueSetSeparator());
-					break;
-				case SeedDMS_Core_AttributeDefinition::type_boolean:
-					$this->printCheckboxPresetButtonHtml('attributes_'.$attrdef->getID(), $latestContent->getAttributeValue($attrdef));
-					break;
-				}
-//				print_r($latestContent->getAttributeValue($attrdef));
-			}
-?></td>
-    </tr>
-<?php
 			}
 		}
-	}
-	if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
-		// Retrieve a list of all users and groups that have review / approve
-		// privileges.
-		$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
-		if($workflowmode != 'traditional_only_approval') {
-?>
-		<tr>
-			<td colspan="2">
-				<?php $this->contentSubHeading(getMLText("assign_reviewers")); ?>
-      </td>
-    </tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-      </td>
-			<td>
-        <select id="IndReviewer" class="chzn-select span9" name="indReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
-<?php
+		$arrs = $this->callHook('addDocumentContentAttributes', $folder);
+		if(is_array($arrs)) {
+			foreach($arrs as $arr) {
+				$this->formField($arr[0], $arr[1]);
+			}
+		} elseif(is_string($arrs)) {
+			echo $arrs;
+		}
+
+		if($workflowmode == 'advanced') {
+			$mandatoryworkflows = $user->getMandatoryWorkflows();
+			if($mandatoryworkflows) {
+				if(count($mandatoryworkflows) == 1) {
+					$this->formField(
+						getMLText("workflow"),
+						htmlspecialchars($mandatoryworkflows[0]->getName()).'<input type="hidden" name="workflow" value="'.$mandatoryworkflows[0]->getID().'">'
+					);
+				} else {
+					$options = array();
+					$curworkflow = $latestContent->getWorkflow();
+					foreach ($mandatoryworkflows as $workflow) {
+						$options[] = array($workflow->getID(), htmlspecialchars($workflow->getName()), $curworkflow && $curworkflow->getID() == $workflow->getID());
+					}
+					$this->formField(
+						getMLText("workflow"),
+						array(
+							'element'=>'select',
+							'id'=>'workflow',
+							'name'=>'workflow',
+							'class'=>'chzn-select',
+							'attributes'=>array(array('data-placeholder', getMLText('select_workflow'))),
+							'options'=>$options
+						)
+					);
+				}
+			} else {
+				$options = array();
+				$options[] = array('', '');
+				$workflows=$dms->getAllWorkflows();
+				foreach ($workflows as $workflow) {
+					$options[] = array($workflow->getID(), htmlspecialchars($workflow->getName()));
+				}
+				$this->formField(
+					getMLText("workflow"),
+					array(
+						'element'=>'select',
+						'id'=>'workflow',
+						'name'=>'workflow',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_workflow'))),
+						'options'=>$options
+					)
+				);
+			}
+			$this->warningMsg(getMLText("add_doc_workflow_warning"));
+		} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+			$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
+			if($workflowmode == 'traditional') {
+				$this->contentSubHeading(getMLText("assign_reviewers"));
 				$res=$user->getMandatoryReviewers();
+				$options = array();
 				foreach ($docAccess["users"] as $usr) {
 					if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
 					$mandatory=false;
 					foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
 
-					if ($mandatory) print "<option disabled=\"disabled\" value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
-					else print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
+					$option = array($usr->getID(), htmlspecialchars($usr->getLogin()." - ".$usr->getFullName()), null);
+					if ($mandatory) $option[] = array(array('disabled', 'disabled'));
+					$options[] = $option;
 				}
-?>
-				</select>
-<?php
 				$tmp = array();
 				foreach($reviewStatus as $r) {
 					if($r['type'] == 0) {
-					 	if($res) {
+						if($res) {
 							$mandatory=false;
 							foreach ($res as $rr)
 								if ($rr['reviewerUserID']==$r['required']) {
@@ -281,8 +301,9 @@ $(document).ready(function() {
 						}
 					}
 				}
+				$fieldwrap = array();
 				if($tmp) {
-					$this->printSelectPresetButtonHtml("IndReviewer", $tmp);
+					$fieldwrap = array('', $this->getSelectPresetButtonHtml("IndReviewers", $tmp));
 				}
 				/* List all mandatory reviewers */
 				if($res) {
@@ -294,11 +315,27 @@ $(document).ready(function() {
 						}
 					}
 					if($tmp) {
-						echo '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> ';
-						echo implode(', ', $tmp);
-						echo "</div>\n";
+						if(isset($fieldwrap[1]))
+							$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> '.implode(', ', $tmp)."</div>\n";
+						else
+							$fieldwrap[1] = '<div class="mandatories"><span>'.getMLText('mandatory_reviewers').':</span> '.implode(', ', $tmp)."</div>\n";
 					}
 				}
+
+				$this->formField(
+					getMLText("individuals"),
+					array(
+						'element'=>'select',
+						'name'=>'indReviewers[]',
+						'id'=>'IndReviewers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_ind_reviewers'))),
+						'multiple'=>true,
+						'options'=>$options
+					),
+					array('field_wrap'=>$fieldwrap)
+				);
+
 				/* Check for mandatory reviewer without access */
 				foreach($res as $r) {
 					if($r['reviewerUserID']) {
@@ -309,45 +346,38 @@ $(document).ready(function() {
 						}
 						if(!$hasAccess) {
 							$noAccessUser = $dms->getUser($r['reviewerUserID']);
-							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewer_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+							$this->warningMsg(getMLText("mandatory_reviewer_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")"))));
 						}
 					}
 				}
-?>
-      </td>
-    </tr>
-      <tr>
-        <td>
-			<div class="cbSelectTitle"><?php printMLText("individuals_in_groups");?>:</div>
-        </td>
-        <td>
-        <select class="chzn-select span9" name="grpIndReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_reviewers'); ?>">
-<?php
-			foreach ($docAccess["groups"] as $grp) {
-				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
-			}
-?>
-			</select>
-			</td>
-			</tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-      </td>
-      <td>
-        <select id="GrpReviewer" class="chzn-select span9" name="grpReviewers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_reviewers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
+
+				$options = array();
+				foreach ($docAccess["groups"] as $grp) {
+					$options[] = array($grp->getID(), htmlspecialchars($grp->getName()));
+				}
+				$this->formField(
+					getMLText("individuals_in_groups"),
+					array(
+						'element'=>'select',
+						'name'=>'grpIndReviewers[]',
+						'id'=>'GrpIndReviewers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_grp_ind_reviewers'))),
+						'multiple'=>true,
+						'options'=>$options
+					)
+				);
+
+				$options = array();
 				foreach ($docAccess["groups"] as $grp) {
 				
 					$mandatory=false;
 					foreach ($res as $r) if ($r['reviewerGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory || !$grp->getUsers()) print "<option value=\"".$grp->getID()."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
-					else print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+					$option = array($grp->getID(), htmlspecialchars($grp->getName()), null);
+					if ($mandatory || !$grp->getUsers()) $option[] = array(array('disabled', 'disabled'));
+					$options[] = $option;
 				}
-?>
-			</select>
-<?php
 				$tmp = array();
 				foreach($reviewStatus as $r) {
 					if($r['type'] == 1) {
@@ -364,8 +394,9 @@ $(document).ready(function() {
 						}
 					}
 				}
+				$fieldwrap = array('', '');
 				if($tmp) {
-					$this->printSelectPresetButtonHtml("GrpReviewer", $tmp);
+					$fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpReviewers", $tmp));
 				}
 				/* List all mandatory groups of reviewers */
 				if($res) {
@@ -377,11 +408,22 @@ $(document).ready(function() {
 						}
 					}
 					if($tmp) {
-						echo '<div class="mandatories"><span>'.getMLText('mandatory_reviewergroups').':</span> ';
-						echo implode(', ', $tmp);
-						echo "</div>\n";
+						$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_reviewergroups').':</span> '.implode(', ', $tmp)."</div>\n";
 					}
 				}
+				$this->formField(
+					getMLText("groups"),
+					array(
+						'element'=>'select',
+						'name'=>'grpReviewers[]',
+						'id'=>'GrpReviewers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_grp_reviewers'))),
+						'multiple'=>true,
+						'options'=>$options
+					),
+					array('field_wrap'=>$fieldwrap)
+				);
 
 				/* Check for mandatory reviewer group without access */
 				foreach($res as $r) {
@@ -393,73 +435,72 @@ $(document).ready(function() {
 						}
 						if(!$hasAccess) {
 							$noAccessGroup = $dms->getGroup($r['reviewerGroupID']);
-							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_reviewergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+							$this->warningMsg(getMLText("mandatory_reviewergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName()))));
 						}
 					}
 				}
-?>
-      </td>
-		</tr>
-<?php } ?>
-    <tr>
-			<td colspan=2>
-				<?php $this->contentSubHeading(getMLText("assign_approvers")); ?>	
-      </td>
-    </tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-      </td>
-      <td>
-        <select id="IndApprover" class="chzn-select span9" name="indApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
-<?php
-				$res=$user->getMandatoryApprovers();
-				foreach ($docAccess["users"] as $usr) {
-					if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
+			}
 
-					$mandatory=false;
-					foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
-					
-					if ($mandatory) print "<option value=\"". $usr->getID() ."\" disabled='disabled'>". htmlspecialchars($usr->getFullName())."</option>";
-					else print "<option value=\"". $usr->getID() ."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
-				}
-?>
-        </select>
-<?php
-				$tmp = array();
-				foreach($approvalStatus as $r) {
-					if($r['type'] == 0) {
-						if($res) {
-							$mandatory=false;
-							foreach ($res as $rr)
-								if ($rr['approverUserID']==$r['required']) {
-									$mandatory=true;
-								}
-							if(!$mandatory)
-								$tmp[] = $r['required'];
-						} else {
+			$this->contentSubHeading(getMLText("assign_approvers"));
+			$options = array();
+			$res=$user->getMandatoryApprovers();
+			foreach ($docAccess["users"] as $usr) {
+				if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
+
+				$mandatory=false;
+				foreach ($res as $r) if ($r['approverUserID']==$usr->getID()) $mandatory=true;
+				
+				$option = array($usr->getID(), htmlspecialchars($usr->getLogin()." - ".$usr->getFullName()), null);
+				if ($mandatory) $option[] = array(array('disabled', 'disabled'));
+				$options[] = $option;
+			}
+			$tmp = array();
+			foreach($approvalStatus as $r) {
+				if($r['type'] == 0) {
+					if($res) {
+						$mandatory=false;
+						foreach ($res as $rr)
+							if ($rr['approverUserID']==$r['required']) {
+								$mandatory=true;
+							}
+						if(!$mandatory)
 							$tmp[] = $r['required'];
-						}
+					} else {
+						$tmp[] = $r['required'];
+					}
+				}
+			}
+			$fieldwrap = array();
+			if($tmp) {
+				$fieldwrap = array('', $this->getSelectPresetButtonHtml("IndApprovers", $tmp));
+			}
+			/* List all mandatory approvers */
+			if($res) {
+				$tmp = array();
+				foreach ($res as $r) {
+					if($r['approverUserID'] > 0) {
+						$u = $dms->getUser($r['approverUserID']);
+						$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
 					}
 				}
 				if($tmp) {
-					$this->printSelectPresetButtonHtml("IndApprover", $tmp);
-				}
-				/* List all mandatory approvers */
-				if($res) {
-					$tmp = array();
-					foreach ($res as $r) {
-						if($r['approverUserID'] > 0) {
-							$u = $dms->getUser($r['approverUserID']);
-							$tmp[] =  htmlspecialchars($u->getFullName().' ('.$u->getLogin().')');
-						}
-					}
-					if($tmp) {
-						echo '<div class="mandatories"><span>'.getMLText('mandatory_approvers').':</span> ';
-						echo implode(', ', $tmp);
-						echo "</div>\n";
-					}
+					$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_approvers').':</span> '.implode(', ', $tmp)."</div>\n";
 				}
+			}
+
+			$this->formField(
+				getMLText("individuals"),
+				array(
+					'element'=>'select',
+					'name'=>'indApprovers[]',
+					'id'=>'IndApprovers',
+					'class'=>'chzn-select',
+					'attributes'=>array(array('data-placeholder', getMLText('select_ind_approvers'))),
+					'multiple'=>true,
+					'options'=>$options
+				),
+				array('field_wrap'=>$fieldwrap)
+			);
 
 				/* Check for mandatory approvers without access */
 				foreach($res as $r) {
@@ -471,46 +512,39 @@ $(document).ready(function() {
 						}
 						if(!$hasAccess) {
 							$noAccessUser = $dms->getUser($r['approverUserID']);
-							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approver_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")")))."</div>";
+							$this->warningMsg(getMLText("mandatory_approver_no_access", array('user'=>htmlspecialchars($noAccessUser->getFullName()." (".$noAccessUser->getLogin().")"))));
 						}
 					}
 				}
-?>
-      </td>
-		</tr>
-		  <tr>	
-        <td>
-			<div class="cbSelectTitle"><?php printMLText("individuals_in_groups");?>:</div>
-        </td>
-        <td>
-      <select class="chzn-select span9" name="grpIndApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_approvers'); ?>">
-<?php
-			foreach ($docAccess["groups"] as $grp) {
-				print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
-			}
-?>
-			</select>
-				</td>
-			</tr>	
-		<tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-      </td>
-      <td>
-        <select id="GrpApprover" class="chzn-select span9" name="grpApprovers[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_approvers'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
+
+				$options = array();
+				foreach ($docAccess["groups"] as $grp) {
+					$options[] = array($grp->getID(), htmlspecialchars($grp->getName()));
+				}
+				$this->formField(
+					getMLText("individuals_in_groups"),
+					array(
+						'element'=>'select',
+						'name'=>'grpIndApprovers[]',
+						'id'=>'GrpIndApprovers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_grp_ind_approvers'))),
+						'multiple'=>true,
+						'options'=>$options
+					)
+				);
+
+				$options = array();
 				foreach ($docAccess["groups"] as $grp) {
 				
 					$mandatory=false;
 					foreach ($res as $r) if ($r['approverGroupID']==$grp->getID()) $mandatory=true;	
 
-					if ($mandatory || !$grp->getUsers()) print "<option value=\"". $grp->getID() ."\" disabled=\"disabled\">".htmlspecialchars($grp->getName())."</option>";
-					else print "<option value=\"". $grp->getID() ."\">".htmlspecialchars($grp->getName())."</option>";
+					$option = array($grp->getID(), htmlspecialchars($grp->getName()), null);
+					if ($mandatory || !$grp->getUsers()) $option[] = array(array('disabled', 'disabled'));
 
+					$options[] = $option;
 				}
-?>
-        </select>
-<?php
 				$tmp = array();
 				foreach($approvalStatus as $r) {
 					if($r['type'] == 1) {
@@ -527,8 +561,9 @@ $(document).ready(function() {
 						}
 					}
 				}
+				$fieldwrap = array('', '');
 				if($tmp) {
-					$this->printSelectPresetButtonHtml("GrpApprover", $tmp);
+					$fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpApprovers", $tmp));
 				}
 				/* List all mandatory groups of approvers */
 				if($res) {
@@ -540,12 +575,24 @@ $(document).ready(function() {
 						}
 					}
 					if($tmp) {
-						echo '<div class="mandatories"><span>'.getMLText('mandatory_approvergroups').':</span> ';
-						echo implode(', ', $tmp);
-						echo "</div>\n";
+						$fieldwrap[1] .= '<div class="mandatories"><span>'.getMLText('mandatory_approvergroups').':</span> '.implode(', ', $tmp)."</div>\n";
 					}
 				}
 
+				$this->formField(
+					getMLText("groups"),
+					array(
+						'element'=>'select',
+						'name'=>'grpApprovers[]',
+						'id'=>'GrpApprovers',
+						'class'=>'chzn-select',
+						'attributes'=>array(array('data-placeholder', getMLText('select_grp_approvers'))),
+						'multiple'=>true,
+						'options'=>$options
+					),
+					array('field_wrap'=>$fieldwrap)
+				);
+
 				/* Check for mandatory approver groups without access */
 				foreach($res as $r) {
 					if ($r['approverGroupID']) {
@@ -556,138 +603,90 @@ $(document).ready(function() {
 						}
 						if(!$hasAccess) {
 							$noAccessGroup = $dms->getGroup($r['approverGroupID']);
-							echo "<div class=\"alert alert-warning\">".getMLText("mandatory_approvergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName())))."</div>";
+							$this->warningMsg(getMLText("mandatory_approvergroup_no_access", array('group'=>htmlspecialchars($noAccessGroup->getName()))));
 						}
 					}
 				}
-?>
-			</td>
-			</tr>
-		<tr>
-			<td colspan="2"><div class="alert"><?php printMLText("add_doc_reviewer_approver_warning")?></div></td>
-		</tr>
-<?php
-	} else {
-?>
-		<tr>	
-      <td>
-			<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div>
-      </td>
-      <td>
-<?php
-				$mandatoryworkflow = $user->getMandatoryWorkflow();
-				if($mandatoryworkflow) {
-?>
-				<?php echo $mandatoryworkflow->getName(); ?>
-				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflow->getID(); ?>">
-<?php
-				} else {
-?>
-        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
-<?php
-					$workflows=$dms->getAllWorkflows();
-					print "<option value=\"\">"."</option>";
-					foreach ($workflows as $workflow) {
-						print "<option value=\"".$workflow->getID()."\"";
-						if($mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID())
-							echo " selected=\"selected\"";
-						print ">". htmlspecialchars($workflow->getName())."</option>";
-					}
-?>
-        </select>
-<?php
-				}
-?>
-      </td>
-    </tr>
-		<tr>	
-      <td colspan="2">
-			<?php $this->warningMsg(getMLText("add_doc_workflow_warning")); ?>
-      </td>
-		</tr>	
-<?php
-	}
-	if($enablereceiptworkflow) {
-		$docAccess = $folder->getReadAccessList();
-?>
-		<tr>
-			<td colspan="2">
-				<?php $this->contentSubHeading(getMLText("assign_recipients")); ?>
-      </td>
-    </tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
-      </td>
-			<td>
-        <select id="IndRecipient" class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
-<?php
-				foreach ($docAccess["users"] as $usr) {
-					if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue; 
-					print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>";
-				}
-?>
-				</select>
-<?php
-				$tmp = array();
-				foreach($receiptStatus as $r) {
-					if($r['type'] == 0) {
-						$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->printSelectPresetButtonHtml("IndRecipient", $tmp);
-				}
-?>
-      </td>
-    </tr>
-      <tr>
-        <td>
-			<div class="cbSelectTitle"><?php printMLText("individuals_in_groups");?>:</div>
-        </td>
-        <td>
-        <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>">
-<?php
-			foreach ($docAccess["groups"] as $grp) {
-				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			$this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
+		}
+		if($enablereceiptworkflow) {
+			$options = array();
+			foreach ($docAccess["users"] as $usr) {
+				if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue; 
+				$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin()." - ".$usr->getFullName()));
 			}
-?>
-			</select>
-			</td>
-			</tr>
-    <tr>
-      <td>
-				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
-      </td>
-      <td>
-        <select id="GrpRecipient" class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
-				foreach ($docAccess["groups"] as $grp) {
-					print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>";
+			$tmp = array();
+			foreach($receiptStatus as $r) {
+				if($r['type'] == 0) {
+					$tmp[] = $r['required'];
 				}
-?>
-			</select>
-<?php
-				$tmp = array();
-				foreach($receiptStatus as $r) {
-					if($r['type'] == 1) {
-						$tmp[] = $r['required'];
-					}
-				}
-				if($tmp) {
-					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp);
+			}
+			$fieldwrap = array();
+			if($tmp) {
+				$fieldwrap = array('', $this->getSelectPresetButtonHtml("IndRecipient", $tmp));
+			}
+			$this->formField(
+				getMLText("assign_recipients"),
+				array(
+					'element'=>'select',
+					'name'=>'indRecipients[]',
+					'id'=>'IndRecipient',
+					'class'=>'chzn-select',
+					'attributes'=>array(array('data-placeholder', getMLText('select_ind_recipients')), array('data-no_results_text', getMLText('unknown_owner'))),
+					'multiple'=>true,
+					'options'=>$options
+				),
+				array('field_wrap'=>$fieldwrap)
+			);
+
+			$options = array();
+			foreach ($docAccess["groups"] as $grp) {
+				$options[] = array($grp->getID(), htmlspecialchars($grp->getName()));
+			}
+			$this->formField(
+				getMLText("individuals_in_groups"),
+				array(
+					'element'=>'select',
+					'name'=>'grpIndRecipients[]',
+					'id'=>'GrpIndRecipient',
+					'class'=>'chzn-select',
+					'attributes'=>array(array('data-placeholder', getMLText('select_grp_ind_recipients'))),
+					'multiple'=>true,
+					'options'=>$options
+				)
+			);
+
+			$options = array();
+			foreach ($docAccess["groups"] as $grp) {
+				$options[] = array($grp->getID(), htmlspecialchars($grp->getName()));
+			}
+			$tmp = array();
+			foreach($receiptStatus as $r) {
+				if($r['type'] == 1) {
+					$tmp[] = $r['required'];
 				}
+			}
+			$fieldwrap = array();
+			if($tmp) {
+				$fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpRecipient", $tmp));
+			}
+			$this->formField(
+				getMLText("assign_recipients"),
+				array(
+					'element'=>'select',
+					'name'=>'grpRecipients[]',
+					'id'=>'GrpRecipient',
+					'class'=>'chzn-select',
+					'attributes'=>array(array('data-placeholder', getMLText('select_grp_recipients')), array('data-no_results_text', getMLText('unknown_owner'))),
+					'multiple'=>true,
+					'options'=>$options
+				),
+				array('field_wrap'=>$fieldwrap)
+			);
+
+		}
+		$this->formSubmit(getMLText('checkin_document'));
 ?>
-      </td>
-		</tr>
-<?php
-	}
-?>
-		<tr>
-			<td></td>
-			<td><input type="submit" class="btn" value="<?php printMLText("checkin_document")?>"></td>
-		</tr>
-	</table>
 </form>
 
 <?php

From d9c1d2f5af613ac17a6633a46881631d58a6f992 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Sep 2020 08:56:58 +0200
Subject: [PATCH 1314/2006] add item for 6.0.13

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9511a7433..cfbf81b94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.20
 - create download file for transmittal in system tmp (Closes: #478)
+- sync source code of checkin with update document
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.12

From 5148f27a01a723e3510fa759a25d8270f597011b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Sep 2020 11:42:54 +0200
Subject: [PATCH 1315/2006] set propper id of input field for library document
 to fix validation

---
 views/bootstrap/class.AddDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 89e18a431..ee5feb453 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -113,10 +113,10 @@ $(document).ready(function() {
 		} else {
 ?>
 			'userfile[]': {
-				alternatives: [$('#dropfolderfileadddocform'), $('#choosedocsearchadddocform')]
+				alternatives: [$('#dropfolderfileadddocform'), $('#choosedocsearch<?= md5('librarydoc'.'adddocform') ?>')]
 			},
 			dropfolderfileadddocform: {
-				 alternatives: [$("#userfile"), $('#choosedocsearchadddocform')]
+				 alternatives: [$("#userfile"), $('#choosedocsearch<?= md5('librarydoc'.'adddocform') ?>')]
 			}
 <?php
 		}

From 8d2de278285f370153f13c688c25e6b522d161e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 30 Sep 2020 09:11:13 +0200
Subject: [PATCH 1316/2006] add indexing task

---
 inc/inc.ClassSchedulerTaskBase.php |   5 +-
 inc/inc.Tasks.php                  | 141 ++++++++++++++++++++++++++++-
 inc/inc.Utils.php                  |   6 +-
 op/op.SchedulerTaskMgr.php         |   4 +-
 views/bootstrap/class.Indexer.php  |   2 +-
 5 files changed, 150 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index a596348d9..372c30e0f 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -37,11 +37,14 @@ class SeedDMS_SchedulerTaskBase {
 
 	var $logger;
 
-	public function __construct($dms=null, $user=null, $settings=null, $logger=null) { /* {{{ */
+	var $fulltextservice;
+
+	public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null) { /* {{{ */
 		$this->dms = $dms;
 		$this->user = $user;
 		$this->settings = $settings;
 		$this->logger = $logger;
+		$this->fulltextservice = $fulltextservice;
 	} /* }}} */
 
 	public function execute($task) { /* {{{ */
diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 34e94537e..c503eebcb 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -7,7 +7,7 @@ require_once("inc/inc.ClassSchedulerTaskBase.php");
  *
  * @author  Uwe Steinmann <uwe@steinmann.cx>
  * @package SeedDMS
- * @subpackage  trash
+ * @subpackage  core
  */
 class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 
@@ -43,4 +43,143 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	}
 } /* }}} */
 
+/**
+ * Class for processing a single folder
+ *
+ * SeedDMS_Task_Indexer_Process_Folder::process() is used as a callable when
+ * iterating over all folders recursively.
+ */
+class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
+	protected $forceupdate;
+
+	protected $fulltextservice;
+
+	public function __construct($fulltextservice, $forceupdate) { /* {{{ */
+		$this->fulltextservice = $fulltextservice;
+		$this->forceupdate = $forceupdate;
+	} /* }}} */
+
+	public function process($folder) { /* {{{ */
+		$documents = $folder->getDocuments();
+		if($documents) {
+			$lucenesearch = $this->fulltextservice->Search();
+			echo $folder->getFolderPathPlain()."\n";
+			foreach($documents as $document) {
+				echo $document->getId().":".$document->getName()." ";
+				/* If the document wasn't indexed before then just add it */
+				if(!($hit = $lucenesearch->getDocument($document->getId()))) {
+					try {
+						$idoc = $this->fulltextservice->IndexedDocument($document, true);
+						if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+							foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+								if (method_exists($hookObj, 'preIndexDocument')) {
+									$hookObj->preIndexDocument(null, $document, $idoc);
+								}
+							}
+						}
+						$this->fulltextservice->Indexer()->addDocument($idoc);
+						echo " (Document added)".PHP_EOL;
+					} catch(Exception $e) {
+						echo " (Timeout)".PHP_EOL;
+					}
+				} else {
+					/* Check if the attribute created is set or has a value older
+					 * than the lastet content. Documents without such an attribute
+					 * where added when a new document was added to the dms. In such
+					 * a case the document content  wasn't indexed.
+					 */
+					try {
+						$created = (int) $hit->getDocument()->getFieldValue('created');
+					} catch (/* Zend_Search_Lucene_ */Exception $e) {
+						$created = 0;
+					}
+					$content = $document->getLatestContent();
+					if($created >= $content->getDate() && !$this->forceupdate) {
+						echo getMLText('index_document_unchanged').PHP_EOL;
+					} else {
+						$this->fulltextservice->Indexer()->delete($hit->id);
+						try {
+							$idoc = $this->fulltextservice->IndexedDocument($document, true);
+							if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+								foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+									if (method_exists($hookObj, 'preIndexDocument')) {
+										$hookObj->preIndexDocument(null, $document, $idoc);
+									}
+								}
+							}
+							$this->fulltextservice->Indexer()->addDocument($idoc);
+							echo " (Document updated)".PHP_EOL;
+						} catch(Exception $e) {
+							echo " (Timeout)".PHP_EOL;
+						}
+					}
+				}
+			}
+		}
+	} /* }}} */
+} /* }}} */
+
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  core
+ */
+class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
+
+	/**
+	 * Run the task
+	 *
+	 * @param $task task to be executed
+	 * @param $dms dms
+	 * @return boolean true if task was executed succesfully, otherwise false
+	 */
+	public function execute($task) {
+		$dms = $this->dms;
+		$fulltextservice = $this->fulltextservice;
+		$taskparams = $task->getParameter();
+		$folder = $dms->getRootFolder();
+		$recreate = isset($taskparams['recreate']) ? $taskparams['recreate'] : false;
+
+		if($fulltextservice) {
+			if($recreate) {
+				$index = $fulltextservice->Indexer(true);
+				if(!$index) {
+					UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
+				}
+			} else {
+				$index = $fulltextservice->Indexer(false);
+				if(!$index) {
+					$index = $fulltextservice->Indexer(true);
+					if(!$index) {
+						UI::exitError(getMLText("admin_tools"),getMLText("no_fulltextindex"));
+					}
+				}
+			}
+		}
+
+		$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($fulltextservice, $recreate);
+		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
+		call_user_func(array($folderprocess, 'process'), $folder);
+
+		return true;
+	}
+
+	public function getDescription() {
+		return 'Indexing all new or updated documents';
+	}
+
+	public function getAdditionalParams() {
+		return array(
+			array(
+				'name'=>'recreate',
+				'type'=>'boolean',
+				'description'=> 'Force recreation of index',
+			)
+		);
+	}
+} /* }}} */
+
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = 'SeedDMS_ExpiredDocumentsTask';
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['indexingdocs'] = 'SeedDMS_IndexingDocumentsTask';
diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 50f9ff6bc..d57d6ef0c 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -650,13 +650,13 @@ function seed_pass_verify($password, $hash) { /* {{{ */
 } /* }}} */
 
 function resolveTask($task) {
-	global $dms, $user, $settings, $logger;
+	global $dms, $user, $settings, $logger, $fulltextservice;
 
 	if(is_object($task))
 		return $task;
 	if(is_string($task)) {
 		if(class_exists($task)) {
-			$task = new $task($dms, $user, $settings, $logger);
+			$task = new $task($dms, $user, $settings, $logger, $fulltextservice);
 		}
 	}
 	return $task;
@@ -741,7 +741,7 @@ class SeedDMS_FolderTree { /* {{{ */
 
 	public function __construct($folder, $callback) { /* {{{ */
     $iter = new \SeedDMS\RecursiveFolderIterator($folder);
-    $iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::       SELF_FIRST);
+    $iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::SELF_FIRST);
 		foreach($iter2 as $ff) {
 			call_user_func($callback, $ff);
 //      echo $ff->getID().': '.$ff->getFolderPathPlain().'-'.$ff->getName()."<br />";
diff --git a/op/op.SchedulerTaskMgr.php b/op/op.SchedulerTaskMgr.php
index 45589660b..c38c5e595 100644
--- a/op/op.SchedulerTaskMgr.php
+++ b/op/op.SchedulerTaskMgr.php
@@ -53,7 +53,7 @@ if ($action == "addtask") { /* {{{ */
 	$description = $_POST["description"];
 	$frequency = $_POST["frequency"];
 	$disabled = isset($_POST["disabled"]) ? $_POST["disabled"] : 0;
-	$params = $_POST["params"];
+	$params = isset($_POST["params"]) ? $_POST["params"] : null;
 
 	$newtask = $scheduler->addTask($extension, $task, $name, $description, $frequency, $disabled, $params);
 	if ($newtask) {
@@ -90,7 +90,7 @@ else if ($action == "edittask") { /* {{{ */
 	$description = $_POST["description"];
 	$frequency = $_POST["frequency"];
 	$disabled = isset($_POST["disabled"]) ? $_POST["disabled"] : 0;
-	$params = $_POST["params"];
+	$params = isset($_POST["params"]) ? $_POST["params"] : null;
 
 	if ($editedtask->getName() != $name)
 		$editedtask->setName($name);
diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 7613500f1..92de6595b 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -27,7 +27,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 	protected $forceupdate;
 
-	protected $index;
+	protected $fulltextservice;
 
 	public function __construct($fulltextservice, $forceupdate) { /* {{{ */
 		$this->fulltextservice = $fulltextservice;

From 16e4437032edc6773283476bbb990962eed37f4c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Oct 2020 10:52:49 +0200
Subject: [PATCH 1317/2006] more packages

---
 Gruntfile.js | 88 ++++++++++++++++++++++++++++++++++++++++++----------
 package.json |  7 ++++-
 2 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 1beeb3cc4..35a4ea180 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -173,36 +173,50 @@ module.exports = function (grunt) {
 								],
 								dest: bootstrapDir + '/bootstrap-datepicker/locales',
 								flatten: true
-						},{
-								expand: true,
-								src: [
-										nodeDir + '/@coreui/coreui/dist/js/*'
-								],
-								dest: bootstrapDir + '/coreui/js',
-								flatten: true
-						},{
-								expand: true,
-								src: [
-										nodeDir + '/@coreui/coreui/dist/css/*'
-								],
-								dest: bootstrapDir + '/coreui/css',
-								flatten: true
 						}]
 					},
 					'coreui': {
 						files: [{
+								expand: true,
+								src: [
+										nodeDir + '/jquery/dist/*'
+								],
+								dest: tdkDir + '/jquery',
+								flatten: true
+						}, {
 								expand: true,
 								src: [
 										nodeDir + '/@coreui/coreui/dist/js/*'
 								],
-								dest: tdkDir + '/coreui/js',
+								dest: tdkDir + '/@coreui/coreui/js',
 								flatten: true
 						},{
 								expand: true,
 								src: [
 										nodeDir + '/@coreui/coreui/dist/css/*'
 								],
-								dest: tdkDir + '/coreui/css',
+								dest: tdkDir + '/@coreui/coreui/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/icons/css/*'
+								],
+								dest: tdkDir + '/@coreui/icons/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/@coreui/icons/fonts/*'
+								],
+								dest: tdkDir + '/@coreui/icons/fonts',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/popper.js/dist/esm/*'
+								],
+								dest: tdkDir + '/popper.js',
 								flatten: true
 						},{
 								expand: true,
@@ -239,6 +253,48 @@ module.exports = function (grunt) {
 								],
 								dest: tdkDir + '/font-awesome/css',
 								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/pace-progressbar/index.js'
+								],
+								dest: tdkDir + '/pace-progressbar',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/pace-progressbar/themes/*'
+								],
+								dest: tdkDir + '/pace-progressbar/themes',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/pace-progressbar/templates/*'
+								],
+								dest: tdkDir + '/pace-progressbar/templates',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/flag-icon-css/css/*'
+								],
+								dest: tdkDir + '/flag-icon-css/css',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/simple-line-icons/dist/fonts/*'
+								],
+								dest: tdkDir + '/simple-line-icons/fonts',
+								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/simple-line-icons/dist/styles/*'
+								],
+								dest: tdkDir + '/simple-line-icons/css',
+								flatten: true
 						}]
 					},
 				}
diff --git a/package.json b/package.json
index 8378da1e4..bd8258450 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@coreui/coreui": "^3.2.2",
+    "@coreui/icons": "^1.0.1",
     "@popperjs/core": "^2.4.4",
     "bootstrap": "^4.5.2",
     "bootstrap-datepicker": "^1.9.0",
@@ -17,6 +18,7 @@
     "cytoscape": "^3.15.2",
     "cytoscape-grid-guide": "^2.3.2",
     "fine-uploader": "^5.16.2",
+    "flag-icon-css": "^3.5.0",
     "flot": "^4.2.1",
     "font-awesome": "^4.7.0",
     "fullcalendar": "^3.*",
@@ -28,7 +30,10 @@
     "jquery-validation": "^1.19.2",
     "moment": "^2.17.1",
     "noty": "^2.4.1",
+    "pace-progressbar": "^1.0.9",
     "perfect-scrollbar": "^1.5.0",
-    "select2": "^4.0.13"
+    "popper.js": "^1.16.1",
+    "select2": "^4.0.13",
+    "simple-line-icons": "^2.5.5"
   }
 }

From eb0367bd7c27e433f471bb52e6f3116a2e10c5d0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Oct 2020 06:37:07 +0200
Subject: [PATCH 1318/2006] document links can be added by regular users again

---
 CHANGELOG                        | 1 +
 inc/inc.ClassAccessOperation.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 285749c27..39807f031 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.14
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.21
+- document links can be added by regular users again
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.13
diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index a01abd2f4..a43530c10 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -433,6 +433,7 @@ class SeedDMS_AccessOperation {
 		} else {
 			$user_allowed = array(
 				'AddDocument',
+				'AddDocumentLink',
 				'AddEvent',
 				'AddFile',
 				'AddSubFolder',

From 16175182826951a8d97c37c202f1cb4068790dca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Oct 2020 21:49:48 +0200
Subject: [PATCH 1319/2006] show debug menu only if debug mode is on

---
 CHANGELOG                           | 1 +
 views/bootstrap/class.Bootstrap.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 11a9e55d4..ff78183de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.14
 --------------------------------------------------------------------------------
+- show debug menu only if debug mode is on
 - merge changes up to 5.1.21
 - document links can be added by regular users again
 
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e6cb25bd5..d61e3c8c0 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -916,7 +916,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$menuitems['misc']['children']['version_info'] = array('link'=>"../out/out.Info.php", 'label'=>'version_info');
 		}
 
-		if($accessobject->check_view_access(array('Hooks'))) {
+		if ($settings->_enableDebugMode) {
 		$menuitems['debug'] = array('link'=>"#", 'label'=>'debug');
 		if ($accessobject->check_view_access('Hooks'))
 		$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>'list_hooks');

From 024a61319e267a93ce29c79f2563a20c9913dbb9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 12:40:35 +0200
Subject: [PATCH 1320/2006] fix typo in printDocumentChooserHtml()

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 4aaece05d..e06c35301 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1481,7 +1481,7 @@ $(document).ready(function() {
 		return $content;
 	} /* }}} */
 
-	function printtDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
+	function printDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
 		echo self::getDocumentChooserHtml($form, $accessMode, $exclude, $default, $formname, $folder, $partialtree);
 	} /* }}} */
 

From 0cc4fccd7fdbb062e51dd952885c43aa15303039 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 16:26:30 +0200
Subject: [PATCH 1321/2006] show list of recject and docs that need attention
 if for traditional_only_approval

---
 views/bootstrap/class.MyDocuments.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 089c9da3f..b0e0b51c7 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -728,7 +728,7 @@ $(document).ready( function() {
 		echo '<li class=""><a data-href="#documents_user_reception" data-action="listReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_reception").'</a></li>';
 		$resArr = $dms->getDocumentList('NoReceiveOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_no_reception" data-action="listNoReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_no_reception").'</a></li>';
-		if($workflowmode == 'traditional') {
+		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
 		}
@@ -737,7 +737,7 @@ $(document).ready( function() {
 		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		$resArr = $dms->getDocumentList('DraftOwner', $user);
 		echo '<li class=""><a data-href="#documents_user_draft" data-action="listDraftOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_draft").'</a></li>';
-		if($workflowmode == 'traditional') {
+		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$resArr = $dms->getDocumentList('RejectOwner', $user);
 			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
 		}

From 40f410a762662cd0621653703aa5c3aa3b6617c9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 16:27:06 +0200
Subject: [PATCH 1322/2006] check for workflow and workflowstate

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5b29f2581..1c6a995a8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2868,7 +2868,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$content .= count($links)."/".count($revlinks)." ".getMLText("linked_documents")."<br />";
 			if($status["status"] == S_IN_WORKFLOW && $workflowmode == 'advanced') {
 				$workflowstate = $latestContent->getWorkflowState();
-				$content .= '<span title="'.getOverallStatusText($status["status"]).': '.htmlspecialchars($workflow->getName()).'">'.htmlspecialchars($workflowstate->getName()).'</span>';
+				$content .= '<span title="'.getOverallStatusText($status["status"]).': '.($workflow ? htmlspecialchars($workflow->getName()) : '').'">'.($workflowstate ? htmlspecialchars($workflowstate->getName()) : '').'</span>';
 			} else {
 				$content .= getOverallStatusText($status["status"]);
 			}

From 598529da7a0464ac15be965cbf837da0dbca3faa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Oct 2020 18:48:32 +0200
Subject: [PATCH 1323/2006] add item for 6.0.14

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 04672e013..c4b69944f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - show debug menu only if debug mode is on
 - merge changes up to 5.1.21
 - document links can be added by regular users again
+- add list of checked out documents to tasks
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.13

From 3014b9411136a76cf15049113df606bcb75c4564 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Oct 2020 14:35:05 +0100
Subject: [PATCH 1324/2006] fix syntax error

---
 SeedDMS_Core/package.xml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 465e49012..235232b13 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+???
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -2090,20 +2091,20 @@ SeedDMS_Core_DMS::filterAccess() properly checks for documents
    </notes>
   </release>
   <release>
- <date>2020-09-29</date>
- <time>13:44:55</time>
- <version>
-  <release>6.0.13</release>
-  <api>6.0.13</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
- <notes>
+   <date>2020-09-29</date>
+   <time>13:44:55</time>
+   <version>
+    <release>6.0.13</release>
+    <api>6.0.13</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
 - SeedDMS_Folder_DMS::getAccessList() and getDefaultAccess() do not return fals anymore if the parent does not exists. They just stop inheritance.
+   </notes>
   </release>
- </notes>
  </changelog>
 </package>

From 65a1b64db9d69278aca7e0c7ade42adb43bbd044 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Oct 2020 14:37:32 +0100
Subject: [PATCH 1325/2006] remove old code which was already removed in 5.1.x

---
 controllers/class.AddDocument.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 30a0633f5..3dffad086 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -140,13 +140,6 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 				}
 			}
 
-			if($index) {
-				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText));
-				if(!$this->callHook('preIndexDocument', $document, $idoc)) {
-				}
-				$index->addDocument($idoc);
-			}
-
 			/* Add a default notification for the owner of the document */
 			if($settings->_enableOwnerNotification) {
 				$res = $document->addNotify($owner->getID(), true);

From f1aed51047692f39a83a2fee8bd2ed27b737ba5f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Nov 2020 15:03:06 +0100
Subject: [PATCH 1326/2006] add method callHook() to class
 SeedDMS_SchedulerTaskBase

---
 inc/inc.ClassSchedulerTaskBase.php | 62 ++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index 372c30e0f..2c5330e77 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -39,6 +39,68 @@ class SeedDMS_SchedulerTaskBase {
 
 	var $fulltextservice;
 
+	/**
+	 * Call a hook with a given name
+	 *
+	 * Checks if a hook with the given name and for the current task
+	 * exists and executes it. The name of the current task is taken
+	 * from the current class name by lower casing the first char.
+	 * This function will execute all registered hooks in the order
+	 * they were registered.
+	 *
+	 * Attention: as func_get_arg() cannot handle references passed to the hook,
+	 * callHook() should not be called if that is required. In that case get
+	 * a list of hook objects with getHookObjects() and call the hooks yourself.
+	 *
+	 * @params string $hook name of hook
+	 * @return string concatenated string, merged arrays or whatever the hook
+	 * function returns
+	 */
+	public function callHook($hook) { /* {{{ */
+		$tmps = array();
+		$tmp = explode('_', get_class($this));
+		$tmps[] = $tmp[1];
+		$tmp = explode('_', get_parent_class($this));
+		$tmps[] = $tmp[1];
+		/* Run array_unique() in case the parent class has the same suffix */
+		$tmps = array_unique($tmps);
+		$ret = null;
+		foreach($tmps as $tmp)
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['task'][lcfirst($tmp)])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['task'][lcfirst($tmp)] as $hookObj) {
+				if (method_exists($hookObj, $hook)) {
+					switch(func_num_args()) {
+						case 1:
+							$tmpret = $hookObj->$hook($this);
+							break;
+						case 2:
+							$tmpret = $hookObj->$hook($this, func_get_arg(1));
+							break;
+						case 3:
+							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2));
+							break;
+						case 4:
+							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3));
+							break;
+						default:
+						case 5:
+							$tmpret = $hookObj->$hook($this, func_get_arg(1), func_get_arg(2), func_get_arg(3), func_get_arg(4));
+							break;
+					}
+					if($tmpret !== null) {
+						if(is_string($tmpret)) {
+							$ret = ($ret === null) ? $tmpret : (is_string($ret) ? $ret.$tmpret : array_merge($ret, array($tmpret)));
+						} elseif(is_array($tmpret) || is_object($tmpret)) {
+							$ret = ($ret === null) ? $tmpret : (is_string($ret) ? array_merge(array($ret), $tmpret) : array_merge($ret, $tmpret));
+						} else
+							$ret = $tmpret;
+					}
+				}
+			}
+		}
+		return $ret;
+	} /* }}} */
+
 	public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null) { /* {{{ */
 		$this->dms = $dms;
 		$this->user = $user;

From f440d8bf5401890e20f9fe1eb96f489fbc0f781e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 15 Nov 2020 07:44:09 +0100
Subject: [PATCH 1327/2006] call hook filterList

---
 views/bootstrap/class.MyDocuments.php | 36 +++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index b0e0b51c7..f754a6acb 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -56,19 +56,23 @@ $(document).ready( function() {
 <?php
 	} /* }}} */
 
-	protected function printListHeader($resArr, $previewer, $order=false) { /* {{{ */
+	protected function printListHeader($resArr, $previewer, $action=false) { /* {{{ */
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
 
 		print "<table class=\"table table-condensed\">";
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";
-		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; <a data-action=\"".$order."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
-		else
+		if($action) {
+			print "<th>";
+			print "<a data-action=\"".$action."\" data-orderby=\"n\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("name")."</a> ".($orderby == 'n' || $orderby == '' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; ";
+			print "<a data-action=\"".$action."\" data-orderby=\"u\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("last_update")."</a> ".($orderby == 'u' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')." &middot; ";
+			print "<a data-action=\"".$action."\" data-orderby=\"e\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("expires")."</a> ".($orderby == 'e' ? ($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '');
+			print "</th>\n";
+		} else
 			print "<th>".getMLText("name")."</th>\n";
-		if($order)
-			print "<th><a data-action=\"".$order."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
+		if($action)
+			print "<th><a data-action=\"".$action."\" data-orderby=\"s\" data-orderdir=\"".($orderdir == 'desc' ? '' : 'desc')."\">".getMLText("status")."</a>".($orderby == 's' ? " ".($orderdir == 'desc' ? '<i class="fa fa-arrow-up"></i>' :  '<i class="fa fa-arrow-down"></i>') : '')."</th>\n";
 		else
 			print "<th>".getMLText("status")."</th>\n";
 		print "<th>".getMLText("action")."</th>\n";
@@ -79,26 +83,32 @@ $(document).ready( function() {
 		echo "</tbody>\n</table>";
 	} /* }}} */
 
-	protected function printList($resArr, $previewer, $order=false) { /* {{{ */
+	protected function printList($resArr, $previewer, $action=false) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 
-		$this->printListHeader($resArr, $previewer, $order);
+		$this->printListHeader($resArr, $previewer, $action);
 		$noaccess = 0;
+		$docs = [];
 		foreach ($resArr as $res) {
 			$document = $dms->getDocument($res["id"]);
 			$document->verifyLastestContentExpriry();
 
 			if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-				$txt = $this->callHook('documentListItem', $document, $previewer, false, $res['version']);
-				if(is_string($txt))
-					echo $txt;
-				else
-					echo $this->documentListRow($document, $previewer, false, $res['version']);
+				$docs[] = $document;
 			} else {
 				$noaccess++;
 			}
 		}
+		if($this->hasHook('filterList'))
+			$docs = $this->callHook('filterList', $docs, $action);
+		foreach($docs as $document) {
+			$txt = $this->callHook('documentListItem', $document, $previewer, false);
+			if(is_string($txt))
+				echo $txt;
+			else
+				echo $this->documentListRow($document, $previewer, false);
+		}
 		$this->printListFooter();
 
 		if($noaccess) {

From 78aab08ebd6bf78bacb40e6830f9f7863aaac2f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Nov 2020 16:50:37 +0100
Subject: [PATCH 1328/2006] do not show the task menu at all, if there are no
 tasks

---
 views/bootstrap/class.Tasks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index db6bcd076..fdab2d397 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -300,7 +300,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$ct[] = count($tasks['checkedout']);
 		$content .= implode('/', $ct);
 		$content .= ")";
-		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow']) || !empty($tasks['rejected']) || !empty($tasks['rejected'])) {
+		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow']) || !empty($tasks['rejected']) || !empty($tasks['rejected']) || !empty($tasks['checkedout'])) {
 		$content .= " <i class=\"fa fa-caret-down\"></i></a>\n";
 		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if(!empty($tasks['review'])) {
@@ -391,11 +391,11 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$content .= "       </ul>\n";
 		$content .= "      </li>\n";
 		}
-		}
 		if ($accessobject->check_view_access('MyDocuments')) {
 			$content .= "    <li class=\"divider\"></li>\n";
 			$content .= "    <li><a href=\"../out/out.MyDocuments.php\">".getMLText("my_documents")."</a></li>\n";
 		}
+		}
 		$content .= "    </li>\n";
 		$content .= "   </ul>\n";
 		echo $content;

From ab438f18d9b275813f2dba6415ff5f5c0c90b6b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 22 Nov 2020 11:39:57 +0100
Subject: [PATCH 1329/2006] issue warning when deleting a checked out document

---
 CHANGELOG                                | 1 +
 views/bootstrap/class.RemoveDocument.php | 4 ++++
 views/bootstrap/class.UpdateDocument.php | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9b7503bb2..958ca45b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - merge changes up to 5.1.21
 - document links can be added by regular users again
 - add list of checked out documents to tasks
+- issue a warning when removing a document with is checked out
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.13
diff --git a/views/bootstrap/class.RemoveDocument.php b/views/bootstrap/class.RemoveDocument.php
index 26e3cb019..945da4312 100644
--- a/views/bootstrap/class.RemoveDocument.php
+++ b/views/bootstrap/class.RemoveDocument.php
@@ -43,6 +43,10 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rm_document"));
+		if ($document->isCheckedOut()) {
+			$msg = getMLText('document_is_checked_out_remove');
+			$this->warningMsg($msg);
+		}
 		$this->contentContainerStart('warning');
 
 ?>
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 5758b5397..58135cc33 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -225,7 +225,7 @@ console.log(element);
 			$this->warningMsg($msg);
 
 		if ($document->isCheckedOut()) {
-			$msg = getMLText('document_is_checked_out');
+			$msg = getMLText('document_is_checked_out_update');
 			$this->warningMsg($msg);
 		}
 

From 152c943d5aeb3a45a44520b6d55e856be476991c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 Nov 2020 08:04:44 +0100
Subject: [PATCH 1330/2006] SeedDMS_Core_Document::getCheckOutInfo() returns
 all checkout versions

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 27 ++++++++++++++++---------
 views/bootstrap/class.ViewDocument.php  | 11 ++++++----
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 2ceb12874..3e12f6edf 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1020,7 +1020,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Get checkout info for document
 	 *
-	 * @return array/boolean record from table tblDocumentCheckOuts or false
+	 * This returns the checkouts for a document. There could be several checkouts
+	 * for one document, but usually there is just one.
+	 *
+	 * @return array/boolean records from table tblDocumentCheckOuts or false
 	 * in case of an error.
 	 */
 	function getCheckOutInfo() { /* {{{ */
@@ -1033,7 +1036,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		} else {
 			// A check out has been identified for this document.
-			return $resArr[0];
+			return $resArr;
 		}
 	} /* }}} */
 
@@ -1114,7 +1117,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function checkIn($comment, $user, $reviewers=array(), $approvers=array(), $version=0, $attributes=array(), $workflow=null, $initstate=S_RELEASED) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$info = self::getCheckOutInfo();
+		$infos = self::getCheckOutInfo();
+		if(!$infos)
+			return false;
+		$info = $infos[0];
 		$lc = self::getLatestContent();
 
 		/* If file doesn't exist anymore, then just remove the record from the db */
@@ -1168,12 +1174,14 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function cancelCheckOut() { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$info = self::getCheckOutInfo();
-		if($info) {
-			SeedDMS_Core_File::removeFile($info['filename']);
+		$infos = self::getCheckOutInfo();
+		if($infos) {
+			$info = $infos[0];
 
 			$queryStr = "DELETE FROM `tblDocumentCheckOuts` WHERE `document` = ".$this->_id;
-			$db->getResult($queryStr);
+			if (!$db->getResult($queryStr))
+				return false;
+			SeedDMS_Core_File::removeFile($info['filename']);
 		}
 
 		return true;
@@ -1193,10 +1201,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * 0=The checked out file is modified and check in will create a new version
 	 */
 	function checkOutStatus() { /* {{{ */
-		$info = self::getCheckOutInfo();
-		if(!$info)
+		$infos = self::getCheckOutInfo();
+		if(!$infos)
 			return 4;
 
+		$info = $infos[0];
 		$lc = self::getLatestContent();
 
 		/* If file doesn't exist anymore, then just remove the record from the db */
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 1a9725b47..e2a4c82eb 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -194,17 +194,20 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$txt = $this->callHook('checkOutInfo', $document);
 		if(is_string($txt)) {
 			echo $txt;
-		} elseif($info = $document->getCheckOutInfo()) {
-			echo "<div class=\"alert alert-info\">";
+		} elseif($infos = $document->getCheckOutInfo()) {
 			$session = $this->params['session'];
 			if($session->getSu()) {
 				$origuser = $dms->getUser($session->getUser());
 				$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $origuser->getLogin()));
 			} else {
+				$origuser = $user;
 				$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
 			}
-			echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>$info['date'], 'filename'=>substr($info['filename'], strlen($checkoutpath)+1)))."</a>";
-			echo "</div>";
+			foreach($infos as $info) {
+				echo "<div class=\"alert alert-info\">";
+				echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>$info['date'], 'filename'=>substr($info['filename'], strlen($checkoutpath)+1)))."</a>";
+				echo "</div>";
+			}
 		}
 		$this->contentContainerStart();
 		$txt = $this->callHook('preDocumentInfos', $document);

From c9a2aaca9c64044755cc9849f57ce2d67f55ac83 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Nov 2020 09:13:37 +0100
Subject: [PATCH 1331/2006] add notes for 6.0.14

---
 SeedDMS_Core/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 235232b13..b1299f17d 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-???
+better error checking in SeedDMS_Core_Document::cancelCheckOut()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 67a8d10797a28db0a0eaa3bea52ca57432cb4de2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Nov 2020 09:14:03 +0100
Subject: [PATCH 1332/2006] add discarding of checked out document

---
 CHANGELOG                                 |  3 +-
 SeedDMS_Core/Core/inc.ClassDocument.php   | 11 ++++-
 inc/inc.ClassSettings.php                 |  4 ++
 op/op.CancelCheckOut.php                  | 50 +++++++++++++++++++++++
 op/op.CheckInDocument.php                 |  7 +++-
 op/op.Settings.php                        |  1 +
 views/bootstrap/class.CheckInDocument.php | 16 +++++++-
 views/bootstrap/class.Settings.php        |  1 +
 8 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 op/op.CancelCheckOut.php

diff --git a/CHANGELOG b/CHANGELOG
index e4b0280cb..6a433e522 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,8 @@
 - merge changes up to 5.1.21
 - document links can be added by regular users again
 - add list of checked out documents to tasks
-- issue a warning when removing a document with is checked out
+- issue a warning when removing a document which is checked out
+- checked out can be discarded if it was changed
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.13
diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 3e12f6edf..d9adfb97a 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1178,10 +1178,17 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if($infos) {
 			$info = $infos[0];
 
+			$db->startTransaction();
 			$queryStr = "DELETE FROM `tblDocumentCheckOuts` WHERE `document` = ".$this->_id;
-			if (!$db->getResult($queryStr))
+			if (!$db->getResult($queryStr)) {
+				$db->rollbackTransaction();
 				return false;
-			SeedDMS_Core_File::removeFile($info['filename']);
+			}
+			if(!SeedDMS_Core_File::removeFile($info['filename'])) {
+				$db->rollbackTransaction();
+				return false;
+			}
+			$db->commitTransaction();
 		}
 
 		return true;
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 4b373b696..6022d9624 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -188,6 +188,8 @@ class Settings { /* {{{ */
 	var $_enableDuplicateDocNames = true;
 	// enable/disable duplicate names of a subfolder in a folder
 	var $_enableDuplicateSubFolderNames = true;
+	// allow/disallow to cancel a checkout
+	var $_enableCancelCheckout = true;
 	// override mimetype set by browser when uploading a file
 	var $_overrideMimeType = false;
 	// advanced access control lists
@@ -749,6 +751,7 @@ class Settings { /* {{{ */
 			$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
 			$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
 			$this->_enableDuplicateSubFolderNames = Settings::boolval($tab["enableDuplicateSubFolderNames"]);
+			$this->_enableCancelCheckout = Settings::boolval($tab["enableCancelCheckout"]);
 			$this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]);
 			$this->_advancedAcl = Settings::boolval($tab["advancedAcl"]);
 			$this->_removeFromDropFolder = Settings::boolval($tab["removeFromDropFolder"]);
@@ -1099,6 +1102,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
     $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
     $this->setXMLAttributValue($node, "enableDuplicateSubFolderNames", $this->_enableDuplicateSubFolderNames);
+    $this->setXMLAttributValue($node, "enableCancelCheckout", $this->_enableCancelCheckout);
     $this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType);
     $this->setXMLAttributValue($node, "advancedAcl", $this->_advancedAcl);
     $this->setXMLAttributValue($node, "removeFromDropFolder", $this->_removeFromDropFolder);
diff --git a/op/op.CancelCheckOut.php b/op/op.CancelCheckOut.php
new file mode 100644
index 000000000..c3a1ce270
--- /dev/null
+++ b/op/op.CancelCheckOut.php
@@ -0,0 +1,50 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 2015 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey('cancelcheckout')) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
+}
+
+if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+}
+
+$documentid = $_POST["documentid"];
+$document = $dms->getDocument($documentid);
+
+if(empty($settings->_enableCancelCheckout)) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("operation_disallowed"));
+}
+
+$document->cancelCheckOut($comment);
+if (is_bool($result) && !$result) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+}
+$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_cancel_checkout')));
+add_log_line("?documentid=".$documentid);
+header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index fd0e40ead..b60f4ad92 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -25,6 +25,11 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+/* Check if the form data comes from a trusted request */
+if(!checkFormKey('checkindocument')) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
+}
+
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -427,5 +432,3 @@ else
 add_log_line("?documentid=".$documentid);
 header("Location:../out/out.ViewDocument.php?documentid=".$documentid);
 
-?>
-
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 0cad3843a..1f91dc0b8 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -216,6 +216,7 @@ if ($action == "saveSettings")
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
   $settings->_enableDuplicateSubFolderNames = getBoolValue("enableDuplicateSubFolderNames");
+  $settings->_enableCancelCheckout = getBoolValue("enableCancelCheckout");
   $settings->_overrideMimeType = getBoolValue("overrideMimeType");
   $settings->_advancedAcl = getBoolValue("advancedAcl");
   $settings->_removeFromDropFolder = getBoolValue("removeFromDropFolder");
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 5fa945742..cfe1d8076 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -77,6 +77,7 @@ $(document).ready(function() {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$settings = $this->params['settings'];
 		$folder = $this->params['folder'];
 		$document = $this->params['document'];
 		$strictformcheck = $this->params['strictformcheck'];
@@ -688,9 +689,22 @@ $(document).ready(function() {
 		$this->formSubmit(getMLText('checkin_document'));
 ?>
 </form>
-
 <?php
 		$this->contentContainerEnd();
+		if(!empty($settings->_enableCancelCheckout)) {
+			$this->contentContainerStart();
+			$this->warningMsg(getMLText('cancel_checkout_warning'));
+?>
+<form class="form-horizontal" action="../op/op.CancelCheckOut.php" method="post">
+	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
+<?php
+	echo createHiddenFieldWithKey('cancelcheckout');
+			$this->formSubmit(getMLText('cancel_checkout'));
+?>
+</form>
+<?php
+			$this->contentContainerEnd();
+		}
 		} else {
 ?>
 <form action="../op/op.CheckInDocument.php" method="post">
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 4a3de21f1..b40ced0f6 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -485,6 +485,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 <?php $this->showConfigCheckbox('settings_enableVersionModification', 'enableVersionModification'); ?>
 <?php $this->showConfigCheckbox('settings_enableDuplicateDocNames', 'enableDuplicateDocNames'); ?>
 <?php $this->showConfigCheckbox('settings_enableDuplicateSubFolderNames', 'enableDuplicateSubFolderNames'); ?>
+<?php $this->showConfigCheckbox('settings_enableCancelCheckout', 'enableCancelCheckout'); ?>
 <?php $this->showConfigCheckbox('settings_overrideMimeType', 'overrideMimeType'); ?>
 <?php $this->showConfigCheckbox('settings_advancedAcl', 'advancedAcl'); ?>
 <?php $this->showConfigCheckbox('settings_removeFromDropFolder', 'removeFromDropFolder'); ?>

From 2158225795e4397bcb258fc398aaac7718f514f1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 12:37:13 +0100
Subject: [PATCH 1333/2006] put revision date into log messages

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index d9adfb97a..cd5d172af 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -933,7 +933,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 				/* We have sleeping revision, next check if the revision is already due */
 				if($lc->getRevisionDate() && $lc->getRevisionDate() <= date('Y-m-d 00:00:00')) {
-					if($lc->startRevision($user, 'Automatic start of revision workflow')) {
+					if($lc->startRevision($user, 'Automatic start of revision workflow scheduled for '.$lc->getRevisionDate())) {
 						if($next) {
 							$tmp = explode('-', substr($next, 0, 10));
 							if(checkdate($tmp[1], $tmp[2], $tmp[0]))
@@ -5657,7 +5657,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		}
 		/* Set status only if at least one revision was started */
 		if($startedrev)
-			if(!$this->setStatus(S_IN_REVISION, "Started revision", $requestUser)) {
+			if(!$this->setStatus(S_IN_REVISION, "Started revision scheduled for ".$this->getRevisionDate(), $requestUser)) {
 				$db->rollbackTransaction();
 				return false;
 			}

From fcab6f5a091c574c5fc293aba88125abe02ca281 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Dec 2020 21:59:02 +0100
Subject: [PATCH 1334/2006] format date with getLongReadableDate()

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index b77ac22a6..20e367cef 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1363,7 +1363,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					}
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
-					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+					print "<td><ul class=\"unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
 					/* $updateUser is the user who has done the receipt */
 					$updateUser = $dms->getUser($r["userID"]);
 					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
@@ -1494,7 +1494,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				if($user->isAdmin() || $r["status"] != -2) {
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
-					print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
+					print "<td><ul class=\"unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
 					/* $updateUser is the user who has done the revision */
 					if($r['status'] != 0) {
 						$updateUser = $dms->getUser($r["userID"]);

From e3d7a6f4643d6316b71515a9b3a63f6e04d49ad4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Dec 2020 09:13:04 +0100
Subject: [PATCH 1335/2006] show path and name of selected doc/folder in
 doc/folder chooser as title

---
 views/bootstrap/class.Bootstrap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 4b35c29e0..2421f5d96 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1471,13 +1471,13 @@ $(document).ready(function() {
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
+		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\"".($default ? ' title="'.htmlspecialchars($default->getFolder()->getFolderPathPlain().' / '.$default->getName()).'"' : '')." />";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree)
 			$content .= $this->getModalBoxLink(
 				array(
 					'target' => 'docChooser'.$formid,
-					'remote' => "out.DocumentChooser.php?form=".$formid."&folderid=".$folderid."&partialtree=".$partialtree,
+					'remote' => "../out/out.DocumentChooser.php?form=".$formid."&folderid=".$folderid."&partialtree=".$partialtree,
 					'title' => getMLText('document')
 				));
 		$content .= "</div>\n";
@@ -1535,7 +1535,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
+		$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"".($default ? ' title="'.htmlspecialchars($default->getFolderPathPlain()).'"' : '')."/>";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$formid."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree) {
 			$content .= $this->getModalBoxLink(

From b65c62e37084960ff83b253db039bf467375bd24 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 12 Dec 2020 15:57:14 +0100
Subject: [PATCH 1336/2006] fix error when checking for manager

---
 SeedDMS_Core/Core/inc.ClassGroup.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index d9bd39069..5be182a7c 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -220,6 +220,7 @@ class SeedDMS_Core_Group { /* {{{ */
 
 		$managers = array();
 
+		$classnamerole = $this->_dms->getClassname('role');
 		$classname = $this->_dms->getClassname('user');
 		foreach ($resArr as $row) {
 			/** @var SeedDMS_Core_User $user */

From 0c399ced957d7c1d9a8f69706a38f5c8bb15efb9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 15 Dec 2020 10:02:18 +0100
Subject: [PATCH 1337/2006] fix call of getDocumentChooserHtml()

---
 views/bootstrap/class.Bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 85ad70bdc..334844127 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1773,7 +1773,7 @@ $(document).ready(function() {
 				$target = $dms->getDocument($objvalue);
 			else
 				$target = null;
-			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), $target, $fieldname."[".$attrdef->getId()."]");
+			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), M_READ, -1, $target, $fieldname."[".$attrdef->getId()."]");
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_user:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : $attribute) : array();

From faf45dc2533e456b4f87fffea76ae2ac59404d95 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 15 Dec 2020 10:02:30 +0100
Subject: [PATCH 1338/2006] searchdocs returns only docs with at least read
 access

---
 op/op.Ajax.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 5edac3348..017b295ac 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -125,15 +125,21 @@ switch($command) {
 		}	
 		break; /* }}} */
 
+		/* Used for document chooser */
 	case 'searchdocument': /* {{{ */
 		if($user) {
 			$query = $_GET['query'];
+			$status = isset($_GET['status']) ? (is_array($_GET['status']) ? $_GET['status'] : array($_GET['status'])) : array();
 
-			$hits = $dms->search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x1, $expirationstartdate=array(), $expirationenddate=array());
+			$hits = $dms->search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status, $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x1, $expirationstartdate=array(), $expirationenddate=array());
 			if($hits) {
 				$result = array();
 				foreach($hits['docs'] as $hit) {
-					$result[] = $hit->getID().'#'.$hit->getName();
+					if ($hit->getAccessMode($user) >= M_READ) {
+						if($hit->getLatestContent()) {
+							$result[] = $hit->getID().'#'.$hit->getName();
+						}
+					}
 				}
 				header('Content-Type: application/json');
 				echo json_encode($result);
@@ -141,6 +147,7 @@ switch($command) {
 		}
 		break; /* }}} */
 
+		/* Used for folder chooser */
 	case 'searchfolder': /* {{{ */
 		if($user) {
 			$query = $_GET['query'];

From 2d4007d62fcd17577a8a3eed7fc0b2f8b46018b8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 15 Dec 2020 17:05:04 +0100
Subject: [PATCH 1339/2006] fix comment

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index cff7ef9a8..db73e29be 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2189,8 +2189,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * Get the latest version of document
 	 *
 	 * This function returns the latest accessible version of a document.
-	 * If content access has been restricted by setting
-	 * {@link SeedDMS_Core_DMS::noReadForStatus} the function will go
+	 * If content access has been restricted by the role of the user
+	 * the function will go
 	 * backwards in history until an accessible version is found. If none
 	 * is found null will be returned.
 	 * Access rights based on the document status are calculated for the

From 5323feca9b05b253b804662b52f5e368f2645b5a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Dec 2020 10:41:52 +0100
Subject: [PATCH 1340/2006] add hook preRecipientsTab

---
 views/bootstrap/class.ViewDocument.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index ef71456ae..5de7f8c21 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1297,7 +1297,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 			if($status["status"]!=S_RELEASED)
 				echo "<div class=\"alert alert-warning\">".getMLText('info_recipients_tab_not_released')."</div>";
-//			$this->contentContainerStart();
+
+			$txt = $this->callHook('preRecipientsTab', $receiptStatus);
+			if(is_string($txt))
+				echo $txt;
+
 			print "<table class=\"table table-condensed\">\n";
 
 			print "<tr>\n";

From 2c008bafeeb934ac7baf5b1c5fd48d681c7f4bbd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Dec 2020 09:37:50 +0100
Subject: [PATCH 1341/2006] allow editAttributes in S_IN_REVISION and
 S_DRAFT_APP

---
 inc/inc.ClassAccessOperation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index a43530c10..c09101d25 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -275,7 +275,7 @@ class SeedDMS_AccessOperation {
 			if($latestContent = $document->getLatestContent()) {
 				$status = $latestContent->getStatus();
 				$workflow = $latestContent->getWorkflow();
-				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT_REV || ($workflow && $workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
+				if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) >= M_READWRITE)) || $this->user->isAdmin()) && (in_array($status["status"], array(S_DRAFT_REV, S_DRAFT_APP, S_IN_REVISION)) || ($workflow && $workflow->getInitState()->getID() == $latestContent->getWorkflowState()->getID()))) {
 					return true;
 				}
 			}

From 20bc412a17d6ff7655330a5aecb5af4d853de80c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Jan 2021 09:46:34 +0100
Subject: [PATCH 1342/2006] check if document exists

---
 views/bootstrap/class.MyDocuments.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index f754a6acb..462f7dd15 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -91,13 +91,14 @@ $(document).ready( function() {
 		$noaccess = 0;
 		$docs = [];
 		foreach ($resArr as $res) {
-			$document = $dms->getDocument($res["id"]);
-			$document->verifyLastestContentExpriry();
+			if($document = $dms->getDocument($res["id"])) {
+				$document->verifyLastestContentExpriry();
 
-			if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-				$docs[] = $document;
-			} else {
-				$noaccess++;
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$docs[] = $document;
+				} else {
+					$noaccess++;
+				}
 			}
 		}
 		if($this->hasHook('filterList'))

From ec419216916f6c1f50655684c0a03d5935b4e7f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 14 Jan 2021 13:59:20 +0100
Subject: [PATCH 1343/2006] use phrase select_attr instead of
 select_attribute_value

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index c75982e63..7e3d7a26c 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -612,7 +612,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 										else
 											$recs = $dms->getAllAttributeDefinitions(explode(',', $conf['objtype']));
 										if($recs) {
-											echo "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_attribute_value")."\">";
+											echo "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_attrdef")."\" data-no_results_text=\"".getMLText('unknown_attrdef')."\">";
 											if($allowempty)
 												echo "<option value=\"\"></option>";
 											foreach($recs as $rec) {

From 59c59f136a5f69fcfa4a9e1a1641db295633be8d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Jan 2021 07:16:21 +0100
Subject: [PATCH 1344/2006] fix typo in comment

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 9b97f9726..e261466ec 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1089,7 +1089,7 @@ class SeedDMS_Core_DMS {
 	 * @param SeedDMS_Core_User $param1 user
 	 * @param bool $param2 set to true
 	 * if 'ReviewByMe', 'ApproveByMe', 'AppRevByMe', 'ReviseByMe', 'ReceiptByMe'
-	 * shall return even documents І have already taken care of.
+	 * shall return even documents I have already taken care of.
 	 * @param string $param3 sort list by this field
 	 * @param string $param4 order direction
 	 * @return array|bool

From 518eecde18dc1e732cc9d17fae933e4dd345f89c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 18 Jan 2021 08:45:21 +0100
Subject: [PATCH 1345/2006] fix syntax error

---
 SeedDMS_Core/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index b94adbb23..ce6e2b8c0 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -2157,7 +2157,7 @@ SeedDMS_Core_DMS::filterAccess() properly checks for documents
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 better error checking in SeedDMS_Core_Document::cancelCheckOut()
-    </release>
    </notes>
+  </release>
  </changelog>
 </package>

From 363fdf7a1a5e324702848d619a57b214595c2257 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Jan 2021 12:03:34 +0100
Subject: [PATCH 1346/2006] list docs and folder that fail the general object
 check

---
 views/bootstrap/class.ObjectCheck.php | 48 +++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 8078024e4..83972bb73 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -91,9 +91,16 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 		$folder = $this->params['folder'];
 		$repair = $this->params['repair'];
 		$objects = $this->params['repairobjects'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewConverters'];
+		$timeout = $this->params['timeout'];
 
 		$this->contentHeading(getMLText("objectcheck"));
 
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
 		if($objects) {
 			if($repair) {
 				echo "<div class=\"alert\">".getMLText('repairing_objects')."</div>";
@@ -102,15 +109,52 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Bootstrap_Style {
 			print "<thead>\n<tr>\n";
 			print "<th></th>\n";
 			print "<th>".getMLText("name")."</th>\n";
-			print "<th>".getMLText("owner")."</th>\n";
+			print "<th>".getMLText("status")."</th>\n";
+			print "<th>".getMLText("action")."</th>\n";
 			print "<th>".getMLText("error")."</th>\n";
 			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
+			foreach($objects as $object) {
+				if($object['object']->isType('document')) {
+					$document = $object['object'];
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$txt = $this->callHook('documentListItem', $document, $previewer, false);
+						if(is_string($txt))
+							echo $txt;
+						else
+							echo $this->documentListRow($document, $previewer, false);
+					}
+				} elseif($object['object']->isType('documentcontent')) {
+					$document = $object['object']->getDocument();
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						echo $this->documentListRowStart($document);
+						$txt = $this->callHook('documentListItem', $document, $previewer, true, $object['object']->getVersion());
+						if(is_string($txt))
+							echo $txt;
+						else
+							echo $this->documentListRow($document, $previewer, true, $object['object']->getVersion());
+						echo "<td>".$object['msg']."</td>";
+						echo $this->documentListRowEnd($document);
+					}
+				} elseif($object['object']->isType('folder')) {
+					$folder = $object['object'];
+					if($folder->getAccessMode($user) >= M_READ) {
+						echo $this->folderListRowStart($folder);
+						$txt = $this->callHook('folderListItem', $folder, true);
+						if(is_string($txt))
+							echo $txt;
+						else
+							echo $this->folderListRow($folder, true);
+						echo "<td>".$object['msg']."</td>";
+						echo $this->folderListRowEnd($folder);
+					}
+				}
+			}
 			$this->needsrepair = false;
 			print "</tbody></table>\n";
 
 			if($this->needsrepair && $repair == 0) {
-				echo '<p><a href="out.ObjectCheck.php?repair=1">'.getMLText('do_object_repair').'</a></p>';
+				echo '<p><a class="btn btn-primary" href="out.ObjectCheck.php?repair=1">'.getMLText('do_object_repair').'</a></p>';
 			}
 		}
 	} /* }}} */

From a7286be63ad7070448db994fdb5912f3229fc3ae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Jan 2021 15:42:45 +0100
Subject: [PATCH 1347/2006] add a new task for checking the checksum of all
 versions

---
 inc/inc.Tasks.php | 74 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 2 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index c503eebcb..cc4a06abf 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -23,7 +23,7 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		$taskparams = $task->getParameter();
 		$docs = $dms->getDocumentsExpired(intval($taskparams['days']));
 		foreach($docs as $doc) {
-			echo $doc->getName()."\n";
+			echo $doc->getName().PHP_EOL;
 		}
 		return true;
 	}
@@ -63,7 +63,7 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 		$documents = $folder->getDocuments();
 		if($documents) {
 			$lucenesearch = $this->fulltextservice->Search();
-			echo $folder->getFolderPathPlain()."\n";
+			echo $folder->getFolderPathPlain().PHP_EOL;
 			foreach($documents as $document) {
 				echo $document->getId().":".$document->getName()." ";
 				/* If the document wasn't indexed before then just add it */
@@ -181,5 +181,75 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 	}
 } /* }}} */
 
+/**
+ * Class for processing a single folder
+ *
+ * SeedDMS_Task_CheckSum_Process_Folder::process() is used as a callable when
+ * iterating over all folders recursively.
+ */
+class SeedDMS_Task_CheckSum_Process_Folder { /* {{{ */
+	public function __construct() { /* {{{ */
+	} /* }}} */
+
+	public function process($folder) { /* {{{ */
+		$dms = $folder->getDMS();
+		$documents = $folder->getDocuments();
+		if($documents) {
+			foreach($documents as $document) {
+				$versions = $document->getContent();
+				foreach($versions as $version) {
+					if(file_exists($dms->contentDir.$version->getPath())) {
+						$checksum = SeedDMS_Core_File::checksum($dms->contentDir.$version->getPath());
+						if($checksum != $version->getChecksum()) {
+							echo $document->getId().':'.$version->getVersion().' wrong checksum'.PHP_EOL;
+						}
+					} else {
+						echo $document->getId().':'.$version->getVersion().' missing content'.PHP_EOL;
+					}
+				}
+			}
+		}
+	} /* }}} */
+} /* }}} */
+
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  core
+ */
+class SeedDMS_CheckSumTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
+
+	/**
+	 * Run the task
+	 *
+	 * @param $task task to be executed
+	 * @param $dms dms
+	 * @return boolean true if task was executed succesfully, otherwise false
+	 */
+	public function execute($task) {
+		$dms = $this->dms;
+		$taskparams = $task->getParameter();
+		$folder = $dms->getRootFolder();
+
+		$folderprocess = new SeedDMS_Task_CheckSum_Process_Folder();
+		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
+		call_user_func(array($folderprocess, 'process'), $folder);
+
+		return true;
+	}
+
+	public function getDescription() {
+		return 'Check all documents for a propper checksum';
+	}
+
+	public function getAdditionalParams() {
+		return array(
+		);
+	}
+} /* }}} */
+
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = 'SeedDMS_ExpiredDocumentsTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['indexingdocs'] = 'SeedDMS_IndexingDocumentsTask';
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['checksum'] = 'SeedDMS_CheckSumTask';

From d6e652ec45ccb9c766edec791f9e35ac533fbd5a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Jan 2021 15:44:02 +0100
Subject: [PATCH 1348/2006] add changeds for 6.0.15

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 45ad1142e..096b0785e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.15
 --------------------------------------------------------------------------------
+- merge changes up to 5.1.22
+- add a new task for checking the checksum of all document versions
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.14

From 2d4c7b7581d26c621389451ae5fe88faba31961e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Jan 2021 18:06:17 +0100
Subject: [PATCH 1349/2006] fix calculation of checksum

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index cb46c7684..5a585d6f3 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -621,7 +621,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			exit;
 		}
 
-		$checksum = SeedDMS_Core_File::checksum($dms->contentDir, $latestContent->getPath());
+		$checksum = SeedDMS_Core_File::checksum($dms->contentDir.$latestContent->getPath());
 		if($checksum != $latestContent->getChecksum()) {
 			$this->errorMsg(getMLText('wrong_checksum'));
 		}

From 788b5b0014d1e6032c46e88045d9219cc9957abd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Jan 2021 12:01:59 +0100
Subject: [PATCH 1350/2006] escape email address

---
 views/bootstrap/class.RoleMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 1072f4929..d5236366c 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -85,7 +85,7 @@ $(document).ready( function() {
 					echo "<tr>";
 					echo "<td>";
 					echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")";
-					echo "<br /><a href=\"mailto:".$currUser->getEmail()."\">".htmlspecialchars($currUser->getEmail())."</a>";
+					echo "<br /><a href=\"mailto:".htmlspecialchars($currUser->getEmail())."\">".htmlspecialchars($currUser->getEmail())."</a>";
 					if($currUser->getComment())
 						echo "<br /><small>".htmlspecialchars($currUser->getComment())."</small>";
 					echo "</td>";

From 8129221b574430fd890d280761f2491de675734a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Jan 2021 12:02:22 +0100
Subject: [PATCH 1351/2006] escape email address, use translated phrase

---
 views/bootstrap/class.Acl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index 70e830b27..e26379ac6 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -144,7 +144,7 @@ $(document).ready( function() {
 					echo "<tr>";
 					echo "<td>";
 					echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")";
-					echo "<br /><a href=\"mailto:".$currUser->getEmail()."\">".htmlspecialchars($currUser->getEmail())."</a>";
+					echo "<br /><a href=\"mailto:".htmlspecialchars($currUser->getEmail())."\">".htmlspecialchars($currUser->getEmail())."</a>";
 					if($currUser->getComment())
 						echo "<br /><small>".htmlspecialchars($currUser->getComment())."</small>";
 					echo "</td>";
@@ -281,7 +281,7 @@ $(document).ready( function() {
 				echo "<button id=\"add_aro\" class=\"btn btn-primary\" data-roleid=\"".$selrole->getID()."\">".getMLText('add')."</button>";
 			} else {
 ?>
-	<div id="acostree" data-url="out.Acl.php?action=tree&roleid=<?= ($selrole ? $selrole->getID() : 0) ?>">Berechtigungen werden geladen ...</div>
+	<div id="acostree" data-url="out.Acl.php?action=tree&roleid=<?= ($selrole ? $selrole->getID() : 0) ?>"><?= getMLText('data_loading')?></div>
 <?php
 			}
 		}

From 6a3939158b14bdcc093c68e3aad7a81b28cdd972 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 Jan 2021 10:12:42 +0100
Subject: [PATCH 1352/2006] add new notification receiver types, pass recv type
 to notif. service

---
 inc/inc.ClassNotificationService.php |  2 ++
 op/op.CheckInDocument.php            | 20 ++++++++++----------
 op/op.ReviewDocument.php             |  2 +-
 op/op.ReviseDocument.php             | 12 ++++++------
 op/op.SetRecipients.php              |  8 ++++----
 op/op.SetRevisors.php                |  8 ++++----
 6 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index e4d04b4e4..7008acafb 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -45,6 +45,8 @@ class SeedDMS_NotificationService {
 	const RECV_REVIEWER = 3;
 	const RECV_APPROVER = 4;
 	const RECV_WORKFLOW = 5;
+	const RECV_REVISOR = 6;
+	const RECV_RECIPIENT = 7;
 
 	public function __construct($logger = null) {
 		$this->services = array();
diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index b60f4ad92..977352acf 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -284,9 +284,9 @@ else
 			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
+				$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 			}
 
 			if($workflow && $settings->_enableNotificationWorkflow) {
@@ -305,10 +305,10 @@ else
 
 				foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
 					foreach($ntransition->getUsers() as $tuser) {
-						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
+						$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 					}
 					foreach($ntransition->getGroups() as $tuser) {
-						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
+						$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params, SeedDMS_NotificationService::RECV_WORKFLOW);
 					}
 				}
 			}
@@ -329,10 +329,10 @@ else
 					$params['http_root'] = $settings->_httpRoot;
 
 					foreach($reviewers['i'] as $reviewerid) {
-						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params);
+						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 					}
 					foreach($reviewers['g'] as $reviewergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params);
+						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_REVIEWER);
 					}
 				}
 
@@ -350,10 +350,10 @@ else
 					$params['http_root'] = $settings->_httpRoot;
 
 					foreach($approvers['i'] as $approverid) {
-						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params);
+						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 					}
 					foreach($approvers['g'] as $approvergrpid) {
-						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params);
+						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
 					}
 				}
 			}
@@ -418,9 +418,9 @@ else
 					$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 					$params['sitename'] = $settings->_siteName;
 					$params['http_root'] = $settings->_httpRoot;
-					$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+					$notifier->toList($user, $notifyList["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 					foreach ($notifyList["groups"] as $grp) {
-						$notifier->toGroup($user, $grp, $subject, $message, $params);
+						$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 					}
 				}
 			} else {
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index b28be8864..9aa02d8e4 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -123,7 +123,7 @@ if ($_POST["reviewType"] == "ind" || $_POST["reviewType"] == "grp") {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index 5b43e6d0d..1a18c0360 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -112,11 +112,11 @@ if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
-		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 }
 
@@ -136,11 +136,11 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
 		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
-		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params);
+		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 }
 
diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 5ad1bca18..69d77fa45 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -141,7 +141,7 @@ foreach ($pIndRev as $p) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
-								$notifier->toIndividual($user, $accessIndex["i"][$p], $subject, $message, $params);
+								$notifier->toIndividual($user, $accessIndex["i"][$p], $subject, $message, $params, SeedDMS_NotificationService::RECV_RECIPIENT);
 							}
 						}
 						break;
@@ -200,7 +200,7 @@ if (count($receiptIndex["i"]) > 0) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
-								$notifier->toIndividual($user, $accessIndex["i"][$rx], $subject, $message, $params);
+								$notifier->toIndividual($user, $accessIndex["i"][$rx], $subject, $message, $params, SeedDMS_NotificationService::RECV_RECIPIENT);
 							}
 						}
 						break;
@@ -248,7 +248,7 @@ foreach ($pGrpRev as $p) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
-								$notifier->toGroup($user, $accessIndex["g"][$p], $subject, $message, $params);
+								$notifier->toGroup($user, $accessIndex["g"][$p], $subject, $message, $params, SeedDMS_NotificationService::RECV_RECIPIENT);
 							}
 						}
 						break;
@@ -303,7 +303,7 @@ if (count($receiptIndex["g"]) > 0) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
-								$notifier->toGroup($user, $accessIndex["g"][$rx], $subject, $message, $params);
+								$notifier->toGroup($user, $accessIndex["g"][$rx], $subject, $message, $params, SeedDMS_NotificationService::RECV_RECIPIENT);
 							}
 						}
 						break;
diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 8314c506c..087b2eb27 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -139,7 +139,7 @@ foreach ($pIndRev as $p) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
-								$notifier->toIndividual($user, $accessIndex["i"][$p], $subject, $message, $params);
+								$notifier->toIndividual($user, $accessIndex["i"][$p], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVISOR);
 							}
 						}
 						break;
@@ -198,7 +198,7 @@ if (count($revisionIndex["i"]) > 0) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 								
-								$notifier->toIndividual($user, $accessIndex["i"][$rx], $subject, $message, $params);
+								$notifier->toIndividual($user, $accessIndex["i"][$rx], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVISOR);
 							}
 						}
 						break;
@@ -246,7 +246,7 @@ foreach ($pGrpRev as $p) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
-								$notifier->toGroup($user, $accessIndex["g"][$p], $subject, $message, $params);
+								$notifier->toGroup($user, $accessIndex["g"][$p], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVISOR);
 							}
 						}
 						break;
@@ -301,7 +301,7 @@ if (count($revisionIndex["g"]) > 0) {
 								$params['sitename'] = $settings->_siteName;
 								$params['http_root'] = $settings->_httpRoot;
 							
-								$notifier->toGroup($user, $accessIndex["g"][$rx], $subject, $message, $params);
+								$notifier->toGroup($user, $accessIndex["g"][$rx], $subject, $message, $params, SeedDMS_NotificationService::RECV_REVISOR);
 							}
 						}
 						break;

From aa8290e03bdb8e9a5ffd4467ebc9ac4e66aae6b5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 Jan 2021 14:19:44 +0100
Subject: [PATCH 1353/2006] add searching fro revision date

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 25 +++++++++++++++++++++++--
 SeedDMS_Core/package.xml           |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index e261466ec..2e4d7368c 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1959,8 +1959,9 @@ class SeedDMS_Core_DMS {
 	 */
 	function search($query, $limit=0, $offset=0, $logicalmode='AND', $searchin=array(), $startFolder=null, $owner=null, $status = array(), $creationstartdate=array(), $creationenddate=array(), $modificationstartdate=array(), $modificationenddate=array(), $categories=array(), $attributes=array(), $mode=0x3, $expirationstartdate=array(), $expirationenddate=array(), $reception=array()) { /* {{{ */
 		$orderby = '';
+		$revisionstartdate = $revisionenddate = '';
 		if(is_array($query)) {
-			foreach(array('limit', 'offset', 'logicalmode', 'searchin', 'startFolder', 'owner', 'status', 'creationstartdate', 'creationenddate', 'modificationstartdate', 'modificationenddate', 'categories', 'attributes', 'mode', 'expirationstartdate', 'expirationenddate', 'reception') as $paramname)
+			foreach(array('limit', 'offset', 'logicalmode', 'searchin', 'startFolder', 'owner', 'status', 'creationstartdate', 'creationenddate', 'modificationstartdate', 'modificationenddate', 'categories', 'attributes', 'mode', 'revisionstartdate', 'revisionenddate', 'expirationstartdate', 'expirationenddate', 'reception') as $paramname)
 				${$paramname} = isset($query[$paramname]) ? $query[$paramname] : ${$paramname};
 			foreach(array('orderby') as $paramname)
 				${$paramname} = isset($query[$paramname]) ? $query[$paramname] : '';
@@ -2264,6 +2265,23 @@ class SeedDMS_Core_DMS {
 					$searchCreateDate .= "`tblDocumentContent`.`date` <= ".$stopdate;
 				}
 			}
+			$searchRevisionDate = "";
+			if ($revisionstartdate) {
+				$startdate = $revisionstartdate['year'].'-'.$revisionstartdate["month"].'-'.$revisionstartdate["day"];
+				if ($startdate) {
+					if($searchRevisionDate)
+						$searchRevisionDate .= " AND ";
+					$searchRevisionDate .= "`tblDocumentContent`.`revisiondate` >= '".$startdate."'";
+				}
+			}
+			if ($revisionenddate) {
+				$stopdate = $revisionenddate["year"].'-'.$revisionenddate["month"].'-'.$revisionenddate["day"];
+				if ($stopdate) {
+					if($searchRevisionDate)
+						$searchRevisionDate .= " AND ";
+					$searchRevisionDate .= "`tblDocumentContent`.`revisiondate` <= '".$stopdate."'";
+				}
+			}
 			$searchExpirationDate = '';
 			if ($expirationstartdate) {
 				$startdate = SeedDMS_Core_DMS::makeTimeStamp($expirationstartdate['hour'], $expirationstartdate['minute'], $expirationstartdate['second'], $expirationstartdate['year'], $expirationstartdate["month"], $expirationstartdate["day"]);
@@ -2330,6 +2348,9 @@ class SeedDMS_Core_DMS {
 			if (strlen($searchCreateDate)>0) {
 				$searchQuery .= " AND (".$searchCreateDate.")";
 			}
+			if (strlen($searchRevisionDate)>0) {
+				$searchQuery .= " AND (".$searchRevisionDate.")";
+			}
 			if (strlen($searchExpirationDate)>0) {
 				$searchQuery .= " AND (".$searchExpirationDate.")";
 			}
@@ -2363,7 +2384,7 @@ class SeedDMS_Core_DMS {
 				}
 			}
 
-			if($searchKey || $searchOwner || $searchCategories || $searchCreateDate || $searchExpirationDate || $searchAttributes || $status || $reception) {
+			if($searchKey || $searchOwner || $searchCategories || $searchCreateDate || $searchRevisionDate || $searchExpirationDate || $searchAttributes || $status || $reception) {
 				// Count the number of rows that the search will produce.
 				$resArr = $this->db->getResultArray("SELECT COUNT(*) AS num FROM (SELECT DISTINCT `tblDocuments`.`id` ".$searchQuery.") a");
 				$totalDocs = 0;
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 91c7d489c..7e6aecfc9 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- no changes, just keep same version as seeddms application
+- add searching for revision date
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 780be78d36daef0305bbb7e8313f68bded084cf2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 Jan 2021 14:20:05 +0100
Subject: [PATCH 1354/2006] add searching for revision date

---
 out/out.Search.php               | 32 ++++++++++++++++++++++++++++++++
 views/bootstrap/class.Search.php | 22 ++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/out/out.Search.php b/out/out.Search.php
index 744d6cfd4..09e54760f 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -360,6 +360,33 @@ if(((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext
 		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
 	}
 
+	$revisionstartdate = array();
+	$revisionstopdate = array();
+	if (isset($_GET["revisiondate"]) && $_GET["revisiondate"]!=null) {
+		$revisiondate = true;
+	} else {
+		$revisiondate = false;
+	}
+
+	if(isset($_GET["revisionstart"]) && $_GET["revisionstart"]) {
+		$tmp = explode("-", $_GET["revisionstart"]);
+		$revisionstartdate = array('year'=>(int)$tmp[0], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[2], 'hour'=>0, 'minute'=>0, 'second'=>0);
+		if (!checkdate($revisionstartdate['month'], $revisionstartdate['day'], $revisionstartdate['year'])) {
+			UI::exitError(getMLText("search"),getMLText("invalid_revision_date_start"));
+		}
+	} else {
+		$revisionstartdate = array();
+	}
+	if(isset($_GET["revisionend"]) && $_GET["revisionend"]) {
+		$tmp = explode("-", $_GET["revisionend"]);
+		$revisionstopdate = array('year'=>(int)$tmp[0], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[2], 'hour'=>0, 'minute'=>0, 'second'=>0);
+		if (!checkdate($revisionstopdate['month'], $revisionstopdate['day'], $revisionstopdate['year'])) {
+			UI::exitError(getMLText("search"),getMLText("invalid_revision_date_end"));
+		}
+	} else {
+		$revisionstopdate = array();
+	}
+
 	$expstartdate = array();
 	$expstopdate = array();
 	if (isset($_GET["expirationdate"]) && $_GET["expirationdate"]!=null) {
@@ -498,6 +525,8 @@ if(((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext
 		'mode'=>$resultmode,
 		'expirationstartdate'=>$expirationdate ? $expstartdate : array(),
 		'expirationenddate'=>$expirationdate ? $expstopdate : array(),
+		'revisionstartdate'=>$revisiondate ? $revisionstartdate : array(),
+		'revisionenddate'=>$revisiondate ? $revisionstopdate : array(),
 		'reception'=>$reception,
 		'orderby'=>$orderby
 	));
@@ -584,10 +613,13 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('owner', $owner);
 		$view->setParam('startdate', isset($startdate) ? $startdate : array());
 		$view->setParam('stopdate', isset($stopdate) ? $stopdate : array());
+		$view->setParam('revisionstartdate', isset($revisionstartdate) ? $revisionstartdate : array());
+		$view->setParam('revisionstopdate', isset($revisionstopdate) ? $revisionstopdate : array());
 		$view->setParam('expstartdate', isset($expstartdate) ? $expstartdate : array());
 		$view->setParam('expstopdate', isset($expstopdate) ? $expstopdate : array());
 		$view->setParam('creationdate', isset($creationdate) ? $creationdate : '');
 		$view->setParam('expirationdate', isset($expirationdate) ? $expirationdate: '');
+		$view->setParam('revisiondate', isset($revisiondate) ? $revisiondate: '');
 		$view->setParam('status', isset($status) ? $status : array());
 		$view->setParam('categories', isset($categories) ? $categories : '');
 		$view->setParam('category', isset($categorynames) ? $categorynames : '');
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 9db55688d..aac2fdba6 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -189,8 +189,11 @@ function typeahead() { /* {{{ */
 		$stopdate = $this->params['stopdate'];
 		$expstartdate = $this->params['expstartdate'];
 		$expstopdate = $this->params['expstopdate'];
+		$revisionstartdate = $this->params['revisionstartdate'];
+		$revisionstopdate = $this->params['revisionstopdate'];
 		$creationdate = $this->params['creationdate'];
 		$expirationdate = $this->params['expirationdate'];
+		$revisiondate = $this->params['revisiondate'];
 		$status = $this->params['status'];
 		$this->query = $this->params['query'];
 		$orderby = $this->params['orderby'];
@@ -366,6 +369,8 @@ function typeahead() { /* {{{ */
 			$openfilterdlg = true;
 		if($expirationdate)
 			$openfilterdlg = true;
+		if($revisiondate)
+			$openfilterdlg = true;
 		if($reception)
 			$openfilterdlg = true;
 ?>
@@ -465,6 +470,23 @@ function typeahead() { /* {{{ */
         </span>
 </td>
 </tr>
+<tr>
+<td><?php printMLText("revision");?>:</td>
+<td>
+        <label class="checkbox inline">
+				  <input type="checkbox" name="revisiondate" value="true" <?php if($revisiondate) echo "checked"; ?>/><?php printMLText("between");?>
+        </label><br />
+        <span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span4" size="16" name="revisionstart" type="text" value="<?php if($revisionstartdate) printf("%04d-%02d-%02d", $revisionstartdate['year'], $revisionstartdate['month'], $revisionstartdate['day']); else echo date('Y-m-d'); ?>">
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
+        </span>&nbsp;
+				<?php printMLText("and"); ?>
+        <span class="input-append date" style="display: inline;" id="revisionenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span4" size="16" name="revisionend" type="text" value="<?php if($revisionstopdate) printf("%04d-%02d-%02d", $revisionstopdate['year'], $revisionstopdate['month'], $revisionstopdate['day']); else echo date('Y-m-d'); ?>">
+          <span class="add-on"><i class="fa fa-calendar"></i></span>
+        </span>
+</td>
+</tr>
 <?php
 		if($attrdefs) {
 			foreach($attrdefs as $attrdef) {

From f1f574c412fecbc0b4b31377b533c5f622eb8620 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 Jan 2021 14:20:36 +0100
Subject: [PATCH 1355/2006] add changes for 6.0.15

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index c2201c8fa..bbbf8e3de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.22
 - add a new task for checking the checksum of all document versions
+- add searching for revision date
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.14

From c5247b8abf8e45ec8b114ed1a17d60e4c6bcdac8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 30 Jan 2021 15:04:12 +0100
Subject: [PATCH 1356/2006] escape owner name and email

---
 views/bootstrap/class.TimelineFeed.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
index 0e0f7b9da..41bd71efb 100644
--- a/views/bootstrap/class.TimelineFeed.php
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -78,7 +78,7 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
 		$feed->setChannelElement('pubDate', date(\DATE_RSS, strtotime('2013-04-06')));
 		// You can add additional link elements, e.g. to a PubSubHubbub server with custom relations.
 		// It's recommended to provide a backlink to the feed URL.
-		$feed->setSelfLink($baseurl.'out/out.Feed.php');
+		$feed->setSelfLink($baseurl.'out/out.TimelineFeed.php');
 //		$feed->setAtomLink('http://pubsubhubbub.appspot.com', 'hub');
 		// You can add more XML namespaces for more custom channel elements which are not defined
 		// in the RSS 2 specification. Here the 'creativeCommons' element is used. There are much more
@@ -122,7 +122,7 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
 					$newItem->setLink($baseurl.'out/out.ViewDocument.php?documentid='.$doc->getID());
 					$newItem->setDescription("<h2>".$item['msg']."</h2>".
 						"<p>".getMLText('comment').": <b>".$doc->getComment()."</b></p>".
-						"<p>".getMLText('owner').": <b><a href=\"mailto:".$owner->getEmail()."\">".$owner->getFullName()."</a></b></p>".
+						"<p>".getMLText('owner').": <b><a href=\"mailto:".htmlspecialchars($owner->getEmail())."\">".htmlspecialchars($owner->getFullName())."</a></b></p>".
 						"<p>".getMLText("creation_date").": <b>".getLongReadableDate($doc->getDate())."</p>"
 					);
 					$newItem->setDate(date('c', $d));

From 82784f4aedd894a76d6b125d27b4bc937786774e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 30 Jan 2021 15:40:19 +0100
Subject: [PATCH 1357/2006] set guid to whole url

---
 views/bootstrap/class.TimelineFeed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
index 41bd71efb..4b49aac23 100644
--- a/views/bootstrap/class.TimelineFeed.php
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -127,7 +127,7 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
 					);
 					$newItem->setDate(date('c', $d));
 					$newItem->setAuthor($owner->getFullName(), $owner->getEmail());
-					$newItem->setId('out/out.ViewDocument.php?documentid='.$doc->getID(), true);
+					$newItem->setId($baseurl.'out/out.ViewDocument.php?documentid='.$doc->getID()."&kkk=".$classname, true);
 					if(!empty($item['version'])) {
 						$version = $doc->getContentByVersion($item['version']);
 						$previewer->createPreview($version);

From 60250927937eebb11f9f02814a1dfe943b0e28df Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 Feb 2021 13:07:57 +0100
Subject: [PATCH 1358/2006] set url of notification mail

---
 op/op.ReviewDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 9aa02d8e4..445fe4dea 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -170,6 +170,7 @@ if ($newdocstatus['status'] == S_DRAFT_APP) {
 			$params['username'] = $user->getFullName();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
+			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			foreach ($docApprovalStatus as $dastat) {
 			
 				if ($dastat["status"] == 0) {

From 9186cf66c3f510469aa655855cd026405de6e757 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 5 Feb 2021 07:28:46 +0100
Subject: [PATCH 1359/2006] expired documents can be skipped from counting in
 countTasks()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 65a4555d9..f3ee04941 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -927,7 +927,7 @@ class SeedDMS_Core_DMS {
 	 * @param object $user user
 	 * @return array list of documents records
 	 */
-	function countTasks($listtype, $user=null) { /* {{{ */
+	function countTasks($listtype, $user=null, $param5=true) { /* {{{ */
 		if (!$this->db->createTemporaryTable("ttstatid") || !$this->db->createTemporaryTable("ttcontentid")) {
 			return false;
 		}
@@ -958,7 +958,10 @@ class SeedDMS_Core_DMS {
 				$queryStr .= "OR `tblDocumentReviewers`.`type` = 1 AND `tblDocumentReviewers`.`required` IN (".implode(',', $groups).") ";
 			$queryStr .= ") ";
 			$queryStr .= "AND `tblDocumentReviewLog`.`status` = 0 ";
-			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_EXPIRED.") ";
+			$docstatarr = array(S_DRAFT_REV);
+			if($param5)
+				$docstatarr[] = S_EXPIRED;
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".implode(',', $docstatarr).") ";
 			break; /* }}} */
 		case 'ApproveByMe': // Documents I have to approve {{{
 			if (!$this->db->createTemporaryTable("ttapproveid")) {
@@ -976,7 +979,10 @@ class SeedDMS_Core_DMS {
 				$queryStr .= ") ";
 			}
 			$queryStr .= "AND `tblDocumentApproveLog`.`status` = 0 ";
-			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_APP.", ".S_EXPIRED.") ";
+			$docstatarr = array(S_DRAFT_APP);
+			if($param5)
+				$docstatarr[] = S_EXPIRED;
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".implode(',', $docstatarr).") ";
 			break; /* }}} */
 		case 'ReceiptByMe': // Documents I have to receipt {{{
 			if (!$this->db->createTemporaryTable("ttreceiptid")) {

From 445664ed533e1793d1e1b5126edaef1e46f48ede Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 5 Feb 2021 07:30:00 +0100
Subject: [PATCH 1360/2006] do not count expired documents in task list anymore

---
 views/bootstrap/class.Tasks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index fc489b9a0..db4682b34 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -56,7 +56,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
 			if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {
 				$tasks['approval'] = array();
-				$resArr = $dms->getDocumentList('ApproveByMe', $user);
+				$resArr = $dms->getDocumentList('ApproveByMe', $user, false, '', '', false);
 				if($resArr) {
 					$docs = array();
 					foreach ($resArr as $res) {
@@ -74,7 +74,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		if($workflowmode == 'traditional')
 			if(!$tasksinmenu || in_array('review', $tasksinmenu)) {
 				$tasks['review'] = array();
-				$resArr = $dms->getDocumentList('ReviewByMe', $user);
+				$resArr = $dms->getDocumentList('ReviewByMe', $user, false, '', '', false);
 				if($resArr) {
 					$docs = array();
 					foreach ($resArr as $res) {

From 2f23a09f24afaf1af76c8ddd82cf86fda066583c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 5 Feb 2021 07:31:47 +0100
Subject: [PATCH 1361/2006] update changes for 6.0.15

---
 CHANGELOG                | 2 ++
 SeedDMS_Core/package.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index f08f7a941..2dfb99505 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@
 - merge changes up to 5.1.22
 - add a new task for checking the checksum of all document versions
 - add searching for revision date
+- list of open tasks will no longer contain expired documents but MyDocuments
+  page still list them
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.14
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index e697cbe67..5f1981faa 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - add searching for revision date
+- expired documents can be skipped from counting in countTasks()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 531e11ce57e353889b5ba6d9b543c69184e01275 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 5 Feb 2021 14:22:04 +0100
Subject: [PATCH 1362/2006] pass document status to notification

---
 op/op.ReviseDocument.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index 1a18c0360..417d20b15 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -97,6 +97,7 @@ if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
 
+$newdocstatus = $content->getStatus();
 if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
 	if($notifier) {
 		$nl=$document->getNotifyList();
@@ -121,7 +122,6 @@ if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
 }
 
 /* Send notification about status change only if status has actually changed */
-$newdocstatus = $content->getStatus();
 if($olddocstatus['status'] != $newdocstatus['status']) {
 	// Send notification to subscribers.
 	if($notifier) {
@@ -131,7 +131,8 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params = array();
 		$params['name'] = $document->getName();
 		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['status'] = getRevisionStatusText(S_REJECTED);
+		$params['status'] = getOverallStatusText($newdocstatus['status']);
+		$params['new_status_code'] = $newdocstatus['status'];
 		$params['username'] = $user->getFullName();
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;

From d53318b91776649d69becf6931b90cae005e3777 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Feb 2021 18:55:18 +0100
Subject: [PATCH 1363/2006] set recvtyp to NOTIFICATION approval_submit
 notification

---
 op/op.ApproveDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index f3e05afaf..7603da67e 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -128,9 +128,9 @@ if ($_POST["approvalType"] == "ind" || $_POST["approvalType"] == "grp") {
 
 		// Send notification to subscribers.
 		$nl=$document->getNotifyList();
-		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
 	}
 }

From 7696dc66b85f5eb3c171a02b6e90fd0d553fdd23 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Feb 2021 09:18:21 +0100
Subject: [PATCH 1364/2006] no need to init task lists

---
 views/bootstrap/class.Tasks.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index db4682b34..6c221f249 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -44,6 +44,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$workflowmode = $this->params['workflowmode'];
 		$tasksinmenu = $this->params['tasksinmenu'];
 		$tasks = array();
+/*
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$tasks['approval'] = array();
 			if($workflowmode == 'traditional')
@@ -52,6 +53,7 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$tasks['workflow'] = array();
 		$tasks['rejected'] = array();
 		$tasks['checkedout'] = array();
+*/
 
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval')
 			if(!$tasksinmenu || in_array('approval', $tasksinmenu)) {

From e68608bf04ea03c4a530f1ea7f5fd780d8eaee24 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Feb 2021 09:18:38 +0100
Subject: [PATCH 1365/2006] check for tasks in all possible lists

---
 styles/bootstrap/application.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 36cf1c3da..6598719f8 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -1287,7 +1287,7 @@ $(document).ready(function() { /* {{{ */
 }); /* }}} */
 
 (function( SeedDMSTask, $, undefined ) { /* {{{ */
-	var approval_count, review_count, workflow_count;
+	var approval_count, review_count, workflow_count, receipt_count, revision_count, needscorrection_count, rejected_count, checkedout_count;
 	var timeout = 1000;
 	var counter = 0;
 	var tasks = Array(
@@ -1301,11 +1301,21 @@ $(document).ready(function() { /* {{{ */
 						if(data) {
 							if((typeof data.data.approval != 'undefined' && approval_count != data.data.approval.length) ||
 								 (typeof data.data.review != 'undefined' && review_count != data.data.review.length) ||
+								 (typeof data.data.receipt != 'undefined' && receipt_count != data.data.receipt.length) ||
+								 (typeof data.data.revision != 'undefined' && revision_count != data.data.revision.length) ||
+								 (typeof data.data.needscorrection != 'undefined' && needscorrection_count != data.data.needscorrection.length) ||
+								 (typeof data.data.rejected != 'undefined' && rejected_count != data.data.rejected.length) ||
+								 (typeof data.data.checkedout != 'undefined' && checkedout_count != data.data.checkedout.length) ||
 								 (typeof data.data.workflow != 'undefined' && workflow_count != data.data.workflow.length)) {
 		//						$("#menu-tasks").html('Loading').hide().load('../out/out.Tasks.php?action=menutasks').fadeIn('500')
 								$('#menu-tasks > div.ajax').trigger('update', {folderid: seeddms_folder});
 								approval_count = typeof data.data.approval != 'undefined' ? data.data.approval.length : 0;
 								review_count = typeof data.data.review != 'undefined' ? data.data.review.length : 0;
+								receipt_count = typeof data.data.receipt != 'undefined' ? data.data.receipt.length : 0;
+								revision_count = typeof data.data.revision != 'undefined' ? data.data.revision.length : 0;
+								needscorrection_count = typeof data.data.needscorrection != 'undefined' ? data.data.needscorrection.length : 0;
+								rejected_count = typeof data.data.rejected != 'undefined' ? data.data.rejected.length : 0;
+								checkedout_count = typeof data.data.checkedout != 'undefined' ? data.data.checkedout.length : 0;
 								workflow_count = typeof data.data.workflow != 'undefined' ? data.data.workflow.length : 0;
 							}
 						}

From 7d93bccee6a1dc18a29265720a68554679bf2a48 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 9 Feb 2021 11:09:02 +0100
Subject: [PATCH 1366/2006] replace old table layout

---
 views/bootstrap/class.ReviseDocument.php | 50 ++++++++++++------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index a841d0cc9..f073ca835 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -128,31 +128,33 @@ $(document).ready(function() {
 			print "</tr></tbody></table><br>\n";
 		}
 ?>
-	<form method="post" action="../op/op.ReviseDocument.php" id="form<?= $revisiontype ?>" name="form<?= $revisiontype ?>">
+	<form class="form-horizontal" method="post" action="../op/op.ReviseDocument.php" id="form<?= $revisiontype ?>" name="form<?= $revisiontype ?>">
 	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("comment")?>:</td>
-			<td><textarea name="comment" cols="80" rows="4"></textarea></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("revision_status")?>:</td>
-			<td>
-				<select name="revisionStatus">
-<?php if($revisionStatus['status'] != 1) { ?>
-					<option value='1'><?php printMLText("status_revised")?></option>
-<?php } ?>
-<?php if($revisionStatus['status'] != -1) { ?>
-					<option value='-1'><?php printMLText("status_needs_correction")?></option>
-<?php } ?>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td><input type='submit' class="btn" name='<?= $revisiontype ?>Revision' value='<?php printMLText("submit_revision")?>'/></td>
-		</tr>
-	</table>
+<?php
+		$this->formField(
+			getMLText("comment"),
+			array(
+				'element'=>'textarea',
+				'name'=>'comment',
+				'rows'=>4,
+				'cols'=>80
+			)
+		);
+		$options = array();
+		if($revisionStatus['status'] != 1)
+			$options[] = array('1', getMLText("status_revised"));
+		if($revisionStatus['status'] != -1)
+			$options[] = array('-1', getMLText("status_needs_correction"));
+		$this->formField(
+			getMLText("revision_status"),
+			array(
+				'element'=>'select',
+				'name'=>'revisionStatus',
+				'options'=>$options,
+			)
+		);
+		$this->formSubmit(getMLText('submit_revision'), $revisiontype.'Revision');
+?>
 	<input type='hidden' name='revisionType' value='<?= $revisiontype ?>'/>
 	<?php if($revisiontype == 'grp'): ?>
 	<input type='hidden' name='revisionGroup' value='<?php echo $revisionStatus['required']; ?>'/>

From 3931227789c197d98f8602affe13162141e9f1ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 10 Feb 2021 15:36:52 +0100
Subject: [PATCH 1367/2006] set new/old status code in notification mail, fix
 sending mail

---
 op/op.ApproveDocument.php       | 7 ++++---
 op/op.OverrideContentStatus.php | 2 +-
 op/op.ReviewDocument.php        | 5 +++--
 op/op.ReviseDocument.php        | 7 ++++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 7603da67e..abdd3c876 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -89,7 +89,7 @@ if($_FILES["approvalfile"]["tmp_name"]) {
 }
 
 $controller->setParam('document', $document);
-$controller->setParam('content', $latestContent);
+$controller->setParam('content', $content);
 $controller->setParam('approvalstatus', $_POST["approvalStatus"]);
 $controller->setParam('approvaltype', $_POST["approvalType"]);
 if ($_POST["approvalType"] == "grp") {
@@ -147,8 +147,9 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params = array();
 		$params['name'] = $document->getName();
 		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['status'] = getOverallStatusText($status);
-		$params['new_status_code'] = $status;
+		$params['status'] = getOverallStatusText($olddocstatus['status']).' → '.getOverallStatusText($newdocstatus['status']);
+		$params['new_status_code'] = $newdocstatus['status'];
+		$params['old_status_code'] = $olddocstatus['status'];
 		$params['comment'] = $document->getComment();
 		$params['username'] = $user->getFullName();
 		$params['sitename'] = $settings->_siteName;
diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php
index 9f2193aa7..1c52e2d43 100644
--- a/op/op.OverrideContentStatus.php
+++ b/op/op.OverrideContentStatus.php
@@ -94,7 +94,7 @@ if ($overrideStatus != $overallStatus["status"]) {
 			$params = array();
 			$params['name'] = $document->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['status'] = getOverallStatusText($overrideStatus);
+			$params['status'] = getOverallStatusText($overallStatus['status']).' → '.getOverallStatusText($overrideStatus);
 			$params['new_status_code'] = $overrideStatus;
 			$params['old_status_code'] = $overallStatus["status"];
 			$params['username'] = $user->getFullName();
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index d73339ef2..4d96d1321 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -142,8 +142,9 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params = array();
 		$params['name'] = $document->getName();
 		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['status'] = getReviewStatusText(S_REJECTED);
-		$params['new_status_code'] = S_REJECTED;
+		$params['status'] = getOverallStatusText($olddocstatus['status']).' → '.getReviewStatusText($newdocstatus['status']);
+		$params['new_status_code'] = $newdocstatus['status'];
+		$params['old_status_code'] = $olddocstatus['status'];
 		$params['username'] = $user->getFullName();
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index 417d20b15..b303124fd 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -82,7 +82,7 @@ if (!isset($_POST["revisionStatus"]) || !is_numeric($_POST["revisionStatus"]) ||
 }
 
 $controller->setParam('document', $document);
-$controller->setParam('content', $latestContent);
+$controller->setParam('content', $content);
 $controller->setParam('revisionstatus', $_POST["revisionStatus"]);
 $controller->setParam('revisiontype', $_POST["revisionType"]);
 if ($_POST["revisionType"] == "grp") {
@@ -97,7 +97,6 @@ if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
 
-$newdocstatus = $content->getStatus();
 if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
 	if($notifier) {
 		$nl=$document->getNotifyList();
@@ -122,6 +121,7 @@ if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
 }
 
 /* Send notification about status change only if status has actually changed */
+$newdocstatus = $content->getStatus();
 if($olddocstatus['status'] != $newdocstatus['status']) {
 	// Send notification to subscribers.
 	if($notifier) {
@@ -131,8 +131,9 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		$params = array();
 		$params['name'] = $document->getName();
 		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['status'] = getOverallStatusText($newdocstatus['status']);
+		$params['status'] = getOverallStatusText($olddocstatus['status']).' → '.getOverallStatusText($newdocstatus['status']);
 		$params['new_status_code'] = $newdocstatus['status'];
+		$params['old_status_code'] = $olddocstatus['status'];
 		$params['username'] = $user->getFullName();
 		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 		$params['sitename'] = $settings->_siteName;

From 68a16ce3723c0160cf8fbce0038bac08550b1338 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Feb 2021 08:36:07 +0100
Subject: [PATCH 1368/2006] SeedDMS_Core_DMS::getDocumentList() uses ambiguous
 column name when sorting by status

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 8 ++++----
 SeedDMS_Core/package.xml           | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index f3ee04941..0eb979fa0 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1244,7 +1244,7 @@ class SeedDMS_Core_DMS {
 				$queryStr .= " AND `tblDocumentReviewLog`.`status` = 0 ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
-			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
 			else $queryStr .= "ORDER BY `name`";
 			$queryStr .= " ".$orderdir;
 			} else {
@@ -1326,7 +1326,7 @@ class SeedDMS_Core_DMS {
 				$queryStr .= " AND `tblDocumentApproveLog`.`status` = 0 ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
-			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
 			else $queryStr .= "ORDER BY `name`";
 			$queryStr .= " ".$orderdir;
 			} else {
@@ -1405,7 +1405,7 @@ class SeedDMS_Core_DMS {
 				$queryStr .= " AND `tblDocumentReceiptLog`.`status` = 0 ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
-			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
 			else $queryStr .= "ORDER BY `name`";
 			$queryStr .= " ".$orderdir;
 			} else {
@@ -1479,7 +1479,7 @@ class SeedDMS_Core_DMS {
 				$queryStr .= " AND `tblDocumentRevisionLog`.`status` = 0 ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
-			else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
 			else $queryStr .= "ORDER BY `name`";
 			$queryStr .= " ".$orderdir;
 			} else {
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 6497995af..545cce176 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2021-01-27</date>
+ <date>2021-02-11</date>
  <time>13:44:55</time>
  <version>
   <release>6.0.15</release>
@@ -26,6 +26,7 @@
  <notes>
 - add searching for revision date
 - expired documents can be skipped from counting in countTasks()
+- SeedDMS_Core_DMS::getDocumentList() uses ambiguous column name when sorting by status
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 0d43c618cd63ed19e4cf6be34831c76cc43b698d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Feb 2021 12:23:35 +0100
Subject: [PATCH 1369/2006] getCurrentDatetime() takes parameter for day offset

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 633591aed..72cf07f5a 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -1013,16 +1013,25 @@ class SeedDMS_Core_DatabaseAccess {
 	 *
 	 * @return string sql code
 	 */
-	function getCurrentDatetime() { /* {{{ */
+	function getCurrentDatetime($dayoffset=0) { /* {{{ */
 		switch($this->_driver) {
 			case 'mysql':
-				return "CURRENT_TIMESTAMP";
+				if($dayoffset)
+					return "DATE_ADD(CURRENT_TIMESTAMP, INTERVAL ".$dayoffset." DAY)";
+				else
+					return "CURRENT_TIMESTAMP";
 				break;
 			case 'sqlite':
-				return "datetime('now', 'localtime')";
+				if($dayoffset)
+					return "datetime('now', '".$dayoffset." days', 'localtime')";
+				else
+					return "datetime('now', 'localtime')";
 				break;
 			case 'pgsql':
-				return "now()";
+				if($dayoffset)
+					return "now() + interval '".$dayoffset." day'";
+				else
+					return "now()";
 				break;
 		}
 		return '';

From 5ac51f3c896a6294808f7afdd380da0da1990841 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 11 Feb 2021 12:24:07 +0100
Subject: [PATCH 1370/2006] getDocumentList() can return sleeping revision

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 55 ++++++++++++++++++++++++++++++
 SeedDMS_Core/package.xml           |  1 +
 2 files changed, 56 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 0eb979fa0..c2cab5eba 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1020,6 +1020,25 @@ class SeedDMS_Core_DMS {
 			$queryStr .= "AND `tblDocumentRevisionLog`.`status` = 0 ";
 			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_IN_REVISION.") ";
 			break; /* }}} */
+		case 'SleepingReviseByMe': // Documents I have to receipt {{{
+			if (!$this->db->createTemporaryTable("ttrevisionid")) {
+				return false;
+			}
+			$queryStr .=
+				"LEFT JOIN `tblDocumentRevisors` on `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` ".
+				"LEFT JOIN `ttrevisionid` ON `ttrevisionid`.`revisionID` = `tblDocumentRevisors`.`revisionID` ".
+				"LEFT JOIN `tblDocumentRevisionLog` ON `tblDocumentRevisionLog`.`revisionLogID`=`ttrevisionid`.`maxLogID` ";
+
+			if($user) {
+				$queryStr .= "WHERE (`tblDocumentRevisors`.`type` = 0 AND `tblDocumentRevisors`.`required` = ".$user->getID()." ";
+				if($groups)
+					$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).") ";
+				$queryStr .= ") ";
+			}
+			$queryStr .= "AND `tblDocumentContent`.`revisiondate` IS NOT NULL AND `tblDocumentContent`.`revisiondate` <= ".$this->db->getCurrentDatetime(14)." ";
+			$queryStr .= "AND `tblDocumentRevisionLog`.`status` = -3 ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_RELEASED.") ";
+			break; /* }}} */
 		case 'NeedsCorrectionOwner': // Documents that need to be corrected {{{
 			$queryStr .=
 				"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `ttcontentid`.`document` ";
@@ -1519,6 +1538,42 @@ class SeedDMS_Core_DMS {
 			}
 			}
 			break; // }}}
+		case 'SleepingReviseByMe': // Documents I have to revise but are still sleeping {{{
+			if (!$this->db->createTemporaryTable("ttrevisionid")) {
+				return false;
+			}
+			$user = $param1;
+			$orderby = $param3;
+			if($param4 == 'desc')
+				$orderdir = 'DESC';
+			else
+				$orderdir = 'ASC';
+
+			$groups = array();
+			$tmp = $user->getGroups();
+			foreach($tmp as $group)
+				$groups[] = $group->getID();
+
+			$selectStr .= ", `tblDocumentRevisionLog`.`date` as `duedate` ";
+			$queryStr .=
+				"LEFT JOIN `tblDocumentRevisors` on `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` ".
+				"LEFT JOIN `ttrevisionid` ON `ttrevisionid`.`revisionID` = `tblDocumentRevisors`.`revisionID` ".
+				"LEFT JOIN `tblDocumentRevisionLog` ON `tblDocumentRevisionLog`.`revisionLogID`=`ttrevisionid`.`maxLogID` ";
+
+			$queryStr .= "WHERE (`tblDocumentRevisors`.`type` = 0 AND `tblDocumentRevisors`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).")";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentContent`.`revisiondate` IS NOT NULL AND `tblDocumentContent`.`revisiondate` <= ".$this->db->getCurrentDatetime(14)." ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_RELEASED." ";
+			if(!$param2)
+				$queryStr .= " AND `tblDocumentRevisionLog`.`status` = -3 ";
+			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
+			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
+			else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
+			else $queryStr .= "ORDER BY `name`";
+			$queryStr .= " ".$orderdir;
+			break; // }}}
 		case 'DueRevision': // Documents with a due revision, which is not started {{{
 			if (!$this->db->createTemporaryTable("ttrevisionid")) {
 				return false;
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 545cce176..66ed077d0 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -27,6 +27,7 @@
 - add searching for revision date
 - expired documents can be skipped from counting in countTasks()
 - SeedDMS_Core_DMS::getDocumentList() uses ambiguous column name when sorting by status
+- add list type SleepingReviseByMe to SeedDMS_Core_DMS::getDocumentList()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 16c8102392a95032a0f93eb945da398870593a7e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 15 Feb 2021 19:04:23 +0100
Subject: [PATCH 1371/2006] send list of expired docs to configured email
 address

---
 inc/inc.Tasks.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index cc4a06abf..7f47e20e1 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -22,8 +22,18 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		$dms = $this->dms;
 		$taskparams = $task->getParameter();
 		$docs = $dms->getDocumentsExpired(intval($taskparams['days']));
-		foreach($docs as $doc) {
-			echo $doc->getName().PHP_EOL;
+		$tableformat = " %-10s %5d %-60s";
+		$tableformathead = " %-10s %5s %-60s";
+		$body = '';
+		if (count($docs)>0) {
+			$body .= sprintf($tableformathead."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
+			$body .= "---------------------------------------------------------------------------------\n";
+			foreach($docs as $doc) {
+				$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+//				echo $doc->getName().PHP_EOL;
+			}
+			if($taskparams['email'])
+				mail($taskparams['email'], getMLText('expired_docs_mail_subject',array('sitename'=>$settings->_siteName, 'count'=>count($docs))), $body);
 		}
 		return true;
 	}
@@ -34,6 +44,11 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 
 	public function getAdditionalParams() {
 		return array(
+			array(
+				'name'=>'email',
+				'type'=>'string',
+				'description'=> '',
+			),
 			array(
 				'name'=>'days',
 				'type'=>'integer',
@@ -86,7 +101,7 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 					/* Check if the attribute created is set or has a value older
 					 * than the lastet content. Documents without such an attribute
 					 * where added when a new document was added to the dms. In such
-					 * a case the document content  wasn't indexed.
+					 * a case the document content wasn't indexed.
 					 */
 					try {
 						$created = (int) $hit->getDocument()->getFieldValue('created');

From d22d21d1573b42edd2e19904802ffa750b9d7e1c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Feb 2021 16:32:32 +0100
Subject: [PATCH 1372/2006] cancel checkout if versions mismatch

---
 views/bootstrap/class.CheckInDocument.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index cfe1d8076..97aac4363 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -707,9 +707,10 @@ $(document).ready(function() {
 		}
 		} else {
 ?>
-<form action="../op/op.CheckInDocument.php" method="post">
+<form action="../op/op.CancelCheckOut.php" method="post">
+	<?php echo createHiddenFieldWithKey('cancelcheckout'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
-	<input type="submit" class="btn" value="<?php printMLText("reset_checkout"); ?>">
+	<input type="submit" class="btn" value="<?php printMLText("cancel_checkout"); ?>">
 </form>
 <?php
 		}

From bc06fd60f066fa8b9088a6447ad59f31e1a49cd1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Feb 2021 20:16:26 +0100
Subject: [PATCH 1373/2006] include Utils.php

---
 utils/schedulercli.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 3dcf4a4d4..8883ef78c 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -60,6 +60,7 @@ if(isset($options['mode'])) {
 
 include($myincpath."/inc/inc.Settings.php");
 include($myincpath."/inc/inc.LogInit.php");
+include($myincpath."/inc/inc.Utils.php");
 include($myincpath."/inc/inc.Init.php");
 include($myincpath."/inc/inc.Language.php");
 include($myincpath."/inc/inc.Extension.php");

From 826a6ae1093d4c672078e45c9d2f20b5cbb12fa8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2021 10:23:01 +0100
Subject: [PATCH 1374/2006] add check_view_access

---
 out/out.RemoveFolder.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/out/out.RemoveFolder.php b/out/out.RemoveFolder.php
index 4c912b958..df96fc2b4 100644
--- a/out/out.RemoveFolder.php
+++ b/out/out.RemoveFolder.php
@@ -43,6 +43,10 @@ if (!is_object($folder)) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
 
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));
+}
+
 if ($folder->getID() == $settings->_rootFolderID || !$folder->getParent()) {
 	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("cannot_rm_root"));
 }

From 8e78a217fc1dbe414733eb91abdbcef10c464e9f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2021 10:23:51 +0100
Subject: [PATCH 1375/2006] add advanced access control for folder, do not show
 delete doc/folder button without access

---
 views/bootstrap/class.Bootstrap.php | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 19dcc7d77..09b7fe9d3 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -651,7 +651,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 			if ($accessMode == M_ALL) {
 				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-					$menuitems['rm_folder'] = array('link'=>"../out/out.RemoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'rm_folder');
+					if ($accessobject->check_view_access('RemoveFolder'))
+						$menuitems['rm_folder'] = array('link'=>"../out/out.RemoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>'rm_folder');
 			}
 			if ($accessMode == M_ALL) {
 				if ($accessobject->check_view_access('FolderAccess'))
@@ -2324,11 +2325,9 @@ $(function() {
 	 * @return string html content if $return is true, otherwise an empty string
 	 */
 	function printDeleteDocumentButton($document, $msg, $return=false){ /* {{{ */
-		$accessobject = $this->params['accessobject'];
 		$docid = $document->getID();
 		$content = '';
-		if ($accessobject->check_view_access('RemoveDocument'))
-			$content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
+		$content .= '<a class="delete-document-btn" rel="'.$docid.'" msg="'.getMLText($msg).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
 		if($return)
 			return $content;
 		else
@@ -2939,10 +2938,12 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			$content .= "<div class=\"list-action\">";
 			if(!empty($extracontent['begin_action_list']))
 				$content .= $extracontent['begin_action_list'];
-			if($document->getAccessMode($user) >= M_ALL) {
-				$content .= $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
-			} else {
-				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
+			if($accessop->check_view_access('RemoveDocument')) {
+				if($document->getAccessMode($user) >= M_ALL) {
+					$content .= $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
+				} else {
+					$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
+				}
 			}
 			if($document->getAccessMode($user) >= M_READWRITE) {
 				$content .= '<a href="../out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="fa fa-edit"></i></a>';
@@ -3018,6 +3019,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		$enableRecursiveCount = $this->params['enableRecursiveCount'];
 		$maxRecursiveCount = $this->params['maxRecursiveCount'];
 		$enableClipboard = $this->params['enableclipboard'];
+		$accessop = $this->params['accessobject'];
 		$onepage = $this->params['onepage'];
 
 		$owner = $subFolder->getOwner();
@@ -3074,10 +3076,12 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		if(!empty($extracontent['begin_action_list']))
 			$content .= $extracontent['begin_action_list'];
 		$subFolderAccessMode = $subFolder->getAccessMode($user);
-		if($subFolderAccessMode >= M_ALL) {
-			$content .= $this->printDeleteFolderButton($subFolder, 'splash_rm_folder', true);
-		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
+		if ($accessop->check_view_access('RemoveFolder')) {
+			if($subFolderAccessMode >= M_ALL) {
+				$content .= $this->printDeleteFolderButton($subFolder, 'splash_rm_folder', true);
+			} else {
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
+			}
 		}
 		if($subFolderAccessMode >= M_READWRITE) {
 			$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';

From 4f650f3d2b31029d850189164f4d3e476536ce7d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2021 13:33:53 +0100
Subject: [PATCH 1376/2006] use new methods getMandatoryReviewers and
 getMandatoryApprovers

---
 op/op.CheckInDocument.php | 42 ++++++---------------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 977352acf..94bf8d768 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -133,45 +133,15 @@ else
 		}
 
 		// add mandatory reviewers/approvers
-		$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
 		if($settings->_workflowMode == 'traditional') {
-			$res=$user->getMandatoryReviewers();
-			foreach ($res as $r){
-
-				if ($r['reviewerUserID']!=0){
-					foreach ($docAccess["users"] as $usr)
-						if ($usr->getID()==$r['reviewerUserID']){
-							$reviewers["i"][] = $r['reviewerUserID'];
-							break;
-						}
-				}
-				else if ($r['reviewerGroupID']!=0){
-					foreach ($docAccess["groups"] as $grp)
-						if ($grp->getID()==$r['reviewerGroupID']){
-							$reviewers["g"][] = $r['reviewerGroupID'];
-							break;
-						}
-				}
-			}
+			$mreviewers = getMandatoryReviewers($folder, $user);
+			if($mreviewers['i'])
+				$reviewers['i'] = array_merge($reviewers['i'], $mreviewers['i']);
 		}
-		$res=$user->getMandatoryApprovers();
-		foreach ($res as $r){
+		$mapprovers = getMandatoryApprovers($folder, $user);
+		if($mapprovers['i'])
+			$approvers['i'] = array_merge($approvers['i'], $mapprovers['i']);
 
-			if ($r['approverUserID']!=0){
-				foreach ($docAccess["users"] as $usr)
-					if ($usr->getID()==$r['approverUserID']){
-						$approvers["i"][] = $r['approverUserID'];
-						break;
-					}
-			}
-			else if ($r['approverGroupID']!=0){
-				foreach ($docAccess["groups"] as $grp)
-					if ($grp->getID()==$r['approverGroupID']){
-						$approvers["g"][] = $r['approverGroupID'];
-						break;
-					}
-			}
-		}
 		if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
 			/* Check if reviewers are send but no approvers */
 			if(($reviewers["i"] || $reviewers["g"]) && !$approvers["i"] && !$approvers["g"]) {

From a0ef972028d2da9bee2de66b19d396f36629ef1f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2021 15:01:13 +0100
Subject: [PATCH 1377/2006] send expired docs mail as html, log sending mail

---
 inc/inc.Tasks.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 7f47e20e1..55637aa46 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -20,20 +20,40 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 */
 	public function execute($task) {
 		$dms = $this->dms;
+		$user = $this->user;
+		$settings = $this->settings;
+		$logger = $this->logger;
 		$taskparams = $task->getParameter();
 		$docs = $dms->getDocumentsExpired(intval($taskparams['days']));
 		$tableformat = " %-10s %5d %-60s";
 		$tableformathead = " %-10s %5s %-60s";
+		$tableformathtml = "<tr><td>%s</td><td>%d</td><td>%s</td></tr>";
+		$tableformatheadhtml = "<tr><th>%s</th><th>%s</th><th>%s</th></tr>";
 		$body = '';
+		$bodyhtml = '';
 		if (count($docs)>0) {
+			$bodyhtml .= "<table>".PHP_EOL;
+			$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
 			$body .= sprintf($tableformathead."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
 			$body .= "---------------------------------------------------------------------------------\n";
 			foreach($docs as $doc) {
 				$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
-//				echo $doc->getName().PHP_EOL;
+				$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
 			}
+			$bodyhtml .= "</table>".PHP_EOL;
 			if($taskparams['email'])
-				mail($taskparams['email'], getMLText('expired_docs_mail_subject',array('sitename'=>$settings->_siteName, 'count'=>count($docs))), $body);
+				require_once('inc/inc.ClassEmailNotify.php');
+				$email = new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+
+				$params = array();
+				$params['count'] = count($docs);
+				$params['__body__'] = $body;
+				$params['__body_html__'] = $bodyhtml;
+				$params['sitename'] = $settings->_siteName;
+				$email->toIndividual('', $taskparams['email'], 'expired_docs_mail_subject', '', $params);
+
+				$logger->log('Task \'expired_docs\': Sending reminder \'expired_docs_mail_subject\' to user \''.$taskparams['email'].'\'', PEAR_LOG_INFO);
+//				mail($taskparams['email'], getMLText('expired_docs_mail_subject',array('sitename'=>$settings->_siteName, 'count'=>count($docs))), $body);
 		}
 		return true;
 	}

From 53ee447d8441b193968eb0525e3d8871ffd0b01c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 24 Feb 2021 15:11:20 +0100
Subject: [PATCH 1378/2006] get logger in execute()

---
 inc/inc.Tasks.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 55637aa46..a7cc19c83 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -172,6 +172,7 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 	 */
 	public function execute($task) {
 		$dms = $this->dms;
+		$logger = $this->logger;
 		$fulltextservice = $this->fulltextservice;
 		$taskparams = $task->getParameter();
 		$folder = $dms->getRootFolder();
@@ -265,6 +266,7 @@ class SeedDMS_CheckSumTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 */
 	public function execute($task) {
 		$dms = $this->dms;
+		$logger = $this->logger;
 		$taskparams = $task->getParameter();
 		$folder = $dms->getRootFolder();
 

From b9e12a82ae13c85c1f3e899f33b298f94fe13050 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 1 Mar 2021 09:26:37 +0100
Subject: [PATCH 1379/2006] remove old table layout and use formField()

---
 views/bootstrap/class.RoleMgr.php | 60 ++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index d5236366c..6e73fef93 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -135,7 +135,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$accessop = $this->params['accessobject'];
 ?>
-	<form action="../op/op.RoleMgr.php" method="post" enctype="multipart/form-data" name="form" id="form">
+	<form class="form-horizontal" action="../op/op.RoleMgr.php" method="post" enctype="multipart/form-data" name="form" id="form">
 <?php
 		if($currRole) {
 			echo createHiddenFieldWithKey('editrole');
@@ -150,37 +150,47 @@ $(document).ready( function() {
 	<input type="hidden" name="action" value="addrole">
 <?php
 		}
-?>
-	<table class="table-condensed">
-		<tr>
-			<td><?php printMLText("role_name");?>:</td>
-			<td><input type="text" name="name" id="name" value="<?php print $currRole ? htmlspecialchars($currRole->getName()) : "";?>"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("role_type");?>:</td>
-			<td><select name="role"><option value="<?php echo SeedDMS_Core_Role::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_admin ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_admin) echo "selected"; ?>><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_Role::role_guest ?>" <?php if($currRole && $currRole->getRole() == SeedDMS_Core_Role::role_guest) echo "selected"; ?>><?php printMLText("role_guest"); ?></option></select></td>
-		</tr>
-<?php
+		$this->formField(
+			getMLText("role_name"),
+			array(
+				'element'=>'input',
+				'type'=>'text',
+				'id'=>'name',
+				'name'=>'name',
+				'value'=>($currRole ? htmlspecialchars($currRole->getName()) : '')
+			)
+		);
+		$options = array();
+		$options[] = array(SeedDMS_Core_Role::role_user, getMLText("role_user"), $currRole && $currRole->getRole() == SeedDMS_Core_Role::role_user);
+		$options[] = array(SeedDMS_Core_Role::role_admin, getMLText("role_admin"), $currRole && $currRole->getRole() == SeedDMS_Core_Role::role_admin);
+		$options[] = array(SeedDMS_Core_Role::role_guest, getMLText("role_guest"), $currRole && $currRole->getRole() == SeedDMS_Core_Role::role_guest);
+		$this->formField(
+			getMLText("role_type"),
+			array(
+				'element'=>'select',
+				'name'=>'role',
+				'options'=>$options
+			)
+		);
 		if($currRole && $currRole->getRole() != SeedDMS_Core_Role::role_admin) {
-			echo "<tr>";
-			echo "<td>".getMLText('restrict_access')."</td>";
-			echo "<td>";
+			$options = array();
 			foreach(array(S_DRAFT_REV, S_DRAFT_APP, S_IN_WORKFLOW, S_REJECTED, S_RELEASED, S_IN_REVISION, S_DRAFT, S_EXPIRED, S_OBSOLETE, S_NEEDS_CORRECTION) as $status) {
-				echo "<input type=\"checkbox\" name=\"noaccess[]\" value=\"".$status."\" ".(in_array($status, $currRole->getNoAccess()) ? "checked" : "")."> ".getOverallStatusText($status)."<br />";
+				$options[] = array($status, getOverallStatusText($status), in_array($status, $currRole->getNoAccess()));
 			}
-			echo "</td>";
-			echo "</tr>";
+			$this->formField(
+				getMLText("restrict_access"),
+				array(
+					'element'=>'select',
+					'name'=>'noaccess[]',
+					'options'=>$options,
+					'multiple'=>true,
+				)
+			);
 		}
 		if($currRole && $accessop->check_controller_access('RoleMgr', array('action'=>'editrole')) || !$currRole && $accessop->check_controller_access('RoleMgr', array('action'=>'addrole'))) {
-?>
-		<tr>
-			<td></td>
-			<td><button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText($currRole ? "save" : "add_role")?></button></td>
-		</tr>
-<?php
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText($currRole ? "save" : "add_role"));
 		}
 ?>
-	</table>
 	</form>
 <?php
 	} /* }}} */

From 1df630a28e1cde409c9cce1cda52c5679e2be57b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Mar 2021 08:02:11 +0100
Subject: [PATCH 1380/2006] fix downloading approval file

---
 op/op.Download.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Download.php b/op/op.Download.php
index 8451136e3..4ac76024d 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -250,7 +250,7 @@ elseif (isset($_GET["approvelogid"])) { /* {{{ */
 	}
 
 	$controller->setParam('document', $document);
-	$controller->setParam('reviewlogid', (int) $_GET['approvelogid']);
+	$controller->setParam('approvelogid', (int) $_GET['approvelogid']);
 	$controller->setParam('type', 'approval');
 	$controller->run();
 	switch($controller->getErrorNo()) {

From 7f0ed73f746ff5699e377abae8798ea9e0efd222 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Mar 2021 08:03:23 +0100
Subject: [PATCH 1381/2006] close Ticket #504

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index eb80d32c9..f42747eb8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - add searching for revision date
 - list of open tasks will no longer contain expired documents but MyDocuments
   page still list them
+- fixed downloading approval file (Closes: #504)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.14

From c494afa49c0b40dc9609f3fac1fc4eed45824427 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Mar 2021 08:04:53 +0100
Subject: [PATCH 1382/2006] wrong ticket number, must be #503 not #504

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f42747eb8..b1b2eea99 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,7 @@
 - add searching for revision date
 - list of open tasks will no longer contain expired documents but MyDocuments
   page still list them
-- fixed downloading approval file (Closes: #504)
+- fixed downloading approval file (Closes: #503)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.14

From 05e1f0477333dea4a34d93d31e4f1e72cc223537 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Mar 2021 10:13:57 +0100
Subject: [PATCH 1383/2006] fix merge error

---
 views/bootstrap/class.Search.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index bfd3ff920..f50ffc858 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -502,9 +502,6 @@ function typeahead() { /* {{{ */
 ?>
 <tr>
 	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-<<<<<<< HEAD
-	<td><?php $this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : null, 'attributes', true) ?></td>
-=======
 	<td>
 <?php
 					if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date)
@@ -512,7 +509,6 @@ function typeahead() { /* {{{ */
 					else
 						$this->printAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true)
 ?></td>
->>>>>>> seeddms-5.1.x
 </tr>
 
 <?php

From 70b2fa45e445b1535a66a1a50b379e9c92eb833c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 12 Mar 2021 21:54:52 +0100
Subject: [PATCH 1384/2006] check if $recipients['i'] and ['g'] are set instead
 of $recipients

---
 controllers/class.UpdateDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/class.UpdateDocument.php b/controllers/class.UpdateDocument.php
index e7dfe1026..c394b22e1 100644
--- a/controllers/class.UpdateDocument.php
+++ b/controllers/class.UpdateDocument.php
@@ -67,14 +67,14 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
 					}
 				}
 
-				if($recipients['i']) {
+				if(!empty($recipients['i'])) {
 					foreach($recipients['i'] as $uid) {
 						if($u = $dms->getUser($uid)) {
 							$res = $contentResult->getContent()->addIndRecipient($u, $user);
 						}
 					}
 				}
-				if($recipients['g']) {
+				if(!empty($recipients['g'])) {
 					foreach($recipients['g'] as $gid) {
 						if($g = $dms->getGroup($gid)) {
 							$res = $contentResult->getContent()->addGrpRecipient($g, $user);

From bbc49439734217f169c56c2dc70bc0e00d42fb18 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 19 Mar 2021 10:52:39 +0100
Subject: [PATCH 1385/2006] pass 3rd parameter to formField() if returned by
 hook

---
 views/bootstrap/class.CheckInDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 97aac4363..b1c728d21 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -208,7 +208,7 @@ $(document).ready(function() {
 				$arr = $this->callHook('editDocumentContentAttribute', $document, $attrdef);
 				if(is_array($arr)) {
 					if($arr)
-						$this->formField($arr[0], $arr[1]);
+						$this->formField($arr[0], $arr[1], isset($arr[2]) ? $arr[2] : null);
 				} elseif(is_string($arr)) {
 					echo $arr;
 				} else {
@@ -219,7 +219,7 @@ $(document).ready(function() {
 		$arrs = $this->callHook('addDocumentContentAttributes', $folder);
 		if(is_array($arrs)) {
 			foreach($arrs as $arr) {
-				$this->formField($arr[0], $arr[1]);
+				$this->formField($arr[0], $arr[1], isset($arr[2]) ? $arr[2] : null);
 			}
 		} elseif(is_string($arrs)) {
 			echo $arrs;

From 67d8cf39fbe0e66a801a7c5367585d22d41f9b7b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 25 Mar 2021 16:37:56 +0100
Subject: [PATCH 1386/2006] regular users can no longer set owner of document
 while uploading

---
 CHANGELOG                        | 1 +
 inc/inc.ClassAccessOperation.php | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index bfc3ea2c7..e10416421 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - list of open tasks will no longer contain expired documents but MyDocuments
   page still list them
 - fixed downloading approval file (Closes: #503)
+- regular users can no longer set owner of document while uploading
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.14
diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index c09101d25..577b19112 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -582,8 +582,13 @@ class SeedDMS_AccessOperation {
 		if(!$this->settings->_advancedAcl) {
 			if($this->user->isGuest())
 				return false;
-			else
+			elseif($this->user->isAdmin())
 				return true;
+			else {
+				if($controller == 'AddDocument' && isset($get['action']) && $get['action'] == 'setOwner')
+					return false;
+				return true;
+			}
 		}
 		if(is_string($controller)) {
 			$scripts = array($controller);

From c9faef81f7448f5867c258d2f9a6b612e11a900f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 3 Apr 2021 07:50:47 +0200
Subject: [PATCH 1387/2006] use formField() instead of plain html, scroll to
 top for editing a task

---
 views/bootstrap/class.SchedulerTaskMgr.php | 78 ++++++++++++++--------
 1 file changed, 49 insertions(+), 29 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index e2cb2cd38..4b9220f4a 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -42,6 +42,7 @@ $(document).ready( function() {
 	$('body').on('click', '.edittask', function(ev){
 		ev.preventDefault();
 		$('#editaddtask.ajax').trigger('update', {taskid: $(this).data('id'), action: $(this).data('action')});
+		$("html, body").animate({ scrollTop: 0 }, "slow");
 	});
 	$('#listtasks.ajax').trigger('update', {});
 
@@ -188,7 +189,7 @@ $(document).ready( function() {
 							getMLText('task_'.$extname."_".$taskname."_".$param['name']),
 							array(
 								'element'=>'input',
-								'type'=>'text',
+								'type'=>(($param['type'] == 'integer') ? 'number' : 'text'),
 								'id'=>'params_'.$param['name'],
 								'name'=>'params['.$param['name'].']',
 								'required'=>false
@@ -241,32 +242,51 @@ $(document).ready( function() {
 		<span class="input uneditable-input"><?= $task->getExtension() ?>::<?= $task->getTask() ?></span>
 		</div>
 	</div>
-	<div class="control-group">
-		<label class="control-label" for="name"><?php printMLText("task_name");?>:</label>
-		<div class="controls">
-		<input type="text" id="name" name="name" value="<?= $task->getName() ?>">
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" for="description"><?php printMLText("task_description");?>:</label>
-		<div class="controls">
-		<input type="text" id="description" name="description" value="<?= $task->getDescription() ?>">
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" for="frequency"><?php printMLText("task_frequency");?>:</label>
-		<div class="controls">
-		<input type="text" id="frequency" name="frequency" value="<?= $task->getFrequency() ?>">
-		</div>
-	</div>
-	<div class="control-group">
-		<div class="controls">
-			<label class="checkbox">
-				<input type="checkbox" name="disabled" value="1"<?= ($task->getDisabled() ? ' checked' : '') ?>> <?= getMLText('task_disabled'); ?>
-			</label>
-		</div>
-	</div>
 <?php
+		$this->formField(
+			getMLText('task_name'),
+			array(
+				'element'=>'input',
+				'type'=>'text',
+				'id'=>'name',
+				'name'=>'name',
+				'value'=>$task->getName(),
+				'required'=>true,
+			)
+		);
+		$this->formField(
+			getMLText('task_description'),
+			array(
+				'element'=>'input',
+				'type'=>'text',
+				'id'=>'description',
+				'name'=>'description',
+				'value'=>$task->getDescription(),
+				'required'=>false,
+			)
+		);
+		$this->formField(
+			getMLText('task_frequency'),
+			array(
+				'element'=>'input',
+				'type'=>'text',
+				'id'=>'frequency',
+				'name'=>'frequency',
+				'value'=>$task->getFrequency(),
+				'required'=>true,
+			)
+		);
+		$this->formField(
+			getMLText('task_disabled'),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'id'=>'disabled',
+				'name'=>'disabled',
+				'value'=>'1',
+				'checked'=>$task->getDisabled(),
+			)
+		);
 		if($additionalparams = $taskobj->getAdditionalParams()) {
 			foreach($additionalparams as $param) {
 				switch($param['type']) {
@@ -301,7 +321,7 @@ $(document).ready( function() {
 						getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
 						array(
 							'element'=>'input',
-							'type'=>'text',
+							'type'=>(($param['type'] == 'integer') ? 'number' : 'text'),
 							'id'=>'params_'.$param['name'],
 							'name'=>'params['.$param['name'].']',
 							'value'=>$task->getParameter()[$param['name']],
@@ -364,10 +384,10 @@ $(document).ready( function() {
 			echo $task->getFrequency();
 			echo "</td>";
 			echo "<td>";
-			echo $task->getNextRun();
+			echo getLongReadableDate(makeTsFromDate($task->getNextRun()));
 			echo "</td>";
 			echo "<td>";
-			echo $task->getLastRun();
+			echo getLongReadableDate(makeTsFromDate($task->getLastRun()));
 			echo "</td>";
 			echo "<td nowrap>";
 			print "<div class=\"list-action\">";

From aa045478dd65c1c4c5d2b96e4752a781158d0798 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 3 Apr 2021 07:53:12 +0200
Subject: [PATCH 1388/2006] pass number of days to
 getDocumentList('DueRevisions')

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 22 +++++++++++++++++-----
 SeedDMS_Core/package.xml           |  2 ++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 031354cae..044c6bd12 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -1116,7 +1116,8 @@ class SeedDMS_Core_DMS {
 	 * 'ReviewByMe', 'ApproveByMe', 'AppRevByMe', 'ReviseByMe', 'ReceiptByMe'
 	 * will also return documents which the reviewer, approver, etc.
 	 * has already taken care of. If set to false only
-	 * untouched documents will be returned. In case of 'ExpiredOwner' this
+	 * untouched documents will be returned. In case of 'ExpiredOwner',
+	 * 'SleepingReviseByMe' this
 	 * parameter contains the number of days (a negative number is allowed)
 	 * relativ to the current date or a date in format 'yyyy-mm-dd'
 	 * (even in the past).
@@ -1542,6 +1543,12 @@ class SeedDMS_Core_DMS {
 			if (!$this->db->createTemporaryTable("ttrevisionid")) {
 				return false;
 			}
+
+			$dayoffset = 0;
+			if(is_int($param2)) {
+				$dayoffset = (int) $param2;
+			}
+
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1564,10 +1571,9 @@ class SeedDMS_Core_DMS {
 			if($groups)
 				$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).")";
 			$queryStr .= ") ";
-			$queryStr .= "AND `tblDocumentContent`.`revisiondate` IS NOT NULL AND `tblDocumentContent`.`revisiondate` <= ".$this->db->getCurrentDatetime(14)." ";
+			$queryStr .= "AND `tblDocumentContent`.`revisiondate` IS NOT NULL AND `tblDocumentContent`.`revisiondate` <= ".$this->db->getCurrentDatetime($dayoffset)." ";
 			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_RELEASED." ";
-			if(!$param2)
-				$queryStr .= " AND `tblDocumentRevisionLog`.`status` = -3 ";
+			$queryStr .= " AND `tblDocumentRevisionLog`.`status` = -3 ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
 			else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
@@ -1578,6 +1584,12 @@ class SeedDMS_Core_DMS {
 			if (!$this->db->createTemporaryTable("ttrevisionid")) {
 				return false;
 			}
+
+			$dayoffset = 0;
+			if(is_int($param2)) {
+				$dayoffset = (int) $param2;
+			}
+
 			$user = $param1;
 			$orderby = $param3;
 			if($param4 == 'desc')
@@ -1586,7 +1598,7 @@ class SeedDMS_Core_DMS {
 				$orderdir = 'ASC';
 
 			$selectStr .= ", `tblDocumentContent`.`revisiondate` ";
-			$queryStr .= "WHERE `tblDocumentContent`.`revisiondate` IS NOT NULL AND `tblDocumentContent`.`revisiondate` <= ".$this->db->getCurrentDatetime()." ";
+			$queryStr .= "WHERE `tblDocumentContent`.`revisiondate` IS NOT NULL AND `tblDocumentContent`.`revisiondate` <= ".$this->db->getCurrentDatetime($dayoffset)." ";
 			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_RELEASED." ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
 			else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 7ca7ce74d..f440e34f6 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -28,6 +28,8 @@
 - expired documents can be skipped from counting in countTasks()
 - SeedDMS_Core_DMS::getDocumentList() uses ambiguous column name when sorting by status
 - add list type SleepingReviseByMe to SeedDMS_Core_DMS::getDocumentList()
+- parameter 2 of SeedDMS_Core_DMS::getDocumentList() is treated as number of
+  days for list DueRevisions
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 397081bdebe8c9f40a169f2274307cfed7908a97 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Apr 2021 07:56:47 +0200
Subject: [PATCH 1389/2006] replace plain html with formField(), add help to
 task params

---
 views/bootstrap/class.SchedulerTaskMgr.php | 108 ++++++++++++++++-----
 1 file changed, 82 insertions(+), 26 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 4b9220f4a..e2caec493 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -117,32 +117,51 @@ $(document).ready( function() {
 		<span class="input uneditable-input"><?= $extname ?>::<?= $taskname ?></span>
 		</div>
 	</div>
-	<div class="control-group">
-		<label class="control-label" for="name"><?php printMLText("task_name");?>:</label>
-		<div class="controls">
-			<input type="text" id="name" name="name" value="">
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" for="description"><?php printMLText("task_description");?>:</label>
-		<div class="controls">
-			<input type="text" id="description" name="description" value="">
-		</div>
-	</div>
-	<div class="control-group">
-		<label class="control-label" for="frequency"><?php printMLText("task_frequency");?>:</label>
-		<div class="controls">
-			<input type="text" id="frequency" name="frequency" value="">
-		</div>
-	</div>
-	<div class="control-group">
-		<div class="controls">
-			<label class="checkbox">
-				<input type="checkbox" name="disabled" value="1" checked> <?= getMLText('task_disabled'); ?>
-			</label>
-		</div>
-	</div>
 <?php
+			$this->formField(
+				getMLText('task_name'),
+				array(
+					'element'=>'input',
+					'type'=>'text',
+					'id'=>'name',
+					'name'=>'name',
+					'value'=>'',
+					'required'=>true,
+				)
+			);
+			$this->formField(
+				getMLText('task_description'),
+				array(
+					'element'=>'input',
+					'type'=>'text',
+					'id'=>'description',
+					'name'=>'description',
+					'value'=>'',
+					'required'=>false,
+				)
+			);
+			$this->formField(
+				getMLText('task_frequency'),
+				array(
+					'element'=>'input',
+					'type'=>'text',
+					'id'=>'frequency',
+					'name'=>'frequency',
+					'value'=>'',
+					'required'=>true,
+				)
+			);
+			$this->formField(
+				getMLText('task_disabled'),
+				array(
+					'element'=>'input',
+					'type'=>'checkbox',
+					'id'=>'disabled',
+					'name'=>'disabled',
+					'value'=>'1',
+					'checked'=>true,
+				)
+			);
 			if($additionalparams) {
 				foreach($additionalparams as $param) {
 					switch($param['type']) {
@@ -156,7 +175,10 @@ $(document).ready( function() {
 								'name'=>'params['.$param['name'].']',
 								'value'=>'1',
 								'checked'=>false,
-							)
+							),
+							array(
+								'help'=>$param['description']
+							),
 						);
 						break;
 					case 'password':
@@ -168,6 +190,9 @@ $(document).ready( function() {
 								'id'=>'params_'.$param['name'],
 								'name'=>'params['.$param['name'].']',
 								'required'=>false
+							),
+							array(
+								'help'=>$param['description']
 							)
 						);
 						break;
@@ -181,6 +206,9 @@ $(document).ready( function() {
 								'multiple'=>false,
 								'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
 								'options'=>$param['options'],
+							),
+							array(
+								'help'=>$param['description']
 							)
 						);
 						break;
@@ -193,6 +221,9 @@ $(document).ready( function() {
 								'id'=>'params_'.$param['name'],
 								'name'=>'params['.$param['name'].']',
 								'required'=>false
+							),
+							array(
+								'help'=>$param['description']
 							)
 						);
 						break;
@@ -300,6 +331,9 @@ $(document).ready( function() {
 							'name'=>'params['.$param['name'].']',
 							'value'=>'1',
 							'checked'=>$task->getParameter($param['name']) == 1,
+						),
+						array(
+							'help'=>$param['description']
 						)
 					);
 					break;
@@ -313,6 +347,25 @@ $(document).ready( function() {
 							'name'=>'params['.$param['name'].']',
 							'value'=>$task->getParameter()[$param['name']],
 							'required'=>false
+						),
+						array(
+							'help'=>$param['description']
+						)
+					);
+					break;
+				case 'select':
+					$this->formField(
+						getMLText('task_'.$extname."_".$taskname."_".$param['name']),
+						array(
+							'element'=>'select',
+							'class'=>'chzn-select',
+							'name'=>'params['.$param['name'].']',
+							'multiple'=>false,
+							'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
+							'options'=>$task->getParameter()[$param['options']],
+						),
+						array(
+							'help'=>$param['description']
 						)
 					);
 					break;
@@ -326,6 +379,9 @@ $(document).ready( function() {
 							'name'=>'params['.$param['name'].']',
 							'value'=>$task->getParameter()[$param['name']],
 							'required'=>false
+						),
+						array(
+							'help'=>$param['description']
 						)
 					);
 					break;

From 59e92a836f3b740a32a4c46a1ba05b599292b3c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Apr 2021 10:55:33 +0200
Subject: [PATCH 1390/2006] minor formating change

---
 views/bootstrap/class.ViewDocument.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index be32ffdfc..6500e2707 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1375,7 +1375,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<td><ul class=\"unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
 					/* $updateUser is the user who has done the receipt */
 					$updateUser = $dms->getUser($r["userID"]);
-					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
+					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li>";
+					print "</ul></td>";
 					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
 					print "<td>";
 					if($class)
@@ -1505,6 +1506,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					print "<td>".$reqName."</td>\n";
 					print "<td><ul class=\"unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
 					/* $updateUser is the user who has done the revision */
+					$updateUser = null;
 					if($r['status'] != 0) {
 						$updateUser = $dms->getUser($r["userID"]);
 						print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li>";

From 130afd7d251809d659faff61c36e1b9c3406f2ef Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Apr 2021 06:34:56 +0200
Subject: [PATCH 1391/2006] pass name of user as parameter to checkout msg

---
 views/bootstrap/class.ViewDocument.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 6500e2707..be37f97e4 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -204,8 +204,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$checkoutpath = sprintf($checkoutdir, preg_replace('/[^A-Za-z0-9_-]/', '', $user->getLogin()));
 			}
 			foreach($infos as $info) {
+				$checkoutuser = $dms->getUser($info['userID']);
 				echo "<div class=\"alert alert-info\">";
-				echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>$info['date'], 'filename'=>substr($info['filename'], strlen($checkoutpath)+1)))."</a>";
+				echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>$info['date'], 'filename'=>substr($info['filename'], strlen($checkoutpath)+1), 'username'=>($checkoutuser ? $checkoutuser->getFullName() : '')))."</a>";
 				echo "</div>";
 			}
 		}

From 7b30188dd935344698a8051fac8874cf11840674 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Apr 2021 19:45:40 +0200
Subject: [PATCH 1392/2006] use class SeedDMS_Theme_Style, remove plain html

---
 views/bootstrap/class.Acl.php               |  23 ++--
 views/bootstrap/class.MyDocuments.php       |  71 +++++++------
 views/bootstrap/class.ReceiptDocument.php   |   4 +-
 views/bootstrap/class.ReceiptSummary.php    |  16 +--
 views/bootstrap/class.RemoveTransmittal.php |  12 +--
 views/bootstrap/class.ReviseDocument.php    |   4 +-
 views/bootstrap/class.RevisionSummary.php   |  16 +--
 views/bootstrap/class.RoleMgr.php           |  27 +++--
 views/bootstrap/class.SchedulerTaskMgr.php  |  23 ++--
 views/bootstrap/class.SetRecipients.php     |   4 +-
 views/bootstrap/class.SetRevisors.php       |   4 +-
 views/bootstrap/class.TransmittalMgr.php    |  82 ++++++---------
 views/bootstrap/class.ViewDocument.php      |   6 +-
 views/bootstrap4/class.Bootstrap4.php       | 110 +++++++++++++++++---
 views/bootstrap4/styles/styles.css          |   2 +-
 15 files changed, 231 insertions(+), 173 deletions(-)

diff --git a/views/bootstrap/class.Acl.php b/views/bootstrap/class.Acl.php
index e26379ac6..0d3615d80 100644
--- a/views/bootstrap/class.Acl.php
+++ b/views/bootstrap/class.Acl.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Acl view
@@ -27,7 +27,7 @@ require_once("class.Bootstrap.php");
  * @copyright  Copyright (C) 2016 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_Acl extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_Acl extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$selrole = $this->params['selrole'];
@@ -241,10 +241,8 @@ $(document).ready( function() {
 		if(!$settings->_advancedAcl) {
 			$this->warningMsg(getMLText("access_control_is_off"));
 		}
-?>
-<div class="row-fluid">
-<div class="span4">
-<?php
+		$this->rowStart();
+		$this->columnStart(4);
 		$this->contentHeading(getMLText("role"));
 ?>
 <form class="form-horizontal">
@@ -267,11 +265,10 @@ $(document).ready( function() {
 </form>
 <?php if($accessop->check_view_access($this, array('action'=>'info')) || $user->isAdmin()) { ?>
 <div class="ajax" data-view="Acl" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
-<?php } ?>
-</div>
-
-<div class="span8">
 <?php
+	 	}
+		$this->columnEnd();
+		$this->columnStart(8);
 		$this->contentHeading(getMLText("access_control"));
 
 		if($selrole) {
@@ -285,10 +282,8 @@ $(document).ready( function() {
 <?php
 			}
 		}
-?>
-</div>
-</div>
-<?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 2ae12f898..538eafb21 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -45,7 +45,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Theme_Style {
 		$this->printClickDocumentJs();
 ?>
 $(document).ready( function() {
-	$('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){
+	$('body').on('click', 'ul.sidenav li a', function(ev){
 		ev.preventDefault();
 		$('#kkkk.ajax').data('action', $(this).data('action'));
 		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
@@ -734,67 +734,72 @@ $(document).ready( function() {
 
 		echo '<div class="row-fluid">';
 		echo '<div class="span3">';
+		$this->rowStart();
+		$this->columnStart(3);
 		$this->contentHeading(getMLText("my_documents"));
-		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
+		$menuitems = [];
 		$resArr = $dms->getDocumentList('MyDocs', $user);
-		echo '<li class=""><a data-href="#all_documents" data-action="listMyDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("all_documents").'</a></li>';
+		$menuitems[] = array('label'=>getMLText('all_documents'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#all_documents"), array('data-action', "listmyDocs")));
+
 		$resArr = $dms->getDocumentList('ReceiveOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_reception" data-action="listReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_reception").'</a></li>';
+		$menuitems[] = array('label'=>getMLText('documents_user_reception'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_reception"), array('data-action', "listReceiveOwner")));
 		$resArr = $dms->getDocumentList('NoReceiveOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_no_reception" data-action="listNoReceiveOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_no_reception").'</a></li>';
+		$menuitems[] = array('label'=>getMLText('documents_user_no_reception'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_no_reception"), array('data-action', "listNoReceiveOwner")));
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$resArr = $dms->getDocumentList('AppRevOwner', $user);
-			echo '<li class=""><a data-href="#documents_user_requiring_attention" data-action="listDocsToLookAt"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_requiring_attention").'</a></li>';
+			$menuitems[] = array('label'=>getMLText('documents_user_requiring_attention'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_requiring_attention"), array('data-action', "listDocsToLookAt")));
 		}
-		echo '</ul>';
+		self::showNavigationListWithBadges($menuitems);
+
+		$menuitems = [];
 		$this->contentHeading(getMLText("documents_in_process"));
-		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		$resArr = $dms->getDocumentList('DraftOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_draft" data-action="listDraftOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_draft").'</a></li>';
+		$menuitems[] = array('label'=>getMLText('documents_user_draft'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_draft"), array('data-action', "listDraftOwner")));
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$resArr = $dms->getDocumentList('RejectOwner', $user);
-			echo '<li class=""><a data-href="#documents_user_rejected" data-action="listRejects"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_rejected").'</a></li>';
+			$menuitems[] = array('label'=>getMLText('documents_user_rejected'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_rejected"), array('data-action', "listRejects")));
 		}
 		$resArr = $dms->getDocumentList('CheckedOutByMe', $user);
-		echo '<li class=""><a data-href="#documents_checked_out_by_you" data-action="listCheckedoutDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_checked_out_by_you").'</a></li>';
+		$menuitems[] = array('label'=>getMLText('documents_checked_out_by_you'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_checked_out_by_you"), array('data-action', "listCheckedoutDocs")));
 		$resArr = $dms->getDocumentList('LockedByMe', $user);
-		echo '<li class=""><a data-href="#documents_locked_by_you" data-action="listLockedDocs"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_locked_by_you").'</a></li>';
-		echo '</ul>';
+		$menuitems[] = array('label'=>getMLText('documents_locked_by_you'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_locked_by_you"), array('data-action', "listLockedDocs")));
+		self::showNavigationListWithBadges($menuitems);
+
+		$menuitems = [];
 		$this->contentHeading(getMLText("tasks"));
-		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
 		if($workflowmode == 'traditional') {
 			$resArr = $dms->getDocumentList('ReviewByMe', $user);
-			echo '<li class=""><a data-href="#documents_to_review" data-action="listReviews"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_review").'</a></li>';
+			$menuitems[] = array('label'=>getMLText('documents_to_review'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_review"), array('data-action', "listReviews")));
 		}
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			$resArr = $dms->getDocumentList('ApproveByMe', $user);
-			echo '<li class=""><a data-href="#documents_to_approve" data-action="listApprovals"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_approve").'</a></li>';
+			$menuitems[] = array('label'=>getMLText('documents_to_approve'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_approve"), array('data-action', "listApprovals")));
 		} else {
 			$resArr = $dms->getDocumentList('WorkflowByMe', $user);
-			echo '<li class=""><a data-href="#documents_to_process" data-action="listWorkflow"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_process").'</a></li>';
+			$menuitems[] = array('label'=>getMLText('documents_to_process'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_process"), array('data-action', "listWorkflow")));
 		}
 		$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-		echo '<li class=""><a data-href="#documents_to_receipt" data-action="listReceipts"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_receipt").'</a></li>';
+		$menuitems[] = array('label'=>getMLText('documents_to_receipt'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_receipt"), array('data-action', "listReceipts")));
 		$resArr = $dms->getDocumentList('ReviseByMe', $user);
-		echo '<li class=""><a data-href="#documents_to_revise" data-action="listRevisions"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_to_revise").'</a></li>';
+		$menuitems[] = array('label'=>getMLText('documents_to_revise'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_to_revise"), array('data-action', "listRevisions")));
 		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_needs_correction" data-action="listNeedsCorrectionOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_needs_correction").'</a></li>';
-		echo '</ul>';
-		$this->contentHeading(getMLText("archive"));
-		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
-		$resArr = $dms->getDocumentList('ExpiredOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_expiration" data-action="listExpiredOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_expiration").'</a></li>';
-		$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
-		echo '<li class=""><a data-href="#documents_user_obsolete" data-action="listObsoleteOwner"><span class="badge '.($resArr ? 'badge-info ' : '').'badge-right">'.count($resArr).'</span>'.getMLText("documents_user_obsolete").'</a></li>';
-		echo '</ul>';
-		echo '</div>';
-		echo '<div class="span9">';
+		$menuitems[] = array('label'=>getMLText('documents_user_needs_correction'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_needs_correction"), array('data-action', "listNeedsCorrectionOwner")));
+		self::showNavigationListWithBadges($menuitems);
 
+		$menuitems = [];
+		$this->contentHeading(getMLText("archive"));
+		$resArr = $dms->getDocumentList('ExpiredOwner', $user);
+		$menuitems[] = array('label'=>getMLText('documents_user_expiration'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_expiration"), array('data-action', "listExpiredOwner")));
+		$resArr = $dms->getDocumentList('ObsoleteOwner', $user);
+		$menuitems[] = array('label'=>getMLText('documents_user_obsolete'), 'badge'=>count($resArr), 'attributes'=>array(array('data-href', "#documents_user_obsolete"), array('data-action', "listObsoleteOwner")));
+		self::showNavigationListWithBadges($menuitems);
+
+		$this->columnEnd();
+		$this->columnStart(9);
 		echo '<div id="kkkk" class="ajax" data-view="MyDocuments" data-action="'.($listtype ? $listtype : 'listDocsToLookAt').'"></div>';
 
-		echo '</div>';
-		echo '</div>';
-
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index de126c47f..2ea3a0854 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ReceiptDocument view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ReceiptDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ReceiptDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 4876c9342..ce6ac1c42 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ReceiptSummary extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -62,8 +62,8 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span6\">\n";
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("receipt_summary"));
 
 		// TODO: verificare scadenza
@@ -118,8 +118,8 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_docs_to_receipt");
 		}
 
-		echo "</div>\n";
-		echo "<div class=\"span6\">\n";
+		$this->columnEnd();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("group_receipt_summary"));
 
 		$printheader=true;
@@ -161,8 +161,8 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Bootstrap_Style {
 			printMLText("no_docs_to_receipt");
 		}
 
-		echo "</div>\n";
-		echo "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.RemoveTransmittal.php b/views/bootstrap/class.RemoveTransmittal.php
index c448ab042..6311861dd 100644
--- a/views/bootstrap/class.RemoveTransmittal.php
+++ b/views/bootstrap/class.RemoveTransmittal.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RemoveTransmittal view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RemoveTransmittal extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RemoveTransmittal extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -41,22 +41,18 @@ class SeedDMS_View_RemoveTransmittal extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("rm_transmittal"));
-		$this->contentContainerStart();
 
+		$this->warningMsg(getMLText("confirm_rm_transmittal", array ("name" => htmlspecialchars($rmtransmittal->getName()))));
 ?>
 <form action="../op/op.TransmittalMgr.php" name="form1" method="post">
 <input type="hidden" name="transmittalid" value="<?php print $rmtransmittal->getID();?>">
 <input type="hidden" name="action" value="removetransmittal">
 <?php echo createHiddenFieldWithKey('removetransmittal'); ?>
-<p>
-<?php printMLText("confirm_rm_transmittal", array ("name" => htmlspecialchars($rmtransmittal->getName())));?>
-</p>
 
-<p><button type="submit" class="btn"><i class="fa fa-remove"></i> <?php printMLText("rm_transmittal");?></button></p>
+<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_transmittal");?></button></p>
 
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index f073ca835..351fe54bf 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ReviseDocument view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ReviseDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ReviseDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
diff --git a/views/bootstrap/class.RevisionSummary.php b/views/bootstrap/class.RevisionSummary.php
index adfc54b55..fccc06735 100644
--- a/views/bootstrap/class.RevisionSummary.php
+++ b/views/bootstrap/class.RevisionSummary.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Include class to preview documents
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RevisionSummary extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
@@ -63,8 +63,8 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span6\">\n";
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("revision_summary"));
 //		$this->contentContainerStart();
 
@@ -122,8 +122,8 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
 		}
 
 //		$this->contentContainerEnd();
-		echo "</div>\n";
-		echo "<div class=\"span6\">\n";
+		$this->columnEnd();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("group_revision_summary"));
 //		$this->contentContainerStart();
 
@@ -167,8 +167,8 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Bootstrap_Style {
 		}
 
 //		$this->contentContainerEnd();
-		echo "</div>\n";
-		echo "</div>\n";
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 6e73fef93..ba1aaeda9 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for RoleMgr view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_RoleMgr extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_RoleMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$selrole = $this->params['selrole'];
@@ -80,7 +80,7 @@ $(document).ready( function() {
 			$this->contentHeading(getMLText("role_info"));
 			$users = $selrole->getUsers();
 			if($users) {
-				echo "<table class=\"table table-condensed\"><thead><tr><th>".getMLText('name')."</th><th></th></tr></thead><tbody>\n";
+				echo "<table class=\"table table-condensed table-sm\"><thead><tr><th>".getMLText('name')."</th><th></th></tr></thead><tbody>\n";
 				foreach($users as $currUser) {
 					echo "<tr>";
 					echo "<td>";
@@ -208,9 +208,9 @@ $(document).ready( function() {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 		$this->contentHeading(getMLText("role_management"));
+		$this->rowStart();
+		$this->columnStart(4);
 ?>
-<div class="row-fluid">
-<div class="span4">
 <form class="form-horizontal">
 <?php
 		$options = array();
@@ -235,21 +235,20 @@ $(document).ready( function() {
 	<div class="ajax" style="margin-bottom: 15px;" data-view="RoleMgr" data-action="actionmenu" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
 <?php if($accessop->check_view_access($this, array('action'=>'info'))) { ?>
 	<div class="ajax" data-view="RoleMgr" data-action="info" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
-<?php } ?>
-</div>
-
-<div class="span8">
+<?php
+	 	}
+		$this->columnEnd();
+		$this->columnStart(8);
+?>
 <?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
 	<div class="well">
 		<div class="ajax" data-view="RoleMgr" data-action="form" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
 	</div>
 <?php } else {
 	$this->errorMsg(getMLText('access_denied'));
-} ?>
-</div>
-</div>
-
-<?php
+}
+		$this->rowEnd();
+		$this->columnEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index e2caec493..841fc841f 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -14,7 +14,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for SchedulerTaskMgr view
@@ -25,7 +25,7 @@ require_once("class.Bootstrap.php");
  * @copyright  Copyright (C) 2013 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_SchedulerTaskMgr extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_SchedulerTaskMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
@@ -472,10 +472,8 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 		$this->contentHeading(getMLText("scheduler_task_mgr"));
-?>
-<div class="row-fluid">
-	<div class="span6">
-<?php
+		$this->rowStart();
+		$this->columnStart(6);
 		if(!empty($GLOBALS['SEEDDMS_SCHEDULER']['tasks'])) {
 			echo "<table class=\"table _table-condensed\">\n";
 			print "<thead>\n<tr>\n";
@@ -520,13 +518,14 @@ $(document).ready( function() {
 		}
 ?>
 		<div id="listtasks" class="ajax" data-view="SchedulerTaskMgr" data-action="tasklist"></div>
-  </div>
-	<div class="span6">
-		<div id="editaddtask" class="ajax" data-view="SchedulerTaskMgr" data-action="form"></div>
-	</div>
-</div>
-
 <?php
+		$this->columnEnd();
+		$this->columnStart(6);
+?>
+		<div id="editaddtask" class="ajax" data-view="SchedulerTaskMgr" data-action="form"></div>
+<?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index 7345fb9bb..cf6f9ba0d 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for SetRecipients view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2015 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_SetRecipients extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 10f2391fc..dd5c836f3 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for SetRevisors view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2015 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_SetRevisors extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index d2305fc0e..4280931b6 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for TransmittalMgr view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_TransmittalMgr extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_TransmittalMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$showtree = $this->params['showtree'];
@@ -223,37 +223,30 @@ $(document).ready( function() {
 	<input type="hidden" name="action" value="addtransmittal">
 <?php
 		}
-?>
-	<table class="table-condensed">
-<?php
-	if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'removetransmittal'))) {
-?>
-		<tr>
-			<td></td>
-			<td><a class="standardText btn" href="../out/out.RemoveTransmittal.php?transmittalid=<?php print $transmittal->getID();?>"><i class="fa fa-remove"></i> <?php printMLText("rm_transmittal");?></a></td>
-		</tr>
-<?php
-	}
-?>
-		<tr>
-			<td><?php printMLText("transmittal_name");?>:</td>
-			<td><input type="text" name="name" value="<?php print $transmittal ? htmlspecialchars($transmittal->getName()) : "";?>"></td>
-		</tr>
-		<tr>
-			<td><?php printMLText("transmittal_comment");?>:</td>
-			<td><input type="text" name="comment" value="<?php print $transmittal ? htmlspecialchars($transmittal->getComment()) : "";?>"></td>
-		</tr>
-<?php
+		$this->formField(
+			getMLText("name"),
+			array(
+				'element'=>'input',
+				'type'=>'text',
+				'id'=>'name',
+				'name'=>'name',
+				'value'=>($transmittal ? htmlspecialchars($transmittal->getName()) : '')
+			)
+		);
+		$this->formField(
+			getMLText("comment"),
+			array(
+				'element'=>'textarea',
+				'id'=>'comment',
+				'name'=>'comment',
+				'rows'=>4,
+				'value'=>($transmittal ? htmlspecialchars($transmittal->getComment()) : '')
+			)
+		);
 		if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'edittransmittal')) || !$transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'addtransmittal'))) {
-?>
-		<tr>
-			<td></td>
-			<td><button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText($transmittal ? "save" : "add_transmittal")?></button></td>
-		</tr>
-<?php
+			$this->formSubmit("<i class=\"fa fa-save\"></i> ".($transmittal ? getMLText('save') : getMLText('add_transmittal')));
 		}
 ?>
-	</table>
 	</form>
 <?php
 	} /* }}} */
@@ -279,7 +272,7 @@ $(document).ready( function() {
 		if($seltransmittal) {
 			$items = $seltransmittal->getItems();
 			if($items) {
-				print "<table class=\"table table-condensed\">";
+				print "<table class=\"table table-condensed table-sm\">";
 				print "<thead>\n<tr>\n";
 				print "<th></th>\n";
 				print "<th>".getMLText("name")."</th>\n";
@@ -326,23 +319,18 @@ $(document).ready( function() {
 		$accessop = $this->params['accessobject'];
 		$seltransmittal = $this->params['seltransmittal'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$this->htmlStartPage(getMLText("my_transmittals"));
 		$this->globalNavigation();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_transmittals"), "my_documents");
 		$this->contentHeading(getMLText("my_transmittals"));
-?>
-<div class="row-fluid">
-<div class="span4">
-<?php
-		$this->contentContainerStart();
+		$this->rowStart();
+		$this->columnStart(4);
 
 		$transmittals = $dms->getAllTransmittals($user);
 
 		if ($transmittals){
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("comment")."</th>\n";
@@ -358,6 +346,9 @@ $(document).ready( function() {
 				print "<td>";
 				print "<div class=\"list-action\">";
 				print "<a class=\"selecttransmittal\" data-transmittalid=\"".$transmittal->getID()."\" href=\"../out/out.TransmittalMgr.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("edit_transmittal_props")."\"><i class=\"fa fa-edit\"></i></a>";
+				if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'removetransmittal'))) {
+					print "<a data-transmittalid=\"".$transmittal->getID()."\" href=\"../out/out.RemoveTransmittal.php?transmittalid=".$transmittal->getID()."\" title=\"".getMLText("rm_transmittal")."\"><i class=\"fa fa-remove\"></i></a>";
+				}
 				print "</div>";
 				print "</td>";
 				print "</tr>\n";
@@ -365,11 +356,8 @@ $(document).ready( function() {
 			print "</tbody>\n</table>\n";
 		}
 
-		$this->contentContainerEnd();
-?>
-</div>
-<div class="span8">
-<?php
+		$this->columnEnd();
+		$this->columnStart(8);
 		if($accessop->check_view_access($this, array('action'=>'form'))) {
 		$this->contentContainerStart();
 ?>
@@ -382,10 +370,8 @@ $(document).ready( function() {
 		<div class="ajax" data-view="TransmittalMgr" data-action="items" <?php echo ($seltransmittal ? "data-query=\"transmittalid=".$seltransmittal->getID()."\"" : "") ?>></div>
 <?php
 		}
-?>
-</div>
-</div>
-<?php
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index b71725210..d94aac484 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -490,7 +490,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		if($versions === null)
 			$versions = $document->getContent();
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+//		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 		$this->htmlAddHeader('<link href="../styles/bootstrap/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-min.js"></script>'."\n", 'js');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-locales.js"></script>'."\n", 'js');
@@ -589,12 +589,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			}
 			if(is_array($receiptStatus) && count($receiptStatus)>0) {
 ?>
-		  <li class="<?php if($currenttab == 'recipients') echo 'active'; ?>"><a data-target="#recipients" data-toggle="tab"><?php echo getMLText('recipients'); ?></a></li>
+		  <li class="nav-item <?php if($currenttab == 'recipients') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'recipients') echo 'active'; ?>" data-target="#recipients" data-toggle="tab"><?php echo getMLText('recipients'); ?></a></li>
 <?php
 			}
 			if(is_array($revisionStatus) && count($revisionStatus)>0) {
 ?>
-		  <li class="<?php if($currenttab == 'revision') echo 'active'; ?>"><a data-target="#revision" data-toggle="tab"><?php echo getMLText('revise_document'); ?></a></li>
+		  <li class="nav-item <?php if($currenttab == 'revision') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'revision') echo 'active'; ?>" data-target="#revision" data-toggle="tab"><?php echo getMLText('revise_document'); ?></a></li>
 <?php
 			}
 ?>
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 83ce4efdd..0550e0b23 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -407,8 +407,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo "    <div class=\"dropdown-menu dropdown-menu-right\" aria-labelledby=\"navbarMainUser\">\n";
 			if (!$this->params['user']->isGuest()) {
 				$menuitems = array();
-				$menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php?inProcess=1", 'label'=>'my_documents');
-				$menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account');
+				if ($accessobject->check_view_access('MyDocuments'))
+					$menuitems['my_documents'] = array('link'=>"../out/out.MyDocuments.php?inProcess=1", 'label'=>'my_documents');
+				if ($accessobject->check_view_access('MyAccount'))
+					$menuitems['my_account'] = array('link'=>"../out/out.MyAccount.php", 'label'=>'my_account');
+				if ($accessobject->check_view_access('TransmittalMgr'))
+					$menuitems['my_transmittals'] = array('link'=>"../out/out.TransmittalMgr.php", 'label'=>'my_transmittals');
 				foreach($hookObjs as $hookObj) {
 					if (method_exists($hookObj, 'userMenuItems')) {
 						$menuitems = $hookObj->userMenuItems($this, $menuitems);
@@ -701,6 +705,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
 				if($accessobject->check_controller_access('LockDocument'))
 					$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid, 'label'=>getMLText('lock_document'));
+				if($document->isCheckedOut())
+					$menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>getMLText('checkin_document'));
+				else {
+					if($this->params['checkoutdir']) {
+						$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>getMLText('checkout_document'));
+					}
+				}
 				if($accessobject->check_controller_access('EditDocument'))
 					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>getMLText('edit_document_props'));
 				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
@@ -712,12 +723,19 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 						$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
 					if($accessobject->check_controller_access('UnlockDocument'))
 						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid, 'label'=>getMLText('unlock_document'));
+					if($document->isCheckedOut()) {
+						$menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>getMLText('checkin_document'));
+					} else {
+						if($this->params['checkoutdir']) {
+							$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>getMLText('checkout_document'));
+						}
+					}
 					if($accessobject->check_controller_access('EditDocument'))
 						$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>getMLText('edit_document_props'));
 					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
 				}
 			}
-			if($accessobject->maySetExpires()) {
+			if($accessobject->maySetExpires($document)) {
 				if ($accessobject->check_view_access('SetExpires'))
 					$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>getMLText('expires'));
 			}
@@ -767,6 +785,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 		$menuitems['edit_notify'] = array('link'=>"../out/out.ManageNotify.php", 'label'=>getMLText('edit_existing_notify'));
 
+		$menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'2_factor_auth');
+
 		if ($this->params['enableusersview']){
 			if ($accessobject->check_view_access('UsrView'))
 				$menuitems['users'] = array('link'=>"../out/out.UsrView.php", 'label'=>getMLText('users'));
@@ -797,6 +817,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if ($accessobject->check_view_access('WorkflowSummary'))
 				$menuitems['workflow_summary'] = array('link'=>"../out/out.WorkflowSummary.php", 'label'=>getMLText('workflow_summary'));
 		}
+		if ($accessobject->check_view_access('ReceiptSummary'))
+		$menuitems['receipt_summary'] = array('link'=>"../out/out.ReceiptSummary.php", 'label'=>getMLText('receipt_summary'));
+		if ($accessobject->check_view_access('RevisionSummary'))
+		$menuitems['revision_summary'] = array('link'=>"../out/out.RevisionSummary.php", 'label'=>getMLText('revision_summary'));
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
 		if($this->hasHook('mydocumentsNavigationBar'))
@@ -811,14 +835,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$settings = $this->params['settings'];
 
 		$menuitems = array();
-		if($accessobject->check_view_access(array('UsrMgr', 'GroupMgr', 'UserList'))) {
+		if($accessobject->check_view_access(array('UsrMgr', 'RoleMgr', 'GroupMgr', 'UserList', 'Acl'))) {
 			$menuitems['user_group_management'] = array('link'=>"#", 'label'=>getMLText('user_group_management'));
 			if ($accessobject->check_view_access('UsrMgr'))
 				$menuitems['user_group_management']['children']['user_management'] = array('link'=>"../out/out.UsrMgr.php", 'label'=>getMLText('user_management'));
+			if ($accessobject->check_view_access('RoleMgr'))
+				$menuitems['user_group_management']['children']['role_management'] = array('link'=>"../out/out.RoleMgr.php", 'label'=>getMLText('role_management'));
 			if ($accessobject->check_view_access('GroupMgr'))
 				$menuitems['user_group_management']['children']['group_management'] = array('link'=>"../out/out.GroupMgr.php", 'label'=>getMLText('group_management'));
 			if ($accessobject->check_view_access('UserList'))
 				$menuitems['user_group_management']['children']['user_list'] = array('link'=>"../out/out.UserList.php", 'label'=>getMLText('user_list'));
+			if ($accessobject->check_view_access('Acl'))
+				$menuitems['user_group_management']['children']['access_control'] = array('link'=>"../out/out.Acl.php", 'label'=>getMLText('access_control'));
 			}
 
 			if($accessobject->check_view_access(array('DefaultKeywords', 'Categories', 'AttributeMgr', 'WorkflowMgr', 'WorkflowStatesMgr', 'WorkflowActionsMgr'))) {
@@ -872,6 +900,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				$menuitems['misc']['children']['charts'] = array('link'=>"../out/out.Charts.php", 'label'=>getMLText('charts'));
 			if ($accessobject->check_view_access('Timeline'))
 				$menuitems['misc']['children']['timeline'] = array('link'=>"../out/out.Timeline.php", 'label'=>getMLText('timeline'));
+			if ($accessobject->check_view_access('SchedulerTaskMgr'))
+				$menuitems['misc']['children']['schedulertaskmgr'] = array('link'=>"../out/out.SchedulerTaskMgr.php", 'label'=>getMLText('scheduler_task_mgr'));
 			if ($accessobject->check_view_access('ObjectCheck'))
 				$menuitems['misc']['children']['objectcheck'] = array('link'=>"../out/out.ObjectCheck.php", 'label'=>getMLText('objectcheck'));
 			if ($accessobject->check_view_access('ExpiredDocuments'))
@@ -884,6 +914,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				$menuitems['misc']['children']['version_info'] = array('link'=>"../out/out.Info.php", 'label'=>getMLText('version_info'));
 		}
 
+		if ($settings->_enableDebugMode) {
+		$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
+		if ($accessobject->check_view_access('Hooks'))
+		$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
+		}
+
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
 		if($this->hasHook('admintoolsNavigationBar'))
 			$menuitems = $this->callHook('admintoolsNavigationBar', $menuitems);
@@ -1440,12 +1476,15 @@ $(document).ready(function() {
 		$content .= "</select>";
 		return $content;
 	} /* }}} */
-
-	function getDocumentChooserHtml($form, $default=false, $formname='', $skiptree=false) { /* {{{ */
+	
+	function getDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0, $skiptree=false) { /* {{{ */
 		if(!$formname)
 			$formname = "docid";
 		$formid = md5($formname.$form);
-
+		if(!$folder)
+			$folderid = $this->params['dms']->getRootFolder()->getId();
+		else
+			$folderid = $folder->getID();
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-group\">\n";
@@ -1456,7 +1495,7 @@ $(document).ready(function() {
 			$content .= $this->getModalBoxLink(
 				array(
 					'target' => 'docChooser'.$formid,
-					'remote' => "../out/out.DocumentChooser.php?form=".$formid."&folderid=".$this->params['dms']->getRootFolder()->getId(),
+					'remote' => "../out/out.DocumentChooser.php?form=".$formid."&folderid=".$folderid."&partialtree=".$partialtree,
 					'title' => getMLText('document')
 				));
 		$content .= "</div>\n";
@@ -1473,8 +1512,8 @@ $(document).ready(function() {
 		return $content;
 	} /* }}} */
 
-	function printDocumentChooserHtml($formName) { /* {{{ */
-		echo self::getDocumentChooserHtml($formName);
+	function printDocumentChooserHtml($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
+		echo self::getDocumentChooserHtml($form, $accessMode, $exclude, $default, $formname, $folder, $partialtree);
 	} /* }}} */
 
 	/**
@@ -1497,8 +1536,8 @@ function folderSelected<?php echo $formid ?>(id, name) {
 <?php
 	} /* }}} */
 
-	function printDocumentChooser($form) { /* {{{ */
-		$this->printDocumentChooserHtml($form);
+	function printDocumentChooser($form, $accessMode=M_READ, $exclude = -1, $default = false, $formname = '', $folder='', $partialtree=0) { /* {{{ */
+		$this->printDocumentChooserHtml($form, $accessMode, $exclude, $default, $formname, $folder, $partialtree);
 ?>
 		<script language="JavaScript">
 <?php
@@ -1767,7 +1806,7 @@ $(document).ready(function() {
 				$target = $dms->getDocument($objvalue);
 			else
 				$target = null;
-			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), $target, $fieldname."[".$attrdef->getId()."]");
+			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), M_READ, -1, $target, $fieldname."[".$attrdef->getId()."]");
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_user:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : $attribute) : array();
@@ -2031,7 +2070,7 @@ $(document).ready(function() {
 	 * @param boolean $partialtree set to true if the given folder is the start folder
 	 */
 	function printNewTreeNavigationJs($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='', $partialtree=false) { /* {{{ */
-		function jqtree($path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) { /* {{{ */
+		function jqtree($obj, $path, $folder, $user, $accessmode, $showdocs=1, $expandtree=0, $orderby='', $level=0) { /* {{{ */
 			$orderdir = (isset($orderby[1]) ? ($orderby[1] == 'd' ? 'desc' : 'asc') : 'asc');
 			if($path/* || $expandtree>=$level*/) {
 				if($path)
@@ -2047,10 +2086,12 @@ $(document).ready(function() {
 					$node = array('label'=>$subfolder->getName(), 'id'=>$subfolder->getID(), 'load_on_demand'=>(1 && ($subfolder->hasSubFolders() || ($subfolder->hasDocuments() && $showdocs))) ? true : false, 'is_folder'=>true);
 					/* if the subfolder is in the path then further unfold the tree. */
 					if(/*$expandtree>=$level ||*/ $path && ($path[0]->getID() == $subfolder->getID())) {
-						$node['children'] = jqtree($path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
+						$node['children'] = jqtree($obj, $path, $subfolder, $user, $accessmode, $showdocs, $expandtree, $orderby, $level+1);
 						if($showdocs) {
 							$documents = $subfolder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 							$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, $accessmode);
+							if($obj->hasHook('filterTreeDocuments'))
+								$documents = $obj->callHook('filterTreeDocuments', $folder, $documents);
 							foreach($documents as $document) {
 								$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
 								$node['children'][] = $node2;
@@ -2085,10 +2126,12 @@ $(document).ready(function() {
 				$node['load_on_demand'] = true;
 				$node['children'] = array();
 			} else {
-				$node['children'] = jqtree($path, $folder, $this->params['user'], $accessmode, $showdocs, 1 /*$expandtree*/, $orderby, 0);
+				$node['children'] = jqtree($this, $path, $folder, $this->params['user'], $accessmode, $showdocs, 1 /*$expandtree*/, $orderby, 0);
 				if($showdocs) {
 					$documents = $folder->getDocuments(isset($orderby[0]) ? $orderby[0] : '', $orderdir);
 					$documents = SeedDMS_Core_DMS::filterAccess($documents, $this->params['user'], $accessmode);
+					if($this->hasHook('filterTreeDocuments'))
+						$documents = $this->callHook('filterTreeDocuments', $folder, $documents);
 					foreach($documents as $document) {
 						$node2 = array('label'=>$document->getName(), 'id'=>$document->getID(), 'load_on_demand'=>false, 'is_folder'=>false);
 						$node['children'][] = $node2;
@@ -2916,6 +2959,29 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			} else {
 				$content .= getOverallStatusText($status["status"]);
 			}
+			if($accessop->check_view_access($this, array('action'=>'receptionBar')) /*$owner->getID() == $user->getID()*/ && $receiptStatus = $latestContent->getReceiptStatus()) {
+				$rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0);
+				$allcomments = array('-1'=>array(), '1'=>array());
+				foreach ($receiptStatus as $r) {
+					$rstat[''.$r['status']]++;
+					if($r['comment']) {
+//						$allcomments[''.$r['status']][] = htmlspecialchars($r['comment']);
+						$m5 = md5(trim($r['comment']));
+						if(isset($allcomments[''.$r['status']][$m5]))
+							$allcomments[''.$r['status']][$m5]['n']++;
+						else
+							$allcomments[''.$r['status']][$m5] = array('n'=>1, 'c'=>htmlspecialchars(trim($r['comment'])));
+					}
+				}
+				$totalreceipts = $rstat['-1'] + $rstat['0'] + $rstat['1'];
+				if($totalreceipts) {
+					$content .= "
+<div class=\"progress\">
+<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
+	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
+</div>";
+				}
+			}
 			$content .= "</small></td>";
 //				$content .= "<td>".$version."</td>";
 			$content .= "<td>";
@@ -3301,6 +3367,12 @@ $(document).ready(function() {
 		case "approval":
 			$statusList = $latestContent->getApprovalStatus(10);
 			break;
+		case "revision":
+			$statusList = $latestContent->getRevisionStatus(10);
+			break;
+		case "receipt":
+			$statusList = $latestContent->getReceiptStatus(10);
+			break;
 		default:
 			$statusList = array();
 		}
@@ -3363,6 +3435,12 @@ $(document).ready(function() {
 			case "approval":
 				echo getApprovalStatusText($rec["status"]);
 				break;
+			case "revision":
+				echo getRevisionStatusText($rec["status"]);
+				break;
+			case "receipt":
+				echo getReceiptStatusText($rec["status"]);
+				break;
 			default:
 			}
 			echo "</td>";
diff --git a/views/bootstrap4/styles/styles.css b/views/bootstrap4/styles/styles.css
index 9925c6347..cafd95ac5 100644
--- a/views/bootstrap4/styles/styles.css
+++ b/views/bootstrap4/styles/styles.css
@@ -17,7 +17,7 @@ ul.jqtree-tree .jqtree-title {
 ul.jqtree-tree .jqtree-title.jqtree-title-folder {
 	margin-left: 0.3em;
 }
-ul.jqtree-tree .jqtree-element {
+#jqtreemaintree ul.jqtree-tree .jqtree-element {
 	display: initial;
 }
 

From 81f091a44d58b76e0a3867023b813ef856abe2d3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Apr 2021 19:54:24 +0200
Subject: [PATCH 1393/2006] fix class for list a actions

---
 views/bootstrap/class.ViewDocument.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index d94aac484..26c46ffd8 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1372,7 +1372,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 					}
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
-					print "<td><ul class=\"unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
+					print "<td><ul class=\"actions unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
 					/* $updateUser is the user who has done the receipt */
 					$updateUser = $dms->getUser($r["userID"]);
 					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li>";
@@ -1382,7 +1382,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 					if($class)
 						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
 					print getReceiptStatusText($r["status"])."</td>\n";
-					print "<td><ul class=\"unstyled\">";
+					print "<td><ul class=\"actions unstyled\">";
 					if($accesserr)
 						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 					if($accessobject->mayReceipt($document)) {
@@ -1504,7 +1504,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 				if($user->isAdmin() || $r["status"] != -2) {
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
-					print "<td><ul class=\"unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
+					print "<td><ul class=\"actions unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
 					/* $updateUser is the user who has done the revision */
 					$updateUser = null;
 					if($r['status'] != 0) {
@@ -1517,7 +1517,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 					if($class)
 						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
 					print getRevisionStatusText($r["status"])."</td>\n";
-					print "<td><ul class=\"unstyled\">";
+					print "<td><ul class=\"actions unstyled\">";
 					if($accesserr)
 						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 					if($accessobject->mayRevise($document)) {

From 993a8056ece65bdfbb78d07e8c7501829417c350 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Apr 2021 08:38:52 +0200
Subject: [PATCH 1394/2006] convert checkout date to readable date

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 26c46ffd8..1a9759d4c 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -206,7 +206,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			foreach($infos as $info) {
 				$checkoutuser = $dms->getUser($info['userID']);
 				echo "<div class=\"alert alert-info\">";
-				echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>$info['date'], 'filename'=>substr($info['filename'], strlen($checkoutpath)+1), 'username'=>($checkoutuser ? $checkoutuser->getFullName() : '')))."</a>";
+				echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>getLongReadableDate(makeTsFromLongDate($info['date'])), 'filename'=>substr($info['filename'], strlen($checkoutpath)+1), 'username'=>($checkoutuser ? $checkoutuser->getFullName() : '')))."</a>";
 				echo "</div>";
 			}
 		}

From 7bdf60ebbff4349debc6780062d5c5d296a5005b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Apr 2021 17:44:17 +0200
Subject: [PATCH 1395/2006] update execute() to meet latest changes in passed
 parameters

---
 ext/example/class.example.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ext/example/class.example.php b/ext/example/class.example.php
index a0a5814a3..c01d3acfd 100644
--- a/ext/example/class.example.php
+++ b/ext/example/class.example.php
@@ -183,10 +183,13 @@ class SeedDMS_ExtExample_Task extends SeedDMS_SchedulerTaskBase {
 	 * Run the task
 	 *
 	 * @param $task task to be executed
-	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
-	public function execute($task, $dms, $user) {
+	public function execute($task) {
+		$dms = $this->dms;
+		$user = $this->user;
+    $settings = $this->settings;
+    $logger = $this->logger;
 		$taskparams = $task->getParameter();
 		return true;
 	}

From 15c281095dfbed5e0f088eb5c3f5d890926b5700 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Apr 2021 09:28:07 +0200
Subject: [PATCH 1396/2006] set placeholder for frequency

---
 views/bootstrap/class.SchedulerTaskMgr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 841fc841f..81e5faaf8 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -149,6 +149,7 @@ $(document).ready( function() {
 					'name'=>'frequency',
 					'value'=>'',
 					'required'=>true,
+					'placeholder'=>getMLText('task_frequency_placeholder'),
 				)
 			);
 			$this->formField(

From 6a9def5358bb61982c2ae10969bbdb5968520ed9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Apr 2021 09:28:25 +0200
Subject: [PATCH 1397/2006] issue warning if full text search is disabled

---
 inc/inc.Tasks.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index a7cc19c83..246f5cb8b 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -193,11 +193,13 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 					}
 				}
 			}
-		}
 
-		$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($fulltextservice, $recreate);
-		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
-		call_user_func(array($folderprocess, 'process'), $folder);
+			$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($fulltextservice, $recreate);
+			$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
+			call_user_func(array($folderprocess, 'process'), $folder);
+		} else {
+			$logger->log('Task \'indexingdocs\': fulltext search is turned off', PEAR_LOG_WARNING);
+		}
 
 		return true;
 	}

From 73a7f8a5f2cef8f8e8e8d2a9a55cdcbe7cabf776 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Apr 2021 14:31:36 +0200
Subject: [PATCH 1398/2006] cancel checkout needs confirmation

---
 op/op.CancelCheckOut.php                  |  4 ++++
 views/bootstrap/class.CheckInDocument.php | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/op/op.CancelCheckOut.php b/op/op.CancelCheckOut.php
index c3a1ce270..bed1b5013 100644
--- a/op/op.CancelCheckOut.php
+++ b/op/op.CancelCheckOut.php
@@ -41,6 +41,10 @@ if(empty($settings->_enableCancelCheckout)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("operation_disallowed"));
 }
 
+if(empty($_POST['confirm'])) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("operation_disallowed"));
+}
+
 $document->cancelCheckOut($comment);
 if (is_bool($result) && !$result) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index b1c728d21..6654af4f9 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -698,7 +698,16 @@ $(document).ready(function() {
 <form class="form-horizontal" action="../op/op.CancelCheckOut.php" method="post">
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 <?php
-	echo createHiddenFieldWithKey('cancelcheckout');
+			echo createHiddenFieldWithKey('cancelcheckout');
+			$this->formField(
+				getMLText("checkout_cancel_confirm"),
+				array(
+					'element'=>'input',
+					'type'=>'checkbox',
+					'name'=>'confirm',
+					'value'=>1
+				)
+			);
 			$this->formSubmit(getMLText('cancel_checkout'));
 ?>
 </form>
@@ -710,7 +719,8 @@ $(document).ready(function() {
 <form action="../op/op.CancelCheckOut.php" method="post">
 	<?php echo createHiddenFieldWithKey('cancelcheckout'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
-	<input type="submit" class="btn" value="<?php printMLText("cancel_checkout"); ?>">
+	<input type="hidden" name="confirm" value="1">
+	<input type="submit" class="btn btn-danger" value="<?php printMLText("cancel_checkout"); ?>">
 </form>
 <?php
 		}

From c9ae939bff384d0c7ad897af304e71927c33b855 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Apr 2021 14:32:47 +0200
Subject: [PATCH 1399/2006] add entry for 6.0.16

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 09af37fc2..4bc0ba28e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.16
 --------------------------------------------------------------------------------
+- cancel checkout needs confirmation
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.15

From fa241482c092a6181a087cf2cc9059bd002670a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Apr 2021 14:41:30 +0200
Subject: [PATCH 1400/2006] set type='danger' of submit button

---
 views/bootstrap/class.CheckInDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 6654af4f9..b14b43701 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -708,7 +708,7 @@ $(document).ready(function() {
 					'value'=>1
 				)
 			);
-			$this->formSubmit(getMLText('cancel_checkout'));
+			$this->formSubmit(getMLText('cancel_checkout'), '', '', 'danger');
 ?>
 </form>
 <?php

From 4c47d69a88a1519546634974db5704a9cd767913 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 23 Apr 2021 12:51:31 +0200
Subject: [PATCH 1401/2006] remove old html code

---
 views/bootstrap/class.MyDocuments.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 538eafb21..9cbde242a 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -732,8 +732,6 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 
-		echo '<div class="row-fluid">';
-		echo '<div class="span3">';
 		$this->rowStart();
 		$this->columnStart(3);
 		$this->contentHeading(getMLText("my_documents"));

From cad9e24ec3d9bb6ed812cf0499c3f6238d23a7d6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Apr 2021 07:27:31 +0200
Subject: [PATCH 1402/2006] fix progress bars of reception

---
 views/bootstrap4/class.Bootstrap4.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index f7dd11292..6c3b90c40 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -3005,8 +3005,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				if($totalreceipts) {
 					$content .= "
 <div class=\"progress\">
-<div class=\"bar bar-success\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
-	<div class=\"bar bar-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
+<div class=\"progress-bar bar bar-success bg-success\" role=\"progress-bar\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
+	<div class=\"progress-bar bar bar-danger bg-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
 </div>";
 				}
 			}

From e279a2f8e824ace0a28f257a6824294b9ceb0767 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 27 Apr 2021 22:17:26 +0200
Subject: [PATCH 1403/2006] do not prevent events, otherwise the checkbox
 doesn't work anymore

---
 views/bootstrap/class.RemoveUserFromProcesses.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index a634104cb..b2d1f2cf1 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -36,7 +36,7 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Theme_Style {
 ?>
 $(document).ready( function() {
   $('body').on('click', 'label.checkbox', function(ev){
-    ev.preventDefault();
+//    ev.preventDefault();
     $('#kkkk.ajax').data('action', $(this).data('action'));
     $('#kkkk.ajax').trigger('update', {userid: $(this).data('userid'), task: $(this).   data('task')});
   });

From a7deac79482903d44dab106355faf3bb83e195fc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Apr 2021 07:05:15 +0200
Subject: [PATCH 1404/2006] removeFromProcess() writes into log when a user was
 replaced (not just removed)

---
 SeedDMS_Core/Core/inc.ClassUser.php | 8 ++++----
 SeedDMS_Core/package.xml            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index e689d54b8..8755d2bee 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -946,7 +946,7 @@ class SeedDMS_Core_User { /* {{{ */
 		foreach ($reviewStatus["indstatus"] as $ri) {
 			if($ri['status'] != -2 && (!isset($states['review']) || in_array($ri['status'], $states['review']))) {
 				$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+					"VALUES ('". $ri["reviewID"] ."', '-2', '".($newuser ? 'Reviewer replaced by '.$newuser->getLogin() : 'Reviewer removed from process')."', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if(!$res) {
 					$db->rollbackTransaction();
@@ -975,7 +975,7 @@ class SeedDMS_Core_User { /* {{{ */
 		foreach ($approvalStatus["indstatus"] as $ai) {
 			if($ai['status'] != -2 && (!isset($states['approval']) || in_array($ai['status'], $states['approval']))) {
 				$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+					"VALUES ('". $ai["approveID"] ."', '-2', '".($newuser ? 'Approver replaced by '.$newuser->getLogin() : 'Approver removed from process')."', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if(!$res) {
 					$db->rollbackTransaction();
@@ -1004,7 +1004,7 @@ class SeedDMS_Core_User { /* {{{ */
 		foreach ($receiptStatus["indstatus"] as $ri) {
 			if($ri['status'] != -2 && (!isset($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
 				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+					"VALUES ('". $ri["receiptID"] ."', '-2', '".($newuser ? 'Recipient replaced by '.$newuser->getLogin() : 'Recipient removed from process')."', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if(!$res) {
 					$db->rollbackTransaction();
@@ -1033,7 +1033,7 @@ class SeedDMS_Core_User { /* {{{ */
 		foreach ($revisionStatus["indstatus"] as $ri) {
 			if($ri['status'] != -2 && (!isset($states['revision']) || in_array($ri['status'], $states['revision']))) {
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
-					"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+					"VALUES ('". $ri["revisionID"] ."', '-2', '".($newuser ? 'Revisor replaced by '.$newuser->getLogin() : 'Revisor removed from process')."', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
 				if(!$res) {
 					$db->rollbackTransaction();
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 69e8a24a9..cc3b2a1cc 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- no changes 
+- removeFromProcesses() documents in comment of log when a user was replaced
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 2c7ab1cfb1d5d926f37a01503b450fadff312703 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Apr 2021 14:24:40 +0200
Subject: [PATCH 1405/2006] move checkForDueRevisionWorkflow() into document
 version

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 96 ++++++++++++++-----------
 1 file changed, 56 insertions(+), 40 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 21dc3ad94..72a9bb9a7 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -898,14 +898,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Check if latest content of the document has a scheduled
 	 * revision workflow.
-	 * The method will update the document status log database table
-	 * if needed and set the revisiondate of the content to $next.
 	 *
-	 * FIXME: This method does not check if there are any revisors left. Even
-	 * if all revisors have been removed, it will still start the revision workflow!
-	 * NOTE: This seems not the case anymore. The status of each revision is
-	 * checked. Only if at least one status is S_LOG_SLEEPING the revision will be
-	 * started. This wouldn't be the case if all revisors had been removed.
+	 * This method was moved into SeedDMS_Core_DocumentContent and
+	 * the original method in SeedDMS_Core_Document now uses it for
+	 * the latest version.
 	 *
 	 * @param object $user user requesting the possible automatic change
 	 * @param string $next next date for review
@@ -914,39 +910,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function checkForDueRevisionWorkflow($user, $next=''){ /* {{{ */
 		$lc=$this->getLatestContent();
 		if($lc) {
-			$st=$lc->getStatus();
-
-			/* A revision workflow will only be started if the document is released */
-			if($st["status"] == S_RELEASED) {
-				/* First check if there are any scheduled revisions currently sleeping */
-				$pendingRevision=false;
-				unset($this->_revisionStatus);  // force to be reloaded from DB
-				$revisionStatus=$lc->getRevisionStatus();
-				if (is_array($revisionStatus) && count($revisionStatus)>0) {
-					foreach ($revisionStatus as $a){
-						if ($a["status"]==S_LOG_SLEEPING || $a["status"]==S_LOG_SLEEPING){
-							$pendingRevision=true;
-							break;
-						}
-					}
-				}
-				if(!$pendingRevision)
-					return false;
-
-				/* We have sleeping revision, next check if the revision is already due */
-				if($lc->getRevisionDate() && $lc->getRevisionDate() <= date('Y-m-d 00:00:00')) {
-					if($lc->startRevision($user, 'Automatic start of revision workflow scheduled for '.$lc->getRevisionDate())) {
-						if($next) {
-							$tmp = explode('-', substr($next, 0, 10));
-							if(checkdate($tmp[1], $tmp[2], $tmp[0]))
-								$lc->setRevisionDate($next);
-						} else {
-							$lc->setRevisionDate(false);
-						}
-						return true;
-					}
-				}
-			}
+			return $lc->checkForDueRevisionWorkflow($user, $next);
 		}
 		return false;
 	} /* }}} */
@@ -4503,6 +4467,58 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Check if document version has a scheduled revision workflow.
+	 * The method will update the document status log database table
+	 * if needed and set the revisiondate of the content to $next.
+	 *
+	 * FIXME: This method does not check if there are any revisors left. Even
+	 * if all revisors have been removed, it will still start the revision workflow!
+	 * NOTE: This seems not the case anymore. The status of each revision is
+	 * checked. Only if at least one status is S_LOG_SLEEPING the revision will be
+	 * started. This wouldn't be the case if all revisors had been removed.
+	 *
+	 * @param object $user user requesting the possible automatic change
+	 * @param string $next next date for review
+	 * @return boolean true if status has changed
+	 */
+	function checkForDueRevisionWorkflow($user, $next=''){ /* {{{ */
+		$st=$this->getStatus();
+
+		/* A revision workflow will only be started if the document version is released */
+		if($st["status"] == S_RELEASED) {
+			/* First check if there are any scheduled revisions currently sleeping */
+			$pendingRevision=false;
+			unset($this->_revisionStatus);  // force to be reloaded from DB
+			$revisionStatus=$this->getRevisionStatus();
+			if (is_array($revisionStatus) && count($revisionStatus)>0) {
+				foreach ($revisionStatus as $a){
+					if ($a["status"]==S_LOG_SLEEPING || $a["status"]==S_LOG_SLEEPING){
+						$pendingRevision=true;
+						break;
+					}
+				}
+			}
+			if(!$pendingRevision)
+				return false;
+
+			/* We have sleeping revision, next check if the revision is already due */
+			if($this->getRevisionDate() && $this->getRevisionDate() <= date('Y-m-d 00:00:00')) {
+				if($this->startRevision($user, 'Automatic start of revision workflow scheduled for '.$this->getRevisionDate())) {
+					if($next) {
+						$tmp = explode('-', substr($next, 0, 10));
+						if(checkdate($tmp[1], $tmp[2], $tmp[0]))
+							$this->setRevisionDate($next);
+					} else {
+						$this->setRevisionDate(false);
+					}
+					return true;
+				}
+			}
+		}
+		return false;
+	} /* }}} */
+
 	function addIndReviewer($user, $requestUser) { /* {{{ */
 		$db = $this->_document->getDMS()->getDB();
 

From e128e0e9dd825b22f46e015ec7c1971d368ddcf4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 28 Apr 2021 14:26:34 +0200
Subject: [PATCH 1406/2006] add changes for 6.0.16

---
 SeedDMS_Core/package.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index cc3b2a1cc..2f26f0664 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,8 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - removeFromProcesses() documents in comment of log when a user was replaced
+- move SeedDMS_Core_Document::checkForDueRevisionWorkflow() into SeedDMS_Core_DocumentContent
+  and add a wrapper method in SeedDMЅ_Core_Document
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 4d471ed592b84dea51147afb756cc24d6c7857cb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 30 Apr 2021 09:25:11 +0200
Subject: [PATCH 1407/2006] fix layout of recipient list, add field to filter
 table rows

---
 views/bootstrap/class.ViewDocument.php | 42 ++++++++++++++++++--------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 1a9759d4c..ad9027a3c 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -168,6 +168,16 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 
 		header('Content-Type: application/javascript; charset=UTF-8');
 		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+?>
+		$(document).ready(function(){
+			$("#filterRecipientsInput").on("keyup", function() {
+				var value = $(this).val().toLowerCase();
+				$("#filterRecipientsTable tbody tr").filter(function() {
+					$(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+				});
+			});
+		});
+<?php
 		if($user->isAdmin()) {
 			$latestContent = $this->callHook('documentLatestContent', $document);
 			if($latestContent === null)
@@ -1307,15 +1317,22 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			if(is_string($txt))
 				echo $txt;
 
-			print "<table class=\"table table-condensed\">\n";
+			if(count($receiptStatus) > 8) {
+				echo '<input type="text" id="filterRecipientsInput" placeholder="'.getMLText('type_to_filter').'">';
+			}
 
+			print "<table id=\"filterRecipientsTable\" class=\"table table-condensed table-sm\">\n";
+
+			print "<thead>\n";
 			print "<tr>\n";
-			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
-			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";
-			print "<td width='25%'><b>".getMLText("comment")."</b></td>";
-			print "<td width='15%'><b>".getMLText("status")."</b></td>\n";
-			print "<td width='20%'></td>\n";
+			print "<th width='20%'>".(($count($receiptStatus) > 5) ? '<input type="text" id="filterRecipientsInput" placeholder="'.getMLText('type_to_filter').'">' : getMLText('name'))."</th>\n";
+			print "<th width='20%'>".getMLText("last_update")."</th>\n";
+			print "<th width='25%'>".getMLText("comment")."</th>";
+			print "<th width='15%'>".getMLText("status")."</th>\n";
+			print "<th width='20%'></th>\n";
 			print "</tr>\n";
+			print "</thead>\n";
+			print "<tbody>\n";
 
 			$stat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0);
 			foreach ($receiptStatus as $r) {
@@ -1372,11 +1389,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 					}
 					print "<tr>\n";
 					print "<td>".$reqName."</td>\n";
-					print "<td><ul class=\"actions unstyled\"><li>".getLongReadableDate($r["date"])."</li>";
+					print "<td>".getLongReadableDate($r["date"])."<br />";
 					/* $updateUser is the user who has done the receipt */
 					$updateUser = $dms->getUser($r["userID"]);
-					print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li>";
-					print "</ul></td>";
+					print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'");
+					print "</td>";
 					print "<td>".htmlspecialchars($r["comment"])."</td>\n";
 					print "<td>";
 					if($class)
@@ -1400,6 +1417,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 				}
 			}
 ?>
+			<tbody>
 		</table>
 <?php
 //			$this->contentContainerEnd();
@@ -1410,9 +1428,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			<div class="row-fluid">
 			<div class="span12">
 <div class="progress">
-<div class="bar bar-success" style="width: <?php echo round($stat['1']/$totalreceipts*100); ?>%;"><?php echo ($stat['1'] ? $stat['1']."/".$totalreceipts : ''); ?></div>
+<div class="progress-bar bar bar-success bg-success" style="width: <?php echo round($stat['1']/$totalreceipts*100); ?>%;"><?php echo ($stat['1'] ? $stat['1']."/".$totalreceipts : ''); ?></div>
 <!-- div class="bar bar-warning" style="width: <?php echo round($stat['0']/$totalreceipts*100); ?>%;"></div -->
-	<div class="bar bar-danger" style="width: <?php echo round($stat['-1']/$totalreceipts*100); ?>%;"><?php echo ($stat['-1'] ? $stat['-1']."/".$totalreceipts : ''); ?></div>
+	<div class="progress-bar bar bar-danger bg-danger" style="width: <?php echo round($stat['-1']/$totalreceipts*100); ?>%;"><?php echo ($stat['-1'] ? $stat['-1']."/".$totalreceipts : ''); ?></div>
 </div>
 			</div>
 			</div>
@@ -1449,7 +1467,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 <?php
 				} */
 //			$this->contentContainerStart();
-			print "<table class=\"table table-condensed\">\n";
+			print "<table class=\"table table-condensed table-sm\">\n";
 
 			print "<tr>\n";
 			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";

From 4a678ad1ec0512f792e158fa92c4f06bbe44f364 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 30 Apr 2021 09:31:50 +0200
Subject: [PATCH 1408/2006] escape workflow name, fix counting recipients

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index ad9027a3c..e6fbef655 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -832,7 +832,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 				echo "</thead><tbody>";
 				foreach($wkflogt as $wkflog) {
 					echo "<tr>";
-					echo "<td>".$wkflog->getWorkflow()->getName()."</td>";
+					echo "<td>".htmlspecialchars($wkflog->getWorkflow()->getName())."</td>";
 					echo "<td>".$wkflog->getDate()."</td>";
 					echo "<td>".htmlspecialchars($wkflog->getTransition()->getAction()->getName())."</td>";
 					$loguser = $wkflog->getUser();
@@ -1325,7 +1325,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 
 			print "<thead>\n";
 			print "<tr>\n";
-			print "<th width='20%'>".(($count($receiptStatus) > 5) ? '<input type="text" id="filterRecipientsInput" placeholder="'.getMLText('type_to_filter').'">' : getMLText('name'))."</th>\n";
+			print "<th width='20%'>".((count($receiptStatus) > 5) ? '<input type="text" id="filterRecipientsInput" placeholder="'.getMLText('type_to_filter').'">' : getMLText('name'))."</th>\n";
 			print "<th width='20%'>".getMLText("last_update")."</th>\n";
 			print "<th width='25%'>".getMLText("comment")."</th>";
 			print "<th width='15%'>".getMLText("status")."</th>\n";

From 30eadac7cdf4c09196a3251e4f861b42fbb7bcb2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 30 Apr 2021 11:48:03 +0200
Subject: [PATCH 1409/2006] move filter field for recipients into head of table

---
 views/bootstrap/class.ViewDocument.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 4b07ab20a..3069928b5 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1317,15 +1317,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			if(is_string($txt))
 				echo $txt;
 
-			if(count($receiptStatus) > 8) {
-				echo '<input type="text" id="filterRecipientsInput" placeholder="'.getMLText('type_to_filter').'">';
-			}
-
 			print "<table id=\"filterRecipientsTable\" class=\"table table-condensed table-sm\">\n";
 
 			print "<thead>\n";
 			print "<tr>\n";
-			print "<th width='20%'>".((count($receiptStatus) > 5) ? '<input type="text" id="filterRecipientsInput" placeholder="'.getMLText('type_to_filter').'">' : getMLText('name'))."</th>\n";
+			print "<th width='20%'>".((count($receiptStatus) > 10) ? '<input type="text" id="filterRecipientsInput" placeholder="'.getMLText('type_to_filter').'">' : getMLText('name'))."</th>\n";
 			print "<th width='20%'>".getMLText("last_update")."</th>\n";
 			print "<th width='25%'>".getMLText("comment")."</th>";
 			print "<th width='15%'>".getMLText("status")."</th>\n";

From bb5a79ba70e006a52a054f1b2fa5fe66e8caee8e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 30 Apr 2021 11:48:28 +0200
Subject: [PATCH 1410/2006] add changes for 6.0.16

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 615613127..f3f57e113 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.16
 --------------------------------------------------------------------------------
 - cancel checkout needs confirmation
+- add input field to filter list of recipients if more then 10
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.15

From db8e6f3ac67b7ab098ab881e6f2ae7c65d403c76 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 1 May 2021 13:07:09 +0200
Subject: [PATCH 1411/2006] fix call of constructor SeedDMS_AccessOperation()

---
 inc/inc.ClassUI.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 4114cb7f2..3d288427d 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -184,7 +184,7 @@ class UI extends UI_Default {
 
 	static function exitError($pagetitle, $error, $noexit=false, $plain=false) {
 		global $theme, $dms, $user, $settings;
-		$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+		$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 		$view = UI::factory($theme, 'ErrorDlg');
 		$view->setParam('dms', $dms);
 		$view->setParam('user', $user);

From 113db3fb017a678a13259ce940e79865bcf7a3c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 2 May 2021 07:53:20 +0200
Subject: [PATCH 1412/2006] change type of badge depending on count

---
 views/bootstrap/class.Bootstrap.php   | 2 +-
 views/bootstrap4/class.Bootstrap4.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 99567efa8..7b5ad6030 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -670,7 +670,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$content .= ' '.$attr[0].'="'.$attr[1].'"';
 			$content .= '>';
 			$content .= $menuitem['label'];
-			$content .= '<span class="badge badge-right">'.$menuitem['badge']."</span>";
+			$content .= '<span class="badge'.($menuitem['badge'] > 0 ? ' badge-info' : '').' badge-right">'.$menuitem['badge']."</span>";
 			$content .= '    </a>'."\n";
 			$content .= "  </li>\n";
 		}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 6aabb0104..2e858e2fe 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -590,7 +590,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			$content .= '>';
 			$content .= $menuitem['label'];
 			$content .= '    </a>'."\n";
-			$content .= '<span class="badge badge-primary badge-pill">'.$menuitem['badge']."</span>";
+			$content .= '<span class="badge'.($menuitem['badge'] > 0 ? ' badge-primary' : ' badge-secondary').' badge-pill">'.$menuitem['badge']."</span>";
 			$content .= "  </li>\n";
 		}
 

From 29e9907c891594c15054b55680c54b68183515ab Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 2 May 2021 07:54:02 +0200
Subject: [PATCH 1413/2006] use showNavigationListWithBadges()

---
 views/bootstrap/class.ObjectCheck.php | 48 +++++++++++++--------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 7594eea8c..959703b74 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -545,7 +545,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$this->printClickDocumentJs();
 ?>
 $(document).ready( function() {
-	$('body').on('click', 'ul.bs-docs-sidenav li a', function(ev){
+	$('body').on('click', 'ul.sidenav li a', function(ev){
 		ev.preventDefault();
 		$('#kkkk.ajax').data('action', $(this).data('action'));
 		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
@@ -600,39 +600,37 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
-		echo '<div class="row-fluid">';
-		echo '<div class="span3">';
+		$this->rowStart();
+		$this->columnStart(3);
 		$this->contentHeading(getMLText("object_check_critical"));
-		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
-		echo '<li class=""><a data-href="#all_documents" data-action="listRepair"><span class="badge '.($repairobjects ? 'badge-info ' : '').'badge-right">'.count($repairobjects).'</span>'.getMLText("objectcheck").'</a></li>';
-		echo '<li class=""><a data-href="#unlinked_folders" data-action="listUnlinkedFolders"><span class="badge '.($unlinkedfolders ? 'badge-info ' : '').'badge-right">'.count($unlinkedfolders).'</span>'.getMLText("unlinked_folders").'</a></li>';
-		echo '<li class=""><a data-href="#unlinked_documents" data-action="listUnlinkedDocuments"><span class="badge '.($unlinkeddocuments ? 'badge-info ' : '').'badge-right">'.count($unlinkeddocuments).'</span>'.getMLText("unlinked_documents").'</a></li>';
-		echo '<li class=""><a data-href="#unlinked_content" data-action="listUnlinkedContent"><span class="badge '.($unlinkedcontent ? 'badge-info ' : '').'badge-right">'.count($unlinkedcontent).'</span>'.getMLText("unlinked_content").'</a></li>';
-		echo '<li class=""><a data-href="#missing_filesize" data-action="listMissingFileSize"><span class="badge '.($nofilesizeversions ? 'badge-info ' : '').'badge-right">'.count($nofilesizeversions).'</span>'.getMLText("missing_filesize").'</a></li>';
-		echo '<li class=""><a data-href="#missing_checksum" data-action="listMissingChecksum"><span class="badge '.($nochecksumversions ? 'badge-info ' : '').'badge-right">'.count($nochecksumversions).'</span>'.getMLText("missing_checksum").'</a></li>';
-		echo '<li class=""><a data-href="#wrong_filetype" data-action="listWrongFiletype"><span class="badge '.($wrongfiletypeversions ? 'badge-info ' : '').'badge-right">'.count($wrongfiletypeversions).'</span>'.getMLText("wrong_filetype").'</a></li>';
-		echo '</ul>';
+		$menuitems = [];
+		$menuitems[] = array('label'=>getMLText('objectcheck'), 'badge'=>count($repairobjects), 'attributes'=>array(array('data-href', "#all_documents"), array('data-action', "listRepair")));
+		$menuitems[] = array('label'=>getMLText('unlinked_folders'), 'badge'=>count($unlinkedfolders), 'attributes'=>array(array('data-href', "#unlinked_folders"), array('data-action', "listUnlinkedFolders")));
+		$menuitems[] = array('label'=>getMLText('unlinked_documents'), 'badge'=>count($unlinkeddocuments), 'attributes'=>array(array('data-href', "#unlinked_documents"), array('data-action', "listUnlinkedDocuments")));
+		$menuitems[] = array('label'=>getMLText('unlinked_content'), 'badge'=>count($unlinkedcontent), 'attributes'=>array(array('data-href', "#unlinked_content"), array('data-action', "listUnlinkedContent")));
+		$menuitems[] = array('label'=>getMLText('missing_filesize'), 'badge'=>count($nofilesizeversions), 'attributes'=>array(array('data-href', "#missing_filesize"), array('data-action', "listMissingFileSize")));
+		$menuitems[] = array('label'=>getMLText('missing_checksum'), 'badge'=>count($nochecksumversions), 'attributes'=>array(array('data-href', "#missing_checksum"), array('data-action', "listMissingChecksum")));
+		$menuitems[] = array('label'=>getMLText('wrong_filetype'), 'badge'=>count($wrongfiletypeversions), 'attributes'=>array(array('data-href', "#wrong_filetype"), array('data-action', "listWrongFiletype")));
+		self::showNavigationListWithBadges($menuitems);
+
 		$this->contentHeading(getMLText("object_check_warning"));
-		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
-		echo '<li class=""><a data-href="#duplicate_content" data-action="listDuplicateContent"><span class="badge '.($duplicateversions ? 'badge-info ' : '').'badge-right">'.count($duplicateversions).'</span>'.getMLText("duplicate_content").'</a></li>';
-		echo '<li class=""><a data-href="#inrevision_no_access" data-action="listDocsInRevisionNoAccess"><span class="badge '.($docsinrevision ? 'badge-info ' : '').'badge-right">'.count($docsinrevision).'</span>'.getMLText("docs_in_revision_no_access").'</a></li>';
-		echo '<li class=""><a data-href="#inreception_no_access" data-action="listDocsInReceptionNoAccess"><span class="badge '.($docsinreception ? 'badge-info ' : '').'badge-right">'.count($docsinreception).'</span>'.getMLText("docs_in_reception_no_access").'</a></li>';
-		echo '</ul>';
-		echo '<ul class="nav nav-list bs-docs-sidenav _affix">';
+		$menuitems = [];
+		$menuitems[] = array('label'=>getMLText('duplicate_content'), 'badge'=>count($duplicateversions), 'attributes'=>array(array('data-href', "#duplicate_content"), array('data-action', "listDuplicateContent")));
+		$menuitems[] = array('label'=>getMLText('docs_in_revision_no_access'), 'badge'=>count($docsinrevision), 'attributes'=>array(array('data-href', "#inrevision_no_access"), array('data-action', "listDocsInRevisionNoAccess")));
+		$menuitems[] = array('label'=>getMLText('docs_in_reception_no_access'), 'badge'=>count($docsinreception), 'attributes'=>array(array('data-href', "#inreception_no_access"), array('data-action', "listDocsInReceptionNoAccess")));
 		foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
 			foreach(array('user', 'group') as $ug) {
-				echo '<li class=""><a data-href="#'.$process.'_without_'.$ug.'" data-action="list'.ucfirst($process).'Without'.ucfirst($ug).'"><span class="badge '.($processwithoutusergroup[$process][$ug] ? 'badge-info ' : '').'badge-right">'.count($processwithoutusergroup[$process][$ug]).'</span>'.getMLText($process."s_without_".$ug).'</a></li>';
+				$menuitems[] = array('label'=>getMLText($process."s_without_".$ug), 'badge'=>count($processwithoutusergroup[$process][$ug]), 'attributes'=>array(array('data-href', "#".$process.'_without_'.$ug), array('data-action', "list".ucfirst($process).'Without'.ucfirst($ug))));
 			}
 		}
-		echo '</ul>';
-		echo '</div>';
-		echo '<div class="span9">';
+		self::showNavigationListWithBadges($menuitems);
+		$this->columnEnd();
+		$this->columnStart(9);
 
 		echo '<div id="kkkk" class="ajax" data-view="ObjectCheck" data-action="'.($listtype ? $listtype : 'listRepair').'"></div>';
 
-		echo '</div>';
-		echo '</div>';
-
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From f0fc1bfcc33b9bbb7ce06fb2d13f93355fa1593f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 2 May 2021 08:08:11 +0200
Subject: [PATCH 1414/2006] add class 'table-sm' to all tables

---
 views/bootstrap/class.ObjectCheck.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 959703b74..a5460e618 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -37,7 +37,7 @@ require_once("SeedDMS/Preview.php");
 class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 
 	protected function printListHeader($resArr, $previewer, $order=false) { /* {{{ */
-		print "<table class=\"table table-condensed\">";
+		print "<table class=\"table table-condensed table-sm\">";
 		print "<thead>\n<tr>\n";
 		print "<th></th>\n";
 		if($order) {
@@ -105,7 +105,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 			if($repair) {
 				echo "<div class=\"alert\">".getMLText('repairing_objects')."</div>";
 			}
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>\n";
 			print "<th>".getMLText("name")."</th>\n";
@@ -167,7 +167,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 
 		$this->contentHeading(getMLText("unlinked_folders"));
 		if($unlinkedfolders) {
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("id")."</th>\n";
@@ -196,7 +196,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 
 		$this->contentHeading(getMLText("unlinked_documents"));
 		if($unlinkeddocuments) {
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("id")."</th>\n";
@@ -230,7 +230,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		}
 
 		if($unlinkedcontent) {
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
@@ -263,7 +263,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 
 		$this->contentHeading(getMLText("missing_filesize"));
 		if($nofilesizeversions) {
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
@@ -307,7 +307,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$this->contentHeading(getMLText("missing_checksum"));
 
 		if($nochecksumversions) {
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
@@ -350,7 +350,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$this->contentHeading(getMLText("wrong_filetype"));
 
 		if($wrongfiletypeversions) {
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
@@ -393,7 +393,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$this->contentHeading(getMLText("duplicate_content"));
 
 		if($duplicateversions) {
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
 			print "<th>".getMLText("version")."</th>\n";
@@ -476,7 +476,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$this->contentHeading(getMLText($process."s_without_".$ug));
 
 		if($processwithoutusergroup[$process][$ug]) {
-			print "<table class=\"table table-condensed\">";
+			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("process")."</th>\n";
 			print "<th>".getMLText("user_group")."</th>\n";

From da2174fafd7e3d20681f9397a99eef5031ebfabc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 2 May 2021 08:34:28 +0200
Subject: [PATCH 1415/2006] docs and folders can be repaired again

---
 views/bootstrap/class.ObjectCheck.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index a5460e618..5664ec40c 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -103,7 +103,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 
 		if($objects) {
 			if($repair) {
-				echo "<div class=\"alert\">".getMLText('repairing_objects')."</div>";
+				$this->warningMsg(getMLText('repairing_objects'));
 			}
 			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
@@ -114,6 +114,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 			print "<th>".getMLText("error")."</th>\n";
 			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
+			$needsrepair = false;
 			foreach($objects as $object) {
 				if($object['object']->isType('document')) {
 					$document = $object['object'];
@@ -123,6 +124,11 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 							echo $txt;
 						else
 							echo $this->documentListRow($document, $previewer, false);
+						echo "<td>".$object['msg'];
+						if($repair)
+							$document->repair();
+						echo "</td>";
+						$needsrepair = true;
 					}
 				} elseif($object['object']->isType('documentcontent')) {
 					$document = $object['object']->getDocument();
@@ -145,16 +151,19 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 							echo $txt;
 						else
 							echo $this->folderListRow($folder, true);
-						echo "<td>".$object['msg']."</td>";
+						echo "<td>".$object['msg'];
+						if($repair)
+							$folder->repair();
+						echo "</td>";
 						echo $this->folderListRowEnd($folder);
+						$needsrepair = true;
 					}
 				}
 			}
-			$this->needsrepair = false;
 			print "</tbody></table>\n";
 
-			if($this->needsrepair && $repair == 0) {
-				echo '<p><a class="btn btn-primary" href="out.ObjectCheck.php?repair=1">'.getMLText('do_object_repair').'</a></p>';
+			if($needsrepair && $repair == 0) {
+				echo '<div class="repair"><a class="btn btn-primary" href="out.ObjectCheck.php?list=listRepair&repair=1">'.getMLText('do_object_repair').'</a></div>';
 			}
 		}
 	} /* }}} */
@@ -593,7 +602,7 @@ $(document).ready( function() {
 		$repairobjects = $this->params['repairobjects'];
 		$this->enableClipboard = $this->params['enableclipboard'];
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
+//		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();

From 612a493873073e8e742988e2386be24a52c04869 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 2 May 2021 14:46:40 +0200
Subject: [PATCH 1416/2006] fix syntax error in some php versions

---
 views/bootstrap/class.SchedulerTaskMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 81e5faaf8..2f56375c9 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -179,7 +179,7 @@ $(document).ready( function() {
 							),
 							array(
 								'help'=>$param['description']
-							),
+							)
 						);
 						break;
 					case 'password':

From bc1faf4d2e497c6a6b424176c77b7a55bfbdedd8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 3 May 2021 13:44:38 +0200
Subject: [PATCH 1417/2006] set initial document status from settings

---
 webdav/webdav.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webdav/webdav.php b/webdav/webdav.php
index f0f0d041a..ddb6d2a6e 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -843,6 +843,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$controller->setParam('workflow', $workflow);
 			$controller->setParam('notificationgroups', array());
 			$controller->setParam('notificationusers', array());
+			$controller->setParam('initialdocumentstatus', $settings->_initialDocumentStatus);
 			$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
 			$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
 			if(!$document = $controller->run()) {

From b7c46ccfdab41a84f40021e897f113bb48e7166a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 3 May 2021 22:03:37 +0200
Subject: [PATCH 1418/2006] put form into contentContainer

---
 views/bootstrap/class.RoleMgr.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index ba1aaeda9..e91b7ad3a 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -150,6 +150,7 @@ $(document).ready( function() {
 	<input type="hidden" name="action" value="addrole">
 <?php
 		}
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("role_name"),
 			array(
@@ -187,6 +188,7 @@ $(document).ready( function() {
 				)
 			);
 		}
+		$this->contentContainerEnd();
 		if($currRole && $accessop->check_controller_access('RoleMgr', array('action'=>'editrole')) || !$currRole && $accessop->check_controller_access('RoleMgr', array('action'=>'addrole'))) {
 			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText($currRole ? "save" : "add_role"));
 		}

From 56adaae427c818ff80e3f1048f61df0ddaa67ef9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 May 2021 12:20:52 +0200
Subject: [PATCH 1419/2006] fix button for removing, downloading file

---
 views/bootstrap/class.LogManagement.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php
index 55843d783..2ebcba1f5 100644
--- a/views/bootstrap/class.LogManagement.php
+++ b/views/bootstrap/class.LogManagement.php
@@ -58,11 +58,11 @@ class SeedDMS_View_LogManagement extends SeedDMS_Theme_Style {
 			print "<td>";
 
 			if($accessop->check_view_access('RemoveLog')) {
-				print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("rm_file")."</a>";
+				print "<a href=\"out.RemoveLog.php?mode=".$mode."&logname=".$entry."\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i><span class=\"d-none d-lg-block\"> ".getMLText("rm_file")."</span></a>";
 			}
 			if($accessop->check_controller_access('Download', array('action'=>'log'))) {
 				print "&nbsp;";
-				print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText("download")."</a>";
+				print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-secondary btn-mini btn-sm\"><i class=\"fa fa-download\"></i><span class=\"d-none d-lg-block\"> ".getMLText("download")."</span></a>";
 			}
 			print "&nbsp;";
 			echo $this->getModalBoxLink(array('target'=>'logViewer', 'remote'=>'out.LogManagement.php?logname='.$entry, 'class'=>'btn btn-primary btn-mini btn-sm', 'title'=>'<i class="fa fa-eye"></i><span class="d-none d-lg-block"> '.getMLText('view').'</span>'));

From 84a61cbd14d2ae6698594d3b6460bcd792c1230f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 May 2021 18:08:19 +0200
Subject: [PATCH 1420/2006] fix parameters of SeedDMS_AccessOperation()

---
 out/out.AddEvent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.AddEvent.php b/out/out.AddEvent.php
index 84e14e158..0510b6035 100644
--- a/out/out.AddEvent.php
+++ b/out/out.AddEvent.php
@@ -39,7 +39,7 @@ if ($user->isGuest()) {
 	UI::exitError(getMLText("edit_event"),getMLText("access_denied"));
 }
 
-$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 if($view) {
 	$view->setParam('accessobject', $accessop);

From ff4151093c3482f9446e3d344a9e5da043caedb1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 May 2021 18:08:31 +0200
Subject: [PATCH 1421/2006] nicer layout

---
 views/bootstrap/class.Setup2Factor.php | 32 +++++++++++++++++---------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/views/bootstrap/class.Setup2Factor.php b/views/bootstrap/class.Setup2Factor.php
index 59f5f2d2d..a42bb4b9b 100644
--- a/views/bootstrap/class.Setup2Factor.php
+++ b/views/bootstrap/class.Setup2Factor.php
@@ -76,36 +76,46 @@ $(document).ready( function() {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_account"), "my_account");
 		$this->contentHeading(getMLText('2_factor_auth'));
-		echo "<div class=\"alert\">".getMLText('2_factor_auth_info')."</div>";
+		$this->infoMsg(getMLText('2_factor_auth_info'));
 		$this->rowStart();
-		$this->contentContainerStart('span6');
+		$this->columnStart(6);
+		$this->contentHeading(getMLText('2_fact_auth_new_secret'));
 
 		$tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS');
 		$oldsecret = $user->getSecret();
 		$secret = $tfa->createSecret();
 ?>
 <form class="form-horizontal" action="../op/op.Setup2Factor.php" method="post" id="form" name="form1">
-		<div class="control-group"><label class="control-label"><?php printMLText('2_fact_auth_secret'); ?></label><div class="controls">
-		<input id="secret" class="secret" type="text" name="secret" size="30" value="<?php echo $secret; ?>"><br />
-		</div></div>
+<?php
+		$this->formField(
+			getMLText('2_fact_auth_secret'),
+			array(
+				'element'=>'input',
+				'type'=>'text',
+				'name'=>'secret',
+				'class'=>'secret',
+				'value'=>htmlspecialchars($secret),
+				'required'=>true
+			)
+		);
+		$this->formSubmit(getMLText('submit_2_fact_auth'));
+?>
 		<div class="control-group"><label class="control-label"></label><div class="controls">
 		<img src="<?php echo $tfa->getQRCodeImageAsDataUri($sitename, $secret); ?>">
 		</div></div>
-<?php
-		$this->formSubmit(getMLText('submit_2_fact_auth'));
-?>
 </form>
 <?php
 		if($oldsecret) {
-			$this->contentContainerEnd();
-			$this->contentContainerStart('span6');
+			$this->columnEnd();
+			$this->columnStart(6);
+			$this->contentHeading(getMLText('2_fact_auth_current_secret'));
 			echo '<div>'.$oldsecret.'</div>';
 			echo '<div><img src="'.$tfa->getQRCodeImageAsDataUri($sitename, $oldsecret).'"></div>';
 ?>
 <?php
 		}
 
-		$this->contentContainerEnd();
+		$this->columnEnd();
 		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();

From f5b8b5b45d4f4a29fe4fe9b229f69048685fd19e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 May 2021 18:25:33 +0200
Subject: [PATCH 1422/2006] major rework, make it work again

---
 op/op.AddToTransmittal.php                 |  2 +-
 views/bootstrap/class.AddToTransmittal.php | 35 ++++++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/op/op.AddToTransmittal.php b/op/op.AddToTransmittal.php
index 6aa99dc12..de8d6c466 100644
--- a/op/op.AddToTransmittal.php
+++ b/op/op.AddToTransmittal.php
@@ -68,7 +68,7 @@ if (!is_object($transmittal)) {
 }
 
 if ($transmittal->getUser()->getID() != $user->getID()) {
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_transmittal"));
 }
 
 if($transmittal->addContent($version)) {
diff --git a/views/bootstrap/class.AddToTransmittal.php b/views/bootstrap/class.AddToTransmittal.php
index dd9c665a9..0f8a43a39 100644
--- a/views/bootstrap/class.AddToTransmittal.php
+++ b/views/bootstrap/class.AddToTransmittal.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for AddToTransmittal view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_AddToTransmittal extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_AddToTransmittal extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -42,31 +42,34 @@ class SeedDMS_View_AddToTransmittal extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("my_documents"), "my_documents");
 		$this->contentHeading(getMLText("add_to_transmittal"));
-		$this->contentContainerStart();
-
 ?>
-<form action="../op/op.AddToTransmittal.php" name="form1" method="post">
+<form class="form-horizontal" action="../op/op.AddToTransmittal.php" name="form1" method="post">
 <input type="hidden" name="documentid" value="<?php print $content->getDocument()->getID();?>">
 <input type="hidden" name="version" value="<?php print $content->getVersion();?>">
 <input type="hidden" name="action" value="addtotransmittal">
 <?php echo createHiddenFieldWithKey('addtotransmittal'); ?>
-
-<p>
-<?php printMLText("transmittal"); ?>:
-<select name="assignTo">
 <?php
+		$this->contentContainerStart();
+		$options = array();
 		foreach ($transmittals as $transmittal) {
-			print "<option value=\"".$transmittal->getID()."\">" . htmlspecialchars($transmittal->getName()) . "</option>";
+			$options[] = array($transmittal->getID(), htmlspecialchars($transmittal->getName()));
 		}
+		$this->formField(
+			getMLText("transmittal"),
+			array(
+				'element'=>'select',
+				'id'=>'assignTo',
+				'name'=>'assignTo',
+				'class'=>'chzn-select',
+				'options'=>$options,
+				'placeholder'=>getMLText('choose_transmittal'),
+			)
+		);
+		$this->contentContainerEnd();
+		$this->formSubmit('<i class="fa fa-plus"></i> '.getMLText('add'));
 ?>
-</select>
-</p>
-
-<p><button type="submit" class="btn"><i class="fa fa-plus"></i> <?php printMLText("add");?></button></p>
-
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 515a8de2e0c628d2e246b351ec41885e80f224f9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 May 2021 14:31:13 +0200
Subject: [PATCH 1423/2006] put export into accordion, use formFields

---
 views/bootstrap/class.Search.php | 44 +++++++++++++-------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 16fadd479..ecd602940 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -340,8 +340,8 @@ function typeahead() { /* {{{ */
 				}
 			}
 		}
-		$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
 		$this->contentContainerEnd();
+		$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
 		// }}}
 
 		// Seach options for documents {{{
@@ -369,31 +369,23 @@ function typeahead() { /* {{{ */
 			$openfilterdlg = true;
 		if($statusdate)
 			$openfilterdlg = true;
-?>
-<?php if($totaldocs): ?>
-<div class="accordion" id="accordion1">
-  <div class="accordion-group">
-    <div class="accordion-heading">
-      <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapseExport">
-        <?php printMLText('export'); ?>
-      </a>
-    </div>
-    <div id="collapseExport" class="accordion-body">
-      <div class="accordion-inner">
-<table class="table-condensed">
-<tr>
-<td><?= getMLText('content') ?></td><td><label class="checkbox inline"><input id="includecontent" type="checkbox" name="includecontent" value="1"> <?php printMLText("include_content"); ?></label></td>
-</tr>
-<tr>
-<td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&action=export" ?>"><i class="fa fa-download"></i> Export</a></td>
-</tr>
-</table>
-      </div>
-    </div>
-  </div>
-</div>
-<?php endif; ?>
-<?php
+
+		if($totaldocs) {
+			ob_start();
+			$this->formField(
+				getMLText("include_content"),
+				array(
+					'element'=>'input',
+					'type'=>'checkbox',
+					'name'=>'includecontent',
+					'value'=>1,
+				)
+			);
+			$this->formSubmit("<i class=\"fa fa-download\"></i> ".getMLText('export'));
+			$content = ob_get_clean();
+			$this->printAccordion(getMLText('export'), $content);
+		}
+
 		/* Start of fields only applicable to documents */
 		ob_start();
 		$tmpcatids = array();

From c6c99bc384e398c4b52c0da60190c96797f676ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 May 2021 21:54:26 +0200
Subject: [PATCH 1424/2006] minor correction of nav bar color

---
 views/bootstrap4/styles/seeddms.css | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap4/styles/seeddms.css b/views/bootstrap4/styles/seeddms.css
index ea7146ca8..defe1ea99 100644
--- a/views/bootstrap4/styles/seeddms.css
+++ b/views/bootstrap4/styles/seeddms.css
@@ -4338,11 +4338,11 @@ input[type="button"].btn-block {
 }
 
 .navbar-dark .navbar-nav .nav-link {
-  color: rgba(255, 255, 255, 0.5);
+  color: rgba(255, 255, 255, 0.75);
 }
 
 .navbar-dark .navbar-nav .nav-link:hover, .navbar-dark .navbar-nav .nav-link:focus {
-  color: rgba(255, 255, 255, 0.75);
+  color: rgba(255, 255, 255, 0.95);
 }
 
 .navbar-dark .navbar-nav .nav-link.disabled {
@@ -4357,16 +4357,16 @@ input[type="button"].btn-block {
 }
 
 .navbar-dark .navbar-toggler {
-  color: rgba(255, 255, 255, 0.5);
+  color: rgba(255, 255, 255, 0.75);
   border-color: rgba(255, 255, 255, 0.1);
 }
 
 .navbar-dark .navbar-toggler-icon {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.5%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.75%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
 }
 
 .navbar-dark .navbar-text {
-  color: rgba(255, 255, 255, 0.5);
+  color: rgba(255, 255, 255, 0.75);
 }
 
 .navbar-dark .navbar-text a {
@@ -10896,4 +10896,4 @@ a.text-dark:hover, a.text-dark:focus {
   }
 }
 
-/*# sourceMappingURL=data:application/json;base64,{
	"version": 3,
	"file": "dist/seeddms.css",
	"sources": [
		"scss/seeddms.scss",
		"node_modules/bootstrap/scss/bootstrap.scss",
		"node_modules/bootstrap/scss/_functions.scss",
		"node_modules/bootstrap/scss/_variables.scss",
		"node_modules/bootstrap/scss/_mixins.scss",
		"node_modules/bootstrap/scss/vendor/_rfs.scss",
		"node_modules/bootstrap/scss/mixins/_deprecate.scss",
		"node_modules/bootstrap/scss/mixins/_breakpoints.scss",
		"node_modules/bootstrap/scss/mixins/_hover.scss",
		"node_modules/bootstrap/scss/mixins/_image.scss",
		"node_modules/bootstrap/scss/mixins/_badge.scss",
		"node_modules/bootstrap/scss/mixins/_resize.scss",
		"node_modules/bootstrap/scss/mixins/_screen-reader.scss",
		"node_modules/bootstrap/scss/mixins/_size.scss",
		"node_modules/bootstrap/scss/mixins/_reset-text.scss",
		"node_modules/bootstrap/scss/mixins/_text-emphasis.scss",
		"node_modules/bootstrap/scss/mixins/_text-hide.scss",
		"node_modules/bootstrap/scss/mixins/_text-truncate.scss",
		"node_modules/bootstrap/scss/mixins/_visibility.scss",
		"node_modules/bootstrap/scss/mixins/_alert.scss",
		"node_modules/bootstrap/scss/mixins/_buttons.scss",
		"node_modules/bootstrap/scss/mixins/_caret.scss",
		"node_modules/bootstrap/scss/mixins/_pagination.scss",
		"node_modules/bootstrap/scss/mixins/_lists.scss",
		"node_modules/bootstrap/scss/mixins/_list-group.scss",
		"node_modules/bootstrap/scss/mixins/_nav-divider.scss",
		"node_modules/bootstrap/scss/mixins/_forms.scss",
		"node_modules/bootstrap/scss/mixins/_table-row.scss",
		"node_modules/bootstrap/scss/mixins/_background-variant.scss",
		"node_modules/bootstrap/scss/mixins/_border-radius.scss",
		"node_modules/bootstrap/scss/mixins/_box-shadow.scss",
		"node_modules/bootstrap/scss/mixins/_gradients.scss",
		"node_modules/bootstrap/scss/mixins/_transition.scss",
		"node_modules/bootstrap/scss/mixins/_clearfix.scss",
		"node_modules/bootstrap/scss/mixins/_grid-framework.scss",
		"node_modules/bootstrap/scss/mixins/_grid.scss",
		"node_modules/bootstrap/scss/mixins/_float.scss",
		"node_modules/bootstrap/scss/_root.scss",
		"node_modules/bootstrap/scss/_reboot.scss",
		"node_modules/bootstrap/scss/_type.scss",
		"node_modules/bootstrap/scss/_images.scss",
		"node_modules/bootstrap/scss/_code.scss",
		"node_modules/bootstrap/scss/_grid.scss",
		"node_modules/bootstrap/scss/_tables.scss",
		"node_modules/bootstrap/scss/_forms.scss",
		"node_modules/bootstrap/scss/_buttons.scss",
		"node_modules/bootstrap/scss/_transitions.scss",
		"node_modules/bootstrap/scss/_dropdown.scss",
		"node_modules/bootstrap/scss/_button-group.scss",
		"node_modules/bootstrap/scss/_input-group.scss",
		"node_modules/bootstrap/scss/_custom-forms.scss",
		"node_modules/bootstrap/scss/_nav.scss",
		"node_modules/bootstrap/scss/_navbar.scss",
		"node_modules/bootstrap/scss/_card.scss",
		"node_modules/bootstrap/scss/_breadcrumb.scss",
		"node_modules/bootstrap/scss/_pagination.scss",
		"node_modules/bootstrap/scss/_badge.scss",
		"node_modules/bootstrap/scss/_jumbotron.scss",
		"node_modules/bootstrap/scss/_alert.scss",
		"node_modules/bootstrap/scss/_progress.scss",
		"node_modules/bootstrap/scss/_media.scss",
		"node_modules/bootstrap/scss/_list-group.scss",
		"node_modules/bootstrap/scss/_close.scss",
		"node_modules/bootstrap/scss/_toasts.scss",
		"node_modules/bootstrap/scss/_modal.scss",
		"node_modules/bootstrap/scss/_tooltip.scss",
		"node_modules/bootstrap/scss/_popover.scss",
		"node_modules/bootstrap/scss/_carousel.scss",
		"node_modules/bootstrap/scss/_spinners.scss",
		"node_modules/bootstrap/scss/_utilities.scss",
		"node_modules/bootstrap/scss/utilities/_align.scss",
		"node_modules/bootstrap/scss/utilities/_background.scss",
		"node_modules/bootstrap/scss/utilities/_borders.scss",
		"node_modules/bootstrap/scss/utilities/_clearfix.scss",
		"node_modules/bootstrap/scss/utilities/_display.scss",
		"node_modules/bootstrap/scss/utilities/_embed.scss",
		"node_modules/bootstrap/scss/utilities/_flex.scss",
		"node_modules/bootstrap/scss/utilities/_float.scss",
		"node_modules/bootstrap/scss/utilities/_interactions.scss",
		"node_modules/bootstrap/scss/utilities/_overflow.scss",
		"node_modules/bootstrap/scss/utilities/_position.scss",
		"node_modules/bootstrap/scss/utilities/_screenreaders.scss",
		"node_modules/bootstrap/scss/utilities/_shadows.scss",
		"node_modules/bootstrap/scss/utilities/_sizing.scss",
		"node_modules/bootstrap/scss/utilities/_spacing.scss",
		"node_modules/bootstrap/scss/utilities/_stretched-link.scss",
		"node_modules/bootstrap/scss/utilities/_text.scss",
		"node_modules/bootstrap/scss/utilities/_visibility.scss",
		"node_modules/bootstrap/scss/_print.scss",
		"node_modules/select2/src/scss/core.scss",
		"node_modules/select2/src/scss/_single.scss",
		"node_modules/select2/src/scss/_multiple.scss",
		"node_modules/select2/src/scss/_dropdown.scss",
		"node_modules/select2/src/scss/theme/default/layout.scss",
		"node_modules/select2/src/scss/theme/default/_single.scss",
		"node_modules/select2/src/scss/theme/default/_multiple.scss",
		"node_modules/select2/src/scss/theme/classic/layout.scss",
		"node_modules/select2/src/scss/theme/classic/_defaults.scss",
		"node_modules/select2/src/scss/mixins/_gradients.scss",
		"node_modules/select2/src/scss/theme/classic/_single.scss",
		"node_modules/select2/src/scss/theme/classic/_multiple.scss",
		"node_modules/select2-theme-bootstrap4/src/select2-bootstrap.scss"
	],
	"names": [],
	"mappings": "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"
} */
\ No newline at end of file
+/*# sourceMappingURL=data:application/json;base64,{
	"version": 3,
	"file": "dist/seeddms.css",
	"sources": [
		"scss/seeddms.scss",
		"node_modules/bootstrap/scss/bootstrap.scss",
		"node_modules/bootstrap/scss/_functions.scss",
		"node_modules/bootstrap/scss/_variables.scss",
		"node_modules/bootstrap/scss/_mixins.scss",
		"node_modules/bootstrap/scss/vendor/_rfs.scss",
		"node_modules/bootstrap/scss/mixins/_deprecate.scss",
		"node_modules/bootstrap/scss/mixins/_breakpoints.scss",
		"node_modules/bootstrap/scss/mixins/_hover.scss",
		"node_modules/bootstrap/scss/mixins/_image.scss",
		"node_modules/bootstrap/scss/mixins/_badge.scss",
		"node_modules/bootstrap/scss/mixins/_resize.scss",
		"node_modules/bootstrap/scss/mixins/_screen-reader.scss",
		"node_modules/bootstrap/scss/mixins/_size.scss",
		"node_modules/bootstrap/scss/mixins/_reset-text.scss",
		"node_modules/bootstrap/scss/mixins/_text-emphasis.scss",
		"node_modules/bootstrap/scss/mixins/_text-hide.scss",
		"node_modules/bootstrap/scss/mixins/_text-truncate.scss",
		"node_modules/bootstrap/scss/mixins/_visibility.scss",
		"node_modules/bootstrap/scss/mixins/_alert.scss",
		"node_modules/bootstrap/scss/mixins/_buttons.scss",
		"node_modules/bootstrap/scss/mixins/_caret.scss",
		"node_modules/bootstrap/scss/mixins/_pagination.scss",
		"node_modules/bootstrap/scss/mixins/_lists.scss",
		"node_modules/bootstrap/scss/mixins/_list-group.scss",
		"node_modules/bootstrap/scss/mixins/_nav-divider.scss",
		"node_modules/bootstrap/scss/mixins/_forms.scss",
		"node_modules/bootstrap/scss/mixins/_table-row.scss",
		"node_modules/bootstrap/scss/mixins/_background-variant.scss",
		"node_modules/bootstrap/scss/mixins/_border-radius.scss",
		"node_modules/bootstrap/scss/mixins/_box-shadow.scss",
		"node_modules/bootstrap/scss/mixins/_gradients.scss",
		"node_modules/bootstrap/scss/mixins/_transition.scss",
		"node_modules/bootstrap/scss/mixins/_clearfix.scss",
		"node_modules/bootstrap/scss/mixins/_grid-framework.scss",
		"node_modules/bootstrap/scss/mixins/_grid.scss",
		"node_modules/bootstrap/scss/mixins/_float.scss",
		"node_modules/bootstrap/scss/_root.scss",
		"node_modules/bootstrap/scss/_reboot.scss",
		"node_modules/bootstrap/scss/_type.scss",
		"node_modules/bootstrap/scss/_images.scss",
		"node_modules/bootstrap/scss/_code.scss",
		"node_modules/bootstrap/scss/_grid.scss",
		"node_modules/bootstrap/scss/_tables.scss",
		"node_modules/bootstrap/scss/_forms.scss",
		"node_modules/bootstrap/scss/_buttons.scss",
		"node_modules/bootstrap/scss/_transitions.scss",
		"node_modules/bootstrap/scss/_dropdown.scss",
		"node_modules/bootstrap/scss/_button-group.scss",
		"node_modules/bootstrap/scss/_input-group.scss",
		"node_modules/bootstrap/scss/_custom-forms.scss",
		"node_modules/bootstrap/scss/_nav.scss",
		"node_modules/bootstrap/scss/_navbar.scss",
		"node_modules/bootstrap/scss/_card.scss",
		"node_modules/bootstrap/scss/_breadcrumb.scss",
		"node_modules/bootstrap/scss/_pagination.scss",
		"node_modules/bootstrap/scss/_badge.scss",
		"node_modules/bootstrap/scss/_jumbotron.scss",
		"node_modules/bootstrap/scss/_alert.scss",
		"node_modules/bootstrap/scss/_progress.scss",
		"node_modules/bootstrap/scss/_media.scss",
		"node_modules/bootstrap/scss/_list-group.scss",
		"node_modules/bootstrap/scss/_close.scss",
		"node_modules/bootstrap/scss/_toasts.scss",
		"node_modules/bootstrap/scss/_modal.scss",
		"node_modules/bootstrap/scss/_tooltip.scss",
		"node_modules/bootstrap/scss/_popover.scss",
		"node_modules/bootstrap/scss/_carousel.scss",
		"node_modules/bootstrap/scss/_spinners.scss",
		"node_modules/bootstrap/scss/_utilities.scss",
		"node_modules/bootstrap/scss/utilities/_align.scss",
		"node_modules/bootstrap/scss/utilities/_background.scss",
		"node_modules/bootstrap/scss/utilities/_borders.scss",
		"node_modules/bootstrap/scss/utilities/_clearfix.scss",
		"node_modules/bootstrap/scss/utilities/_display.scss",
		"node_modules/bootstrap/scss/utilities/_embed.scss",
		"node_modules/bootstrap/scss/utilities/_flex.scss",
		"node_modules/bootstrap/scss/utilities/_float.scss",
		"node_modules/bootstrap/scss/utilities/_interactions.scss",
		"node_modules/bootstrap/scss/utilities/_overflow.scss",
		"node_modules/bootstrap/scss/utilities/_position.scss",
		"node_modules/bootstrap/scss/utilities/_screenreaders.scss",
		"node_modules/bootstrap/scss/utilities/_shadows.scss",
		"node_modules/bootstrap/scss/utilities/_sizing.scss",
		"node_modules/bootstrap/scss/utilities/_spacing.scss",
		"node_modules/bootstrap/scss/utilities/_stretched-link.scss",
		"node_modules/bootstrap/scss/utilities/_text.scss",
		"node_modules/bootstrap/scss/utilities/_visibility.scss",
		"node_modules/bootstrap/scss/_print.scss",
		"node_modules/select2/src/scss/core.scss",
		"node_modules/select2/src/scss/_single.scss",
		"node_modules/select2/src/scss/_multiple.scss",
		"node_modules/select2/src/scss/_dropdown.scss",
		"node_modules/select2/src/scss/theme/default/layout.scss",
		"node_modules/select2/src/scss/theme/default/_single.scss",
		"node_modules/select2/src/scss/theme/default/_multiple.scss",
		"node_modules/select2/src/scss/theme/classic/layout.scss",
		"node_modules/select2/src/scss/theme/classic/_defaults.scss",
		"node_modules/select2/src/scss/mixins/_gradients.scss",
		"node_modules/select2/src/scss/theme/classic/_single.scss",
		"node_modules/select2/src/scss/theme/classic/_multiple.scss",
		"node_modules/select2-theme-bootstrap4/src/select2-bootstrap.scss"
	],
	"names": [],
	"mappings": "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"
} */
\ No newline at end of file

From a17fcfcd8e28c6103bbe2a157aa8d0531aca5956 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 May 2021 21:54:47 +0200
Subject: [PATCH 1425/2006] do not collapse search form

---
 views/bootstrap4/class.Bootstrap4.php | 46 ++++++++++++++++-----------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 4918dc103..5627d5d6b 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -272,6 +272,16 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	function contentStart() { /* {{{ */
+/*
+		echo "<div class=\"container-fluid\">\n";
+		echo "<div class=\"row\">\n";
+		echo "<nav class=\"_col-md-2 d-none d-md-block bg-light sidebar\">\n";
+		echo "<div class=\"sidebar-sticky\">\n";
+		echo "lsajdlf";
+		echo "</div>\n";
+		echo "</nav>\n";
+		echo "<main role=\"main\" class=\"_col-md-10 _ml-sm-auto pb-3 px-4\">\n";
+*/
 		echo "<main role=\"main\" class=\"container-fluid mt-3 pb-3\">\n";
 		echo " <div class=\"row-fluid\">\n";
 	} /* }}} */
@@ -279,6 +289,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	function contentEnd() { /* {{{ */
 		echo " </div>\n";
 		echo "</main>\n";
+/*
+		echo "</div>\n";
+		echo "</div>\n";
+*/
 	} /* }}} */
 
 	function globalBanner() { /* {{{ */
@@ -291,7 +305,19 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$dms = $this->params['dms'];
 		$accessobject = $this->params['accessobject'];
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark border-bottom fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><img src=\"../views/bootstrap/images/seeddms-logo.svg\"> ".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
+		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><img src=\"../views/bootstrap/images/seeddms-logo.svg\"> <span class=\"d-none d-md-inline-block\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
+			/* search form {{{ */
+			echo "     <form action=\"../out/out.Search.php\" class=\"form-inline mr-auto\" autocomplete=\"off\">";
+			if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) {
+				echo "      <input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\" />";
+			}
+			echo "      <input type=\"hidden\" name=\"navBar\" value=\"1\" />";
+			echo "      <input name=\"query\" class=\"form-control mr-sm-2 search-query\" ".($this->params['defaultsearchmethod'] == 'fulltext_' ? "id=\"searchfield\"" : "id=\"searchfield\"")." data-provide=\"typeahead\" type=\"search\" style=\"width: 150px;\" placeholder=\"".getMLText("search")."\" aria-label=\"".getMLText("search")."\"/>";
+			if($this->params['defaultsearchmethod'] == 'fulltext')
+				echo "      <input type=\"hidden\" name=\"fullsearch\" value=\"1\" />";
+			echo "</form>\n";
+			/* }}} End of search form */
+
 		echo " <button class=\"navbar-toggler\" type=\"button\" data-toggle=\"collapse\" data-target=\"#navbarMain\" aria-controls=\"navbarMain\" aria-expanded=\"false\" aria-label=\"Toggle navigation\">\n";
 		echo "  <span class=\"navbar-toggler-icon\"></span>\n";
 		echo " </button>\n";
@@ -326,26 +352,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			}
 			echo "   </ul>\n";
 
-			/* search form {{{ */
-			echo "     <form action=\"../out/out.Search.php\" class=\"form-inline ml-auto\" autocomplete=\"off\">";
-			if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) {
-				echo "      <input type=\"hidden\" name=\"folderid\" value=\"".$folder->getID()."\" />";
-			}
-			echo "      <input type=\"hidden\" name=\"navBar\" value=\"1\" />";
-			echo "      <input name=\"query\" class=\"form-control mr-sm-2 search-query\" ".($this->params['defaultsearchmethod'] == 'fulltext_' ? "id=\"searchfield\"" : "id=\"searchfield\"")." data-provide=\"typeahead\" type=\"search\" style=\"width: 150px;\" placeholder=\"".getMLText("search")."\" aria-label=\"".getMLText("search")."\"/>";
-			if($this->params['defaultsearchmethod'] == 'fulltext')
-				echo "      <input type=\"hidden\" name=\"fullsearch\" value=\"1\" />";
-//			if($this->params['enablefullsearch']) {
-//				echo "      <label class=\"checkbox\" style=\"color: #999999;\"><input type=\"checkbox\" name=\"fullsearch\" value=\"1\" title=\"".getMLText('fullsearch_hint')."\"/> ".getMLText('fullsearch')."</label>";
-//			}
-	//		echo "      <input type=\"submit\" value=\"".getMLText("search")."\" id=\"searchButton\" class=\"btn\"/>";
-			echo "</form>\n";
-			/* }}} End of search form */
-
 			/* menu tasks {{{ */
 			if($this->params['enablemenutasks'] && !$this->params['user']->isGuest()) {
 				if($accessobject->check_view_access('Tasks', array('action'=>'menuTasks'))) {
-					echo "   <div id=\"menu-tasks\">";
+					echo "   <div id=\"menu-tasks\" class=\"ml-auto\">";
 					echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Tasks\" data-action=\"menuTasks\"></div>";
 	//				echo "   <ul id=\"main-menu-tasks\" class=\"navbar-nav ml-auto\">\n";
 	//				echo "    <li class=\"nav-item dropdown\">\n";

From 1a84cb311a538c5b98956f335ec9b14816503273 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 May 2021 14:22:37 +0200
Subject: [PATCH 1426/2006] make button primary

---
 views/bootstrap/class.SetRecipients.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index cf6f9ba0d..f3083dab7 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -132,7 +132,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 <p>
 <input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
 <input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-<input type="submit" class="btn" value="<?php printMLText("update");?>">
+<input type="submit" class="btn btn-primary" value="<?php printMLText("update");?>">
 </p>
 </form>
 <?php

From 93192b7e3df67cd17f052d1e27011ddfd232319d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 May 2021 14:22:50 +0200
Subject: [PATCH 1427/2006] support custom date format, remove some html

---
 op/op.SetRevisors.php                 |  5 ++--
 views/bootstrap/class.SetRevisors.php | 35 ++++++++++-----------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 087b2eb27..4c6b9568b 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -56,10 +56,11 @@ if (!is_object($content)) {
 }
 
 if (isset($_POST["startdate"])) {
-	$startdate = $_POST["startdate"];
+	$ts = makeTsFromDate($_POST["startdate"]);
 } else {
-	$startdate = date('Y-m-d');
+	$ts = time();
 }
+$startdate = date('Y-m-d', $ts);
 
 if(!$content->setRevisionDate($startdate)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index dd5c836f3..7d7ef29bc 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -47,7 +47,7 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 		$this->globalNavigation($folder);
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
-		$this->contentHeading(getMLText("change_assignments"));
+		$this->contentHeading(getMLText("update_revisors"));
 
 		// Retrieve a list of all users and groups that have review / approve privileges.
 		$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
@@ -55,7 +55,7 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 		// Retrieve list of currently assigned revisors, along with
 		// their latest status.
 		$revisionStatus = $content->getRevisionStatus();
-		$startdate = substr($content->getRevisionDate(), 0, 10);
+		$startdate = getReadableDate(makeTsFromDate($content->getRevisionDate()));
 
 		// Index the revision results for easy cross-reference with the revisor list.
 		$revisionIndex = array("i"=>array(), "g"=>array());
@@ -68,21 +68,15 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 		}
 ?>
 
-<?php $this->contentContainerStart(); ?>
-
 <form class="form-horizontal" action="../op/op.SetRevisors.php" method="post" name="form1">
 
-<?php $this->contentSubHeading(getMLText("update_revisors"));?>
-
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("revision_date")?>:</label>
-		<div class="controls">
-			<span class="input-append date" style="display: inline;" id="revisionstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-				<input class="span4" size="16" name="startdate" type="text" value="<?php if($startdate) echo $startdate; else echo date('Y-m-d'); ?>">
-				<span class="add-on"><i class="fa fa-calendar"></i></span>
-			</span>
-		</div>
-	</div>
+<?php
+		$this->contentContainerStart();
+		$this->formField(
+			getMLText("revision_date"),
+			$this->getDateChooser($startdate, "startdate", $this->params['session']->getLanguage())
+		);
+?>
 
 	<div class="control-group">
 		<label class="control-label"><?php printMLText("individuals")?>:</label>
@@ -160,15 +154,12 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 
 	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
 	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-	<div class="control-group">
-		<label class="control-label"></label>
-		<div class="controls">
-			<input type="submit" class="btn" value="<?php printMLText("update");?>">
-		</div>
-	</div>
-</form>
 <?php
 		$this->contentContainerEnd();
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));
+?>
+</form>
+<?php
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From a99efecb7be51584125a9ae35dbf408174ad232c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 May 2021 20:25:18 +0200
Subject: [PATCH 1428/2006] pass email to setAuthor() only if it is syntactical
 correct

---
 views/bootstrap/class.TimelineFeed.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
index 4b49aac23..7fc886f83 100644
--- a/views/bootstrap/class.TimelineFeed.php
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -14,7 +14,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 require_once("vendor/autoload.php");
 
@@ -34,7 +34,7 @@ require_once("SeedDMS/Preview.php");
  * @copyright  Copyright (C)2016 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_TimelineFeed extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -126,7 +126,7 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Bootstrap_Style {
 						"<p>".getMLText("creation_date").": <b>".getLongReadableDate($doc->getDate())."</p>"
 					);
 					$newItem->setDate(date('c', $d));
-					$newItem->setAuthor($owner->getFullName(), $owner->getEmail());
+					$newItem->setAuthor($owner->getFullName(), preg_match('/.+@.+/', $owner->getEmail()) == 1 ? $owner->getEmail() : null);
 					$newItem->setId($baseurl.'out/out.ViewDocument.php?documentid='.$doc->getID()."&kkk=".$classname, true);
 					if(!empty($item['version'])) {
 						$version = $doc->getContentByVersion($item['version']);

From 096312dbdbf93c55c671f0dc043830c1f4ec2e8c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 May 2021 20:25:54 +0200
Subject: [PATCH 1429/2006] replace SeedDMS_Theme_Bootstrap by
 SeedDMS_Theme_Style

---
 views/bootstrap/class.CheckInDocument.php | 4 ++--
 views/bootstrap/class.EditEvent.php       | 4 ++--
 views/bootstrap/class.ViewEvent.php       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index b14b43701..904596c8b 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -14,7 +14,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for Document view
@@ -25,7 +25,7 @@ require_once("class.Bootstrap.php");
  * @copyright  Copyright (C) 2015 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_CheckInDocument extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_CheckInDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
diff --git a/views/bootstrap/class.EditEvent.php b/views/bootstrap/class.EditEvent.php
index 061a1b803..67b0dcc4c 100644
--- a/views/bootstrap/class.EditEvent.php
+++ b/views/bootstrap/class.EditEvent.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for EditEvent view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_EditEvent extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_EditEvent extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
diff --git a/views/bootstrap/class.ViewEvent.php b/views/bootstrap/class.ViewEvent.php
index 85eb4ac29..0b0eeb448 100644
--- a/views/bootstrap/class.ViewEvent.php
+++ b/views/bootstrap/class.ViewEvent.php
@@ -16,7 +16,7 @@
 /**
  * Include parent class
  */
-require_once("class.Bootstrap.php");
+//require_once("class.Bootstrap.php");
 
 /**
  * Class which outputs the html page for ViewEvent view
@@ -29,7 +29,7 @@ require_once("class.Bootstrap.php");
  *             2010-2012 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_View_ViewEvent extends SeedDMS_Bootstrap_Style {
+class SeedDMS_View_ViewEvent extends SeedDMS_Theme_Style {
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];

From 7e73388730cb494781241b96d03d65ae97afad2e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 7 May 2021 12:41:03 +0200
Subject: [PATCH 1430/2006] add extra script for accessing preview images in
 rss feed

---
 op/op.TimelineFeedPreview.php          | 69 ++++++++++++++++++++++++++
 views/bootstrap/class.TimelineFeed.php |  2 +-
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 op/op.TimelineFeedPreview.php

diff --git a/op/op.TimelineFeedPreview.php b/op/op.TimelineFeedPreview.php
new file mode 100644
index 000000000..d18acd528
--- /dev/null
+++ b/op/op.TimelineFeedPreview.php
@@ -0,0 +1,69 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
+include("../inc/inc.BasicAuthentication.php");
+
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+$documentid = $_GET["documentid"];
+if (!isset($documentid) || !is_numeric($documentid) || intval($documentid)<1) {
+	exit;
+}
+
+$document = $dms->getDocument($documentid);
+if (!is_object($document)) {
+	exit;
+}
+
+if ($document->getAccessMode($user) < M_READ) {
+	header('Content-Type: image/svg+xml');
+	readfile('../views/'.$theme.'/images/empty.svg');
+	exit;
+}
+
+if(isset($_GET['version'])) {
+	$version = $_GET["version"];
+	if (!is_numeric($version))
+		exit;
+
+	$controller = Controller::factory('Preview', array('dms'=>$dms, 'user'=>$user));
+	$controller->setParam('width', !empty($_GET["width"]) ? $_GET["width"] : null);
+	$controller->setParam('document', $document);
+	$controller->setParam('version', $version);
+	$controller->setParam('type', 'version');
+	if(!$controller->run()) {
+		header('Content-Type: image/svg+xml');
+		readfile('../views/'.$theme.'/images/empty.svg');
+		exit;
+	}
+}
diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
index 0322eac40..b31319a68 100644
--- a/views/bootstrap/class.TimelineFeed.php
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -132,7 +132,7 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Theme_Style {
 						$version = $doc->getContentByVersion($item['version']);
 						$previewer->createPreview($version);
 						if($previewer->hasPreview($version)) {
-							$newItem->addElement('enclosure', null, array('url' => $baseurl.'op/op.Preview.php?documentid='.$item['document']->getId().'&version='.$version->getVersion().'&width='.$previewwidthdetail, 'length'=>$previewer->getFileSize($version), 'type'=>'image/png'));
+							$newItem->addElement('enclosure', null, array('url' => $baseurl.'op/op.TimelineFeedPreview.php?documentid='.$item['document']->getId().'&version='.$version->getVersion().'&width='.$previewwidthdetail, 'length'=>$previewer->getFileSize($version), 'type'=>'image/png'));
 						}
 					}
 					$feed->addItem($newItem);

From 8d660b1f989ae66b1243f30b282f8ef816bd196b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 7 May 2021 13:20:00 +0200
Subject: [PATCH 1431/2006] use json web token for authentication

---
 op/op.TimelineFeedPreview.php | 57 ++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/op/op.TimelineFeedPreview.php b/op/op.TimelineFeedPreview.php
index d18acd528..610cc506c 100644
--- a/op/op.TimelineFeedPreview.php
+++ b/op/op.TimelineFeedPreview.php
@@ -28,42 +28,57 @@ include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
-include("../inc/inc.BasicAuthentication.php");
+//include("../inc/inc.BasicAuthentication.php");
 
 /**
  * Include class to preview documents
  */
 require_once("SeedDMS/Preview.php");
 
-$documentid = $_GET["documentid"];
-if (!isset($documentid) || !is_numeric($documentid) || intval($documentid)<1) {
+if(empty($_GET['hash']))
+	exit;
+
+$token = new SeedDMS_JwtToken($settings->_extensions['encryptionKey']);
+if(!($tokenstr = $token->jwtDecode($_GET['hash'])))
+	exit;
+
+$tokendata = json_decode($tokenstr, true);
+print_r($tokendata);
+exit;
+
+if (!isset($tokendata['d']) || !is_numeric($tokendata['d'])) {
 	exit;
 }
 
-$document = $dms->getDocument($documentid);
+$document = $dms->getDocument($tokendata['d']);
 if (!is_object($document)) {
 	exit;
 }
 
+if (!isset($tokendata['u']) || !is_numeric($tokendata['u'])) {
+	exit;
+}
+
+$user = $dms->getUser($tokendata['u']);
+if (!is_object($user)) {
+	exit;
+}
+
 if ($document->getAccessMode($user) < M_READ) {
+	exit;
+}
+
+if (!isset($tokendata['v']) || !is_numeric($tokendata['v'])) {
+	exit;
+}
+
+$controller = Controller::factory('Preview', array('dms'=>$dms, 'user'=>$user));
+$controller->setParam('width', !empty($tokendata["w"]) ? $tokendata["w"] : null);
+$controller->setParam('document', $document);
+$controller->setParam('version', $tokendata['v']);
+$controller->setParam('type', 'version');
+if(!$controller->run()) {
 	header('Content-Type: image/svg+xml');
 	readfile('../views/'.$theme.'/images/empty.svg');
 	exit;
 }
-
-if(isset($_GET['version'])) {
-	$version = $_GET["version"];
-	if (!is_numeric($version))
-		exit;
-
-	$controller = Controller::factory('Preview', array('dms'=>$dms, 'user'=>$user));
-	$controller->setParam('width', !empty($_GET["width"]) ? $_GET["width"] : null);
-	$controller->setParam('document', $document);
-	$controller->setParam('version', $version);
-	$controller->setParam('type', 'version');
-	if(!$controller->run()) {
-		header('Content-Type: image/svg+xml');
-		readfile('../views/'.$theme.'/images/empty.svg');
-		exit;
-	}
-}

From 1cb6816a6f48087bab30ddbf18d36a97cb534a8b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 7 May 2021 14:37:36 +0200
Subject: [PATCH 1432/2006] use jwt for securing preview image

---
 op/op.TimelineFeedPreview.php          | 4 +---
 views/bootstrap/class.TimelineFeed.php | 6 +++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/op/op.TimelineFeedPreview.php b/op/op.TimelineFeedPreview.php
index 610cc506c..183b3d4b7 100644
--- a/op/op.TimelineFeedPreview.php
+++ b/op/op.TimelineFeedPreview.php
@@ -38,13 +38,11 @@ require_once("SeedDMS/Preview.php");
 if(empty($_GET['hash']))
 	exit;
 
-$token = new SeedDMS_JwtToken($settings->_extensions['encryptionKey']);
+$token = new SeedDMS_JwtToken($settings->_encryptionKey);
 if(!($tokenstr = $token->jwtDecode($_GET['hash'])))
 	exit;
 
 $tokendata = json_decode($tokenstr, true);
-print_r($tokendata);
-exit;
 
 if (!isset($tokendata['d']) || !is_numeric($tokendata['d'])) {
 	exit;
diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
index b31319a68..050af1000 100644
--- a/views/bootstrap/class.TimelineFeed.php
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -39,6 +39,7 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Theme_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$settings = $this->params['settings'];
 		$httproot = $this->params['httproot'];
 		$skip = $this->params['skip'];
 		$fromdate = $this->params['fromdate'];
@@ -132,7 +133,10 @@ class SeedDMS_View_TimelineFeed extends SeedDMS_Theme_Style {
 						$version = $doc->getContentByVersion($item['version']);
 						$previewer->createPreview($version);
 						if($previewer->hasPreview($version)) {
-							$newItem->addElement('enclosure', null, array('url' => $baseurl.'op/op.TimelineFeedPreview.php?documentid='.$item['document']->getId().'&version='.$version->getVersion().'&width='.$previewwidthdetail, 'length'=>$previewer->getFileSize($version), 'type'=>'image/png'));
+							$token = new SeedDMS_JwtToken($settings->_encryptionKey);
+							$data = array('d'=>$doc->getId(), 'v'=>$item['version'], 'u'=>$user->getId(), 'w'=>$previewwidthdetail,);
+							$hash =  $token->jwtEncode($data);
+							$newItem->addElement('enclosure', null, array('url' => $baseurl.'op/op.TimelineFeedPreview.php?hash='.$hash, 'length'=>$previewer->getFileSize($version), 'type'=>'image/png'));
 						}
 					}
 					$feed->addItem($newItem);

From 53654444f0d2685d40c0e6fce0ef97ad40c231d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 9 May 2021 08:15:14 +0200
Subject: [PATCH 1433/2006] use sys_get_temp_dir() instead of '/tmp'

---
 op/op.AddDocument.php            | 2 +-
 views/bootstrap/class.Search.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 1e78762e8..73ed1b615 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -333,7 +333,7 @@ if($settings->_libraryFolder) {
 		if($clonedoc = $dms->getDocument($_POST["librarydoc"])) {
 			if($content = $clonedoc->getLatestContent()) {
 				$docsource = 'library';
-				$fullfile = tempnam('/tmp', '');
+				$fullfile = tempnam(sys_get_temp_dir(), '');
 				if(SeedDMS_Core_File::copyFile($dms->contentDir . $content->getPath(), $fullfile)) {
 					/* Check if a local file is uploaded as well */
 					if(isset($_FILES["userfile"]['error'][0])) {
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 12403e1ba..2e461777b 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -97,7 +97,7 @@ $(document).ready(function() {
 					$downmgr->addItem($entry->getLatestContent(), $extracols);
 			}
 		}
-		$filename = tempnam('/tmp', '');
+		$filename = tempnam(sys_get_temp_dir(), '');
 		if(isset($_GET['includecontent']) && $_GET['includecontent']) {
 			$downmgr->createArchive($filename);
 			header("Content-Transfer-Encoding: binary");

From c53b3babbdeb96277c8ddf2d426552179da87301 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 9 May 2021 13:41:53 +0200
Subject: [PATCH 1434/2006] add task for creating missing preview images

---
 inc/inc.Tasks.php | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 246f5cb8b..591276610 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -289,6 +289,87 @@ class SeedDMS_CheckSumTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	}
 } /* }}} */
 
+/**
+ * Class for processing a single folder
+ *
+ * SeedDMS_Task_Preview_Process_Folder::process() is used as a callable when
+ * iterating over all folders recursively.
+ */
+class SeedDMS_Task_Preview_Process_Folder { /* {{{ */
+	protected $logger;
+
+	protected $previewer;
+
+	protected $widths;
+
+	public function __construct($previewer, $widths, $logger) { /* {{{ */
+		$this->logger = $logger;
+		$this->previewer = $previewer;
+		$this->widths = $widths;
+	} /* }}} */
+
+	public function process($folder) { /* {{{ */
+		$dms = $folder->getDMS();
+		$documents = $folder->getDocuments();
+		if($documents) {
+		foreach($documents as $document) {
+				$versions = $document->getContent();
+				foreach($versions as $version) {
+					foreach($this->widths as $width) {
+						if($this->previewer->createPreview($version, $width)) {
+							$this->logger->log('Task \'preview\': created preview ('.$width.'px) for document '.$document->getId().':'.$version->getVersion(), PEAR_LOG_INFO);
+//							echo "Preview ".$width."px for ".$document->getId().":".$version->getVersion()." created\n";
+						}
+					}
+				}
+			}
+		}
+	} /* }}} */
+} /* }}} */
+
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  core
+ */
+class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
+
+	/**
+	 * Run the task
+	 *
+	 * @param $task task to be executed
+	 * @param $dms dms
+	 * @return boolean true if task was executed succesfully, otherwise false
+	 */
+	public function execute($task) {
+		$dms = $this->dms;
+		$logger = $this->logger;
+		$settings = $this->settings;
+		$taskparams = $task->getParameter();
+		$folder = $dms->getRootFolder();
+
+		$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+
+		$folderprocess = new SeedDMS_Task_Preview_Process_Folder($previewer, array($settings->_previewWidthList, $settings->_previewWidthDetail), $logger);
+		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
+		call_user_func(array($folderprocess, 'process'), $folder);
+
+		return true;
+	}
+
+	public function getDescription() {
+		return 'Check all documents for a missing preview image';
+	}
+
+	public function getAdditionalParams() {
+		return array(
+		);
+	}
+} /* }}} */
+
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = 'SeedDMS_ExpiredDocumentsTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['indexingdocs'] = 'SeedDMS_IndexingDocumentsTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['checksum'] = 'SeedDMS_CheckSumTask';
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['preview'] = 'SeedDMS_PreviewTask';

From 9cd60901b1a0064314a142f6b218eb858d789a15 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 9 May 2021 13:42:35 +0200
Subject: [PATCH 1435/2006] set proper class for coloring a table row

---
 views/bootstrap/class.ExtensionMgr.php     | 4 ++--
 views/bootstrap/class.SchedulerTaskMgr.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index ad7cbe258..217734682 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -116,9 +116,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 			echo "<tr";
 			if(isset($extconf[$re['name']])) {
 				if($needsupdate)
-					echo " class=\"warning\"";
+					echo " class=\"table-warning warning\"";
 				else
-					echo " class=\"success\"";
+					echo " class=\"table-success success\"";
 			}
 			echo ">";
 			echo "<td width=\"32\">".($re['icon-data'] ? '<img width="32" height="32" alt="'.$re['name'].'" title="'.$re['name'].'" src="'.$re['icon-data'].'">' : '')."</td>";
diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 2f56375c9..89cef4541 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -426,9 +426,9 @@ $(document).ready( function() {
 		print "</tr></thead><tbody>\n";
 		foreach($tasks as $task) {
 			if(!isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()]) || !is_object(resolveTask($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()])))
-				$class = 'error';
+				$class = 'table-danger error';
 			else
-				$class = 'success';
+				$class = 'table-success success';
 			echo "<tr id=\"table-row-task-".$task->getID()."\" class=\"".(!$task->getDisabled() ? " ".$class : "")."\">";
 			echo "<td>";
 			echo $task->getExtension()."::".$task->getTask();

From e0cfbd9b1b207acb95b450049884897792e1136e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 10 May 2021 08:45:52 +0200
Subject: [PATCH 1436/2006] set converters in preview task, really check if
 preview was created

---
 inc/inc.Tasks.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 591276610..9ca8aac0c 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -316,9 +316,12 @@ class SeedDMS_Task_Preview_Process_Folder { /* {{{ */
 				$versions = $document->getContent();
 				foreach($versions as $version) {
 					foreach($this->widths as $width) {
-						if($this->previewer->createPreview($version, $width)) {
-							$this->logger->log('Task \'preview\': created preview ('.$width.'px) for document '.$document->getId().':'.$version->getVersion(), PEAR_LOG_INFO);
-//							echo "Preview ".$width."px for ".$document->getId().":".$version->getVersion()." created\n";
+						$isnew = null;
+						if($this->previewer->createPreview($version, $width, $isnew)) {
+							if($isnew){
+								$this->logger->log('Task \'preview\': created preview ('.$width.'px) for document '.$document->getId().':'.$version->getVersion(), PEAR_LOG_INFO);
+							echo "Preview ".$width."px for ".$document->getId().":".$version->getVersion()." created\n";
+						}
 						}
 					}
 				}
@@ -351,6 +354,8 @@ class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		$folder = $dms->getRootFolder();
 
 		$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+		$previewer->setConverters(isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
+		$logger->log('Cachedir is '.$settings->_cacheDir, PEAR_LOG_INFO);
 
 		$folderprocess = new SeedDMS_Task_Preview_Process_Folder($previewer, array($settings->_previewWidthList, $settings->_previewWidthDetail), $logger);
 		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));

From 1af7524b766470d068387aec9db1eb2bacbd7caa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 10 May 2021 09:03:44 +0200
Subject: [PATCH 1437/2006] add changes of 6.0.16

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 238772003..7feb88627 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - cancel checkout needs confirmation
 - add input field to filter list of recipients if more then 10
+- add task for creating missing preview images
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.15

From d1690c917dd3bdce429111be0c543e9a494bd857 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 11 May 2021 19:02:48 +0200
Subject: [PATCH 1438/2006] show only detail preview for older versions

---
 inc/inc.Tasks.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 9ca8aac0c..4c324ea15 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -315,13 +315,15 @@ class SeedDMS_Task_Preview_Process_Folder { /* {{{ */
 		foreach($documents as $document) {
 				$versions = $document->getContent();
 				foreach($versions as $version) {
-					foreach($this->widths as $width) {
-						$isnew = null;
-						if($this->previewer->createPreview($version, $width, $isnew)) {
-							if($isnew){
-								$this->logger->log('Task \'preview\': created preview ('.$width.'px) for document '.$document->getId().':'.$version->getVersion(), PEAR_LOG_INFO);
-							echo "Preview ".$width."px for ".$document->getId().":".$version->getVersion()." created\n";
-						}
+					foreach($this->widths as $previewtype=>$width) {
+						if($previewtype == 'detail' || $document->isLatestContent($version->getVersion())) {
+							$isnew = null;
+							if($this->previewer->createPreview($version, $width, $isnew)) {
+								if($isnew){
+									$this->logger->log('Task \'preview\': created preview ('.$width.'px) for document '.$document->getId().':'.$version->getVersion(), PEAR_LOG_INFO);
+								echo "Preview ".$width."px for ".$document->getId().":".$version->getVersion()." created\n";
+								}
+							}
 						}
 					}
 				}
@@ -357,7 +359,7 @@ class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		$previewer->setConverters(isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 		$logger->log('Cachedir is '.$settings->_cacheDir, PEAR_LOG_INFO);
 
-		$folderprocess = new SeedDMS_Task_Preview_Process_Folder($previewer, array($settings->_previewWidthList, $settings->_previewWidthDetail), $logger);
+		$folderprocess = new SeedDMS_Task_Preview_Process_Folder($previewer, array('list'=>$settings->_previewWidthList, 'detail'=>$settings->_previewWidthDetail), $logger);
 		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
 		call_user_func(array($folderprocess, 'process'), $folder);
 

From 0f9be431524f9505a4902a3574b8a8f572220f46 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 11 May 2021 19:06:52 +0200
Subject: [PATCH 1439/2006] get status of latest content

---
 views/bootstrap/class.ViewDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 52a34c474..33dc9d6a1 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1339,6 +1339,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 ?>
 		  <div class="tab-pane <?php if($currenttab == 'recipients') echo 'active'; ?>" id="recipients">
 <?php
+			$status = $latestContent->getStatus();
 			if($status["status"]!=S_RELEASED)
 				echo "<div class=\"alert alert-warning\">".getMLText('info_recipients_tab_not_released')."</div>";
 

From 7d34bd86b3f919afea183ff35a9216b259298253 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 11 May 2021 22:13:35 +0200
Subject: [PATCH 1440/2006] create previews of attachments

---
 inc/inc.Tasks.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 4c324ea15..290604eaa 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -321,12 +321,18 @@ class SeedDMS_Task_Preview_Process_Folder { /* {{{ */
 							if($this->previewer->createPreview($version, $width, $isnew)) {
 								if($isnew){
 									$this->logger->log('Task \'preview\': created preview ('.$width.'px) for document '.$document->getId().':'.$version->getVersion(), PEAR_LOG_INFO);
-								echo "Preview ".$width."px for ".$document->getId().":".$version->getVersion()." created\n";
 								}
 							}
 						}
 					}
 				}
+				$files = $document->getDocumentFiles();
+				foreach($files as $file) {
+					$this->previewer->createPreview($file, $width['detail'], $isnew);
+					if($isnew){
+						$this->logger->log('Task \'preview\': created preview ('.$width.'px) for attachment of document '.$document->getId().':'.$file->getId(), PEAR_LOG_INFO);
+					}
+				}
 			}
 		}
 	} /* }}} */

From 01a4251b9a25e44c99de463b9fe8ee93d9caaf09 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 12 May 2021 11:56:05 +0200
Subject: [PATCH 1441/2006] remove extra div

---
 views/bootstrap/class.RoleMgr.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index e91b7ad3a..8bbdb902b 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -243,9 +243,7 @@ $(document).ready( function() {
 		$this->columnStart(8);
 ?>
 <?php if($accessop->check_view_access($this, array('action'=>'form'))) { ?>
-	<div class="well">
 		<div class="ajax" data-view="RoleMgr" data-action="form" <?php echo ($selrole ? "data-query=\"roleid=".$selrole->getID()."\"" : "") ?>></div>
-	</div>
 <?php } else {
 	$this->errorMsg(getMLText('access_denied'));
 }

From cd99928cd49fadb14cd459da986380331bf13901 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 17 May 2021 07:01:50 +0200
Subject: [PATCH 1442/2006] remove superflous fold mark

---
 op/op.Ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 7a05bbd02..be23970c9 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -902,7 +902,7 @@ switch($command) {
 		}
 		break; /* }}} */
 
-	case 'indexdocument': /* {{{ */
+	case 'indexdocument':
 	case 'indexfolder': /* {{{ */
 		if($user && $user->isAdmin()) {
 			if($fulltextservice) {

From 3614bae91b7ebebac451aba3643796f132e73a66 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 22 May 2021 13:12:38 +0200
Subject: [PATCH 1443/2006] get status of latest content

---
 views/bootstrap/class.ViewDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index e19541901..c4b63e960 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1476,6 +1476,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 ?>
 			<div class="tab-pane <?php if($currenttab == 'revision') echo 'active'; ?>" id="revision">
 <?php
+			$status = $latestContent->getStatus();
 			if($status['status'] == S_RELEASED) {
 				if($latestContent->getRevisionDate()) {
 ?>

From 1132bd134ed4a86d2d15826b223e658eae0546b3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 May 2021 09:02:59 +0200
Subject: [PATCH 1444/2006] fix strict php warning

---
 views/bootstrap/class.TriggerWorkflow.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index 6753082bb..f8fc63ff8 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -79,7 +79,8 @@ $(document).ready(function() {
 
 		$action = $transition->getAction();
 		$currentstate = $latestContent->getWorkflowState();
-		$wkflog = array_shift($latestContent->getWorkflowLog());
+		$wkflogs = $latestContent->getWorkflowLog();
+		$wkflog = array_shift($wkflogs);
 		$workflow = $latestContent->getWorkflow();
 
 		$msg = "The document is currently in state: ".$currentstate->getName()."<br />";

From 012c3b7d223f881ab5a3f21697d8ede3d11e14c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 06:48:42 +0200
Subject: [PATCH 1445/2006] use jquery validatation

---
 views/bootstrap/class.ReviseDocument.php | 80 ++++++++++--------------
 1 file changed, 32 insertions(+), 48 deletions(-)

diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 351fe54bf..4068505f2 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -33,55 +33,36 @@ class SeedDMS_View_ReviseDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkIndForm()
-{
-	msg = new Array();
-	if (document.formind.revisionStatus.value == "") msg.push("<?php printMLText("js_no_revision_status");?>");
-	if (document.formind.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-function checkGrpForm()
-{
-	msg = new Array();
-	if (document.formgrp.revisionGroup.value == "") msg.push("<?php printMLText("js_no_revision_group");?>");
-	if (document.formgrp.revisionSatus.value == "") msg.push("<?php printMLText("js_no_revision_status");?>");
-	if (document.formgrp.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 $(document).ready(function() {
-	$('body').on('submit', '#formind', function(ev){
-		if(checkIndForm()) return;
-		event.preventDefault();
+	$("#formind").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			reviewStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			reviewStatus: "<?php printMLText("js_no_review_status");?>",
+		},
 	});
-	$('body').on('submit', '#formgrp', function(ev){
-		if(checkGrpForm()) return;
-		event.preventDefault();
+	$("#formgrp").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			reviewStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			reviewStatus: "<?php printMLText("js_no_review_status");?>",
+		},
 	});
 });
 <?php
@@ -103,12 +84,14 @@ $(document).ready(function() {
 			}
 		}
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_revision"));
-		$this->contentContainerStart();
 
 		// Display the Revision form.
 		$revisiontype = ($revisionStatus['type'] == 0) ? 'ind' : 'grp';
@@ -131,6 +114,7 @@ $(document).ready(function() {
 	<form class="form-horizontal" method="post" action="../op/op.ReviseDocument.php" id="form<?= $revisiontype ?>" name="form<?= $revisiontype ?>">
 	<?php echo createHiddenFieldWithKey('revisedocument'); ?>
 <?php
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("comment"),
 			array(
@@ -153,6 +137,7 @@ $(document).ready(function() {
 				'options'=>$options,
 			)
 		);
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_revision'), $revisiontype.'Revision');
 ?>
 	<input type='hidden' name='revisionType' value='<?= $revisiontype ?>'/>
@@ -163,7 +148,6 @@ $(document).ready(function() {
 	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 	</form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 554b10235621ba950f88822c5184ee5fe9826a69 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 06:49:16 +0200
Subject: [PATCH 1446/2006] fix layout (still not perfect)

---
 views/bootstrap/class.SetRecipients.php | 36 ++++++++++++++++---------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index f3083dab7..603576d54 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -66,13 +66,15 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 		}
 ?>
 
+<form class="form-horizontal" action="../op/op.SetRecipients.php" method="post" name="form1">
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
+
 <?php $this->contentContainerStart(); ?>
 
-<form action="../op/op.SetRecipients.php" method="post" name="form1">
-
-<?php $this->contentSubHeading(getMLText("update_recipients"));?>
-
-  <div class="cbSelectTitle"><?php printMLText("individuals")?>:</div>
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("individuals")?>:</label>
+		<div class="controls">
   <select class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
 
@@ -96,8 +98,12 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 		}
 ?>
   </select>
+		</div>
+	</div>
 
-  <div class="cbSelectTitle"><?php printMLText("individuals_in_groups")?>:</div>
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("individuals_in_groups")?>:</label>
+		<div class="controls">
   <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
 		foreach ($docAccess["groups"] as $group) {
@@ -105,8 +111,12 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 		}
 ?>
   </select>
+		</div>
+	</div>
 
-  <div class="cbSelectTitle"><?php printMLText("groups")?>:</div>
+	<div class="control-group">
+		<label class="control-label"><?php printMLText("groups")?>:</label>
+		<div class="controls">
   <select class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
 <?php
 		foreach ($docAccess["groups"] as $group) {
@@ -128,15 +138,15 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 		}
 ?>
   </select>
+		</div>
+	</div>
 
-<p>
-<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
-<input type="submit" class="btn btn-primary" value="<?php printMLText("update");?>">
-</p>
-</form>
 <?php
 		$this->contentContainerEnd();
+		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));
+?>
+</form>
+<?php
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 5d6235ec0b97be9036ded46ef5c4ea949e4ae66b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 06:49:55 +0200
Subject: [PATCH 1447/2006] place submit button outside of contentContainer

---
 views/bootstrap/class.SetRevisors.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 7d7ef29bc..1c5c0135f 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -69,6 +69,8 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 ?>
 
 <form class="form-horizontal" action="../op/op.SetRevisors.php" method="post" name="form1">
+	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 
 <?php
 		$this->contentContainerStart();
@@ -152,8 +154,6 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 		</div>
 	</div>
 
-	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 <?php
 		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));

From 7485d0291a76bfa992098b17b686f8bfdbc93a8b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 1 Jun 2021 07:05:59 +0200
Subject: [PATCH 1448/2006] use jquery validation

---
 views/bootstrap/class.TransmittalMgr.php | 25 +++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 4280931b6..22dfa2392 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -36,13 +36,25 @@ class SeedDMS_View_TransmittalMgr extends SeedDMS_Theme_Style {
 		$onepage = $this->params['onepage'];
 
 		header('Content-Type: application/javascript; charset=UTF-8');
-		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		parent::jsTranslations(array('js_form_error', 'js_form_errors', 'cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 		$this->printDeleteDocumentButtonJs();
 		$this->printDeleteItemButtonJs();
 		$this->printUpdateItemButtonJs();
 		if($onepage)
 			$this->printClickDocumentJs();
 ?>
+function runValidation() {
+	$("#form1").validate({
+		rules: {
+			name: {
+				required: true
+			},
+		},
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+		}
+	});
+}
 $(document).ready( function() {
 	$('body').on('click', '.selecttransmittal', function(ev){
 		ev.preventDefault();
@@ -209,7 +221,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$accessop = $this->params['accessobject'];
 ?>
-	<form action="../op/op.TransmittalMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $transmittal ? $transmittal->getID() : '0';?>">
+	<form action="../op/op.TransmittalMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $transmittal ? $transmittal->getID() : '0';?>" id="form1">
 <?php
 		if($transmittal) {
 			echo createHiddenFieldWithKey('edittransmittal');
@@ -223,6 +235,7 @@ $(document).ready( function() {
 	<input type="hidden" name="action" value="addtransmittal">
 <?php
 		}
+		$this->contentContainerStart();
 		$this->formField(
 			getMLText("name"),
 			array(
@@ -243,6 +256,7 @@ $(document).ready( function() {
 				'value'=>($transmittal ? htmlspecialchars($transmittal->getComment()) : '')
 			)
 		);
+		$this->contentContainerEnd();
 		if($transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'edittransmittal')) || !$transmittal && $accessop->check_controller_access('TransmittalMgr', array('action'=>'addtransmittal'))) {
 			$this->formSubmit("<i class=\"fa fa-save\"></i> ".($transmittal ? getMLText('save') : getMLText('add_transmittal')));
 		}
@@ -319,6 +333,9 @@ $(document).ready( function() {
 		$accessop = $this->params['accessobject'];
 		$seltransmittal = $this->params['seltransmittal'];
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("my_transmittals"));
 		$this->globalNavigation();
 		$this->contentStart();
@@ -359,11 +376,9 @@ $(document).ready( function() {
 		$this->columnEnd();
 		$this->columnStart(8);
 		if($accessop->check_view_access($this, array('action'=>'form'))) {
-		$this->contentContainerStart();
 ?>
-		<div class="ajax" data-view="TransmittalMgr" data-action="form" <?php echo ($seltransmittal ? "data-query=\"transmittalid=".$seltransmittal->getID()."\"" : "") ?>></div>
+		<div class="ajax" data-view="TransmittalMgr" data-action="form" data-afterload="()=>{runValidation();}" <?php echo ($seltransmittal ? "data-query=\"transmittalid=".$seltransmittal->getID()."\"" : "") ?>></div>
 <?php
-		$this->contentContainerEnd();
 		}
 		if($accessop->check_view_access($this, array('action'=>'items'))) {
 ?>

From e425120d7da51edb7808155d856b338a356dfbf4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Jun 2021 08:02:32 +0200
Subject: [PATCH 1449/2006] mails listing expired documents can be send for
 each owner

---
 inc/inc.Tasks.php | 62 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 15 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 290604eaa..5c37c717a 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -24,27 +24,52 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		$settings = $this->settings;
 		$logger = $this->logger;
 		$taskparams = $task->getParameter();
-		$docs = $dms->getDocumentsExpired(intval($taskparams['days']));
 		$tableformat = " %-10s %5d %-60s";
 		$tableformathead = " %-10s %5s %-60s";
 		$tableformathtml = "<tr><td>%s</td><td>%d</td><td>%s</td></tr>";
 		$tableformatheadhtml = "<tr><th>%s</th><th>%s</th><th>%s</th></tr>";
 		$body = '';
 		$bodyhtml = '';
-		if (count($docs)>0) {
-			$bodyhtml .= "<table>".PHP_EOL;
-			$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
-			$body .= sprintf($tableformathead."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
-			$body .= "---------------------------------------------------------------------------------\n";
-			foreach($docs as $doc) {
-				$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
-				$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
-			}
-			$bodyhtml .= "</table>".PHP_EOL;
-			if($taskparams['email'])
-				require_once('inc/inc.ClassEmailNotify.php');
-				$email = new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
 
+		require_once('inc/inc.ClassEmailNotify.php');
+		$email = new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+
+		if(!empty($taskparams['peruser'])) {
+			$users = $dms->getAllUsers();
+			foreach($users as $u) {
+				$docs = $dms->getDocumentsExpired(intval($taskparams['days']), $u);
+				if (count($docs)>0) {
+					$bodyhtml .= "<table>".PHP_EOL;
+					$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
+					$body .= sprintf($tableformathead."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
+					$body .= "---------------------------------------------------------------------------------\n";
+					foreach($docs as $doc) {
+						$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+						$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+					}
+					$bodyhtml .= "</table>".PHP_EOL;
+					$params = array();
+					$params['count'] = count($docs);
+					$params['__body__'] = $body;
+					$params['__body_html__'] = $bodyhtml;
+					$params['sitename'] = $settings->_siteName;
+					$email->toIndividual('', $u, 'expired_docs_mail_subject', '', $params);
+
+					$logger->log('Task \'expired_docs\': Sending reminder \'expired_docs_mail_subject\' to user \''.$u->getLogin().'\'', PEAR_LOG_INFO);
+				}
+			}
+		} elseif($taskparams['email']) {
+			$docs = $dms->getDocumentsExpired(intval($taskparams['days']));
+			if (count($docs)>0) {
+				$bodyhtml .= "<table>".PHP_EOL;
+				$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
+				$body .= sprintf($tableformathead."\n", getMLText("expiration_date", array(), ""), "ID", getMLText("name", array(), ""));
+				$body .= "---------------------------------------------------------------------------------\n";
+				foreach($docs as $doc) {
+					$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+					$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+				}
+				$bodyhtml .= "</table>".PHP_EOL;
 				$params = array();
 				$params['count'] = count($docs);
 				$params['__body__'] = $body;
@@ -53,7 +78,9 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 				$email->toIndividual('', $taskparams['email'], 'expired_docs_mail_subject', '', $params);
 
 				$logger->log('Task \'expired_docs\': Sending reminder \'expired_docs_mail_subject\' to user \''.$taskparams['email'].'\'', PEAR_LOG_INFO);
-//				mail($taskparams['email'], getMLText('expired_docs_mail_subject',array('sitename'=>$settings->_siteName, 'count'=>count($docs))), $body);
+			}
+		} else {
+				$logger->log('Task \'expired_docs\': neither peruser nor email is set', PEAR_LOG_WARNING);
 		}
 		return true;
 	}
@@ -73,6 +100,11 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 				'name'=>'days',
 				'type'=>'integer',
 				'description'=> 'Number of days to check for. Negative values will look into the past. 0 will just check for documents expiring the current day. Keep in mind that the document is still valid on the expiration date.',
+			),
+			array(
+				'name'=>'peruser',
+				'type'=>'boolean',
+				'description'=> 'Send mail to each user. If set, a list of all expired documents will be send to the owner of the documents.',
 			)
 		);
 	}

From 1ab5f833956d1893a0b387bfcc11d4becf94e49b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 16 Jun 2021 08:04:42 +0200
Subject: [PATCH 1450/2006] output info message above form if it set

---
 views/bootstrap/class.ReceiptDocument.php | 2 ++
 views/bootstrap/class.ReviseDocument.php  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index 2ea3a0854..e3e310be8 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -108,6 +108,8 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_receipt"));
+		if(getMLText('info_submit_receipt', array(), ''))
+			$this->infoMsg(getMLText('info_submit_receipt', array(), ''));
 		$this->contentContainerStart();
 
 		// Display the Receipt form.
diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 4068505f2..78b5848bb 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -92,6 +92,8 @@ $(document).ready(function() {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_revision"));
+		if(getMLText('info_submit_revision', array(), ''))
+			$this->infoMsg(getMLText('info_submit_revision', array(), ''));
 
 		// Display the Revision form.
 		$revisiontype = ($revisionStatus['type'] == 0) ? 'ind' : 'grp';

From 79e926324a81265be41861cee7f966e55789f3d9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 09:47:16 +0200
Subject: [PATCH 1451/2006] add access check for EditFolder, MoveFolder, put
 logo in header

---
 op/op.EditFolder.php                  |  4 ++++
 op/op.MoveFolder.php                  |  5 +++++
 views/bootstrap/class.Bootstrap.php   | 20 +++++++++++++-------
 views/bootstrap4/class.Bootstrap4.php | 22 ++++++++++++++--------
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php
index d834329b1..247235532 100644
--- a/op/op.EditFolder.php
+++ b/op/op.EditFolder.php
@@ -31,6 +31,10 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
+	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("access_denied"));
+}
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('editfolder')) {
diff --git a/op/op.MoveFolder.php b/op/op.MoveFolder.php
index d0fc96886..b80a15c49 100644
--- a/op/op.MoveFolder.php
+++ b/op/op.MoveFolder.php
@@ -33,6 +33,11 @@ if(!checkFormKey('movefolder', 'GET')) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('MoveFolder', $_POST)) {
+	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("access_denied"));
+}
+
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 66ad6f4a4..8c0f9249f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -752,9 +752,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_document'));
 			if(0 && $this->params['enablelargefileupload'])
 				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_multiple_documents'));
-			$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
-			if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-				$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
+			if ($accessobject->check_view_access('EditFolder')) {
+				$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
+			}
+			if ($accessobject->check_view_access('MoveFolder')) {
+				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
+					$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
+			}
 
 			if ($accessMode == M_ALL) {
 				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
@@ -3237,10 +3241,12 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 			}
 		}
-		if($subFolderAccessMode >= M_READWRITE) {
-			$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';
-		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+		if ($accessop->check_view_access('EditFolder')) {
+			if($subFolderAccessMode >= M_READWRITE) {
+				$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';
+			} else {
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+			}
 		}
 		if($subFolderAccessMode >= M_READWRITE) {
 			$content .= $this->printAccessButton($subFolder, true);
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index adb5f0072..64e1c36e2 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -297,7 +297,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	function globalBanner() { /* {{{ */
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
+		echo " <a class=\"navbar-brand\" href=\"../out/out.ViewFolder.php\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="../views/bootstrap4/images/seeddms-logo.svg">')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 		echo "</nav>\n";
 	} /* }}} */
 
@@ -669,9 +669,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_document'));
 			if(0 && $this->params['enablelargefileupload'])
 				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_multiple_documents'));
-			$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
-			if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
-				$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
+			if ($accessobject->check_view_access('EditFolder')) {
+				$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
+			}
+			if ($accessobject->check_view_access('MoveFolder')) {
+				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
+					$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
+			}
 
 			if ($accessMode == M_ALL) {
 				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
@@ -3233,10 +3237,12 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 			}
 		}
-		if($subFolderAccessMode >= M_READWRITE) {
-			$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';
-		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+		if ($accessop->check_view_access('EditFolder')) {
+			if($subFolderAccessMode >= M_READWRITE) {
+				$content .= '<a class_="btn btn-mini" href="../out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';
+			} else {
+				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+			}
 		}
 		if($subFolderAccessMode >= M_READWRITE) {
 			$content .= $this->printAccessButton($subFolder, true);

From aa4997a7e730251c6bfe7c3afc50417bc3567812 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 09:48:28 +0200
Subject: [PATCH 1452/2006] add access check

---
 out/out.EditFolder.php | 3 +++
 out/out.MoveFolder.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/out/out.EditFolder.php b/out/out.EditFolder.php
index ed47a1d72..5361f4cbe 100644
--- a/out/out.EditFolder.php
+++ b/out/out.EditFolder.php
@@ -32,6 +32,9 @@ require_once("inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
+}
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
diff --git a/out/out.MoveFolder.php b/out/out.MoveFolder.php
index 0755feb4c..fc86bd506 100644
--- a/out/out.MoveFolder.php
+++ b/out/out.MoveFolder.php
@@ -32,6 +32,9 @@ require_once("inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
+}
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));

From ea5efd75d70ffc51c2b78510846dbd379ef571eb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Jun 2021 11:33:54 +0200
Subject: [PATCH 1453/2006] add access control for EditComment and
 EditAttributes

---
 op/op.EditAttributes.php               |  5 +++++
 op/op.EditComment.php                  |  5 +++++
 out/out.EditAttributes.php             |  3 +++
 views/bootstrap/class.ViewDocument.php | 14 ++++++++------
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php
index 95a5740b7..a3fb4633d 100644
--- a/op/op.EditAttributes.php
+++ b/op/op.EditAttributes.php
@@ -34,6 +34,11 @@ if(!checkFormKey('editattributes')) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('EditAttributes', $_POST)) {
+	UI::exitError(getMLText("folder_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
diff --git a/op/op.EditComment.php b/op/op.EditComment.php
index af2860f66..b0fe19994 100644
--- a/op/op.EditComment.php
+++ b/op/op.EditComment.php
@@ -34,6 +34,11 @@ if(!checkFormKey('editcomment')) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('EditComment', $_POST)) {
+	UI::exitError(getMLText("folder_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
diff --git a/out/out.EditAttributes.php b/out/out.EditAttributes.php
index 6233cf8fd..4685b4474 100644
--- a/out/out.EditAttributes.php
+++ b/out/out.EditAttributes.php
@@ -34,6 +34,9 @@ require_once("inc/inc.Authentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"), false, $isajax);
+}
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index fa29dac0b..689d9cd21 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -656,12 +656,14 @@ $(document).ready( function() {
 				if($accessobject->check_view_access('AddToTransmittal'))
 					$items[] = array('link'=>"out.AddToTransmittal.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'list', 'label'=>'add_to_transmittal');
 			}
-		if($accessobject->mayEditComment($latestContent->getDocument())) {
-			$items[] = array('link'=>"out.EditComment.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'comment', 'label'=>'edit_comment');
-		}
-		if($accessobject->mayEditAttributes($latestContent->getDocument())) {
-			$items[] = array('link'=>"out.EditAttributes.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'edit', 'label'=>'edit_attributes');
-		}
+		if($accessobject->check_view_access('EditComment'))
+			if($accessobject->mayEditComment($latestContent->getDocument())) {
+				$items[] = array('link'=>"out.EditComment.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'comment', 'label'=>'edit_comment');
+			}
+		if($accessobject->check_view_access('EditAttributes'))
+			if($accessobject->mayEditAttributes($latestContent->getDocument())) {
+				$items[] = array('link'=>"out.EditAttributes.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'edit', 'label'=>'edit_attributes');
+			}
 		if(!$islatest)
 			$items[] = array('link'=>"out.DocumentVersionDetail.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'info', 'label'=>'details');
 

From 0754a794d3ddf242527003743bf2ba6fe61858ad Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Jun 2021 09:01:24 +0200
Subject: [PATCH 1454/2006] fix creating AccessOperation

---
 out/out.SendLoginData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.SendLoginData.php b/out/out.SendLoginData.php
index 97db9e237..61fd76659 100644
--- a/out/out.SendLoginData.php
+++ b/out/out.SendLoginData.php
@@ -40,7 +40,7 @@ if (!is_object($newuser)) {
 	UI::exitError(getMLText("rm_user"),getMLText("invalid_user_id"));
 }
 
-$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {

From cefcdc966b26303e9f32d09bde207f05ea847c18 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Jun 2021 17:55:35 +0200
Subject: [PATCH 1455/2006] use check_view_access instead of checking for admin

---
 out/out.ImportUsers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/out/out.ImportUsers.php b/out/out.ImportUsers.php
index 199763a26..b847f4754 100644
--- a/out/out.ImportUsers.php
+++ b/out/out.ImportUsers.php
@@ -30,8 +30,8 @@ require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
-if (!$user->isAdmin()) {
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_view_access($view, $_GET)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 

From 6d1aa2f347348f33aafe9479a6e8abe03bccfc57 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 08:43:09 +0200
Subject: [PATCH 1456/2006] use translated text

---
 inc/inc.Tasks.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 5c37c717a..bcf0251e6 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -145,9 +145,9 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 							}
 						}
 						$this->fulltextservice->Indexer()->addDocument($idoc);
-						echo " (Document added)".PHP_EOL;
+						echo "(".getMLText('index_document_added').")".PHP_EOL;
 					} catch(Exception $e) {
-						echo " (Timeout)".PHP_EOL;
+						echo "(Timeout)".PHP_EOL;
 					}
 				} else {
 					/* Check if the attribute created is set or has a value older
@@ -162,7 +162,7 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 					}
 					$content = $document->getLatestContent();
 					if($created >= $content->getDate() && !$this->forceupdate) {
-						echo getMLText('index_document_unchanged').PHP_EOL;
+						echo "(".getMLText('index_document_unchanged').")".PHP_EOL;
 					} else {
 						$this->fulltextservice->Indexer()->delete($hit->id);
 						try {
@@ -175,9 +175,9 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 								}
 							}
 							$this->fulltextservice->Indexer()->addDocument($idoc);
-							echo " (Document updated)".PHP_EOL;
+							echo "(".getMLText('index_document_updated').")".PHP_EOL;
 						} catch(Exception $e) {
-							echo " (Timeout)".PHP_EOL;
+							echo "(Timeout)".PHP_EOL;
 						}
 					}
 				}

From 363f417eb79ff20bda23f9d0d1898693982e185e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Jun 2021 12:51:44 +0200
Subject: [PATCH 1457/2006] index folders in task

---
 inc/inc.Tasks.php | 59 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index bcf0251e6..2551ac1d9 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -124,17 +124,64 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 	public function __construct($fulltextservice, $forceupdate) { /* {{{ */
 		$this->fulltextservice = $fulltextservice;
 		$this->forceupdate = $forceupdate;
+		$this->numdocs = $this->fulltextservice->Indexer()->count();
 	} /* }}} */
 
-	public function process($folder) { /* {{{ */
+	public function process($folder, $depth=0) { /* {{{ */
+		$lucenesearch = $this->fulltextservice->Search();
 		$documents = $folder->getDocuments();
+		echo str_repeat('  ', $depth+1).$folder->getId().":".$folder->getFolderPathPlain()." ";
+		if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
+			try {
+				$idoc = $this->fulltextservice->IndexedDocument($folder, true);
+				if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) {
+					foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) {
+						if (method_exists($hookObj, 'preIndexFolder')) {
+							$hookObj->preIndexDocument(null, $folder, $idoc);
+						}
+					}
+				}
+				$this->fulltextservice->Indexer()->addDocument($idoc);
+				echo "(".getMLText('index_folder_added').")".PHP_EOL;
+			} catch(Exception $e) {
+				echo "(Timeout)".PHP_EOL;
+			}
+		} else {
+			/* Check if the attribute created is set or has a value older
+			 * than the lastet content. Folders without such an attribute
+			 * where added when a new folder was added to the dms. In such
+			 * a case the folder content wasn't indexed.
+			 */
+			try {
+				$created = (int) $hit->getDocument()->getFieldValue('created');
+			} catch (/* Zend_Search_Lucene_ */Exception $e) {
+				$created = 0;
+			}
+			if($created >= $folder->getDate() && !$this->forceupdate) {
+				echo "(".getMLText('index_folder_unchanged').")".PHP_EOL;
+			} else {
+				$this->fulltextservice->Indexer()->delete($hit->id);
+				try {
+					$idoc = $this->fulltextservice->IndexedDocument($folder, true);
+					if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) {
+						foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) {
+							if (method_exists($hookObj, 'preIndexFolder')) {
+								$hookObj->preIndexDocument(null, $folder, $idoc);
+							}
+						}
+					}
+					$this->fulltextservice->Indexer()->addDocument($idoc);
+					echo "(".getMLText('index_folder_updated').")".PHP_EOL;
+				} catch(Exception $e) {
+					echo "(Timeout)".PHP_EOL;
+				}
+			}
+		}
 		if($documents) {
-			$lucenesearch = $this->fulltextservice->Search();
-			echo $folder->getFolderPathPlain().PHP_EOL;
 			foreach($documents as $document) {
-				echo $document->getId().":".$document->getName()." ";
+				echo str_repeat('  ', $depth+2).$document->getId().":".$document->getName()." ";
 				/* If the document wasn't indexed before then just add it */
-				if(!($hit = $lucenesearch->getDocument($document->getId()))) {
+				if(($this->numdocs == 0) || !($hit = $lucenesearch->getDocument($document->getId()))) {
 					try {
 						$idoc = $this->fulltextservice->IndexedDocument($document, true);
 						if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
@@ -227,8 +274,8 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 			}
 
 			$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($fulltextservice, $recreate);
+			call_user_func(array($folderprocess, 'process'), $folder, -1);
 			$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
-			call_user_func(array($folderprocess, 'process'), $folder);
 		} else {
 			$logger->log('Task \'indexingdocs\': fulltext search is turned off', PEAR_LOG_WARNING);
 		}

From 4de124d9ae9b4c26039fce93b90718782e180e47 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 09:19:20 +0200
Subject: [PATCH 1458/2006] take out logging of cachedir path

---
 inc/inc.Tasks.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 2551ac1d9..c8ef229bf 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -442,7 +442,6 @@ class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 
 		$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 		$previewer->setConverters(isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
-		$logger->log('Cachedir is '.$settings->_cacheDir, PEAR_LOG_INFO);
 
 		$folderprocess = new SeedDMS_Task_Preview_Process_Folder($previewer, array('list'=>$settings->_previewWidthList, 'detail'=>$settings->_previewWidthDetail), $logger);
 		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));

From f02074c794c03a39f57af9f9b0473bbced630da6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 11:15:36 +0200
Subject: [PATCH 1459/2006] better message when running in dry mode

---
 utils/schedulercli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 8883ef78c..dcfff3974 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -92,7 +92,7 @@ foreach($tasks as $task) {
 							$task->setDisabled(1);
 						}
 					} elseif($mode == 'dryrun') {
-						echo "Running ".$task->getExtension()."::".$task->getTask()."\n";
+						echo "Running ".$task->getExtension()."::".$task->getTask()." in dry mode\n";
 					}
 				}
 			}

From 635d8253feec6a0400a0681345fca8c3bd88cc3a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Jun 2021 11:15:56 +0200
Subject: [PATCH 1460/2006] add space after scriptname in add_log_line()

---
 inc/inc.Utils.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 3299c41c7..9ba41f782 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -412,9 +412,9 @@ function add_log_line($msg="", $priority=null) { /* {{{ */
 	elseif(!empty($_SERVER['REMOTE_ADDR']))
 		$ip = $_SERVER['REMOTE_ADDR'];
 	if(!empty($_SERVER["REQUEST_URI"]))
-		$scriptname = basename($_SERVER["REQUEST_URI"], ".php");
+		$scriptname = basename($_SERVER["REQUEST_URI"], ".php").' ';
 	else
-		$scriptname = basename($_SERVER["SCRIPT_NAME"]);
+		$scriptname = basename($_SERVER["SCRIPT_NAME"]).' ';
 	if($user)
 		$logger->log($user->getLogin()." (".$ip.") ".$scriptname.($msg ? $msg : ''), $priority);
 	else

From e8a50e31017bf05a1baec4e1cbf85aafc92e0c14 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Jun 2021 09:04:57 +0200
Subject: [PATCH 1461/2006] more access checking

---
 op/op.LockDocument.php                |  5 +++++
 op/op.MoveDocument.php                |  5 +++++
 op/op.RemoveDocument.php              |  4 ++++
 op/op.UnlockDocument.php              |  5 +++++
 op/op.UpdateDocument.php              |  4 ++++
 views/bootstrap/class.Bootstrap.php   | 19 ++++++++++++++++---
 views/bootstrap4/class.Bootstrap4.php | 14 ++++++++------
 7 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/op/op.LockDocument.php b/op/op.LockDocument.php
index e2b2215c9..78b40e079 100644
--- a/op/op.LockDocument.php
+++ b/op/op.LockDocument.php
@@ -29,6 +29,11 @@ require_once("inc/inc.DBInit.php");
 require_once("inc/inc.ClassUI.php");
 require_once("inc/inc.Authentication.php");
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('LockDocument', $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('lockdocument', 'GET')) {
 	UI::exitError(getMLText("document_title"), getMLText("invalid_request_token"));
diff --git a/op/op.MoveDocument.php b/op/op.MoveDocument.php
index e1ebc227a..8006903c3 100644
--- a/op/op.MoveDocument.php
+++ b/op/op.MoveDocument.php
@@ -33,6 +33,11 @@ if(!checkFormKey('movedocument', 'GET')) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
 }
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('MoveDocument', $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index f700b96ac..c53e6808d 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -30,6 +30,10 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('removedocument')) {
diff --git a/op/op.UnlockDocument.php b/op/op.UnlockDocument.php
index 235e8c5d0..f61767365 100644
--- a/op/op.UnlockDocument.php
+++ b/op/op.UnlockDocument.php
@@ -28,6 +28,11 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('UnlockDocument', $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('unlockdocument', 'GET')) {
 	UI::exitError(getMLText("document_title"), getMLText("invalid_request_token"));
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 58cd26991..8af7b8e5a 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -30,6 +30,10 @@ include("../inc/inc.ClassController.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('updatedocument')) {
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 386d9f963..f259369b7 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -798,9 +798,17 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$menuitems['update_document'] = array('link'=>"../out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
 				if($accessobject->check_controller_access('LockDocument'))
 					$menuitems['lock_document'] = array('link'=>"../op/op.LockDocument".$docid."&formtoken=".createFormKey('lockdocument'), 'label'=>getMLText('lock_document'));
+				if($document->isCheckedOut())
+					$menuitems['checkin_document'] = array('link'=>"../out/out.CheckInDocument".$docid, 'label'=>getMLText('checkin_document'));
+				else {
+					if($this->params['checkoutdir']) {
+						$menuitems['checkout_document'] = array('link'=>"../op/op.CheckOutDocument".$docid, 'label'=>getMLText('checkout_document'));
+					}
+				}
 				if($accessobject->check_controller_access('EditDocument'))
 					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>getMLText('edit_document_props'));
-				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
+				if($accessobject->check_controller_access('MoveDocument'))
+					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
 			}
 			else {
 				$lockingUser = $document->getLockingUser();
@@ -811,7 +819,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid."&formtoken=".createFormKey('unlockdocument'), 'label'=>getMLText('unlock_document'));
 					if($accessobject->check_controller_access('EditDocument'))
 						$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>getMLText('edit_document_props'));
-					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
+					if($accessobject->check_controller_access('MoveDocument'))
+						$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
 				}
 			}
 			if($accessobject->maySetExpires($document)) {
@@ -825,7 +834,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if ($accessobject->check_view_access('DocumentAccess'))
 				$menuitems['edit_document_access'] = array('link'=>"../out/out.DocumentAccess". $docid, 'label'=>getMLText('edit_document_access'));
 		}
-		if ($accessMode >= M_READ) {
+		if ($accessMode >= M_READ && !$this->params['user']->isGuest()) {
 			if ($accessobject->check_view_access('DocumentNotify'))
 				$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>getMLText('edit_existing_notify'));
 		}
@@ -1604,6 +1613,7 @@ $(document).ready(function() {
 				array(
 					'target' => 'docChooser'.$formid,
 					'remote' => "../out/out.DocumentChooser.php?form=".$formid."&folderid=".$folderid."&partialtree=".$partialtree,
+					'class' => 'btn btn-secondary',
 					'title' => getMLText('document').'…'
 				));
 		$content .= "</div>\n";
@@ -1668,6 +1678,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 				array(
 					'target' => 'folderChooser'.$formid,
 					'remote' => "../out/out.FolderChooser.php?form=".$formid."&mode=".$accessMode."&exclude=".$exclude,
+					'class' => 'btn btn-secondary',
 					'title' => getMLText('folder').'…'
 				));
 		}
@@ -1740,6 +1751,7 @@ $(document).ready(function() {
 			array(
 				'target' => 'keywordChooser',
 				'remote' => "../out/out.KeywordChooser.php?target=".$formName,
+				'class' => 'btn btn-secondary',
 				'title' => getMLText('keywords').'…'
 			));
 		$content .= '
@@ -1991,6 +2003,7 @@ $(document).ready(function() {
 			array(
 				'target' => 'dropfolderChooser',
 				'remote' => "../out/out.DropFolderChooser.php?form=".$formName."&dropfolderfile=".urlencode($dropfolderfile)."&showfolders=".$showfolders,
+				'class' => 'btn btn-secondary',
 				'title' => ($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file")).'…'
 			));
 		$content .= "</div>\n";
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 64e1c36e2..d14f2786e 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -721,7 +721,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				}
 				if($accessobject->check_controller_access('EditDocument'))
 					$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid , 'label'=>getMLText('edit_document_props'));
-				$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
+				if($accessobject->check_controller_access('MoveDocument'))
+					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
 			}
 			else {
 				$lockingUser = $document->getLockingUser();
@@ -732,7 +733,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 						$menuitems['unlock_document'] = array('link'=>"../op/op.UnlockDocument".$docid."&formtoken=".createFormKey('unlockdocument'), 'label'=>getMLText('unlock_document'));
 					if($accessobject->check_controller_access('EditDocument'))
 						$menuitems['edit_document_props'] = array('link'=>"../out/out.EditDocument".$docid, 'label'=>getMLText('edit_document_props'));
-					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
+					if($accessobject->check_controller_access('MoveDocument'))
+						$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>getMLText('move_document'));
 				}
 			}
 			if($accessobject->maySetExpires($document)) {
@@ -750,7 +752,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if ($accessobject->check_view_access('DocumentNotify'))
 				$menuitems['edit_existing_notify'] = array('link'=>"../out/out.DocumentNotify". $docid, 'label'=>getMLText('edit_existing_notify'));
 		}
-		if ($this->params['user']->isAdmin()) {
+		if ($accessobject->check_view_access('TransferDocument')) {
 			$menuitems['transfer_document'] = array('link'=>"../out/out.TransferDocument". $docid, 'label'=>getMLText('transfer_document'));
 		}
 
@@ -777,7 +779,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$accessobject = $this->params['accessobject'];
 
 		$menuitems = array();
-		if ($this->params['user']->isAdmin() || !$this->params['disableselfedit'])
+		if ($accessobject->check_view_access('EditUserData') || !$this->params['disableselfedit'])
 			$menuitems['edit_user_details'] = array('link'=>"../out/out.EditUserData.php", 'label'=>getMLText('edit_user_details'));
 		
 		if (!$this->params['user']->isAdmin()) 
@@ -938,7 +940,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=w".$ds."\">".getMLText("week_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=m".$ds."\">".getMLText("month_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=y".$ds."\">".getMLText("year_view")."</a></li>\n";
-		if (!$this->params['user']->isGuest())
+		if($accessobject->check_view_access(array('AddEvent')))
 			echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
 		echo "</ul>\n";
 		echo "</div>\n";
@@ -950,7 +952,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$accessobject = $this->params['accessobject'];
 
 		$menuitems = array();
-		if (!$this->params['user']->isGuest())
+		if($accessobject->check_view_access(array('AddEvent')))
 			$menuitems['addevent'] = array('link'=>"../out/out.AddEvent.php", 'label'=>getMLText('add_event'));
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */

From 03a394906ec93dc12f414408b2a6b98841fc082e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Jun 2021 09:44:30 +0200
Subject: [PATCH 1462/2006] more access control

---
 op/op.EditDocument.php                |  4 ++++
 views/bootstrap/class.Bootstrap.php   | 12 ++++++------
 views/bootstrap4/class.Bootstrap4.php | 12 ++++++------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 8e9f21518..ace42d15d 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -31,6 +31,10 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('editdocument')) {
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f259369b7..243d01cc7 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -741,20 +741,20 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$menuitems = array();
 
 		if ($accessMode == M_READ && !$this->params['user']->isGuest()) {
-			if ($accessobject->check_view_access('FolderNotify'))
+			if ($accessobject->check_controller_access('FolderNotify'))
 				$menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>getMLText('edit_folder_notify'));
 		}
 		else if ($accessMode >= M_READWRITE) {
-			if ($accessobject->check_view_access('AddSubFolder'))
+			if ($accessobject->check_controller_access('AddSubFolder'))
 				$menuitems['add_subfolder'] = array('link'=>"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_subfolder'));
-			if ($accessobject->check_view_access('AddDocument'))
+			if ($accessobject->check_controller_access('AddDocument'))
 				$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_document'));
 			if(0 && $this->params['enablelargefileupload'])
 				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_multiple_documents'));
-			if ($accessobject->check_view_access('EditFolder')) {
+			if ($accessobject->check_controller_access('EditFolder')) {
 				$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
 			}
-			if ($accessobject->check_view_access('MoveFolder')) {
+			if ($accessobject->check_controller_access('MoveFolder')) {
 				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
 					$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
 			}
@@ -768,7 +768,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				if ($accessobject->check_view_access('FolderAccess'))
 					$menuitems['edit_folder_access'] = array('link'=>"../out/out.FolderAccess.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>getMLText('edit_folder_access'));
 			}
-			if ($accessobject->check_view_access('FolderNotify'))
+			if ($accessobject->check_controller_access('FolderNotify'))
 				$menuitems['edit_existing_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>getMLText('edit_existing_notify'));
 		}
 		if ($accessobject->check_view_access('Indexer') && $this->params['enablefullsearch']) {
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index d14f2786e..2d7f69992 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -659,20 +659,20 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$menuitems = array();
 
 		if ($accessMode == M_READ && !$this->params['user']->isGuest()) {
-			if ($accessobject->check_view_access('FolderNotify'))
+			if ($accessobject->check_controller_access('FolderNotify'))
 				$menuitems['edit_folder_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>getMLText('edit_folder_notify'));
 		}
 		else if ($accessMode >= M_READWRITE) {
-			if ($accessobject->check_view_access('AddSubFolder'))
+			if ($accessobject->check_controller_access('AddSubFolder'))
 				$menuitems['add_subfolder'] = array('link'=>"../out/out.AddSubFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_subfolder'));
-			if ($accessobject->check_view_access('AddDocument'))
+			if ($accessobject->check_controller_access('AddDocument'))
 				$menuitems['add_document'] = array('link'=>"../out/out.AddDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_document'));
 			if(0 && $this->params['enablelargefileupload'])
 				$menuitems['add_multiple_documents'] = array('link'=>"../out/out.AddMultiDocument.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('add_multiple_documents'));
-			if ($accessobject->check_view_access('EditFolder')) {
+			if ($accessobject->check_controller_access('EditFolder')) {
 				$menuitems['edit_folder_props'] = array('link'=>"../out/out.EditFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('edit_folder_props'));
 			}
-			if ($accessobject->check_view_access('MoveFolder')) {
+			if ($accessobject->check_controller_access('MoveFolder')) {
 				if ($folderID != $this->params['rootfolderid'] && $folder->getParent())
 					$menuitems['move_folder'] = array('link'=>"../out/out.MoveFolder.php?folderid=". $folderID ."&showtree=".showtree(), 'label'=>getMLText('move_folder'));
 			}
@@ -686,7 +686,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				if ($accessobject->check_view_access('FolderAccess'))
 					$menuitems['edit_folder_access'] = array('link'=>"../out/out.FolderAccess.php?folderid=".$folderID."&showtree=".showtree(), 'label'=>getMLText('edit_folder_access'));
 			}
-			if ($accessobject->check_view_access('FolderNotify'))
+			if ($accessobject->check_controller_access('FolderNotify'))
 				$menuitems['edit_existing_notify'] = array('link'=>"../out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>getMLText('edit_existing_notify'));
 		}
 		if ($this->params['user']->isAdmin() && $this->params['enablefullsearch']) {

From 56c35b5ebaa22b8c476b9afde45b6e668cc28dea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 2 Jul 2021 09:28:05 +0200
Subject: [PATCH 1463/2006] new method showConfigFolder() for selecting a
 folder, use for libraryFolder

---
 views/bootstrap/class.Settings.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 9aa54cfe4..e4226e93f 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -225,6 +225,19 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 <?php
 	} /* }}} */
 
+	protected function showConfigFolder($title, $name, $allowempty=false, $multiple=false, $size=0) { /* {{{ */
+		$settings = $this->params['settings'];
+		$dms = $this->params['dms'];
+?>
+      <tr title="<?= getMLText($title."_desc") ?>">
+        <td><?= getMLText($title) ?>:</td>
+				<td>
+<?php $this->printFolderChooserHtml($name, M_READWRITE, -1, $dms->getFolder($settings->{"_".$name}), $name);?>
+				</td>
+			</tr>
+<?php
+	} /* }}} */
+
 	function js() { /* {{{ */
 		$extmgr = $this->params['extmgr'];
 
@@ -360,10 +373,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 <?php $this->showConfigOption('settings_sortUsersInList', 'sortUsersInList', array(' '=>'settings_sortUsersInList_val_login', 'fullname'=>'settings_sortUsersInList_val_fullname'), false, true); ?>
 <?php $this->showConfigOption('settings_sortFoldersDefault', 'sortFoldersDefault', array('u'=>'settings_sortFoldersDefault_val_unsorted', 's'=>'settings_sortFoldersDefault_val_sequence', 'n'=>'settings_sortFoldersDefault_val_name'), false, true); ?>
 <?php $this->showConfigOption('settings_defaultDocPosition', 'defaultDocPosition', array('end'=>'settings_defaultDocPosition_val_end', 'start'=>'settings_defaultDocPosition_val_start'), false, true); ?>
-      <tr title="<?php printMLText("settings_libraryFolder_desc");?>">
-        <td><?php printMLText("settings_libraryFolder");?>:</td>
-				<td><?php $this->printFolderChooserHtml("form1", M_READWRITE, -1, $dms->getFolder($settings->_libraryFolder), 'libraryFolder');?></td>
-      </tr>
+<?php $this->showConfigFolder('settings_libraryFolder', 'libraryFolder'); ?>
 
       <!--
         -- SETTINGS - SITE - WEBDAV

From 7218e475581694349273a38ecc3464cdd5164824 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 2 Jul 2021 12:26:15 +0200
Subject: [PATCH 1464/2006] do not output date of last run if task hasn't run
 yet

---
 views/bootstrap/class.SchedulerTaskMgr.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 89cef4541..763460d10 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -444,7 +444,8 @@ $(document).ready( function() {
 			echo getLongReadableDate(makeTsFromDate($task->getNextRun()));
 			echo "</td>";
 			echo "<td>";
-			echo getLongReadableDate(makeTsFromDate($task->getLastRun()));
+			if($task->getLastRun())
+				echo getLongReadableDate(makeTsFromDate($task->getLastRun()));
 			echo "</td>";
 			echo "<td nowrap>";
 			print "<div class=\"list-action\">";

From cb601a82eb6ed1e5d02ef87af712477b0744828f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Jul 2021 10:08:51 +0200
Subject: [PATCH 1465/2006] expect parameter of type SeedDMS_SchedulerTask in
 execute()

---
 inc/inc.ClassSchedulerTaskBase.php |  2 +-
 inc/inc.Tasks.php                  | 15 +++++++++------
 utils/schedulercli.php             |  1 +
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index 2c5330e77..d8af37452 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -109,7 +109,7 @@ class SeedDMS_SchedulerTaskBase {
 		$this->fulltextservice = $fulltextservice;
 	} /* }}} */
 
-	public function execute($task) { /* {{{ */
+	public function execute(SeedDMS_SchedulerTask $task) { /* {{{ */
 		return true;
 	} /* }}} */
 
diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index c8ef229bf..d0a7d688b 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -18,7 +18,7 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
-	public function execute($task) {
+	public function execute(SeedDMS_SchedulerTask $task) {
 		$dms = $this->dms;
 		$user = $this->user;
 		$settings = $this->settings;
@@ -117,11 +117,14 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
  * iterating over all folders recursively.
  */
 class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
+	protected $scheduler;
+
 	protected $forceupdate;
 
 	protected $fulltextservice;
 
-	public function __construct($fulltextservice, $forceupdate) { /* {{{ */
+	public function __construct($scheduler, $fulltextservice, $forceupdate) { /* {{{ */
+		$this->scheduler = $scheduler;
 		$this->fulltextservice = $fulltextservice;
 		$this->forceupdate = $forceupdate;
 		$this->numdocs = $this->fulltextservice->Indexer()->count();
@@ -249,7 +252,7 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
-	public function execute($task) {
+	public function execute(SeedDMS_SchedulerTask $task) {
 		$dms = $this->dms;
 		$logger = $this->logger;
 		$fulltextservice = $this->fulltextservice;
@@ -273,7 +276,7 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 				}
 			}
 
-			$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($fulltextservice, $recreate);
+			$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($this, $fulltextservice, $recreate);
 			call_user_func(array($folderprocess, 'process'), $folder, -1);
 			$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
 		} else {
@@ -345,7 +348,7 @@ class SeedDMS_CheckSumTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
-	public function execute($task) {
+	public function execute(SeedDMS_SchedulerTask $task) {
 		$dms = $this->dms;
 		$logger = $this->logger;
 		$taskparams = $task->getParameter();
@@ -433,7 +436,7 @@ class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
-	public function execute($task) {
+	public function execute(SeedDMS_SchedulerTask $task) {
 		$dms = $this->dms;
 		$logger = $this->logger;
 		$settings = $this->settings;
diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index dcfff3974..1d55247c3 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -84,6 +84,7 @@ foreach($tasks as $task) {
 			if(method_exists($taskobj, 'execute')) {
 				if(!$task->getDisabled() && $task->isDue()) {
 					if($mode == 'run') {
+						echo get_class($task);
 						if($taskobj->execute($task)) {
 							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
 							$task->updateLastNextRun();

From 9a616999d3bec7eb8e294f03f20616878f58f041 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Jul 2021 07:34:26 +0200
Subject: [PATCH 1466/2006] new parameter $wrap can be passed to html_link()

---
 inc/inc.ClassViewCommon.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index ea9dc78d4..1f8c5f764 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -307,7 +307,7 @@ class SeedDMS_View_Common {
 	 * @param boolean $hsc set to false if htmlspecialchars() shall not be called
 	 * @return string link
 	 */
-	protected function html_link($view='', $urlparams=array(), $linkparams=array(), $link, $hsc=true, $nocheck=false) { /* {{{ */
+	protected function html_link($view='', $urlparams=array(), $linkparams=array(), $link, $hsc=true, $nocheck=false, $wrap=array()) { /* {{{ */
 		if(!$nocheck)
 			if(!$this->check_access($view))
 				return '';
@@ -317,6 +317,8 @@ class SeedDMS_View_Common {
 			foreach($linkparams as $k=>$v)
 				$tag .= " ".$k."=\"".$v."\"";
 		$tag .= ">".($hsc ? htmlspecialchars($link) : $link)."</a>";
+		if(is_array($wrap) && count($wrap) == 2)
+			return $wrap[0].$tag.$wrap[1];
 		return $tag;
 	} /* }}} */
 

From cdb93920e4de72d611368a743fc6cb536a23e3b5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Jul 2021 07:35:00 +0200
Subject: [PATCH 1467/2006] html_link() takes care of wrapping the links into
 '<li>..</li>'

---
 views/bootstrap/class.ViewDocument.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index d1b9c4cf6..a2deac155 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1007,9 +1007,9 @@ $(document).ready( function() {
 					if($accessobject->mayReview($latestContent->getDocument())) {
 						if ($is_reviewer) {
 							if ($r["status"]==0) {
-								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_review"), false, true)."</li>";
+								print $this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_review"), false, true, array('<li>', '</li>'));
 							} elseif ($accessobject->mayUpdateReview($latestContent->getDocument(), $updateUser) && (($r["status"]==1)||($r["status"]==-1))){
-								print "<li>".$this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
+								print $this->html_link('ReviewDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'reviewid'=>$r['reviewID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true, array('<li>', '</li>'));
 							}
 						}
 					}
@@ -1113,9 +1113,9 @@ $(document).ready( function() {
 					if($accessobject->mayApprove($latestContent->getDocument())) {
 						if ($is_approver) {
 							if ($a['status'] == 0) {
-								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_approval"), false, true)."</li>";
+								print $this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_approval"), false, true, array('<li>', '</li>'));
 							} elseif ($accessobject->mayUpdateApproval($latestContent->getDocument(), $updateUser) && (($a["status"]==1)||($a["status"]==-1))){
-								print "<li>".$this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
+								print $this->html_link('ApproveDocument', array('documentid'=>$latestContent->getDocument()->getId(), 'version'=>$latestContent->getVersion(), 'approveid'=>$a['approveID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true, array('<li>', '</li>'));
 							}
 						}
 					}
@@ -1465,9 +1465,9 @@ $(document).ready( function() {
 					if($accessobject->mayReceipt($document)) {
 						if ($is_recipient) {
 							if($r["status"]==0) {
-								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_receipt"), false, true)."</li>";
+								print $this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_receipt"), false, true, array('<li>', '</li>'));
 							} elseif ($accessobject->mayUpdateReceipt($document, $updateUser) && (($r["status"]==1 && $enablereceiptreject)||($r["status"]==-1))) {
-								print "<li>".$this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
+								print $this->html_link('ReceiptDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'receiptid'=>$r['receiptID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true, array('<li>', '</li>'));
 							}
 						}
 					}
@@ -1601,9 +1601,9 @@ $(document).ready( function() {
 						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 					if($accessobject->mayRevise($document)) {
 						if ($is_recipient && $r["status"]==0) {
-							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_revision"), false, true)."</li>";
+							print $this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_revision"), false, true, array('<li>', '</li>'));
 						} elseif (($updateUser==$user)&&(($r["status"]==1)||($r["status"]==-1))&&(!$document->hasExpired())){
-							print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true)."</li>";
+							print $this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("edit"), false, true, array('<li>', '</li>'));
 						}
 					}
 

From e733b4fced33e0ec7712cd1fae64ac9f5edf3a0e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 12 Jul 2021 19:47:34 +0200
Subject: [PATCH 1468/2006] add new method printAttribute() (just like in
 5.1.x)

---
 views/bootstrap/class.ViewDocument.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 4faf119d0..e030c816c 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -83,6 +83,21 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 		}
 	} /* }}} */
 
+	/**
+	 * Output a single attribute in the document info section
+	 *
+	 * @param object $attribute attribute
+	 */
+	protected function printAttribute($attribute) { /* {{{ */
+		$attrdef = $attribute->getAttributeDefinition();
+?>
+		    <tr>
+					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
+					<td><?php echo $this->getAttributeValue($attribute); ?></td>
+		    </tr>
+<?php
+	} /* }}} */
+
 	protected function printVersionAttributes($folder, $version) { /* {{{ */
 			$attributes = $version->getAttributes();
 			if($attributes) {
@@ -363,13 +378,7 @@ $(document).ready( function() {
 				} elseif(is_string($arr)) {
 					echo $arr;
 				} else {
-					$attrdef = $attribute->getAttributeDefinition();
-			?>
-					<tr>
-					<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
-					<td><?php echo $this->getAttributeValue($attribute); ?></td>
-					</tr>
-<?php
+					$this->printAttribute($attribute);
 				}
 			}
 		}

From ca9e1c8860513b3b19096d48af832b1aea2763d9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Jul 2021 12:00:47 +0200
Subject: [PATCH 1469/2006] check for null passed as folder to getFolderList()

---
 views/bootstrap/class.Bootstrap.php   | 5 +++++
 views/bootstrap4/class.Bootstrap4.php | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 3c6fc7978..715a9945d 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -2925,6 +2925,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	 * @return string
 	 */
 	function getListRowPath($object) { /* {{{ */
+		if(!$object)
+			return '';
 		$belowtitle = '';
 		$folder = $object->getParent();
 		if($folder) {
@@ -3187,6 +3189,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		$accessop = $this->params['accessobject'];
 		$onepage = $this->params['onepage'];
 
+		if(!$subFolder)
+			return '';
+
 		$owner = $subFolder->getOwner();
 		$comment = $subFolder->getComment();
 		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 28ad6aee4..a5d3ae9b7 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -2908,6 +2908,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	 * @return string
 	 */
 	function getListRowPath($object) { /* {{{ */
+		if(!$object)
+			return '';
 		$belowtitle = '';
 		$folder = $object->getParent();
 		if($folder) {
@@ -3176,6 +3178,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		$accessop = $this->params['accessobject'];
 		$onepage = $this->params['onepage'];
 
+		if(!$subFolder)
+			return '';
+
 		$owner = $subFolder->getOwner();
 		$comment = $subFolder->getComment();
 		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";

From 64a5ea3d904bf85881d4994f14c48fd4318241c1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Jul 2021 13:28:26 +0200
Subject: [PATCH 1470/2006] allow to cancel checkout if document was not
 modified

---
 op/op.CancelCheckOut.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/op/op.CancelCheckOut.php b/op/op.CancelCheckOut.php
index bed1b5013..787a9ea84 100644
--- a/op/op.CancelCheckOut.php
+++ b/op/op.CancelCheckOut.php
@@ -37,7 +37,8 @@ if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval(
 $documentid = $_POST["documentid"];
 $document = $dms->getDocument($documentid);
 
-if(empty($settings->_enableCancelCheckout)) {
+$checkoutstatus = $document->checkOutStatus();
+if($checkoutstatus != 3 && empty($settings->_enableCancelCheckout)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("operation_disallowed"));
 }
 

From f2b0375df6023dbfca93302e1109f65342a74056 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Jul 2021 13:45:55 +0200
Subject: [PATCH 1471/2006] user warningMsg() instead of plain html code

---
 views/bootstrap/class.CheckInDocument.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 904596c8b..8fe539ab5 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -124,19 +124,13 @@ $(document).ready(function() {
 		if ($checkoutstatus = $document->checkOutStatus()) {
 			switch($checkoutstatus) {
 			case 1:
-				print "<div class=\"alert alert-warning\">";
-				printMLText("checkedout_file_has_disappeared");
-				print "</div>";
+				$this->warningMsg(getMLText("checkedout_file_has_disappeared"));
 				break;
 			case 2:
-				print "<div class=\"alert alert-warning\">";
-				printMLText("checkedout_file_has_different_version");
-				print "</div>";
+				$this->warningMsg(getMLText("checkedout_file_has_different_version"));
 				break;
 			case 3:
-				print "<div class=\"alert alert-warning\">";
-				printMLText("checkedout_file_is_unchanged");
-				print "</div>";
+				$this->warningMsg(getMLText("checkedout_file_is_unchanged"));
 				break;
 			}
 		}

From 4401ce7b23f3bb396b263d2223bdd74bd7ab7b75 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 14 Jul 2021 21:09:28 +0200
Subject: [PATCH 1472/2006] fix form validation, sync with UpdateDocument

---
 op/op.CheckInDocument.php                 |  4 +-
 views/bootstrap/class.CheckInDocument.php | 54 ++++++++---------------
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 94bf8d768..41f4a1407 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -186,8 +186,8 @@ else
 		}
 	}
 
-	if(isset($_POST["attributes"]) && $_POST["attributes"]) {
-		$attributes = $_POST["attributes"];
+	if(isset($_POST["attributes_version"]) && $_POST["attributes_version"]) {
+		$attributes = $_POST["attributes_version"];
 		foreach($attributes as $attrdefid=>$attribute) {
 			$attrdef = $dms->getAttributeDefinition($attrdefid);
 			if($attribute) {
diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 8fe539ab5..4dbe2b4e4 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -17,7 +17,7 @@
 //require_once("class.Bootstrap.php");
 
 /**
- * Class which outputs the html page for Document view
+ * Class which outputs the html page for CheckInDocument view
  *
  * @category   DMS
  * @package    SeedDMS
@@ -30,39 +30,18 @@ class SeedDMS_View_CheckInDocument extends SeedDMS_Theme_Style {
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 		$this->printSelectPresetButtonJs();
 		$this->printInputPresetButtonJs();
 		$this->printCheckboxPresetButtonJs();
 ?>
-function checkForm()
-{
-	msg = new Array();
-<?php
-	if ($strictformcheck) {
-	?>
-	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-<?php
-	}
-?>
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 $(document).ready(function() {
-	$('body').on('submit', '#form1', function(ev){
-		if(checkForm()) return;
-		event.preventDefault();
+	$("#form1").validate({
+		messages: {
+			name: "<?php printMLText("js_no_name");?>",
+			comment: "<?php printMLText("js_no_comment");?>",
+			keywords: "<?php printMLText("js_no_keywords");?>"
+		}
 	});
 	$('#presetexpdate').on('change', function(ev){
 		if($(this).val() == 'date')
@@ -86,12 +65,16 @@ $(document).ready(function() {
 		$enableadminrevapp = $this->params['enableadminrevapp'];
 		$enableownerrevapp = $this->params['enableownerrevapp'];
 		$enableselfrevapp = $this->params['enableselfrevapp'];
-		$enableselfreceipt = $this->params['enableselfreceipt'];
 		$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
+		$enableselfreceipt = $this->params['enableselfreceipt'];
 		$workflowmode = $this->params['workflowmode'];
 		$presetexpiration = $this->params['presetexpiration'];
 		$documentid = $document->getId();
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/additional-methods.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
@@ -114,6 +97,7 @@ $(document).ready(function() {
 			{
 				printMLText("no_update_cause_locked");
 				print "</div>";
+				$this->contentEnd();
 				$this->htmlEndPage();
 				exit;
 			}
@@ -140,8 +124,8 @@ $(document).ready(function() {
 
 		$latestContent = $document->getLatestContent();
 		$reviewStatus = $latestContent->getReviewStatus();
-		$approvalStatus = $latestContent->getApprovalStatus();
 		$receiptStatus = $latestContent->getReceiptStatus();
+		$approvalStatus = $latestContent->getApprovalStatus();
 		if($workflowmode == 'advanced') {
 			if($status = $latestContent->getStatus()) {
 				if($status["status"] == S_IN_WORKFLOW) {
@@ -193,7 +177,7 @@ $(document).ready(function() {
 		);
 		$this->formField(
 			getMLText("expires"),
-			$this->getDateChooser(($expts ? date('Y-m-d', $expts) : ''), "expdate", $this->params['session']->getLanguage())
+			$this->getDateChooser(($expts ? getReadableDate($expts) : ''), "expdate", $this->params['session']->getLanguage())
 		);
 		}
 		$attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all));
@@ -206,11 +190,11 @@ $(document).ready(function() {
 				} elseif(is_string($arr)) {
 					echo $arr;
 				} else {
-					$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef)));
+					$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef), 'attributes_version'));
 				}
 			}
 		}
-		$arrs = $this->callHook('addDocumentContentAttributes', $folder);
+		$arrs = $this->callHook('addDocumentContentAttributes', $document);
 		if(is_array($arrs)) {
 			foreach($arrs as $arr) {
 				$this->formField($arr[0], $arr[1], isset($arr[2]) ? $arr[2] : null);
@@ -219,6 +203,7 @@ $(document).ready(function() {
 			echo $arrs;
 		}
 
+		$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 		if($workflowmode == 'advanced') {
 			$mandatoryworkflows = $user->getMandatoryWorkflows();
 			if($mandatoryworkflows) {
@@ -266,7 +251,6 @@ $(document).ready(function() {
 			}
 			$this->warningMsg(getMLText("add_doc_workflow_warning"));
 		} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
-			$docAccess = $document->getReadAccessList($enableadminrevapp, $enableownerrevapp);
 			if($workflowmode == 'traditional') {
 				$this->contentSubHeading(getMLText("assign_reviewers"));
 				$res=$user->getMandatoryReviewers();

From 09a60988fb8090ae358bb07b04210eeb43a596fe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Jul 2021 08:10:42 +0200
Subject: [PATCH 1473/2006] parameter $urlparams of html_url() can be a string

---
 inc/inc.ClassViewCommon.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 045de262c..1b56c71a0 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -290,8 +290,10 @@ class SeedDMS_View_Common {
 	 */
 	protected function html_url($view, $urlparams=array()) { /* {{{ */
 		$url = $this->params['settings']->_httpRoot."out/out.".$view.".php";
-		if($urlparams)
+		if(is_array($urlparams))
 			$url .= "?".http_build_query($urlparams);
+		elseif(is_string($urlparams))
+			$url .= "?".$urlparams;
 		return $url;
 	} /* }}} */
 

From 74003313e8b3c2361a207300fdf914d23304dff9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Jul 2021 08:11:14 +0200
Subject: [PATCH 1474/2006] pass url param 'includecontent' to view

---
 out/out.Search.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/out/out.Search.php b/out/out.Search.php
index 19e39fb46..7bbdf06c7 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -51,6 +51,10 @@ if (isset($_GET["navBar"])) {
 
 $accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
 
+$includecontent = false;
+if (isset($_GET["includecontent"]) && $_GET["includecontent"])
+	$includecontent = true;
+
 if(((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
@@ -572,6 +576,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('facets', $facets);
 		$view->setParam('accessobject', $accessop);
 		$view->setParam('query', $query);
+		$view->setParam('includecontent', $includecontent);
 		$view->setParam('searchhits', $entries);
 		$view->setParam('totalpages', $totalPages);
 		$view->setParam('pagenumber', $pageNumber);

From 20dd55840e45da219fd837fb22c38ef7f599617e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Jul 2021 08:12:17 +0200
Subject: [PATCH 1475/2006] use replacement for PHPExcel() which is outdated
 for a long time, create xlsx instead of xls

---
 inc/inc.ClassDownloadMgr.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 2c4ac4f52..2dfc6705d 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -67,7 +67,7 @@ class SeedDMS_Download_Mgr {
 
 	public function createToc($file) { /* {{{ */
 		$items = $this->items;
-		$objPHPExcel = new PHPExcel();
+		$objPHPExcel = new PhpOffice\PhpSpreadsheet\Spreadsheet();
 		$objPHPExcel->getProperties()->setCreator("SeedDMS")->setTitle("Metadata");
 		$sheet = $objPHPExcel->setActiveSheetIndex(0);
 
@@ -163,7 +163,7 @@ class SeedDMS_Download_Mgr {
 			$i++;
 		}
 
-		$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
+		$objWriter = new PhpOffice\PhpSpreadsheet\Writer\Xlsx($objPHPExcel);
 		$objWriter->save($file);
 
 		return true;
@@ -204,7 +204,7 @@ class SeedDMS_Download_Mgr {
 				$zip->addFile($dms->contentDir.$item->getPath(), utf8_decode($filename));
 		}
 
-		$zip->addFile($file, $prefixdir."/metadata.xls");
+		$zip->addFile($file, $prefixdir."/metadata.xlsx");
 		$zip->close();
 		unlink($file);
 		return true;

From 50d528a831ec1b09c38dc85125176c4027d3e7aa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Jul 2021 08:13:15 +0200
Subject: [PATCH 1476/2006] fix export, export xlsx, do not collapse search
 form anymore

---
 views/bootstrap/class.Search.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index bbc0d3978..bdcb92711 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -83,6 +83,7 @@ $(document).ready(function() {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$entries = $this->params['searchhits'];
+		$includecontent = $this->params['includecontent'];
 
 		include("../inc/inc.ClassDownloadMgr.php");
 		$downmgr = new SeedDMS_Download_Mgr();
@@ -91,14 +92,14 @@ $(document).ready(function() {
 		foreach($entries as $entry) {
 			if($entry->isType('document')) {
 				$extracols = $this->callHook('extraDownloadColumns', $entry);
-				if(isset($_GET['includecontent']) && $_GET['includecontent'] && $rawcontent = $this->callHook('rawcontent', $entry->getLatestContent())) {
+				if($includecontent && $rawcontent = $this->callHook('rawcontent', $entry->getLatestContent())) {
 					$downmgr->addItem($entry->getLatestContent(), $extracols, $rawcontent);
 				} else
 					$downmgr->addItem($entry->getLatestContent(), $extracols);
 			}
 		}
 		$filename = tempnam(sys_get_temp_dir(), '');
-		if(isset($_GET['includecontent']) && $_GET['includecontent']) {
+		if($includecontent) {
 			$downmgr->createArchive($filename);
 			header("Content-Transfer-Encoding: binary");
 			header("Content-Length: " . filesize($filename));
@@ -109,8 +110,8 @@ $(document).ready(function() {
 			$downmgr->createToc($filename);
 			header("Content-Transfer-Encoding: binary");
 			header("Content-Length: " . filesize($filename));
-			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".xls\"");
-			header("Content-Type: application/vnd.ms-excel");
+			header("Content-Disposition: attachment; filename=\"export-" .date('Y-m-d') . ".xlsx\"");
+			header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
 			header("Cache-Control: must-revalidate");
 		}
 
@@ -241,9 +242,10 @@ function typeahead() { /* {{{ */
 
 		$this->rowStart();
 		$this->columnStart(4);
-		$this->contentHeading("<button class=\"btn btn-primary\" id=\"searchform-toggle\" data-toggle=\"collapse\" href=\"#searchform\"><i class=\"fa fa-exchange\"></i></button> ".getMLText('search'), true);
+		//$this->contentHeading("<button class=\"btn btn-primary\" id=\"searchform-toggle\" data-toggle=\"collapse\" href=\"#searchform\"><i class=\"fa fa-exchange\"></i></button> ".getMLText('search'), true);
+		$this->contentHeading(getMLText('search'), true);
 		if($this->query) {
-		echo "<div id=\"searchform\" class=\"collapse mb-sm-4\">";
+		echo "<div id=\"searchform\" class=\"_collapse mb-sm-4\">";
 		}
 ?>
   <ul class="nav nav-pills" id="searchtab">
@@ -387,10 +389,12 @@ function typeahead() { /* {{{ */
 					'element'=>'input',
 					'type'=>'checkbox',
 					'name'=>'includecontent',
+					'id'=>'includecontent',
 					'value'=>1,
 				)
 			);
-			$this->formSubmit("<i class=\"fa fa-download\"></i> ".getMLText('export'));
+			//$this->formSubmit("<i class=\"fa fa-download\"></i> ".getMLText('export'));
+			print $this->html_link('Search', array_merge($_GET, array('action'=>'export')), array('class'=>'btn btn-primary', 'id'=>'export'), "<i class=\"fa fa-download\"></i> ".getMLText("export"), false, true)."\n";
 			$content = ob_get_clean();
 			$this->printAccordion(getMLText('export'), $content);
 		}

From 93c88a6f87677e192dc5687f1225d6eccad9b754 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Jul 2021 08:33:14 +0200
Subject: [PATCH 1477/2006] add changes for 6.0.16

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d3e92c4b0..5f231f6d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@
 - cancel checkout needs confirmation
 - add input field to filter list of recipients if more then 10
 - add task for creating missing preview images
+- no longer use old PHPExcel classes, use PhpOffice\PhpSpreadsheet\Spreadsheet
+  instead
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.15

From 8b34c4f82e039109a539753207e4fd79166e9a66 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Aug 2021 08:33:34 +0200
Subject: [PATCH 1478/2006] fix width in task for creating preview

---
 inc/inc.Tasks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index d0a7d688b..6063b9039 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -410,7 +410,7 @@ class SeedDMS_Task_Preview_Process_Folder { /* {{{ */
 				}
 				$files = $document->getDocumentFiles();
 				foreach($files as $file) {
-					$this->previewer->createPreview($file, $width['detail'], $isnew);
+					$this->previewer->createPreview($file, $width, $isnew);
 					if($isnew){
 						$this->logger->log('Task \'preview\': created preview ('.$width.'px) for attachment of document '.$document->getId().':'.$file->getId(), PEAR_LOG_INFO);
 					}

From 46040dce7eff0501e98037f4fe85455dcb442fd8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Aug 2021 08:34:19 +0200
Subject: [PATCH 1479/2006] add '/www' to $myincpath

---
 utils/schedulercli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 1d55247c3..1161fe6de 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -1,7 +1,7 @@
 <?php
 if(isset($_SERVER['SEEDDMS_HOME'])) {
 	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
-	$myincpath = $_SERVER['SEEDDMS_HOME'];
+	$myincpath = $_SERVER['SEEDDMS_HOME'].'/www';
 } else {
 	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
 	$myincpath = dirname($argv[0]);

From 749f7a2fb1e4cac25da144d9c6fab11af6a61b7d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Aug 2021 09:19:54 +0200
Subject: [PATCH 1480/2006] revert change of $myincpath

---
 utils/schedulercli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 1161fe6de..1d55247c3 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -1,7 +1,7 @@
 <?php
 if(isset($_SERVER['SEEDDMS_HOME'])) {
 	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
-	$myincpath = $_SERVER['SEEDDMS_HOME'].'/www';
+	$myincpath = $_SERVER['SEEDDMS_HOME'];
 } else {
 	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
 	$myincpath = dirname($argv[0]);

From 73d27bc82bba0c0a2e33dc5bb312c18d11a88260 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Aug 2021 20:54:57 +0200
Subject: [PATCH 1481/2006] schedule next run before executing current run

---
 utils/schedulercli.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 1d55247c3..e0f0ef6c6 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -84,10 +84,14 @@ foreach($tasks as $task) {
 			if(method_exists($taskobj, 'execute')) {
 				if(!$task->getDisabled() && $task->isDue()) {
 					if($mode == 'run') {
-						echo get_class($task);
+						/* Schedule the next run right away to prevent a second execution
+						 * of the task when the cron job of the scheduler is called before
+						 * the last run was finished. The task itself can still be scheduled
+						 * to fast, but this is up to the admin of seeddms.
+						 */
+						$task->updateLastNextRun();
 						if($taskobj->execute($task)) {
 							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
-							$task->updateLastNextRun();
 						} else {
 							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
 							$task->setDisabled(1);

From 99bc6becb6c1d7dd4d3e7f120cefcb7e5d17193e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Aug 2021 13:51:07 +0200
Subject: [PATCH 1482/2006] do not check for sender in toList() because it is
 done in toIndividual()

---
 inc/inc.ClassEmailNotify.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php
index b5b1905de..ec0753aad 100644
--- a/inc/inc.ClassEmailNotify.php
+++ b/inc/inc.ClassEmailNotify.php
@@ -113,7 +113,6 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 			$from = $this->from_address;
 		}
 
-
 		$body = '';
 		if(!isset($params['__skip_header__']) || !$params['__skip_header__']) {
 			if(!isset($params['__header__']))
@@ -256,10 +255,12 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 	 * The dispatching is now done in SeedDMS_NotificationService::toList()
 	 */
 	function toList($sender, $recipients, $subject, $message, $params=array()) { /* {{{ */
+		/*
 		if ((!is_object($sender) && strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) ||
 				(!is_array($recipients) && count($recipients)==0)) {
 			return false;
 		}
+		 */
 
 		$ret = true;
 		foreach ($recipients as $recipient) {

From bbcf7cb9796e89faabc30b2f22892dbefe8d479a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Aug 2021 13:52:13 +0200
Subject: [PATCH 1483/2006] do send mail to disabled users or guests

---
 inc/inc.Tasks.php | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 6063b9039..65ed4fc37 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -37,25 +37,27 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		if(!empty($taskparams['peruser'])) {
 			$users = $dms->getAllUsers();
 			foreach($users as $u) {
-				$docs = $dms->getDocumentsExpired(intval($taskparams['days']), $u);
-				if (count($docs)>0) {
-					$bodyhtml .= "<table>".PHP_EOL;
-					$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
-					$body .= sprintf($tableformathead."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
-					$body .= "---------------------------------------------------------------------------------\n";
-					foreach($docs as $doc) {
-						$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
-						$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
-					}
-					$bodyhtml .= "</table>".PHP_EOL;
-					$params = array();
-					$params['count'] = count($docs);
-					$params['__body__'] = $body;
-					$params['__body_html__'] = $bodyhtml;
-					$params['sitename'] = $settings->_siteName;
-					$email->toIndividual('', $u, 'expired_docs_mail_subject', '', $params);
+				if(!$u->isGuest() && !$u->isDisabled()) {
+					$docs = $dms->getDocumentsExpired(intval($taskparams['days']), $u);
+					if (count($docs)>0) {
+						$bodyhtml .= "<table>".PHP_EOL;
+						$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
+						$body .= sprintf($tableformathead."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
+						$body .= "---------------------------------------------------------------------------------\n";
+						foreach($docs as $doc) {
+							$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+							$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+						}
+						$bodyhtml .= "</table>".PHP_EOL;
+						$params = array();
+						$params['count'] = count($docs);
+						$params['__body__'] = $body;
+						$params['__body_html__'] = $bodyhtml;
+						$params['sitename'] = $settings->_siteName;
+						$email->toIndividual('', $u, 'expired_docs_mail_subject', '', $params);
 
-					$logger->log('Task \'expired_docs\': Sending reminder \'expired_docs_mail_subject\' to user \''.$u->getLogin().'\'', PEAR_LOG_INFO);
+						$logger->log('Task \'expired_docs\': Sending reminder \'expired_docs_mail_subject\' to user \''.$u->getLogin().'\'', PEAR_LOG_INFO);
+					}
 				}
 			}
 		} elseif($taskparams['email']) {

From f19ed34d253ee70e039dbfaf90a9aa6f0f62d447 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Aug 2021 13:52:51 +0200
Subject: [PATCH 1484/2006] pass notifier to constructor of
 SeedDMS_SchedulerTaskBase

---
 inc/inc.ClassSchedulerTaskBase.php | 5 ++++-
 inc/inc.Utils.php                  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index d8af37452..d3d5561b3 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -39,6 +39,8 @@ class SeedDMS_SchedulerTaskBase {
 
 	var $fulltextservice;
 
+	var $notifier;
+
 	/**
 	 * Call a hook with a given name
 	 *
@@ -101,12 +103,13 @@ class SeedDMS_SchedulerTaskBase {
 		return $ret;
 	} /* }}} */
 
-	public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null) { /* {{{ */
+	public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null, $notifier=null) { /* {{{ */
 		$this->dms = $dms;
 		$this->user = $user;
 		$this->settings = $settings;
 		$this->logger = $logger;
 		$this->fulltextservice = $fulltextservice;
+		$this->notifier = $notifier;
 	} /* }}} */
 
 	public function execute(SeedDMS_SchedulerTask $task) { /* {{{ */
diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 9ba41f782..bfd993759 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -780,13 +780,13 @@ function seed_pass_verify($password, $hash) { /* {{{ */
 } /* }}} */
 
 function resolveTask($task) {
-	global $dms, $user, $settings, $logger, $fulltextservice;
+	global $dms, $user, $settings, $logger, $fulltextservice, $notifier;
 
 	if(is_object($task))
 		return $task;
 	if(is_string($task)) {
 		if(class_exists($task)) {
-			$task = new $task($dms, $user, $settings, $logger, $fulltextservice);
+			$task = new $task($dms, $user, $settings, $logger, $fulltextservice, $notifier);
 		}
 	}
 	return $task;

From 7b807f8d67874a772463780cb087e9bbce1ca9e0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Aug 2021 08:46:18 +0200
Subject: [PATCH 1485/2006] correct processing of return value of
 getWorkflowLog()

---
 .../class.RemoveWorkflowFromDocument.php      | 19 +++++++++++--------
 .../bootstrap/class.ReturnFromSubWorkflow.php |  3 ++-
 views/bootstrap/class.RewindWorkflow.php      |  3 ++-
 views/bootstrap/class.RunSubWorkflow.php      |  3 ++-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/views/bootstrap/class.RemoveWorkflowFromDocument.php b/views/bootstrap/class.RemoveWorkflowFromDocument.php
index 98fa89fac..cebc1d3d3 100644
--- a/views/bootstrap/class.RemoveWorkflowFromDocument.php
+++ b/views/bootstrap/class.RemoveWorkflowFromDocument.php
@@ -46,7 +46,8 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Theme_Style {
 		$this->contentHeading(getMLText("rm_workflow"));
 
 		$currentstate = $latestContent->getWorkflowState();
-		$wkflog = $latestContent->getWorkflowLog();
+		$wkflogs = $latestContent->getWorkflowLog();
+		$wkflog = array_shift($wkflogs);
 		$workflow = $latestContent->getWorkflow();
 
 		if($currentstate) {
@@ -58,8 +59,10 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Theme_Style {
 						$enterts = makeTsFromLongDate($enterdate);
 					}
 				}
-				$msg .= "The state was entered at ".$enterdate." which was ";
-				$msg .= getReadableDuration((time()-$enterts))." ago.<br />";
+				if(!empty($enterdate)) {
+					$msg .= "The state was entered at ".$enterdate." which was ";
+					$msg .= getReadableDuration((time()-$enterts))." ago.<br />";
+				}
 			}
 			$msg .= "The document may stay in this state for ".$currentstate->getMaxTime()." sec.";
 		} else {
@@ -96,12 +99,12 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Theme_Style {
 			echo "<tr><th>".getMLText('action')."</th><th>Start state</th><th>End state</th><th>".getMLText('date')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>";
 			foreach($wkflog as $entry) {
 				echo "<tr>";
-				echo "<td>".getMLText('action_'.$entry->getTransition()->getAction()->getName())."</td>";
-				echo "<td>".$entry->getTransition()->getState()->getName()."</td>";
-				echo "<td>".$entry->getTransition()->getNextState()->getName()."</td>";
+				echo "<td>".htmlspecialchars(getMLText('action_'.$entry->getTransition()->getAction()->getName()))."</td>";
+				echo "<td>".htmlspecialchars($entry->getTransition()->getState()->getName())."</td>";
+				echo "<td>".htmlspecialchars($entry->getTransition()->getNextState()->getName())."</td>";
 				echo "<td>".$entry->getDate()."</td>";
-				echo "<td>".$entry->getUser()->getFullname()."</td>";
-				echo "<td>".$entry->getComment()."</td>";
+				echo "<td>".htmlspecialchars($entry->getUser()->getFullname())."</td>";
+				echo "<td>".htmlspecialchars($entry->getComment())."</td>";
 				echo "</tr>";
 			}
 			echo "</table>\n";
diff --git a/views/bootstrap/class.ReturnFromSubWorkflow.php b/views/bootstrap/class.ReturnFromSubWorkflow.php
index f78706360..e0f985943 100644
--- a/views/bootstrap/class.ReturnFromSubWorkflow.php
+++ b/views/bootstrap/class.ReturnFromSubWorkflow.php
@@ -77,7 +77,8 @@ $(document).ready(function() {
 		$this->contentHeading(getMLText("return_from_subworkflow"));
 
 		$currentstate = $latestContent->getWorkflowState();
-		$wkflog = $latestContent->getWorkflowLog();
+		$wkflogs = $latestContent->getWorkflowLog();
+		$wkflog = array_shift($wkflogs);
 		$workflow = $latestContent->getWorkflow();
 		$parentworkflow = $latestContent->getParentWorkflow();
 
diff --git a/views/bootstrap/class.RewindWorkflow.php b/views/bootstrap/class.RewindWorkflow.php
index c6c338c62..76e071021 100644
--- a/views/bootstrap/class.RewindWorkflow.php
+++ b/views/bootstrap/class.RewindWorkflow.php
@@ -46,7 +46,8 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Theme_Style {
 		$this->contentHeading(getMLText("rewind_workflow"));
 
 		$currentstate = $latestContent->getWorkflowState();
-		$wkflog = array_pop($latestContent->getWorkflowLog());
+		$wkflogs = $latestContent->getWorkflowLog();
+		$wkflog = array_shift($wkflogs);
 		$workflow = $latestContent->getWorkflow();
 
 		if($currentstate) {
diff --git a/views/bootstrap/class.RunSubWorkflow.php b/views/bootstrap/class.RunSubWorkflow.php
index ddafc8043..c85249fff 100644
--- a/views/bootstrap/class.RunSubWorkflow.php
+++ b/views/bootstrap/class.RunSubWorkflow.php
@@ -47,7 +47,8 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Theme_Style {
 		$this->contentHeading(getMLText("run_subworkflow"));
 
 		$currentstate = $latestContent->getWorkflowState();
-		$wkflog = $latestContent->getWorkflowLog();
+		$wkflogs = $latestContent->getWorkflowLog();
+		$wkflog = array_shift($wkflogs);
 		$workflow = $latestContent->getWorkflow();
 
 		$msg = "The document is currently in state: ".$currentstate->getName()."<br />";

From 4f3a7f65125ce721bbb7c317b502cef5ea94f90a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Aug 2021 09:55:08 +0200
Subject: [PATCH 1486/2006] send notification on submit of reception

---
 op/op.ReceiptDocument.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index 6f955a8ca..04dd0f7b4 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -94,6 +94,29 @@ if(!$controller->run()) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText($controller->getErrorMsg()));
 }
 
+if ($_POST["receiptType"] == "ind" || $_POST["receiptType"] == "grp") {
+	if($notifier) {
+		$nl=$document->getNotifyList();
+		$subject = "receipt_submit_email_subject";
+		$message = "receipt_submit_email_body";
+		$params = array();
+		$params['name'] = $document->getName();
+		$params['version'] = $version;
+		$params['folder_path'] = $folder->getFolderPathPlain();
+		$params['status'] = getReceiptStatusText($_POST["receiptStatus"]);
+		$params['comment'] = strip_tags($_POST['comment']);
+		$params['username'] = $user->getFullName();
+		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
+		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		foreach ($nl["groups"] as $grp) {
+			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
+		}
+		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+	}
+}
+
 header("Location:../out/out.ViewDocument.php?documentid=".$documentid."&currenttab=recipients");
 
 ?>

From 6ccabf1c68fe01c36dd81102e532f75e74292036 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Aug 2021 09:55:31 +0200
Subject: [PATCH 1487/2006] start change log for 6.0.17

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1d7af4dd8..36b883231 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.17
+--------------------------------------------------------------------------------
+- merge changes up to 5.1.24
+- send notification when a receiption of a document was submitted
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.16
 --------------------------------------------------------------------------------

From 9ea8a0289305d243978b46573e87c147d51c530e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Sep 2021 16:25:54 +0200
Subject: [PATCH 1488/2006] fix task parameters of type 'select'

---
 views/bootstrap/class.SchedulerTaskMgr.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 763460d10..ec507839e 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -355,15 +355,20 @@ $(document).ready( function() {
 					);
 					break;
 				case 'select':
+					$vals = $task->getParameter()[$param['name']];
+					foreach($param['options'] as &$opt) {
+						if(in_array($opt[0], $vals))
+							$opt[2] = true;
+					}
 					$this->formField(
-						getMLText('task_'.$extname."_".$taskname."_".$param['name']),
+						getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
 						array(
 							'element'=>'select',
 							'class'=>'chzn-select',
-							'name'=>'params['.$param['name'].']',
-							'multiple'=>false,
+							'name'=>'params['.$param['name'].'][]',
+							'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
 							'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
-							'options'=>$task->getParameter()[$param['options']],
+							'options'=>$param['options'],
 						),
 						array(
 							'help'=>$param['description']

From 7a1b03951e2c678742807c740740e326b8864004 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Sep 2021 17:45:56 +0200
Subject: [PATCH 1489/2006] use methods in notification class for sending
 notifications

---
 op/op.ReviewDocument.php | 46 ++--------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 6f95e6586..4eacb6107 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -120,24 +120,7 @@ $newdocstatus = $content->getStatus();
 if($olddocstatus['status'] != $newdocstatus['status']) {
 	// Send notification to subscribers.
 	if($notifier) {
-		$nl=$document->getNotifyList();
-		$subject = "document_status_changed_email_subject";
-		$message = "document_status_changed_email_body";
-		$params = array();
-		$params['name'] = $document->getName();
-		$params['folder_path'] = $folder->getFolderPathPlain();
-		$params['status'] = getOverallStatusText($olddocstatus['status']).' → '.getReviewStatusText($newdocstatus['status']);
-		$params['new_status_code'] = $newdocstatus['status'];
-		$params['old_status_code'] = $olddocstatus['status'];
-		$params['username'] = $user->getFullName();
-		$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-		$params['sitename'] = $settings->_siteName;
-		$params['http_root'] = $settings->_httpRoot;
-		$notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		foreach ($nl["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
-		}
-//		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		$notifier->sendChangedDocumentStatusMail($content, $user, $olddocstatus["status"]);
 	}
 }
 
@@ -146,32 +129,7 @@ if ($newdocstatus['status'] == S_DRAFT_APP) {
 	$requestUser = $document->getOwner();
 
 	if($notifier) {
-		if($docApprovalStatus = $content->getApprovalStatus()) {
-			$subject = "approval_request_email_subject";
-			$message = "approval_request_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['version'] = $version;
-			$params['username'] = $user->getFullName();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."&currenttab=revapp";
-			foreach ($docApprovalStatus as $dastat) {
-			
-				if ($dastat["status"] == 0) {
-					if ($dastat["type"] == 0) {
-
-						$approver = $dms->getUser($dastat["required"]);
-						$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-					} elseif ($dastat["type"] == 1) {
-					
-						$group = $dms->getGroup($dastat["required"]);
-						$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params, SeedDMS_NotificationService::RECV_APPROVER);
-					}
-				}
-			}
-		}
+		$notifier->sendApprovalRequestMail($content, $user);
 	}
 }
 

From 5904d223945b65f392b0f95c506fc9ee8f00a992 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Sep 2021 08:20:53 +0200
Subject: [PATCH 1490/2006] add dummy note in 6.0.17, update release date

---
 SeedDMS_Core/package.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 90474e832..ae413c96c 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2021-08-20</date>
+ <date>2021-09-09</date>
  <time>13:44:55</time>
  <version>
   <release>6.0.17</release>
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+???
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 825ae7bfeb29ca74a21addaddb538936130546c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Sep 2021 10:41:36 +0200
Subject: [PATCH 1491/2006] check access on RemoveDocumentFile and
 EditDocumentFile

---
 op/op.EditDocumentFile.php             | 4 ++++
 op/op.RemoveDocumentFile.php           | 5 +++++
 views/bootstrap/class.ViewDocument.php | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/op/op.EditDocumentFile.php b/op/op.EditDocumentFile.php
index 14f2e7c40..6de0fe62e 100644
--- a/op/op.EditDocumentFile.php
+++ b/op/op.EditDocumentFile.php
@@ -32,6 +32,10 @@ include("../inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access($controller, $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
 
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('editdocumentfile')) {
diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php
index f01114f94..739e2938a 100644
--- a/op/op.RemoveDocumentFile.php
+++ b/op/op.RemoveDocumentFile.php
@@ -26,6 +26,11 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+if (!$accessop->check_controller_access('RemoveDocumentFile', $_POST)) {
+	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("access_denied"));
+}
+
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('removedocumentfile')) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 0640306f7..8e2a6e1e5 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -324,8 +324,8 @@ $(document).ready( function() {
 				} else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
 				echo "</ul><ul class=\"unstyled actions\">";
 				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID())) {
-					print $this->html_link('RemoveDocumentFile', array('documentid'=>$document->getID(), 'fileid'=>$file->getID()), array(), '<i class="fa fa-remove"></i>'.getMLText("delete"), false, true, array('<li>', '</li>'));
-					print $this->html_link('EditDocumentFile', array('documentid'=>$document->getID(), 'fileid'=>$file->getID()), array(), '<i class="fa fa-edit"></i>'.getMLText("edit"), false, true, array('<li>', '</li>'));
+					print $this->html_link('RemoveDocumentFile', array('documentid'=>$document->getID(), 'fileid'=>$file->getID()), array(), '<i class="fa fa-remove"></i>'.getMLText("delete"), false, false, array('<li>', '</li>'));
+					print $this->html_link('EditDocumentFile', array('documentid'=>$document->getID(), 'fileid'=>$file->getID()), array(), '<i class="fa fa-edit"></i>'.getMLText("edit"), false, false, array('<li>', '</li>'));
 				}
 				print "</ul></td>";		
 				

From d05a200ed6e274dc0e8a96e5e503820d27d47a8c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Sep 2021 11:18:26 +0200
Subject: [PATCH 1492/2006] add more packages needed for 6.0.x

---
 composer-dist.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/composer-dist.json b/composer-dist.json
index fd0acb080..162377501 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -1,9 +1,14 @@
 {
     "require": {
+        "robthree/twofactorauth": "^1.5",
         "sabre/dav": "^3.",
+        "sabre/xml": "^1.4.",
         "slim/slim": "^3.0",
         "erusev/parsedown": "*",
         "erusev/parsedown-extra": "*",
+        "mibe/feedwriter": "^1.1",
+        "phpoffice/phpexcel": "^1.8",
+        "phpoffice/phpspreadsheet": "*",
         "pear/log": "*",
         "pear/mail": "*",
         "pear/mail_mime": "*",
@@ -11,6 +16,7 @@
         "pear/auth_sasl": "*",
         "pear/db": "*",
         "alecrabbit/php-console-colour": "*",
+        "dragonmantank/cron-expression": "^2.2",
         "daverandom/resume": "^0.0.3",
         "zf1/zend-search-lucene": "*"
     }

From b6a308e6307cc7393ccd07d30b8f12b1491096e9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Sep 2021 15:44:12 +0200
Subject: [PATCH 1493/2006] set default $role='3' in addUser()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index b9c5e8f18..7d80a00d0 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2846,7 +2846,7 @@ class SeedDMS_Core_DMS {
 	 * @param null $homefolder
 	 * @return bool|SeedDMS_Core_User
 	 */
-	function addUser($login, $pwd, $fullName, $email, $language, $theme, $comment, $role='0', $isHidden=0, $isDisabled=0, $pwdexpiration='', $quota=0, $homefolder=null) { /* {{{ */
+	function addUser($login, $pwd, $fullName, $email, $language, $theme, $comment, $role='3', $isHidden=0, $isDisabled=0, $pwdexpiration='', $quota=0, $homefolder=null) { /* {{{ */
 		$db = $this->db;
 		if (is_object($this->getUserByLogin($login))) {
 			return false;
@@ -2854,7 +2854,7 @@ class SeedDMS_Core_DMS {
 		if(is_object($role))
 			$role = $role->getID();
 		elseif($role == '')
-			$role = '0';
+			$role = '3';
 		if(trim($pwdexpiration) == '' || trim($pwdexpiration) == 'never') {
 			$pwdexpiration = 'NULL';
 		} elseif(trim($pwdexpiration) == 'now') {

From 39ec44cd41cc5dee2d0969f23050098dc9be34c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Sep 2021 15:46:05 +0200
Subject: [PATCH 1494/2006] sewPwdExpiration() sets date internally not 'now'

---
 SeedDMS_Core/Core/inc.ClassUser.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index e89025f29..2342b4523 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -76,10 +76,10 @@ class SeedDMS_Core_Role { /* {{{ */
 	 * @param string|integer $id Id, login name, or email of user, depending
 	 * on the 3rd parameter.
 	 * @param object $dms instance of dms
-	 * @param string $by search by [name|email]. If 'name' is passed, the method
-	 * will check for the 4th paramater and also filter by email. If this
-	 * parameter is left empty, the user will be search by its Id.
-	 * @param string $email optional email address if searching for name
+	 * @param string $by search by name. If 'name' is passed, the method
+	 * will search by name instead of id. If this
+	 * parameter is left empty, the role will be searched by its Id.
+	 *
 	 * @return object instance of class SeedDMS_Core_User
 	 */
 	public static function getInstance($id, $dms, $by='') { /* {{{ */
@@ -631,10 +631,11 @@ class SeedDMS_Core_User { /* {{{ */
 		if(trim($newPwdExpiration) == '' || trim($newPwdExpiration) == 'never') {
 			$newPwdExpiration = null;
 			$queryStr = "UPDATE `tblUsers` SET `pwdExpiration` = NULL WHERE `id` = " . $this->_id;
-		} elseif(trim($newPwdExpiration) == 'now')
-			$queryStr = "UPDATE `tblUsers` SET `pwdExpiration` =".$db->qstr(date('Y-m-d H:i:s'))." WHERE `id` = " . $this->_id;
-		else
+        } else {
+            if(trim($newPwdExpiration) == 'now')
+                $newPwdExpiration = date('Y-m-d H:i:s');
 			$queryStr = "UPDATE `tblUsers` SET `pwdExpiration` =".$db->qstr($newPwdExpiration)." WHERE `id` = " . $this->_id;
+        }
 		$res = $db->getResult($queryStr);
 		if (!$res)
 			return false;

From 2d3ec59c2d273dbd55f69788eb6daedaf11f1ee9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Sep 2021 18:30:06 +0200
Subject: [PATCH 1495/2006] fix creation of instance of SeedDMS_AccessOperation

---
 out/out.RemoveApprovalLog.php | 2 +-
 out/out.RemoveReviewLog.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/out/out.RemoveApprovalLog.php b/out/out.RemoveApprovalLog.php
index d310c66de..c3c37c743 100644
--- a/out/out.RemoveApprovalLog.php
+++ b/out/out.RemoveApprovalLog.php
@@ -68,7 +68,7 @@ if (!isset($_GET["approveid"]) || !is_numeric($_GET["approveid"]) || intval($_GE
 $approveid = $_GET['approveid'];
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $approvals = $content->getApprovalStatus();
 if(!$approvals) {
diff --git a/out/out.RemoveReviewLog.php b/out/out.RemoveReviewLog.php
index 8e46ac83c..98c92b66c 100644
--- a/out/out.RemoveReviewLog.php
+++ b/out/out.RemoveReviewLog.php
@@ -68,7 +68,7 @@ if (!isset($_GET["reviewid"]) || !is_numeric($_GET["reviewid"]) || intval($_GET[
 $reviewid = $_GET['reviewid'];
 
 /* Create object for checking access to certain operations */
-$accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 $reviews = $content->getReviewStatus();
 if(!$reviews) {

From 19266f164702ccee0611ccdd9029a822c5253c07 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Sep 2021 18:50:48 +0200
Subject: [PATCH 1496/2006] set return value and new status in verifyStatus()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 22c5709e7..1b924b5b9 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3434,7 +3434,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		 */
 		elseif ($st["status"]!=S_DRAFT && $st["status"]!=S_RELEASED ) {
 			if($st["status"]==S_DRAFT_REV || $st["status"]==S_DRAFT_APP) {
-				if($hasReview || $hasApproval) $this->setStatus(S_RELEASED,$msg,$user);
+				if($hasReview || $hasApproval) { $newstatus = S_RELEASED; $ret = $this->setStatus(S_RELEASED,$msg,$user); }
 				else { $newstatus = $initialstatus; $ret = $this->setStatus($initialstatus,$msg,$user); }
 			} elseif($st["status"]==S_IN_REVISION) {
 				if($needsCorrection) { $newstatus = S_NEEDS_CORRECTION; $ret = $this->setStatus(S_NEEDS_CORRECTION,$msg,$user); }

From 43f7a94aa67a224a54b0b0e08bdf72fb9b0406b4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Sep 2021 21:23:51 +0200
Subject: [PATCH 1497/2006] remove most of html code to create form

---
 views/bootstrap/class.ReceiptDocument.php | 63 +++++++++++++----------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index e3e310be8..5c10b3c33 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -103,6 +103,9 @@ $(document).ready(function() {
 			}
 		}
 
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
+		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/styles/validation-default.js"></script>'."\n", 'js');
+
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
@@ -110,7 +113,6 @@ $(document).ready(function() {
 		$this->contentHeading(getMLText("submit_receipt"));
 		if(getMLText('info_submit_receipt', array(), ''))
 			$this->infoMsg(getMLText('info_submit_receipt', array(), ''));
-		$this->contentContainerStart();
 
 		// Display the Receipt form.
 		$receipttype = ($receiptStatus['type'] == 0) ? 'ind' : 'grp';
@@ -132,32 +134,38 @@ $(document).ready(function() {
 ?>
 	<form class="form-horizontal" method="post" action="../op/op.ReceiptDocument.php" id="form<?= $receipttype ?>" name="form<?= $receipttype ?>">
 	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("comment");?>:</label>
-			<div class="controls">
-				<textarea name="comment" cols="80" rows="4"></textarea>
-			</div>
-		</div>
-<?php if($receiptreject) { ?>
-		<div class="control-group">
-			<label class="control-label"><?php printMLText("receipt_status");?>:</label>
-			<div class="controls">
-				<select name="receiptStatus">
-<?php if($receiptStatus['status'] != 1) { ?>
-					<option value='1'><?php printMLText("status_receipted")?></option>
-<?php } ?>
-<?php if($receiptStatus['status'] != -1) { ?>
-					<option value='-1'><?php printMLText("rejected")?></option>
-<?php } ?>
-				</select>
-			</div>
-		</div>
-<?php } else { ?>
-		<input type="hidden" name="receiptStatus" value="1" />
-<?php } ?>
-		<div class="controls">
-			<input type='submit' class="btn btn-primary" name='<?= $receipttype ?>Receipt' value='<?php printMLText("submit_receipt")?>'/>
-		<div>
+<?php
+		$this->contentContainerStart();
+		$this->formField(
+			getMLText("comment"),
+			array(
+				'element'=>'textarea',
+				'name'=>'comment',
+				'required'=>true,
+				'rows'=>4,
+				'cols'=>80
+			)
+		);
+		if($receiptreject) {
+			$options = array();
+			if($revisionStatus['status'] != 1)
+				$options[] = array('1', getMLText("status_receipted"));
+			if($revisionStatus['status'] != -1)
+				$options[] = array('-1', getMLText("rejected"));
+			$this->formField(
+				getMLText("revision_status"),
+				array(
+					'element'=>'select',
+					'name'=>'receiptStatus',
+					'options'=>$options,
+				)
+			);
+		} else {
+			echo '<input type="hidden" name="receiptStatus" value="1" />';
+		}
+		$this->contentContainerEnd();
+		$this->formSubmit(getMLText('submit_revision'), $revisiontype.'Revision');
+?>
 		<input type='hidden' name='receiptType' value='<?= $receipttype ?>'/>
 		<?php if($receipttype == 'grp'): ?>
 		<input type='hidden' name='receiptGroup' value='<?php echo $receiptStatus['required']; ?>'/>
@@ -166,7 +174,6 @@ $(document).ready(function() {
 		<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 	</form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 3487a27f9d4169931acb29c6c77d80b337d43c25 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Sep 2021 21:24:13 +0200
Subject: [PATCH 1498/2006] make comment required

---
 views/bootstrap/class.ReviseDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.ReviseDocument.php b/views/bootstrap/class.ReviseDocument.php
index 78b5848bb..4e75a0d30 100644
--- a/views/bootstrap/class.ReviseDocument.php
+++ b/views/bootstrap/class.ReviseDocument.php
@@ -122,6 +122,7 @@ $(document).ready(function() {
 			array(
 				'element'=>'textarea',
 				'name'=>'comment',
+				'required'=>true,
 				'rows'=>4,
 				'cols'=>80
 			)

From 768631bf5583cfa8dff23539afafba1120d73638 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Sep 2021 22:04:59 +0200
Subject: [PATCH 1499/2006] fix various errors and validation of form

---
 views/bootstrap/class.ReceiptDocument.php | 81 +++++++++--------------
 1 file changed, 31 insertions(+), 50 deletions(-)

diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index 5c10b3c33..03489b4a9 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -33,55 +33,36 @@ class SeedDMS_View_ReceiptDocument extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-function checkIndForm()
-{
-	msg = new Array();
-	if (document.formind.reviewStatus.value == "") msg.push("<?php printMLText("js_no_receipt_status");?>");
-	if (document.formind.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "") {
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-function checkGrpForm()
-{
-	msg = new Array();
-	if (document.formgrp.reviewGroup.value == "") msg.push("<?php printMLText("js_no_receipt_group");?>");
-	if (document.formgrp.reviewStatus.value == "") msg.push("<?php printMLText("js_no_receipt_status");?>");
-	if (document.formgrp.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
 $(document).ready(function() {
-	$('body').on('submit', '#formind', function(ev){
-		if(checkIndForm()) return;
-		event.preventDefault();
+	$("#formind").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			receiptStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			receiptStatus: "<?php printMLText("js_no_receipt_status");?>",
+		},
 	});
-	$('body').on('submit', '#formgrp', function(ev){
-		if(checkGrpForm()) return;
-		event.preventDefault();
+	$("#formgrp").validate({
+		rules: {
+			comment: {
+				required: true
+			},
+			receiptStatus: {
+				required: true
+			},
+		},
+		messages: {
+			comment: "<?php printMLText("js_no_comment");?>",
+			receiptStatus: "<?php printMLText("js_no_receipt_status");?>",
+		},
 	});
 });
 <?php
@@ -148,12 +129,12 @@ $(document).ready(function() {
 		);
 		if($receiptreject) {
 			$options = array();
-			if($revisionStatus['status'] != 1)
+			if($receiptStatus['status'] != 1)
 				$options[] = array('1', getMLText("status_receipted"));
-			if($revisionStatus['status'] != -1)
+			if($receiptStatus['status'] != -1)
 				$options[] = array('-1', getMLText("rejected"));
 			$this->formField(
-				getMLText("revision_status"),
+				getMLText("receipt_status"),
 				array(
 					'element'=>'select',
 					'name'=>'receiptStatus',
@@ -164,7 +145,7 @@ $(document).ready(function() {
 			echo '<input type="hidden" name="receiptStatus" value="1" />';
 		}
 		$this->contentContainerEnd();
-		$this->formSubmit(getMLText('submit_revision'), $revisiontype.'Revision');
+		$this->formSubmit(getMLText('submit_receipt'), $receipttype.'Receipt');
 ?>
 		<input type='hidden' name='receiptType' value='<?= $receipttype ?>'/>
 		<?php if($receipttype == 'grp'): ?>

From b2b61eb99048a30e69466ea9ea4a2cfcc1507211 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 16 Oct 2021 17:43:42 +0200
Subject: [PATCH 1500/2006] pass conversion mgr to constructor of task

---
 inc/inc.ClassSchedulerTaskBase.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassSchedulerTaskBase.php b/inc/inc.ClassSchedulerTaskBase.php
index d3d5561b3..ba954d03a 100644
--- a/inc/inc.ClassSchedulerTaskBase.php
+++ b/inc/inc.ClassSchedulerTaskBase.php
@@ -103,13 +103,14 @@ class SeedDMS_SchedulerTaskBase {
 		return $ret;
 	} /* }}} */
 
-	public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null, $notifier=null) { /* {{{ */
+	public function __construct($dms=null, $user=null, $settings=null, $logger=null, $fulltextservice=null, $notifier=null, $conversionmgr=null) { /* {{{ */
 		$this->dms = $dms;
 		$this->user = $user;
 		$this->settings = $settings;
 		$this->logger = $logger;
 		$this->fulltextservice = $fulltextservice;
 		$this->notifier = $notifier;
+		$this->conversionmgr = $conversionmgr;
 	} /* }}} */
 
 	public function execute(SeedDMS_SchedulerTask $task) { /* {{{ */

From e7303b63714060682a7c71d1f8d51bc48a0a522f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 16 Oct 2021 17:44:11 +0200
Subject: [PATCH 1501/2006] pass conversion mgr to previewer, list all
 conversion services

---
 inc/inc.Tasks.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 65ed4fc37..80ae27646 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -442,11 +442,21 @@ class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		$dms = $this->dms;
 		$logger = $this->logger;
 		$settings = $this->settings;
+		$conversionmgr = $this->conversionmgr;
 		$taskparams = $task->getParameter();
 		$folder = $dms->getRootFolder();
 
 		$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
-		$previewer->setConverters(isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
+		$logger->log('Task \'previewer\': '.($conversionmgr ? 'has conversionmgr' : 'has not conversionmgr'), PEAR_LOG_INFO);
+		if($conversionmgr) {
+			$fromservices = $conversionmgr->getServices();
+			foreach($fromservices as $from=>$toservices)
+				foreach($toservices as $to=>$services)
+					foreach($services as $service)
+						$logger->log($from.'->'.$to.' : '.get_class($service), PEAR_LOG_DEBUG);
+			$previewer->setConversionMgr($conversionmgr);
+		} else
+			$previewer->setConverters(isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 
 		$folderprocess = new SeedDMS_Task_Preview_Process_Folder($previewer, array('list'=>$settings->_previewWidthList, 'detail'=>$settings->_previewWidthDetail), $logger);
 		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));

From b46795cbfecb7035a8a4b1e5c08ef7f3f82472f4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 16 Oct 2021 17:44:45 +0200
Subject: [PATCH 1502/2006] pass conversion mgr to task

---
 inc/inc.Utils.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 23f491637..5aca70fa4 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -780,13 +780,13 @@ function seed_pass_verify($password, $hash) { /* {{{ */
 } /* }}} */
 
 function resolveTask($task) {
-	global $dms, $user, $settings, $logger, $fulltextservice, $notifier;
+	global $dms, $user, $settings, $logger, $fulltextservice, $notifier, $conversionmgr;
 
 	if(is_object($task))
 		return $task;
 	if(is_string($task)) {
 		if(class_exists($task)) {
-			$task = new $task($dms, $user, $settings, $logger, $fulltextservice, $notifier);
+			$task = new $task($dms, $user, $settings, $logger, $fulltextservice, $notifier, $conversionmgr);
 		}
 	}
 	return $task;

From adde8afc844f59580bb736b9b4df7c26dc9618de Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Oct 2021 10:15:21 +0200
Subject: [PATCH 1503/2006] fix cols of formField 'textarea'

---
 views/bootstrap/class.Bootstrap.php   | 2 +-
 views/bootstrap4/class.Bootstrap4.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e654e3b03..5a2cb6807 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1233,7 +1233,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					(!empty($value['name']) ? ' name="'.$value['name'].'"' : '').
 					(!empty($value['class']) ? ' class="'.$value['class'].'"' : '').
 					(!empty($value['rows']) ? ' rows="'.$value['rows'].'"' : '').
-					(!empty($value['cols']) ? ' rows="'.$value['cols'].'"' : '').
+					(!empty($value['cols']) ? ' cols="'.$value['cols'].'"' : '').
 					(!empty($value['required']) ? ' required="required"' : '').">".(!empty($value['value']) ? $value['value'] : '')."</textarea>";
 				break;
 			case 'plain':
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index d550e1453..dce5f14f5 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1132,7 +1132,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					(!empty($value['name']) ? ' name="'.$value['name'].'"' : '').
 					(empty($value['class']) ? ' class="form-control"' : ' class="form-control '.$value['class'].'"').
 					(!empty($value['rows']) ? ' rows="'.$value['rows'].'"' : '').
-					(!empty($value['cols']) ? ' rows="'.$value['cols'].'"' : '').
+					(!empty($value['cols']) ? ' cols="'.$value['cols'].'"' : '').
 					(!empty($value['required']) ? ' required="required"' : '').">".(!empty($value['value']) ? $value['value'] : '')."</textarea>";
 				break;
 			case 'plain':

From 07f50b4b95e9ea352a602ea49bd440b35f61a2f1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 Oct 2021 19:26:06 +0200
Subject: [PATCH 1504/2006] install spectrum

---
 Gruntfile.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Gruntfile.js b/Gruntfile.js
index 1ad6013f0..493798a7a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -181,6 +181,14 @@ module.exports = function (grunt) {
 								],
 								dest: bootstrapDir + '/bootstrap',
 								flatten: true
+						},{
+								expand: true,
+								src: [
+										nodeDir + '/spectrum-colorpicker2/dist/spectrum.min.js',
+										nodeDir + '/spectrum-colorpicker2/dist/spectrum.min.css'
+								],
+								dest: bootstrapDir + '/spectrum-colorpicker2',
+								flatten: true
 						},{
 								expand: true,
 								src: [

From df94bc0c1ab31cc12e02b731b9e81ee6a315b82a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 Oct 2021 19:26:28 +0200
Subject: [PATCH 1505/2006] add spectrum-colorpicker2, new version of flot

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b16c40b8b..2c66dc369 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "cytoscape-grid-guide": "^2.3.2",
     "fine-uploader": "^5.16.2",
     "flag-icon-css": "^3.5.0",
-    "flot": "^4.2.1",
+    "flot": "^4.2.2",
     "font-awesome": "^4.7.0",
     "fullcalendar": "^3.*",
     "grunt": "^1.3.0",
@@ -33,6 +33,7 @@
     "perfect-scrollbar": "^1.5.0",
     "popper.js": "^1.16.1",
     "select2": "^4.0.13",
+    "spectrum-colorpicker2": "^2.0.8",
     "vis-timeline": "^7.4.7"
   }
 }

From 542a6cb04575770bf5440fa35d61e04b0d69ce49 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Nov 2021 15:53:43 +0100
Subject: [PATCH 1506/2006] require basic auth and login as user cli_scheduler

---
 controllers/class.Cron.php | 20 +++++++++++++-------
 op/op.Cron.php             | 10 ++++++++--
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/controllers/class.Cron.php b/controllers/class.Cron.php
index 2c9d62837..9defe2723 100644
--- a/controllers/class.Cron.php
+++ b/controllers/class.Cron.php
@@ -24,8 +24,9 @@ class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
 
 	public function run() { /* {{{ */
 		$dms = $this->params['dms'];
+		$user = $this->params['user'];
 		$settings = $this->params['settings'];
-		$mode = 'run'; //$this->params['mode'];
+		$mode = $this->params['mode'];
 		$db = $dms->getDb();
 
 		$scheduler = new SeedDMS_Scheduler($db);
@@ -35,19 +36,24 @@ class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
 			if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = resolveTask($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()]))) {
 				switch($mode) {
 				case "run":
+				case "dryrun":
 					if(method_exists($taskobj, 'execute')) {
             if(!$task->getDisabled() && $task->isDue()) {
-							if($user = $dms->getUserByLogin('cli_scheduler')) {
+							if($mode == 'run') {
+								/* Schedule the next run right away to prevent a second execution
+								 * of the task when the cron job of the scheduler is called before
+								 * the last run was finished. The task itself can still be scheduled
+								 * to fast, but this is up to the admin of seeddms.
+								 */
+								$task->updateLastNextRun();
 								if($taskobj->execute($task)) {
 									add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
-									$task->updateLastNextRun();
 								} else {
 									add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
 									$task->setDisabled(1);
 								}
-							} else {
-								add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed because of missing user 'cli_scheduler'. Task has been disabled.", PEAR_LOG_ERR);
-								$task->setDisabled(1);
+							} elseif($mode == 'dryrun') {
+								echo "Running ".$task->getExtension()."::".$task->getTask()." in dry mode\n";
 							}
             }
 					}
@@ -56,7 +62,7 @@ class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
 			}
 		}
 
-	return true;
+		return true;
 	} /* }}} */
 }
 
diff --git a/op/op.Cron.php b/op/op.Cron.php
index e9b56b111..76c8409e6 100644
--- a/op/op.Cron.php
+++ b/op/op.Cron.php
@@ -30,12 +30,18 @@ include("../inc/inc.ClassNotificationService.php");
 include("../inc/inc.ClassEmailNotify.php");
 include("../inc/inc.ClassController.php");
 include("../inc/inc.Scheduler.php");
+include("../inc/inc.BasicAuthentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$controller = Controller::factory($tmp[1], array('dms'=>$dms));
+$controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
-$controller->setParam('settings', $settings);
 header("Content-Type: text/plain");
+if($user->getLogin() != 'cli_scheduler') {
+	echo "Wrong user";
+	exit;
+}
+$controller->setParam('settings', $settings);
+$controller->setParam('mode', 'dryrun');
 if(!$controller->run()) {
 	echo getMLText("error_occured");
 	exit;

From 25e12c5f5ebfcd06da50d7f356fffdae16d6be15 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 8 Nov 2021 15:54:15 +0100
Subject: [PATCH 1507/2006] include Notification.php instead of setting
 services

---
 inc/inc.BasicAuthentication.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/inc/inc.BasicAuthentication.php b/inc/inc.BasicAuthentication.php
index d4227d745..37f4cf8c4 100644
--- a/inc/inc.BasicAuthentication.php
+++ b/inc/inc.BasicAuthentication.php
@@ -76,8 +76,6 @@ if (!isset($_SERVER['PHP_AUTH_USER'])) {
 $user->clearLoginFailures();
 
 $dms->setUser($user);
-$notifier = new SeedDMS_NotificationService();
-if($settings->_enableEmail) {
-	$notifier->addService(new SeedDMS_EmailNotify($dms));
-}
+
+require_once('inc/inc.Notification.php');
 

From b01e2aa66645454da3a3d7b734e2f7fac32c1ed3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Nov 2021 17:17:28 +0100
Subject: [PATCH 1508/2006] take out sending mails to owner

---
 op/op.ReceiptDocument.php |  6 +++++-
 op/op.ReviseDocument.php  | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index 04dd0f7b4..5bdfb8a5c 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -113,7 +113,11 @@ if ($_POST["receiptType"] == "ind" || $_POST["receiptType"] == "grp") {
 		foreach ($nl["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
-		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		/* Send mail to owner only if the currently logged in user is not the
+		 * owner and the owner is not already in the list of notifiers.
+		 */
+//		if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users']))
+//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 }
 
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index b303124fd..1a4254be5 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -116,7 +116,11 @@ if ($_POST["revisionType"] == "ind" || $_POST["revisionType"] == "grp") {
 		foreach ($nl["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
-		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		/* Send mail to owner only if the currently logged in user is not the
+		 * owner and the owner is not already in the list of notifiers.
+		 */
+//		if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users']))
+//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 }
 
@@ -142,7 +146,11 @@ if($olddocstatus['status'] != $newdocstatus['status']) {
 		foreach ($nl["groups"] as $grp) {
 			$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
 		}
-		$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
+		/* Send mail to owner only if the currently logged in user is not the
+		 * owner and the owner is not already in the list of notifiers.
+		 */
+//		if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users']))
+//			$notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
 	}
 }
 

From a1b4b3b081477c01e90103d27b274675aecfdc3f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Dec 2021 20:55:59 +0100
Subject: [PATCH 1509/2006] remove duplicate submit button

---
 views/bootstrap/class.Search.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index ce6296c46..0b9a692e1 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -373,7 +373,6 @@ function typeahead() { /* {{{ */
 			}
 		}
 		$this->contentContainerEnd();
-		$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
 		// }}}
 
 		// Seach options for documents {{{

From 7b87cc355dcf551f9903659f2f98848850b8332c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 12 Dec 2021 12:58:42 +0100
Subject: [PATCH 1510/2006] finish running cron jobs via web, result is
 returned as json

---
 controllers/class.Cron.php | 38 +++++++++++++++++++++++++++++++++++++-
 op/op.Cron.php             |  9 +++++++--
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/controllers/class.Cron.php b/controllers/class.Cron.php
index 9defe2723..0ea71e76b 100644
--- a/controllers/class.Cron.php
+++ b/controllers/class.Cron.php
@@ -32,8 +32,16 @@ class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
 		$scheduler = new SeedDMS_Scheduler($db);
 		$tasks = $scheduler->getTasks();
 
+		$jsonarr = [];
 		foreach($tasks as $task) {
 			if(isset($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()]) && is_object($taskobj = resolveTask($GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()]))) {
+				$arr = array(
+					'extension'=>$task->getExtension(),
+					'name'=>$task->getTask(),
+					'mode'=>$mode,
+					'disabled' => (bool) $task->getDisabled(),
+					'isdue' => $task->isDue(),
+				);
 				switch($mode) {
 				case "run":
 				case "dryrun":
@@ -48,19 +56,47 @@ class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
 								$task->updateLastNextRun();
 								if($taskobj->execute($task)) {
 									add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
+									$arr['success'] = true;
 								} else {
 									add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
+									$arr['success'] = false;
 									$task->setDisabled(1);
 								}
 							} elseif($mode == 'dryrun') {
-								echo "Running ".$task->getExtension()."::".$task->getTask()." in dry mode\n";
+								$arr['success'] = true;
 							}
             }
 					}
 					break;
+				case "check":
+					$arr['error'] = false;
+					if(!method_exists($taskobj, 'execute')) {
+						$arr['error'] = true;
+						$arr['messages'][] = 'Missing method execute()';
+					}
+					if(get_parent_class($taskobj) != 'SeedDMS_SchedulerTaskBase') {
+						$arr['error'] = true;
+						$arr['error'][] = "Wrong parent class";
+					}
+					break;
+				case "list":
+				default:
+					header("Content-Type: application/json");
+					$arr['nextrun']=$task->getNextRun();
+					$arr['frequency']=$task->getFrequency();
+					$arr['params']=array();
+					if($params = $task->getParameter()) {
+						foreach($params as $key=>$value) {
+							$p = $taskobj->getAdditionalParamByName($key);
+							$arr['params'][$key] = ($p['type'] == 'password') ? '*******' : $value;
+						}
+					}
+					break;
 				}
+				$jsonarr[] = $arr;
 			}
 		}
+		echo json_encode($jsonarr);
 
 		return true;
 	} /* }}} */
diff --git a/op/op.Cron.php b/op/op.Cron.php
index 76c8409e6..50e6aa580 100644
--- a/op/op.Cron.php
+++ b/op/op.Cron.php
@@ -35,13 +35,18 @@ include("../inc/inc.BasicAuthentication.php");
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
-header("Content-Type: text/plain");
 if($user->getLogin() != 'cli_scheduler') {
+	header('WWW-Authenticate: Basic realm="'.$settings->_siteName.'"');
+	header('HTTP/1.0 401 Unauthorized');
 	echo "Wrong user";
 	exit;
 }
+$mode = 'list';
+if(!empty($_GET['mode']) && in_array($_GET['mode'], array('list', 'run', 'dryrun', 'check')))
+	$mode = $_GET['mode'];
+
 $controller->setParam('settings', $settings);
-$controller->setParam('mode', 'dryrun');
+$controller->setParam('mode', $mode);
 if(!$controller->run()) {
 	echo getMLText("error_occured");
 	exit;

From b91745626ad98685c0dd8981ef4788033f5faa90 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 12 Dec 2021 13:01:46 +0100
Subject: [PATCH 1511/2006] add entry for 6.0.18

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index aa7e5579a..8fd7b2f2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.18
 --------------------------------------------------------------------------------
+- finish op/op.Cron.php, returns json
 - merge changes up to 5.1.25
 
 --------------------------------------------------------------------------------

From 2b0351325ce4a60aa1e9b820a6619a4d88894efd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Dec 2021 16:42:40 +0100
Subject: [PATCH 1512/2006] remove html with $this->formField()

---
 views/bootstrap/class.SchedulerTaskMgr.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index ec507839e..c19521a28 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -107,7 +107,7 @@ $(document).ready( function() {
 				$additionalparams = null;
 ?>
 	<form action="../op/op.SchedulerTaskMgr.php" method="post" class="form-horizontal">
-	<?=	createHiddenFieldWithKey('addtask') ?>
+	<?= createHiddenFieldWithKey('addtask') ?>
 	<input type="hidden" name="action" value="addtask">
 	<input type="hidden" name="extension" value="<?= $extname ?>">
 	<input type="hidden" name="task" value="<?= $taskname ?>">
@@ -268,13 +268,11 @@ $(document).ready( function() {
 	<input type="hidden" name="taskid" value="<?= $taskid ?>">
 	<input type="hidden" name="extension" value="<?= $task->getExtension() ?>">
 	<input type="hidden" name="task" value="<?= $task->getTask() ?>">
-	<div class="control-group">
-		<label class="control-label" for="extension"><?= getMLText("scheduler_class");?>:</label>
-		<div class="controls">
-		<span class="input uneditable-input"><?= $task->getExtension() ?>::<?= $task->getTask() ?></span>
-		</div>
-	</div>
 <?php
+		$this->formField(
+			getMLText('scheduler_class'),
+			$task->getExtension()
+		);
 		$this->formField(
 			getMLText('task_name'),
 			array(

From 056dd8bd093e2cb17204f459e297e79382032b38 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Dec 2021 16:42:58 +0100
Subject: [PATCH 1513/2006] new css with google fonts

---
 views/bootstrap4/styles/seeddms.css | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap4/styles/seeddms.css b/views/bootstrap4/styles/seeddms.css
index defe1ea99..316d9a63f 100644
--- a/views/bootstrap4/styles/seeddms.css
+++ b/views/bootstrap4/styles/seeddms.css
@@ -2,9 +2,13 @@
 /*
 @import url(https://fonts.googleapis.com/css?family=Nunito:200,300,400,700);
 $font-family-base: "Nunito";
-*/
+
 @import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,700);
+$font-family-base: "Source Sans Pro";
+
 @import url(https://fonts.googleapis.com/css?family=Crete+Round:200,300,400,700);
+$headings-font-family: "Crete Round";
+*/
 /*
 $theme-colors: (
   "primary": #04c,
@@ -68,7 +72,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
 
 body {
   margin: 0;
-  font-family: "Source Sans Pro";
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-size: 1rem;
   font-weight: 400;
   line-height: 1.5;
@@ -368,7 +372,6 @@ template {
 h1, h2, h3, h4, h5, h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
   margin-bottom: 0.25rem;
-  font-family: "Crete Round";
   font-weight: 500;
   line-height: 1.2;
 }
@@ -5582,7 +5585,7 @@ a.close.disabled {
   z-index: 1070;
   display: block;
   margin: 0;
-  font-family: "Source Sans Pro";
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-style: normal;
   font-weight: 400;
   line-height: 1.5;
@@ -5694,7 +5697,7 @@ a.close.disabled {
   z-index: 1060;
   display: block;
   max-width: 276px;
-  font-family: "Source Sans Pro";
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   font-style: normal;
   font-weight: 400;
   line-height: 1.5;
@@ -10896,4 +10899,4 @@ a.text-dark:hover, a.text-dark:focus {
   }
 }
 
-/*# sourceMappingURL=data:application/json;base64,{
	"version": 3,
	"file": "dist/seeddms.css",
	"sources": [
		"scss/seeddms.scss",
		"node_modules/bootstrap/scss/bootstrap.scss",
		"node_modules/bootstrap/scss/_functions.scss",
		"node_modules/bootstrap/scss/_variables.scss",
		"node_modules/bootstrap/scss/_mixins.scss",
		"node_modules/bootstrap/scss/vendor/_rfs.scss",
		"node_modules/bootstrap/scss/mixins/_deprecate.scss",
		"node_modules/bootstrap/scss/mixins/_breakpoints.scss",
		"node_modules/bootstrap/scss/mixins/_hover.scss",
		"node_modules/bootstrap/scss/mixins/_image.scss",
		"node_modules/bootstrap/scss/mixins/_badge.scss",
		"node_modules/bootstrap/scss/mixins/_resize.scss",
		"node_modules/bootstrap/scss/mixins/_screen-reader.scss",
		"node_modules/bootstrap/scss/mixins/_size.scss",
		"node_modules/bootstrap/scss/mixins/_reset-text.scss",
		"node_modules/bootstrap/scss/mixins/_text-emphasis.scss",
		"node_modules/bootstrap/scss/mixins/_text-hide.scss",
		"node_modules/bootstrap/scss/mixins/_text-truncate.scss",
		"node_modules/bootstrap/scss/mixins/_visibility.scss",
		"node_modules/bootstrap/scss/mixins/_alert.scss",
		"node_modules/bootstrap/scss/mixins/_buttons.scss",
		"node_modules/bootstrap/scss/mixins/_caret.scss",
		"node_modules/bootstrap/scss/mixins/_pagination.scss",
		"node_modules/bootstrap/scss/mixins/_lists.scss",
		"node_modules/bootstrap/scss/mixins/_list-group.scss",
		"node_modules/bootstrap/scss/mixins/_nav-divider.scss",
		"node_modules/bootstrap/scss/mixins/_forms.scss",
		"node_modules/bootstrap/scss/mixins/_table-row.scss",
		"node_modules/bootstrap/scss/mixins/_background-variant.scss",
		"node_modules/bootstrap/scss/mixins/_border-radius.scss",
		"node_modules/bootstrap/scss/mixins/_box-shadow.scss",
		"node_modules/bootstrap/scss/mixins/_gradients.scss",
		"node_modules/bootstrap/scss/mixins/_transition.scss",
		"node_modules/bootstrap/scss/mixins/_clearfix.scss",
		"node_modules/bootstrap/scss/mixins/_grid-framework.scss",
		"node_modules/bootstrap/scss/mixins/_grid.scss",
		"node_modules/bootstrap/scss/mixins/_float.scss",
		"node_modules/bootstrap/scss/_root.scss",
		"node_modules/bootstrap/scss/_reboot.scss",
		"node_modules/bootstrap/scss/_type.scss",
		"node_modules/bootstrap/scss/_images.scss",
		"node_modules/bootstrap/scss/_code.scss",
		"node_modules/bootstrap/scss/_grid.scss",
		"node_modules/bootstrap/scss/_tables.scss",
		"node_modules/bootstrap/scss/_forms.scss",
		"node_modules/bootstrap/scss/_buttons.scss",
		"node_modules/bootstrap/scss/_transitions.scss",
		"node_modules/bootstrap/scss/_dropdown.scss",
		"node_modules/bootstrap/scss/_button-group.scss",
		"node_modules/bootstrap/scss/_input-group.scss",
		"node_modules/bootstrap/scss/_custom-forms.scss",
		"node_modules/bootstrap/scss/_nav.scss",
		"node_modules/bootstrap/scss/_navbar.scss",
		"node_modules/bootstrap/scss/_card.scss",
		"node_modules/bootstrap/scss/_breadcrumb.scss",
		"node_modules/bootstrap/scss/_pagination.scss",
		"node_modules/bootstrap/scss/_badge.scss",
		"node_modules/bootstrap/scss/_jumbotron.scss",
		"node_modules/bootstrap/scss/_alert.scss",
		"node_modules/bootstrap/scss/_progress.scss",
		"node_modules/bootstrap/scss/_media.scss",
		"node_modules/bootstrap/scss/_list-group.scss",
		"node_modules/bootstrap/scss/_close.scss",
		"node_modules/bootstrap/scss/_toasts.scss",
		"node_modules/bootstrap/scss/_modal.scss",
		"node_modules/bootstrap/scss/_tooltip.scss",
		"node_modules/bootstrap/scss/_popover.scss",
		"node_modules/bootstrap/scss/_carousel.scss",
		"node_modules/bootstrap/scss/_spinners.scss",
		"node_modules/bootstrap/scss/_utilities.scss",
		"node_modules/bootstrap/scss/utilities/_align.scss",
		"node_modules/bootstrap/scss/utilities/_background.scss",
		"node_modules/bootstrap/scss/utilities/_borders.scss",
		"node_modules/bootstrap/scss/utilities/_clearfix.scss",
		"node_modules/bootstrap/scss/utilities/_display.scss",
		"node_modules/bootstrap/scss/utilities/_embed.scss",
		"node_modules/bootstrap/scss/utilities/_flex.scss",
		"node_modules/bootstrap/scss/utilities/_float.scss",
		"node_modules/bootstrap/scss/utilities/_interactions.scss",
		"node_modules/bootstrap/scss/utilities/_overflow.scss",
		"node_modules/bootstrap/scss/utilities/_position.scss",
		"node_modules/bootstrap/scss/utilities/_screenreaders.scss",
		"node_modules/bootstrap/scss/utilities/_shadows.scss",
		"node_modules/bootstrap/scss/utilities/_sizing.scss",
		"node_modules/bootstrap/scss/utilities/_spacing.scss",
		"node_modules/bootstrap/scss/utilities/_stretched-link.scss",
		"node_modules/bootstrap/scss/utilities/_text.scss",
		"node_modules/bootstrap/scss/utilities/_visibility.scss",
		"node_modules/bootstrap/scss/_print.scss",
		"node_modules/select2/src/scss/core.scss",
		"node_modules/select2/src/scss/_single.scss",
		"node_modules/select2/src/scss/_multiple.scss",
		"node_modules/select2/src/scss/_dropdown.scss",
		"node_modules/select2/src/scss/theme/default/layout.scss",
		"node_modules/select2/src/scss/theme/default/_single.scss",
		"node_modules/select2/src/scss/theme/default/_multiple.scss",
		"node_modules/select2/src/scss/theme/classic/layout.scss",
		"node_modules/select2/src/scss/theme/classic/_defaults.scss",
		"node_modules/select2/src/scss/mixins/_gradients.scss",
		"node_modules/select2/src/scss/theme/classic/_single.scss",
		"node_modules/select2/src/scss/theme/classic/_multiple.scss",
		"node_modules/select2-theme-bootstrap4/src/select2-bootstrap.scss"
	],
	"names": [],
	"mappings": "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"
} */
\ No newline at end of file
+/*# sourceMappingURL=data:application/json;base64,{
	"version": 3,
	"file": "dist/seeddms.css",
	"sources": [
		"scss/seeddms.scss",
		"node_modules/bootstrap/scss/bootstrap.scss",
		"node_modules/bootstrap/scss/_functions.scss",
		"node_modules/bootstrap/scss/_variables.scss",
		"node_modules/bootstrap/scss/_mixins.scss",
		"node_modules/bootstrap/scss/vendor/_rfs.scss",
		"node_modules/bootstrap/scss/mixins/_deprecate.scss",
		"node_modules/bootstrap/scss/mixins/_breakpoints.scss",
		"node_modules/bootstrap/scss/mixins/_hover.scss",
		"node_modules/bootstrap/scss/mixins/_image.scss",
		"node_modules/bootstrap/scss/mixins/_badge.scss",
		"node_modules/bootstrap/scss/mixins/_resize.scss",
		"node_modules/bootstrap/scss/mixins/_screen-reader.scss",
		"node_modules/bootstrap/scss/mixins/_size.scss",
		"node_modules/bootstrap/scss/mixins/_reset-text.scss",
		"node_modules/bootstrap/scss/mixins/_text-emphasis.scss",
		"node_modules/bootstrap/scss/mixins/_text-hide.scss",
		"node_modules/bootstrap/scss/mixins/_text-truncate.scss",
		"node_modules/bootstrap/scss/mixins/_visibility.scss",
		"node_modules/bootstrap/scss/mixins/_alert.scss",
		"node_modules/bootstrap/scss/mixins/_buttons.scss",
		"node_modules/bootstrap/scss/mixins/_caret.scss",
		"node_modules/bootstrap/scss/mixins/_pagination.scss",
		"node_modules/bootstrap/scss/mixins/_lists.scss",
		"node_modules/bootstrap/scss/mixins/_list-group.scss",
		"node_modules/bootstrap/scss/mixins/_nav-divider.scss",
		"node_modules/bootstrap/scss/mixins/_forms.scss",
		"node_modules/bootstrap/scss/mixins/_table-row.scss",
		"node_modules/bootstrap/scss/mixins/_background-variant.scss",
		"node_modules/bootstrap/scss/mixins/_border-radius.scss",
		"node_modules/bootstrap/scss/mixins/_box-shadow.scss",
		"node_modules/bootstrap/scss/mixins/_gradients.scss",
		"node_modules/bootstrap/scss/mixins/_transition.scss",
		"node_modules/bootstrap/scss/mixins/_clearfix.scss",
		"node_modules/bootstrap/scss/mixins/_grid-framework.scss",
		"node_modules/bootstrap/scss/mixins/_grid.scss",
		"node_modules/bootstrap/scss/mixins/_float.scss",
		"node_modules/bootstrap/scss/_root.scss",
		"node_modules/bootstrap/scss/_reboot.scss",
		"node_modules/bootstrap/scss/_type.scss",
		"node_modules/bootstrap/scss/_images.scss",
		"node_modules/bootstrap/scss/_code.scss",
		"node_modules/bootstrap/scss/_grid.scss",
		"node_modules/bootstrap/scss/_tables.scss",
		"node_modules/bootstrap/scss/_forms.scss",
		"node_modules/bootstrap/scss/_buttons.scss",
		"node_modules/bootstrap/scss/_transitions.scss",
		"node_modules/bootstrap/scss/_dropdown.scss",
		"node_modules/bootstrap/scss/_button-group.scss",
		"node_modules/bootstrap/scss/_input-group.scss",
		"node_modules/bootstrap/scss/_custom-forms.scss",
		"node_modules/bootstrap/scss/_nav.scss",
		"node_modules/bootstrap/scss/_navbar.scss",
		"node_modules/bootstrap/scss/_card.scss",
		"node_modules/bootstrap/scss/_breadcrumb.scss",
		"node_modules/bootstrap/scss/_pagination.scss",
		"node_modules/bootstrap/scss/_badge.scss",
		"node_modules/bootstrap/scss/_jumbotron.scss",
		"node_modules/bootstrap/scss/_alert.scss",
		"node_modules/bootstrap/scss/_progress.scss",
		"node_modules/bootstrap/scss/_media.scss",
		"node_modules/bootstrap/scss/_list-group.scss",
		"node_modules/bootstrap/scss/_close.scss",
		"node_modules/bootstrap/scss/_toasts.scss",
		"node_modules/bootstrap/scss/_modal.scss",
		"node_modules/bootstrap/scss/_tooltip.scss",
		"node_modules/bootstrap/scss/_popover.scss",
		"node_modules/bootstrap/scss/_carousel.scss",
		"node_modules/bootstrap/scss/_spinners.scss",
		"node_modules/bootstrap/scss/_utilities.scss",
		"node_modules/bootstrap/scss/utilities/_align.scss",
		"node_modules/bootstrap/scss/utilities/_background.scss",
		"node_modules/bootstrap/scss/utilities/_borders.scss",
		"node_modules/bootstrap/scss/utilities/_clearfix.scss",
		"node_modules/bootstrap/scss/utilities/_display.scss",
		"node_modules/bootstrap/scss/utilities/_embed.scss",
		"node_modules/bootstrap/scss/utilities/_flex.scss",
		"node_modules/bootstrap/scss/utilities/_float.scss",
		"node_modules/bootstrap/scss/utilities/_interactions.scss",
		"node_modules/bootstrap/scss/utilities/_overflow.scss",
		"node_modules/bootstrap/scss/utilities/_position.scss",
		"node_modules/bootstrap/scss/utilities/_screenreaders.scss",
		"node_modules/bootstrap/scss/utilities/_shadows.scss",
		"node_modules/bootstrap/scss/utilities/_sizing.scss",
		"node_modules/bootstrap/scss/utilities/_spacing.scss",
		"node_modules/bootstrap/scss/utilities/_stretched-link.scss",
		"node_modules/bootstrap/scss/utilities/_text.scss",
		"node_modules/bootstrap/scss/utilities/_visibility.scss",
		"node_modules/bootstrap/scss/_print.scss",
		"node_modules/select2/src/scss/core.scss",
		"node_modules/select2/src/scss/_single.scss",
		"node_modules/select2/src/scss/_multiple.scss",
		"node_modules/select2/src/scss/_dropdown.scss",
		"node_modules/select2/src/scss/theme/default/layout.scss",
		"node_modules/select2/src/scss/theme/default/_single.scss",
		"node_modules/select2/src/scss/theme/default/_multiple.scss",
		"node_modules/select2/src/scss/theme/classic/layout.scss",
		"node_modules/select2/src/scss/theme/classic/_defaults.scss",
		"node_modules/select2/src/scss/mixins/_gradients.scss",
		"node_modules/select2/src/scss/theme/classic/_single.scss",
		"node_modules/select2/src/scss/theme/classic/_multiple.scss",
		"node_modules/select2-theme-bootstrap4/src/select2-bootstrap.scss"
	],
	"names": [],
	"mappings": "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"
} */
\ No newline at end of file

From 9889bbe6392e934975c1c7817abfb112a7649426 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Jan 2022 07:44:31 +0100
Subject: [PATCH 1514/2006] make role id an integer

---
 restapi/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/restapi/index.php b/restapi/index.php
index cc751acb2..bd7919bf6 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -147,7 +147,7 @@ class RestapiController { /* {{{ */
             'email'=>$u->getEmail(),
             'language' => $u->getLanguage(),
             'theme' => $u->getTheme(),
-            'role' => array('id'=>$u->getRole()->getId(), 'name'=>$u->getRole()->getName()),
+            'role' => array('id'=>(int)$u->getRole()->getId(), 'name'=>$u->getRole()->getName()),
             'hidden'=>$u->isHidden() ? true : false,
             'disabled'=>$u->isDisabled() ? true : false,
             'isguest' => $u->isGuest() ? true : false,

From 27b5af8adaf2695a53d36ab327b17bd469f77a20 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Feb 2022 10:55:45 +0100
Subject: [PATCH 1515/2006] propperly get workflow log (Closes #522)

---
 op/op.TriggerWorkflow.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php
index 7eac816a5..881abb8e2 100644
--- a/op/op.TriggerWorkflow.php
+++ b/op/op.TriggerWorkflow.php
@@ -80,7 +80,8 @@ $overallStatus = $version->getStatus();
 if($ret = $version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 	/* $ret is the next state if it was entered otherwise it is just true */
 	if ($notifier) {
-		$wkflog = $version->getWorkflowLog($transition);
+		$wkflogs = $version->getWorkflowLog($transition);
+		$wkflog = array_pop($wkflogs);
 		$notifier->sendTriggerWorkflowTransitionMail($version, $user, $wkflog ? $wkflog[0] : false);
 
 		if(is_object($ret)) {

From 3e63f1ffc0bd1f21daed66e5c8945e58487e3615 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Feb 2022 10:56:14 +0100
Subject: [PATCH 1516/2006] init $ret in setStatus()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 6f34941fa..b7ab3314b 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3458,6 +3458,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			}
 		}
 
+		$ret = false;
 		/* First check for a running workflow or open reviews, approvals, revisions. */
 		if ($hasworkflow) { $newstatus = S_IN_WORKFLOW; $ret = $this->setStatus(S_IN_WORKFLOW,$msg,$user); }
 		elseif ($pendingReview) { $newstatus = S_DRAFT_REV; $ret = $this->setStatus(S_DRAFT_REV,$msg,$user); }

From b2fd7bb383fdb46ceca7ce9159e2ac9668f19936 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Feb 2022 11:14:49 +0100
Subject: [PATCH 1517/2006] add entry for 6.0.18

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index f0ad535db..27f4bfcf5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - finish op/op.Cron.php, returns json
 - merge changes up to 5.1.25
+- fix sending trigger workflow notification (Closes: #522)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.17

From b57dc78e2a5fc7d762704c4324d25270891d90b1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Feb 2022 11:06:02 +0100
Subject: [PATCH 1518/2006] replace checks isset(_workflow) with _workflow ==
 null

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 16 ++++++++++------
 SeedDMS_Core/package.xml                |  3 ++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index b7ab3314b..398abfb0b 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3404,7 +3404,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		 */
 		if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED || $st["status"]==S_NEEDS_CORRECTION)) return $st['status'];
 
-		unset($this->_workflow); // force to be reloaded from DB
+		$this->_workflow = null; // force to be reloaded from DB
 		$hasworkflow =  $this->getWorkflow() ? true : false;
 
 		/* $pendingReview will be set when there are still open reviews */
@@ -6317,6 +6317,10 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * $this->_workflow['parent']. $this->_workflow['id'] is the
 	 * id from table tblWorkflowDocumentContent which is used to
 	 * get log entries for this workflow.
+	 * This method will only get a currently running workflow in
+	 * a state. Once
+	 * workflow has ended, the current state of the workflow was
+	 * set to null.
 	 *
 	 * @return object/boolean an object of class SeedDMS_Core_Workflow
 	 *         or false in case of error, e.g. the version has not a workflow
@@ -6324,7 +6328,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	function getWorkflow() { /* {{{ */
 		$db = $this->_document->getDMS()->getDB();
 
-		if (!isset($this->_workflow)) {
+		if (!$this->_workflow) {
 			$queryStr=
 				"SELECT a.`id` as `wdcid`, a.`parent`, b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.`id` WHERE a.`version`='".$this->_version
 				."' AND a.`document` = '". $this->_document->getID() ."' "
@@ -6401,7 +6405,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		$this->getWorkflow();
 
-		if (!isset($this->_workflow)) {
+		if (!$this->_workflow) {
 			return true;
 		}
 		$workflow = $this->_workflow['workflow'];
@@ -6444,7 +6448,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		$this->getWorkflow();
 
-		if (!isset($this->_workflow)) {
+		if (!$this->_workflow) {
 			return true;
 		}
 
@@ -6568,7 +6572,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if(!$this->_workflow)
 			return false;
 
-		if (isset($this->_workflow)) {
+		if ($this->_workflow) {
 			$workflow = $this->_workflow['workflow'];
 			$db->startTransaction();
 
@@ -6580,7 +6584,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 			/* Calling getWorkflow() should find the parent workflow, better check */
 			$parent = $this->_workflow['parent'];
-			unset($this->_workflow);
+			$this->_workflow = null;
 			$this->getWorkflow();
 			if($this->_workflow['id'] != $parent) {
 				$db->rollbackTransaction();
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index b5f51db02..59887046a 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2021-12-11</date>
+ <date>2022-02-14</date>
  <time>13:44:55</time>
  <version>
   <release>6.0.18</release>
@@ -25,6 +25,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - all changes from 5.1.25
+- replace all checks on isset(_workflow) by checking for null
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From b9c613ff83d26ed35486c2a6b7e0d82939788228 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Feb 2022 12:29:37 +0100
Subject: [PATCH 1519/2006] handle role in addUser() propperly

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 37299554e..0c50735b0 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2866,10 +2866,12 @@ class SeedDMS_Core_DMS {
 		if (is_object($this->getUserByLogin($login))) {
 			return false;
 		}
-		if(is_object($role))
-			$role = $role->getID();
-		elseif($role == '')
-			$role = '3';
+		if(!is_object($role)) {
+		  if($role == '')
+              $role = SeedDMS_Core_Role::getInstance(3, $this);
+          else
+              $role = SeedDMS_Core_Role::getInstance($role, $this);
+        }
 		if(trim($pwdexpiration) == '' || trim($pwdexpiration) == 'never') {
 			$pwdexpiration = 'NULL';
 		} elseif(trim($pwdexpiration) == 'now') {
@@ -2877,7 +2879,7 @@ class SeedDMS_Core_DMS {
 		} else {
 			$pwdexpiration = $db->qstr($pwdexpiration);
 		}
-		$queryStr = "INSERT INTO `tblUsers` (`login`, `pwd`, `fullName`, `email`, `language`, `theme`, `comment`, `role`, `hidden`, `disabled`, `pwdExpiration`, `quota`, `homefolder`) VALUES (".$db->qstr($login).", ".$db->qstr($pwd).", ".$db->qstr($fullName).", ".$db->qstr($email).", '".$language."', '".$theme."', ".$db->qstr($comment).", '".intval($role)."', '".intval($isHidden)."', '".intval($isDisabled)."', ".$pwdexpiration.", '".intval($quota)."', ".($homefolder ? intval($homefolder) : "NULL").")";
+		$queryStr = "INSERT INTO `tblUsers` (`login`, `pwd`, `fullName`, `email`, `language`, `theme`, `comment`, `role`, `hidden`, `disabled`, `pwdExpiration`, `quota`, `homefolder`) VALUES (".$db->qstr($login).", ".$db->qstr($pwd).", ".$db->qstr($fullName).", ".$db->qstr($email).", '".$language."', '".$theme."', ".$db->qstr($comment).", '".intval($role->getId())."', '".intval($isHidden)."', '".intval($isDisabled)."', ".$pwdexpiration.", '".intval($quota)."', ".($homefolder ? intval($homefolder) : "NULL").")";
 		$res = $this->db->getResult($queryStr);
 		if (!$res)
 			return false;

From 96933bb30de107f3804575bcf411ed64464f04e3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 17 Feb 2022 12:30:29 +0100
Subject: [PATCH 1520/2006] ensure setRole() is passed an object

---
 SeedDMS_Core/Core/inc.ClassUser.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index b47b16c13..a8b6b0901 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -90,7 +90,7 @@ class SeedDMS_Core_Role { /* {{{ */
 			$queryStr = "SELECT * FROM `tblRoles` WHERE `name` = ".$db->qstr($id);
 			break;
 		default:
-			$queryStr = "SELECT * FROM `tblRoles` WHERE id = " . (int) $id;
+			$queryStr = "SELECT * FROM `tblRoles` WHERE `id` = " . (int) $id;
 		}
 
 		$resArr = $db->getResultArray($queryStr);
@@ -740,6 +740,9 @@ class SeedDMS_Core_User { /* {{{ */
 	function setRole($newrole) { /* {{{ */
 		$db = $this->_dms->getDB();
 
+        if(!is_object($newrole) || (get_class($newrole) != $this->_dms->getClassname('role')))
+            return false;
+
 		if(is_object($newrole))
 			$queryStr = "UPDATE `tblUsers` SET `role` = " . $newrole->getID() . " WHERE `id` = " . $this->_id;
 		else

From 0f417a2d7b060c4add9912e9b9849a02da845c5f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Feb 2022 07:10:08 +0100
Subject: [PATCH 1521/2006] handle docs in workflow proppeerly in
 verifyStatus()

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 8936dc19f..d648fe6cd 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3495,6 +3495,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				}
 			} elseif($st["status"]==S_EXPIRED) {
 				$newstatus = S_RELEASED; $ret = $this->setStatus(S_RELEASED,$msg,$user);
+			} elseif($st["status"]==S_IN_WORKFLOW) {
+				$newstatus = $initialstatus; $ret = $this->setStatus($initialstatus,$msg,$user);
 			}
 		}
 

From 535a0b1b6714ac4469e5f082f54b5a7f88bc25cc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Feb 2022 07:10:28 +0100
Subject: [PATCH 1522/2006] fix line indenting

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 50 ++++++++++++-------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index d648fe6cd..65b454301 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -678,11 +678,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function setFolder($newFolder) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-        if(!$newFolder)
-            return false;
+		if(!$newFolder)
+			return false;
 
-        if(!$newFolder->isType('folder'))
-            return false;
+		if(!$newFolder->isType('folder'))
+			return false;
 
 		$queryStr = "UPDATE `tblDocuments` SET `folder` = " . $newFolder->getID() . " WHERE `id` = ". $this->_id;
 		if (!$db->getResult($queryStr))
@@ -795,8 +795,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	function setDefaultAccess($mode, $noclean="false") { /* {{{ */
 		$db = $this->_dms->getDB();
 
-        if($mode < M_LOWEST_RIGHT || $mode > M_HIGHEST_RIGHT)
-            return false;
+		if($mode < M_LOWEST_RIGHT || $mode > M_HIGHEST_RIGHT)
+			return false;
 
 		$queryStr = "UPDATE `tblDocuments` set `defaultAccess` = " . (int) $mode . " WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr))
@@ -2452,8 +2452,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if (file_exists( $this->_dms->contentDir.$version->getPath() ))
 			if (!SeedDMS_Core_File::removeFile( $this->_dms->contentDir.$version->getPath() )) {
 				$db->rollbackTransaction();
-                return false;
-            }
+				return false;
+			}
 
 		$db->commitTransaction();
 		return true;
@@ -3405,7 +3405,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		if (!$ignorecurrentstatus && ($st["status"]==S_OBSOLETE || $st["status"]==S_REJECTED || $st["status"]==S_EXPIRED || $st["status"]==S_NEEDS_CORRECTION)) return $st['status'];
 
 		$this->_workflow = null; // force to be reloaded from DB
-		$hasworkflow =  $this->getWorkflow() ? true : false;
+		$hasworkflow = $this->getWorkflow() ? true : false;
 
 		/* $pendingReview will be set when there are still open reviews */
 		$pendingReview=false;
@@ -5055,14 +5055,14 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 
 		$db = $this->_document->getDMS()->getDB();
 
-        if(!$group->isType('group'))
-            return -1;
+		if(!$group->isType('group'))
+			return -1;
 
 		// Check if the group is on the review list at all.
 		$reviewStatus = $group->getReviewStatus($this->_document->getID(), $this->_version);
 		if (is_bool($reviewStatus) && !$reviewStatus) {
 			return false;
-        }
+		}
 		if (count($reviewStatus)==0) {
 			// User is not assigned to review this document. No action required.
 			// Return an error.
@@ -5084,13 +5084,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$requestUser->getID() ."')";
 		$res=$db->getResult($queryStr);
 		if (is_bool($res) && !$res)
-            return false;
+			return false;
 
-        $reviewLogID = $db->getInsertID('tblDocumentReviewLog', 'reviewLogID');
-        if($file) {
-            SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'r' . $reviewLogID);
-        }
-        return $reviewLogID;
+		$reviewLogID = $db->getInsertID('tblDocumentReviewLog', 'reviewLogID');
+		if($file) {
+			SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'r' . $reviewLogID);
+		}
+		return $reviewLogID;
  } /* }}} */
 
 	/**
@@ -5353,8 +5353,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
  } /* }}} */
 
 	/**
-     * Sets approval status of a document content for a group
-     *
+	 * Sets approval status of a document content for a group
+	 *
 	 * The functions behaves like
 	 * {link SeedDMS_Core_DocumentContent::setApprovalByInd} but does it for
 	 * a group instead of a user
@@ -5666,7 +5666,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return 0;
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`,
-  	  `comment`, `date`, `userID`) ".
+			`comment`, `date`, `userID`) ".
 			"VALUES ('". $indstatus["receiptID"] ."', '".
 			(int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentDatetime().", '".
 			$requestUser->getID() ."')";
@@ -5715,7 +5715,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return 0;
 
 		$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`,
-  	  `comment`, `date`, `userID`) ".
+			`comment`, `date`, `userID`) ".
 			"VALUES ('". $grpstatus["receiptID"] ."', '".
 			(int) $status ."', ".$db->qstr($comment).", ".$db->getCurrentDatetime().", '".
 			$requestUser->getID() ."')";
@@ -6936,8 +6936,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Get the latest workflow log entry for the document content within the
 	 * workflow. Even after finishing the workflow (when the document content
-     * does not have workflow set anymore) this function returns the last
-     * log entry.
+	 * does not have a workflow set anymore) this function returns the last
+	 * log entry.
 	 *
 	 * @return object
 	 */
@@ -6952,7 +6952,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return false;
  */
 		$queryStr=
-			"SELECT * FROM `tblWorkflowLog` WHERE `workflowdocumentcontent` = ". $this->_workflow['id'];
+			"SELECT `a`.*, `b`.`workflow`, `b`.`document`, `b`.`version` FROM `tblWorkflowLog` `a` LEFT JOIN `tblWorkflowDocumentContent` `b` ON `a`.`workflowdocumentcontent` = `b`.`id` WHERE `b`.`version`='".$this->_version ."' AND `b`.`document` = '". $this->_document->getID() ."'";
 		$queryStr .= " ORDER BY `id` DESC LIMIT 1";
 		$resArr = $db->getResultArray($queryStr);
 		if (is_bool($resArr) && !$resArr)

From f095e252addbb54661061f129a9a4256d3519340 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Feb 2022 11:05:22 +0100
Subject: [PATCH 1523/2006] getWorkflowLog() will always return all log entries
 if document is not in a workflow

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 27 +++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 6b2b01505..ab780ebf1 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -6889,9 +6889,32 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * Get the so far logged operations on the document content within the
 	 * workflow. If the document content is currently in a workflow and
 	 * a transition is passed, then the
-	 * log entries will be restricted on the workflow and returned as one
+	 * log entries will be restricted on the workflow and returned as a one
 	 * dimensional list. Without a running workflow the log entries of
 	 * all workflows in the past are returned grouped by workflow.
+	 * This result is a two dimensional array. The keys of the first
+	 * dimension are the ids used in table tblWorkflowDocumentContent.
+	 * If only the logs of last workflow run are of interesst, then just
+	 * take the last element of the returned array.
+	 *
+	 * Example: A workflow was started for a document content.
+	 * This will add an entry in tblWorkflowDocumentContent whose state is set
+	 * to the initial state of the workflow and a new autoinc id, e.g. with id 45
+	 * Once any step in the workflow was triggered, the table tblWorkflowLog will
+	 * have an entry for workflowdocumentcontent=45.
+	 * Retrieving the workflow log as long the document is still in the workflow
+	 * will return the log entries for the current workflow. In this particular
+	 * case it will be an array with one log entry.
+	 * Once the workflow has ended this method will still return the log entries
+	 * but in a 2-dimensional array with the first dimension set to 45.
+	 *
+	 * The same document version can be run through the same or a different
+	 * workflow again which will lead to a new entry in
+	 * tblWorkflowDocumentContent, e.g. with id 46.  Getting the log entries
+	 * while the content is still in the workflow will return only those entries
+	 * for the current workflow. Once the workflow has ended, this methods
+	 * returns a 2-dimensional array with two elements in the first dimension.
+	 * One for key 45 and another one for key 46.
 	 *
 	 * @return array list of objects
 	 */
@@ -6918,7 +6941,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$workflow = $this->_document->getDMS()->getWorkflow($resArr[$i]["workflow"]);
 			$workflowlog = new SeedDMS_Core_Workflow_Log($resArr[$i]["id"], $this->_document->getDMS()->getDocument($resArr[$i]["document"]), $resArr[$i]["version"], $workflow, $this->_document->getDMS()->getUser($resArr[$i]["userid"]), $workflow->getTransition($resArr[$i]["transition"]), $resArr[$i]["date"], $resArr[$i]["comment"]);
 			$workflowlog->setDMS($this);
-			if($this->_workflow && $transition)
+			if($this->_workflow)
 				$workflowlogs[] = $workflowlog;
 			else
 				$workflowlogs[$resArr[$i]["workflowdocumentcontent"]][] = $workflowlog;

From 830f0258df4fe650a465772dee90f692aa4763d1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Feb 2022 11:07:43 +0100
Subject: [PATCH 1524/2006] add note for 6.0.18

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 32288fa55..b682bb3de 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -26,6 +26,7 @@
  <notes>
 - all changes from 5.1.25
 - replace all checks on isset(_workflow) by checking for null
+- SeedDMS_Core_Document::getWorkflowLog() returns all log entries if the document is currently not in a workflow. Previously a transition had to be passed as well.
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 98936632b2b40a163d587212042618fae061042a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Feb 2022 11:08:15 +0100
Subject: [PATCH 1525/2006] call getLastWorkflowLog() instead of
 getWorkflowLog()

---
 op/op.TriggerWorkflow.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php
index 881abb8e2..a42511316 100644
--- a/op/op.TriggerWorkflow.php
+++ b/op/op.TriggerWorkflow.php
@@ -80,9 +80,8 @@ $overallStatus = $version->getStatus();
 if($ret = $version->triggerWorkflowTransition($user, $transition, $_POST["comment"])) {
 	/* $ret is the next state if it was entered otherwise it is just true */
 	if ($notifier) {
-		$wkflogs = $version->getWorkflowLog($transition);
-		$wkflog = array_pop($wkflogs);
-		$notifier->sendTriggerWorkflowTransitionMail($version, $user, $wkflog ? $wkflog[0] : false);
+		$wkflog = $version->getLastWorkflowLog();
+		$notifier->sendTriggerWorkflowTransitionMail($version, $user, $wkflog);
 
 		if(is_object($ret)) {
 			$notifier->sendRequestWorkflowActionMail($version, $user, $transition);

From aa61028f08385f738c42942a6c5e7bfae063355f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Feb 2022 17:53:17 +0100
Subject: [PATCH 1526/2006] set default value of checkbox with hidden input
 field

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index b2a2e2c40..59db9042e 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -582,7 +582,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 						switch($conf['type']) {
 							case 'checkbox':
 ?>
-        <input type="checkbox" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" value="1" <?php if(isset($settings->_extensions[$extname][$confkey]) && $settings->_extensions[$extname][$confkey]) echo 'checked'; ?> />
+        <input type="hidden" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" value=""><input type="checkbox" name="<?php echo "extensions[".$extname."][".$confkey."]"; ?>" value="1" <?php if(isset($settings->_extensions[$extname][$confkey]) && $settings->_extensions[$extname][$confkey]) echo 'checked'; ?> />
 <?php
 								break;
 							case 'select':

From aa9a30a98a602a5fcd0452d0ec012c17c8c4d017 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Feb 2022 07:29:04 +0100
Subject: [PATCH 1527/2006] do not include inc.ClassNotificationService.php and
 inc.ClassEmailNotify.php anymore

---
 op/op.Cron.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/op/op.Cron.php b/op/op.Cron.php
index 50e6aa580..ac05baacc 100644
--- a/op/op.Cron.php
+++ b/op/op.Cron.php
@@ -26,8 +26,6 @@ include("../inc/inc.Utils.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassNotificationService.php");
-include("../inc/inc.ClassEmailNotify.php");
 include("../inc/inc.ClassController.php");
 include("../inc/inc.Scheduler.php");
 include("../inc/inc.BasicAuthentication.php");

From b65d940259a14b0c30fe299d14a7631ba6d7713a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Mar 2022 16:11:43 +0100
Subject: [PATCH 1528/2006] move methods for updating, deleting transmittal
 item into trait, makes it work in bootstrap4

---
 out/out.TransmittalMgr.php                    |   3 +
 views/bootstrap/class.TransmittalMgr.php      | 154 +-----------------
 .../trait.TransmittalDeleteButton.php         |  81 +++++++++
 .../trait.TransmittalUpdateButton.php         |  79 +++++++++
 .../trait.TransmittalDeleteButton.php         |  90 ++++++++++
 .../trait.TransmittalUpdateButton.php         |  86 ++++++++++
 6 files changed, 342 insertions(+), 151 deletions(-)
 create mode 100644 views/bootstrap/trait.TransmittalDeleteButton.php
 create mode 100644 views/bootstrap/trait.TransmittalUpdateButton.php
 create mode 100644 views/bootstrap4/trait.TransmittalDeleteButton.php
 create mode 100644 views/bootstrap4/trait.TransmittalUpdateButton.php

diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index 7d788635e..04374a534 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -26,6 +26,9 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+require_once("../views/".$theme."/trait.TransmittalUpdateButton.php");
+require_once("../views/".$theme."/trait.TransmittalDeleteButton.php");
+
 /**
  * Include class to preview documents
  */
diff --git a/views/bootstrap/class.TransmittalMgr.php b/views/bootstrap/class.TransmittalMgr.php
index 22dfa2392..b89bd7a31 100644
--- a/views/bootstrap/class.TransmittalMgr.php
+++ b/views/bootstrap/class.TransmittalMgr.php
@@ -31,6 +31,9 @@
  */
 class SeedDMS_View_TransmittalMgr extends SeedDMS_Theme_Style {
 
+	use TransmittalDeleteButton;
+	use TransmittalUpdateButton;
+
 	function js() { /* {{{ */
 		$showtree = $this->params['showtree'];
 		$onepage = $this->params['onepage'];
@@ -65,157 +68,6 @@ $(document).ready( function() {
 <?php
 	} /* }}} */
 
-	/**
-	 * Print button for updating the transmittal item to the newest version
-	 *
-	 * @param object $item
-	 * @param string $msg message shown in case of successful update
-	 */
-	protected function printUpdateItemButton($item, $msg, $return=false){ /* {{{ */
-		$itemid = $item->getID();
-		$content = '';
-    $content .= '<a class="update-transmittalitem-btn" transmittal="'.$item->getTransmittal()->getID().'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-refresh"></i></a>';
-		if($return)
-			return $content;
-		else
-			echo $content;
-		return '';
-	} /* }}} */
-
-	protected function printUpdateItemButtonJs(){ /* {{{ */
-		echo "
-		$(document).ready(function () {
-			$('body').on('click', 'a.update-transmittalitem-btn', function(ev){
-				id = $(ev.currentTarget).attr('rel');
-				transmittalid = $(ev.currentTarget).attr('transmittal');
-				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
-				msg = $(ev.currentTarget).attr('msg');
-				formtoken = '".createFormKey('updatetransmittalitem')."';
-				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='fa fa-refresh'></i> ".getMLText("update_transmittalitem")."\",
-					\"class\" : \"btn-danger\",
-					\"callback\": function() {
-						$.ajax('../op/op.TransmittalMgr.php', {
-							type:'POST',
-							async:true,
-							dataType:'json',
-							data: {
-								action: 'updatetransmittalitem',
-								id: id,
-								formtoken: formtoken
-							},
-							success: function(data) {
-								if(data.success) {
-									noty({
-										text: msg,
-										type: 'success',
-										dismissQueue: true,
-										layout: 'topRight',
-										theme: 'defaultTheme',
-										timeout: 1500,
-									});
-									$('div.ajax').trigger('update', {transmittalid: transmittalid});
-								} else {
-									noty({
-										text: data.message,
-										type: 'error',
-										dismissQueue: true,
-										layout: 'topRight',
-										theme: 'defaultTheme',
-										timeout: 3500,
-									});
-								}
-							}
-						});
-					}
-				}, {
-					\"label\" : \"".getMLText("cancel")."\",
-					\"class\" : \"btn-cancel\",
-					\"callback\": function() {
-					}
-				}]);
-			});
-		});
-		";
-	} /* }}} */
-
-	/**
-	 * Print button with link for deleting a transmittal item
-	 *
-	 * This button works just like the printDeleteDocumentButton()
-	 *
-	 * @param object $item transmittal item to be deleted
-	 * @param string $msg message shown in case of successful deletion
-	 * @param boolean $return return html instead of printing it
-	 * @return string html content if $return is true, otherwise an empty string
-	 */
-	protected function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
-		$itemid = $item->getID();
-		$content = '';
-    $content .= '<a class="delete-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
-		if($return)
-			return $content;
-		else
-			echo $content;
-		return '';
-	} /* }}} */
-
-	protected function printDeleteItemButtonJs(){ /* {{{ */
-		echo "
-		$(document).ready(function () {
-			$('body').on('click', 'a.delete-transmittalitem-btn', function(ev){
-				id = $(ev.currentTarget).attr('rel');
-				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
-				msg = $(ev.currentTarget).attr('msg');
-				formtoken = '".createFormKey('removetransmittalitem')."';
-				bootbox.dialog(confirmmsg, [{
-					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_transmittalitem")."\",
-					\"class\" : \"btn-danger\",
-					\"callback\": function() {
-						$.ajax('../op/op.TransmittalMgr.php', {
-							type:'POST',
-							async:true,
-							dataType:'json',
-							data: {
-								action: 'removetransmittalitem',
-								id: id,
-								formtoken: formtoken
-							},
-							success: function(data) {
-								if(data.success) {
-									$('#table-row-transmittalitem-'+id).hide('slow');
-									noty({
-										text: msg,
-										type: 'success',
-										dismissQueue: true,
-										layout: 'topRight',
-										theme: 'defaultTheme',
-										timeout: 1500,
-									});
-								} else {
-									noty({
-										text: data.message,
-										type: 'error',
-										dismissQueue: true,
-										layout: 'topRight',
-										theme: 'defaultTheme',
-										timeout: 3500,
-									});
-								}
-							},
-						});
-					}
-				}, {
-					\"label\" : \"".getMLText("cancel")."\",
-					\"class\" : \"btn-cancel\",
-					\"callback\": function() {
-					}
-				}]);
-			});
-		});
-		";
-	} /* }}} */
-
 	protected function showTransmittalForm($transmittal) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
diff --git a/views/bootstrap/trait.TransmittalDeleteButton.php b/views/bootstrap/trait.TransmittalDeleteButton.php
new file mode 100644
index 000000000..ea08ca647
--- /dev/null
+++ b/views/bootstrap/trait.TransmittalDeleteButton.php
@@ -0,0 +1,81 @@
+<?php
+
+trait TransmittalDeleteButton {
+	/**
+	 * Print button with link for deleting a transmittal item
+	 *
+	 * This button works just like the printDeleteDocumentButton()
+	 *
+	 * @param object $item transmittal item to be deleted
+	 * @param string $msg message shown in case of successful deletion
+	 * @param boolean $return return html instead of printing it
+	 * @return string html content if $return is true, otherwise an empty string
+	 */
+	protected function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
+		$itemid = $item->getID();
+		$content = '';
+    $content .= '<a class="delete-transmittalitem-btn" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
+		if($return)
+			return $content;
+		else
+			echo $content;
+		return '';
+	} /* }}} */
+
+	protected function printDeleteItemButtonJs(){ /* {{{ */
+		echo "
+		$(document).ready(function () {
+			$('body').on('click', 'a.delete-transmittalitem-btn', function(ev){
+				id = $(ev.currentTarget).attr('rel');
+				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
+				msg = $(ev.currentTarget).attr('msg');
+				formtoken = '".createFormKey('removetransmittalitem')."';
+				bootbox.dialog(confirmmsg, [{
+					\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_transmittalitem")."\",
+					\"class\" : \"btn-danger\",
+					\"callback\": function() {
+						$.ajax('../op/op.TransmittalMgr.php', {
+							type:'POST',
+							async:true,
+							dataType:'json',
+							data: {
+								action: 'removetransmittalitem',
+								id: id,
+								formtoken: formtoken
+							},
+							success: function(data) {
+								if(data.success) {
+									$('#table-row-transmittalitem-'+id).hide('slow');
+									noty({
+										text: msg,
+										type: 'success',
+										dismissQueue: true,
+										layout: 'topRight',
+										theme: 'defaultTheme',
+										timeout: 1500,
+									});
+								} else {
+									noty({
+										text: data.message,
+										type: 'error',
+										dismissQueue: true,
+										layout: 'topRight',
+										theme: 'defaultTheme',
+										timeout: 3500,
+									});
+								}
+							},
+						});
+					}
+				}, {
+					\"label\" : \"".getMLText("cancel")."\",
+					\"class\" : \"btn-cancel\",
+					\"callback\": function() {
+					}
+				}]);
+			});
+		});
+		";
+	} /* }}} */
+
+}
diff --git a/views/bootstrap/trait.TransmittalUpdateButton.php b/views/bootstrap/trait.TransmittalUpdateButton.php
new file mode 100644
index 000000000..85937b5cb
--- /dev/null
+++ b/views/bootstrap/trait.TransmittalUpdateButton.php
@@ -0,0 +1,79 @@
+<?php
+
+trait TransmittalUpdateButton {
+	/**
+	 * Print button for updating the transmittal item to the newest version
+	 *
+	 * @param object $item
+	 * @param string $msg message shown in case of successful update
+	 */
+	protected function printUpdateItemButton($item, $msg, $return=false){ /* {{{ */
+		$itemid = $item->getID();
+		$content = '';
+    $content .= '<a class="update-transmittalitem-btn" transmittal="'.$item->getTransmittal()->getID().'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-refresh"></i></a>';
+		if($return)
+			return $content;
+		else
+			echo $content;
+		return '';
+	} /* }}} */
+
+	protected function printUpdateItemButtonJs(){ /* {{{ */
+		echo "
+		$(document).ready(function () {
+			$('body').on('click', 'a.update-transmittalitem-btn', function(ev){
+				ev.stopPropagation();
+				id = $(ev.currentTarget).attr('rel');
+				transmittalid = $(ev.currentTarget).attr('transmittal');
+				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
+				msg = $(ev.currentTarget).attr('msg');
+				formtoken = '".createFormKey('updatetransmittalitem')."';
+				bootbox.dialog(confirmmsg, [{
+					\"label\" : \"<i class='fa fa-refresh'></i> ".getMLText("update_transmittalitem")."\",
+					\"class\" : \"btn-danger\",
+					\"callback\": function() {
+						$.ajax('../op/op.TransmittalMgr.php', {
+							type:'POST',
+							async:true,
+							dataType:'json',
+							data: {
+								action: 'updatetransmittalitem',
+								id: id,
+								formtoken: formtoken
+							},
+							success: function(data) {
+								if(data.success) {
+									noty({
+										text: msg,
+										type: 'success',
+										dismissQueue: true,
+										layout: 'topRight',
+										theme: 'defaultTheme',
+										timeout: 1500,
+									});
+									$('div.ajax').trigger('update', {transmittalid: transmittalid});
+								} else {
+									noty({
+										text: data.message,
+										type: 'error',
+										dismissQueue: true,
+										layout: 'topRight',
+										theme: 'defaultTheme',
+										timeout: 3500,
+									});
+								}
+							}
+						});
+					}
+				}, {
+					\"label\" : \"".getMLText("cancel")."\",
+					\"class\" : \"btn-cancel\",
+					\"callback\": function() {
+					}
+				}]);
+			});
+		});
+		";
+	} /* }}} */
+
+}
diff --git a/views/bootstrap4/trait.TransmittalDeleteButton.php b/views/bootstrap4/trait.TransmittalDeleteButton.php
new file mode 100644
index 000000000..8dd8fa9db
--- /dev/null
+++ b/views/bootstrap4/trait.TransmittalDeleteButton.php
@@ -0,0 +1,90 @@
+<?php
+
+trait TransmittalDeleteButton {
+	/**
+	 * Print button with link for deleting a transmittal item
+	 *
+	 * This button works just like the printDeleteDocumentButton()
+	 *
+	 * @param object $item transmittal item to be deleted
+	 * @param string $msg message shown in case of successful deletion
+	 * @param boolean $return return html instead of printing it
+	 * @return string html content if $return is true, otherwise an empty string
+	 */
+	protected function printDeleteItemButton($item, $msg, $return=false){ /* {{{ */
+		$itemid = $item->getID();
+		$content = '';
+    $content .= '<a class="delete-transmittalitem-btn" transmittal="'.$item->getTransmittal()->getID().'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_rm_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-remove"></i></a>';
+		if($return)
+			return $content;
+		else
+			echo $content;
+		return '';
+	} /* }}} */
+
+	protected function printDeleteItemButtonJs(){ /* {{{ */
+		echo "
+		$(document).ready(function () {
+			$('body').on('click', 'a.delete-transmittalitem-btn', function(ev){
+				ev.stopPropagation();
+				id = $(ev.currentTarget).attr('rel');
+				transmittalid = $(ev.currentTarget).attr('transmittal');
+				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
+				msg = $(ev.currentTarget).attr('msg');
+				formtoken = '".createFormKey('removetransmittalitem')."';
+				bootbox.confirm({
+					\"message\": confirmmsg,
+					\"buttons\": {
+						\"confirm\": {
+							\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("rm_transmittalitem")."\",
+							\"className\" : \"btn-danger\",
+						},
+						\"cancel\": {
+							\"label\" : \"".getMLText("cancel")."\",
+							\"className\" : \"btn-secondary\",
+						}
+					},
+					\"callback\": function(result) {
+						if(result) {
+							$.ajax('".$this->params['settings']->_httpRoot."../op/op.TransmittalMgr.php', {
+								type:'POST',
+								async:true,
+								dataType:'json',
+								data: {
+									action: 'removetransmittalitem',
+									id: id,
+									formtoken: formtoken
+								},
+								success: function(data) {
+									if(data.success) {
+										$('#table-row-transmittalitem-'+id).hide('slow');
+										noty({
+											text: msg,
+											type: 'success',
+											dismissQueue: true,
+											layout: 'topRight',
+											theme: 'defaultTheme',
+											timeout: 1500,
+										});
+										$('div.ajax').trigger('update', {transmittalid: transmittalid});
+									} else {
+										noty({
+											text: data.message,
+											type: 'error',
+											dismissQueue: true,
+											layout: 'topRight',
+											theme: 'defaultTheme',
+											timeout: 3500,
+										});
+									}
+								},
+							});
+						}
+					}
+				});
+			});
+		});
+		";
+	} /* }}} */
+
+}
diff --git a/views/bootstrap4/trait.TransmittalUpdateButton.php b/views/bootstrap4/trait.TransmittalUpdateButton.php
new file mode 100644
index 000000000..0698dfff5
--- /dev/null
+++ b/views/bootstrap4/trait.TransmittalUpdateButton.php
@@ -0,0 +1,86 @@
+<?php
+
+trait TransmittalUpdateButton {
+	/**
+	 * Print button for updating the transmittal item to the newest version
+	 *
+	 * @param object $item
+	 * @param string $msg message shown in case of successful update
+	 */
+	protected function printUpdateItemButton($item, $msg, $return=false){ /* {{{ */
+		$itemid = $item->getID();
+		$content = '';
+    $content .= '<a class="update-transmittalitem-btn" transmittal="'.$item->getTransmittal()->getID().'" rel="'.$itemid.'" msg="'.htmlspecialchars($msg, ENT_QUOTES).'" confirmmsg="'.htmlspecialchars(getMLText("confirm_update_transmittalitem"), ENT_QUOTES).'"><i class="fa fa-refresh"></i></a>';
+		if($return)
+			return $content;
+		else
+			echo $content;
+		return '';
+	} /* }}} */
+
+	protected function printUpdateItemButtonJs(){ /* {{{ */
+		echo "
+		$(document).ready(function () {
+			$('body').on('click', 'a.update-transmittalitem-btn', function(ev){
+				ev.stopPropagation();
+				id = $(ev.currentTarget).attr('rel');
+				transmittalid = $(ev.currentTarget).attr('transmittal');
+				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
+				msg = $(ev.currentTarget).attr('msg');
+				formtoken = '".createFormKey('updatetransmittalitem')."';
+				bootbox.dialog({
+					\"message\": confirmmsg,
+					\"buttons\": {
+						\"confirm\": {
+							\"label\" : \"<i class='fa fa-remove'></i> ".getMLText("update_transmittalitem")."\",
+							\"className\" : \"btn-danger\",
+						},
+						\"cancel\": {
+							\"label\" : \"".getMLText("cancel")."\",
+							\"className\" : \"btn-secondary\",
+						}
+					},
+					\"callback\": function(result) {
+						if(result) {
+							$.ajax('".$this->params['settings']->_httpRoot."../op/op.TransmittalMgr.php', {
+								type:'POST',
+								async:true,
+								dataType:'json',
+								data: {
+									action: 'updatetransmittalitem',
+									id: id,
+									formtoken: formtoken
+								},
+								success: function(data) {
+									if(data.success) {
+										noty({
+											text: msg,
+											type: 'success',
+											dismissQueue: true,
+											layout: 'topRight',
+											theme: 'defaultTheme',
+											timeout: 1500,
+										});
+										$('div.ajax').trigger('update', {transmittalid: transmittalid});
+									} else {
+										noty({
+											text: data.message,
+											type: 'error',
+											dismissQueue: true,
+											layout: 'topRight',
+											theme: 'defaultTheme',
+											timeout: 3500,
+										});
+									}
+								}
+							});
+						}
+					}
+				});
+			});
+		});
+		";
+	} /* }}} */
+
+}
+

From a5a2b877cea0d394f5705e65ed4318300713f2e5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Mar 2022 16:12:23 +0100
Subject: [PATCH 1529/2006] add entry for 6.0.18

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index c824ed8f0..fc9a8abc4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - finish op/op.Cron.php, returns json
 - merge changes up to 5.1.25
 - fix sending trigger workflow notification (Closes: #522)
+- fix updating und deleting items in document lists
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.17

From 11942c825d2ad591183c1c529c66f5441bb5d434 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 25 Mar 2022 07:21:37 +0100
Subject: [PATCH 1530/2006] filename can be passed to addItem()

---
 inc/inc.ClassDownloadMgr.php | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 2dfc6705d..e6636ab0e 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -46,6 +46,18 @@ class SeedDMS_Download_Mgr {
 	 */
 	protected $extracols;
 
+	/**
+	 * @var array $rawcontents list of content used instead of document content
+	 * @access protected
+	 */
+	protected $rawcontents;
+
+	/**
+	 * @var array $filenames filename used in archive
+	 * @access protected
+	 */
+	protected $filnames;
+
 	function __construct($tmpdir = '') {
 		$this->tmpdir = $tmpdir;
 		$this->items = array();
@@ -59,10 +71,11 @@ class SeedDMS_Download_Mgr {
 		$this->extraheader = $extraheader;
 	} /* }}} */
 
-	public function addItem($item, $extracols=array(), $rawcontent='') { /* {{{ */
+	public function addItem($item, $extracols=array(), $rawcontent='', $filename='') { /* {{{ */
 		$this->items[$item->getID()] = $item;
 		$this->extracols[$item->getID()] = $extracols;
 		$this->rawcontents[$item->getID()] = $rawcontent;
+		$this->filenames[$item->getID()] = $filename;
 	} /* }}} */
 
 	public function createToc($file) { /* {{{ */
@@ -190,14 +203,19 @@ class SeedDMS_Download_Mgr {
 		foreach($this->items as $item) {
 			$document = $item->getDocument();
 			$dms = $document->_dms;
-			$ext = pathinfo($document->getName(), PATHINFO_EXTENSION);
-			$oext = pathinfo($item->getOriginalFileName(), PATHINFO_EXTENSION);
-			if($ext == $oext)
-				$filename = preg_replace('/[^A-Za-z0-9_.-]/', '_', $document->getName());
-			else {
-				$filename = preg_replace('/[^A-Za-z0-9_-]/', '_', $document->getName()).'.'.$oext;
+			if($this->filenames[$item->getID()]) {
+				$filename = $this->filenames[$item->getID()];
+			} else {
+				$ext = pathinfo($document->getName(), PATHINFO_EXTENSION);
+				$oext = pathinfo($item->getOriginalFileName(), PATHINFO_EXTENSION);
+				if($ext == $oext)
+					$filename = preg_replace('/[^A-Za-z0-9_.-]/', '_', $document->getName());
+				else {
+					$filename = preg_replace('/[^A-Za-z0-9_-]/', '_', $document->getName()).'.'.$oext;
+				}
+				$filename = $document->getID().'-'.$item->getVersion().'-'.$filename; //$lc->getOriginalFileName();
 			}
-			$filename = $prefixdir."/".$document->getID().'-'.$item->getVersion().'-'.$filename; //$lc->getOriginalFileName();
+			$filename = $prefixdir."/".$filename;
 			if($this->rawcontents[$item->getID()]) {
 				$zip->addFromString(utf8_decode($filename), $this->rawcontents[$item->getID()]);
 			} else

From 6de426bbc3626f7ecb378bcd33ab495517c75891 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 25 Mar 2022 08:44:32 +0100
Subject: [PATCH 1531/2006] call hook 'filenameDownloadItem' in search export
 and transmittal download

---
 CHANGELOG                                 | 1 +
 controllers/class.TransmittalDownload.php | 5 +++--
 views/bootstrap/class.Search.php          | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6dafb8435..671a0e782 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - merge changes up to 5.1.25
 - fix sending trigger workflow notification (Closes: #522)
 - fix updating und deleting items in document lists
+- call hook 'filenameDownloadItem' in search export and transmittal download
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.17
diff --git a/controllers/class.TransmittalDownload.php b/controllers/class.TransmittalDownload.php
index 13ab05f4d..24b3c10a9 100644
--- a/controllers/class.TransmittalDownload.php
+++ b/controllers/class.TransmittalDownload.php
@@ -39,10 +39,11 @@ class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
 				$document = $content->getDocument();
 				if ($document->getAccessMode($user) >= M_READ) {
 					$extracols = $this->callHook('extraDownloadColumns', $document);
+					$filename = $this->callHook('filenameDownloadItem', $content);
 					if($rawcontent = $this->callHook('rawcontent', $content)) {
-						$downmgr->addItem($content, $extracols, $rawcontent);
+						$downmgr->addItem($content, $extracols, $rawcontent, $filename);
 					} else
-						$downmgr->addItem($content, $extracols);
+						$downmgr->addItem($content, $extracols, null, $filename);
 				}
 			}
 
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index ab7094418..6c5401112 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -92,10 +92,11 @@ $(document).ready(function() {
 		foreach($entries as $entry) {
 			if($entry->isType('document')) {
 				$extracols = $this->callHook('extraDownloadColumns', $entry);
+				$filename = $this->callHook('filenameDownloadItem', $entry->getLatestContent());
 				if($includecontent && $rawcontent = $this->callHook('rawcontent', $entry->getLatestContent())) {
-					$downmgr->addItem($entry->getLatestContent(), $extracols, $rawcontent);
+					$downmgr->addItem($entry->getLatestContent(), $extracols, $rawcontent, $filename);
 				} else
-					$downmgr->addItem($entry->getLatestContent(), $extracols);
+					$downmgr->addItem($entry->getLatestContent(), $extracols, null, $filename);
 			}
 		}
 		$filename = tempnam(sys_get_temp_dir(), '');

From 283d051d3a8d6b5779a1fd41f18e6c769411bd17 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Mar 2022 17:36:20 +0200
Subject: [PATCH 1532/2006] initial code to check for upcomming events in
 calendar

---
 inc/inc.Tasks.php | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 80ae27646..44efbb474 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -475,7 +475,47 @@ class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	}
 } /* }}} */
 
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  core
+ */
+class SeedDMS_CalendarTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
+
+	/**
+	 * Run the task
+	 *
+	 * @param $task task to be executed
+	 * @param $dms dms
+	 * @return boolean true if task was executed succesfully, otherwise false
+	 */
+	public function execute(SeedDMS_SchedulerTask $task) {
+		$dms = $this->dms;
+		$user = $this->user;
+		$logger = $this->logger;
+		$settings = $this->settings;
+		$taskparams = $task->getParameter();
+
+		$calendar = new SeedDMS_Calendar($dms->getDB(), $user);
+		$events = $calendar->getEventsInInterval(mktime(0,0,0, $start[1], $start[2], $start[0]), mktime(23,59,59, $end[1], $end[2], $end[0]));
+
+		return true;
+	}
+
+	public function getDescription() {
+		return 'Check calendar for upcoming events';
+	}
+
+	public function getAdditionalParams() {
+		return array(
+		);
+	}
+} /* }}} */
+
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = 'SeedDMS_ExpiredDocumentsTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['indexingdocs'] = 'SeedDMS_IndexingDocumentsTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['checksum'] = 'SeedDMS_CheckSumTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['preview'] = 'SeedDMS_PreviewTask';
+//$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['calendar'] = 'SeedDMS_CalendarTask';

From 9e92524fdbd1e7c3e6771d669f140c62389ec375 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Mar 2022 21:33:48 +0200
Subject: [PATCH 1533/2006] escape role name to prevent xss attack

---
 views/bootstrap/class.UsrMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index c56c1af47..b953b3800 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -351,7 +351,7 @@ $(document).ready( function() {
 		);
 		$options = array();
 		foreach($roles as $role) {
-			$options[] = array($role->getID(), $role->getName(), ($currUser && $currUser->getRole()->getID() == $role->getID()));
+			$options[] = array($role->getID(), htmlspecialchars($role->getName()), ($currUser && $currUser->getRole()->getID() == $role->getID()));
 		}
 		$this->formField(
 			getMLText("role"),

From 687d7eb0dd031e7ab03ea427a30082ac11345555 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Mar 2022 21:34:48 +0200
Subject: [PATCH 1534/2006] add entry for 6.0.18

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1503f85ec..296dcb592 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - fix sending trigger workflow notification (Closes: #522)
 - fix updating und deleting items in document lists
 - call hook 'filenameDownloadItem' in search export and transmittal download
+- fix possible xss attack in UsrMgr
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.17

From 6f4a1bab680cfc29597cea83bcac46703959f442 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 31 Mar 2022 06:36:48 +0200
Subject: [PATCH 1535/2006] make methods public, add methods getUser() and
 setUser()

---
 inc/inc.ClassCalendar.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/inc/inc.ClassCalendar.php b/inc/inc.ClassCalendar.php
index f537c52de..65ef21f5d 100644
--- a/inc/inc.ClassCalendar.php
+++ b/inc/inc.ClassCalendar.php
@@ -33,12 +33,20 @@ class SeedDMS_Calendar {
 	 */
 	protected $db;
 
-	function __construct($db, $user) {
+	public function __construct($db, $user) { /* {{{ */
 		$this->db = $db;
 		$this->user = $user;
-	}
+	} /* }}} */
 
-	function getEvents($day, $month, $year) { /* {{{ */
+	public function setUser($user) { /* {{{ */
+		$this->user = $user;
+	} /* }}} */
+
+	public function getUser() { /* {{{ */
+		return $this->user;
+	} /* }}} */
+
+	public function getEvents($day, $month, $year) { /* {{{ */
 		$date = mktime(12,0,0, $month, $day, $year);
 		
 		$queryStr = "SELECT * FROM `tblEvents` WHERE `start` <= " . $date . " AND `stop` >= " . $date;
@@ -49,7 +57,7 @@ class SeedDMS_Calendar {
 		return $ret;
 	} /* }}} */
 
-	function getEventsInInterval($start, $stop) { /* {{{ */
+	public function getEventsInInterval($start, $stop) { /* {{{ */
 		$queryStr = "SELECT * FROM `tblEvents` WHERE ( `start` <= " . (int) $start . " AND `stop` >= " . (int) $start . " ) ".
 																					 "OR ( `start` <= " . (int) $stop . " AND `stop` >= " . (int) $stop . " ) ".
 																					 "OR ( `start` >= " . (int) $start . " AND `stop` <= " . (int) $stop . " )";
@@ -60,7 +68,7 @@ class SeedDMS_Calendar {
 		return $ret;
 	} /* }}} */
 
-	function addEvent($from, $to, $name, $comment ) { /* {{{ */
+	public function addEvent($from, $to, $name, $comment ) { /* {{{ */
 		$queryStr = "INSERT INTO `tblEvents` (`name`, `comment`, `start`, `stop`, `date`, `userID`) VALUES ".
 			"(".$this->db->qstr($name).", ".$this->db->qstr($comment).", ".(int) $from.", ".(int) $to.", ".$this->db->getCurrentTimestamp().", ".$this->user->getID().")";
 		
@@ -68,7 +76,7 @@ class SeedDMS_Calendar {
 		return $ret;
 	} /* }}} */
 
-	function getEvent($id) { /* {{{ */
+	public function getEvent($id) { /* {{{ */
 		if (!is_numeric($id)) return false;
 
 		$queryStr = "SELECT * FROM `tblEvents` WHERE `id` = " . (int) $id;
@@ -80,7 +88,7 @@ class SeedDMS_Calendar {
 		return $ret[0];	
 	} /* }}} */
 
-	function editEvent($id, $from, $to=null, $name=null, $comment=null) { /* {{{ */
+	public function editEvent($id, $from, $to=null, $name=null, $comment=null) { /* {{{ */
 		if (!is_numeric($id)) return false;
 		
 		$queryStr = "UPDATE `tblEvents` SET `start` = " . (int) $from . ($to !== null ? ", `stop` = " . (int) $to : '') . ($name !== null ? ", `name` = " . $this->db->qstr($name) : '') . ($comment !== null ? ", `comment` = " . $this->db->qstr($comment) : '') . ", `date` = " . $this->db->getCurrentTimestamp() . " WHERE `id` = ". (int) $id;
@@ -88,7 +96,7 @@ class SeedDMS_Calendar {
 		return $ret;
 	} /* }}} */
 
-	function delEvent($id) { /* {{{ */
+	public function delEvent($id) { /* {{{ */
 		if (!is_numeric($id)) return false;
 		
 		$queryStr = "DELETE FROM `tblEvents` WHERE `id` = " . (int) $id;

From 43fe015049a51eb70505e50410eb97e5f84f1788 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 31 Mar 2022 06:48:05 +0200
Subject: [PATCH 1536/2006] add task to informa about upcoming events

---
 inc/inc.Tasks.php | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 44efbb474..bc2712589 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -497,9 +497,45 @@ class SeedDMS_CalendarTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		$logger = $this->logger;
 		$settings = $this->settings;
 		$taskparams = $task->getParameter();
+		$tableformat = " %-10s %5d %-60s";
+		$tableformathead = " %-10s %5s %-60s";
+		$tableformathtml = "<tr><td>%s</td><td>%d</td><td>%s</td></tr>";
+		$tableformatheadhtml = "<tr><th>%s</th><th>%s</th><th>%s</th></tr>";
 
-		$calendar = new SeedDMS_Calendar($dms->getDB(), $user);
-		$events = $calendar->getEventsInInterval(mktime(0,0,0, $start[1], $start[2], $start[0]), mktime(23,59,59, $end[1], $end[2], $end[0]));
+		require_once('inc/inc.ClassEmailNotify.php');
+		require_once('inc/inc.ClassCalendar.php');
+		$email = new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+
+		$calendar = new SeedDMS_Calendar($dms->getDB(), null);
+		$allusers = $dms->getAllUsers();
+		foreach($allusers as $auser) {
+			if(!$auser->isAdmin() && !$auser->isGuest() && !$auser->isDisabled() && $auser->getEmail()) {
+				$body = ''.$auser->getLogin()." <".$auser->getEmail().">\n\n";
+				$bodyhtml = '<p>'.$auser->getLogin()." &lt;".$auser->getEmail()."&gt;</p>";
+				$calendar->setUser($auser);
+				$start = mktime(0,0,0, date('m'), date('d'), date('Y'));
+				$events = $calendar->getEventsInInterval($start, $start+7*86400);
+				if($events && count($events)>0) {
+					$bodyhtml .= "<table>".PHP_EOL;
+					$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("date", array(), ""), "ID", getMLText("name", array(), ""));
+					$body .= sprintf($tableformathead."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
+					$body .= "---------------------------------------------------------------------------------\n";
+					foreach($events as $event) {
+						$body .= sprintf($tableformat."\n", getReadableDate($event['start']), 1, $event['name']);
+						$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($event['start']), 1, $event['name']);
+					}
+					$bodyhtml .= "</table>".PHP_EOL;
+					$params = array();
+					$params['count'] = count($events);
+					$params['__body__'] = $body;
+					$params['__body_html__'] = $bodyhtml;
+					$params['sitename'] = $settings->_siteName;
+					$email->toIndividual('', $auser, 'calendar_events_mail_subject', '', $params);
+
+					$logger->log('Task \'calendar_events\': Sending reminder \'calender_events_mail_subject\' to user \''.$auser->getLogin().'\'', PEAR_LOG_INFO);
+				}
+			}
+		}
 
 		return true;
 	}
@@ -518,4 +554,4 @@ $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = 'SeedDMS_Expired
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['indexingdocs'] = 'SeedDMS_IndexingDocumentsTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['checksum'] = 'SeedDMS_CheckSumTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['preview'] = 'SeedDMS_PreviewTask';
-//$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['calendar'] = 'SeedDMS_CalendarTask';
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['calendar'] = 'SeedDMS_CalendarTask';

From d80d1be9dee67f06536dd5ca2f9847c70c235032 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 4 Apr 2022 08:42:26 +0200
Subject: [PATCH 1537/2006] include inc.ClassAccessOperation.php because it is
 need at many places and the back button of the ErrorDlg works again

---
 inc/inc.ClassUI.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 638848884..53919d74e 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -20,6 +20,7 @@
 
 require_once('inc.ClassUI_Default.php');
 require_once('inc.ClassViewCommon.php');
+require_once('inc.ClassAccessOperation.php');
 
 /* $theme was possibly set in inc.Authentication.php */
 if (!isset($theme) || strlen($theme)==0) {
@@ -185,11 +186,9 @@ class UI extends UI_Default {
 
 	static function exitError($pagetitle, $error, $noexit=false, $plain=false) {
 		global $theme, $dms, $user, $settings;
-		$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 		$view = UI::factory($theme, 'ErrorDlg');
 		$view->setParam('dms', $dms);
 		$view->setParam('user', $user);
-		$view->setParam('accessobject', $accessop);
 		$view->setParam('pagetitle', $pagetitle);
 		$view->setParam('errormsg', $error);
 		$view->setParam('plain', $plain);

From f8ac9090fb3b3a8939ea9c69dd3361babae93063 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Apr 2022 19:54:46 +0200
Subject: [PATCH 1538/2006] add optional parameter to getWorkflow() to retrieve
 data from tblWorkflowDocumentContent

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 15 ++++++++++-----
 SeedDMS_Core/package.xml                |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index ad1765462..4a0df531f 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -6323,19 +6323,21 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	 * id from table tblWorkflowDocumentContent which is used to
 	 * get log entries for this workflow.
 	 * This method will only get a currently running workflow in
-	 * a state. Once
+	 * a state. Once a
 	 * workflow has ended, the current state of the workflow was
 	 * set to null.
 	 *
+	 * @param bool $full return not just workflow but the data from
+	 *        tblWorkflowDocumentContent too
 	 * @return object/boolean an object of class SeedDMS_Core_Workflow
 	 *         or false in case of error, e.g. the version has not a workflow
 	 */
-	function getWorkflow() { /* {{{ */
+	function getWorkflow($full = false) { /* {{{ */
 		$db = $this->_document->getDMS()->getDB();
 
 		if (!$this->_workflow) {
 			$queryStr=
-				"SELECT a.`id` as `wdcid`, a.`parent`, b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.`id` WHERE a.`version`='".$this->_version
+				"SELECT a.`id` as `wdcid`, a.`parent`, a.`date`, b.* FROM `tblWorkflowDocumentContent` a LEFT JOIN `tblWorkflows` b ON a.`workflow` = b.`id` WHERE a.`version`='".$this->_version
 				."' AND a.`document` = '". $this->_document->getID() ."' "
 				." AND a.`state` IS NOT NULL"
 				." ORDER BY `date` DESC LIMIT 1";
@@ -6344,10 +6346,13 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 			if(!$recs)
 				return false;
-			$this->_workflow = array('id'=>(int)$recs[0]['wdcid'], 'parent'=>(int)$recs[0]['parent'], 'workflow'=>new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->getDMS()->getWorkflowState($recs[0]['initstate']), $recs[0]["layoutdata"]));
+			$this->_workflow = array('id'=>(int)$recs[0]['wdcid'], 'parent'=>(int)$recs[0]['parent'], 'date'=>$recs[0]['date'], 'workflow'=>new SeedDMS_Core_Workflow($recs[0]['id'], $recs[0]['name'], $this->_document->getDMS()->getWorkflowState($recs[0]['initstate']), $recs[0]["layoutdata"]));
 			$this->_workflow['workflow']->setDMS($this->_document->getDMS());
 		}
-		return $this->_workflow['workflow'];
+		if($full)
+			return $this->_workflow;
+		else
+			return $this->_workflow['workflow'];
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index d1de912fa..136a2fbff 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2022-02-18</date>
+ <date>2022-04-06</date>
  <time>13:44:55</time>
  <version>
   <release>6.0.18</release>
@@ -30,6 +30,7 @@
 - add SeedDMS_Core_File::fileExtension()
 - add callbacks on onPostUpdateAttribute, onPostRemoveAttribute, onPostAddAttribute
 - fix searching for document content with a custom attribute having a value set
+- SeedDMS_Core_DocumentContent::getWorkflow() has optional parameter to return data from table tblWorkflowDocumentContent
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 202e6079594bd04897e549a339559e126e2b14a7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 12 Apr 2022 07:15:56 +0200
Subject: [PATCH 1539/2006] include files with require_once, check if $settings
 are set already

---
 out/out.Acl.php               | 19 +++++++++++--------
 out/out.AddToTransmittal.php  | 19 ++++++++++---------
 out/out.CheckInDocument.php   | 19 ++++++++++---------
 out/out.ReceiptDocument.php   | 19 ++++++++++---------
 out/out.ReceiptSummary.php    | 18 ++++++++++--------
 out/out.RemoveTransmittal.php | 17 ++++++++++-------
 out/out.ReviseDocument.php    | 19 ++++++++++---------
 out/out.RoleMgr.php           | 17 ++++++++++-------
 out/out.SchedulerTaskMgr.php  | 22 ++++++++++++----------
 out/out.SetRecipients.php     | 19 ++++++++++---------
 out/out.SetRevisors.php       | 19 ++++++++++---------
 out/out.TimelineFeed.php      | 17 ++++++++++-------
 out/out.TransmittalMgr.php    | 17 ++++++++++-------
 13 files changed, 133 insertions(+), 108 deletions(-)

diff --git a/out/out.Acl.php b/out/out.Acl.php
index f6665ef48..a6b653371 100644
--- a/out/out.Acl.php
+++ b/out/out.Acl.php
@@ -16,14 +16,17 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAcl.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.ClassAcl.php");
+require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.AddToTransmittal.php b/out/out.AddToTransmittal.php
index a6602608e..ac5eda233 100644
--- a/out/out.AddToTransmittal.php
+++ b/out/out.AddToTransmittal.php
@@ -19,15 +19,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Utils.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAccessOperation.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php
index 07d9cc31b..3aefdb7b9 100644
--- a/out/out.CheckInDocument.php
+++ b/out/out.CheckInDocument.php
@@ -16,15 +16,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Utils.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAccessOperation.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
diff --git a/out/out.ReceiptDocument.php b/out/out.ReceiptDocument.php
index be568e690..85f0a6878 100644
--- a/out/out.ReceiptDocument.php
+++ b/out/out.ReceiptDocument.php
@@ -18,15 +18,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Utils.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAccessOperation.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.ReceiptSummary.php b/out/out.ReceiptSummary.php
index db3e4e26e..dfe5c8c55 100644
--- a/out/out.ReceiptSummary.php
+++ b/out/out.ReceiptSummary.php
@@ -19,14 +19,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.RemoveTransmittal.php b/out/out.RemoveTransmittal.php
index b060ff4d6..33d3c5ab0 100644
--- a/out/out.RemoveTransmittal.php
+++ b/out/out.RemoveTransmittal.php
@@ -18,13 +18,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.ReviseDocument.php b/out/out.ReviseDocument.php
index 66792e9b6..9f8f9346b 100644
--- a/out/out.ReviseDocument.php
+++ b/out/out.ReviseDocument.php
@@ -18,15 +18,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Utils.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAccessOperation.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
diff --git a/out/out.RoleMgr.php b/out/out.RoleMgr.php
index 1c720d2a8..178b071d8 100644
--- a/out/out.RoleMgr.php
+++ b/out/out.RoleMgr.php
@@ -18,13 +18,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.SchedulerTaskMgr.php b/out/out.SchedulerTaskMgr.php
index 14d95d766..3b365b0ce 100644
--- a/out/out.SchedulerTaskMgr.php
+++ b/out/out.SchedulerTaskMgr.php
@@ -16,16 +16,18 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Version.php");
-include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.Scheduler.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.Version.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.Scheduler.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.SetRecipients.php b/out/out.SetRecipients.php
index 5d73d66c2..986ec4315 100644
--- a/out/out.SetRecipients.php
+++ b/out/out.SetRecipients.php
@@ -19,15 +19,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Utils.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAccessOperation.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.SetRevisors.php b/out/out.SetRevisors.php
index f9c9cf993..bbd4c87d2 100644
--- a/out/out.SetRevisors.php
+++ b/out/out.SetRevisors.php
@@ -19,15 +19,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Utils.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAccessOperation.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.TimelineFeed.php b/out/out.TimelineFeed.php
index fc2a33665..000efd52a 100644
--- a/out/out.TimelineFeed.php
+++ b/out/out.TimelineFeed.php
@@ -16,13 +16,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.BasicAuthentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.BasicAuthentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index 04374a534..22aac353f 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -18,13 +18,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.Authentication.php");
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
 
 require_once("../views/".$theme."/trait.TransmittalUpdateButton.php");
 require_once("../views/".$theme."/trait.TransmittalDeleteButton.php");

From 34c71328471cb43b37f934e33a305a1508a4f647 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Apr 2022 21:35:45 +0200
Subject: [PATCH 1540/2006] translate '2_factor_auth'

---
 views/bootstrap/class.Bootstrap.php   | 2 +-
 views/bootstrap4/class.Bootstrap4.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index a2f868172..e50334995 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -881,7 +881,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		if ($accessobject->check_view_access('ManageNotify'))
 			$menuitems['edit_notify'] = array('link'=>$this->params['settings']->_httpRoot."out/out.ManageNotify.php", 'label'=>getMLText('edit_existing_notify'));
 
-		$menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'2_factor_auth');
+		$menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>getMLText('2_factor_auth'));
 
 		if ($this->params['enableusersview']){
 			if ($accessobject->check_view_access('UsrView'))
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 7d6090cb9..be10910a4 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -794,7 +794,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		if ($accessobject->check_view_access('ManageNotify'))
 			$menuitems['edit_notify'] = array('link'=>$this->params['settings']->_httpRoot."out/out.ManageNotify.php", 'label'=>getMLText('edit_existing_notify'));
 
-		$menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>'2_factor_auth');
+		$menuitems['2_factor_auth'] = array('link'=>"../out/out.Setup2Factor.php", 'label'=>getMLText('2_factor_auth'));
 
 		if ($this->params['enableusersview']){
 			if ($accessobject->check_view_access('UsrView'))

From b854d64757e83ed57629dbd48305b42a2aa6ece2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 29 Apr 2022 07:04:52 +0200
Subject: [PATCH 1541/2006] fix merge errors

---
 CHANGELOG | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 910d2e333..78c4f1a51 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 --------------------------------------------------------------------------------
-<<<<<<< HEAD
+                     Changes in version 6.0.19
+--------------------------------------------------------------------------------
+- merge changes up to 5.1.26
+
+--------------------------------------------------------------------------------
                      Changes in version 6.0.18
 --------------------------------------------------------------------------------
 - finish op/op.Cron.php, returns json
@@ -7,7 +11,7 @@
 - fix sending trigger workflow notification (Closes: #522)
 - fix updating und deleting items in document lists
 - call hook 'filenameDownloadItem' in search export and transmittal download
-- fix possible xss attack in UsrMgr
+- fix possible xss attack in UsrMgr (CVE-2022-28479)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.17
@@ -217,10 +221,10 @@
 - add access controll list for many functions
 - add document list which can be exported as an archive
 - search results can be exported
-=======
+
+--------------------------------------------------------------------------------
                      Changes in version 5.1.26
 --------------------------------------------------------------------------------
->>>>>>> seeddms-5.1.x
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.25

From 49c2e54e942d5370e4155e95bc45a8ed821df649 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 30 Apr 2022 14:50:08 +0200
Subject: [PATCH 1542/2006] add missing status to getOverallStatusIcon()

---
 views/bootstrap/class.Bootstrap.php   | 9 +++++++++
 views/bootstrap4/class.Bootstrap4.php | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 226bbfa05..894056853 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1415,6 +1415,15 @@ function getOverallStatusIcon($status) { /* {{{ */
 			case S_EXPIRED:
 				$icon = 'fa-circle expired';
 				break;
+			case S_IN_REVISION:
+				$icon = 'fa-refresh';
+				break;
+			case S_DRAFT:
+				$icon = 'fa-circle-o';
+				break;
+			case S_NEEDS_CORRECTION:
+				$icon = 'fa-circle in-workflow';
+				break;
 			default:
 				$icon = 'fa fa-question';
 				break;
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index e57ae0af7..99d03f539 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1339,6 +1339,15 @@ function getOverallStatusIcon($status) { /* {{{ */
 			case S_EXPIRED:
 				$icon = 'fa-circle expired';
 				break;
+			case S_IN_REVISION:
+				$icon = 'fa-refresh';
+				break;
+			case S_DRAFT:
+				$icon = 'fa-circle-o';
+				break;
+			case S_NEEDS_CORRECTION:
+				$icon = 'fa-circle in-workflow';
+				break;
 			default:
 				$icon = 'fa fa-question';
 				break;

From 939a7dbce2d0096c66396f61db66ec221e4d9cbf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 May 2022 22:11:29 +0200
Subject: [PATCH 1543/2006] use require_once instead of include

---
 op/op.Acl.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/op/op.Acl.php b/op/op.Acl.php
index d34723416..3289109e4 100644
--- a/op/op.Acl.php
+++ b/op/op.Acl.php
@@ -19,16 +19,15 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
-include("../inc/inc.Utils.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassAcl.php");
-include("../inc/inc.Authentication.php");
+require_once("../inc/inc.Settings.php");
+require_once("../inc/inc.LogInit.php");
+require_once("../inc/inc.Utils.php");
+require_once("../inc/inc.Language.php");
+require_once("../inc/inc.Init.php");
+require_once("../inc/inc.Extension.php");
+require_once("../inc/inc.DBInit.php");
+require_once("../inc/inc.ClassUI.php");
+require_once("../inc/inc.Authentication.php");
 
 if (!$user->isAdmin()) {
 	$result = array('type'=>'error', 'msg'=>getMLText("access_denied"));

From 7c1c81f7fc22b10a9a07169645b98ae4b9452fc6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2022 16:44:43 +0200
Subject: [PATCH 1544/2006] addRevisor and addRecipient return id of log entry

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 4a0df531f..ec6cac8e6 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -5454,7 +5454,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 		// Add recipient to event notification table.
 		//$this->_document->addNotify($userID, true);
 
-		return 0;
+		$receiptLogID = $db->getInsertID('tblDocumentReceiptLog', 'receiptLogID');
+		$db->dropTemporaryTable('ttreceiptid');
+		return $receiptLogID;
 	} /* }}} */
 
 	function addGrpRecipient($group, $requestUser) { /* {{{ */
@@ -5513,7 +5515,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return -1;
 		}
 
-		return 0;
+		$receiptLogID = $db->getInsertID('tblDocumentReceiptLog', 'receiptLogID');
+		$db->dropTemporaryTable('ttreceiptid');
+		return $receiptLogID;
 	} /* }}} */
 
 	/**
@@ -5611,7 +5615,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return -1;
 		}
 
-		return 0;
+		$revisionLogID = $db->getInsertID('tblDocumentRevisionLog', 'revisionLogID');
+		$db->dropTemporaryTable('ttrevisionid');
+		return $revisionLogID;
 	} /* }}} */
 
 	function addIndRevisor($user, $requestUser, $donotstart=true) { /* {{{ */

From 17d1f2bffec199cba677a76d0201067c5d673625 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2022 16:45:21 +0200
Subject: [PATCH 1545/2006] fix checks in __removeFromProcesses()

---
 SeedDMS_Core/Core/inc.ClassUser.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index a8900ccf4..3af9c67b7 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -975,7 +975,7 @@ class SeedDMS_Core_User { /* {{{ */
 						if($version = $doc->getContentByVersion($ri['version'])) {
 							$ret = $version->addIndReviewer($newuser, $user);
 							/* returns -3 if the user is already a reviewer */ 
-							if($ret != 0 && $ret != -3) {
+							if($ret === false || ($ret < 0 && $ret != -3)) {
 								$db->rollbackTransaction();
 								return false;
 							}
@@ -1004,7 +1004,7 @@ class SeedDMS_Core_User { /* {{{ */
 						if($version = $doc->getContentByVersion($ai['version'])) {
 							$ret = $version->addIndReviewer($newuser, $user);
 							/* returns -3 if the user is already a reviewer */ 
-							if($ret != 0 && $ret != -3) {
+							if($ret === false || ($ret < 0 && $ret != -3)) {
 								$db->rollbackTransaction();
 								return false;
 							}
@@ -1033,7 +1033,7 @@ class SeedDMS_Core_User { /* {{{ */
 						if($version = $doc->getContentByVersion($ri['version'])) {
 							$ret = $version->addIndRecipient($newuser, $user);
 							/* returns -3 if the user is already a recipient */ 
-							if($ret != 0 && $ret != -3) {
+							if($ret === false || ($ret < 0 && $ret != -3)) {
 								$db->rollbackTransaction();
 								return false;
 							}
@@ -1062,7 +1062,7 @@ class SeedDMS_Core_User { /* {{{ */
 						if($version = $doc->getContentByVersion($ri['version'])) {
 							$ret = $version->addIndRevisor($newuser, $user);
 							/* returns -3 if the user is already a revisor */ 
-							if($ret != 0 && $ret != -3) {
+							if($ret === false || ($ret < 0 && $ret != -3)) {
 								$db->rollbackTransaction();
 								return false;
 							}

From 87fe831973d393325c163e9da8d947339784be28 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 May 2022 11:03:28 +0200
Subject: [PATCH 1546/2006] removeFromProcesses() will not touch documents for
 which the new user does not have at   least read access

---
 SeedDMS_Core/Core/inc.ClassUser.php | 26 +++++++++++++++++++++++---
 SeedDMS_Core/package.xml            |  1 +
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 3af9c67b7..028cc1060 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -932,11 +932,11 @@ class SeedDMS_Core_User { /* {{{ */
 	 * Remove user from all processes
 	 *
 	 * This method adds another log entry to the reviews, approvals, receptions, revisions,
-	 * which indicates the user has been deleted from the process. By default it will
+	 * which indicates that the user has been deleted from the process. By default it will
 	 * do so for each review/approval/reception/revision regardless of its current state unless
 	 * the user has been removed already (status=-2). So even
 	 * reviews/approvals/receptions/revisions already processed by the user will be added the log
-	 * entry. Only if the last log entry was a removal already, it will not be
+	 * entry. Only, if the last log entry was a removal already, it will not be
 	 * added a second time.
 	 * This behaviour can be changed by passing a list of states in the optional
 	 * argument $states. Only reviews, etc. in the given state will be affected.
@@ -944,7 +944,11 @@ class SeedDMS_Core_User { /* {{{ */
 	 * (state = 0).
 	 *
 	 * The last optional parameter $newuser is for replacing the user currently in
-	 * charge by another user. 
+	 * charge by another user. If this parameter is passed, the old user will
+	 * be deleted first (like described above) and afterwards the new user will
+	 * be addded. The deletion of the old user and adding the new user will only
+	 * happen if the new user has at least read access on the document. If not,
+	 * the document will be skipped and remained unchanged.
 	 *
 	 * @param object $user the user doing the removal (needed for entry in
 	 *        review and approve log).
@@ -961,6 +965,10 @@ class SeedDMS_Core_User { /* {{{ */
 		$reviewStatus = $this->getReviewStatus();
 		$db->startTransaction();
 		foreach ($reviewStatus["indstatus"] as $ri) {
+			if(!($doc = $this->_dms->getDocument($ri['documentID'])))
+				continue;
+			if($newuser && $doc->getAccessMode($newuser) < M_READ)
+				continue;
 			if($ri['status'] != -2 && (!isset($states['review']) || in_array($ri['status'], $states['review']))) {
 				$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["reviewID"] ."', '-2', '".(($newuser && $ri['status'] == 0) ? 'Reviewer replaced by '.$newuser->getLogin() : 'Reviewer removed from process')."', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
@@ -990,6 +998,10 @@ class SeedDMS_Core_User { /* {{{ */
 		$approvalStatus = $this->getApprovalStatus();
 		$db->startTransaction();
 		foreach ($approvalStatus["indstatus"] as $ai) {
+			if(!($doc = $this->_dms->getDocument($ai['documentID'])))
+				continue;
+			if($newuser && $doc->getAccessMode($newuser) < M_READ)
+				continue;
 			if($ai['status'] != -2 && (!isset($states['approval']) || in_array($ai['status'], $states['approval']))) {
 				$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ai["approveID"] ."', '-2', '".(($newuser && $ai['status'] == 0)? 'Approver replaced by '.$newuser->getLogin() : 'Approver removed from process')."', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
@@ -1019,6 +1031,10 @@ class SeedDMS_Core_User { /* {{{ */
 		$receiptStatus = $this->getReceiptStatus();
 		$db->startTransaction();
 		foreach ($receiptStatus["indstatus"] as $ri) {
+			if(!($doc = $this->_dms->getDocument($ri['documentID'])))
+				continue;
+			if($newuser && $doc->getAccessMode($newuser) < M_READ)
+				continue;
 			if($ri['status'] != -2 && (!isset($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
 				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["receiptID"] ."', '-2', '".(($newuser && $ri['status'] == 0) ? 'Recipient replaced by '.$newuser->getLogin() : 'Recipient removed from process')."', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
@@ -1048,6 +1064,10 @@ class SeedDMS_Core_User { /* {{{ */
 		$revisionStatus = $this->getRevisionStatus();
 		$db->startTransaction();
 		foreach ($revisionStatus["indstatus"] as $ri) {
+			if(!($doc = $this->_dms->getDocument($ri['documentID'])))
+				continue;
+			if($newuser && $doc->getAccessMode($newuser) < M_READ)
+				continue;
 			if($ri['status'] != -2 && (!isset($states['revision']) || in_array($ri['status'], $states['revision']))) {
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["revisionID"] ."', '-2', '".(($newuser && in_array($ri['status'], array(S_LOG_WAITING, S_LOG_SLEEPING))) ? 'Revisor replaced by '.$newuser->getLogin() : 'Revisor removed from process')."', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index d2d71de41..f880159d9 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - all changes from 5.1.26
+- removeFromProcesses() will not touch documents for which the new user does not have at least read access
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 9a76df52bd00504b8592aa7957098b4431984f3b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 May 2022 07:27:24 +0200
Subject: [PATCH 1547/2006] fix documentation of execute() methods

---
 inc/inc.Tasks.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index bc2712589..c3cf13ca0 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -251,7 +251,6 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 	 * Run the task
 	 *
 	 * @param $task task to be executed
-	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
 	public function execute(SeedDMS_SchedulerTask $task) {
@@ -347,7 +346,6 @@ class SeedDMS_CheckSumTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 * Run the task
 	 *
 	 * @param $task task to be executed
-	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
 	public function execute(SeedDMS_SchedulerTask $task) {
@@ -435,7 +433,6 @@ class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 * Run the task
 	 *
 	 * @param $task task to be executed
-	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
 	public function execute(SeedDMS_SchedulerTask $task) {
@@ -488,7 +485,6 @@ class SeedDMS_CalendarTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 * Run the task
 	 *
 	 * @param $task task to be executed
-	 * @param $dms dms
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
 	public function execute(SeedDMS_SchedulerTask $task) {

From 30c2b8a493fb91aa5b6f6de770f3229d76eda725 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 May 2022 17:53:38 +0200
Subject: [PATCH 1548/2006] do not set orderby when clicking on link in sidebar
 as it is undefined anyway

---
 views/bootstrap/class.MyDocuments.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 9cbde242a..e0ccc3b5b 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -48,7 +48,7 @@ $(document).ready( function() {
 	$('body').on('click', 'ul.sidenav li a', function(ev){
 		ev.preventDefault();
 		$('#kkkk.ajax').data('action', $(this).data('action'));
-		$('#kkkk.ajax').trigger('update', {orderby: $(this).data('orderby')});
+		$('#kkkk.ajax').trigger('update', {});
 	});
 	$('body').on('click', 'table th a', function(ev){
 		ev.preventDefault();

From 9b07f6e943c5a31f7dc213fd970b2aabae523d9e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 May 2022 15:45:23 +0200
Subject: [PATCH 1549/2006] pass logger to fulltextservice

---
 inc/inc.FulltextInit.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index ef7954154..777d2ca2c 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -4,6 +4,7 @@ $fulltextservice = null;
 if($settings->_enableFullSearch) {
 	require_once("inc.ClassFulltextService.php");
 	$fulltextservice = new SeedDMS_FulltextService();
+	$fulltextservice->setLogger($logger);
 
 	if($settings->_fullSearchEngine == 'sqlitefts') {
 		$indexconf = array(

From 983af33300cb68efee1d4bb2ecb070896910bc5c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 May 2022 07:43:43 +0200
Subject: [PATCH 1550/2006] use conversion mgr

---
 out/out.MyDocuments.php               |  1 +
 views/bootstrap/class.MyDocuments.php | 98 ++++++++++++++++++++++-----
 2 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index a684193ee..0d2a690b6 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -61,6 +61,7 @@ if($view) {
 	$view->setParam('orderby', $orderby);
 	$view->setParam('orderdir', $orderdir);
 	$view->setParam('showtree', showtree());
+	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('listtype', $listtype);
 	$view->setParam('workflowmode', $settings->_workflowMode);
 	$view->setParam('cachedir', $settings->_cacheDir);
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index e0ccc3b5b..c0a69f3fd 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -125,6 +125,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -133,7 +134,10 @@ $(document).ready( function() {
 
 		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$resArr = $dms->getDocumentList('ReviewByMe', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
@@ -157,6 +161,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -164,7 +169,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$resArr = $dms->getDocumentList('ApproveByMe', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
@@ -186,6 +194,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$workflowmode = $this->params['workflowmode'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
@@ -194,7 +203,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		if($workflowmode != 'advanced') {
 			/* Get list of documents owned by current user that are
@@ -236,6 +248,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$showtree = $this->params['showtree'];
 		$previewwidth = $this->params['previewWidthList'];
@@ -244,7 +257,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of documents owned by current user */
 		$resArr = $dms->getDocumentList('ReceiveOwner', $user, false, $orderby, $orderdir);
@@ -267,6 +283,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$showtree = $this->params['showtree'];
 		$previewwidth = $this->params['previewWidthList'];
@@ -275,7 +292,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of documents owned by current user */
 		$resArr = $dms->getDocumentList('NoReceiveOwner', $user, false, $orderby, $orderdir);
@@ -298,6 +318,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$showtree = $this->params['showtree'];
 		$previewwidth = $this->params['previewWidthList'];
@@ -306,7 +327,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of documents owned by current user */
 		$resArr = $dms->getDocumentList('MyDocs', $user, false, $orderby, $orderdir);
@@ -329,6 +353,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -336,7 +361,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		// Get document list for the current user.
 		$workflowStatus = $user->getWorkflowStatus();
@@ -431,6 +459,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -438,7 +467,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		// Get document list for the current user.
 		$revisionStatus = $user->getRevisionStatus();
@@ -464,6 +496,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -471,7 +504,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$resArr = $dms->getDocumentList('ReceiptByMe', $user, false, $orderby, $orderdir);
 		if (is_bool($resArr) && !$resArr) {
@@ -495,6 +531,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -502,7 +539,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of documents owned by current user that has
 		 * been rejected.
@@ -528,6 +568,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -535,7 +576,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of documents locked by current user */
 		$resArr = $dms->getDocumentList('LockedByMe', $user, false, $orderby, $orderdir);
@@ -559,6 +603,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -566,7 +611,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of documents expired and owned by current user */
 		$resArr = $dms->getDocumentList('ExpiredOwner', $user, false, $orderby, $orderdir);
@@ -590,6 +638,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -597,7 +646,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of obsolete documents and owned by current user */
 		$resArr = $dms->getDocumentList('ObsoleteOwner', $user, false, $orderby, $orderdir);
@@ -621,6 +673,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -628,7 +681,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of obsolete documents and owned by current user */
 		$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user, false, $orderby, $orderdir);
@@ -652,6 +708,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -659,7 +716,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of draft documents and owned by current user */
 		$resArr = $dms->getDocumentList('DraftOwner', $user, false, $orderby, $orderdir);
@@ -683,6 +743,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -690,7 +751,10 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		/* Get list of documents checked out by current user */
 		$resArr = $dms->getDocumentList('CheckedOutByMe', $user, false, $orderby, $orderdir);
@@ -722,8 +786,6 @@ $(document).ready( function() {
 		$xsendfile = $this->params['xsendfile'];
 
 		$db = $dms->getDB();
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
-		$previewer->setConverters($previewconverters);
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 

From 1ae35ca6ad1f17662cbc609f3e3bfcb0a7d7b626 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 May 2022 07:45:05 +0200
Subject: [PATCH 1551/2006] do not show debug menu if all items are
 inaccessible

---
 views/bootstrap/class.Bootstrap.php   | 8 +++++---
 views/bootstrap4/class.Bootstrap4.php | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f392ec989..0240f663e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1019,9 +1019,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		}
 
 		if ($settings->_enableDebugMode) {
-		$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
-		if ($accessobject->check_view_access('Hooks'))
-		$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
+			if($accessobject->check_view_access(array('Hooks'))) {
+				$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
+				if ($accessobject->check_view_access('Hooks'))
+					$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
+			}
 		}
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 640517739..aee665d47 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -927,9 +927,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		}
 
 		if ($settings->_enableDebugMode) {
-		$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
-		if ($accessobject->check_view_access('Hooks'))
-		$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
+			if($accessobject->check_view_access(array('Hooks'))) {
+				$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
+				if ($accessobject->check_view_access('Hooks'))
+					$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
+			}
 		}
 
 		/* Check if hook exists because otherwise callHook() will override $menuitems */

From ecc70bc99a27217eadd9af8723a9ec15bb87eabf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 May 2022 08:07:32 +0200
Subject: [PATCH 1552/2006] make progress bar a block for better positioning of
 popup box

---
 views/bootstrap4/class.Bootstrap4.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index aee665d47..9d83d5ca5 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -3252,7 +3252,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				if($totalreceipts) {
 					$content .= "
 <div class=\"progress\">
-<div class=\"progress-bar bar bar-success bg-success\" role=\"progress-bar\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
+<div class=\"progress-bar bar bar-success bg-success d-block\" role=\"progress-bar\" style=\"width: ".round($rstat['1']/$totalreceipts*100)."%;\">".($rstat['1'] ? $rstat['1']."/".$totalreceipts : '').($allcomments['1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['1'])), true) : "")."</div>
 	<div class=\"progress-bar bar bar-danger bg-danger\" style=\"width: ".round($rstat['-1']/$totalreceipts*100)."%;\">".($rstat['-1'] ? $rstat['-1']."/".$totalreceipts : '').($allcomments['-1'] ? " ".$this->printPopupBox('<i class="fa fa-comment"></i>', implode('<br />', formatComment($allcomments['-1'])), true) : "")."</div>
 </div>";
 				}

From eb4b28ea8c70483dcfa9bb219125f77284696c38 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 May 2022 17:40:04 +0200
Subject: [PATCH 1553/2006] fix php warnings and propperly handle failure of
 cancelCheckout()

---
 op/op.CancelCheckOut.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/op/op.CancelCheckOut.php b/op/op.CancelCheckOut.php
index 787a9ea84..209d37e4e 100644
--- a/op/op.CancelCheckOut.php
+++ b/op/op.CancelCheckOut.php
@@ -46,9 +46,8 @@ if(empty($_POST['confirm'])) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("operation_disallowed"));
 }
 
-$document->cancelCheckOut($comment);
-if (is_bool($result) && !$result) {
-	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+if(!$document->cancelCheckOut()) {
+	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_cancel_checkout"));
 }
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_cancel_checkout')));
 add_log_line("?documentid=".$documentid);

From 369dc801106c900feb376fe211d1c90de3607acb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 May 2022 10:57:50 +0200
Subject: [PATCH 1554/2006] log type of receiver

---
 inc/inc.ClassNotificationService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index 8e377a778..8bc482936 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -97,11 +97,11 @@ class SeedDMS_NotificationService {
 					$this->errors[$name] = false;
 					$this->logger->log('Notification service \''.$name.'\': Sending notification \''.$subject.'\' to user \''.$to.'\' ('.$recvtype.') failed.', PEAR_LOG_ERR);
 				} else {
-					$this->logger->log('Notification service \''.$name.'\': Sending notification \''.$subject.'\' to user \''.$to.'\' ('.$recvtype.') successful.', PEAR_LOG_INFO);
+					$this->logger->log('Notification service \''.$name.'\': Sending notification \''.$subject.'\' to user \''.$to.'\' ('.$recvtype.') successful (reason for notification: '.$recvtype.').', PEAR_LOG_INFO);
 					$this->errors[$name] = true;
 				}
 			} else {
-				$this->logger->log('Notification service \''.$name.'\': Notification \''.$subject.'\' to user \''.$to.'\' ('.$recvtype.') filtered out.', PEAR_LOG_INFO);
+				$this->logger->log('Notification service \''.$name.'\': Notification \''.$subject.'\' to user \''.$to.'\' ('.$recvtype.') filtered out (reason for notification: '.$recvtype.').', PEAR_LOG_INFO);
 			}
 		}
 		return $error;

From 1f6a3c7f772b3ddd9a85f318cc68296de1a505b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 May 2022 11:00:16 +0200
Subject: [PATCH 1555/2006] add list of notifications to debug menu

---
 views/bootstrap/class.Bootstrap.php   | 4 +++-
 views/bootstrap4/class.Bootstrap4.php | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 0240f663e..af06516aa 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1019,10 +1019,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		}
 
 		if ($settings->_enableDebugMode) {
-			if($accessobject->check_view_access(array('Hooks'))) {
+			if($accessobject->check_view_access(array('Hooks', 'NotificationServices'))) {
 				$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
 				if ($accessobject->check_view_access('Hooks'))
 					$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
+				if ($accessobject->check_view_access('NotificationServices'))
+					$menuitems['debug']['children']['notification_services'] = array('link'=>"../out/out.NotificationServices.php", 'label'=>getMLText('list_notification_services'));
 			}
 		}
 
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 64ed0d3db..69077772e 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -927,10 +927,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		}
 
 		if ($settings->_enableDebugMode) {
-			if($accessobject->check_view_access(array('Hooks'))) {
+			if($accessobject->check_view_access(array('Hooks', 'NotificationServices'))) {
 				$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
 				if ($accessobject->check_view_access('Hooks'))
 					$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
+				if ($accessobject->check_view_access('NotificationServices'))
+					$menuitems['debug']['children']['notification_services'] = array('link'=>"../out/out.NotificationServices.php", 'label'=>getMLText('list_notification_services'));
 			}
 		}
 

From 93f6b01c7ff928d344b3d98d2338c6eaeeb6b2cd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 May 2022 11:33:44 +0200
Subject: [PATCH 1556/2006] do not allow to set revision date if document
 status is 'in revision'

---
 views/bootstrap/class.SetRevisors.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 1c5c0135f..20b8b9abf 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -74,10 +74,14 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 
 <?php
 		$this->contentContainerStart();
-		$this->formField(
-			getMLText("revision_date"),
-			$this->getDateChooser($startdate, "startdate", $this->params['session']->getLanguage())
-		);
+		if($content->getStatus()['status'] == S_IN_REVISION) {
+			echo '<input type="hidden" name="startdate" value="" />';
+		} else {
+			$this->formField(
+				getMLText("revision_date"),
+				$this->getDateChooser($startdate, "startdate", $this->params['session']->getLanguage())
+			);
+		}
 ?>
 
 	<div class="control-group">

From 6d5d1a7703d350d2dde766f5c93eb8c148b42e80 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 30 May 2022 13:07:30 +0200
Subject: [PATCH 1557/2006] check if IndexedDocument() set error msg, call
 right hook after indexing document

---
 inc/inc.Tasks.php | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index c3cf13ca0..9d8868465 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -139,15 +139,20 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 		if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
 			try {
 				$idoc = $this->fulltextservice->IndexedDocument($folder, true);
-				if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) {
-					foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) {
-						if (method_exists($hookObj, 'preIndexFolder')) {
-							$hookObj->preIndexDocument(null, $folder, $idoc);
+				$error = $idoc->getErrorMsg();
+				if(!$error) {
+					if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) {
+						foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) {
+							if (method_exists($hookObj, 'preIndexFolder')) {
+								$hookObj->preIndexDocument(null, $folder, $idoc);
+							}
 						}
 					}
+					$this->fulltextservice->Indexer()->addDocument($idoc);
+					echo "(".getMLText('index_folder_added').")".PHP_EOL;
+				} else {
+					echo "(".$error.")".PHP_EOL;
 				}
-				$this->fulltextservice->Indexer()->addDocument($idoc);
-				echo "(".getMLText('index_folder_added').")".PHP_EOL;
 			} catch(Exception $e) {
 				echo "(Timeout)".PHP_EOL;
 			}
@@ -168,15 +173,20 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 				$this->fulltextservice->Indexer()->delete($hit->id);
 				try {
 					$idoc = $this->fulltextservice->IndexedDocument($folder, true);
-					if(isset($GLOBALS['SEEDDMS_HOOKS']['indexFolder'])) {
-						foreach($GLOBALS['SEEDDMS_HOOKS']['indexFolder'] as $hookObj) {
-							if (method_exists($hookObj, 'preIndexFolder')) {
-								$hookObj->preIndexDocument(null, $folder, $idoc);
+					$error = $idoc->getErrorMsg();
+					if(!$error) {
+						if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+							foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+								if (method_exists($hookObj, 'preIndexDocument')) {
+									$hookObj->preIndexDocument(null, $folder, $idoc);
+								}
 							}
 						}
+						$this->fulltextservice->Indexer()->addDocument($idoc);
+						echo "(".getMLText('index_folder_updated').")".PHP_EOL;
+					} else {
+						echo "(".$error.")".PHP_EOL;
 					}
-					$this->fulltextservice->Indexer()->addDocument($idoc);
-					echo "(".getMLText('index_folder_updated').")".PHP_EOL;
 				} catch(Exception $e) {
 					echo "(Timeout)".PHP_EOL;
 				}

From c6470efc6ffc21cc62018f9f4fc4bf8d4bfc07bd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 31 May 2022 14:24:45 +0200
Subject: [PATCH 1558/2006] fix deleting a document by clicking on the icon in
 the document list

---
 views/bootstrap/class.MyDocuments.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index f1b974914..d89a56830 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -42,6 +42,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Theme_Style {
 
 		header('Content-Type: application/javascript; charset=UTF-8');
 		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		$this->printDeleteDocumentButtonJs();
 		$this->printClickDocumentJs();
 ?>
 $(document).ready( function() {
@@ -787,8 +788,6 @@ $(document).ready( function() {
 
 		$db = $dms->getDB();
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
 		$this->contentStart();

From 7ba81f50e3bfd5817e93488c74f619ec3b732161 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 31 May 2022 14:25:23 +0200
Subject: [PATCH 1559/2006] fix deletion of task when using bootstrap4 theme

---
 views/bootstrap/class.SchedulerTaskMgr.php | 49 +++++++++++++++++++++-
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index c19521a28..554266025 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -28,6 +28,7 @@
 class SeedDMS_View_SchedulerTaskMgr extends SeedDMS_Theme_Style {
 
 	function js() { /* {{{ */
+		$theme = $this->params['theme'];
 		header('Content-Type: application/javascript');
 ?>
 $(document).ready( function() {
@@ -53,6 +54,7 @@ $(document).ready( function() {
 		confirmmsg = $(ev.currentTarget).attr('confirmmsg');
 		msg = $(ev.currentTarget).attr('msg');
 		formtoken = '<?= createFormKey('removetask') ?>';
+<?php if($theme == 'bootstrap'): ?>
 		bootbox.dialog(confirmmsg, [{
 			"label" : "<i class='fa fa-remove'></i> <?= getMLText("rm_task") ?>",
 			"class" : "btn-danger",
@@ -90,6 +92,51 @@ $(document).ready( function() {
 			"callback": function() {
 			}
 		}]);
+<?php else: ?>
+		bootbox.confirm({
+			"message": confirmmsg,
+			"buttons": {
+				"confirm": {
+					"label" : "<i class='fa fa-remove'></i> <?= getMLText("rm_task") ?>",
+					"className" : "btn-danger",
+				},
+				"cancel": {
+					"label" : "<?= getMLText("cancel") ?>",
+					"className" : "btn-secondary",
+				}
+			},
+			"callback": function(result) {
+				if(result) {
+					$.post('../op/op.SchedulerTaskMgr.php',
+						{ action: 'removetask', taskid: id, formtoken: formtoken },
+						function(data) {
+							if(data.success) {
+								$('#table-row-task-'+id).hide('slow');
+								noty({
+									text: msg,
+									type: 'success',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 1500,
+								});
+							} else {
+								noty({
+									text: data.message,
+									type: 'error',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 3500,
+								});
+							}
+						},
+						'json'
+					);
+				}
+			}
+		});
+<?php endif ?>
 	});
 });
 <?php
@@ -469,8 +516,6 @@ $(document).ready( function() {
 		$extname = $this->params['extname'];
 		$taskname = $this->params['taskname'];
 		$scheduler = $this->params['scheduler'];
-	
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();

From a91003d5fa22c9d7d0d3590416484a0bcbc9067e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 31 May 2022 14:27:05 +0200
Subject: [PATCH 1560/2006] do not include bootbox.min.js

---
 views/bootstrap/class.ObjectCheck.php     | 2 --
 views/bootstrap/class.ReceiptSummary.php  | 2 --
 views/bootstrap/class.RevisionSummary.php | 2 --
 3 files changed, 6 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 67169fb66..ad38b5cd8 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -606,8 +606,6 @@ $(document).ready( function() {
 		$repairobjects = $this->params['repairobjects'];
 		$this->enableClipboard = $this->params['enableclipboard'];
 
-//		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
 		$this->contentStart();
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index ce6ac1c42..657433a1f 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -55,8 +55,6 @@ class SeedDMS_View_ReceiptSummary extends SeedDMS_Theme_Style {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 		$previewer->setConverters($previewconverters);
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
 		$this->contentStart();
diff --git a/views/bootstrap/class.RevisionSummary.php b/views/bootstrap/class.RevisionSummary.php
index fccc06735..323ef6a6f 100644
--- a/views/bootstrap/class.RevisionSummary.php
+++ b/views/bootstrap/class.RevisionSummary.php
@@ -56,8 +56,6 @@ class SeedDMS_View_RevisionSummary extends SeedDMS_Theme_Style {
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 		$previewer->setConverters($previewconverters);
 
-		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
-
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
 		$this->contentStart();

From 490fe093900731e6cfd179f0fed040b781e5b879 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 31 May 2022 14:27:28 +0200
Subject: [PATCH 1561/2006] add changes for 6.0.19

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index a8b31d3ac..ef8f399be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
                      Changes in version 6.0.19
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.26
+- fix deletion of tasks when using bootstrap4 theme
+- fix deletion of documents when clicking on icon in document list (my documents)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.18

From 6b5826ded4e8719b75ce049011a29b6bb45cfe41 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Jun 2022 20:10:34 +0200
Subject: [PATCH 1562/2006] check if totalreceipts != 0

---
 views/bootstrap/class.ViewDocument.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index e2fe3c64b..b94039bc0 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1670,9 +1670,9 @@ $(document).ready( function() {
 			<div class="row-fluid">
 			<div class="span12">
 <div class="progress">
-<div class="progress-bar bar bar-success bg-success" style="width: <?php echo round($stat['1']/$totalreceipts*100); ?>%;"><?php echo ($stat['1'] ? $stat['1']."/".$totalreceipts : ''); ?></div>
-<!-- div class="bar bar-warning" style="width: <?php echo round($stat['0']/$totalreceipts*100); ?>%;"></div -->
-	<div class="progress-bar bar bar-danger bg-danger" style="width: <?php echo round($stat['-1']/$totalreceipts*100); ?>%;"><?php echo ($stat['-1'] ? $stat['-1']."/".$totalreceipts : ''); ?></div>
+<div class="progress-bar bar bar-success bg-success" style="width: <?= $totalreceipts ? round($stat['1']/$totalreceipts*100) : 0 ?>%;"><?php echo ($stat['1'] ? $stat['1']."/".$totalreceipts : ''); ?></div>
+<!-- div class="bar bar-warning" style="width: <?= $totalreceipts ? round($stat['0']/$totalreceipts*100) : 0 ?>%;"></div -->
+	<div class="progress-bar bar bar-danger bg-danger" style="width: <?= $totalreceipts ? round($stat['-1']/$totalreceipts*100) : 0 ?>%;"><?php echo ($stat['-1'] ? $stat['-1']."/".$totalreceipts : ''); ?></div>
 </div>
 			</div>
 			</div>

From 7deddf8f4e89110f5481e05dc2da526e85c113f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Jun 2022 16:48:26 +0200
Subject: [PATCH 1563/2006] set role to button for each nav-item

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index ab80d00e7..2797e8f66 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -967,12 +967,12 @@ $(document).ready( function() {
 			}
 			if(is_array($receiptStatus) && count($receiptStatus)>0) {
 ?>
-		  <li class="nav-item <?php if($currenttab == 'recipients') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'recipients') echo 'active'; ?>" data-target="#recipients" data-toggle="tab"><?php echo getMLText('recipients'); ?></a></li>
+		  <li class="nav-item <?php if($currenttab == 'recipients') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'recipients') echo 'active'; ?>" data-target="#recipients" data-toggle="tab" role="button"><?php echo getMLText('recipients'); ?></a></li>
 <?php
 			}
 			if(is_array($revisionStatus) && count($revisionStatus)>0) {
 ?>
-		  <li class="nav-item <?php if($currenttab == 'revision') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'revision') echo 'active'; ?>" data-target="#revision" data-toggle="tab"><?php echo getMLText('revise_document'); ?></a></li>
+		  <li class="nav-item <?php if($currenttab == 'revision') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'revision') echo 'active'; ?>" data-target="#revision" data-toggle="tab" role="button"><?php echo getMLText('revise_document'); ?></a></li>
 <?php
 			}
 ?>

From 502ea86d8d9b3443db7ce077d5696955293a15d9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 Jul 2022 18:49:02 +0200
Subject: [PATCH 1564/2006] fix merge error

---
 views/bootstrap/class.Bootstrap.php   | 2 +-
 views/bootstrap4/class.Bootstrap4.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 034a01394..0697ff7df 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -3393,7 +3393,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			if($subFolderAccessMode >= M_READWRITE) {
 				$actions['edit_folder'] = '<a class_="btn btn-mini" href="'.$this->params['settings']->_httpRoot.'out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';
 			} else {
-				$content['edit_folder'] = '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+				$actions['edit_folder'] = '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 			}
 		}
 		if($subFolderAccessMode >= M_READWRITE) {
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 0012635ef..913d7399a 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -3432,7 +3432,7 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			if($subFolderAccessMode >= M_READWRITE) {
 				$actions['edit_folder'] = '<a class_="btn btn-mini" href="'.$this->params['settings']->_httpRoot.'out/out.EditFolder.php?folderid='.$subFolder->getID().'" title="'.getMLText("edit_folder_props").'"><i class="fa fa-edit"></i></a>';
 			} else {
-				$content['edit_folder'] = '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+				$actions['edit_folder'] = '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 			}
 		}
 		if($subFolderAccessMode >= M_READWRITE) {

From 995f7a5bad5024b4700a9f89915935b55d056c54 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Jul 2022 13:39:46 +0200
Subject: [PATCH 1565/2006] propperly get workflow log

---
 views/bootstrap/class.TriggerWorkflow.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index 86f14626c..d700a11c0 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -66,8 +66,16 @@ $(document).ready(function() {
 		$action = $transition->getAction();
 		$currentstate = $latestContent->getWorkflowState();
 		$wkflogs = $latestContent->getWorkflowLog();
-		$wkflog = array_shift($wkflogs);
-		$workflow = $latestContent->getWorkflow();
+		/* Check if latest content is still in workflow, which should be
+		 * always the case, otherwise this code would be executed.
+		 * In that case the returned log is just a list of entries for the
+		 * current workflow. If the document was not in a workflow, then the
+		 * log entries for all workflows of this content will be returned
+		 */
+		if($workflow = $latestContent->getWorkflow())
+			$wkflog = $wkflogs;
+		else
+			$wkflog = array_shift($wkflogs);
 
 		$msg = "The document is currently in state: ".$currentstate->getName()."<br />";
 		if($wkflog) {

From 85c190aad23a7b5a642033e70e3404d1d927ba42 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 26 Jul 2022 14:32:34 +0200
Subject: [PATCH 1566/2006] add changes for 6.0.20

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index cc07d64f1..f961ac884 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.20
 --------------------------------------------------------------------------------
+- merge changes up to 5.1.27
+- fix triggering workflow (Closes: #542)
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.19

From 73d748a025fd18dcada5f71acdf30ad1d8e4aec6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 18 Aug 2022 10:08:28 +0200
Subject: [PATCH 1567/2006] move export below search button

---
 views/bootstrap/class.Search.php | 37 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 9e07dc667..0415b0864 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -440,24 +440,6 @@ function typeahead() { /* {{{ */
 		if($statusdate)
 			$openfilterdlg = true;
 
-		if($totaldocs) {
-			ob_start();
-			$this->formField(
-				getMLText("include_content"),
-				array(
-					'element'=>'input',
-					'type'=>'checkbox',
-					'name'=>'includecontent',
-					'id'=>'includecontent',
-					'value'=>1,
-				)
-			);
-			//$this->formSubmit("<i class=\"fa fa-download\"></i> ".getMLText('export'));
-			print $this->html_link('Search', array_merge($_GET, array('action'=>'export')), array('class'=>'btn btn-primary', 'id'=>'export'), "<i class=\"fa fa-download\"></i> ".getMLText("export"), false, true)."\n";
-			$content = ob_get_clean();
-			$this->printAccordion(getMLText('export'), $content);
-		}
-
 		/* Start of fields only applicable to documents */
 		ob_start();
 		$tmpcatids = array();
@@ -576,6 +558,25 @@ function typeahead() { /* {{{ */
 		// }}}
 
 		$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
+
+		if($totaldocs) {
+			ob_start();
+			$this->formField(
+				getMLText("include_content"),
+				array(
+					'element'=>'input',
+					'type'=>'checkbox',
+					'name'=>'includecontent',
+					'id'=>'includecontent',
+					'value'=>1,
+				)
+			);
+			//$this->formSubmit("<i class=\"fa fa-download\"></i> ".getMLText('export'));
+			print $this->html_link('Search', array_merge($_GET, array('action'=>'export')), array('class'=>'btn btn-primary', 'id'=>'export'), "<i class=\"fa fa-download\"></i> ".getMLText("export"), false, true)."\n";
+			$content = ob_get_clean();
+			$this->printAccordion(getMLText('export'), $content);
+		}
+
 ?>
 </form>
 		</div>

From dc7cf3ce867d583863187dd78dfac55c42516dd7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 23 Aug 2022 08:30:27 +0200
Subject: [PATCH 1568/2006] remove duplicate export form

---
 views/bootstrap/class.Search.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 8cb435860..618028072 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -581,25 +581,6 @@ function typeahead() { /* {{{ */
 		// }}}
 
 		$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
-
-		if($totaldocs) {
-			ob_start();
-			$this->formField(
-				getMLText("include_content"),
-				array(
-					'element'=>'input',
-					'type'=>'checkbox',
-					'name'=>'includecontent',
-					'id'=>'includecontent',
-					'value'=>1,
-				)
-			);
-			//$this->formSubmit("<i class=\"fa fa-download\"></i> ".getMLText('export'));
-			print $this->html_link('Search', array_merge($_GET, array('action'=>'export')), array('class'=>'btn btn-primary', 'id'=>'export'), "<i class=\"fa fa-download\"></i> ".getMLText("export"), false, true)."\n";
-			$content = ob_get_clean();
-			$this->printAccordion(getMLText('export'), $content);
-		}
-
 ?>
 </form>
 <?php

From 9a08430d5b9417e49516141746ab67cdffe22f0a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 31 Aug 2022 20:59:12 +0200
Subject: [PATCH 1569/2006] add changes for 5.1.27 and 6.0.20

---
 SeedDMS_Core/package.xml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index a07336ef7..6df7aaac2 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,9 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- fix SeedDMS_Core_DMS::addAttributeDefinition() when objtype is 0
-- sort search result even if sortorder is 'i' or 'n'
-- pass an array as an attribute to search() will OR each element
+- all changes from 5.1.27 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1994,6 +1992,24 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
 - SeedDMS_Core_DMS::getAllAttributeDefinitions() has second parameter to filter attributes by type
    </notes>
   </release>
+  <release>
+   <date>2022-08-31</date>
+   <time>13:44:55</time>
+   <version>
+    <release>5.1.27</release>
+    <api>5.1.27</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- fix SeedDMS_Core_DMS::addAttributeDefinition() when objtype is 0
+- sort search result even if sortorder is 'i' or 'n'
+- pass an array as an attribute to search() will OR each element
+   </notes>
+  </release>
   <release>
    <date>2017-02-28</date>
    <time>06:34:50</time>

From f4b621de36055ba458a60bcc0897174253c96f6a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 2 Sep 2022 09:39:40 +0200
Subject: [PATCH 1570/2006] make it work with SeedDMS 6

---
 op/op.ImportUsers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index 000a944ac..e2f305996 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -306,7 +306,7 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if($view) {
 	$view->setParam('log', $log);
 	$view->setParam('newusers', $newusers);

From e76df4c71fdaeee3a64cffcf4fad1d80d320227d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Sep 2022 09:26:27 +0200
Subject: [PATCH 1571/2006] create original file name from new document name
 when uploading document from the library folder.

---
 CHANGELOG             | 2 ++
 op/op.AddDocument.php | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 936c317ad..574387125 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,8 @@
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.27
 - fix triggering workflow (Closes: #542)
+- create original file name from new document name when uploading document
+  from the library folder. Used to be the original file name
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.19
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 1e6c3fa98..f28b32913 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -367,10 +367,15 @@ if($settings->_libraryFolder) {
 				$docsource = 'library';
 				$fullfile = tempnam(sys_get_temp_dir(), '');
 				if(SeedDMS_Core_File::copyFile($dms->contentDir . $content->getPath(), $fullfile)) {
+					if($_POST["name"]!="") {
+						$oext = pathinfo($content->getOriginalFileName(), PATHINFO_EXTENSION);
+						$origfilename = getFilenameByDocname(trim($_POST['name'])).".".$oext;
+					} else
+						$origfilename = $content->getOriginalFileName();
 					$file_ary[] = array(
 						'tmp_name' => $fullfile,
 						'type' => $content->getMimeType(),
-						'name' => $content->getOriginalFileName(),
+						'name' => $origfilename,
 						'size' => $content->getFileSize(),
 						'error' => 0,
 						'source' => 'library',

From ea2173b4eda863d2ca01aa698f100293addcb4f0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Sep 2022 20:02:14 +0200
Subject: [PATCH 1572/2006] set 'All' in paginator active if selected

---
 views/bootstrap/class.Bootstrap.php   | 2 +-
 views/bootstrap4/class.Bootstrap4.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index fb6b15b25..229f0b55e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1166,7 +1166,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				echo "<li><a href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber+1)."\" data-page=\"".($pageNumber+1)."\"".$datastr.">&raquo;</a></li>";
 		}
 		if ($totalPages>1) {
-			echo "<li><a href=\"".$resultsURI.($first ? "?" : "&")."pg=all\" data-page=\"all\"".$datastr.">".getMLText("all_pages")."</a></li>";
+			echo "<li ".(0 == $pageNumber ? 'class="active"' : "" )."><a href=\"".$resultsURI.($first ? "?" : "&")."pg=all\" data-page=\"all\"".$datastr.">".getMLText("all_pages")."</a></li>";
 		}
 		echo "</ul>";
 		echo "</div>";
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 188fa7d18..ccf1423f8 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1070,7 +1070,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				echo "<li class=\"page-item\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=".($pageNumber+1)."\" data-page=\"".($pageNumber+1)."\"".$datastr.">&raquo;</a></li>";
 		}
 		if ($totalPages>1) {
-			echo "<li class=\"page-item\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=all\" data-page=\"all\"".$datastr.">".getMLText("all_pages")."</a></li>";
+			echo "<li class=\"page-item".(0 == $pageNumber ? ' active' : "" )."\"><a class=\"page-link\" href=\"".$resultsURI.($first ? "?" : "&")."pg=all\" data-page=\"all\"".$datastr.">".getMLText("all_pages")."</a></li>";
 		}
 		echo "</ul>";
 		echo "</nav>";

From 94d6dd051133daa4b6a8ff2f5ec7d2c3dfdbd466 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Sep 2022 12:44:20 +0200
Subject: [PATCH 1573/2006] some more documentation of method

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index ec6cac8e6..3f941829f 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -4608,6 +4608,9 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	/**
 	 * Get the current revision status of the document content
 	 * The revision status is a list of revisions
+	 * If $limit is 1 it will return just the last log entry for each
+	 * revisor.
+	 * Keep in mind that a revision log may contain repeating revisions.
 	 *
 	 * @param integer $limit maximum number of records per revisor
 	 * @return array list of revisions

From 3721fcfc22132fd65d8055ddd95e188d7b207fc6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Sep 2022 12:44:56 +0200
Subject: [PATCH 1574/2006] check for documents with missing revision date

---
 out/out.ObjectCheck.php               | 12 +++++++++++-
 views/bootstrap/class.ObjectCheck.php | 21 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index 3d4ce0a41..fc22c2612 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -109,16 +109,17 @@ foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
 	}
 }
 $docsinrevision = array();
+$docsmissingrevsiondate = array();
 if(!isset($_GET['action']) || $_GET['action'] == 'listDocsInRevisionNoAccess') {
 $tmprevs = $dms->getDocumentsInRevision();
 foreach($tmprevs as $rev) {
 	if($doc = $dms->getDocument($rev['documentID'])) {
+		$content = $doc->getContentByVersion($rev['version']);
 		$isdisabled = false;
 		if($rev['type'] == 0) {
 			$ruser = $dms->getUser($rev['required']);
 			$isdisabled = $ruser->isDisabled();
 			$mode = $doc->getAccessMode($ruser);
-			$content = $doc->getContentByVersion($rev['version']);
 			$cmode = $content->getAccessMode($ruser);
 		} elseif($rev['type'] == 1) {
 			$rgroup = $dms->getGroup($rev['required']);
@@ -130,6 +131,14 @@ foreach($tmprevs as $rev) {
 		 */
 		if($mode < M_READ || $cmode < M_READ || $isdisabled)
 			$docsinrevision[] = $doc;
+
+		/* If a document has a sleeping revisor then it must have a
+		 * revision date, otherwise the revision will never be started.
+		 */
+		if($rev['status'] == S_LOG_SLEEPING) {
+			if(!$content->getRevisionDate())
+				$docsmissingrevsiondate[] = $doc;
+		}
 	}
 }
 }
@@ -228,6 +237,7 @@ if($view) {
 	$view->setParam('wrongfiletypeversions', $wrongfiletypeversions);
 	$view->setParam('duplicateversions', $duplicateversions);
 	$view->setParam('docsinrevision', $docsinrevision);
+	$view->setParam('docsmissingrevsiondate', $docsmissingrevsiondate);
 	$view->setParam('docsinreception', $docsinreception);
 	$view->setParam('processwithoutusergroup', $processwithoutusergroup);
 	$view->setParam('unlink', $unlink);
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index ad38b5cd8..b21860e09 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -452,6 +452,26 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		}
 	} /* }}} */
 
+	function listDocsWithMissingRevisionDate() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$docsmissingrevsiondate = $this->params['docsmissingrevsiondate'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewConverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		$previewer->setConverters($previewconverters);
+
+		$this->contentHeading(getMLText("docs_with_missing_revision_date"));
+
+		if($docsmissingrevsiondate) {
+			$this->printList($docsmissingrevsiondate, $previewer);
+		}
+	} /* }}} */
+
 	function listDocsInReceptionNoAccess() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -629,6 +649,7 @@ $(document).ready( function() {
 		$menuitems[] = array('label'=>getMLText('duplicate_content'), 'badge'=>count($duplicateversions), 'attributes'=>array(array('data-href', "#duplicate_content"), array('data-action', "listDuplicateContent")));
 		$menuitems[] = array('label'=>getMLText('docs_in_revision_no_access'), 'badge'=>count($docsinrevision), 'attributes'=>array(array('data-href', "#inrevision_no_access"), array('data-action', "listDocsInRevisionNoAccess")));
 		$menuitems[] = array('label'=>getMLText('docs_in_reception_no_access'), 'badge'=>count($docsinreception), 'attributes'=>array(array('data-href', "#inreception_no_access"), array('data-action', "listDocsInReceptionNoAccess")));
+		$menuitems[] = array('label'=>getMLText('docs_with_missing_revision_date'), 'badge'=>count($docsmissingrevsiondate), 'attributes'=>array(array('data-href', "#missing_revision_date"), array('data-action', "listDocsWithMissingRevisionDate")));
 		foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
 			foreach(array('user', 'group') as $ug) {
 				$menuitems[] = array('label'=>getMLText($process."s_without_".$ug), 'badge'=>count($processwithoutusergroup[$process][$ug]), 'attributes'=>array(array('data-href', "#".$process.'_without_'.$ug), array('data-action', "list".ucfirst($process).'Without'.ucfirst($ug))));

From c2a8b4bbc6f57f3d4f0815d55abfd988a30518e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Sep 2022 12:45:40 +0200
Subject: [PATCH 1575/2006] getDocumentsInRevision() also returns status of
 revision log

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 82003811d..dabf91d7e 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -3827,19 +3827,23 @@ class SeedDMS_Core_DMS {
 	} /* }}} */
 
 	/**
-	 * Return all documents waiting for or in revision
+	 * Return all documents revisors waiting for a revision to start (sleeping)
+	 * or are required to revise the document (waiting)
 	 *
-	 * This function retrieves all documents and its version which are waiting for
+	 * This function retrieves all revisors which are waiting for
 	 * revision or already in revision
+	 * Note: the name of the method is somewhat misleading, because it
+	 * does not return documents but just database records from table
+	 * tblDocumentRevisors and tblDocumentRevisionLog
 	 *
-	 * @return object instance of {@link SeedDMS_Core_DocumentContent} or false
+	 * @return array list of revisors or false in case of an error
 	 */
 	function getDocumentsInRevision() { /* {{{ */
 		if (!$this->db->createTemporaryTable("ttrevisionid") || !$this->db->createTemporaryTable("ttcontentid")) {
 			return false;
 		}
 		$queryStr =
-			"SELECT `tblDocumentRevisors`.* FROM `tblDocumentRevisors` LEFT JOIN `ttrevisionid` ON `tblDocumentRevisors`.`revisionID` = `ttrevisionid`.`revisionID` LEFT JOIN `tblDocumentRevisionLog` ON `ttrevisionid`.`maxLogID` = `tblDocumentRevisionLog`.`revisionLogID` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` AND `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` WHERE `tblDocumentRevisionLog`.`status` in (0, -3) AND `ttcontentid`.`maxVersion` IS NOT NULL";
+			"SELECT `tblDocumentRevisors`.*, `tblDocumentRevisionLog`.`status` FROM `tblDocumentRevisors` LEFT JOIN `ttrevisionid` ON `tblDocumentRevisors`.`revisionID` = `ttrevisionid`.`revisionID` LEFT JOIN `tblDocumentRevisionLog` ON `ttrevisionid`.`maxLogID` = `tblDocumentRevisionLog`.`revisionLogID` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` AND `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` WHERE `tblDocumentRevisionLog`.`status` in (".S_LOG_WAITING.", ".S_LOG_SLEEPING.") AND `ttcontentid`.`maxVersion` IS NOT NULL";
 		$resArr = $this->db->getResultArray($queryStr);
 
 		return $resArr;

From 3e2e8e2591a697d9eb299bd972d292af2f236e3d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Sep 2022 12:52:04 +0200
Subject: [PATCH 1576/2006] getDocumentsInReception() returns status, though it
 should be 0

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index dabf91d7e..19ff51606 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -3820,7 +3820,7 @@ class SeedDMS_Core_DMS {
 			return false;
 		}
 		$queryStr =
-			"SELECT `tblDocumentRecipients`.* FROM `tblDocumentRecipients` LEFT JOIN `ttreceiptid` ON `tblDocumentRecipients`.`receiptID` = `ttreceiptid`.`receiptID` LEFT JOIN `tblDocumentReceiptLog` ON `ttreceiptid`.`maxLogID` = `tblDocumentReceiptLog`.`receiptLogID` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion`=`tblDocumentRecipients`.`version` AND `ttcontentid`.`document`=`tblDocumentRecipients`.`documentID` WHERE `tblDocumentReceiptLog`.`status`=0 AND `ttcontentid`.`maxVersion` IS NOT NULL";
+			"SELECT `tblDocumentRecipients`.*, `tblDocumentReceiptLog`.`status` FROM `tblDocumentRecipients` LEFT JOIN `ttreceiptid` ON `tblDocumentRecipients`.`receiptID` = `ttreceiptid`.`receiptID` LEFT JOIN `tblDocumentReceiptLog` ON `ttreceiptid`.`maxLogID` = `tblDocumentReceiptLog`.`receiptLogID` LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion`=`tblDocumentRecipients`.`version` AND `ttcontentid`.`document`=`tblDocumentRecipients`.`documentID` WHERE `tblDocumentReceiptLog`.`status`=0 AND `ttcontentid`.`maxVersion` IS NOT NULL";
 		$resArr = $this->db->getResultArray($queryStr);
 
 		return $resArr;

From 43e114101ae3784439fcfd6aa327222b728c3cc3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Sep 2022 12:53:05 +0200
Subject: [PATCH 1577/2006] issue msg if there are revisors in state 'sleeping'
 but no revision date

---
 views/bootstrap/class.ViewDocument.php | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 3a3c7134d..eaebf2a5a 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1744,19 +1744,13 @@ $(document).ready( function() {
 			$status = $latestContent->getStatus();
 			if($status['status'] == S_RELEASED) {
 				if($latestContent->getRevisionDate()) {
-?>
-				<div class="alert alert-warning">
-<?php
-				print getMLText('revise_document_on', array('date' => getReadableDate($latestContent->getRevisionDate())));
-?>
-				</div>
-<?php
+					$this->warningMsg(getMLText('revise_document_on', array('date' => getReadableDate($latestContent->getRevisionDate()))));
+				} else {
+					$this->errorMsg(getMLText('no_revision_date'));
 				}
-			} /*elseif($status['status'] != S_IN_REVISION) {
-?>
-				<div class="alert alert-info"><?= getMLText('no_revision_planed') ?></div>
-<?php
-				} */
+			} elseif($status['status'] != S_IN_REVISION) {
+				$this->infoMsg(getMLText('no_revision_planed'));
+			}
 //			$this->contentContainerStart();
 			print "<table class=\"table table-condensed table-sm\">\n";
 

From ff1c29561f3a8097b681a06bcb5f9b9eb8443227 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Sep 2022 12:54:53 +0200
Subject: [PATCH 1578/2006] update notes and release date

---
 SeedDMS_Core/package.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 6df7aaac2..a3e640b24 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,7 +12,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2022-08-31</date>
+ <date>2022-09-18</date>
  <time>13:44:55</time>
  <version>
   <release>6.0.20</release>
@@ -25,6 +25,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - all changes from 5.1.27 merged
+- SeedDMЅ_Core_DMS::getDocumentsInRevision() returns status from revision log
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From d9e6472fffc5daff021d60abfec262e37e99ff4f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Sep 2022 13:41:20 +0200
Subject: [PATCH 1579/2006] propperly check for action
 listDocsWithMissingRevisionDate

---
 out/out.ObjectCheck.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index fc22c2612..a616165cc 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -110,7 +110,7 @@ foreach(array('review', 'approval', 'receipt', 'revision') as $process) {
 }
 $docsinrevision = array();
 $docsmissingrevsiondate = array();
-if(!isset($_GET['action']) || $_GET['action'] == 'listDocsInRevisionNoAccess') {
+if(!isset($_GET['action']) || $_GET['action'] == 'listDocsWithMissingRevisionDate') {
 $tmprevs = $dms->getDocumentsInRevision();
 foreach($tmprevs as $rev) {
 	if($doc = $dms->getDocument($rev['documentID'])) {

From 3add16e06af26e19ec5b8890b4ad3ec7c678e562 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Sep 2022 13:42:22 +0200
Subject: [PATCH 1580/2006] use conversion manager for all lists

---
 views/bootstrap/class.ObjectCheck.php | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index b21860e09..d6e2aa46f 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -437,13 +437,17 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$docsinrevision = $this->params['docsinrevision'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$this->contentHeading(getMLText("docs_in_revision_no_access"));
 
@@ -457,13 +461,17 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$docsmissingrevsiondate = $this->params['docsmissingrevsiondate'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$this->contentHeading(getMLText("docs_with_missing_revision_date"));
 
@@ -477,13 +485,17 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$docsinreception = $this->params['docsinreception'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$this->contentHeading(getMLText("docs_in_revision_no_access"));
 
@@ -497,6 +509,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$processwithoutusergroup = $this->params['processwithoutusergroup'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewConverters'];
@@ -504,7 +517,10 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$repair = $this->params['repair'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
-		$previewer->setConverters($previewconverters);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$this->contentHeading(getMLText($process."s_without_".$ug));
 
@@ -617,6 +633,7 @@ $(document).ready( function() {
 		$docsinrevision = $this->params['docsinrevision'];
 		$docsinreception = $this->params['docsinreception'];
 		$processwithoutusergroup = $this->params['processwithoutusergroup'];
+		$docsmissingrevsiondate = $this->params['docsmissingrevsiondate'];
 		$wrongfiletypeversions = $this->params['wrongfiletypeversions'];
 		$repair = $this->params['repair'];
 		$unlink = $this->params['unlink'];

From 18a5306d3cff256b3dff51630422f1e88c38a722 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Sep 2022 07:09:13 +0200
Subject: [PATCH 1581/2006] check for revision date even if document is expired

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index eaebf2a5a..e49a4d4a0 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1742,7 +1742,7 @@ $(document).ready( function() {
 			<div class="tab-pane <?php if($currenttab == 'revision') echo 'active'; ?>" id="revision">
 <?php
 			$status = $latestContent->getStatus();
-			if($status['status'] == S_RELEASED) {
+			if(in_array($status['status'], [S_RELEASED, S_EXPIRED])) {
 				if($latestContent->getRevisionDate()) {
 					$this->warningMsg(getMLText('revise_document_on', array('date' => getReadableDate($latestContent->getRevisionDate()))));
 				} else {

From c3058176f3cba65d32f45266f25ae7d3542a63e9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Sep 2022 10:09:40 +0200
Subject: [PATCH 1582/2006] do not use plain html, but use methods from theme
 class

---
 views/bootstrap/class.SetRecipients.php | 95 ++++++++++++++-----------
 views/bootstrap/class.SetRevisors.php   | 94 +++++++++++++-----------
 2 files changed, 108 insertions(+), 81 deletions(-)

diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index 603576d54..851af0fcc 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -70,78 +70,93 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 	<input type='hidden' name='documentid' value='<?php echo $document->getID() ?>'/>
 	<input type='hidden' name='version' value='<?php echo $content->getVersion() ?>'/>
 
-<?php $this->contentContainerStart(); ?>
-
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("individuals")?>:</label>
-		<div class="controls">
-  <select class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
 <?php
+		$this->contentContainerStart();
 
+		$options = [];
 		foreach ($docAccess["users"] as $usr) {
 			if (isset($receiptIndex["i"][$usr->getID()])) {
 
 				switch ($receiptIndex["i"][$usr->getID()]["status"]) {
 					case 0:
-						print "<option value='". $usr->getID() ."' selected='selected'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName()), true);
 						break;
-					case -2:
-						print "<option value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+					case S_LOG_USER_REMOVED:
+						$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName()), false, array(array('data-subtitle', getMLText('user_previously_removed_from_recipients'))));
 						break;
 					default:
-						print "<option value='". $usr->getID() ."' disabled='disabled'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName()), false, ['disabled', 'disabled']);
 						break;
 				}
 			} else {
-				print "<option value='". $usr->getID() ."'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+				$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName()));
 			}
 		}
-?>
-  </select>
-		</div>
-	</div>
+		$this->formField(
+			getMLText("individuals"),
+			array(
+				'element'=>'select',
+				'id'=>'indRecipients',
+				'name'=>'indRecipients[]',
+				'class'=>'chzn-select',
+				'multiple'=>true,
+				'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_ind_recipients')), array('data-no_results_text', getMLText('unknown_user'))),
+				'options'=>$options
+			)
+		);
 
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("individuals_in_groups")?>:</label>
-		<div class="controls">
-  <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
+		$options = [];
 		foreach ($docAccess["groups"] as $group) {
-			print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+			$grpusers = $group->getUsers();
+			if(count($grpusers) == 0)
+				$optopt[] = ['disabled', 'disabled'];
+			$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'), false, $optopt);
 		}
-?>
-  </select>
-		</div>
-	</div>
+		$this->formField(
+			getMLText("individuals_in_groups"),
+			array(
+				'element'=>'select',
+				'id'=>'grpIndRecipients',
+				'name'=>'grpIndRecipients[]',
+				'class'=>'chzn-select',
+				'multiple'=>true,
+				'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_grp_ind_recipients')), array('data-no_results_text', getMLText('unknown_group'))),
+				'options'=>$options
+			)
+		);
 
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("groups")?>:</label>
-		<div class="controls">
-  <select class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
+		$options = [];
 		foreach ($docAccess["groups"] as $group) {
+			$grpusers = $group->getUsers();
 			if (isset($receiptIndex["g"][$group->getID()])) {
 				switch ($receiptIndex["g"][$group->getID()]["status"]) {
 					case 0:
-						print "<option value='". $group->getID() ."' selected='selected'>".htmlspecialchars($group->getName())."</option>";
+						$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'), true);
 						break;
-					case -2:
-						print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+					case S_LOG_USER_REMOVED:
+						$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'), false, array(array('data-subtitle', getMLText('group_previously_removed_from_recipients'))));
 						break;
 					default:
-						print "<option id='recGrp".$group->getID()."' type='checkbox' name='grpRecipients[]' value='". $group->getID() ."' disabled='disabled'>".htmlspecialchars($group->getName())."</option>";
+						$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'), false, array(array('disabled', 'disabled')));
 						break;
 				}
 			} else {
-				print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+				$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'));
 			}
 		}
-?>
-  </select>
-		</div>
-	</div>
+		$this->formField(
+			getMLText("groups"),
+			array(
+				'element'=>'select',
+				'id'=>'grpRecipients',
+				'name'=>'grpRecipients[]',
+				'class'=>'chzn-select',
+				'multiple'=>true,
+				'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_grp_recipients')), array('data-no_results_text', getMLText('unknown_group'))),
+				'options'=>$options
+			)
+		);
 
-<?php
 		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));
 ?>
diff --git a/views/bootstrap/class.SetRevisors.php b/views/bootstrap/class.SetRevisors.php
index 20b8b9abf..a18f856f0 100644
--- a/views/bootstrap/class.SetRevisors.php
+++ b/views/bootstrap/class.SetRevisors.php
@@ -82,14 +82,8 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 				$this->getDateChooser($startdate, "startdate", $this->params['session']->getLanguage())
 			);
 		}
-?>
-
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("individuals")?>:</label>
-		<div class="controls">
-			<select class="chzn-select span9" name="indRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>">
-<?php
 
+		$options = [];
 		foreach ($docAccess["users"] as $usr) {
 			if (isset($revisionIndex["i"][$usr->getID()])) {
 
@@ -98,67 +92,85 @@ class SeedDMS_View_SetRevisors extends SeedDMS_Theme_Style {
 					case S_LOG_SLEEPING:
 					case S_LOG_ACCEPTED:
 					case S_LOG_REJECTED:
-						print "<option value='". $usr->getID() ."' selected='selected'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName()), true);
 						break;
 					case S_LOG_USER_REMOVED:
-						print "<option value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName()), false, array(array('data-subtitle', getMLText('user_previously_removed_from_revisors'))));
 						break;
 					default:
-						print "<option value='". $usr->getID() ."' disabled='disabled'>".htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+						$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName()), false, ['disabled', 'disabled']);
 						break;
 				}
 			} else {
 				if (!$enableselfrevapp && $usr->getID()==$user->getID()) continue; 
-				print "<option value='". $usr->getID() ."'>". htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName())."</option>";
+				$options[] = array($usr->getID(), htmlspecialchars($usr->getLogin() . " - ". $usr->getFullName()));
 			}
 		}
-?>
-			</select>
-		</div>
-	</div>
-
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("individuals_in_groups")?>:</label>
-		<div class="controls">
-  <select class="chzn-select span9" name="grpIndRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
+		$this->formField(
+			getMLText("individuals"),
+			array(
+				'element'=>'select',
+				'id'=>'indRevisors',
+				'name'=>'indRevisors[]',
+				'class'=>'chzn-select',
+				'multiple'=>true,
+				'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_ind_revisors')), array('data-no_results_text', getMLText('unknown_user'))),
+				'options'=>$options
+			)
+		);
+		$options = [];
 		foreach ($docAccess["groups"] as $group) {
-			print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+			$optopt = [];
+			$grpusers = $group->getUsers();
+			if(count($grpusers) == 0)
+				$optopt[] = ['disabled', 'disabled'];
+			$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'), false, $optopt);
 		}
-?>
-			</select>
-		</div>
-	</div>
+		$this->formField(
+			getMLText("individuals_in_groups"),
+			array(
+				'element'=>'select',
+				'id'=>'grpIndRevisors',
+				'name'=>'grpIndRevisors[]',
+				'class'=>'chzn-select',
+				'multiple'=>true,
+				'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_grp_ind_revisors')), array('data-no_results_text', getMLText('unknown_group'))),
+				'options'=>$options
+			)
+		);
 
-	<div class="control-group">
-		<label class="control-label"><?php printMLText("groups")?>:</label>
-		<div class="controls">
-			<select class="chzn-select span9" name="grpRevisors[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_revisors'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>">
-<?php
+		$options = [];
 		foreach ($docAccess["groups"] as $group) {
+			$grpusers = $group->getUsers();
 			if (isset($revisionIndex["g"][$group->getID()])) {
 				switch ($revisionIndex["g"][$group->getID()]["status"]) {
 					case S_LOG_WAITING:
 					case S_LOG_SLEEPING:
-						print "<option value='". $group->getID() ."' selected='selected'>".htmlspecialchars($group->getName())."</option>";
+						$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'), true);
 						break;
 					case S_LOG_USER_REMOVED:
-						print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+						$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'), false, array(array('data-subtitle', getMLText('group_previously_removed_from_revisors'))));
 						break;
 					default:
-						print "<option id='recGrp".$group->getID()."' type='checkbox' name='grpRevisors[]' value='". $group->getID() ."' disabled='disabled'>".htmlspecialchars($group->getName())."</option>";
+						$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'), false, array(array('disabled', 'disabled')));
 						break;
 				}
 			} else {
-				print "<option value='". $group->getID() ."'>".htmlspecialchars($group->getName())."</option>";
+				$options[] = array($group->getID(), htmlspecialchars($group->getName().' ('.count($grpusers).')'));
 			}
 		}
-?>
-			</select>
-		</div>
-	</div>
-
-<?php
+		$this->formField(
+			getMLText("groups"),
+			array(
+				'element'=>'select',
+				'id'=>'grpRevisors',
+				'name'=>'grpRevisors[]',
+				'class'=>'chzn-select',
+				'multiple'=>true,
+				'attributes'=>array(array('data-allow-clear', 'true'), array('data-placeholder', getMLText('select_grp_revisors')), array('data-no_results_text', getMLText('unknown_group'))),
+				'options'=>$options
+			)
+		);
 		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('update'));
 ?>

From 4b9844262ca8fced227eec72a3a84c64707d3dd1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 21 Sep 2022 12:49:22 +0200
Subject: [PATCH 1583/2006] init variable

---
 views/bootstrap/class.SetRecipients.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.SetRecipients.php b/views/bootstrap/class.SetRecipients.php
index 851af0fcc..fd450cf9a 100644
--- a/views/bootstrap/class.SetRecipients.php
+++ b/views/bootstrap/class.SetRecipients.php
@@ -107,6 +107,7 @@ class SeedDMS_View_SetRecipients extends SeedDMS_Theme_Style {
 
 		$options = [];
 		foreach ($docAccess["groups"] as $group) {
+			$optopt = [];
 			$grpusers = $group->getUsers();
 			if(count($grpusers) == 0)
 				$optopt[] = ['disabled', 'disabled'];

From 2ce2fd07feca57aba09c08813cd32485569433e8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Nov 2022 12:22:23 +0100
Subject: [PATCH 1584/2006] add version 5.1.28 and updated notes of 6.0.21

---
 SeedDMS_Core/package.xml | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index be73778c1..589cbe144 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,11 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- fix SeedDMS_Core_User::getDocumentContents()
-- fix SeedDMS_Core_File::fileExtension()
-- SeedDMS_Core_DMS::createPasswordRequest() creates a cryptographically secure hash
-- fix sql error when deleting a folder attribute
-- add SeedDMS_Core_Attribute::getParsedValue() and use it in SeedDMS_Core_Object::getAttributeValue()
+- all changes from 5.1.28 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -2014,6 +2010,26 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
 - pass an array as an attribute to search() will OR each element
    </notes>
   </release>
+  <release>
+   <date>2022-11-07</date>
+   <time>13:44:55</time>
+   <version>
+    <release>5.1.28</release>
+    <api>5.1.28</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- fix SeedDMS_Core_User::getDocumentContents()
+- fix SeedDMS_Core_File::fileExtension()
+- SeedDMS_Core_DMS::createPasswordRequest() creates a cryptographically secure hash
+- fix sql error when deleting a folder attribute
+- add SeedDMS_Core_Attribute::getParsedValue() and use it in SeedDMS_Core_Object::getAttributeValue()
+   </notes>
+  </release>
   <release>
    <date>2017-02-28</date>
    <time>06:34:50</time>

From e422fcf67a71b2eccbcc822bc63b5462012b3359 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Nov 2022 13:31:10 +0100
Subject: [PATCH 1585/2006] checkout can be canceled if file disappeared, is
 obsolete

---
 op/op.CancelCheckOut.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/op/op.CancelCheckOut.php b/op/op.CancelCheckOut.php
index 209d37e4e..c13ac2404 100644
--- a/op/op.CancelCheckOut.php
+++ b/op/op.CancelCheckOut.php
@@ -38,7 +38,8 @@ $documentid = $_POST["documentid"];
 $document = $dms->getDocument($documentid);
 
 $checkoutstatus = $document->checkOutStatus();
-if($checkoutstatus != 3 && empty($settings->_enableCancelCheckout)) {
+/* Check out of files which has been changed, can only be canceled if allowed in the configuration */
+if($checkoutstatus == 0 && empty($settings->_enableCancelCheckout)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("operation_disallowed"));
 }
 

From 3e733b91cd03e0c5dd13e3a2b39867d20feddf34 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Nov 2022 13:31:47 +0100
Subject: [PATCH 1586/2006] check checkout status

---
 views/bootstrap/class.ViewDocument.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index aa8552d45..384e60b7d 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -422,6 +422,7 @@ $(document).ready( function() {
 			}
 			foreach($infos as $info) {
 				$checkoutuser = $dms->getUser($info['userID']);
+				$checkoutstatus = $document->checkOutStatus();
 				echo "<div class=\"alert alert-info\">";
 				echo "<a href=\"file://".$info['filename']."\">".getMLText('copied_to_checkout_as', array('date'=>getLongReadableDate(makeTsFromLongDate($info['date'])), 'filename'=>substr($info['filename'], strlen($checkoutpath)+1), 'username'=>($checkoutuser ? $checkoutuser->getFullName() : '')))."</a>";
 				echo "</div>";

From b8449289ac76b46cf710ac5f2110dd1c193114f1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 9 Nov 2022 13:33:18 +0100
Subject: [PATCH 1587/2006] do not even try to remove a checked out file if it
 doesn't exist anymore

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 3f941829f..992ff1af3 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1202,7 +1202,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				$db->rollbackTransaction();
 				return false;
 			}
-			if(!SeedDMS_Core_File::removeFile($info['filename'])) {
+			if(file_exists($info['filename']) && !SeedDMS_Core_File::removeFile($info['filename'])) {
 				$db->rollbackTransaction();
 				return false;
 			}

From b786e42bb3499a3d7c0059b6eec6d8744ee23d6c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 11 Nov 2022 14:47:42 +0100
Subject: [PATCH 1588/2006] fix inclusion of php files

---
 op/op.Acl.php                 | 2 +-
 op/op.AddToTransmittal.php    | 1 +
 op/op.CancelCheckOut.php      | 1 +
 op/op.CheckInDocument.php     | 1 +
 op/op.CheckOutDocument.php    | 2 +-
 op/op.RoleMgr.php             | 2 +-
 op/op.SchedulerTaskMgr.php    | 2 +-
 op/op.TransmittalDownload.php | 2 +-
 op/op.TransmittalMgr.php      | 2 +-
 9 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/op/op.Acl.php b/op/op.Acl.php
index 3289109e4..fc7f35baf 100644
--- a/op/op.Acl.php
+++ b/op/op.Acl.php
@@ -20,8 +20,8 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 require_once("../inc/inc.Settings.php");
-require_once("../inc/inc.LogInit.php");
 require_once("../inc/inc.Utils.php");
+require_once("../inc/inc.LogInit.php");
 require_once("../inc/inc.Language.php");
 require_once("../inc/inc.Init.php");
 require_once("../inc/inc.Extension.php");
diff --git a/op/op.AddToTransmittal.php b/op/op.AddToTransmittal.php
index de8d6c466..d81ca2133 100644
--- a/op/op.AddToTransmittal.php
+++ b/op/op.AddToTransmittal.php
@@ -18,6 +18,7 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
 include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
diff --git a/op/op.CancelCheckOut.php b/op/op.CancelCheckOut.php
index c13ac2404..bc4d5bab0 100644
--- a/op/op.CancelCheckOut.php
+++ b/op/op.CancelCheckOut.php
@@ -17,6 +17,7 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
 include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 41f4a1407..47853f199 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -17,6 +17,7 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
 include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
diff --git a/op/op.CheckOutDocument.php b/op/op.CheckOutDocument.php
index f6569ef22..1e22c7ffc 100644
--- a/op/op.CheckOutDocument.php
+++ b/op/op.CheckOutDocument.php
@@ -17,8 +17,8 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
diff --git a/op/op.RoleMgr.php b/op/op.RoleMgr.php
index 62878bbb7..d0cdf6cb0 100644
--- a/op/op.RoleMgr.php
+++ b/op/op.RoleMgr.php
@@ -20,8 +20,8 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
diff --git a/op/op.SchedulerTaskMgr.php b/op/op.SchedulerTaskMgr.php
index c38c5e595..19f989e36 100644
--- a/op/op.SchedulerTaskMgr.php
+++ b/op/op.SchedulerTaskMgr.php
@@ -20,8 +20,8 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
diff --git a/op/op.TransmittalDownload.php b/op/op.TransmittalDownload.php
index 57abc5b1f..f5e3de544 100644
--- a/op/op.TransmittalDownload.php
+++ b/op/op.TransmittalDownload.php
@@ -20,9 +20,9 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
 include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
-include("../inc/inc.Utils.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
diff --git a/op/op.TransmittalMgr.php b/op/op.TransmittalMgr.php
index 73bbc1f52..f58f6de12 100644
--- a/op/op.TransmittalMgr.php
+++ b/op/op.TransmittalMgr.php
@@ -20,8 +20,8 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");

From e2e52d61b17bb53e54ca1b1d5154761047fdfe0f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Nov 2022 08:16:51 +0100
Subject: [PATCH 1589/2006] fix output, add translations

---
 views/bootstrap/class.ObjectCheck.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index d6e2aa46f..6a6f289fe 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -127,12 +127,13 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 						if(is_string($txt))
 							echo $txt;
 						else
-							echo $this->documentListRow($document, $previewer, false);
+							echo $this->documentListRow($document, $previewer, true);
 						echo "<td>".$object['msg'];
 						if($repair)
 							$document->repair();
 						echo "</td>";
 						$needsrepair = true;
+						echo $this->documentListRowEnd($document);
 					}
 				} elseif($object['object']->isType('documentcontent')) {
 					$document = $object['object']->getDocument();
@@ -184,7 +185,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("id")."</th>\n";
-			print "<th>".getMLText("parent")."</th>\n";
+			print "<th>".getMLText("parent_folder")."</th>\n";
 			print "<th></th>\n";
 			print "<th>".getMLText("error")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
@@ -194,7 +195,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 				echo "<td>".$error['id']."</td>";
 				echo "<td>".$error['parent']."</td>";
 				echo "<td>".$error['msg']."</td>";
-				echo "<td><a class=\"btn movefolder\" source=\"".$error['id']."\" dest=\"".$rootfolder->getID()."\" formtoken=\"".createFormKey('movefolder')."\">Move</a> </td>";
+				echo "<td><a class=\"btn btn-primary btn-mini btn-sm movefolder\" source=\"".$error['id']."\" dest=\"".$rootfolder->getID()."\" formtoken=\"".createFormKey('movefolder')."\" title=\"".getMLText("move_into_rootfolder")."\">".getMLText('move')."</a> </td>";
 				echo "</tr>";
 			}
 			print "</tbody></table>\n";
@@ -205,6 +206,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
+		$rootfolder = $this->params['rootfolder'];
 		$unlinkeddocuments = $this->params['unlinkeddocuments'];
 
 		$this->contentHeading(getMLText("unlinked_documents"));
@@ -213,7 +215,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("id")."</th>\n";
-			print "<th>".getMLText("parent")."</th>\n";
+			print "<th>".getMLText("parent_folder")."</th>\n";
 			print "<th>".getMLText("error")."</th>\n";
 			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
@@ -223,7 +225,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 				echo "<td>".$error['id']."</td>";
 				echo "<td>".$error['parent']."</td>";
 				echo "<td>".$error['msg']."</td>";
-				echo "<td><a class=\"btn movedocument\" source=\"".$error['id']."\" dest=\"".$rootfolder->getID()."\" formtoken=\"".createFormKey('movedocument')."\">Move</a> </td>";
+				echo "<td><a class=\"btn btn-primary btn-mini btn-sm movedocument\" source=\"".$error['id']."\" dest=\"".$rootfolder->getID()."\" formtoken=\"".createFormKey('movedocument')."\" title=\"".getMLText("move_into_rootfolder")."\">".getMLText('move')."</a> </td>";
 				echo "</tr>";
 			}
 			print "</tbody></table>\n";

From 863c3f971c5b67b58ed0eefd52e31208588fe7c4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Nov 2022 08:39:09 +0100
Subject: [PATCH 1590/2006] add list of folders containing duplicate sequences

---
 out/out.ObjectCheck.php               |  1 +
 views/bootstrap/class.ObjectCheck.php | 32 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index 58248e711..591873cee 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -240,6 +240,7 @@ if($view) {
 	$view->setParam('nochecksumversions', $nochecksumversions);
 	$view->setParam('wrongfiletypeversions', $wrongfiletypeversions);
 	$view->setParam('duplicateversions', $duplicateversions);
+	$view->setParam('duplicatesequences', $duplicatesequences);
 	$view->setParam('docsinrevision', $docsinrevision);
 	$view->setParam('docsmissingrevsiondate', $docsmissingrevsiondate);
 	$view->setParam('docsinreception', $docsinreception);
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 6a6f289fe..293bc84b0 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -434,6 +434,36 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		}
 } /* }}} */
 
+	function listDuplicateSequence() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$duplicatesequences = $this->params['duplicatesequences'];
+
+		$this->contentHeading(getMLText("duplicate_sequences"));
+
+		if($duplicatesequences) {
+			print "<table class=\"table table-condensed\">";
+			print "<thead><tr>\n";
+			print "<th></th>\n";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("owner")."</th>\n";
+			print "<th>".getMLText("actions")."</th>\n";
+			print "</tr></thead>\n<tbody>\n";
+			foreach($duplicatesequences as $fld) {
+				echo $this->folderListRowStart($fld);
+				$txt = $this->callHook('folderListItem', $fld, true, 'viewfolder');
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo $this->folderListRow($fld, true);
+				}
+				echo $this->folderListRowEnd($fld);
+			}
+			print "</tbody></table>";
+		}
+} /* }}} */
+
 	function listDocsInRevisionNoAccess() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -632,6 +662,7 @@ $(document).ready( function() {
 		$nofilesizeversions = $this->params['nofilesizeversions'];
 		$nochecksumversions = $this->params['nochecksumversions'];
 		$duplicateversions = $this->params['duplicateversions'];
+		$duplicatesequences = $this->params['duplicatesequences'];
 		$docsinrevision = $this->params['docsinrevision'];
 		$docsinreception = $this->params['docsinreception'];
 		$processwithoutusergroup = $this->params['processwithoutusergroup'];
@@ -666,6 +697,7 @@ $(document).ready( function() {
 		$this->contentHeading(getMLText("object_check_warning"));
 		$menuitems = [];
 		$menuitems[] = array('label'=>getMLText('duplicate_content'), 'badge'=>count($duplicateversions), 'attributes'=>array(array('data-href', "#duplicate_content"), array('data-action', "listDuplicateContent")));
+		$menuitems[] = array('label'=>getMLText('duplicate_sequences'), 'badge'=>count($duplicatesequences), 'attributes'=>array(array('data-href', "#duplicate_sequences"), array('data-action', "listDuplicateSequence")));
 		$menuitems[] = array('label'=>getMLText('docs_in_revision_no_access'), 'badge'=>count($docsinrevision), 'attributes'=>array(array('data-href', "#inrevision_no_access"), array('data-action', "listDocsInRevisionNoAccess")));
 		$menuitems[] = array('label'=>getMLText('docs_in_reception_no_access'), 'badge'=>count($docsinreception), 'attributes'=>array(array('data-href', "#inreception_no_access"), array('data-action', "listDocsInReceptionNoAccess")));
 		$menuitems[] = array('label'=>getMLText('docs_with_missing_revision_date'), 'badge'=>count($docsmissingrevsiondate), 'attributes'=>array(array('data-href', "#missing_revision_date"), array('data-action', "listDocsWithMissingRevisionDate")));

From 3b473edd253c43d98b513f4ab8e59cb579455f81 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Nov 2022 16:25:22 +0100
Subject: [PATCH 1591/2006] add button to reorder docs in a folder if sequence
 numbers are not unique

---
 out/out.ObjectCheck.php               |  6 ++++++
 views/bootstrap/class.ObjectCheck.php | 24 ++++++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index 591873cee..47f345a0c 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -229,6 +229,11 @@ if(!isset($_GET['action']) || $_GET['action'] == 'listRepair')
 else
 	$repairobjects = null;
 
+if(isset($_GET['repairfolderid']) && is_numeric($_GET['repairfolderid']))
+	$repairfolder = $dms->getFolder($_GET['repairfolderid']);
+else
+	$repairfolder = null;
+
 if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('showtree', showtree());
@@ -250,6 +255,7 @@ if($view) {
 	$view->setParam('setchecksum', $setchecksum);
 	$view->setParam('setfiletype', $setfiletype);
 	$view->setParam('repair', $repair);
+	$view->setParam('repairfolder', $repairfolder);
 	$view->setParam('showtree', showtree());
 	$view->setParam('rootfolder', $rootfolder);
 	$view->setParam('repairobjects', $repairobjects);
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 293bc84b0..c6eb322ca 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -186,8 +186,8 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("id")."</th>\n";
 			print "<th>".getMLText("parent_folder")."</th>\n";
-			print "<th></th>\n";
 			print "<th>".getMLText("error")."</th>\n";
+//			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($unlinkedfolders as $error) {
 				echo "<tr>";
@@ -195,7 +195,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 				echo "<td>".$error['id']."</td>";
 				echo "<td>".$error['parent']."</td>";
 				echo "<td>".$error['msg']."</td>";
-				echo "<td><a class=\"btn btn-primary btn-mini btn-sm movefolder\" source=\"".$error['id']."\" dest=\"".$rootfolder->getID()."\" formtoken=\"".createFormKey('movefolder')."\" title=\"".getMLText("move_into_rootfolder")."\">".getMLText('move')."</a> </td>";
+//				echo "<td><a class=\"btn btn-primary btn-mini btn-sm movefolder\" source=\"".$error['id']."\" dest=\"".$rootfolder->getID()."\" formtoken=\"".createFormKey('movefolder')."\" title=\"".getMLText("move_into_rootfolder")."\">".getMLText('move')."</a> </td>";
 				echo "</tr>";
 			}
 			print "</tbody></table>\n";
@@ -217,7 +217,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 			print "<th>".getMLText("id")."</th>\n";
 			print "<th>".getMLText("parent_folder")."</th>\n";
 			print "<th>".getMLText("error")."</th>\n";
-			print "<th></th>\n";
+//			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 			foreach($unlinkeddocuments as $error) {
 				echo "<tr>";
@@ -225,7 +225,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 				echo "<td>".$error['id']."</td>";
 				echo "<td>".$error['parent']."</td>";
 				echo "<td>".$error['msg']."</td>";
-				echo "<td><a class=\"btn btn-primary btn-mini btn-sm movedocument\" source=\"".$error['id']."\" dest=\"".$rootfolder->getID()."\" formtoken=\"".createFormKey('movedocument')."\" title=\"".getMLText("move_into_rootfolder")."\">".getMLText('move')."</a> </td>";
+//				echo "<td><a class=\"btn btn-primary btn-mini btn-sm movedocument\" source=\"".$error['id']."\" dest=\"".$rootfolder->getID()."\" formtoken=\"".createFormKey('movedocument')."\" title=\"".getMLText("move_into_rootfolder")."\">".getMLText('move')."</a> </td>";
 				echo "</tr>";
 			}
 			print "</tbody></table>\n";
@@ -438,6 +438,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
+		$repairfolder = $this->params['repairfolder'];
 		$duplicatesequences = $this->params['duplicatesequences'];
 
 		$this->contentHeading(getMLText("duplicate_sequences"));
@@ -449,6 +450,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 			print "<th>".getMLText("name")."</th>\n";
 			print "<th>".getMLText("owner")."</th>\n";
 			print "<th>".getMLText("actions")."</th>\n";
+			print "<th></th>\n";
 			print "</tr></thead>\n<tbody>\n";
 			foreach($duplicatesequences as $fld) {
 				echo $this->folderListRowStart($fld);
@@ -458,6 +460,15 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 				else {
 					echo $this->folderListRow($fld, true);
 				}
+				echo "<td>";
+				if($repairfolder && ($fld->getId() == $repairfolder->getId())) {
+					if($fld->reorderDocuments())
+						echo "Ok";
+					else
+						echo "Error";
+				} else
+					echo "<a class=\"btn btn-primary btn-mini btn-sm reorder\" data-action=\"listDuplicateSequence\" data-repairfolderid=\"".$fld->getId()."\" title=\"".getMLText("reorder_documents_in_folder")."\">".getMLText('reorder')."</a>";
+				echo "</td>";
 				echo $this->folderListRowEnd($fld);
 			}
 			print "</tbody></table>";
@@ -642,6 +653,11 @@ $(document).ready( function() {
 		$('#kkkk.ajax').data('action', $(this).data('action'));
 		$('#kkkk.ajax').trigger('update', {repair: 1, required: $(this).data('required')});
 	});
+	$('body').on('click', 'a.reorder', function(ev){
+		ev.preventDefault();
+		$('#kkkk.ajax').data('action', $(this).data('action'));
+		$('#kkkk.ajax').trigger('update', {repair: 1, repairfolderid: $(this).data('repairfolderid')});
+	});
 	$('body').on('click', 'table th a', function(ev){
 		ev.preventDefault();
 		$('#kkkk.ajax').data('action', $(this).data('action'));

From 9c740db936ce999e9c817a479cf7cd79fc2ea8d7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 14 Nov 2022 17:23:26 +0100
Subject: [PATCH 1592/2006] add changes of 6.0.21

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e477f6e5a..45d0fe2db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 --------------------------------------------------------------------------------
                      Changes in version 6.0.21
 --------------------------------------------------------------------------------
+- merge changes up to 5.1.27
+- add new check for documents with identical sequence numbers in a folder
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.20

From 4e1e126783a7f53459aece1e371fccab61b9f2ee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Nov 2022 16:32:06 +0100
Subject: [PATCH 1593/2006] propperly rollback addDocument() if add categories
 fails

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 23324676f..59ab9b811 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -1059,7 +1059,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		}
 
 		if($categories) {
-			$document->setCategories($categories);
+			if(!$document->setCategories($categories)) {
+				$document->remove();
+				$db->rollbackTransaction();
+				return false;
+			}
 		}
 
 		if($attributes) {

From c93d42228db644ed1ccab5312cc78c5886d811b0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Nov 2022 16:32:37 +0100
Subject: [PATCH 1594/2006] start new version 5.1.29

---
 SeedDMS_Core/package.xml | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 9701ea3f9..8427b476e 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2022-11-07</date>
+ <date>2022-11-21</date>
  <time>13:44:55</time>
  <version>
-  <release>5.1.28</release>
-  <api>5.1.28</api>
+  <release>5.1.29</release>
+  <api>5.1.29</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,15 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- fix SeedDMS_Core_User::getDocumentContents()
-- fix SeedDMS_Core_File::fileExtension()
-- SeedDMS_Core_DMS::createPasswordRequest() creates a cryptographically secure hash
-- fix sql error when deleting a folder attribute
-- add SeedDMS_Core_Attribute::getParsedValue() and use it in SeedDMS_Core_Object::getAttributeValue()
-- add SeedDMS_Core_DMS::getDuplicateSequenceNo() and SeedDMS_Core_Folder::reorderDocuments()
-- add SeedDMS_Core_File::mimetype(), fix SeedDMS_Core_File::moveDir()
-- all file operations use methods of SeedDMS_Core_File
-- change namespace of iterators from SeedDMS to SeedDMS\Core
+- SeedDMS_Core_Folder::addDocument() does rollback transaction propperly when setting document categories fail
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -2016,5 +2008,29 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
 - pass an array as an attribute to search() will OR each element
    </notes>
   </release>
+  <release>
+   <date>2022-11-07</date>
+   <time>13:44:55</time>
+   <version>
+    <release>5.1.28</release>
+    <api>5.1.28</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- fix SeedDMS_Core_User::getDocumentContents()
+- fix SeedDMS_Core_File::fileExtension()
+- SeedDMS_Core_DMS::createPasswordRequest() creates a cryptographically secure hash
+- fix sql error when deleting a folder attribute
+- add SeedDMS_Core_Attribute::getParsedValue() and use it in SeedDMS_Core_Object::getAttributeValue()
+- add SeedDMS_Core_DMS::getDuplicateSequenceNo() and SeedDMS_Core_Folder::reorderDocuments()
+- add SeedDMS_Core_File::mimetype(), fix SeedDMS_Core_File::moveDir()
+- all file operations use methods of SeedDMS_Core_File
+- change namespace of iterators from SeedDMS to SeedDMS\Core
+   </notes>
+  </release>
  </changelog>
 </package>

From 0073b00c5ed3a86066973d54c8272b3048f43459 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Nov 2022 16:33:02 +0100
Subject: [PATCH 1595/2006] fix calling changeFolderAccess()

---
 restapi/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index f9fcecbce..982b9f98a 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -2268,19 +2268,19 @@ class RestapiController { /* {{{ */
     } /* }}} */
 
     function addUserAccessToFolder($request, $response, $args) { /* {{{ */
-        return changeFolderAccess($request, $response, $args, 'add', 'user');
+        return $this->changeFolderAccess($request, $response, $args, 'add', 'user');
     } /* }}} */
 
     function addGroupAccessToFolder($request, $response, $args) { /* {{{ */
-        return changeFolderAccess($request, $response, $args, 'add', 'group');
+        return $this->changeFolderAccess($request, $response, $args, 'add', 'group');
     } /* }}} */
 
     function removeUserAccessFromFolder($request, $response, $args) { /* {{{ */
-        return changeFolderAccess($request, $response, $args, 'remove', 'user');
+        return $this->changeFolderAccess($request, $response, $args, 'remove', 'user');
     } /* }}} */
 
     function removeGroupAccessFromFolder($request, $response, $args) { /* {{{ */
-        return changeFolderAccess($request, $response, $args, 'remove', 'group');
+        return $this->changeFolderAccess($request, $response, $args, 'remove', 'group');
     } /* }}} */
 
     function changeFolderAccess($request, $response, $args, $operationType, $userOrGroup) { /* {{{ */

From 4fe2f97fea131149935efb382da7262949c77078 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 21 Nov 2022 16:33:38 +0100
Subject: [PATCH 1596/2006] js code for drag&drop upload is added even if user
 has no access on folder

---
 views/bootstrap/class.ViewFolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index ba6ca4306..469d80185 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -235,7 +235,7 @@ $('body').on('click', '.order-btn', function(ev) {
 		if($showtree == 1)
 			$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, 'maintree', ($expandFolderTree == 1) ? -1 : 3, $orderby);
 
-		if ($enableDropUpload && $folder->getAccessMode($user) >= M_READWRITE) {
+		if ($enableDropUpload /*&& $folder->getAccessMode($user) >= M_READWRITE*/) {
 			echo "SeedDMSUpload.setUrl('".$this->params['settings']->_httpRoot."op/op.Ajax.php');";
 			echo "SeedDMSUpload.setAbortBtnLabel('".getMLText("cancel")."');";
 			echo "SeedDMSUpload.setEditBtnLabel('".getMLText("edit_document_props")."');";

From 3af5b0f94361e273ff32baf17495dd4bc7bd1e76 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 22 Nov 2022 06:52:44 +0100
Subject: [PATCH 1597/2006] new version 5.1.29

---
 CHANGELOG           | 6 ++++++
 inc/inc.Version.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9ffacd301..63de07fee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.29
+--------------------------------------------------------------------------------
+- fix php errors in restapi
+- fix 'maximum size' error when uploading a file with drag&drop
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.28
 --------------------------------------------------------------------------------
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 2ef1672af..552f28df9 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version { /* {{{ */
 
-	const _number = "5.1.28";
+	const _number = "5.1.29";
 	const _string = "SeedDMS";
 
 	function __construct() {

From 823d98b261dfd9c4b4667f7d41b0d02f0ab9f7a9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 09:44:23 +0100
Subject: [PATCH 1598/2006] add a render function for hashed passwords

---
 op/op.ImportUsers.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index bd86036dd..af34d607c 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -49,6 +49,10 @@ function getPasswordPlainData($colname, $coldata, $objdata) { /* {{{ */
 	return $objdata;
 } /* }}} */
 
+function renderPasswordHashedData($colname, $objdata) { /* {{{ */
+	return substr($objdata[$colname], 0, 16).'...';
+} /* }}} */
+
 function renderPasswordPlainData($colname, $objdata) { /* {{{ */
 	return $objdata[$colname];
 } /* }}} */
@@ -181,6 +185,8 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
 					$colmap[$i] = array("getFolderData", "renderFolderData", $colname);
 				} elseif(in_array($colname, array('quota'))) {
 					$colmap[$i] = array("getQuotaData", "renderQuotaData", $colname);
+				} elseif(in_array($colname, array('passenc'))) {
+					$colmap[$i] = array("getBaseData", "renderPasswordHashedData", $colname);
 				} elseif(in_array($colname, array('password'))) {
 					/* getPasswordPlainData() will set 'passenc' */
 					$colmap[$i] = array("getPasswordPlainData", "renderPasswordPlainData", 'passenc');

From 63ca342576082e7780a53585e20e7526b2d5f3e3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 09:44:43 +0100
Subject: [PATCH 1599/2006] show warning if import file has no users or misses
 a header line

---
 views/bootstrap/class.ImportUsers.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/views/bootstrap/class.ImportUsers.php b/views/bootstrap/class.ImportUsers.php
index 6d5eef3a5..d06e18b15 100644
--- a/views/bootstrap/class.ImportUsers.php
+++ b/views/bootstrap/class.ImportUsers.php
@@ -120,6 +120,11 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Theme_Style {
 			}
 				 */
 			echo "</table>";
+		} else {
+			if($colmap)
+				$this->warningMsg(getMLText('import_users_no_users'));
+			else
+				$this->warningMsg(getMLText('import_users_no_column_mapping'));
 		}
 		$this->columnEnd();
 		$this->rowEnd();

From 7854f75c8c1e53b8064e2301229f1f0338252d70 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 11:01:14 +0100
Subject: [PATCH 1600/2006] add unsafe-inline to csp rule, because of jquery
 3.6.1

---
 views/bootstrap4/class.Bootstrap4.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 0568bd0f6..80f0ecfc4 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -57,9 +57,11 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 			 * X-Content-Security-Policy is deprecated, Firefox understands
 			 * Content-Security-Policy since version 23+
 			 * 'worker-src blob:' is needed for cytoscape
+			 * 'unsafe-inline' is needed for jquery 3.6.1 when loading the remote
+			 * content of a modal box
 			 */
 			$csp_rules = [];
-			$csp_rule = "script-src 'self' 'unsafe-eval'";
+			$csp_rule = "script-src 'self' 'unsafe-eval' 'unsafe-inline'";
 			if($this->nonces) {
 				$csp_rule .= " 'nonce-".implode("' 'nonce-", $this->nonces)."'";
 			}

From d3d7956f4ea6bf59dd8e5fd063fc27372a76ea05 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 11:01:31 +0100
Subject: [PATCH 1601/2006] set data-remote of button to open a modal box with
 content loaded from remote

---
 views/bootstrap4/class.Bootstrap4.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 80f0ecfc4..db21e46ef 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1363,8 +1363,10 @@ function getOverallStatusIcon($status) { /* {{{ */
 	function getModalBoxLinkAttributes($config) { /* {{{ */
 		$attrs = array();
 		$attrs[] = array('data-target', '#'.$config['target']);
-		if(isset($config['remote']))
+		if(isset($config['remote'])) {
 			$attrs[] = array('href', $config['remote']);
+			$attrs[] = array('data-remote', $config['remote']);
+		}
 		$attrs[] = array('data-toggle', 'modal');
 		$attrs[] = array('role', 'button');
 		if(isset($config['class'])) {

From 3e61d93049dfce6c2b695d184a900411a5512ee9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 11:02:07 +0100
Subject: [PATCH 1602/2006] add changes for 5.1.29

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 63de07fee..35816796c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - fix php errors in restapi
 - fix 'maximum size' error when uploading a file with drag&drop
+- update jquery to 3.6.1 (only bootstrap4 theme)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.28

From 53389d9054fa460c93a11fa8c781d8e7f24428e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 12:38:59 +0100
Subject: [PATCH 1603/2006] do cookie handling and session update only if
 logged in via web page

---
 controllers/class.Login.php | 134 +++++++++++++++++++-----------------
 1 file changed, 70 insertions(+), 64 deletions(-)

diff --git a/controllers/class.Login.php b/controllers/class.Login.php
index b8bec3cfa..d30739bf0 100644
--- a/controllers/class.Login.php
+++ b/controllers/class.Login.php
@@ -35,9 +35,10 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 		$dms = $this->params['dms'];
 		$settings = $this->params['settings'];
 		$session = $this->params['session'];
-		$sesstheme = $this->params['sesstheme'];
-		$referuri = $this->params['referuri'];
-		$lang = $this->params['lang'];
+		$source = isset($this->params['source']) ? $this->params['source'] : '';
+		$sesstheme = $this->getParam('sesstheme');
+		$referuri = $this->getParam('referuri');
+		$lang = $this->getParam('lang');
 		$login = $this->params['login'];
 		$pwd = $this->params['pwd'];
 
@@ -75,7 +76,7 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 		 * return false and if the hook doesn't care at all, if must return null.
 		 */
 		if(!$user) {
-			$user = $this->callHook('authenticate');
+			$user = $this->callHook('authenticate', $source);
 			if(false === $user) {
 				if(empty($this->errormsg))
 					$this->setErrorMsg("authentication_failed");
@@ -166,73 +167,78 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 		/* Clear login failures if login was successful */
 		$user->clearLoginFailures();
 
-		// Capture the user's language and theme settings.
-		if ($lang) {
-			$user->setLanguage($lang);
-		} else {
-			$lang = $user->getLanguage();
-			if (strlen($lang)==0) {
-				$lang = $settings->_language;
+		/* Setting the theme and language and all the cookie handling is
+		 * only done when authentication was requested from a weg page.
+		 */
+		if($source == 'web') {
+			// Capture the user's language and theme settings.
+			if ($lang) {
 				$user->setLanguage($lang);
-			}
-		}
-		if ($sesstheme) {
-			$user->setTheme($sesstheme);
-		}
-		else {
-			$sesstheme = $user->getTheme();
-			/* Override the theme if the user doesn't have one or the default theme
-			 * shall override it.
-			 */
-			if (strlen($sesstheme)==0 || !empty($settings->_overrideTheme)) {
-				$sesstheme = $settings->_theme;
-		//		$user->setTheme($sesstheme);
-			}
-		}
-
-		// Delete all sessions that are more than 1 week or the configured
-		// cookie lifetime old. Probably not the most
-		// reliable place to put this check -- move to inc.Authentication.php?
-		if($settings->_cookieLifetime)
-			$lifetime = intval($settings->_cookieLifetime);
-		else
-			$lifetime = 7*86400;
-		if(!$session->deleteByTime($lifetime)) {
-			$this->setErrorMsg("error_occured");
-			return false;
-		}
-
-		if (isset($_COOKIE["mydms_session"])) {
-			/* This part will never be reached unless the session cookie is kept,
-			 * but op.Logout.php deletes it. Keeping a session could be a good idea
-			 * for retaining the clipboard data, but the user id in the session should
-			 * be set to 0 which is not possible due to foreign key constraints.
-			 * So for now op.Logout.php will delete the cookie as always
-			 */
-			/* Load session */
-			$dms_session = $_COOKIE["mydms_session"];
-			if(!$resArr = $session->load($dms_session)) {
-				/* Turn off http only cookies if jumploader is enabled */
-				setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, null, false, true); //delete cookie
-				header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$referuri);
-				exit;
 			} else {
-				$session->updateAccess($dms_session);
-				$session->setUser($userid);
+				$lang = $user->getLanguage();
+				if (strlen($lang)==0) {
+					$lang = $settings->_language;
+					$user->setLanguage($lang);
+				}
 			}
-		} else {
-			// Create new session in database
-			if(!$id = $session->create(array('userid'=>$userid, 'theme'=>$sesstheme, 'lang'=>$lang))) {
+			if ($sesstheme) {
+				$user->setTheme($sesstheme);
+			}
+			else {
+				$sesstheme = $user->getTheme();
+				/* Override the theme if the user doesn't have one or the default theme
+				 * shall override it.
+				 */
+				if (strlen($sesstheme)==0 || !empty($settings->_overrideTheme)) {
+					$sesstheme = $settings->_theme;
+			//		$user->setTheme($sesstheme);
+				}
+			}
+
+			// Delete all sessions that are more than 1 week or the configured
+			// cookie lifetime old. Probably not the most
+			// reliable place to put this check -- move to inc.Authentication.php?
+			if($settings->_cookieLifetime)
+				$lifetime = intval($settings->_cookieLifetime);
+			else
+				$lifetime = 7*86400;
+			if(!$session->deleteByTime($lifetime)) {
 				$this->setErrorMsg("error_occured");
 				return false;
 			}
 
-			// Set the session cookie.
-			if($settings->_cookieLifetime)
-				$lifetime = time() + intval($settings->_cookieLifetime);
-			else
-				$lifetime = 0;
-			setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, false, true);
+			if (isset($_COOKIE["mydms_session"])) {
+				/* This part will never be reached unless the session cookie is kept,
+				 * but op.Logout.php deletes it. Keeping a session could be a good idea
+				 * for retaining the clipboard data, but the user id in the session should
+				 * be set to 0 which is not possible due to foreign key constraints.
+				 * So for now op.Logout.php will delete the cookie as always
+				 */
+				/* Load session */
+				$dms_session = $_COOKIE["mydms_session"];
+				if(!$resArr = $session->load($dms_session)) {
+					/* Turn off http only cookies if jumploader is enabled */
+					setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot, null, false, true); //delete cookie
+					header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$referuri);
+					exit;
+				} else {
+					$session->updateAccess($dms_session);
+					$session->setUser($userid);
+				}
+			} else {
+				// Create new session in database
+				if(!$id = $session->create(array('userid'=>$userid, 'theme'=>$sesstheme, 'lang'=>$lang))) {
+					$this->setErrorMsg("error_occured");
+					return false;
+				}
+
+				// Set the session cookie.
+				if($settings->_cookieLifetime)
+					$lifetime = time() + intval($settings->_cookieLifetime);
+				else
+					$lifetime = 0;
+				setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, false, true);
+			}
 		}
 
 		if($this->callHook('postLogin', $user)) {

From ec38938d8df7cc03a9fb7af2cff82e7b434a9642 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 12:39:37 +0100
Subject: [PATCH 1604/2006] include Log.php

---
 webdav/index.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webdav/index.php b/webdav/index.php
index a6be8fa13..c34f450c3 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -1,6 +1,7 @@
 <?php
 include("../inc/inc.Settings.php");
 
+include("Log.php");
 require_once("../inc/inc.Language.php");
 require_once("../inc/inc.Utils.php");
 

From 2556bf5b3f6b0299ec5ad193a98654a098681266 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 12:39:57 +0100
Subject: [PATCH 1605/2006] set 'source' = 'web' for controller

---
 op/op.Login.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.Login.php b/op/op.Login.php
index 04519ce8a..ab3dc455d 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -84,6 +84,7 @@ add_log_line();
 
 $controller->setParam('login', $login);
 $controller->setParam('pwd', $pwd);
+$controller->setParam('source', 'web');
 $controller->setParam('lang', $lang);
 $controller->setParam('sesstheme', $sesstheme);
 $controller->setParam('referuri', $referuri);

From 4e528975b899ab5a637c9d6605e32d88add632dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 12:40:25 +0100
Subject: [PATCH 1606/2006] use Login controller

---
 webdav/webdav.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/webdav/webdav.php b/webdav/webdav.php
index a893d1374..69faf1d23 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -153,6 +153,25 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		if($this->logger)
 			$this->logger->log('check_auth: type='.$type.', user='.$user.'', PEAR_LOG_INFO);
 
+		$controller = Controller::factory('Login', array('dms'=>$this->dms));
+		$controller->setParam('login', $user);
+		$controller->setParam('pwd', $pass);
+		$controller->setParam('source', 'webdav');
+		if(!$controller()) {
+			if($this->logger) {
+				$this->logger->log($controller->getErrorMsg(), PEAR_LOG_NOTICE);
+				$this->logger->log('check_auth: error authenicating user '.$user, PEAR_LOG_NOTICE);
+			}
+			return false;
+		}
+
+		if($this->logger)
+			$this->logger->log('check_auth: type='.$type.', user='.$user.' authenticated', PEAR_LOG_INFO);
+
+		$this->user = $controller->getUser();
+
+		return true;
+
 		$userobj = false;
 
 		/* Authenticate against LDAP server {{{ */

From e4be5465be5dcc00d2ef50f1c726d05fd4e51fb6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 24 Nov 2022 17:16:43 +0100
Subject: [PATCH 1607/2006] issue propper err msg when view access is
 prohibited

---
 out/out.AddDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index b00a6884c..84df7af84 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -34,7 +34,7 @@ $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 $accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 if (!$accessop->check_view_access($view, $_GET)) {
-	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));
+	UI::exitError(getMLText("folder_title", array("foldername" => '')),getMLText("access_denied"));
 }
 
 if (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {

From 1488cdcfca5b7f1b8a224910120b161ddb51edf6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 25 Nov 2022 13:45:27 +0100
Subject: [PATCH 1608/2006] use predefined key for translation of parameter
 description

---
 views/bootstrap/class.SchedulerTaskMgr.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 554266025..8460d88e2 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -225,7 +225,7 @@ $(document).ready( function() {
 								'checked'=>false,
 							),
 							array(
-								'help'=>$param['description']
+								'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 							)
 						);
 						break;
@@ -240,7 +240,7 @@ $(document).ready( function() {
 								'required'=>false
 							),
 							array(
-								'help'=>$param['description']
+								'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 							)
 						);
 						break;
@@ -256,7 +256,7 @@ $(document).ready( function() {
 								'options'=>$param['options'],
 							),
 							array(
-								'help'=>$param['description']
+								'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 							)
 						);
 						break;
@@ -271,7 +271,7 @@ $(document).ready( function() {
 								'required'=>false
 							),
 							array(
-								'help'=>$param['description']
+								'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 							)
 						);
 						break;

From 182418c8564378afbbca22c16d414aafd8c56695 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 25 Nov 2022 15:06:49 +0100
Subject: [PATCH 1609/2006] allow parameter of type 'folder' and 'users'

---
 views/bootstrap/class.SchedulerTaskMgr.php | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 8460d88e2..156df1b37 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -420,6 +420,32 @@ $(document).ready( function() {
 						)
 					);
 					break;
+				case "folder":
+					$folderid = $task->getParameter()[$param['name']];
+					$this->formField(
+						getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
+					 	$this->getFolderChooserHtml("form".$extname.$confkey, M_READ, -1, $folderid ? $dms->getFolder($folderid) : 0, 'params['.$param['name']."]")
+					);
+					break;
+				case "users":
+					$userids = $task->getParameter()[$param['name']];
+					$users = $dms->getAllUsers();
+					foreach ($users as $currUser) {
+						if (!$currUser->isGuest())
+							$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin().' - '.$currUser->getFullName()), in_array($currUser->getID(), $userids), array(array('data-subtitle', htmlspecialchars($currUser->getEmail()))));
+					}
+					$this->formField(
+						getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
+						array(
+							'element'=>'select',
+							'class'=>'chzn-select',
+							'name'=>'params['.$param['name'].'][]',
+							'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
+							'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
+							'options'=>$options
+						)
+					);
+					break;
 				default:
 					$this->formField(
 						getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),

From 0f0ba034491d2d01dcf328ed681564fb7b0a15e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Nov 2022 21:35:41 +0100
Subject: [PATCH 1610/2006] remove constructor and class vars from abstract
 class

---
 inc/inc.ClassAuthentication.php | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/inc/inc.ClassAuthentication.php b/inc/inc.ClassAuthentication.php
index 29e57ed20..d9a66315b 100644
--- a/inc/inc.ClassAuthentication.php
+++ b/inc/inc.ClassAuthentication.php
@@ -24,34 +24,6 @@
  */
 abstract class SeedDMS_Authentication
 {
-	/**
-	 * DMS object
-	 *
-	 * @var    SeedDMS_Core_DMS
-	 * @access protected
-	 */
-	protected $dms;
-
-	/**
-	 * DMS settings
-	 *
-	 * @var    Settings
-	 * @access protected
-	 */
-	protected $settings;
-
-	/**
-	 * Constructor
-	 *
-	 * @param SeedDMS_Core_DMS $dms      DMS object
-	 * @param Settings         $settings DMS settings
-	 */
-	function __construct($dms, $settings) /* {{{ */
-	{
-		$this->dms = $dms;
-		$this->settings = $settings;
-	} /* }}} */
-
 	/**
 	 * Do Authentication
 	 *

From 28a4a24613e046b32deb77f58ecf68d469024c77 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Nov 2022 21:36:40 +0100
Subject: [PATCH 1611/2006] add constructor, authenticate() returns null if
 authentication fails

---
 inc/inc.ClassDbAuthentication.php   | 16 +++++++++++-----
 inc/inc.ClassLdapAuthentication.php | 13 +++++++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/inc/inc.ClassDbAuthentication.php b/inc/inc.ClassDbAuthentication.php
index fbee7f3c9..2d65e8516 100644
--- a/inc/inc.ClassDbAuthentication.php
+++ b/inc/inc.ClassDbAuthentication.php
@@ -24,6 +24,15 @@ require_once "inc.ClassAuthentication.php";
  */
 class SeedDMS_DbAuthentication extends SeedDMS_Authentication {
 
+  var $dms;
+
+  var $settings;
+
+  public function __construct($dms, $settings) { /* {{{ */
+    $this->dms = $dms;
+    $this->settings = $settings;
+  } /* }}} */
+
 	/**
 	 * Do Authentication
 	 *
@@ -32,18 +41,15 @@ class SeedDMS_DbAuthentication extends SeedDMS_Authentication {
 	 * @return object|boolean user object if authentication was successful otherwise false
 	 */
 	public function authenticate($username, $password) { /* {{{ */
-		$settings = $this->settings;
 		$dms = $this->dms;
 
 		// Try to find user with given login.
 		if($user = $dms->getUserByLogin($username)) {
 			$userid = $user->getID();
 
-			// Check if password matches (if not a guest user)
-			// Assume that the password has been sent via HTTP POST. It would be careless
-			// (and dangerous) for passwords to be sent via GET.
+			// Check if password matches
 			if (!seed_pass_verify($password, $user->getPwd())) {
-				$user = false;
+				$user = null;
 			}
 		}
 
diff --git a/inc/inc.ClassLdapAuthentication.php b/inc/inc.ClassLdapAuthentication.php
index 9f8f66dc6..64995f8e6 100644
--- a/inc/inc.ClassLdapAuthentication.php
+++ b/inc/inc.ClassLdapAuthentication.php
@@ -24,6 +24,15 @@ require_once "inc.ClassAuthentication.php";
  */
 class SeedDMS_LdapAuthentication extends SeedDMS_Authentication {
 
+  var $dms;
+
+  var $settings;
+
+  public function __construct($dms, $settings) { /* {{{ */
+    $this->dms = $dms;
+    $this->settings = $settings;
+  } /* }}} */
+
 	/**
 	 * Do ldap authentication
 	 *
@@ -84,7 +93,7 @@ class SeedDMS_LdapAuthentication extends SeedDMS_Authentication {
 				$bind = @ldap_bind($ds);
 			}
 			$dn = false;
-			/* If bind succeed, then get the dn of for the user */
+			/* If bind succeed, then get the dn of the user */
 			if ($bind) {
 				if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) {
 					$search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$username.")".$settings->_ldapFilter.")");
@@ -106,7 +115,7 @@ class SeedDMS_LdapAuthentication extends SeedDMS_Authentication {
 				$dn = $tmpDN;
 			}
 
-			/* No do the actual authentication of the user */
+			/* Now do the actual authentication of the user */
 			$bind = @ldap_bind($ds, $dn, $password);
 			$user = $dms->getUserByLogin($username);
 			if($user === false) {

From f7ebe8882274f958acc11c0367bb4fd3086d5d0f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 28 Nov 2022 21:40:42 +0100
Subject: [PATCH 1612/2006] add authentication service

---
 controllers/class.Login.php            |  5 ++
 inc/inc.AuthenticationInit.php         | 42 ++++++++++++
 inc/inc.ClassAuthenticationService.php | 88 ++++++++++++++++++++++++++
 inc/inc.DBInit.php                     |  1 +
 op/op.Login.php                        |  1 +
 5 files changed, 137 insertions(+)
 create mode 100644 inc/inc.AuthenticationInit.php
 create mode 100644 inc/inc.ClassAuthenticationService.php

diff --git a/controllers/class.Login.php b/controllers/class.Login.php
index d30739bf0..18412dbe5 100644
--- a/controllers/class.Login.php
+++ b/controllers/class.Login.php
@@ -35,6 +35,7 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 		$dms = $this->params['dms'];
 		$settings = $this->params['settings'];
 		$session = $this->params['session'];
+		$authenticator = $this->params['authenticator'];
 		$source = isset($this->params['source']) ? $this->params['source'] : '';
 		$sesstheme = $this->getParam('sesstheme');
 		$referuri = $this->getParam('referuri');
@@ -98,6 +99,9 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 			}
 		}
 
+		$user = $authenticator->authenticate($login, $pwd);
+
+		if(0) {
 		/* Authenticate against LDAP server {{{ */
 		if (!is_object($user) && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
 			require_once("../inc/inc.ClassLdapAuthentication.php");
@@ -114,6 +118,7 @@ class SeedDMS_Controller_Login extends SeedDMS_Controller_Common {
 			$authobj = new SeedDMS_DbAuthentication($dms, $settings);
 			$user = $authobj->authenticate($login, $pwd);
 		} /* }}} */
+		}
 
 		/* If the user is still not authenticated, then exit with an error */
 		if(!is_object($user)) {
diff --git a/inc/inc.AuthenticationInit.php b/inc/inc.AuthenticationInit.php
new file mode 100644
index 000000000..f7beb05b6
--- /dev/null
+++ b/inc/inc.AuthenticationInit.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Create authentication service
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010-2022 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+require_once('inc.ClassAuthenticationService.php');
+require_once('inc.ClassDbAuthentication.php');
+require_once('inc.ClassLdapAuthentication.php');
+
+global $logger;
+$authenticator = new SeedDMS_AuthenticationService($logger, $settings);
+
+if(isset($GLOBALS['SEEDDMS_HOOKS']['authentication'])) {
+	foreach($GLOBALS['SEEDDMS_HOOKS']['authentication'] as $authenticationObj) {
+		if(method_exists($authenticationObj, 'preAddService')) {
+			$authenticationObj->preAddService($dms, $authenticator);
+		}
+	}
+}
+
+$authenticator->addService(new SeedDMS_DbAuthentication($dms, $settings), 'db');
+if(isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
+	$authenticator->addService(new SeedDMS_LdapAuthentication($dms, $settings), 'ldap');
+}
+
+if(isset($GLOBALS['SEEDDMS_HOOKS']['authentication'])) {
+	foreach($GLOBALS['SEEDDMS_HOOKS']['authentication'] as $authenticationObj) {
+		if(method_exists($authenticationObj, 'postAddService')) {
+			$authenticationObj->postAddService($dms, $authenticator);
+		}
+	}
+}
+
diff --git a/inc/inc.ClassAuthenticationService.php b/inc/inc.ClassAuthenticationService.php
new file mode 100644
index 000000000..41119877a
--- /dev/null
+++ b/inc/inc.ClassAuthenticationService.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Implementation of authentication service
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Implementation of authentication service
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_AuthenticationService {
+	/**
+	 * List of services for authenticating user
+	 */
+	protected $services;
+
+	/*
+	 * List of servives with errors
+	 */
+	protected $errors;
+
+	/*
+	 * Service for logging
+	 */
+	protected $logger;
+
+	/*
+	 * Configuration
+	 */
+	protected $settings;
+
+	public function __construct($logger = null, $settings = null) { /* {{{ */
+		$this->services = array();
+		$this->errors = array();
+		$this->logger = $logger;
+		$this->settings = $settings;
+	} /* }}} */
+
+	public function addService($service, $name='') { /* {{{ */
+		if(!$name)
+			$name = md5(uniqid());
+		$this->services[$name] = $service;
+		$this->errors[$name] = true;
+	} /* }}} */
+
+	public function getServices() { /* {{{ */
+		return $this->services;
+	} /* }}} */
+
+	public function getErrors() { /* {{{ */
+		return $this->errors;
+	} /* }}} */
+
+	public function authenticate($username, $password) { /* {{{ */
+		$user = null;
+		foreach($this->services as $name => $service) {
+			$this->logger->log('Authentication service \''.$name.'\'', PEAR_LOG_INFO);
+			$user = $service->authenticate($username, $password);
+			if($user === false) {
+				$this->errors[$name] = false;
+				if($this->logger)
+					$this->logger->log('Authentication service \''.$name.'\': Authentication of user \''.$username.'\' failed.', PEAR_LOG_ERR);
+				return false;
+			}	elseif($user === null) {
+				if($this->logger)
+					$this->logger->log('Authentication service \''.$name.'\': Authentication of user \''.$username.'\' disregarded.', PEAR_LOG_ERR);
+			} else {
+				if($this->logger)
+					$this->logger->log('Authentication service \''.$name.'\': Authentication of user \''.$username.'\' successful.', PEAR_LOG_INFO);
+				$this->errors[$name] = true;
+				return $user;
+			}
+		}
+		return $user;
+	} /* }}} */
+}
diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index 40a2df262..ec6036cc7 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -68,3 +68,4 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 
 require_once("inc.ConversionInit.php");
 require_once('inc.FulltextInit.php');
+require_once('inc.AuthenticationInit.php');
diff --git a/op/op.Login.php b/op/op.Login.php
index ab3dc455d..1ea6c36af 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -89,6 +89,7 @@ $controller->setParam('lang', $lang);
 $controller->setParam('sesstheme', $sesstheme);
 $controller->setParam('referuri', $referuri);
 $controller->setParam('session', $session);
+$controller->setParam('authenticator', $authenticator);
 if(!$controller()) {
 	$session = null;
 	add_log_line("login failed", PEAR_LOG_ERR);

From e9b3b25b64ab85efdfb2e2fb02fa92b351a57773 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 10:44:19 +0100
Subject: [PATCH 1613/2006] pass notification and authentication service to
 ServeRequest

---
 webdav/index.php  |   2 +-
 webdav/webdav.php | 126 ++++++++++++++++++----------------------------
 2 files changed, 50 insertions(+), 78 deletions(-)

diff --git a/webdav/index.php b/webdav/index.php
index c34f450c3..a33249766 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -39,7 +39,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 
 include("webdav.php");
 $server = new HTTP_WebDAV_Server_SeedDMS();
-$server->ServeRequest($dms, $logger, $notifier);
+$server->ServeRequest($dms, $settings, $logger, $notifier, $authenticator);
 //$files = array();
 //$options = array('path'=>'/Test1/subdir', 'depth'=>1);
 //echo $server->MKCOL(&$options);
diff --git a/webdav/webdav.php b/webdav/webdav.php
index 69faf1d23..891b0685c 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -32,7 +32,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	var $logger = null;
 
 	/**
-	 * A reference to a notifier
+	 * A reference to a notification service
 	 *
 	 * This is set by ServeRequest
 	 *
@@ -41,6 +41,16 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	var $notifier = null;
 
+	/**
+	 * A reference to the authentication service
+	 *
+	 * This is set by ServeRequest
+	 *
+	 * @access private
+	 * @var	object
+	 */
+	var $authenticator = null;
+
 	/**
 	 * Currently logged in user
 	 *
@@ -77,7 +87,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 * @access public
 	 * @param  object $dms reference to DMS
 	 */
-	function ServeRequest($dms = null, $logger = null, $notifier = null) /* {{{ */
+	function ServeRequest($dms = null, $settings = null, $logger = null, $notifier = null, $authenticator = null) /* {{{ */
 	{
 		// set root directory, defaults to webserver document root if not set
 		if ($dms) {
@@ -86,12 +96,22 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			return false;
 		}
 
+		// set settings
+		if ($settings) {
+			$this->settings = $settings;
+		} else {
+			return false;
+		}
+
 		// set logger
 		$this->logger = $logger;
 
-		// set notifier
+		// set notification service
 		$this->notifier = $notifier;
 
+		// set authentication service
+		$this->authenticator = $authenticator;
+
 		// special treatment for litmus compliance test
 		// reply on its identifier header
 		// not needed for the test itself but eases debugging
@@ -148,12 +168,11 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function check_auth($type, $user, $pass) /* {{{ */
 	{
-		global $settings;
-
 		if($this->logger)
 			$this->logger->log('check_auth: type='.$type.', user='.$user.'', PEAR_LOG_INFO);
 
 		$controller = Controller::factory('Login', array('dms'=>$this->dms));
+		$controller->setParam('authenticator', $this->authenticator);
 		$controller->setParam('login', $user);
 		$controller->setParam('pwd', $pass);
 		$controller->setParam('source', 'webdav');
@@ -171,51 +190,6 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 		$this->user = $controller->getUser();
 
 		return true;
-
-		$userobj = false;
-
-		/* Authenticate against LDAP server {{{ */
-		if (!$userobj && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
-			require_once("../inc/inc.ClassLdapAuthentication.php");
-			$authobj = new SeedDMS_LdapAuthentication($this->dms, $settings);
-			$userobj = $authobj->authenticate($user, $pass);
-			if($userobj && $this->logger)
-				$this->logger->log('check_auth: type='.$type.', user='.$user.' authenticated against LDAP', PEAR_LOG_INFO);
-		} /* }}} */
-
-		/* Authenticate against SeedDMS database {{{ */
-		if(!$userobj) {
-			require_once("../inc/inc.ClassDbAuthentication.php");
-			$authobj = new SeedDMS_DbAuthentication($this->dms, $settings);
-			$userobj = $authobj->authenticate($user, $pass);
-			if($userobj && $this->logger)
-				$this->logger->log('check_auth: type='.$type.', user='.$user.' authenticated against database', PEAR_LOG_INFO);
-		} /* }}} */
-
-		if(!$userobj) {
-			if($this->logger)
-				$this->logger->log('check_auth: No such user '.$user, PEAR_LOG_NOTICE);
-			return false;
-		}
-
-		if(($userobj->getID() == $settings->_guestID) && (!$settings->_enableGuestLogin)) {
-			if($this->logger)
-				$this->logger->log('check_auth: Login as guest is not allowed', PEAR_LOG_NOTICE);
-			return false;
-		}
-
-		if($userobj->isDisabled())
-			return false;
-
-		if($userobj->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $settings->_adminIP != ""))
-			return false;
-
-		/* Clear login failures if login was successful */
-		$userobj->clearLoginFailures();
-
-		$this->user = $userobj;
-
-		return true;
 	} /* }}} */
 
 
@@ -463,6 +437,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 				$info["props"][] = $this->mkprop("SeedDMS:", "keywords", $keywords);
 			$info["props"][] = $this->mkprop("SeedDMS:", "id", $obj->getID());
 			$info["props"][] = $this->mkprop("SeedDMS:", "version", $content->getVersion());
+			if($content->getComment())
+				$info["props"][] = $this->mkprop("SeedDMS:", "version-comment", $content->getComment());
 			$status = $content->getStatus();
 			$info["props"][] = $this->mkprop("SeedDMS:", "status", $status['status']);
 			$info["props"][] = $this->mkprop("SeedDMS:", "status-comment", $status['comment']);
@@ -645,7 +621,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function PUT(&$options) /* {{{ */
 	{
-		global $settings, $fulltextservice;
+		global $fulltextservice;
 
 		$this->log_options('PUT', $options);
 
@@ -731,7 +707,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 						 $name == $lc->getOriginalFileName() &&
 						 $fileType == $lc->getFileType() &&
 						 $mimetype == $lc->getMimeType() &&
-						 $settings->_enableWebdavReplaceDoc) {
+						 $this->settings->_enableWebdavReplaceDoc) {
 						if($this->logger)
 							$this->logger->log('PUT: replacing latest version', PEAR_LOG_INFO);
 						if(!$document->replaceContent($lc->getVersion(), $this->user, $tmpFile, $name, $fileType, $mimetype)) {
@@ -749,12 +725,12 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 						$reviewers = array('i'=>[], 'g'=>[]);
 						$approvers = array('i'=>[], 'g'=>[]);
 						$workflow = null;
-						if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
-							if($settings->_workflowMode == 'traditional') {
+						if($this->settings->_workflowMode == 'traditional' || $this->settings->_workflowMode == 'traditional_only_approval') {
+							if($this->settings->_workflowMode == 'traditional') {
 								$reviewers = getMandatoryReviewers($document->getFolder(), $this->user);
 							}
 							$approvers = getMandatoryApprovers($document->getFolder(), $this->user);
-						} elseif($settings->_workflowMode == 'advanced') {
+						} elseif($this->settings->_workflowMode == 'advanced') {
 							if($workflows = $this->user->getMandatoryWorkflows()) {
 								$workflow = array_shift($workflows);
 							}
@@ -803,7 +779,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 
 			/* Check if name already exists in the folder */
 			/*
-			if(!$settings->_enableDuplicateDocNames) {
+			if(!$this->settings->_enableDuplicateDocNames) {
 				if($folder->hasDocumentByName($name)) {
 					return "403 Forbidden";				 
 				}
@@ -813,12 +789,12 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$reviewers = array('i'=>[], 'g'=>[]);
 			$approvers = array('i'=>[], 'g'=>[]);
 			$workflow = null;
-			if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
-				if($settings->_workflowMode == 'traditional') {
+			if($this->settings->_workflowMode == 'traditional' || $this->settings->_workflowMode == 'traditional_only_approval') {
+				if($this->settings->_workflowMode == 'traditional') {
 					$reviewers = getMandatoryReviewers($folder, $this->user);
 				}
 				$approvers = getMandatoryApprovers($folder, $this->user);
-			} elseif($settings->_workflowMode == 'advanced') {
+			} elseif($this->settings->_workflowMode == 'advanced') {
 				if($workflows = $this->user->getMandatoryWorkflows()) {
 					$workflow = array_shift($workflows);
 				}
@@ -841,7 +817,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$controller->setParam('filetype', $fileType);
 			$controller->setParam('userfiletype', $mimetype);
 			$minmax = $folder->getDocumentsMinMax();
-			if($settings->_defaultDocPosition == 'start')
+			if($this->settings->_defaultDocPosition == 'start')
 				$controller->setParam('sequence', $minmax['min'] - 1);
 			else
 				$controller->setParam('sequence', $minmax['max'] + 1);
@@ -854,8 +830,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$controller->setParam('workflow', $workflow);
 			$controller->setParam('notificationgroups', array());
 			$controller->setParam('notificationusers', array());
-			$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
-			$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
+			$controller->setParam('maxsizeforfulltext', $this->settings->_maxSizeForFullText);
+			$controller->setParam('defaultaccessdocs', $this->settings->_defaultAccessDocs);
 			if(!$document = $controller()) {
 //			if(!$res = $folder->addDocument($name, '', 0, $this->user, '', array(), $tmpFile, $name, $fileType, $mimetype, 0, array(), array(), 0, "")) {
 				unlink($tmpFile);
@@ -883,8 +859,6 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function MKCOL($options) /* {{{ */
 	{
-		global $settings;
-
 		$this->log_options('MKCOL', $options);
 
 		$path   = $options["path"];
@@ -963,7 +937,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function DELETE($options) /* {{{ */
 	{
-		global $settings, $fulltextservice;
+		global $fulltextservice;
 
 		$this->log_options('DELETE', $options);
 
@@ -1036,8 +1010,6 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function MOVE($options) /* {{{ */
 	{
-		global $settings;
-
 		$this->log_options('MOVE', $options);
 
 		// no copying to different WebDAV Servers yet
@@ -1112,7 +1084,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			/* Set the new Folder of the source object */
 			if(get_class($objsource) == $this->dms->getClassname('document')) {
 				/* Check if name already exists in the folder */
-				if(!$settings->_enableDuplicateDocNames) {
+				if(!$this->settings->_enableDuplicateDocNames) {
 					if($newdocname) {
 						if($objdest->hasDocumentByName($newdocname)) {
 							return "403 Forbidden";				 
@@ -1136,7 +1108,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 				}
 			} elseif(get_class($objsource) == $this->dms->getClassname('folder')) {
 				/* Check if name already exists in the folder */
-				if(!$settings->_enableDuplicateSubFolderNames) {
+				if(!$this->settings->_enableDuplicateSubFolderNames) {
 					if($newdocname) {
 						if($objdest->hasSubFolderByName($newdocname)) {
 							return "403 Forbidden";				 
@@ -1173,7 +1145,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 	 */
 	function COPY($options) /* {{{ */
 	{
-		global $settings, $fulltextservice;
+		global $fulltextservice;
 
 		$this->log_options('COPY', $options);
 
@@ -1273,7 +1245,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 
 			/* Check if name already exists in the folder */
 			/*
-			if(!$settings->_enableDuplicateDocNames) {
+			if(!$this->settings->_enableDuplicateDocNames) {
 				if($objdest->hasDocumentByName($newdocname)) {
 					return "403 Forbidden";				 
 				}
@@ -1283,12 +1255,12 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$reviewers = array('i'=>[], 'g'=>[]);
 			$approvers = array('i'=>[], 'g'=>[]);
 			$workflow = null;
-			if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
-				if($settings->_workflowMode == 'traditional') {
+			if($this->settings->_workflowMode == 'traditional' || $this->settings->_workflowMode == 'traditional_only_approval') {
+				if($this->settings->_workflowMode == 'traditional') {
 					$reviewers = getMandatoryReviewers($objdest, $this->user);
 				}
 				$approvers = getMandatoryApprovers($objdest, $this->user);
-			} elseif($settings->_workflowMode == 'advanced') {
+			} elseif($this->settings->_workflowMode == 'advanced') {
 				if($workflows = $this->user->getMandatoryWorkflows()) {
 					$workflow = array_shift($workflows);
 				}
@@ -1315,7 +1287,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$controller->setParam('filetype', $content->getFileType());
 			$controller->setParam('userfiletype', $content->getMimeType());
 			$minmax = $objdest->getDocumentsMinMax();
-			if($settings->_defaultDocPosition == 'start')
+			if($this->settings->_defaultDocPosition == 'start')
 				$controller->setParam('sequence', $minmax['min'] - 1);
 			else
 				$controller->setParam('sequence', $minmax['max'] + 1);
@@ -1328,8 +1300,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$controller->setParam('workflow', $workflow);
 			$controller->setParam('notificationgroups', array());
 			$controller->setParam('notificationusers', array());
-			$controller->setParam('maxsizeforfulltext', $settings->_maxSizeForFullText);
-			$controller->setParam('defaultaccessdocs', $settings->_defaultAccessDocs);
+			$controller->setParam('maxsizeforfulltext', $this->settings->_maxSizeForFullText);
+			$controller->setParam('defaultaccessdocs', $this->settings->_defaultAccessDocs);
 			if(!$document = $controller()) {
 				if($this->logger)
 					$this->logger->log('COPY: error copying object', PEAR_LOG_ERR);

From 6a24ce5d10aecff80d622e9a262eda1574f12989 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 10:46:34 +0100
Subject: [PATCH 1614/2006] documentation on how to use swagger

---
 doc/README.Swagger | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 doc/README.Swagger

diff --git a/doc/README.Swagger b/doc/README.Swagger
new file mode 100644
index 000000000..576339a5e
--- /dev/null
+++ b/doc/README.Swagger
@@ -0,0 +1,13 @@
+Swagger
+========
+
+Swagger is used to describe a rest api. SeedDMS ships a swagger.yaml file
+in the restapi directory. You can load this file into a swagger editor, e.g.
+http://petstore.swagger.io/ or http://editor.swagger.io/
+You may as well set up your own swagger-ui installation as described at
+https://medium.com/@tatianaensslin/how-to-add-swagger-ui-to-php-server-code-f1610c01dc03
+
+Your apache needs to have the module 'header' enabled, because some HTTP headers
+are set when the file swagger.yaml is accessed by the editor.
+
+Currently, the swagger.yaml shipped with SeedDMS uses still swagger 2.0

From c87eb6c6f0182d8af5ae6d7981c4dac291ef6478 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 10:49:01 +0100
Subject: [PATCH 1615/2006] add changs for 5.1.29

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 35816796c..90c74d1cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - fix php errors in restapi
 - fix 'maximum size' error when uploading a file with drag&drop
 - update jquery to 3.6.1 (only bootstrap4 theme)
+- introduce authentication service
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.28

From 8a01102cf54ba3c1c3185ddd9bd579ff8b52be02 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 10:49:37 +0100
Subject: [PATCH 1616/2006] add documentation on how to use the scheduler

---
 doc/README.Scheduler.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 doc/README.Scheduler.md

diff --git a/doc/README.Scheduler.md b/doc/README.Scheduler.md
new file mode 100644
index 000000000..9bd20772c
--- /dev/null
+++ b/doc/README.Scheduler.md
@@ -0,0 +1,26 @@
+Scheduler
+==========
+
+The scheduler in SeedDMS manages frequently run tasks. It is very similar
+to regular unix cron jobs. A task in SeedDMS is an instanciation of a task
+class which itself is defined by an extension or SeedDMS itself.
+SeedDMS has some predefined classes e.g. core::expireddocs.
+
+In order for tasks to be runnalbe, a user `cli_scheduler` must exists in
+SeedDMS.
+
+All tasks are executed by a single cronjob in the directory `utils`
+
+> */5 * * * * /home/www-data/seeddms60x/seeddms/utils/seeddms-schedulercli --mode=run
+
+Please keep in mind, that the php interpreter used for the cronjob may be
+different from the php interpreter used für the web application. Hence, two
+different php.ini files might be used. php and the php extensions may differ as
+well. This can cause some extensions to be disabled and consequently some task
+classes are not defined.
+
+`utils/seeddms-schedulercli` can also be run on the command line. If you
+do that, run it with the same system user used for the web server. On Debian
+this is www-data. Hence run it like
+
+sudo -u www-data utils/seeddms-schedulercli --mode=list

From e8192d281309f6b744f0f7e615cacea396f57a68 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 17:31:54 +0100
Subject: [PATCH 1617/2006] add $skiproot and $sep parameter to
 getFolderPathPlain()

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 59ab9b811..50b90b489 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -782,17 +782,20 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 * Run str_replace(' / ', '/', $path) on it to get a valid unix
 	 * file system path.
 	 *
+	 * @param bool $skiproot skip the name of the root folder and start with $sep
+	 * @param string $sep separator between path elements
 	 * @return string path separated with ' / '
 	 */
-	function getFolderPathPlain() { /* {{{ */
+	function getFolderPathPlain($skiproot = false, $sep = ' / ') { /* {{{ */
 		$path="";
 		$folderPath = $this->getPath();
-		for ($i = 0; $i  < count($folderPath); $i++) {
-			$path .= $folderPath[$i]->getName();
+		for ($i = 0; $i < count($folderPath); $i++) {
+			if($i > 0 || !$skiproot)
+				$path .= $folderPath[$i]->getName();
 			if ($i +1 < count($folderPath))
-				$path .= " / ";
+				$path .= $sep;
 		}
-		return $path;
+		return trim($path);
 	} /* }}} */
 
 	/**

From a5e975caa5e13ac605c893c095e3ebfc213e8675 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 17:33:04 +0100
Subject: [PATCH 1618/2006] searchfolder returns full path of folder

---
 op/op.Ajax.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index be2db89a3..74099d4db 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -161,7 +161,8 @@ switch($command) {
 									$result = array();
 									foreach($hits['folders'] as $hit) {
 										if($hit->getAccessMode($user, 'search') >= M_READ)
-											$result[] = $hit->getID().'#'.$basefolder->getName().'/'.$hit->getName();
+											//$result[] = $hit->getID().'#'.$basefolder->getName().'/'.$hit->getName();
+											$result[] = $hit->getID().'#'.$hit->getFolderPathPlain(true, '/');
 									}
 									header('Content-Type: application/json');
 									echo json_encode($result);
@@ -172,7 +173,8 @@ switch($command) {
 								$subfolders = SeedDMS_Core_DMS::filterAccess($subfolders, $user, M_READ);
 								$result = array();
 								foreach($subfolders as $subfolder) {
-									$result[] = $subfolder->getID().'#'.$basefolder->getName().'/'.$subfolder->getName();
+									//$result[] = $subfolder->getID().'#'.$basefolder->getName().'/'.$subfolder->getName();
+									$result[] = $subfolder->getID().'#'.$subfolder->getFolderPathPlain(true, '/');
 								}
 								header('Content-Type: application/json');
 								echo json_encode($result);
@@ -187,7 +189,7 @@ switch($command) {
 				$result = array();
 				foreach($hits['folders'] as $hit) {
 					if($hit->getAccessMode($user, 'search') >= M_READ)
-						$result[] = $hit->getID().'#'.$hit->getName();
+						$result[] = $hit->getID().'#'.$hit->getFolderPathPlain(true, '/');
 				}
 				header('Content-Type: application/json');
 				echo json_encode($result);

From 55df94a993d17e9ccb5fce37a92a7326009ed218 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 17:34:29 +0100
Subject: [PATCH 1619/2006] use authentication service

---
 restapi/index.php | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 982b9f98a..dfc14ad23 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -63,7 +63,7 @@ class RestapiController { /* {{{ */
             }
         }
         return $attrvalues;
-		} /* }}} */
+    } /* }}} */
 
     protected function __getDocumentData($document) { /* {{{ */
         $data = array(
@@ -232,6 +232,7 @@ class RestapiController { /* {{{ */
         $dms = $this->container->dms;
         $settings = $this->container->config;
         $logger = $this->container->logger;
+        $authenticator = $this->container->authenticator;
 
         $params = $request->getParsedBody();
         if(empty($params['user']) || empty($params['pass'])) {
@@ -240,23 +241,7 @@ class RestapiController { /* {{{ */
         }
         $username = $params['user'];
         $password = $params['pass'];
-
-    //    $userobj = $dms->getUserByLogin($username);
-        $userobj = null;
-
-        /* Authenticate against LDAP server {{{ */
-        if (!$userobj && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
-            require_once("../inc/inc.ClassLdapAuthentication.php");
-            $authobj = new SeedDMS_LdapAuthentication($dms, $settings);
-            $userobj = $authobj->authenticate($username, $password);
-        } /* }}} */
-
-        /* Authenticate against SeedDMS database {{{ */
-        if(!$userobj) {
-            require_once("../inc/inc.ClassDbAuthentication.php");
-            $authobj = new SeedDMS_DbAuthentication($dms, $settings);
-            $userobj = $authobj->authenticate($username, $password);
-        } /* }}} */
+        $userobj = $authenticator->authenticate($username, $password);
 
         if(!$userobj) {
             setcookie("mydms_session", '', time()-3600, $settings->_httpRoot);
@@ -2712,6 +2697,7 @@ $container['conversionmgr'] = $conversionmgr;
 $container['logger'] = $logger;
 $container['fulltextservice'] = $fulltextservice;
 $container['notifier'] = $notifier;
+$container['authenticator'] = $authenticator;
 $app->add(new Auth($container));
 
 // Make CORS preflighted request possible
@@ -2799,11 +2785,11 @@ $app->get('/echo/{data}', \TestController::class.':echoData');
 $app->get('/statstotal', \RestapiController::class.':getStatsTotal');
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initRestAPI'])) {
-	foreach($GLOBALS['SEEDDMS_HOOKS']['initRestAPI'] as $hookObj) {
-		if (method_exists($hookObj, 'addRoute')) {
-			$hookObj->addRoute($app);
-		}
-	}
+    foreach($GLOBALS['SEEDDMS_HOOKS']['initRestAPI'] as $hookObj) {
+        if (method_exists($hookObj, 'addRoute')) {
+            $hookObj->addRoute($app);
+        }
+    }
 }
 
 $app->run();

From 92ba1a9e769c430e3c3c5225c5672a9bb4f88171 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 17:35:32 +0100
Subject: [PATCH 1620/2006] focus folder selection after loading page

---
 views/bootstrap/class.MoveDocument.php | 6 ++++++
 views/bootstrap/class.MoveFolder.php   | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/views/bootstrap/class.MoveDocument.php b/views/bootstrap/class.MoveDocument.php
index 380d4a627..a3c40ddd3 100644
--- a/views/bootstrap/class.MoveDocument.php
+++ b/views/bootstrap/class.MoveDocument.php
@@ -34,6 +34,12 @@ class SeedDMS_View_MoveDocument extends SeedDMS_Theme_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
 
+?>
+$(document).ready( function() {
+	$('input[id^=choosefoldersearch]').focus();
+});
+<?php
+
 //		$this->printFolderChooserJs("form1");
 	} /* }}} */
 
diff --git a/views/bootstrap/class.MoveFolder.php b/views/bootstrap/class.MoveFolder.php
index 6f4ecc696..e8574e8ba 100644
--- a/views/bootstrap/class.MoveFolder.php
+++ b/views/bootstrap/class.MoveFolder.php
@@ -34,6 +34,11 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Theme_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript; charset=UTF-8');
 
+?>
+$(document).ready( function() {
+	$('input[id^=choosefoldersearch]').focus();
+});
+<?php
 //		$this->printFolderChooserJs("form1");
 	} /* }}} */
 

From cd5a39b50f4b1ea467f94d446950a62910f8ae13 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 17:36:17 +0100
Subject: [PATCH 1621/2006] make breakcrumps capable of drag&drop

---
 views/bootstrap/class.Bootstrap.php   | 8 ++++----
 views/bootstrap4/class.Bootstrap4.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 6f0dd0ed1..e00b4c75d 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -468,17 +468,17 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$txtpath = "";
 		for ($i = 0; $i < count($path); $i++) {
 			$txtpath .= "<li>";
-			if ($i +1 < count($path)) {
-				$txtpath .= "<a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">".
+			if ($i+1 < count($path)) {
+				$txtpath .= "<a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" data-name=\"".htmlspecialchars($path[$i]->getName())."\" class=\"table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">".
 					htmlspecialchars($path[$i]->getName())."</a>";
 			}
 			else {
-				$txtpath .= ($tagAll ? "<a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\">".htmlspecialchars($path[$i]->getName())."</a>" : htmlspecialchars($path[$i]->getName()));
+				$txtpath .= ($tagAll ? "<a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" data-name=\"".htmlspecialchars($path[$i]->getName())."\" class=\"table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">".htmlspecialchars($path[$i]->getName())."</a>" : htmlspecialchars($path[$i]->getName()));
 			}
 			$txtpath .= " <span class=\"divider\">/</span></li>";
 		}
 		if($document)
-			$txtpath .= "<li><a href=\"".$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getId()."\">".htmlspecialchars($document->getName())."</a></li>";
+			$txtpath .= "<li><a href=\"".$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getId()."\" class=\"table-document-row\" rel=\"document_".$document->getId()."\" data-name=\"".htmlspecialchars($document->getName())."\" formtoken=\"".createFormKey('')."\">".htmlspecialchars($document->getName())."</a></li>";
 
 		return '<ul class="breadcrumb">'.$txtpath.'</ul>';
 	} /* }}} */
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index db21e46ef..5b82a1a8e 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -471,16 +471,16 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$txtpath = "";
 		for ($i = 0; $i < count($path); $i++) {
 			$txtpath .= "<li class=\"breadcrumb-item\">";
-			if ($i +1 < count($path)) {
-				$txtpath .= "<a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">".
+			if ($i+1 < count($path)) {
+				$txtpath .= "<a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" data-name=\"".htmlspecialchars($path[$i]->getName())."\" class=\"table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">".
 					htmlspecialchars($path[$i]->getName())."</a>";
 			}
 			else {
-				$txtpath .= ($tagAll ? "<a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\">".htmlspecialchars($path[$i]->getName())."</a>" : htmlspecialchars($path[$i]->getName()));
+				$txtpath .= ($tagAll ? "<a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" data-droptarget=\"folder_".$path[$i]->getID()."\" rel=\"folder_".$path[$i]->getID()."\" data-name=\"".htmlspecialchars($path[$i]->getName())."\" class=\"table-row-folder droptarget\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\">".htmlspecialchars($path[$i]->getName())."</a>" : htmlspecialchars($path[$i]->getName()));
 			}
 		}
 		if($document)
-			$txtpath .= "<li class=\"breadcrumb-item active\" aria-current=\"page\"><a href=\"".$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getId()."\">".htmlspecialchars($document->getName())."</a></li>";
+			$txtpath .= "<li class=\"breadcrumb-item active table-row-document\" aria-current=\"page\"><a href=\"".$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getId()."\" class=\"table-document-row\" rel=\"document_".$document->getId()."\" data-name=\"".htmlspecialchars($document->getName())."\" formtoken=\"".createFormKey('')."\">".htmlspecialchars($document->getName())."</a></li>";
 
 		return '<nav aria-label="breadcrumb"><ol class="breadcrumb">'.$txtpath.'</ol></nav>';
 	} /* }}} */

From 11d134e35a8bc4b27e0370c3a4e134b11b29bb1a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 17:36:59 +0100
Subject: [PATCH 1622/2006] last element of breadcrumb has a link

---
 views/bootstrap/class.ViewFolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 469d80185..0f930c652 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -457,7 +457,7 @@ $('body').on('click', '.order-btn', function(ev) {
 		if(is_string($txt))
 			echo $txt;
 		else {
-			$this->pageNavigation($this->getFolderPathHTML($folder), "view_folder", $folder);
+			$this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
 		}
 
 		echo $this->callHook('preContent');

From 57ab966404525a022789a2a61579aea032dcdb1c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 17:37:25 +0100
Subject: [PATCH 1623/2006] add changes of 5.1.29

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 8427b476e..164db26fa 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -25,6 +25,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - SeedDMS_Core_Folder::addDocument() does rollback transaction propperly when setting document categories fail
+- add $skiproot and $sep parameter to SeedDMS_Core_Folder::getFolderPathPlain()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From de61d9f1f3582a6ded2f2659dc72c998df904a7e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 29 Nov 2022 21:46:07 +0100
Subject: [PATCH 1624/2006] set error msg if extension list cannot be fetched

---
 inc/inc.ClassExtensionMgr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index 07e7d51d3..a80f3ac21 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -660,6 +660,7 @@ class SeedDMS_Extension_Mgr {
 					}
 					file_put_contents($this->cachedir."/".self::repos_list_file, $file);
 				} else {
+					$this->errmsgs[] = 'Could not fetch cxtension list';
 					return false;
 				}
 			}

From e40f7e6a258f6b986302bfd88f311a6d22690851 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 5 Dec 2022 09:18:36 +0100
Subject: [PATCH 1625/2006] fix typo

---
 inc/inc.ClassExtensionMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index a80f3ac21..ae2e036c1 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -660,7 +660,7 @@ class SeedDMS_Extension_Mgr {
 					}
 					file_put_contents($this->cachedir."/".self::repos_list_file, $file);
 				} else {
-					$this->errmsgs[] = 'Could not fetch cxtension list';
+					$this->errmsgs[] = 'Could not fetch extension list';
 					return false;
 				}
 			}

From 99569a34352fc4e430d510d733879d8c48f73042 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 6 Dec 2022 11:15:51 +0100
Subject: [PATCH 1626/2006] fix possible xss attack

---
 views/bootstrap/class.TriggerWorkflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index 0cc18bd70..e1907061f 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -104,7 +104,7 @@ $(document).ready(function() {
 				'required'=>false
 			)
 		);
-		$this->formSubmit(getMLText("action_".strtolower($action->getName()), array(), $action->getName()));
+		$this->formSubmit(getMLText("action_".strtolower($action->getName()), array(), htmlspecialchars($action->getName())));
 ?>
 	</form>
 <?php

From 6f9ec7cdc34209f27f83c18213719fbe2c53fb73 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 7 Dec 2022 17:03:11 +0100
Subject: [PATCH 1627/2006] $width passed to getFileName() is optional

---
 SeedDMS_Preview/Preview/Previewer.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 327f5e099..4381313bf 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -52,10 +52,15 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 	 * @param integer $width width of preview image
 	 * @return string file name of preview image
 	 */
-	public function getFileName($object, $width) { /* {{{ */
+	public function getFileName($object, $width=0) { /* {{{ */
 		if(!$object)
 			return false;
 
+		if($width == 0)
+			$width = $this->width;
+		else
+			$width = intval($width);
+
 		$document = $object->getDocument();
 		$dms = $document->_dms;
 		$dir = $this->previewDir.'/'.$document->getDir();

From 291b62eeb27d605cf90b2ae51c5fb54eddd4b1a5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Dec 2022 14:44:49 +0100
Subject: [PATCH 1628/2006] getFolderPathPlain(): add sep as prefix if skiproot
 is true

---
 SeedDMS_Core/Core/inc.ClassFolder.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index 50b90b489..3d041043c 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -778,8 +778,8 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	/**
 	 * Returns a file system path
 	 *
-	 * This path contains spaces around the slashes for better readability.
-	 * Run str_replace(' / ', '/', $path) on it to get a valid unix
+	 * This path contains by default spaces around the slashes for better readability.
+	 * Run str_replace(' / ', '/', $path) on it or pass '/' as $sep to get a valid unix
 	 * file system path.
 	 *
 	 * @param bool $skiproot skip the name of the root folder and start with $sep
@@ -787,13 +787,14 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 * @return string path separated with ' / '
 	 */
 	function getFolderPathPlain($skiproot = false, $sep = ' / ') { /* {{{ */
-		$path="";
+		$path="".$sep;
 		$folderPath = $this->getPath();
 		for ($i = 0; $i < count($folderPath); $i++) {
-			if($i > 0 || !$skiproot)
+			if($i > 0 || !$skiproot) {
 				$path .= $folderPath[$i]->getName();
-			if ($i +1 < count($folderPath))
-				$path .= $sep;
+				if ($i+1 < count($folderPath))
+					$path .= $sep;
+			}
 		}
 		return trim($path);
 	} /* }}} */

From 56bd5c00e4bf84b66abe0ccf13906713b3d475a9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Dec 2022 14:45:31 +0100
Subject: [PATCH 1629/2006] set resolution of pdf to 72dpi, using 36dpi will
 not allow previes wider than 298px

---
 inc/inc.ClassConversionServicePdfToImage.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassConversionServicePdfToImage.php b/inc/inc.ClassConversionServicePdfToImage.php
index 7dd3cb5b9..d42bed80f 100644
--- a/inc/inc.ClassConversionServicePdfToImage.php
+++ b/inc/inc.ClassConversionServicePdfToImage.php
@@ -50,8 +50,12 @@ class SeedDMS_ConversionServicePdfToImage extends SeedDMS_ConversionServiceBase
 		$imagick = new Imagick();
 		/* Setting a smaller resolution will speed up the conversion
 		 * A resolution of 72,72 will create a 596x842 image
+		 * Setting it to 36,36 will create a 298x421 image which should
+		 * be sufficient in most cases, but keep in mind that images are
+		 * not scaled up. Hence, a width of 400px still results in a 298px
+		 * wide image
 		 */
-		$imagick->setResolution(36,36);
+		$imagick->setResolution(72,72);
 		$page = 0;
 		if(!empty($params['page']) && intval($params['page']) > 0)
 			$page = intval($params['page'])-1;

From ecb0258186f11e7c555046e96a2fba110622662f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Dec 2022 14:48:10 +0100
Subject: [PATCH 1630/2006] fix filename of attachment

---
 restapi/index.php | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index dfc14ad23..d21be66c8 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1417,7 +1417,7 @@ class RestapiController { /* {{{ */
                 return $response->withHeader('Content-Type', 'image/png')
                       ->withHeader('Content-Description', 'File Transfer')
                       ->withHeader('Content-Transfer-Encoding', 'binary')
-                      ->withHeader('Content-Disposition', 'attachment; filename=preview-"' . $document->getID() . "-" . $object->getVersion() . "-" . $width . ".png" . '"')
+                      ->withHeader('Content-Disposition', 'attachment; filename="preview-' . $document->getID() . "-" . $object->getVersion() . "-" . $width . ".png" . '"')
                       ->withHeader('Content-Length', $previewer->getFilesize($object))
                       ->withBody($stream);
             } else {
@@ -2597,7 +2597,7 @@ class TestController { /* {{{ */
 } /* }}} */
 
 /* Middleware for authentication */
-class Auth { /* {{{ */
+class RestapiAuth { /* {{{ */
 
     private $container;
 
@@ -2619,7 +2619,17 @@ class Auth { /* {{{ */
         // $this->container has the DI
         $dms = $this->container->dms;
         $settings = $this->container->config;
-        $logger = $this->container->logger;
+				$logger = $this->container->logger;
+				$userobj = null;
+				if($this->container->has('userobj'))
+					$userobj = $this->container->userobj;
+
+				if($userobj) {
+					$response = $next($request, $response);
+					return $response;
+				}
+
+				$logger->log("Invoke middleware for method ".$request->getMethod()." on '".$request->getUri()->getPath()."'", PEAR_LOG_INFO);
         $logger->log("Access with method ".$request->getMethod()." on '".$request->getUri()->getPath()."'".(isset($this->container->environment['HTTP_ORIGIN']) ? " with origin ".$this->container->environment['HTTP_ORIGIN'] : ''), PEAR_LOG_INFO);
         if($settings->_apiOrigin && isset($this->container->environment['HTTP_ORIGIN'])) {
             $logger->log("Checking origin", PEAR_LOG_DEBUG);
@@ -2698,7 +2708,16 @@ $container['logger'] = $logger;
 $container['fulltextservice'] = $fulltextservice;
 $container['notifier'] = $notifier;
 $container['authenticator'] = $authenticator;
-$app->add(new Auth($container));
+
+$app->add(new RestapiAuth($container));
+
+if(isset($GLOBALS['SEEDDMS_HOOKS']['initRestAPI'])) {
+    foreach($GLOBALS['SEEDDMS_HOOKS']['initRestAPI'] as $hookObj) {
+        if (method_exists($hookObj, 'addMiddleware')) {
+            $hookObj->addMiddleware($app);
+        }
+    }
+}
 
 // Make CORS preflighted request possible
 $app->options('/{routes:.+}', function ($request, $response, $args) {

From 6341e13ca671ea7c3a9aa6a7ad3c3252cdc32f62 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 8 Dec 2022 14:48:36 +0100
Subject: [PATCH 1631/2006] show path of document/folder in typeahead search

---
 views/bootstrap/class.Search.php        | 4 ++--
 views/bootstrap/styles/application.css  | 5 +++++
 views/bootstrap/styles/application.js   | 4 ++--
 views/bootstrap4/styles/application.css | 5 +++++
 views/bootstrap4/styles/application.js  | 4 ++--
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index f1d3f4827..ff2ea8341 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -367,10 +367,10 @@ function typeahead() { /* {{{ */
 			foreach ($entries as $entry) {
 				if($entry->isType('document')) {
 //					$recs[] = 'D'.$entry->getName();
-					$recs[] = array('type'=>'D', 'id'=>$entry->getId(), 'name'=>$entry->getName());
+					$recs[] = array('type'=>'D', 'id'=>$entry->getId(), 'name'=>$entry->getName(), 'path'=>$entry->getParent()->getFolderPathPlain(true, '/'));
 				} elseif($entry->isType('folder')) {
 //					$recs[] = 'F'.$entry->getName();
-					$recs[] = array('type'=>'F', 'id'=>$entry->getId(), 'name'=>$entry->getName());
+					$recs[] = array('type'=>'F', 'id'=>$entry->getId(), 'name'=>$entry->getName(), 'path'=>$entry->getParent()->getFolderPathPlain(true, '/'));
 				}
 			}
 		}
diff --git a/views/bootstrap/styles/application.css b/views/bootstrap/styles/application.css
index 10d2c690c..bc4abf2c2 100644
--- a/views/bootstrap/styles/application.css
+++ b/views/bootstrap/styles/application.css
@@ -265,6 +265,11 @@ span.datepicker {
 span.datepicker input {
 	max-width: 100px;
 }
+
+div.typeahead span.path {
+	font-size: 85%;
+	color: #888;
+}
 /* Sidenav for Docs
  * -------------------------------------------------- */
 
diff --git a/views/bootstrap/styles/application.js b/views/bootstrap/styles/application.js
index 096c057d4..8cafbb25d 100644
--- a/views/bootstrap/styles/application.js
+++ b/views/bootstrap/styles/application.js
@@ -148,9 +148,9 @@ function initMost() {
 		 **/
 		highlighter : function (item) {
 			if(item.type.charAt(0) == 'D')
-				return '<i class="fa fa-file"></i> ' + item.name.replace(/</g, '&lt;');
+				return '<i class="fa fa-file"></i> ' + item.name.replace(/</g, '&lt;') + '<br /><span class="path">' + item.path + '</span>';
 			else if(item.type.charAt(0) == 'F')
-				return '<i class="fa fa-folder-o"></i> ' + item.name.replace(/</g, '&lt;');
+				return '<i class="fa fa-folder-o"></i> ' + item.name.replace(/</g, '&lt;') + '<br /><span class="path">' + item.path + '</span>';
 			else
 				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;');
 		},
diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css
index 06636e767..927e7bdcc 100644
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@@ -275,6 +275,11 @@ a.accordion2-toggle:focus, a.accordion2-toggle:hover {
 span.datepicker {
 	padding: 0px;
 }
+
+div.typeahead span.path {
+	font-size: 85%;
+	color: #888;
+}
 /* Sidenav for Docs
  * -------------------------------------------------- */
 
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index b2d729c12..a39a2f604 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -153,9 +153,9 @@ function initMost() {
 		 **/
 		highlighter : function (item) {
 			if(item.type.charAt(0) == 'D')
-				return '<i class="fa fa-file"></i> ' + item.name.replace(/</g, '&lt;');
+				return '<i class="fa fa-file"></i> ' + item.name.replace(/</g, '&lt;') + '<br /><span class="path">' + item.path + '</span>';
 			else if(item.type.charAt(0) == 'F')
-				return '<i class="fa fa-folder-o"></i> ' + item.name.replace(/</g, '&lt;');
+				return '<i class="fa fa-folder-o"></i> ' + item.name.replace(/</g, '&lt;') + '<br /><span class="path">' + item.path + '</span>';
 			else
 				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;');
 		},

From 91c5b113b26d5e4d7281d8788d84d31ff1b0dc91 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Dec 2022 10:51:05 +0100
Subject: [PATCH 1632/2006] add optional parameter $order to find()

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index fd2ec197c..084f355d0 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -179,7 +179,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 	 * @return boolean false in case of an error, otherwise array with elements
 	 * 'count', 'hits', 'facets'. 'hits' is an array of SeedDMS_SQLiteFTS_QueryHit
 	 */
-	public function find($query, $limit=array()) { /* {{{ */
+	public function find($query, $limit=array(), $order=array()) { /* {{{ */
 		if(!$this->_conn)
 			return false;
 
@@ -232,10 +232,26 @@ class SeedDMS_SQLiteFTS_Indexer {
 		$sql = "SELECT ".$this->_rawid.", documentid FROM docs";
 		if($query)
 			$sql .= " WHERE docs MATCH ".$this->_conn->quote($query);
-		if($this->_ftstype == 'fts5')
+		if($this->_ftstype == 'fts5') {
 			//$sql .= " ORDER BY rank";
-			// boost documentid, title and comment
-			$sql .= " ORDER BY bm25(docs, 10.0, 10.0, 10.0)";
+			// boost documentid, record_type, title, comment, keywords, category, mimetype, origfilename, owner, content, created unindexed, users, status, path
+			if(!empty($order['by'])) {
+				switch($order['by']) {
+				case "title":
+					$sql .= " ORDER BY title";
+					break;
+				case "created":
+					$sql .= " ORDER BY created";
+					break;
+				default:
+					$sql .= " ORDER BY bm25(docs, 10.0, 0.0, 10.0, 5.0, 5.0, 10.0)";
+				}
+				if(!empty($order['dir'])) {
+					if($order['dir'] == 'desc')
+						$sql .= " DESC";
+				}
+			}
+		}
 		if(!empty($limit['limit']))
 			$sql .= " LIMIT ".(int) $limit['limit'];
 		if(!empty($limit['offset']))

From 68f19b87c3b95128a1aec7a2ac317b33307f089c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Dec 2022 10:51:43 +0100
Subject: [PATCH 1633/2006] add optional parameter $col and $query to terms()

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 29 ++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 084f355d0..4a00502f2 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -334,16 +334,33 @@ class SeedDMS_SQLiteFTS_Indexer {
 	/**
 	 * Return list of terms in index
 	 *
-	 * This function does nothing!
+	 * @return array list of SeedDMS_SQLiteFTS_Term
 	 */
-	public function terms() { /* {{{ */
+	public function terms($query='', $col='') { /* {{{ */
 		if(!$this->_conn)
 			return false;
 
-		if($this->_ftstype == 'fts5')
-			$sql = "SELECT term, col, doc as occurrences FROM docs_terms WHERE col!='*' ORDER BY col";
-		else
-			$sql = "SELECT term, col, occurrences FROM docs_terms WHERE col!='*' ORDER BY col";
+		if($this->_ftstype == 'fts5') {
+			$sql = "SELECT term, col, doc as occurrences FROM docs_terms";
+			if($query || $col) {
+				$sql .= " WHERE";
+				if($query) {
+					$sql .= " term like '".$query."%'";
+					if($col)
+						$sql .= " AND";
+				}
+				if($col)
+					$sql .= " col = '".$col."'";
+			}
+			$sql .= " ORDER BY col, occurrences desc";
+		} else {
+			$sql = "SELECT term, col, occurrences FROM docs_terms WHERE col!='*'";
+			if($query)
+				$sql .= " AND term like '".$query."%'";
+			if($col)
+				$sql .= " AND col = '".$col."'";
+			$sql .=	" ORDER BY col, occurrences desc";
+		}
 		$res = $this->_conn->query($sql);
 		$terms = array();
 		if($res) {

From a8034350ef80ecaa35cffea36bae78b818a45224 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Dec 2022 10:52:08 +0100
Subject: [PATCH 1634/2006] fix documentation of count()

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 4a00502f2..c018e4d6a 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -373,8 +373,9 @@ class SeedDMS_SQLiteFTS_Indexer {
 	} /* }}} */
 
 	/**
-	 * Return list of documents in index
+	 * Return number of documents in index
 	 *
+	 * @return interger number of documents
 	 */
 	public function count() { /* {{{ */
 		$sql = "SELECT count(*) c FROM docs";

From 5fc160a8dc22a90955e6e719784cb920574fbff0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Dec 2022 10:52:33 +0100
Subject: [PATCH 1635/2006] add optional parameter $order to search() which is
 passed to find()

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index d6ba6b6a7..8ff430b47 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -70,7 +70,7 @@ class SeedDMS_SQliteFTS_Search {
 	 * @param object $index SQlite FTS index
 	 * @return object instance of SeedDMS_Lucene_Search
 	 */
-	function search($term, $fields=array(), $limit=array()) { /* {{{ */
+	function search($term, $fields=array(), $limit=array(), $order=array()) { /* {{{ */
 		$querystr = '';
 		$term = trim($term);
 		if($term) {
@@ -140,7 +140,7 @@ class SeedDMS_SQliteFTS_Search {
 			$querystr .= '*)';
 		}
 		try {
-			$result = $this->index->find($querystr, $limit);
+			$result = $this->index->find($querystr, $limit, $order);
 			$recs = array();
 			foreach($result["hits"] as $hit) {
 				$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->documentid);

From b50ca0321d627d5efd767f634bc24a84e5f98955 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Dec 2022 10:53:15 +0100
Subject: [PATCH 1636/2006] start new version 1.0.18

---
 SeedDMS_SQLiteFTS/package.xml | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index a862245cf..21b220640 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2022-03-04</date>
+ <date>2022-12-09</date>
  <time>08:57:44</time>
  <version>
-  <release>1.0.17</release>
-  <api>1.0.17</api>
+  <release>1.0.18</release>
+  <api>1.0.18</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,8 +23,8 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- throw exeption in find() instead of returning false
-- fix query if rootFolder or startFolder is set
+- add optional parameter $order to SeedDMS_SQLiteFTS_Indexer::find()
+- add optional parameters $query and $col to SeedDMS_SQLiteFTS_Indexer::terms()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -353,5 +353,22 @@ add user to list of terms
 - add class SeedDMS_SQLiteFTS_Field
    </notes>
   </release>
+  <release>
+   <date>2022-03-04</date>
+   <time>08:57:44</time>
+   <version>
+    <release>1.0.17</release>
+    <api>1.0.17</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- throw exeption in find() instead of returning false
+- fix query if rootFolder or startFolder is set
+   </notes>
+  </release>
  </changelog>
 </package>

From 8340f9eb64aac5f2df4cca77da42dd979c01aa0a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Dec 2022 10:54:06 +0100
Subject: [PATCH 1637/2006] add style for div.fulltextinfo > span:hover

---
 views/bootstrap/styles/application.css  | 4 ++++
 views/bootstrap4/styles/application.css | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/views/bootstrap/styles/application.css b/views/bootstrap/styles/application.css
index bc4abf2c2..68898a15b 100644
--- a/views/bootstrap/styles/application.css
+++ b/views/bootstrap/styles/application.css
@@ -270,6 +270,10 @@ div.typeahead span.path {
 	font-size: 85%;
 	color: #888;
 }
+
+div.fulltextinfo > span:hover {
+	background-color: lightblue;
+}
 /* Sidenav for Docs
  * -------------------------------------------------- */
 
diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css
index 927e7bdcc..3a487f668 100644
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@@ -280,6 +280,10 @@ div.typeahead span.path {
 	font-size: 85%;
 	color: #888;
 }
+
+div.fulltextinfo > span:hover {
+	background-color: lightblue;
+}
 /* Sidenav for Docs
  * -------------------------------------------------- */
 

From a00883c100db9980a44fcd139d89c54bfe68a55a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 9 Dec 2022 10:54:28 +0100
Subject: [PATCH 1638/2006] set class of container, put terms in span

---
 views/bootstrap/class.IndexInfo.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.IndexInfo.php b/views/bootstrap/class.IndexInfo.php
index dc0e0f0f5..d578638c9 100644
--- a/views/bootstrap/class.IndexInfo.php
+++ b/views/bootstrap/class.IndexInfo.php
@@ -44,11 +44,11 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Theme_Style {
 
 		$numDocs = $index->count();
 		echo "<legend>".$numDocs." ".getMLText('documents')."</legend>";
-		$this->contentContainerStart();
+		$this->contentContainerStart('fulltextinfo');
 		for ($id = 0; $id < $numDocs; $id++) {
 			if (!$index->isDeleted($id)) {
 				if($hit = $index->getDocument($id))
-					echo "<span title=\"".$hit->document_id."\">".htmlspecialchars($hit->title)."</span>\n";
+					echo "<span title=\"".$hit->document_id."\">".htmlspecialchars($hit->title)."</span> ";
 			}
 		}
 		$this->contentContainerEnd();
@@ -62,10 +62,10 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Theme_Style {
 				if($field)
 					$this->contentContainerEnd();
 				echo "<h5>".htmlspecialchars($term->field)."</h5>";
-				$this->contentContainerStart();
+				$this->contentContainerStart('fulltextinfo');
 				$field = $term->field;
 			}
-			echo htmlspecialchars($term->text)."\n";
+			echo '<span title="'.$term->_occurrence.'">'.htmlspecialchars($term->text)."</span> ";
 //			echo "<span title=\"".$term->_occurrence."\">".htmlspecialchars($term->text)."</span>\n";
 		}
 		$this->contentContainerEnd();

From 35e2f86dba710a6e3db2f18dcbdabc16d90c6a69 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 12:58:37 +0100
Subject: [PATCH 1639/2006] add parameter $filter to find()

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index c018e4d6a..10d3d63ae 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -179,15 +179,22 @@ class SeedDMS_SQLiteFTS_Indexer {
 	 * @return boolean false in case of an error, otherwise array with elements
 	 * 'count', 'hits', 'facets'. 'hits' is an array of SeedDMS_SQLiteFTS_QueryHit
 	 */
-	public function find($query, $limit=array(), $order=array()) { /* {{{ */
+	public function find($query, $filter, $limit=array(), $order=array()) { /* {{{ */
 		if(!$this->_conn)
 			return false;
 
 		/* First count some records for facets */
 		foreach(array('owner', 'mimetype', 'category') as $facetname) {
 			$sql = "SELECT `".$facetname."`, count(*) AS `c` FROM `docs`";
-			if($query)
+			if($query) {
 				$sql .= " WHERE docs MATCH ".$this->_conn->quote($query);
+			}
+			if($filter) {
+				if($query)
+					$sql .= " AND ".$filter;
+				else
+					$sql .= " WHERE ".$filter;
+			}
 			$res = $this->_conn->query($sql." GROUP BY `".$facetname."`");
 			if(!$res)
 				throw new SeedDMS_SQLiteFTS_Exception("Counting records in facet \"$facetname\" failed.");
@@ -219,6 +226,12 @@ class SeedDMS_SQLiteFTS_Indexer {
 		$sql = "SELECT `record_type`, count(*) AS `c` FROM `docs`";
 		if($query)
 			$sql .= " WHERE docs MATCH ".$this->_conn->quote($query);
+		if($filter) {
+			if($query)
+				$sql .= " AND ".$filter;
+			else
+				$sql .= " WHERE ".$filter;
+		}
 		$res = $this->_conn->query($sql." GROUP BY `record_type`");
 		if(!$res)
 			throw new SeedDMS_SQLiteFTS_Exception("Counting records in facet \"record_type\" failed.");
@@ -232,6 +245,12 @@ class SeedDMS_SQLiteFTS_Indexer {
 		$sql = "SELECT ".$this->_rawid.", documentid FROM docs";
 		if($query)
 			$sql .= " WHERE docs MATCH ".$this->_conn->quote($query);
+		if($filter) {
+			if($query)
+				$sql .= " AND ".$filter;
+			else
+				$sql .= " WHERE ".$filter;
+		}
 		if($this->_ftstype == 'fts5') {
 			//$sql .= " ORDER BY rank";
 			// boost documentid, record_type, title, comment, keywords, category, mimetype, origfilename, owner, content, created unindexed, users, status, path

From 276ca2c5f4433d711690102b468a06d02dc3cabd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 12:59:13 +0100
Subject: [PATCH 1640/2006] allow to filter search by creation date

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Search.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index 8ff430b47..22c43a1e5 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -139,8 +139,20 @@ class SeedDMS_SQliteFTS_Search {
 			$querystr .= str_replace(':', 'x', $fields['startFolder']->getFolderList().$fields['startFolder']->getID().':');
 			$querystr .= '*)';
 		}
+
+		$filterstr = '';
+		if(!empty($fields['created_start'])) {
+			if($filterstr)
+				$filterstr .= ' AND ';
+			$filterstr .= '(created>='.$fields['created_start'].')';
+		}
+		if(!empty($fields['created_end'])) {
+			if($filterstr)
+				$filterstr .= ' AND ';
+			$filterstr .= '(created<'.$fields['created_end'].')';
+		}
 		try {
-			$result = $this->index->find($querystr, $limit, $order);
+			$result = $this->index->find($querystr, $filterstr, $limit, $order);
 			$recs = array();
 			foreach($result["hits"] as $hit) {
 				$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->documentid);

From 995fd1968493123d7817dd25e5bdfba790528d8a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 12:59:32 +0100
Subject: [PATCH 1641/2006] remove spaces

---
 op/op.AddDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 03e42468e..d1f6a7abd 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -427,7 +427,7 @@ foreach($file_ary as $file) {
 			}
 		}
 	}
-	
+
 	add_log_line("?name=".$name."&folderid=".$folderid);
 }
 

From 1e178fb1c3f4071a79f30e5217b050274aad69b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 13:01:46 +0100
Subject: [PATCH 1642/2006] use formSubmit() instead of plain html for submit
 button

---
 views/bootstrap/class.Settings.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 2bb683f42..936bf828a 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -680,9 +680,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
   </div>
 <?php
 if(is_writeable($settings->_configFilePath)) {
-?>
-  <button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
-<?php
+	$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 }
 ?>
 	</form>

From c31250089e1b3f92555393df88713411ee34516d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 13:05:22 +0100
Subject: [PATCH 1643/2006] use formSubmit() instead of plain html for submit
 button

---
 views/bootstrap/class.ExtensionMgr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 01d91845b..c2383c972 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -320,7 +320,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 <form action="../op/op.ExtensionMgr.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('extensionmgr'); ?>
 	<input type="hidden" name="action" value="refresh" />
-	<p><button type="submit" class="btn btn-primary"><i class="fa fa-refresh"></i> <?php printMLText("refresh");?></button></p>
+	<p><?php $this->formSubmit("<i class=\"fa fa-refresh\"></i> " . getMLText('refresh'));?></p>
 </form>
 			</div>
 
@@ -374,7 +374,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 					<input type="hidden" name="action" value="getlist" />
 					<input type="hidden" name="currenttab" value="repository" />
 					<input type="hidden" name="forceupdate" value="1" />
-          <button type="submit" class="btn btn-primary"><i class="fa fa-refresh"></i> <?= getMLText('force_update')?></button>
+          <?php $this->formSubmit("<i class=\"fa fa-refresh\"></i> " . getMLText('force_update'));?>
 					</form>
 </div>
 			</div>

From 22d59a61edae8addd8dc29d1a1ac4026b06903bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 13:07:26 +0100
Subject: [PATCH 1644/2006] add neutral submit button

---
 views/bootstrap/class.Bootstrap.php   | 3 +++
 views/bootstrap4/class.Bootstrap4.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e00b4c75d..a3af58a5f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1208,6 +1208,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		case 'danger':
 			$class = 'btn-danger';
 			break;
+		case 'neutral':
+			$class = '';
+			break;
 		case 'primary':
 		default:
 			$class = 'btn-primary';
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 5b82a1a8e..4dd80e56a 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1212,6 +1212,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		case 'danger':
 			$class = 'btn-danger';
 			break;
+		case 'neutral':
+			$class = '';
+			break;
 		case 'primary':
 		default:
 			$class = 'btn-primary';

From 6ae0eb38d966fcf58cac15c4ccfd71fc5623150d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 13:12:21 +0100
Subject: [PATCH 1645/2006] use formSubmit() instead of plain html for submit
 button

---
 views/bootstrap/class.RemoveFolder.php      | 2 +-
 views/bootstrap/class.RemoveFolderFiles.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.RemoveFolder.php b/views/bootstrap/class.RemoveFolder.php
index 713462875..4b3f4b258 100644
--- a/views/bootstrap/class.RemoveFolder.php
+++ b/views/bootstrap/class.RemoveFolder.php
@@ -47,7 +47,7 @@ class SeedDMS_View_RemoveFolder extends SeedDMS_Theme_Style {
 	<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
 	<input type="Hidden" name="showtree" value="<?php echo showtree();?>">
   <?php echo createHiddenFieldWithKey('removefolder'); ?>
-	<p><button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php printMLText("rm_folder");?></button></p>
+	<p><?php $this->formSubmit("<i class=\"fa fa-remove\"></i> " . getMLText('rm_folder'), '', '', 'danger'); ?></p>
 </form>
 <?php
 		$this->contentEnd();
diff --git a/views/bootstrap/class.RemoveFolderFiles.php b/views/bootstrap/class.RemoveFolderFiles.php
index 5081fd13d..71aa08162 100644
--- a/views/bootstrap/class.RemoveFolderFiles.php
+++ b/views/bootstrap/class.RemoveFolderFiles.php
@@ -48,7 +48,7 @@ class SeedDMS_View_RemoveFolderFiles extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removefolderfiles'); ?>
 	<input type="hidden" name="folderid" value="<?php echo $folder->getID()?>">
 	<p><?php printMLText("confirm_rm_folder_files", array ("foldername" => htmlspecialchars($folder->getName())));?></p>
-	<input class="btn" type="submit" value="<?php printMLText("accept");?>">
+	<?php $this->formSubmit(getMLText('accept'),'','',"neutral"); ?>
 </form>
 <?php
 		$this->contentContainerEnd();

From ad19678e8629e5d9f2e3f82de7e3b425a13b0f92 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 13:47:32 +0100
Subject: [PATCH 1646/2006] add secondary submit button

---
 views/bootstrap/class.Bootstrap.php   | 3 +++
 views/bootstrap4/class.Bootstrap4.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index a3af58a5f..035e390e0 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1208,6 +1208,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		case 'danger':
 			$class = 'btn-danger';
 			break;
+		case 'secondary':
+			$class = 'btn-secondary';
+			break;
 		case 'neutral':
 			$class = '';
 			break;
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 4dd80e56a..1bf5b646d 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1212,6 +1212,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		case 'danger':
 			$class = 'btn-danger';
 			break;
+		case 'secondary':
+			$class = 'btn-secondary';
+			break;
 		case 'neutral':
 			$class = '';
 			break;

From 3477b1fc9b16462dde1f1f57719fdea1432993e2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 13:48:11 +0100
Subject: [PATCH 1647/2006] use formSubmit() instead of plain html for submit
 button

---
 views/bootstrap/class.AttributeMgr.php        |  2 +-
 views/bootstrap/class.Calendar.php            |  2 +-
 views/bootstrap/class.Categories.php          |  2 +-
 views/bootstrap/class.DefaultKeywords.php     |  4 +--
 views/bootstrap/class.EditEvent.php           |  2 +-
 views/bootstrap/class.EditOnline.php          |  4 +--
 views/bootstrap/class.RemoveArchive.php       |  4 +--
 views/bootstrap/class.RemoveDocument.php      |  2 +-
 views/bootstrap/class.RemoveDocumentFile.php  |  6 ++--
 views/bootstrap/class.RemoveDump.php          |  4 +--
 views/bootstrap/class.RemoveEvent.php         |  2 +-
 views/bootstrap/class.RemoveGroup.php         |  2 +-
 views/bootstrap/class.RemoveLog.php           |  2 +-
 views/bootstrap/class.RemoveUser.php          |  2 +-
 .../class.RemoveUserFromProcesses.php         | 34 +++++++++----------
 views/bootstrap/class.RemoveVersion.php       |  2 +-
 views/bootstrap/class.UserDefaultKeywords.php |  8 ++---
 17 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index b3fe8817d..9864705f6 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -182,7 +182,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
 				<input type="hidden" name="attrdefid" value="<?php echo $selattrdef->getID()?>">
 				<input type="hidden" name="action" value="removeattrdef">
-				<button type="submit" class="btn btn-secondary"><i class="fa fa-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
+				<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_attrdef'),'','','secondary');?>
 			</form>
 <?php
 		}
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index a015ec347..5cae5f01e 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -120,7 +120,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
+	<?php $this->formSubmit("<i class=\"fa fa-remove\"></i> ".getMLText('delete'),'','','danger'); ?>
 </form>
 <?php
 			$this->contentContainerEnd();
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index f2688277b..639e73125 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -92,7 +92,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcat->getID()?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_document_category")?></button>
+						<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_document_category'),'','','danger');?>
 						</form>
 <?php
 		}
diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index eb96e797b..f21846d08 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -87,7 +87,7 @@ $(document).ready( function() {
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="categoryid" value="<?php echo $selcategory->getId(); ?>">
 						<input type="hidden" name="action" value="removecategory">
-						<button class="btn btn-danger" type="submit"><i class="fa fa-remove"></i> <?php echo getMLText("rm_default_keyword_category")?></button>
+						<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_default_keyword_category'),'','','danger');?>
 						</form>
 <?php
 		}
@@ -185,7 +185,7 @@ $(document).ready( function() {
 						<input type="Hidden" name="action" value="newkeywords">
 						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
 						<input type="text" class="keywords form-control" name="keywords">&nbsp;
-							<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("new_default_keywords");?></button>
+							<?php $this->formSubmit('<i class="fa fa-save"></i> '.getMLText('new_default_keywords'),'','','primary');?>
 						</form>
 					</div>
 				</div>
diff --git a/views/bootstrap/class.EditEvent.php b/views/bootstrap/class.EditEvent.php
index 061a1b803..99d6547e8 100644
--- a/views/bootstrap/class.EditEvent.php
+++ b/views/bootstrap/class.EditEvent.php
@@ -122,7 +122,7 @@ $(document).ready(function() {
 			</div>
 		</div>
 		<div class="controls">
-			<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
+			<?php $this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'),'','','neutral');?>
 		</div>
 </form>
 <?php
diff --git a/views/bootstrap/class.EditOnline.php b/views/bootstrap/class.EditOnline.php
index e47036b0f..66fbc8401 100644
--- a/views/bootstrap/class.EditOnline.php
+++ b/views/bootstrap/class.EditOnline.php
@@ -152,9 +152,7 @@ $(document).ready(function()	{
 <?php
 		if($user->getId() == $luser->getId()) {
 			echo $this->warningMsg(getMLText('edit_online_warning'));
-?>
-<button id="update" type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save"); ?></button>
-<?php
+			$this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'),'update','','primary');
 		} else {
 			echo $this->errorMsg(getMLText('edit_online_not_allowed'));
 		}
diff --git a/views/bootstrap/class.RemoveArchive.php b/views/bootstrap/class.RemoveArchive.php
index 46130c3dd..9930105b5 100644
--- a/views/bootstrap/class.RemoveArchive.php
+++ b/views/bootstrap/class.RemoveArchive.php
@@ -46,8 +46,8 @@ class SeedDMS_View_RemoveArchive extends SeedDMS_Theme_Style {
 ?>
 <form action="../op/op.RemoveArchive.php" name="form1" method="post">
 	<input type="hidden" name="arkname" value="<?php echo htmlspecialchars($arkname); ?>">
-  <?php echo createHiddenFieldWithKey('removearchive'); ?>
-	<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("backup_remove");?></button></p>
+	<?php echo createHiddenFieldWithKey('removearchive'); ?>
+	<p><?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('backup_remove'),'','','danger');?></p>
 </form>
 <?php
 		$this->contentEnd();
diff --git a/views/bootstrap/class.RemoveDocument.php b/views/bootstrap/class.RemoveDocument.php
index a3e43fa49..6c7700320 100644
--- a/views/bootstrap/class.RemoveDocument.php
+++ b/views/bootstrap/class.RemoveDocument.php
@@ -49,7 +49,7 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Theme_Style {
 <form action="../op/op.RemoveDocument.php" name="form1" method="post">
 <input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
 <?php echo createHiddenFieldWithKey('removedocument'); ?>
-<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_document");?></button></p>
+<p><?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_document'),'','','danger');?></p>
 </form>
 <?php
 		$this->contentEnd();
diff --git a/views/bootstrap/class.RemoveDocumentFile.php b/views/bootstrap/class.RemoveDocumentFile.php
index 00d4762f6..c835e2fde 100644
--- a/views/bootstrap/class.RemoveDocumentFile.php
+++ b/views/bootstrap/class.RemoveDocumentFile.php
@@ -47,9 +47,9 @@ class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Theme_Style {
 ?>
 <form action="../op/op.RemoveDocumentFile.php" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('removedocumentfile'); ?>
-	<input type="Hidden" name="documentid" value="<?php echo $document->getID()?>">
-	<input type="Hidden" name="fileid" value="<?php echo $file->getID()?>">
-	<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button>
+	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
+	<input type="hidden" name="fileid" value="<?php echo $file->getID()?>">
+	<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_file'),'','','danger');?>
 </form>
 <?php
 		$this->contentEnd();
diff --git a/views/bootstrap/class.RemoveDump.php b/views/bootstrap/class.RemoveDump.php
index f676b51e2..c9a380bde 100644
--- a/views/bootstrap/class.RemoveDump.php
+++ b/views/bootstrap/class.RemoveDump.php
@@ -43,12 +43,12 @@ class SeedDMS_View_RemoveDump extends SeedDMS_Theme_Style {
 		$this->contentHeading(getMLText("dump_remove"));
 ?>
 <form action="../op/op.RemoveDump.php" name="form1" method="post">
-	<input type="Hidden" name="dumpname" value="<?php echo htmlspecialchars($dumpname); ?>">
+	<input type="hidden" name="dumpname" value="<?php echo htmlspecialchars($dumpname); ?>">
 <?php
 	 	echo createHiddenFieldWithKey('removedump');
 		$this->warningMsg(getMLText("confirm_rm_dump", array ("dumpname" => htmlspecialchars($dumpname))));
 ?>
-	<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("dump_remove");?></button></p>
+	<p><?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('dump_remove'),'','','danger');?></p>
 </form>
 <?php
 		$this->contentEnd();
diff --git a/views/bootstrap/class.RemoveEvent.php b/views/bootstrap/class.RemoveEvent.php
index 27748211d..45bbaacab 100644
--- a/views/bootstrap/class.RemoveEvent.php
+++ b/views/bootstrap/class.RemoveEvent.php
@@ -49,7 +49,7 @@ class SeedDMS_View_RemoveEvent extends SeedDMS_Bootstrap_Style {
   <?php echo createHiddenFieldWithKey('removeevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo intval($event["id"]); ?>">
 	<p><?php printMLText("confirm_rm_event", array ("name" => htmlspecialchars($event["name"])));?></p>
-	<button class="btn" type="submit"><i class="fa fa-remove"></i> <?php printMLText("delete");?></button>
+	<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('delete'),'','','neutral');?>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/bootstrap/class.RemoveGroup.php b/views/bootstrap/class.RemoveGroup.php
index 2146c517d..7b8305af3 100644
--- a/views/bootstrap/class.RemoveGroup.php
+++ b/views/bootstrap/class.RemoveGroup.php
@@ -49,7 +49,7 @@ class SeedDMS_View_RemoveGroup extends SeedDMS_Theme_Style {
 <?php
 		$this->warningMsg(getMLText("confirm_rm_group", array ("groupname" => htmlspecialchars($group->getName()))));
 ?>
-<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_group");?></button></p>
+<p><?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_group'),'','','danger');?></p>
 </form>
 <?php
 		$this->contentEnd();
diff --git a/views/bootstrap/class.RemoveLog.php b/views/bootstrap/class.RemoveLog.php
index 736c34318..40ef4fecd 100644
--- a/views/bootstrap/class.RemoveLog.php
+++ b/views/bootstrap/class.RemoveLog.php
@@ -53,7 +53,7 @@ class SeedDMS_View_RemoveLog extends SeedDMS_Theme_Style {
 		}
 		$this->warningMsg(getMLText("confirm_rm_log", array ("logname" => implode(', ', $lognames))));
 ?>
-	<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_file");?></button></p>
+	<p><<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_file'),'','','danger');?>/p>
 </form>
 <?php
 		$this->contentEnd();
diff --git a/views/bootstrap/class.RemoveUser.php b/views/bootstrap/class.RemoveUser.php
index 361a6bdd5..e808cecfd 100644
--- a/views/bootstrap/class.RemoveUser.php
+++ b/views/bootstrap/class.RemoveUser.php
@@ -74,7 +74,7 @@ class SeedDMS_View_RemoveUser extends SeedDMS_Theme_Style {
 ?>
 <div class="control-group">
 	<div class="controls">
-		<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_user");?></button>
+		<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_user'),'','','danger');?>
 	</div>
 </div>
 
diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index 9f0bc8938..3dceb9835 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -199,24 +199,24 @@ $(document).ready( function() {
 				}
 			}
 			echo "</tbody>\n</table>";
-		$options = array(array(0, getMLText('do_no_transfer_to_user')));
-		foreach ($allusers as $currUser) {
-			if ($currUser->isGuest() || ($currUser->getID() == $rmuser->getID()) )
-				continue;
+			$options = array(array(0, getMLText('do_no_transfer_to_user')));
+			foreach ($allusers as $currUser) {
+				if ($currUser->isGuest() || ($currUser->getID() == $rmuser->getID()) )
+					continue;
 
-			if ($rmuser && $currUser->getID()==$rmuser->getID()) $selected=$count;
-			$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName()));
-		}
-		$this->formField(
-			getMLText("transfer_process_to_user"),
-			array(
-				'element'=>'select',
-				'name'=>'assignTo',
-				'class'=>'chzn-select',
-				'options'=>$options
-			)
-		);
-			echo '<button type="submit" class="btn btn-primary"><i class="fa fa-remove"></i> '.getMLText('transfer_processes_to_user').'</button>';
+				if ($rmuser && $currUser->getID()==$rmuser->getID()) $selected=$count;
+				$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName()));
+			}
+			$this->formField(
+				getMLText("transfer_process_to_user"),
+				array(
+					'element'=>'select',
+					'name'=>'assignTo',
+					'class'=>'chzn-select',
+					'options'=>$options
+				)
+			);
+			$this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('transfer_processes_to_user'),'','','primary');
 			echo '</form>';
 		}
 	} /* }}} */
diff --git a/views/bootstrap/class.RemoveVersion.php b/views/bootstrap/class.RemoveVersion.php
index 40e9869e7..6b1b8b430 100644
--- a/views/bootstrap/class.RemoveVersion.php
+++ b/views/bootstrap/class.RemoveVersion.php
@@ -49,7 +49,7 @@ class SeedDMS_View_RemoveVersion extends SeedDMS_Theme_Style {
 	<?php echo createHiddenFieldWithKey('removeversion'); ?>
 	<input type="hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="hidden" name="version" value="<?php echo $version->getVersion()?>">
-  <p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_version");?></button></p>
+  <p><?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_version'),'','','danger');?></p>
 </form>
 <?php
 		$this->contentEnd();
diff --git a/views/bootstrap/class.UserDefaultKeywords.php b/views/bootstrap/class.UserDefaultKeywords.php
index f7931c12e..70f60d8e6 100644
--- a/views/bootstrap/class.UserDefaultKeywords.php
+++ b/views/bootstrap/class.UserDefaultKeywords.php
@@ -139,7 +139,7 @@ $(document).ready(function() {
 					<?php echo createHiddenFieldWithKey('removecategory'); ?>
 						<input type="hidden" name="action" value="removecategory">
 						<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<button type="submit" class="btn btn-danger" title="<?php echo getMLText("delete")?>"><i class="fa fa-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
+						<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_default_keyword_category'),'','','danger');?>
 					</form>
 				</div>
 
@@ -151,7 +151,7 @@ $(document).ready(function() {
 							<input type="hidden" name="action" value="editcategory">
 							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 							<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName())?>">
-  						<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
+  						<?php $this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'),'','','neutral');?>
 					</div>
 				</div>
 				</form>
@@ -170,14 +170,14 @@ $(document).ready(function() {
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="editkeywords">
 									<input type="text" name="keywords" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<button type="submit" class="btn"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
+									<?php $this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'),'','','neutral');?>
 									</form>
 									<form style="display: inline-block;" method="post" action="../op/op.UserDefaultKeywords.php" >
   								<?php echo createHiddenFieldWithKey('removekeywords'); ?>
 									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
 									<input type="hidden" name="action" value="removekeywords">
-									<button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("delete")?></button>
+									<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('delete'),'','','danger');?>
 									</form>
 									<br>
 						<?php }  ?>

From aeb0e4f1de082353983d037f5caf5732039d5573 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 10 Dec 2022 14:18:07 +0100
Subject: [PATCH 1648/2006] use formSubmit() instead of plain html for submit
 button

---
 views/bootstrap/class.CheckInDocument.php   | 2 +-
 views/bootstrap/class.RemoveTransmittal.php | 2 +-
 views/bootstrap/class.RoleMgr.php           | 2 +-
 views/bootstrap/class.SchedulerTaskMgr.php  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 4dbe2b4e4..42df6c10f 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -698,7 +698,7 @@ $(document).ready(function() {
 	<?php echo createHiddenFieldWithKey('cancelcheckout'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 	<input type="hidden" name="confirm" value="1">
-	<input type="submit" class="btn btn-danger" value="<?php printMLText("cancel_checkout"); ?>">
+	<?php $this->formSubmit(getMLText('cancel_checkout'),'','','danger');?>
 </form>
 <?php
 		}
diff --git a/views/bootstrap/class.RemoveTransmittal.php b/views/bootstrap/class.RemoveTransmittal.php
index 6311861dd..3a909bb71 100644
--- a/views/bootstrap/class.RemoveTransmittal.php
+++ b/views/bootstrap/class.RemoveTransmittal.php
@@ -49,7 +49,7 @@ class SeedDMS_View_RemoveTransmittal extends SeedDMS_Theme_Style {
 <input type="hidden" name="action" value="removetransmittal">
 <?php echo createHiddenFieldWithKey('removetransmittal'); ?>
 
-<p><button type="submit" class="btn btn-danger"><i class="fa fa-remove"></i> <?php printMLText("rm_transmittal");?></button></p>
+<p><?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_transmittal'),'','','danger');?></p>
 
 </form>
 <?php
diff --git a/views/bootstrap/class.RoleMgr.php b/views/bootstrap/class.RoleMgr.php
index 8bbdb902b..1cecc7f17 100644
--- a/views/bootstrap/class.RoleMgr.php
+++ b/views/bootstrap/class.RoleMgr.php
@@ -117,7 +117,7 @@ $(document).ready( function() {
 				<?php echo createHiddenFieldWithKey('removerole'); ?>
 				<input type="hidden" name="roleid" value="<?php echo $selrole->getID()?>">
 				<input type="hidden" name="action" value="removerole">
-				<button type="submit" class="btn"><i class="fa fa-remove"></i> <?php echo getMLText("rm_role")?></button>
+				<?php $this->formSubmit('<i class="fa fa-remove"></i> '.getMLText('rm_role'),'','','neutral');?>
 			</form>
 <?php
 			}
diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 156df1b37..12577128f 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -282,7 +282,7 @@ $(document).ready( function() {
 	<div class="control-group">
 		<label class="control-label" for="login"></label>
 		<div class="controls">
-			<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
+			<?php $this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'),'','','primary');?>
 		</div>
 	</div>
 	</form>
@@ -469,7 +469,7 @@ $(document).ready( function() {
 	<div class="control-group">
 		<label class="control-label" for="login"></label>
 		<div class="controls">
-			<button type="submit" class="btn btn-primary"><i class="fa fa-save"></i> <?php printMLText("save")?></button>
+			<?php $this->formSubmit('<i class="fa fa-save"></i> '.getMLText('save'),'','','primary');?>
 		</div>
 	</div>
 	</form>

From 45221b815403efa56841bbc7c1355b5fe7ded168 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 11 Dec 2022 15:34:30 +0100
Subject: [PATCH 1649/2006] add changes of 5.1.29

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 90c74d1cc..d876f1e65 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - fix 'maximum size' error when uploading a file with drag&drop
 - update jquery to 3.6.1 (only bootstrap4 theme)
 - introduce authentication service
+- new hook in restapi to add middleware
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.28

From c786635f9c0c84282593f01099b7b4679358f8d1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 11 Dec 2022 16:56:05 +0100
Subject: [PATCH 1650/2006] fix inclusion of php files

---
 utils/schedulercli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index e0f0ef6c6..e45e9432f 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -59,8 +59,8 @@ if(isset($options['mode'])) {
 }
 
 include($myincpath."/inc/inc.Settings.php");
-include($myincpath."/inc/inc.LogInit.php");
 include($myincpath."/inc/inc.Utils.php");
+include($myincpath."/inc/inc.LogInit.php");
 include($myincpath."/inc/inc.Init.php");
 include($myincpath."/inc/inc.Language.php");
 include($myincpath."/inc/inc.Extension.php");

From c53e27efff756c27a65a3b361dd8ba1f5a2aaffb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 13 Dec 2022 17:43:47 +0100
Subject: [PATCH 1651/2006] make getFileName() public

---
 SeedDMS_Preview/Preview/PdfPreviewer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index 53086867c..c58f8c343 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -48,7 +48,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 	 * @param object $object document content or document file
 	 * @return string file name of preview image
 	 */
-	protected function getFileName($object) { /* {{{ */
+	public function getFileName($object) { /* {{{ */
 		if(!$object)
 			return false;
 

From a81f51c17c3a13d6f9ed877bf5ce7bb496390e51 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Dec 2022 12:35:02 +0100
Subject: [PATCH 1652/2006] add new field 'indexed'

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index 0ac27a583..dd426ff74 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -149,8 +149,9 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 			if($version) {
 				$this->addField(Zend_Search_Lucene_Field::Keyword('mimetype', $version->getMimeType()));
 				$this->addField(Zend_Search_Lucene_Field::Keyword('origfilename', $version->getOriginalFileName(), 'utf-8'));
+				$this->addField(Zend_Search_Lucene_Field::UnIndexed('created', $version->getDate()));
 				if(!$nocontent)
-					$this->addField(Zend_Search_Lucene_Field::UnIndexed('created', $version->getDate()));
+					$this->addField(Zend_Search_Lucene_Field::UnIndexed('indexed', time()));
 				if($attributes = $version->getAttributes()) {
 					foreach($attributes as $attribute) {
 						$attrdef = $attribute->getAttributeDefinition();

From 20d368ec9981afc541704d8d2688303fa9b30ddd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Dec 2022 12:35:16 +0100
Subject: [PATCH 1653/2006] add new field 'indexed'

---
 SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php |  4 +++-
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php         | 13 +++++++------
 SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php        |  1 +
 SeedDMS_SQLiteFTS/SQLiteFTS/Term.php            |  3 ++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index ab553bd96..bb14f710e 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -151,8 +151,9 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 			if($version) {
 				$this->addField(SeedDMS_SQLiteFTS_Field::Keyword('mimetype', $version->getMimeType()));
 				$this->addField(SeedDMS_SQLiteFTS_Field::Keyword('origfilename', $version->getOriginalFileName()));
+				$this->addField(SeedDMS_SQLiteFTS_Field::Keyword('created', $version->getDate(), 'unindexed'));
 				if(!$nocontent)
-					$this->addField(SeedDMS_SQLiteFTS_Field::Keyword('created', $version->getDate(), 'unindexed'));
+					$this->addField(SeedDMS_SQLiteFTS_Field::Keyword('indexed', time(), 'unindexed'));
 				if($attributes = $version->getAttributes()) {
 					foreach($attributes as $attribute) {
 						$attrdef = $attribute->getAttributeDefinition();
@@ -226,6 +227,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 			$this->addField(SeedDMS_SQLiteFTS_Field::Keyword('document_id', 'F'.$document->getID()));
 			$this->addField(SeedDMS_SQLiteFTS_Field::Keyword('record_type', 'folder'));
 			$this->addField(SeedDMS_SQLiteFTS_Field::Keyword('created', $document->getDate(), 'unindexed'));
+			$this->addField(SeedDMS_SQLiteFTS_Field::Keyword('indexed', time(), 'unindexed'));
 		}
 	} /* }}} */
 
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 10d3d63ae..bb9585c73 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -77,9 +77,9 @@ class SeedDMS_SQLiteFTS_Indexer {
 		$version = SQLite3::version();
 		if(self::ftstype == 'fts4') {
 			if($version['versionNumber'] >= 3008000)
-				$sql = 'CREATE VIRTUAL TABLE docs USING fts4(documentid, record_type, title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, status, path, notindexed=created, matchinfo=fts3)';
+				$sql = 'CREATE VIRTUAL TABLE docs USING fts4(documentid, record_type, title, comment, keywords, category, mimetype, origfilename, owner, content, created, indexed, users, status, path, notindexed=created, notindexed=indexed, matchinfo=fts3)';
 			else
-				$sql = 'CREATE VIRTUAL TABLE docs USING fts4(documentid, record_type, title, comment, keywords, category, mimetype, origfilename, owner, content, created, users, status, path, matchinfo=fts3)';
+				$sql = 'CREATE VIRTUAL TABLE docs USING fts4(documentid, record_type, title, comment, keywords, category, mimetype, origfilename, owner, content, created, indexed, users, status, path, matchinfo=fts3)';
 			$res = $index->_conn->exec($sql);
 			if($res === false) {
 				return null;
@@ -90,7 +90,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 				return null;
 			}
 		} elseif(self::ftstype == 'fts5') {
-			$sql = 'CREATE VIRTUAL TABLE docs USING fts5(documentid, record_type, title, comment, keywords, category, mimetype, origfilename, owner, content, created unindexed, users, status, path)';
+			$sql = 'CREATE VIRTUAL TABLE docs USING fts5(documentid, record_type, title, comment, keywords, category, mimetype, origfilename, owner, content, created unindexed, indexed unindexed, users, status, path)';
 			$res = $index->_conn->exec($sql);
 			if($res === false) {
 				return null;
@@ -123,7 +123,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		foreach(array('comment', 'keywords', 'category', 'content', 'mimetype', 'origfilename', 'status', 'created') as $kk) {
+		foreach(array('comment', 'keywords', 'category', 'content', 'mimetype', 'origfilename', 'status', 'created', 'indexed') as $kk) {
 			try {
 				${$kk} = $doc->getFieldValue($kk);
 			} catch (Exception $e) {
@@ -135,7 +135,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if($res === false) {
 			return false;
 		}
-		$sql = "INSERT INTO docs (documentid, record_type, title, comment, keywords, category, owner, content, mimetype, origfilename, created, users, status, path) VALUES (".$this->_conn->quote($doc->getFieldValue('document_id')).", ".$this->_conn->quote($doc->getFieldValue('record_type')).", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($comment).", ".$this->_conn->quote($keywords).", ".$this->_conn->quote($category).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($content).", ".$this->_conn->quote($mimetype).", ".$this->_conn->quote($origfilename).", ".(int)$created.", ".$this->_conn->quote($doc->getFieldValue('users')).", ".$this->_conn->quote($status).", ".$this->_conn->quote($doc->getFieldValue('path'))/*time()*/.")";
+		$sql = "INSERT INTO docs (documentid, record_type, title, comment, keywords, category, owner, content, mimetype, origfilename, created, indexed, users, status, path) VALUES (".$this->_conn->quote($doc->getFieldValue('document_id')).", ".$this->_conn->quote($doc->getFieldValue('record_type')).", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($comment).", ".$this->_conn->quote($keywords).", ".$this->_conn->quote($category).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($content).", ".$this->_conn->quote($mimetype).", ".$this->_conn->quote($origfilename).", ".(int)$created.", ".(int)$indexed.", ".$this->_conn->quote($doc->getFieldValue('users')).", ".$this->_conn->quote($status).", ".$this->_conn->quote($doc->getFieldValue('path'))/*time()*/.")";
 		$res = $this->_conn->exec($sql);
 		if($res === false) {
 			return false;
@@ -324,7 +324,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(!$this->_conn)
 			return false;
 
-		$sql = "SELECT ".$this->_rawid.", documentid, title, comment, owner, keywords, category, mimetype, origfilename, created, users, status, path".($content ? ", content" : "")." FROM docs WHERE ".$this->_rawid."='".$id."'";
+		$sql = "SELECT ".$this->_rawid.", documentid, title, comment, owner, keywords, category, mimetype, origfilename, created, indexed, users, status, path".($content ? ", content" : "")." FROM docs WHERE ".$this->_rawid."='".$id."'";
 		$res = $this->_conn->query($sql);
 		$doc = false;
 		if($res) {
@@ -341,6 +341,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 			$doc->addField(SeedDMS_SQLiteFTS_Field::Keyword('origfilename', $rec['origfilename']));
 			$doc->addField(SeedDMS_SQLiteFTS_Field::Text('owner', $rec['owner']));
 			$doc->addField(SeedDMS_SQLiteFTS_Field::Keyword('created', $rec['created']));
+			$doc->addField(SeedDMS_SQLiteFTS_Field::Keyword('indexed', $rec['indexed']));
 			$doc->addField(SeedDMS_SQLiteFTS_Field::Text('users', $rec['users']));
 			$doc->addField(SeedDMS_SQLiteFTS_Field::Keyword('status', $rec['status']));
 			$doc->addField(SeedDMS_SQLiteFTS_Field::Keyword('path', $rec['path']));
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php b/SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php
index facbd9519..843be973d 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/QueryHit.php
@@ -53,6 +53,7 @@ class SeedDMS_SQLiteFTS_QueryHit {
 	 */
 	public function __construct(SeedDMS_SQLiteFTS_Indexer $index) { /* {{{ */
 		$this->_index = $index;
+		$this->_document = null;
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
index 462d6123e..e31ff56bc 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Term.php
@@ -60,7 +60,8 @@ class SeedDMS_SQLiteFTS_Term {
 			9 => 'created',
 			10 => 'user',
 			11 => 'status',
-			12 => 'path'
+			12 => 'path',
+			13 => 'indexed',
 		);
 		/* fts5 pass the column name in $col, fts4 uses an integer */
 		if(is_int($col))

From 0186e1af00799133504df6fac0f661c6a4493f56 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Dec 2022 12:36:35 +0100
Subject: [PATCH 1654/2006] check field indexed instead of created

---
 views/bootstrap/class.Indexer.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 743e108c6..75dd4200f 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -42,17 +42,17 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 		if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
 			echo " <span id=\"status_F".$folder->getID()."\" class=\"indexme indexstatus\" data-docid=\"F".$folder->getID()."\">".getMLText('index_waiting')."</span>";
 		} else {
-			/* Check if the attribute created is set or has a value older
+			/* Check if the attribute indexed is set or has a value older
 			 * than the lastet content. Documents without such an attribute
 			 * where added when a new document was added to the dms. In such
 			 * a case the document content  wasn't indexed.
 			 */
 			try {
-				$created = (int) $hit->getDocument()->getFieldValue('created');
+				$indexed = (int) $hit->getDocument()->getFieldValue('indexed');
 			} catch (/* Zend_Search_Lucene_ */Exception $e) {
-				$created = 0;
+				$indexed = 0;
 			}
-			if($created >= $folder->getDate() && !$this->forceupdate) {
+			if($indexed >= $folder->getDate() && !$this->forceupdate) {
 				echo "<span id=\"status_F".$folder->getID()."\" class=\"indexstatus\" data-docid=\"F".$folder->getID()."\">".getMLText('index_document_unchanged')."</span>";
 			} else {
 				$this->fulltextservice->Indexer()->delete($hit->id);
@@ -70,18 +70,18 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 				if(($this->numdocs == 0) || !($hit = $lucenesearch->getDocument($document->getId()))) {
 					echo " <span id=\"status_D".$document->getID()."\" class=\"indexme indexstatus\" data-docid=\"D".$document->getID()."\">".getMLText('index_waiting')."</span>";
 				} else {
-					/* Check if the attribute created is set or has a value older
+					/* Check if the attribute indexed is set or has a value older
 					 * than the lastet content. Documents without such an attribute
 					 * where added when a new document was added to the dms. In such
 					 * a case the document content  wasn't indexed.
 					 */
 					try {
-						$created = (int) $hit->getDocument()->getFieldValue('created');
+						$indexed = (int) $hit->getDocument()->getFieldValue('indexed');
 					} catch (/* Zend_Search_Lucene_ */Exception $e) {
-						$created = 0;
+						$indexed = 0;
 					}
 					$content = $document->getLatestContent();
-					if($created >= $content->getDate() && !$this->forceupdate) {
+					if($indexed >= $content->getDate() && !$this->forceupdate) {
 						echo "<span id=\"status_D".$document->getID()."\" class=\"indexstatus\" data-docid=\"D".$document->getID()."\">".getMLText('index_document_unchanged')."</span>";
 					} else {
 						$this->fulltextservice->Indexer()->delete($hit->id);

From 61db1313a32d2745e4f00edf6d86ffba6ff2065f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Dec 2022 12:36:57 +0100
Subject: [PATCH 1655/2006] add translation of 'Processing ...', use
 getMLText()

---
 views/bootstrap/class.Indexer.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 75dd4200f..34b5435f5 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -132,7 +132,7 @@ function check_queue() {
 		}
 		var command = '';
 		docid = funcArray.pop();
-		$('#status_'+docid).html('Processsing ...');
+		$('#status_'+docid).html('<?= getMLText('index_processing') ?>');
 		if(docid[0] == 'F') {
 			command = 'indexfolder';
 		} else {
@@ -161,11 +161,11 @@ function check_queue() {
 				// console.log('success ' + data.data);
 				if(data.success) {
 					if(data.cmd)
-						$('#status_'+data.data).html('<?php printMLText('index_done'); ?>');
+						$('#status_'+data.data).html('<?= getMLText('index_done') ?>');
 					else
-						$('#status_'+data.data).html('<?= getMLText('index_done').' ('.getMLText('index_no_content').')'; ?>');
+						$('#status_'+data.data).html('<?= getMLText('index_done').' ('.getMLText('index_no_content').')' ?>');
 				} else {
-					$('#status_'+data.data).html('<?php printMLText('index_error'); ?>');
+					$('#status_'+data.data).html('<?= getMLText('index_error') ?>');
 					noty({
 						text: '<p><strong>Docid: ' + data.data + ' (' + data.mimetype + ')</strong></p>' + '<p>Cmd: ' + data.cmd + '</p>' + data.message,
 						type: 'error',
@@ -196,7 +196,7 @@ $(document).ready( function() {
 	$('.indexme').each(function(index) {
 		var element = $(this);
 		var docid = element.data('docid');
-		element.html('<?php printMLText('index_pending'); ?>');
+		element.html('<?= getMLText('index_pending') ?>');
     funcArray.push(docid);
 	});
 	docstoindex = funcArray.length;
@@ -235,13 +235,13 @@ div.folder {font-weight: bold; line-height: 20px; margin-top: 10px;}
 			<div class="progress">
 				<div class="progress-bar bar total-bar" role="progressbar" style="width: 100%;"></div>
 			</div>
-			<div class="bar-legend"><?php printMLText('overall_indexing_progress'); ?></div>
+			<div class="bar-legend"><?= getMLText('overall_indexing_progress') ?></div>
 		</div>
 		<div>
 			<div class="progress">
 				<div class="progress-bar bar queue-bar" role="progressbar" style="width: 100%;"></div>
 			</div>
-			<div class="bar-legend"><?php printMLText('indexing_tasks_in_queue'); ?></div>
+			<div class="bar-legend"><?= getMLText('indexing_tasks_in_queue') ?></div>
 		</div>
 <?php
 		$folderprocess = new SeedDMS_View_Indexer_Process_Folder($fulltextservice, $forceupdate);

From e141892934b1cc3a8ebe1599eed77e4da547a5ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 15 Dec 2022 12:46:54 +0100
Subject: [PATCH 1656/2006] fulltext index uses 'indexed' instead of 'created'

---
 inc/inc.Tasks.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 9d8868465..f198808c3 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -157,17 +157,17 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 				echo "(Timeout)".PHP_EOL;
 			}
 		} else {
-			/* Check if the attribute created is set or has a value older
+			/* Check if the attribute indexed is set or has a value older
 			 * than the lastet content. Folders without such an attribute
 			 * where added when a new folder was added to the dms. In such
 			 * a case the folder content wasn't indexed.
 			 */
 			try {
-				$created = (int) $hit->getDocument()->getFieldValue('created');
+				$indexed = (int) $hit->getDocument()->getFieldValue('indexed');
 			} catch (/* Zend_Search_Lucene_ */Exception $e) {
-				$created = 0;
+				$indexed = 0;
 			}
-			if($created >= $folder->getDate() && !$this->forceupdate) {
+			if($indexed >= $folder->getDate() && !$this->forceupdate) {
 				echo "(".getMLText('index_folder_unchanged').")".PHP_EOL;
 			} else {
 				$this->fulltextservice->Indexer()->delete($hit->id);
@@ -212,18 +212,18 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 						echo "(Timeout)".PHP_EOL;
 					}
 				} else {
-					/* Check if the attribute created is set or has a value older
+					/* Check if the attribute indexed is set or has a value older
 					 * than the lastet content. Documents without such an attribute
 					 * where added when a new document was added to the dms. In such
 					 * a case the document content wasn't indexed.
 					 */
 					try {
-						$created = (int) $hit->getDocument()->getFieldValue('created');
+						$indexed = (int) $hit->getDocument()->getFieldValue('indexed');
 					} catch (/* Zend_Search_Lucene_ */Exception $e) {
-						$created = 0;
+						$indexed = 0;
 					}
 					$content = $document->getLatestContent();
-					if($created >= $content->getDate() && !$this->forceupdate) {
+					if($indexed >= $content->getDate() && !$this->forceupdate) {
 						echo "(".getMLText('index_document_unchanged').")".PHP_EOL;
 					} else {
 						$this->fulltextservice->Indexer()->delete($hit->id);

From ed036819e7b67584900b68542a8530ab87e92045 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 17 Dec 2022 14:07:55 +0100
Subject: [PATCH 1657/2006] set currenttab from GET if available

---
 out/out.ViewFolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index e4880beed..935b291a6 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -100,7 +100,7 @@ if($view) {
 	$view->setParam('offset', $offset);
 	$view->setParam('limit', $limit);
 	$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
-	$view->setParam('currenttab', 'folderinfo');
+	$view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : "folderinfo");
 	$view($_GET);
 	exit;
 }

From edabd515f18bd349d23d3047c57dd7998eb275d5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Dec 2022 12:41:39 +0100
Subject: [PATCH 1658/2006] use methods in style to create tabs

---
 views/bootstrap/class.ExtensionMgr.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index c2383c972..db44c3928 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -307,11 +307,11 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 		$this->columnStart(8);
 ?>
 		<ul class="nav nav-pills" id="extensionstab" role="tablist">
-			<li class="nav-item <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>"><a class="nav-link <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>" data-target="#installed" data-toggle="tab" role="button"><?= getMLText('extension_mgr_installed'); ?></a></li>
-			<li class="nav-item <?php if($currenttab == 'repository') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'repository') echo 'active'; ?>" data-target="#repository" data-toggle="tab" role="button"><?= getMLText('extension_mgr_repository'); ?></a></li>
+<?php $this->showPaneHeader('installed', getMLText('extension_mgr_installed'), (!$currenttab || $currenttab == 'installed')); ?>
+<?php $this->showPaneHeader('repository', getMLText('extension_mgr_repository'), ($currenttab == 'repository')); ?>
 		</ul>
 		<div class="tab-content">
-			<div class="tab-pane <?php if(!$currenttab || $currenttab == 'installed') echo 'active'; ?>" id="installed" role="tabpanel">
+			<?php $this->showStartPaneContent('installed', (!$currenttab || $currenttab == 'installed')); ?>
 			<input id="extensionfilter" class="form-control" type="text" placeholder="<?= getMLText('type_to_filter'); ?>">
 	<div class="ajax" data-view="ExtensionMgr" data-action="installedList" data-afterload="()=>{filterList();}"></div>
 <?php
@@ -322,9 +322,9 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 	<input type="hidden" name="action" value="refresh" />
 	<p><?php $this->formSubmit("<i class=\"fa fa-refresh\"></i> " . getMLText('refresh'));?></p>
 </form>
-			</div>
+			<?php $this->showEndPaneContent('installed', $currenttab); ?>
 
-			<div class="tab-pane <?php if($currenttab == 'repository') echo 'active'; ?>" id="repository" role="tabpanel">
+			<?php $this->showStartPaneContent('repository', ($currenttab == 'repository')); ?>
 <?php
 		echo "<table class=\"table\">\n";
 		print "<thead>\n<tr>\n";
@@ -376,8 +376,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 					<input type="hidden" name="forceupdate" value="1" />
           <?php $this->formSubmit("<i class=\"fa fa-refresh\"></i> " . getMLText('force_update'));?>
 					</form>
-</div>
-			</div>
+				</div>
+			<?php $this->showEndPaneContent('repository', $currenttab); ?>
 		</div>
 <?php
 		$this->columnEnd();

From 79b1560a270eba335695f57463b39e216b9ce877 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 18 Dec 2022 12:46:29 +0100
Subject: [PATCH 1659/2006] fix typo

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d876f1e65..fc144fc55 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,7 +26,7 @@
 - rest api returns version attributes as 'version_attributes' (was
   'version-attributes'), each attribute also contains the name
 - new hook in rest api to add more routes in extensions
-- uploaded serveral documents at once by fast upload will assign random
+- uploaded several documents at once by fast upload will assign random
   sequence number to allow manually sorting the documents afterwards
 - fix counting of login failures if both ldap and db authentication is done
 

From d72422eb36c31618311ff9ce71ed86a5bf6e95e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 19 Dec 2022 16:00:28 +0100
Subject: [PATCH 1660/2006] add second column with error messages

---
 views/bootstrap/class.Indexer.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 34b5435f5..4ac0b3cf5 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -165,6 +165,7 @@ function check_queue() {
 					else
 						$('#status_'+data.data).html('<?= getMLText('index_done').' ('.getMLText('index_no_content').')' ?>');
 				} else {
+					$('#update_messages').append('<div><p><strong>Docid: ' + data.data + ' (' + data.mimetype + ')</strong></p>' + '<p>Cmd: ' + data.cmd + '</p>' + data.message+'</div>');
 					$('#status_'+data.data).html('<?= getMLText('index_error') ?>');
 					noty({
 						text: '<p><strong>Docid: ' + data.data + ' (' + data.mimetype + ')</strong></p>' + '<p>Cmd: ' + data.cmd + '</p>' + data.message,
@@ -218,6 +219,8 @@ $(document).ready( function() {
 		$this->globalNavigation();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("update_fulltext_index"));
 		if($fulltextservice) {
 			$index = $fulltextservice->Indexer();
@@ -230,7 +233,6 @@ div.folder {font-weight: bold; line-height: 20px; margin-top: 10px;}
 .progress {margin-bottom: 2px;}
 .bar-legend {text-align: right; font-size: 85%; margin-bottom: 15px;}
 </style>
-		<div style="max-width: 900px;">
 		<div>
 			<div class="progress">
 				<div class="progress-bar bar total-bar" role="progressbar" style="width: 100%;"></div>
@@ -247,7 +249,13 @@ div.folder {font-weight: bold; line-height: 20px; margin-top: 10px;}
 		$folderprocess = new SeedDMS_View_Indexer_Process_Folder($fulltextservice, $forceupdate);
 		call_user_func(array($folderprocess, 'process'), $folder, -1);
 		$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
-		echo "</div>";
+		$this->columnEnd();
+		$this->columnStart(6);
+		$this->contentHeading(getMLText("update_fulltext_messages"));
+		echo '<div id="update_messages">';
+		echo '</div>';
+		$this->columnEnd();
+		$this->rowEnd();
 
 		$index->commit();
 		$index->optimize();

From 6233ac59ff808b185be09f8596b59d36d887492f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Dec 2022 13:45:53 +0100
Subject: [PATCH 1661/2006] log transactions

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 1c3a48a9f..cd0161658 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -447,9 +447,15 @@ class SeedDMS_Core_DatabaseAccess {
 			$this->_conn->beginTransaction();
 		}
 		$this->_intransaction++;
+		if($this->_logfp) {
+			fwrite($this->_logfp, microtime()."	START ".$htis->_intransaction."\n");
+		}
 	} /* }}} */
 
 	function rollbackTransaction() { /* {{{ */
+		if($this->_logfp) {
+			fwrite($this->_logfp, microtime()."	ROLLBACK ".$htis->_intransaction."\n");
+		}
 		if($this->_intransaction == 1) {
 			$this->_conn->rollBack();
 		}
@@ -457,6 +463,9 @@ class SeedDMS_Core_DatabaseAccess {
 	} /* }}} */
 
 	function commitTransaction() { /* {{{ */
+		if($this->_logfp) {
+			fwrite($this->_logfp, microtime()."	COMMIT ".$htis->_intransaction."\n");
+		}
 		if($this->_intransaction == 1) {
 			$this->_conn->commit();
 		}

From 41721467acb0b313da98ad2f744f50b86e237e1b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Dec 2022 15:54:47 +0100
Subject: [PATCH 1662/2006] focus search field after loading page

---
 views/bootstrap/class.ViewFolder.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 0f930c652..9827acd10 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -137,6 +137,9 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Theme_Style {
 		header('Content-Type: application/javascript; charset=UTF-8');
 		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 ?>
+$(document).ready(function() {
+	$('#searchfield').focus();
+});
 seeddms_folder = <?= $folder->getID() ?>;
 function folderSelectedmaintree(id, name) {
 <?php if(!$onepage) { ?>

From 06e9f41ec17351c0172e786b515f49ce4eef92f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 20 Dec 2022 15:55:37 +0100
Subject: [PATCH 1663/2006] replace plain html in formField() method

---
 views/bootstrap/class.ChangePassword.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ChangePassword.php b/views/bootstrap/class.ChangePassword.php
index 335fc9270..a6fe8046c 100644
--- a/views/bootstrap/class.ChangePassword.php
+++ b/views/bootstrap/class.ChangePassword.php
@@ -35,8 +35,8 @@ class SeedDMS_View_ChangePassword extends SeedDMS_Theme_Style {
 		header('Content-Type: application/javascript; charset=UTF-8');
 		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 ?>
-document.form1.newpassword.focus();
 $(document).ready(function() {
+	$('#newpassword').focus();
 	$("#form1").validate({
 		rules: {
 			newpasswordrepeat: {
@@ -78,7 +78,16 @@ $(document).ready(function() {
 		$this->contentContainerStart();
 		$this->formField(
 			getMLText("password"),
-			'<input class="pwd form-control" type="password" rel="strengthbar" name="newpassword" id="newpassword" required="required">'
+			array(
+				'element'=>'input',
+				'type'=>'password',
+				'id'=>'newpassword',
+				'name'=>'newpassword',
+				'autocomplete'=>'off',
+				'required'=>true,
+				'class'=>'pwd',
+				'attributes'=>[['rel', 'strengthbar']]
+			)
 		);
 		if($passwordstrength > 0) {
 			$this->formField(

From 8940a3b3388e415a23ba60e05e0afdadb69ace68 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 1 Jan 2023 09:18:52 +0100
Subject: [PATCH 1664/2006] timeout can be passed to constructor

---
 inc/inc.ClassConversionServiceExec.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassConversionServiceExec.php b/inc/inc.ClassConversionServiceExec.php
index 3931c0fb7..eff1d5ab1 100644
--- a/inc/inc.ClassConversionServiceExec.php
+++ b/inc/inc.ClassConversionServiceExec.php
@@ -91,11 +91,11 @@ class SeedDMS_ConversionServiceExec extends SeedDMS_ConversionServiceBase {
 		}
 	} /* }}} */
 
-	public function __construct($from, $to, $cmd) {
+	public function __construct($from, $to, $cmd, $timeout=5) {
 		$this->from = $from;
 		$this->to = $to;
 		$this->cmd = $cmd;
-		$this->timeout = 5;
+		$this->timeout = ((int) $timeout) ? (int) $timeout : 5;
 	}
 
 	public function getInfo() {

From c67cc6ede4ffe928e3ccecf670dd62e54bf12a1c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 1 Jan 2023 09:21:01 +0100
Subject: [PATCH 1665/2006] turn off auto commit for mysql

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 1 +
 SeedDMS_Core/package.xml              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index cd0161658..11f2541dc 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -301,6 +301,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'mysql':
 					$this->_conn->exec('SET NAMES utf8');
+					$this->_conn->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
 					/* Turn this on if you want strict checking of default values, etc. */
 					/* $this->_conn->exec("SET SESSION sql_mode = 'STRICT_TRANS_TABLES'"); */
 					/* The following is the default on Ubuntu 16.04 */
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 164db26fa..ad0716151 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -26,6 +26,7 @@
  <notes>
 - SeedDMS_Core_Folder::addDocument() does rollback transaction propperly when setting document categories fail
 - add $skiproot and $sep parameter to SeedDMS_Core_Folder::getFolderPathPlain()
+- turn off auto commit for mysql
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From f4b8eb05b77697cdff3f456ad4526b3409af4dc9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 1 Jan 2023 09:22:11 +0100
Subject: [PATCH 1666/2006] set timeout of SeedDMS_ConversionServiceExec

---
 inc/inc.ConversionInit.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ConversionInit.php b/inc/inc.ConversionInit.php
index a1ccb56e6..880e488f1 100644
--- a/inc/inc.ConversionInit.php
+++ b/inc/inc.ConversionInit.php
@@ -5,19 +5,19 @@ $conversionmgr = new SeedDMS_ConversionMgr();
 
 if(!empty($settings->_converters['preview'])) {
 	foreach($settings->_converters['preview'] as $mimetype=>$cmd) {
-		$conversionmgr->addService(new SeedDMS_ConversionServiceExec($mimetype, 'image/png', $cmd))->setLogger($logger);
+		$conversionmgr->addService(new SeedDMS_ConversionServiceExec($mimetype, 'image/png', $cmd), $settings->_cmdTimeout)->setLogger($logger);
 	}
 }
 
 if(!empty($settings->_converters['pdf'])) {
 	foreach($settings->_converters['pdf'] as $mimetype=>$cmd) {
-		$conversionmgr->addService(new SeedDMS_ConversionServiceExec($mimetype, 'application/pdf', $cmd))->setLogger($logger);
+		$conversionmgr->addService(new SeedDMS_ConversionServiceExec($mimetype, 'application/pdf', $cmd, $settings->_cmdTimeout))->setLogger($logger);
 	}
 }
 
 if(!empty($settings->_converters['fulltext'])) {
 	foreach($settings->_converters['fulltext'] as $mimetype=>$cmd) {
-		$conversionmgr->addService(new SeedDMS_ConversionServiceExec($mimetype, 'text/plain', $cmd))->setLogger($logger);
+		$conversionmgr->addService(new SeedDMS_ConversionServiceExec($mimetype, 'text/plain', $cmd, $settings->_cmdTimeout))->setLogger($logger);
 	}
 }
 

From 7202d85e5541d5d946661cd8f5f522dc3db11404 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 1 Jan 2023 09:23:04 +0100
Subject: [PATCH 1667/2006] fix indention of lines

---
 restapi/index.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index d21be66c8..a988a63f2 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -2619,17 +2619,17 @@ class RestapiAuth { /* {{{ */
         // $this->container has the DI
         $dms = $this->container->dms;
         $settings = $this->container->config;
-				$logger = $this->container->logger;
-				$userobj = null;
-				if($this->container->has('userobj'))
-					$userobj = $this->container->userobj;
+        $logger = $this->container->logger;
+        $userobj = null;
+        if($this->container->has('userobj'))
+            $userobj = $this->container->userobj;
 
-				if($userobj) {
-					$response = $next($request, $response);
-					return $response;
-				}
+        if($userobj) {
+            $response = $next($request, $response);
+            return $response;
+        }
 
-				$logger->log("Invoke middleware for method ".$request->getMethod()." on '".$request->getUri()->getPath()."'", PEAR_LOG_INFO);
+        $logger->log("Invoke middleware for method ".$request->getMethod()." on '".$request->getUri()->getPath()."'", PEAR_LOG_INFO);
         $logger->log("Access with method ".$request->getMethod()." on '".$request->getUri()->getPath()."'".(isset($this->container->environment['HTTP_ORIGIN']) ? " with origin ".$this->container->environment['HTTP_ORIGIN'] : ''), PEAR_LOG_INFO);
         if($settings->_apiOrigin && isset($this->container->environment['HTTP_ORIGIN'])) {
             $logger->log("Checking origin", PEAR_LOG_DEBUG);

From 5bd69596c98a1df05d5943f15e7ecc7a89894b2f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 1 Jan 2023 19:58:28 +0100
Subject: [PATCH 1668/2006] add slim middleware for authenticating with session

---
 inc/inc.ClassAuthenticationMiddleware.php | 73 +++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 inc/inc.ClassAuthenticationMiddleware.php

diff --git a/inc/inc.ClassAuthenticationMiddleware.php b/inc/inc.ClassAuthenticationMiddleware.php
new file mode 100644
index 000000000..5ddb846d7
--- /dev/null
+++ b/inc/inc.ClassAuthenticationMiddleware.php
@@ -0,0 +1,73 @@
+<?php
+/* Middleware for authentication based on session */
+class SeedDMS_Auth_Middleware_Session { /* {{{ */
+
+	private $container;
+
+	public function __construct($container) {
+		$this->container = $container;
+	}
+
+	/**
+	 * Example middleware invokable class
+	 *
+	 * @param  \Psr\Http\Message\ServerRequestInterface $request  PSR7 request
+	 * @param  \Psr\Http\Message\ResponseInterface      $response PSR7 response
+	 * @param  callable                                 $next     Next middleware
+	 *
+	 * @return \Psr\Http\Message\ResponseInterface
+	 */
+	public function __invoke($request, $response, $next) {
+		// $this->container has the DI
+		$dms = $this->container->dms;
+		$settings = $this->container->config;
+		$logger = $this->container->logger;
+		$userobj = null;
+		if($this->container->has('userobj'))
+				$userobj = $this->container->userobj;
+
+		if($userobj) {
+				$response = $next($request, $response);
+				return $response;
+		}
+
+		$logger->log("Invoke middleware for method ".$request->getMethod()." on '".$request->getUri()->getPath()."'", PEAR_LOG_INFO);
+		require_once("inc/inc.ClassSession.php");
+		$session = new SeedDMS_Session($dms->getDb());
+		if (isset($_COOKIE["mydms_session"])) {
+			$dms_session = $_COOKIE["mydms_session"];
+			$logger->log("Session key: ".$dms_session, PEAR_LOG_DEBUG);
+			if(!$resArr = $session->load($dms_session)) {
+				/* Delete Cookie */
+				setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot);
+				$logger->log("Session for id '".$dms_session."' has gone", PEAR_LOG_ERR);
+				return $response->withStatus(403);
+			}
+
+			/* Load user data */
+			$userobj = $dms->getUser($resArr["userID"]);
+			if (!is_object($userobj)) {
+				/* Delete Cookie */
+				setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot);
+				if($settings->_enableGuestLogin) {
+					if(!($userobj = $dms->getUser($settings->_guestID)))
+						return $response->withStatus(403);
+				} else
+					return $response->withStatus(403);
+			}
+			if($userobj->isAdmin()) {
+				if($resArr["su"]) {
+					if(!($userobj = $dms->getUser($resArr["su"])))
+						return $response->withStatus(403);
+				}
+			}
+			$dms->setUser($userobj);
+		} else {
+			return $response->withStatus(403);
+		}
+		$this->container['userobj'] = $userobj;
+
+		$response = $next($request, $response);
+		return $response;
+	}
+} /* }}} */

From e30032f028d739cc52dec0225a150356b1ffa5f6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 1 Jan 2023 19:59:29 +0100
Subject: [PATCH 1669/2006] move init of notification into DBInit.php

---
 inc/inc.Authentication.php | 4 ----
 inc/inc.DBInit.php         | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index a94b601f6..ade988137 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -12,8 +12,6 @@
  * @version    Release: @package_version@
  */
 
-require_once("inc.ClassNotificationService.php");
-require_once("inc.ClassEmailNotify.php");
 require_once("inc.ClassSession.php");
 require_once("inc.ClassAccessOperation.php");
 
@@ -95,8 +93,6 @@ if($settings->_useHomeAsRootFolder && !$user->isAdmin() && $user->getHomeFolder(
 	$dms->setRootFolderID($user->getHomeFolder());
 }
 
-require_once('inc/inc.Notification.php');
-
 /* Include additional language file for view
  * This file must set $LANG[xx][]
  */
diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index ec6036cc7..7c1eff742 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -69,3 +69,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 require_once("inc.ConversionInit.php");
 require_once('inc.FulltextInit.php');
 require_once('inc.AuthenticationInit.php');
+require_once("inc.ClassNotificationService.php");
+require_once("inc.ClassEmailNotify.php");
+require_once('inc.Notification.php');
+

From d291c18eabe1492e44f4cee16508899c72a7fc74 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 1 Jan 2023 20:00:27 +0100
Subject: [PATCH 1670/2006] add logger, conversionmgr, authenticator, etc to
 container

---
 index.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 4b30fbbcb..af3d42456 100644
--- a/index.php
+++ b/index.php
@@ -53,11 +53,19 @@ if(true) {
 		};
 	};
 	$app = new \Slim\App($c);
+	$container = $app->getContainer();
+	$container['dms'] = $dms;
+	$container['config'] = $settings;
+	$container['conversionmgr'] = $conversionmgr;
+	$container['logger'] = $logger;
+	$container['fulltextservice'] = $fulltextservice;
+	$container['notifier'] = $notifier;
+	$container['authenticator'] = $authenticator;
 
 	if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 		foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
 			if (method_exists($hookObj, 'addRoute')) {
-				$hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings));
+				$hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings, 'conversionmgr'=>$conversionmgr, 'authenticator'=>$authenticator, 'fulltextservice'=>$fulltextservice, 'logger'=>$logger));
 //			} else {
 //				include("inc/inc.Authentication.php");
 //				if (method_exists($hookObj, 'addRouteAfterAuthentication')) {

From 0e55c95171b8c2aa2b925f76f8b89bcdcfa62c0c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Jan 2023 12:26:31 +0100
Subject: [PATCH 1671/2006] remove old converters

---
 SeedDMS_Preview/Preview/PdfPreviewer.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index c58f8c343..ba9c79ad9 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -27,18 +27,6 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 	function __construct($previewDir, $timeout=5, $xsendfile=true) { /* {{{ */
 		parent::__construct($previewDir, $timeout, $xsendfile);
 		$this->converters = array(
-			'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
-			'application/vnd.oasis.opendocument.text' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
-			'text/rtf' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
-			'application/msword' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
-			'application/vnd.ms-excel' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
-			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
-			'text/plain' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
-			'application/postscript' => "ps2pdf '%f' - > '%o'",
-			'image/jpeg' => "convert '%f' pdf:- > '%o'",
-			'image/png' => "convert '%f' pdf:- > '%o'",
-			'image/gif' => "convert '%f' pdf:- > '%o'",
-			'video/mp4' => "convert '%f[1-20]' pdf:- > '%o'",
 		);
 	} /* }}} */
 

From be62540c69b7dda0f47bcc1b3698531ee78e06a8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Jan 2023 12:26:48 +0100
Subject: [PATCH 1672/2006] set $new when creating preview

---
 SeedDMS_Preview/Preview/PdfPreviewer.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index ba9c79ad9..73a335821 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -116,9 +116,11 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 				} elseif(isset($this->converters['*'])) {
 					$cmd = str_replace(array('%f', '%o', '%m'), array($infile, $target.'.pdf', $mimetype), $this->converters['*']);
 				}
+
 				if($cmd) {
 					try {
 						self::execWithTimeout($cmd, $this->timeout);
+						$new = true;
 					} catch(Exception $e) {
 						$this->lastpreviewfile = '';
 						return false;
@@ -127,6 +129,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 			}
 			return true;
 		}
+		$new = false;
 		return true;
 			
 	} /* }}} */

From c9f3a2c33575688e5e2ec5baefc94d4d15da729e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Jan 2023 19:34:14 +0100
Subject: [PATCH 1673/2006] get class name for 'documentfile'

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 7adec5e8b..99c150c0a 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -381,6 +381,7 @@ class SeedDMS_Core_DMS {
 		$this->classnames['folder'] = 'SeedDMS_Core_Folder';
 		$this->classnames['document'] = 'SeedDMS_Core_Document';
 		$this->classnames['documentcontent'] = 'SeedDMS_Core_DocumentContent';
+		$this->classnames['documentfile'] = 'SeedDMS_Core_DocumentFile';
 		$this->classnames['user'] = 'SeedDMS_Core_User';
 		$this->classnames['group'] = 'SeedDMS_Core_Group';
 		$this->callbacks = array();

From ff5e6e630224e98df1be3d76830c9f55c80fcab2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Jan 2023 19:34:48 +0100
Subject: [PATCH 1674/2006] use getClassname() for getting class of
 documentfile

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 966710335..d9f11610d 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2341,7 +2341,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if ((is_bool($resArr) && !$resArr) || count($resArr)==0) return false;
 
 		$resArr = $resArr[0];
-		$file = new SeedDMS_Core_DocumentFile($resArr["id"], $this, $resArr["userID"], $resArr["comment"], $resArr["date"], $resArr["dir"], $resArr["fileType"], $resArr["mimeType"], $resArr["orgFileName"], $resArr["name"],$resArr["version"],$resArr["public"]);
+		$classname = $this->_dms->getClassname('documentfile');
+		$file = new $classname($resArr["id"], $this, $resArr["userID"], $resArr["comment"], $resArr["date"], $resArr["dir"], $resArr["fileType"], $resArr["mimeType"], $resArr["orgFileName"], $resArr["name"],$resArr["version"],$resArr["public"]);
 		$user = $this->_dms->getLoggedInUser();
 		if($file->getAccessMode($user) >= M_READ)
 			return $file;
@@ -2382,8 +2383,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$this->_documentFiles = array($hash=>array());
 
 			$user = $this->_dms->getLoggedInUser();
+			$classname = $this->_dms->getClassname('documentfile');
 			foreach ($resArr as $row) {
-				$file = new SeedDMS_Core_DocumentFile($row["id"], $this, $row["userID"], $row["comment"], $row["date"], $row["dir"], $row["fileType"], $row["mimeType"], $row["orgFileName"], $row["name"], $row["version"], $row["public"]);
+				$file = new $classname($row["id"], $this, $row["userID"], $row["comment"], $row["date"], $row["dir"], $row["fileType"], $row["mimeType"], $row["orgFileName"], $row["name"], $row["version"], $row["public"]);
 				if($file->getAccessMode($user) >= M_READ)
 					array_push($this->_documentFiles[$hash], $file);
 			}

From 8418bb962d2b5ba2bc7d9e25ead0df83f49e7d3e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Jan 2023 19:35:35 +0100
Subject: [PATCH 1675/2006] use get getClassname() for getting class of
 documentfile

---
 SeedDMS_Preview/Preview/Previewer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 4381313bf..57b2a66ef 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -68,7 +68,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 			case $dms->getClassname('documentcontent'):
 				$target = $dir.'p'.$object->getVersion().'-'.$width;
 				break;
-			case "SeedDMS_Core_DocumentFile":
+			case $dms->getClassname('documentfile'):
 				$target = $dir.'f'.$object->getID().'-'.$width;
 				break;
 			default:

From 91e20d72af50e2a8eb371b41b2c050bca56d5b86 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Jan 2023 19:36:07 +0100
Subject: [PATCH 1676/2006] start new version 1.5.0

---
 SeedDMS_Preview/package.xml | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 5dd1e4b41..4e385c123 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2021-10-16</date>
+ <date>2023-01-02</date>
  <time>09:49:39</time>
  <version>
-  <release>1.4.0</release>
-  <api>1.4.0</api>
+  <release>1.5.0</release>
+  <api>1.5.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,8 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- use new conversion service if available
-- createRawPreview() checks early if a converter exists
+- add previewer which creates txt
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -38,6 +37,9 @@
     <file name="PdfPreviewer.php" role="php">
      <tasks:replace from="@package_version@" to="version" type="package-info" />
     </file>
+    <file name="TxtPreviewer.php" role="php">
+     <tasks:replace from="@package_version@" to="version" type="package-info" />
+    </file>
    </dir> <!-- /Lucene -->
    <dir name="tests">
    </dir> <!-- /tests -->
@@ -49,7 +51,7 @@
  <dependencies>
   <required>
    <php>
-    <min>4.3.0</min>
+    <min>7.4.0</min>
    </php>
    <pearinstaller>
     <min>1.5.4</min>
@@ -488,5 +490,22 @@ update package description
   preview image was actually created
    </notes>
   </release>
+  <release>
+   <date>2021-10-16</date>
+   <time>09:49:39</time>
+   <version>
+    <release>1.4.0</release>
+    <api>1.4.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- use new conversion service if available
+- createRawPreview() checks early if a converter exists
+   </notes>
+  <release>
  </changelog>
 </package>

From 388cf0d136e83a65448ebaa5add51b9dc030e076 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 2 Jan 2023 19:36:22 +0100
Subject: [PATCH 1677/2006] update release notes

---
 SeedDMS_Core/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ad0716151..6cfa5d734 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -27,6 +27,7 @@
 - SeedDMS_Core_Folder::addDocument() does rollback transaction propperly when setting document categories fail
 - add $skiproot and $sep parameter to SeedDMS_Core_Folder::getFolderPathPlain()
 - turn off auto commit for mysql
+- add class name for 'documentfile'
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From eefb0f5ad34b331700e345ee032fefc028e00239 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:00:28 +0100
Subject: [PATCH 1678/2006] include TxtPreviewer.php

---
 SeedDMS_Preview/Preview.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/SeedDMS_Preview/Preview.php b/SeedDMS_Preview/Preview.php
index d19d82943..ce5853001 100644
--- a/SeedDMS_Preview/Preview.php
+++ b/SeedDMS_Preview/Preview.php
@@ -31,4 +31,9 @@ require_once('Preview/Previewer.php');
  */
 require_once('Preview/PdfPreviewer.php');
 
+/**
+ * @uses Preview/PdfPreviewer.php
+ */
+require_once('Preview/TxtPreviewer.php');
+
 ?>

From 05d7c709ab2fba35a40ca44cb083b6afa91e9ed7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:01:04 +0100
Subject: [PATCH 1679/2006] callable can be passed for retrieving text content

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php       | 10 +++++++++-
 SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index dd426ff74..1ee2d93c7 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -182,7 +182,15 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 				if(file_exists($path)) {
 					$mimetype = $version->getMimeType();
 					$this->mimetype = $mimetype;
-					if(is_object($convcmd) && (get_class($convcmd) == 'SeedDMS_ConversionMgr')) {
+					if(is_callable($convcmd)) {
+						$result = $convcmd($document);
+						if($result['content']) {
+							self::setContent($result['content']);
+						} elseif($result['content'] === false) {
+							$this->errormsg = $result['errormsg'];
+						}
+						$this->cmd = $result['cmd'];
+					} elseif(is_object($convcmd) && (get_class($convcmd) == 'SeedDMS_ConversionMgr')) {
 						if($service = $convcmd->getService($mimetype, 'text/plain')) {
 							$content = $convcmd->convert($path, $mimetype, 'text/plain');
 							if($content) {
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index bb14f710e..6ab17c461 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -183,7 +183,15 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 				if(file_exists($path)) {
 					$mimetype = $version->getMimeType();
 					$this->mimetype = $mimetype;
-					if(is_object($convcmd) && (get_class($convcmd) == 'SeedDMS_ConversionMgr')) {
+					if(is_callable($convcmd)) {
+						$result = $convcmd($document);
+						if($result['content']) {
+							self::setContent($result['content']);
+						} elseif($result['content'] === false) {
+							$this->errormsg = $result['errormsg'];
+						}
+						$this->cmd = $result['cmd'];
+					} elseif(is_object($convcmd) && (get_class($convcmd) == 'SeedDMS_ConversionMgr')) {
 						if($service = $convcmd->getService($mimetype, 'text/plain')) {
 							$content = $convcmd->convert($path, $mimetype, 'text/plain');
 							if($content) {

From 75638089e6090fdb69e00a117e286a921976f772 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:04:08 +0100
Subject: [PATCH 1680/2006] add notes for latest version

---
 SeedDMS_Lucene/package.xml    | 24 ++++++++++++++++++++----
 SeedDMS_SQLiteFTS/package.xml |  3 ++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index 01192ead0..6b901160b 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2021-05-10</date>
+ <date>2023-01-03</date>
  <time>08:55:43</time>
  <version>
-  <release>1.1.17</release>
-  <api>1.1.17</api>
+  <release>1.1.18</release>
+  <api>1.1.18</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- close pipes in execWithTimeout(), also return exit code of command
+- IndexedDocument() accepts a callable for conversion to text
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -368,5 +368,21 @@ Index users with at least read access on the document
 - add indexing of folders
    </notes>
   </release>
+  <release>
+   <date>2021-05-10</date>
+   <time>08:55:43</time>
+   <version>
+    <release>1.1.17</release>
+    <api>1.1.17</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- close pipes in execWithTimeout(), also return exit code of command
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 21b220640..452e8f74a 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,7 +11,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2022-12-09</date>
+ <date>2023-01-03</date>
  <time>08:57:44</time>
  <version>
   <release>1.0.18</release>
@@ -25,6 +25,7 @@
  <notes>
 - add optional parameter $order to SeedDMS_SQLiteFTS_Indexer::find()
 - add optional parameters $query and $col to SeedDMS_SQLiteFTS_Indexer::terms()
+- IndexedDocument() accepts a callable for conversion to text
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 98e7c58b74f7501713b0f34fefbac563b6908739 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:05:32 +0100
Subject: [PATCH 1681/2006] fulltext service can use new text previewer to
 create a cached txt file of a document

---
 inc/inc.ClassFulltextService.php | 71 +++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassFulltextService.php b/inc/inc.ClassFulltextService.php
index 33cc46ae7..142943183 100644
--- a/inc/inc.ClassFulltextService.php
+++ b/inc/inc.ClassFulltextService.php
@@ -54,6 +54,7 @@ class SeedDMS_FulltextService {
 		$this->services = array();
 		$this->converters = array();
 		$this->conversionmgr = null;
+		$this->previewer = null;
 		$this->logger = null;
 		$this->maxsize = 0;
 		$this->index = null;
@@ -93,6 +94,73 @@ class SeedDMS_FulltextService {
 		$this->cmdtimeout = $timeout;
 	}
 
+	public function setPreviewer($previewer) {
+		$this->previewer = $previewer;
+	}
+
+	/**
+	 * Returns callback function to convert a document into plain text
+	 *
+	 * This variant just uses the conversion manager and does not
+	 * cache the converted document
+	 */
+	public function getConversionCallback() { /* {{{ */
+		$conversionmgr = $this->conversionmgr;
+		return function($object) use ($conversionmgr) {
+			$result = ['content'=>false, 'cmd'=>'', 'errormsg'=>''];
+			if(!$conversionmgr)
+				return $result;
+			if($object->isType('document')) {
+				$dms = $object->getDMS();
+				$version = $object->getLatestContent();
+				$mimetype = $version->getMimeType();
+				$path = $dms->contentDir . $version->getPath();
+				if(file_exists($path)) {
+					if($service = $conversionmgr->getService($mimetype, 'text/plain')) {
+						$content = $conversionmgr->convert($path, $mimetype, 'text/plain');
+						if($content) {
+							$result['content'] = $content;
+						} elseif($content === false) {
+							$result['errormsg'] = 'Conversion failed';
+						}
+						$result['cmd'] = get_class($service);
+					} else {
+						$result['cmd'] = 'No service to convert '.$mimetype.' to text/plain';
+					}
+				}
+			}
+			return $result;
+		};
+	} /* }}} */
+
+	/**
+	 * Returns callback function to convert a document into plain text
+	 *
+	 * This variant just uses the text previewer which
+	 * caches the converted document
+	 */
+	public function getConversionWithPreviewCallback() { /* {{{ */
+		$previewer = $this->previewer;
+		return function($object) use ($previewer) {
+			$result = ['content'=>false, 'cmd'=>'', 'errormsg'=>''];
+			if($object->isType('document')) {
+				$dms = $object->getDMS();
+				$version = $object->getLatestContent();
+				if($previewer->createPreview($version)) {
+					if($previewer->hasPreview($version)) {
+						$filename = $previewer->getFileName($version).'.txt';
+						$result['content'] = file_get_contents($filename);
+						$result['cmd'] = 'previewer '.$previewer->getFileSize($version);
+					}
+				} else {
+					$result['cmd'] = 'previewer';
+					$result['errormsg'] = 'Creating preview failed';
+				}
+			}
+			return $result;
+		};
+	} /* }}} */
+
 	/**
 	 * Return an indexable document from the given document or folder
 	 *
@@ -108,7 +176,8 @@ class SeedDMS_FulltextService {
 			$nocontent = $object->getLatestContent()->getFileSize() > $this->maxsize && $this->maxsize && !$forceupdate;
 		else
 			$nocontent = true;
-		return new $this->services[0]['IndexedDocument']($object->getDMS(), $object, $this->conversionmgr ? $this->conversionmgr : $this->converters, $nocontent, $this->cmdtimeout);
+		$convcallback = $this->getConversionWithPreviewCallback();
+		return new $this->services[0]['IndexedDocument']($object->getDMS(), $object, $convcallback /*$this->conversionmgr ? $this->conversionmgr : $this->converters*/, $nocontent, $this->cmdtimeout);
 	}
 
 	/**

From 29310e7c431090aae68ed78050d76fcf49a3e4f4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:06:24 +0100
Subject: [PATCH 1682/2006] pass text previewer to fulltext service

---
 inc/inc.FulltextInit.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index ef7954154..2368e5477 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -45,5 +45,10 @@ if($settings->_enableFullSearch) {
 	$fulltextservice->setConversionMgr($conversionmgr);
 	$fulltextservice->setMaxSize($settings->_maxSizeForFullText);
 	$fulltextservice->setCmdTimeout($settings->_cmdTimeout);
+	require_once("SeedDMS/Preview.php");
+	$txtpreviewer = new SeedDMS_Preview_TxtPreviewer($settings->_cacheDir, $settings->_cmdTimeout, $settings->_enableXsendfile);
+	if($conversionmgr)
+		$txtpreviewer->setConversionMgr($conversionmgr);
+	$fulltextservice->setPreviewer($txtpreviewer);
 }
 

From d8e9cb570781a47b499d3038784652b94d18d819 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:07:05 +0100
Subject: [PATCH 1683/2006] indexdocument returns propper error msg

---
 op/op.Ajax.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 74099d4db..36c47298c 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -999,9 +999,9 @@ switch($command) {
 									$ires = $index->addDocument($idoc);
 								header('Content-Type: application/json');
 								if(false === $ires) {
-									echo json_encode(array('success'=>false, 'message'=>getMLText('error_document_indexed'), 'data'=>$prefix.$object->getID(), 'mimetype'=>$idoc->getMimeType(), 'cmd'=>$idoc->getCmd()));
+									echo json_encode(array('success'=>false, 'message'=>getMLText('error_document_indexed', ['name'=>$object->getName()]), 'data'=>$prefix.$object->getID(), 'mimetype'=>$idoc->getMimeType(), 'cmd'=>$idoc->getCmd()));
 								} else {
-									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_indexed'), 'data'=>$prefix.$object->getID(), 'cmd'=>$idoc->getCmd()));
+									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_indexed', ['name'=>$object->getName()]), 'data'=>$prefix.$object->getID(), 'cmd'=>$idoc->getCmd()));
 								}
 							} else {
 								header('Content-Type: application/json');

From e54874c3ff388fa211e614a1fad987acff909edc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:07:38 +0100
Subject: [PATCH 1684/2006] some more documentation

---
 inc/inc.ClassConversionMgr.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassConversionMgr.php b/inc/inc.ClassConversionMgr.php
index 278d2e510..8e98a44df 100644
--- a/inc/inc.ClassConversionMgr.php
+++ b/inc/inc.ClassConversionMgr.php
@@ -72,18 +72,25 @@ class SeedDMS_ConversionMgr {
 	 * @param string $file name of file to convert
 	 * @param string $from mimetype of input file
 	 * @param string $to   mimetype of output file
+	 * @param string $target name of target file. If none is given the
+	 * content of the converted document will be returned.
+	 * @param array $params additional parameter needed for the conversion,
+	 * e.g. the width of an image
 	 *
 	 * @return boolean true on success, other false
 	 */
-	public function convert($file, $from, $to, $target=null, $params=array()) {
+	public function convert($file, $from, $to, $target=null, $params=array()) { /* {{{ */
 		if(isset($this->services[$from][$to])) {
 			$services = $this->services[$from][$to];
 			for(end($services); key($services)!==null; prev($services)) {
 				$service = current($services);
 				$text = $service->convert($file, $target, $params);
-				if($text !== false)
+				if($text === false)
+					return false;
+				if($text)
 					return $text;
 			}
 		}
-	}
+		return true;
+	} /* }}} */
 }

From 763420843255cde8efa1258de7e45717eaa5dac7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:09:48 +0100
Subject: [PATCH 1685/2006] script for deleting a docuemnt

---
 utils/delete.php     | 179 +++++++++++++++++++++++++++++++++++++++++++
 utils/seeddms-delete |   9 +++
 2 files changed, 188 insertions(+)
 create mode 100644 utils/delete.php
 create mode 100755 utils/seeddms-delete

diff --git a/utils/delete.php b/utils/delete.php
new file mode 100644
index 000000000..ec7282a38
--- /dev/null
+++ b/utils/delete.php
@@ -0,0 +1,179 @@
+<?php
+if(isset($_SERVER['SEEDDMS_HOME'])) {
+	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = $_SERVER['SEEDDMS_HOME'];
+} else {
+	ini_set('include_path', dirname(realpath($argv[0])). PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = dirname(realpath($argv[0]));
+}
+
+function usage() { /* {{{ */
+	echo "Usage:".PHP_EOL;
+	echo "  seeddms-delete [--config <file>] [-h] [-v] -f <folder id> -e <folder id> -d <document id>".PHP_EOL;
+	echo PHP_EOL;
+	echo "Description:".PHP_EOL;
+	echo "  This program deletes a folder or document.".PHP_EOL;
+	echo PHP_EOL;
+	echo "Options:".PHP_EOL;
+	echo "  -h, --help: print usage information and exit.".PHP_EOL;
+	echo "  -v, --version: print version and exit.".PHP_EOL;
+	echo "  --config: set alternative config file.".PHP_EOL;
+	echo "  -f <folder id>: id of folder to be deleted".PHP_EOL;
+	echo "  -e <folder id>: id of folder to be emptied".PHP_EOL;
+	echo "  -d <document id>: id of document to be deleted".PHP_EOL;
+	echo "  -u <user>: login name of user".PHP_EOL;
+	echo PHP_EOL;
+	echo "If the user is not given the user with id 1 will be used.".PHP_EOL;
+	echo "The options -d, -e and -f can be passed multiple times or the option value".PHP_EOL;
+	echo "can be a comma separated list of ids.".PHP_EOL;
+} /* }}} */
+
+$version = "0.0.1";
+$shortoptions = "e:f:d:u:hv";
+$longoptions = array('help', 'version', 'config:');
+if(false === ($options = getopt($shortoptions, $longoptions))) {
+	usage();
+	exit(0);
+}
+
+/* Print help and exit */
+if(isset($options['h']) || isset($options['help'])) {
+	usage();
+	exit(0);
+}
+
+/* Print version and exit */
+if(isset($options['v']) || isset($options['verѕion'])) {
+	echo $version.PHP_EOL;
+	exit(0);
+}
+
+/* Set alternative config file */
+if(isset($options['config'])) {
+	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
+}
+
+/* Set folders to be deleted */
+$folderids = array();
+if(isset($options['f'])) {
+	if(is_string($options['f']))
+		$folderids = explode(',', $options['f']);
+	else
+		$folderids = $options['f'];
+}
+
+/* Set folders to be emptied */
+$emptyids = array();
+if(isset($options['e'])) {
+	if(is_string($options['e']))
+		$emptyids = explode(',', $options['e']);
+	else
+		$emptyids = $options['e'];
+}
+
+/* Set documents to be deleted */
+$documentids = array();
+if(isset($options['d'])) {
+	if(is_string($options['d']))
+		$documentids = explode(',', $options['d']);
+	else
+		$documentids = $options['d'];
+}
+
+if(!$documentids && !$folderids && !$emptyids) {
+	echo "Neither folder ids nor document ids were given".PHP_EOL;
+	usage();
+	exit(1);
+}
+
+$username = '';
+if(isset($options['u'])) {
+	$username = $options['u'];
+}
+
+include($myincpath."/inc/inc.Settings.php");
+include($myincpath."/inc/inc.Init.php");
+include($myincpath."/inc/inc.Extension.php");
+include($myincpath."/inc/inc.DBInit.php");
+include($myincpath."/inc/inc.ClassNotificationService.php");
+include($myincpath."/inc/inc.Notification.php");
+include($myincpath."/inc/inc.ClassController.php");
+
+/* Create a global user object {{{ */
+if($username) {
+	if(!($user = $dms->getUserByLogin($username))) {
+		echo "No such user '".$username."'.";
+		exit;
+	}
+} else
+	$user = $dms->getUser(1);
+
+$dms->setUser($user);
+/* }}} */
+
+foreach($folderids as $folderid) {
+	$folder = $dms->getFolder($folderid);
+
+	if (!is_object($folder)) {
+		echo "Could not find folder with id ".$folderid.PHP_EOL;
+	} else {
+
+		if ($folder->getAccessMode($user) < M_READWRITE) {
+			echo "Not sufficient access rights on folder with id ".$folderid.PHP_EOL;
+		} else {
+			$controller = Controller::factory('RemoveFolder', array('dms'=>$dms, 'user'=>$user));
+			$controller->setParam('folder', $folder);
+			$controller->setParam('fulltextservice', $fulltextservice);
+			if(!$document = $controller->run()) {
+				echo "Could not remove folder with id ".$folderid.PHP_EOL;
+			} else {
+				echo "Folder with id ".$folderid." removed.".PHP_EOL;
+			}
+		}
+	}
+}
+
+foreach($emptyids as $folderid) {
+	$folder = $dms->getFolder($folderid);
+
+	if (!is_object($folder)) {
+		echo "Could not find folder with id ".$folderid.PHP_EOL;
+	}
+
+	if ($folder->getAccessMode($user) < M_READWRITE) {
+		echo "Not sufficient access rights on folder with id ".$folderid.PHP_EOL;
+	}
+
+	$controller = Controller::factory('EmptyFolder', array('dms'=>$dms, 'user'=>$user));
+	$controller->setParam('folder', $folder);
+	$controller->setParam('fulltextservice', $fulltextservice);
+	if(!$document = $controller->run()) {
+		echo "Could not empty folder with id ".$folderid.PHP_EOL;
+	} else {
+		echo "Folder with id ".$folderid." emptied.".PHP_EOL;
+	}
+}
+
+foreach($documentids as $documentid) {
+	$document = $dms->getDocument($documentid);
+
+	if (!is_object($document)) {
+		echo "Could not find specified document with id ".$documentid.PHP_EOL;
+	}
+
+	if ($document->getAccessMode($user) < M_READWRITE) {
+		echo "Not sufficient access rights on document with id ".$documentid.PHP_EOL;
+	}
+
+	$controller = Controller::factory('RemoveDocument', array('dms'=>$dms, 'user'=>$user));
+	$controller->setParam('document', $document);
+	$controller->setParam('fulltextservice', $fulltextservice);
+	if(!$document = $controller->run()) {
+		echo "Could not remove document with id ".$documentid.PHP_EOL;
+	} else {
+		echo "Document with id ".$documentid." removed.".PHP_EOL;
+	}
+}
+
diff --git a/utils/seeddms-delete b/utils/seeddms-delete
new file mode 100755
index 000000000..8e1c857fd
--- /dev/null
+++ b/utils/seeddms-delete
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	parentdir=$(dirname "$0")
+	export SEEDDMS_HOME=$(dirname "$parentdir")
+fi
+
+exec php -f "${SEEDDMS_HOME}/utils/delete.php" -- "${@}"
+

From 3633beb98dc9f53d4256e4b86be121f7283a22b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:13:06 +0100
Subject: [PATCH 1686/2006] script for informing users about expired documents

---
 utils/expireddocs.php     | 304 ++++++++++++++++++++++++++++++++++++++
 utils/seeddms-expireddocs |   8 +
 2 files changed, 312 insertions(+)
 create mode 100644 utils/expireddocs.php
 create mode 100755 utils/seeddms-expireddocs

diff --git a/utils/expireddocs.php b/utils/expireddocs.php
new file mode 100644
index 000000000..4c5dc2f3c
--- /dev/null
+++ b/utils/expireddocs.php
@@ -0,0 +1,304 @@
+<?php
+if(isset($_SERVER['SEEDDMS_HOME'])) {
+	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = $_SERVER['SEEDDMS_HOME'];
+} else {
+	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = dirname($argv[0]);
+}
+
+function usage() { /* {{{ */
+	echo "Usage:".PHP_EOL;
+	echo "  seeddms-expireddocs [--config <file>] [-u <user>] [-h] [-v] [-t] [-q] [-o] [-f <email>] [-u <user>] [-w] [-b <base>] [-c] -d <days> -D <days>".PHP_EOL;
+	echo PHP_EOL;
+	echo "Description:".PHP_EOL;
+	echo "  Check for files which will expire in the next days and inform the".PHP_EOL;
+	echo "  the owner and all users watching the document.".PHP_EOL;
+	echo PHP_EOL;
+	echo "Options:".PHP_EOL;
+	echo "  -h, --help: print usage information and exit.".PHP_EOL;
+	echo "  -v, --version: print version and exit.".PHP_EOL;
+	echo "  --config=<file>: set alternative config file.".PHP_EOL;
+	echo "  -u <user>: login name of user".PHP_EOL;
+	echo "  -w: send mail also to all users watching the document".PHP_EOL;
+	echo "  -c: list also categories for each document".PHP_EOL;
+	echo "  -f <email>: set From field in notification mail".PHP_EOL;
+	echo "  -b <base>: set base for links in html email. The final link will be".PHP_EOL;
+	echo "             <base><httpRoot>out/out.ViewDocument.php. The default is".PHP_EOL;
+	echo "             http://localhost".PHP_EOL;
+	echo "  -d <days>: check till n days in the future (default 14). Days always".PHP_EOL.
+	     "             start at 00:00:00 and end at 23:59:59. A value of '1' means today.".PHP_EOL;
+	     "             '-d 2' will search for documents expiring today or tomorrow.".PHP_EOL;
+	echo "  -D <days>: start checking in n days in the future (default 0). This value".PHP_EOL.
+	     "             must be less then -d. A value of 0 means to start checking today.".PHP_EOL.
+	     "             Any positive number will start checking in n days.".PHP_EOL.
+	     "             A negative number will look backwards in time.".PHP_EOL.
+	     "             '-d 10 -D 5' will search for documents expiring in 5 to 10 days.".PHP_EOL.
+	     "             '-d 10 -D -5' will search for documents which have expired in the last 5 days".PHP_EOL.
+	     "             or will expire in the next 10 days.".PHP_EOL;
+	echo "  -o: list obsolete documents (default: do not list)".PHP_EOL;
+	echo "  -t: run in test mode (will not send any mails)".PHP_EOL;
+	echo "  -q: be quite (just output error messages)".PHP_EOL;
+} /* }}} */
+
+$version = "0.0.2";
+$tableformat = "%-60s %-14s";
+$tableformathtml = "<tr><td>%s</td><td>%s</td></tr>";
+$baseurl = "http://localhost/";
+$mailfrom = "uwe@steinman.cx";
+
+$shortoptions = "u:d:D:f:b:wtqhvo";
+$longoptions = array('help', 'version', 'config:');
+if(false === ($options = getopt($shortoptions, $longoptions))) {
+	usage();
+	exit(0);
+}
+
+/* Print help and exit */
+if(isset($options['h']) || isset($options['help'])) {
+	usage();
+	exit(0);
+}
+
+/* Print version and exit */
+if(isset($options['v']) || isset($options['verѕion'])) {
+	echo $version.PHP_EOL;
+	exit(0);
+}
+
+/* Set alternative config file */
+if(isset($options['config'])) {
+	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
+}
+
+include($myincpath."/inc/inc.Settings.php");
+include($myincpath."/inc/inc.Utils.php");
+include($myincpath."/inc/inc.Init.php");
+include($myincpath."/inc/inc.Language.php");
+include($myincpath."/inc/inc.Extension.php");
+include($myincpath."/inc/inc.DBInit.php");
+
+$LANG['de_DE']['daylyDigestMail'] = 'Tägliche Benachrichtigungsmail';
+$LANG['en_GB']['daylyDigestMail'] = 'Dayly digest mail';
+$LANG['de_DE']['docsExpiringInNDays'] = 'Dokumente, die in den nächsten [days] Tagen ablaufen';
+$LANG['en_GB']['docsExpiringInNDays'] = 'Documents expiring in the next [days] days';
+$LANG['de_DE']['docsExpiringBetween'] = 'Dokumente, die zwischen dem [start] und [end] ablaufen';
+$LANG['en_GB']['docsExpiringBetween'] = 'Documents which expire between [start] and [end]';
+
+require_once('Mail.php');
+require_once('Mail/mime.php');
+
+$usernames = array();
+if(isset($options['u'])) {
+	$usernames = explode(',', $options['u']);
+}
+
+$informwatcher = false;
+if(isset($options['w'])) {
+	$informwatcher = true;
+}
+
+$showcats = false;
+if(isset($options['c'])) {
+	$showcats = true;
+	$tableformathtml = "<tr><td>%s</td><td>%s</td><td>%s</td></tr>";
+}
+
+$days = 14;
+if(isset($options['d'])) {
+	$days = (int) $options['d'];
+}
+$enddays = 0;
+if(isset($options['D'])) {
+	$enddays = (int) $options['D'];
+}
+
+if($enddays >= $days) {
+	echo "Value of -D must be less then value of -d".PHP_EOL;
+	exit(1);
+}
+
+if(isset($options['f'])) {
+	$mailfrom = trim($options['f']);
+}
+
+if(isset($options['b'])) {
+	$baseurl = trim($options['b']);
+}
+
+$showobsolete = false;
+if(isset($options['o'])) {
+	$showobsolete = true;
+}
+
+$dryrun = false;
+if(isset($options['t'])) {
+	$dryrun = true;
+	echo "Running in test mode will not send any mail.".PHP_EOL;
+}
+$quite = false;
+if(isset($options['q'])) {
+	$quite = true;
+}
+
+$startts = strtotime("midnight", time());
+if(!$quite)
+	echo "Checking for documents expiring between ".getLongReadableDate($startts+$enddays*86400)." and ".getLongReadableDate($startts+$days*86400-1).PHP_EOL;
+
+$users = array();
+if(!$usernames) {
+	$users = $dms->getAllUsers();
+} else {
+	/* Create a global user object */
+	foreach($usernames as $username) {
+		if(!$user = $dms->getUserByLogin($username)) {
+			echo "No such user with name '".$username."'".PHP_EOL;
+			exit(1);
+		}
+		$users[] = $user;
+	}
+}
+
+if (!$db->createTemporaryTable("ttstatid") || !$db->createTemporaryTable("ttcontentid")) {
+	echo getMLText("internal_error_exit").PHP_EOL;
+	exit;
+}
+
+foreach($users as $user) {
+	$groups = $user->getGroups();
+	$groupids = array();
+	foreach($groups as $group)
+		$groupids[] = $group->getID();
+	$sendmail = false; /* Set to true if there is something to report */
+	$body = "";
+	$bodyhtml = "<html>".PHP_EOL."<head>".PHP_EOL."<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />".PHP_EOL."<title>SeedDMS: ".getMLText('daylyDigestMail', array(), "", $user->getLanguage())."</title>".PHP_EOL."<base href=\"".$baseurl.$settings->_httpRoot."\" />".PHP_EOL."</head>".PHP_EOL."<body>".PHP_EOL."";
+
+	/*
+	$queryStr = "SELECT `tblDocuments`.* FROM `tblDocuments`".
+		"WHERE `tblDocuments`.`owner` = '".$user->getID()."' ".
+		"AND `tblDocuments`.`expires` < '".($startts + $days*86400)."' ".
+		"AND `tblDocuments`.`expires` > '".($startts)."'";
+	 */
+
+	$queryStr = "SELECT DISTINCT a.*, `tblDocumentStatusLog`.* FROM `tblDocuments` a ".
+		"LEFT JOIN `ttcontentid` ON `ttcontentid`.`document` = `a`.`id` ".
+		"LEFT JOIN `tblDocumentContent` ON `a`.`id` = `tblDocumentContent`.`document` AND `tblDocumentContent`.`version` = `ttcontentid`.`maxVersion` ".
+		"LEFT JOIN `tblNotify` b ON a.`id`=b.`target` ".
+		"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` AND `tblDocumentContent`.`version` = `tblDocumentStatus`.`version` ".
+		"LEFT JOIN `ttstatid` ON `ttstatid`.`statusID` = `tblDocumentStatus`.`statusID` ".
+		"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusLogID` = `ttstatid`.`maxLogID` ".
+		"WHERE (a.`owner` = '".$user->getID()."' ".
+		($informwatcher ? " OR ((b.`userID` = '".$user->getID()."' ".
+		($groupids ? "or b.`groupID` in (".implode(',', $groupids).")" : "").") ".
+		"AND b.`targetType` = 2) " : "").
+		") AND a.`expires` < '".($startts + $days*86400)."' ".
+		"AND a.`expires` > '".($startts + $enddays*86400)."' ";
+	if(!$showobsolete)
+		$queryStr .= "AND `tblDocumentStatusLog`.`status` != -2";
+
+	$resArr = $db->getResultArray($queryStr);
+	if (is_bool($resArr) && !$resArr) {
+		echo getMLText("internal_error_exit").PHP_EOL;
+		exit;
+	}
+
+	$body .= "==== ";
+	$body .= getMLText('docsExpiringBetween', array('start'=>getReadableDate($startts + ($enddays)*86400), 'end'=>getReadableDate($startts + ($days)*86400)), "", $user->getLanguage()).PHP_EOL;
+	$body .= "==== ";
+	$body .= $user->getFullname();
+	$body .= PHP_EOL.PHP_EOL;
+	$bodyhtml .= "<h2>";
+	$bodyhtml .= getMLText('docsExpiringBetween', array('start'=>getReadableDate($startts + ($enddays)*86400), 'end'=>getReadableDate($startts + ($days)*86400)), "", $user->getLanguage()).PHP_EOL;
+	$bodyhtml .= "</h2>".PHP_EOL;
+	$bodyhtml .= "<h3>";
+	$bodyhtml .= $user->getFullname();
+	$bodyhtml .= "</h3>".PHP_EOL;
+	if (count($resArr)>0) {
+		$sendmail = true;
+
+		$body .= sprintf($tableformat.PHP_EOL, getMLText("name", array(), "", $user->getLanguage()), getMLText("expires", array(), "", $user->getLanguage()));	
+		$body .= "---------------------------------------------------------------------------------".PHP_EOL;
+		$bodyhtml .= "<table>".PHP_EOL;
+		if($showcats)
+			$bodyhtml .= sprintf($tableformathtml.PHP_EOL, getMLText("name", array(), "", $user->getLanguage()), getMLText("categories", array(), "", $user->getLanguage()), getMLText("expires", array(), "", $user->getLanguage()));	
+		else
+			$bodyhtml .= sprintf($tableformathtml.PHP_EOL, getMLText("name", array(), "", $user->getLanguage()), getMLText("expires", array(), "", $user->getLanguage()));	
+
+		foreach ($resArr as $res) {
+			if($doc = $dms->getDocument((int) $res['id'])) {
+				$catnames = array();
+				if($cats = $doc->getCategories()) {
+					foreach($cats as $cat)
+						$catnames[] = $cat->getName();
+				}
+			}
+		
+			$body .= sprintf($tableformat.PHP_EOL, $res["name"], (!$res["expires"] ? "-":getReadableDate($res["expires"])));
+			if($showcats)
+				$body .= getMLText("categories", array(), "", $user->getLanguage()).": ".implode(', ', $catnames).PHP_EOL;
+			if($showcats)
+				$bodyhtml .= sprintf($tableformathtml.PHP_EOL, '<a href="out/out.ViewDocument.php?documentid='.$res["id"].'">'.htmlspecialchars($res["name"]).'</a>', implode(', ', $catnames), (!$res["expires"] ? "-":getReadableDate($res["expires"])));	
+			else
+				$bodyhtml .= sprintf($tableformathtml.PHP_EOL, '<a href="out/out.ViewDocument.php?documentid='.$res["id"].'">'.htmlspecialchars($res["name"]).'</a>', (!$res["expires"] ? "-":getReadableDate($res["expires"])));	
+		}		
+		$bodyhtml .= "</table>".PHP_EOL;
+		
+	} else {
+		$body .= getMLText("no_docs_to_look_at", array(), "", $user->getLanguage()).PHP_EOL.PHP_EOL;
+		$bodyhtml .= "<p>".getMLText("no_docs_to_look_at", array(), "", $user->getLanguage())."</p>".PHP_EOL.PHP_EOL;
+	}
+
+	if($sendmail) {
+		if($user->getEmail()) {
+			if(!$quite) {
+				echo "Send mail to ".$user->getLogin()." <".$user->getEmail().">".PHP_EOL;
+			echo $body;
+			echo "----------------------------".PHP_EOL.PHP_EOL.PHP_EOL;
+			echo $bodyhtml;
+			}
+
+			if(!$dryrun) {
+				$mime = new Mail_mime(array('eol' => PHP_EOL));
+
+				$mime->setTXTBody($body);
+				$mime->setHTMLBody($bodyhtml);
+
+				$body = $mime->get(array(
+					'text_encoding'=>'8bit',
+					'html_encoding'=>'8bit',
+					'head_charset'=>'utf-8',
+					'text_charset'=>'utf-8',
+					'html_charset'=>'utf-8'
+				));
+				$hdrs = $mime->headers(array('From' => $mailfrom, 'Subject' => 'SeedDMS: '.getMLText('daylyDigestMail', array(), "", $user->getLanguage()), 'Content-Type' => 'text/plain; charset=UTF-8'));
+
+				$mail_params = array();
+				if($settings->_smtpServer) {
+					$mail_params['host'] = $settings->_smtpServer;
+					if($settings->smtpPort) {
+						$mail_params['port'] = $settings->_smtpPort;
+					}
+					if($settings->smtpUser) {
+						$mail_params['auth'] = true;
+						$mail_params['username'] = $settings->_smtpUser;
+						$mail_params['password'] = $settings->_smtpPassword;
+					}
+					$mail = Mail::factory('smtp', $mail_params);
+				} else {
+					$mail = Mail::factory('mail');
+				}
+				$mail->send($user->getEmail(), $hdrs, $body);
+			}
+		} else {
+			if(!$quite) {
+				echo "User ".$user->getLogin()." has no email".PHP_EOL;
+			}
+		}
+	} else {
+		if(!$quite) {
+			echo "No notification for user ".$user->getLogin()." needed".PHP_EOL;
+		}
+	}
+}
diff --git a/utils/seeddms-expireddocs b/utils/seeddms-expireddocs
new file mode 100755
index 000000000..bf95f3e40
--- /dev/null
+++ b/utils/seeddms-expireddocs
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	parentdir=$(dirname "$0")
+	export SEEDDMS_HOME=$(dirname "$parentdir")
+fi
+
+php -f ${SEEDDMS_HOME}/utils/expireddocs.php -- "${@}"

From a8ccf1669bc7bff5dfab86ab7006fc2617edae5e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 14:16:43 +0100
Subject: [PATCH 1687/2006] script for uploading files from local disc

---
 utils/importfs.php     | 215 +++++++++++++++++++++++++++++++++++++++++
 utils/seeddms-importfs |   7 ++
 2 files changed, 222 insertions(+)
 create mode 100644 utils/importfs.php
 create mode 100755 utils/seeddms-importfs

diff --git a/utils/importfs.php b/utils/importfs.php
new file mode 100644
index 000000000..16323a2f5
--- /dev/null
+++ b/utils/importfs.php
@@ -0,0 +1,215 @@
+<?php
+if(isset($_SERVER['SEEDDMS_HOME'])) {
+	ini_set('include_path', $_SERVER['SEEDDMS_HOME'].'/utils'. PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = $_SERVER['SEEDDMS_HOME'];
+} else {
+	ini_set('include_path', dirname($argv[0]). PATH_SEPARATOR .ini_get('include_path'));
+	$myincpath = dirname($argv[0]);
+}
+
+function usage() { /* {{{ */
+	echo "Usage:".PHP_EOL;
+	echo "  seeddms-importfs [--config <file>] [-h] [-v] -F <folder id> -d <dirname>".PHP_EOL;
+	echo PHP_EOL;
+	echo "Description:".PHP_EOL;
+	echo "  This program uploads a directory recursively into a folder of SeedDMS.".PHP_EOL;
+	echo PHP_EOL;
+	echo "Options:".PHP_EOL;
+	echo "  -h, --help: print usage information and exit.".PHP_EOL;
+	echo "  -v, --version: print version and exit.".PHP_EOL;
+	echo "  --config: set alternative config file.".PHP_EOL;
+	echo "  --user: use this user for accessing seeddms.".PHP_EOL;
+	echo "  --exclude: exlude files/directories by name (defaults to .svn, .gitignore).".PHP_EOL;
+	echo "      This must be just the file or directory without the path.".PHP_EOL;
+	echo "  --filemtime: take over modification time from file.".PHP_EOL;
+	echo "  --foldermtime: take over modification time from folder.".PHP_EOL;
+	echo "  --basefolder: creates the base folder".PHP_EOL;
+	echo "  -F <folder id>: id of folder the file is uploaded to".PHP_EOL;
+	echo "  -d <dirname>: upload this directory".PHP_EOL;
+	echo "  -e <encoding>: encoding used by filesystem (defaults to iso-8859-1)".PHP_EOL;
+} /* }}} */
+
+$version = "0.0.1";
+$shortoptions = "d:F:e:hv";
+$longoptions = array('help', 'version', 'user:', 'basefolder', 'filemtime', 'foldermtime', 'exclude:', 'config:');
+if(false === ($options = getopt($shortoptions, $longoptions))) {
+	usage();
+	exit(0);
+}
+
+/* Print help and exit */
+if(!$options || isset($options['h']) || isset($options['help'])) {
+	usage();
+	exit(0);
+}
+
+/* Print version and exit */
+if(isset($options['v']) || isset($options['verѕion'])) {
+	echo $version.PHP_EOL;
+	exit(0);
+}
+
+/* Set encoding of names in filesystem */
+$fsencoding = 'iso-8859-1';
+if(isset($options['e'])) {
+	$fsencoding = $options['e'];
+}
+
+/* Set alternative config file */
+if(isset($options['config'])) {
+	define('SEEDDMS_CONFIG_FILE', $options['config']);
+} elseif(isset($_SERVER['SEEDDMS_CONFIG_FILE'])) {
+	define('SEEDDMS_CONFIG_FILE', $_SERVER['SEEDDMS_CONFIG_FILE']);
+}
+
+$excludefiles = array('.', '..');
+if(isset($options['exclude'])) {
+	if(is_array($options['exclude']))
+		$excludefiles = array_merge($excludefiles, $options['exclude']);
+	else
+		$excludefiles[] = $options['exclude'];
+} else {
+	$excludefiles[] = '.svn';
+	$excludefiles[] = '.gitignore';
+}
+
+if(isset($options['user'])) {
+	$userlogin = $options['user'];
+} else {
+	echo "Missing user".PHP_EOL;
+	usage();
+	exit(1);
+}
+
+/* check if base folder shall be created */
+$createbasefolder = false;
+if(isset($options['basefolder'])) {
+	$createbasefolder = true;
+}
+
+/* check if modification time shall be taken over */
+$filemtime = false;
+if(isset($options['filemtime'])) {
+	$filemtime = true;
+}
+$foldermtime = false;
+if(isset($options['foldermtime'])) {
+	$foldermtime = true;
+}
+
+if(isset($settings->_extraPath))
+	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
+
+if(isset($options['F'])) {
+	$folderid = (int) $options['F'];
+} else {
+	echo "Missing folder ID".PHP_EOL;
+	usage();
+	exit(1);
+}
+
+$dirname = '';
+if(isset($options['d'])) {
+	$dirname = $options['d'];
+} else {
+	echo "Missing import directory".PHP_EOL;
+	usage();
+	exit(1);
+}
+
+include($myincpath."/inc/inc.Settings.php");
+include($myincpath."/inc/inc.Utils.php");
+include($myincpath."/inc/inc.Init.php");
+include($myincpath."/inc/inc.Language.php");
+include($myincpath."/inc/inc.Extension.php");
+include($myincpath."/inc/inc.DBInit.php");
+include($myincpath."/inc/inc.ClassNotificationService.php");
+include($myincpath."/inc/inc.ClassEmailNotify.php");
+include($myincpath."/inc/inc.ClassController.php");
+
+echo $settings->_contentDir.$settings->_contentOffsetDir.PHP_EOL;
+
+/* Create a global user object */
+if(!($user = $dms->getUserByLogin($userlogin))) {
+	echo "User with login '".$userlogin."' does not exists.";
+	exit;
+}
+
+$folder = $dms->getFolder($folderid);
+if (!is_object($folder)) {
+	echo "Could not find specified folder".PHP_EOL;
+	exit(1);
+}
+
+if ($folder->getAccessMode($user) < M_READWRITE) {
+	echo "Not sufficient access rights".PHP_EOL;
+	exit(1);
+}
+
+function import_folder($dirname, $folder, $filemtime, $foldermtime) {
+	global $user, $excludefiles, $fsencoding;
+
+	$d = dir($dirname);
+	$sequence = 1;
+	while(false !== ($entry = $d->read())) {
+		$path = $dirname.'/'.$entry;
+		if(!in_array($entry, $excludefiles)) {
+			$name = iconv($fsencoding, 'utf-8', basename($path));
+			if(is_file($path)) {
+				$filetmp = $path;
+
+				$reviewers = array();
+				$approvers = array();
+				$comment = '';
+				$version_comment = '';
+				$reqversion = 1;
+				$expires = false;
+				$keywords = '';
+				$categories = array();
+
+				$finfo = finfo_open(FILEINFO_MIME_TYPE);
+				$mimetype = finfo_file($finfo, $path);
+				$lastDotIndex = strrpos($name, ".");
+				if (is_bool($lastDotIndex) && !$lastDotIndex) $filetype = ".";
+				else $filetype = substr($name, $lastDotIndex);
+
+				echo $mimetype." - ".$filetype." - ".$path.PHP_EOL;
+				$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
+																		$categories, $filetmp, $name,
+																		$filetype, $mimetype, $sequence, $reviewers,
+																		$approvers, $reqversion, $version_comment);
+
+				if (is_bool($res) && !$res) {
+					echo "Could not add document to folder".PHP_EOL;
+					exit(1);
+				}
+				if($filemtime) {
+					$newdoc = $res[0];
+					$newdoc->setDate(filemtime($path));
+					$lc = $newdoc->getLatestContent();
+					$lc->setDate(filemtime($path));
+				}
+				set_time_limit(1200);
+			} elseif(is_dir($path)) {
+				$newfolder = $folder->addSubFolder($name, '', $user, $sequence);
+				if($foldermtime) {
+					$newfolder->setDate(filemtime($path));
+				}
+				import_folder($path, $newfolder, $filemtime, $foldermtime);
+			}
+			$sequence++;
+		}
+	}
+}
+
+if($createbasefolder) {
+	if($newfolder = $folder->addSubFolder(basename($dirname), '', $user, 1)) {
+		if($foldermtime) {
+			$newfolder->setDate(filemtime($dirname));
+		}
+		import_folder($dirname, $newfolder, $filemtime, $foldermtime);
+	}
+} else {
+	import_folder($dirname, $folder, $filemtime, $foldermtime);
+}
+
diff --git a/utils/seeddms-importfs b/utils/seeddms-importfs
new file mode 100755
index 000000000..82ce84188
--- /dev/null
+++ b/utils/seeddms-importfs
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ -z "${SEEDDMS_HOME}" ]; then
+	parentdir=$(dirname "$0")
+	export SEEDDMS_HOME=$(dirname "$parentdir")
+fi
+
+php -f ${SEEDDMS_HOME}/utils/importfs.php -- "$@"

From 51d8ebbf60f2e63b9437b067a0857fbf5545c49d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 16:58:40 +0100
Subject: [PATCH 1688/2006] improve html for listing errors

---
 views/bootstrap/class.Indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 4ac0b3cf5..5549d0f44 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -165,7 +165,7 @@ function check_queue() {
 					else
 						$('#status_'+data.data).html('<?= getMLText('index_done').' ('.getMLText('index_no_content').')' ?>');
 				} else {
-					$('#update_messages').append('<div><p><strong>Docid: ' + data.data + ' (' + data.mimetype + ')</strong></p>' + '<p>Cmd: ' + data.cmd + '</p>' + data.message+'</div>');
+					$('#update_messages').append('<div><strong>Docid: ' + data.data + ' (' + data.mimetype + ')</strong><br />' + 'Cmd: ' + data.cmd + '<br />' + data.message+'</div>');
 					$('#status_'+data.data).html('<?= getMLText('index_error') ?>');
 					noty({
 						text: '<p><strong>Docid: ' + data.data + ' (' + data.mimetype + ')</strong></p>' + '<p>Cmd: ' + data.cmd + '</p>' + data.message,

From eb0be965ee5bafa556bb38c52992c80daa5792a8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 16:59:08 +0100
Subject: [PATCH 1689/2006] adjust label of checkbox to delete preview images
 and text

---
 views/bootstrap/class.ClearCache.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php
index 8eef31464..b9b447c50 100644
--- a/views/bootstrap/class.ClearCache.php
+++ b/views/bootstrap/class.ClearCache.php
@@ -48,7 +48,8 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style {
 <?php
 		$this->contentContainerStart('warning');
 ?>
-<input type="checkbox" name="preview" value="1" checked> <?php printMLText('preview_images'); ?>
+<p>
+<input type="checkbox" name="preview" value="1" checked> <?php printMLText('preview_images_text'); ?>
 </p>
 <p>
 <input type="checkbox" name="js" value="1" checked> <?php printMLText('temp_jscode'); ?>

From d8ed7797c0de657b08582a8c253fa6020c912cef Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 17:00:25 +0100
Subject: [PATCH 1690/2006] some new phrases

---
 languages/ar_EG/lang.inc | 3 +++
 languages/bg_BG/lang.inc | 3 +++
 languages/ca_ES/lang.inc | 3 +++
 languages/cs_CZ/lang.inc | 3 +++
 languages/de_DE/lang.inc | 7 +++++--
 languages/el_GR/lang.inc | 3 +++
 languages/en_GB/lang.inc | 5 ++++-
 languages/es_ES/lang.inc | 3 +++
 languages/fr_FR/lang.inc | 3 +++
 languages/hr_HR/lang.inc | 3 +++
 languages/hu_HU/lang.inc | 7 +++++--
 languages/id_ID/lang.inc | 3 +++
 languages/it_IT/lang.inc | 3 +++
 languages/ko_KR/lang.inc | 3 +++
 languages/lo_LA/lang.inc | 3 +++
 languages/nb_NO/lang.inc | 3 +++
 languages/nl_NL/lang.inc | 3 +++
 languages/pl_PL/lang.inc | 3 +++
 languages/pt_BR/lang.inc | 3 +++
 languages/ro_RO/lang.inc | 3 +++
 languages/ru_RU/lang.inc | 3 +++
 languages/sk_SK/lang.inc | 3 +++
 languages/sv_SE/lang.inc | 3 +++
 languages/tr_TR/lang.inc | 3 +++
 languages/uk_UA/lang.inc | 3 +++
 languages/zh_CN/lang.inc | 3 +++
 languages/zh_TW/lang.inc | 3 +++
 27 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 90724c95d..cd2d4efa8 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -755,6 +755,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => 'فهرسة بلا محتوى',
 'index_pending' => 'الفهرسة قيد الإنتظار',
+'index_processing' => '',
 'index_waiting' => 'الفهرسة قيد الإنتظار',
 'individuals' => 'افراد',
 'individuals_in_groups' => 'أفراد في المجموعات',
@@ -1086,6 +1087,7 @@ URL: [url]',
 'preview' => 'معاينة',
 'preview_converters' => 'محول المعاينات',
 'preview_images' => 'معاينة الصور',
+'preview_images_text' => '',
 'preview_markdown' => 'معاينة التخفيضات',
 'preview_pdf' => 'معاينة ملف pdf',
 'preview_plain' => 'معاينة سطحية',
@@ -2048,6 +2050,7 @@ URL: [url]',
 'update_approvers' => 'تحديثة قائمة الموافقون',
 'update_document' => 'تحديث المستند',
 'update_fulltext_index' => 'تحديث فهرس النص الكامل',
+'update_fulltext_messages' => '',
 'update_info' => 'تحديث المعلومات',
 'update_locked_msg' => 'هذا المستند محمي من التعديل.',
 'update_recipients' => 'تطوير المستلم',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 96b83df19..638bee68a 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -684,6 +684,7 @@ $text = array(
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => '',
 'individuals' => 'Личности',
 'individuals_in_groups' => '',
@@ -985,6 +986,7 @@ $text = array(
 'preview' => 'Преглед',
 'preview_converters' => '',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
@@ -1902,6 +1904,7 @@ $text = array(
 'update_approvers' => 'Обнови списъка с утвърждаващи',
 'update_document' => 'Обнови документ',
 'update_fulltext_index' => 'Обнови пълнотекстовия индекс',
+'update_fulltext_messages' => '',
 'update_info' => 'Обнови информацията',
 'update_locked_msg' => 'Този документ е блокиран',
 'update_recipients' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index bf00e8f78..6dc899353 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -689,6 +689,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => '',
 'individuals' => 'Individuals',
 'individuals_in_groups' => '',
@@ -990,6 +991,7 @@ URL: [url]',
 'preview' => 'Previsualitzar',
 'preview_converters' => '',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
@@ -1907,6 +1909,7 @@ URL: [url]',
 'update_approvers' => 'Actualitzar llista d\'aprovadors',
 'update_document' => 'Actualitzar',
 'update_fulltext_index' => 'Update fulltext index',
+'update_fulltext_messages' => '',
 'update_info' => 'Actualitzar informació',
 'update_locked_msg' => 'Aquest document està bloquejat.',
 'update_recipients' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 830a942d2..5e1c17a38 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -786,6 +786,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => 'Nenaindexoval se obsah',
 'index_pending' => 'Probíhá indexování',
+'index_processing' => '',
 'index_waiting' => 'Čekání',
 'individuals' => 'Jednotlivci',
 'individuals_in_groups' => 'Členové skupiny',
@@ -1121,6 +1122,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'preview' => 'Náhled',
 'preview_converters' => 'Náhled převodu dokumentu',
 'preview_images' => 'Náhled obrázků',
+'preview_images_text' => '',
 'preview_markdown' => 'Náhled úpravy textu Markdown',
 'preview_pdf' => 'Náhled jako PDF',
 'preview_plain' => 'Náhled jako text',
@@ -2120,6 +2122,7 @@ URL: [url]',
 'update_approvers' => 'Aktualizovat seznam schvalovatelů',
 'update_document' => 'Aktualizovat',
 'update_fulltext_index' => 'Aktualizovat fulltext index',
+'update_fulltext_messages' => '',
 'update_info' => 'Aktualizovat informace',
 'update_locked_msg' => 'Tento dokument je zamčený.',
 'update_recipients' => 'Aktualizovat příjemce',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 7528ab0d6..5a6724d31 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3150), dgrutsch (22)
+//    Translators: Admin (3154), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -854,7 +854,7 @@ Old name: [old_name]<br />
 Benutzer: [username]<br />
 URL: [url]</p>',
 'folder_renamed_email_subject' => '[sitename]: [name] - Ordner umbenannt',
-'folder_title' => 'SeedDMS - Ordner: [foldername]',
+'folder_title' => 'Ordner: [foldername]',
 'foot_note' => '',
 'force_update' => 'Aktualisieren',
 'friday' => 'Freitag',
@@ -929,6 +929,7 @@ URL: [url]</p>',
 'index_folder_updated' => 'Ordner aktualisiert',
 'index_no_content' => 'Inhalt nicht indiziert',
 'index_pending' => 'Vorgemerkt',
+'index_processing' => 'Verarbeite ...',
 'index_waiting' => 'Warte',
 'individuals' => 'Einzelpersonen',
 'individuals_in_groups' => 'Mitglieder einer Gruppe',
@@ -1313,6 +1314,7 @@ Sollen Sie danach immer noch Probleme bei der Anmeldung haben, dann kontaktieren
 'preview' => 'Vorschau',
 'preview_converters' => 'Vorschau Dokumentenumwandlung',
 'preview_images' => 'Vorschaubilder',
+'preview_images_text' => 'Vorschaubilder und Textinhalt',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Vorschau als PDF',
 'preview_plain' => 'Text',
@@ -2463,6 +2465,7 @@ URL: [url]</p>',
 'update_approvers' => 'Liste der Freigebenden aktualisieren',
 'update_document' => 'Aktualisieren',
 'update_fulltext_index' => 'Aktualisiere Volltext-Index',
+'update_fulltext_messages' => 'Nachrichten',
 'update_info' => 'Informationen zur Aktualisierung',
 'update_locked_msg' => 'Dieses Dokument wurde gesperrt<p>Die Sperrung wurde von <a href="mailto:[email]">[username]</a> eingerichtet.<br>',
 'update_recipients' => 'Liste der Empfänger aktualisieren',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 1cf1edc89..6def8ae2b 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -684,6 +684,7 @@ $text = array(
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => 'Αναμονή',
 'individuals' => 'Άτομα',
 'individuals_in_groups' => '',
@@ -996,6 +997,7 @@ URL: [url]',
 'preview' => 'προεπισκόπηση',
 'preview_converters' => '',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
@@ -1913,6 +1915,7 @@ URL: [url]',
 'update_approvers' => '',
 'update_document' => 'Ενημέρωση εγγράφου',
 'update_fulltext_index' => 'Ενημέρωση της Αρίθμησης Κειμένων',
+'update_fulltext_messages' => '',
 'update_info' => '',
 'update_locked_msg' => '',
 'update_recipients' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 7dad80431..e9e6a6162 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2245), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2248), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -930,6 +930,7 @@ URL: [url]</p>',
 'index_folder_updated' => 'Folder updated',
 'index_no_content' => 'Did not index content',
 'index_pending' => 'Pending',
+'index_processing' => 'Processing ...',
 'index_waiting' => 'Waiting',
 'individuals' => 'Individuals',
 'individuals_in_groups' => 'Members of a group',
@@ -1316,6 +1317,7 @@ If you still have problems to login, then please contact your administrator.',
 'preview' => 'Preview',
 'preview_converters' => 'Preview document conversion',
 'preview_images' => 'Preview images',
+'preview_images_text' => 'Preview images and text content',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Preview as PDF',
 'preview_plain' => 'Text',
@@ -2466,6 +2468,7 @@ URL: [url]</p>',
 'update_approvers' => 'Update List of Approvers',
 'update_document' => 'Update document',
 'update_fulltext_index' => 'Update fulltext index',
+'update_fulltext_messages' => 'Messages',
 'update_info' => 'Update Information',
 'update_locked_msg' => 'This document is locked.',
 'update_recipients' => 'Update list of recipients',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index c445d883e..a982be52c 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -774,6 +774,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => 'Esperando',
 'individuals' => 'Individuales',
 'individuals_in_groups' => 'Miembros del grupo',
@@ -1113,6 +1114,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'preview' => 'anterior',
 'preview_converters' => 'Vista previa del documento convertido',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
@@ -2075,6 +2077,7 @@ URL: [url]',
 'update_approvers' => 'Actualizar lista de aprobadores',
 'update_document' => 'Actualizar documento',
 'update_fulltext_index' => 'Actualizar índice de texto completo',
+'update_fulltext_messages' => '',
 'update_info' => 'Actualizar información',
 'update_locked_msg' => 'Este documento está bloqueado.',
 'update_recipients' => 'Actualizaar lista de receptores',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index bdebee968..cac907550 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -916,6 +916,7 @@ URL : [url]</p>',
 'index_folder_updated' => 'Dossier mis à jour',
 'index_no_content' => 'Contenu non indexé',
 'index_pending' => 'En attente',
+'index_processing' => '',
 'index_waiting' => 'Chargement…',
 'individuals' => 'Individuels',
 'individuals_in_groups' => 'Membres d’un groupe',
@@ -1301,6 +1302,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'preview' => 'Aperçu',
 'preview_converters' => 'Conversion des documents pour prévisualisation',
 'preview_images' => 'Miniatures',
+'preview_images_text' => '',
 'preview_markdown' => 'Prévisualisation',
 'preview_pdf' => 'Prévisualisation en PDF',
 'preview_plain' => 'Texte',
@@ -2449,6 +2451,7 @@ URL : [url]</p>',
 'update_approvers' => 'Mettre à jour la liste des approbateurs',
 'update_document' => 'Mettre à jour',
 'update_fulltext_index' => 'Mettre à jour l\'index de recherche plein texte',
+'update_fulltext_messages' => '',
 'update_info' => 'Informations de mise à jour',
 'update_locked_msg' => 'Ce document est verrouillé.',
 'update_recipients' => 'Mettre à jour la liste des destinataires',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index b3507f1ba..c9fafeb28 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -767,6 +767,7 @@ Internet poveznica: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => '',
 'individuals' => 'Pojedinci',
 'individuals_in_groups' => '',
@@ -1105,6 +1106,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'preview' => 'Predpregled',
 'preview_converters' => 'Pretpregled konverzije dokumenta',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => 'Smanjenje',
 'preview_pdf' => '',
 'preview_plain' => 'Obični tekst',
@@ -2084,6 +2086,7 @@ Internet poveznica: [url]',
 'update_approvers' => 'Ažuriraj popis validatora',
 'update_document' => 'Ažuriraj dokument',
 'update_fulltext_index' => 'Ažuriraj indeksiranje cijelog teksta',
+'update_fulltext_messages' => '',
 'update_info' => 'Info ažuriranje',
 'update_locked_msg' => 'Ovaj dokument je zaključan.',
 'update_recipients' => 'Izmjena liste primatelja',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index f1e433b1a..d4f23f05b 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (648), Kalpy (113), ribaz (1036)
+//    Translators: Admin (649), Kalpy (113), ribaz (1036)
 
 $text = array(
 '2_factor_auth' => 'Kétfaktoros azonosítás',
@@ -737,7 +737,7 @@ URL: [url]',
 'hu_HU' => 'Magyar',
 'id' => 'ID',
 'identical_version' => 'Az új verzió megegyezik az eredetivel.',
-'id_ID' => '',
+'id_ID' => 'Indonéz',
 'import' => 'Import',
 'importfs' => '',
 'import_extension' => 'Kiterjesztés import',
@@ -762,6 +762,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => '',
 'individuals' => 'Egyedek',
 'individuals_in_groups' => '',
@@ -1101,6 +1102,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'preview' => 'Előnézet',
 'preview_converters' => 'A dokumentum átalakításának előnézete',
 'preview_images' => 'előnézeti képek',
+'preview_images_text' => '',
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
@@ -2062,6 +2064,7 @@ URL: [url]',
 'update_approvers' => 'Jóváhagyók listájának frissítése',
 'update_document' => 'Dokumentum frissítése',
 'update_fulltext_index' => 'Teljes szöveg index frissítése',
+'update_fulltext_messages' => '',
 'update_info' => 'Információ frissítése',
 'update_locked_msg' => 'Ez a dokumentum zárolt.',
 'update_recipients' => '',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index ff46a94f2..0b1f69d52 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -818,6 +818,7 @@ URL: [url]</p>',
 'index_folder_updated' => 'Folder diperbarui',
 'index_no_content' => '',
 'index_pending' => 'Ditunda',
+'index_processing' => '',
 'index_waiting' => 'Mengunggu',
 'individuals' => 'Perorangan',
 'individuals_in_groups' => '',
@@ -1186,6 +1187,7 @@ Jika Anda masih mengalami masalah untuk login, silakan hubungi administrator And
 'preview' => 'Pratinjau',
 'preview_converters' => 'Pratinjau konversi dokumen',
 'preview_images' => 'Pratinjau gambar',
+'preview_images_text' => '',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Lihat sebagai PDF',
 'preview_plain' => 'Text',
@@ -2127,6 +2129,7 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'update_approvers' => 'Perbarui Daftar Penyetuju',
 'update_document' => 'Perbarui dokumen',
 'update_fulltext_index' => 'Perbarui indek fulltext',
+'update_fulltext_messages' => '',
 'update_info' => 'Perbarui Informasi',
 'update_locked_msg' => 'Dokumen ini terkunci.',
 'update_recipients' => 'Perbarui daftar penerima',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 26bbc25eb..b329f50c7 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -772,6 +772,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => 'Non indicizzare contenuti',
 'index_pending' => 'Indicizzazione pendente',
+'index_processing' => '',
 'index_waiting' => 'Attendi',
 'individuals' => 'Singoli',
 'individuals_in_groups' => 'I membri de la gruppo',
@@ -1111,6 +1112,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'amministratore di
 'preview' => 'Anteprima',
 'preview_converters' => 'Anteprima convesione documento',
 'preview_images' => 'Immagini di anteprima',
+'preview_images_text' => '',
 'preview_markdown' => 'Riduzione ribasso',
 'preview_pdf' => 'Anteprima come PDF',
 'preview_plain' => 'Testo',
@@ -2111,6 +2113,7 @@ URL: [url]',
 'update_approvers' => 'Aggiornamento lista approvatori',
 'update_document' => 'Aggiorna documento',
 'update_fulltext_index' => 'Aggiorna indice fulltext',
+'update_fulltext_messages' => '',
 'update_info' => 'Aggiorna informazioni',
 'update_locked_msg' => 'Questo documento è bloccato.',
 'update_recipients' => 'Aggiorna lista cartelle',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 496ac5b74..125527d64 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -768,6 +768,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => '기다리는 중',
 'individuals' => '개인',
 'individuals_in_groups' => '개별 그룹',
@@ -1099,6 +1100,7 @@ URL : [url]',
 'preview' => '미리보기',
 'preview_converters' => '문서 변환 미리보기',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => '마크다운',
 'preview_pdf' => '',
 'preview_plain' => '텍스트',
@@ -2078,6 +2080,7 @@ URL : [url]',
 'update_approvers' => '승인자의 업데이트 목록',
 'update_document' => '문서 갱신하기',
 'update_fulltext_index' => '업데이트 전체 텍스트 색인',
+'update_fulltext_messages' => '',
 'update_info' => '업데이트 정보',
 'update_locked_msg' => '이 문서는 잠겨 있습니다.',
 'update_recipients' => '받는 사람 업데이트 목록',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index ae23a3e7e..d8edb5a13 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -765,6 +765,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => 'ລໍຖ້າດຳເນີນການ',
+'index_processing' => '',
 'index_waiting' => 'ຖ້າ',
 'individuals' => 'ບຸກຄົນ',
 'individuals_in_groups' => 'ສະມາຊິກຂອງກຸ່ມ',
@@ -1104,6 +1105,7 @@ URL: [url]',
 'preview' => 'ເບີ່ງຕົວຢ່າງ',
 'preview_converters' => 'ເບີ່ງຕົວຢ່າງການແປງເອກະສານ',
 'preview_images' => 'ເບີ່ງຮູບຕົງຢ່າງ',
+'preview_images_text' => '',
 'preview_markdown' => 'ເຮັດເຄື່ອງຫມາຍລົງ',
 'preview_pdf' => '',
 'preview_plain' => 'ຂໍ້ຄວາມ',
@@ -2104,6 +2106,7 @@ URL: [url]',
 'update_approvers' => 'ອັບເດດລາຍຊື່ຜູ້ອະນຸມັດ',
 'update_document' => 'ອັບເດດເອກະສານ',
 'update_fulltext_index' => 'ອັບເດດດັດຊະນີຂໍ້ຄວາມແບບເຕັມຮູບແບບ',
+'update_fulltext_messages' => '',
 'update_info' => 'ອັບເດດຂໍ້ມູນ',
 'update_locked_msg' => 'ເອກະສານນີ້ຖືກລັອກ',
 'update_recipients' => 'ອັບເດລາຍຊື່ຜູ້ຮັບ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 6cd633703..621c36a29 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -786,6 +786,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => 'Indekserte ikke innhold',
 'index_pending' => 'Avventer',
+'index_processing' => '',
 'index_waiting' => 'Venter',
 'individuals' => 'Personer',
 'individuals_in_groups' => 'Medlemmer i en gruppe',
@@ -1119,6 +1120,7 @@ Om du fortsatt har problemer med innloggingen, kontakt admin.',
 'preview' => 'Forhåndsvisning',
 'preview_converters' => 'Forhåndsvis dokumentkonvertering',
 'preview_images' => 'Forhåndsvis bilder',
+'preview_images_text' => '',
 'preview_markdown' => 'Forminsking',
 'preview_pdf' => 'Forhåndsvis som PDF',
 'preview_plain' => 'Tekst',
@@ -2117,6 +2119,7 @@ URL: [url]',
 'update_approvers' => 'Oppdater liste over godkjennere',
 'update_document' => 'Oppdater dokumentet',
 'update_fulltext_index' => 'Oppdater fulltekstindeksen',
+'update_fulltext_messages' => '',
 'update_info' => 'Oppdater informasjon',
 'update_locked_msg' => 'Dette dokumentet er låst.',
 'update_recipients' => 'Oppdater liste over mottakere',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 171dc9519..c5420ad25 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -779,6 +779,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => 'Index heeft geen inhoud',
 'index_pending' => 'Indexering moet nog gebeuren',
+'index_processing' => '',
 'index_waiting' => 'Indexering wacht',
 'individuals' => 'Individuen',
 'individuals_in_groups' => 'Individuen in groepen',
@@ -1118,6 +1119,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'preview' => 'Voorbeeld',
 'preview_converters' => 'Converters',
 'preview_images' => 'Voorbeelden',
+'preview_images_text' => '',
 'preview_markdown' => 'Voorbeeld in Markdown',
 'preview_pdf' => 'Inhoud van het document',
 'preview_plain' => 'Voorbeeld in platte tekst',
@@ -2116,6 +2118,7 @@ URL: [url]',
 'update_approvers' => 'Bijwerken lijst van [Goedkeurders]',
 'update_document' => 'Bijwerken',
 'update_fulltext_index' => 'Index voor fulltext search bijwerken',
+'update_fulltext_messages' => '',
 'update_info' => 'Update-informatie',
 'update_locked_msg' => 'Dit document is geblokkeerd.',
 'update_recipients' => 'Update de lijst vanontvangers',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index ab5ef1927..53770f872 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -755,6 +755,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => 'Nie indeksuje zawartości',
 'index_pending' => 'Oczekujące',
+'index_processing' => '',
 'index_waiting' => 'Oczekiwanie',
 'individuals' => 'Indywidualni',
 'individuals_in_groups' => 'Członkowie grupy',
@@ -1094,6 +1095,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'preview' => 'Podgląd',
 'preview_converters' => 'Podgląd konwersji dokumentu',
 'preview_images' => 'Podgląd obrazu',
+'preview_images_text' => '',
 'preview_markdown' => 'Oznacz w dół',
 'preview_pdf' => 'Podgląd PDF',
 'preview_plain' => 'Zwykły podgląd',
@@ -2047,6 +2049,7 @@ URL: [url]',
 'update_approvers' => 'Aktualizuj listę osób zatwierdzających',
 'update_document' => 'Aktualizuj dokument',
 'update_fulltext_index' => 'Aktualizuj indeks pełnotekstowy',
+'update_fulltext_messages' => '',
 'update_info' => 'Aktualizuj informacje',
 'update_locked_msg' => 'Ten dokument jest zablokowany.',
 'update_recipients' => 'Zaktualizuj listę odbiorców',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 748d8f7f9..4d6f0ff28 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -786,6 +786,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => 'Não indexou o conteúdo',
 'index_pending' => 'Pendente',
+'index_processing' => '',
 'index_waiting' => 'Aguarde...',
 'individuals' => 'Indivíduos',
 'individuals_in_groups' => 'Members of a group',
@@ -1124,6 +1125,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'preview' => 'visualizar',
 'preview_converters' => 'Visualizar a conversão do documento',
 'preview_images' => 'Imagens de pré-visualização',
+'preview_images_text' => '',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Visualizar como PDF',
 'preview_plain' => 'Texto',
@@ -2123,6 +2125,7 @@ URL: [url]',
 'update_approvers' => 'Atualizar lista de aprovadores',
 'update_document' => 'Atualizar',
 'update_fulltext_index' => 'Índice de atualização de texto completo',
+'update_fulltext_messages' => '',
 'update_info' => 'Atualizar informação',
 'update_locked_msg' => 'Este documento está travado.',
 'update_recipients' => 'Atualizar lista de destinatários',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index c95720d0b..95c207800 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -767,6 +767,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => 'Așteptare',
 'individuals' => 'Individuals',
 'individuals_in_groups' => '',
@@ -1106,6 +1107,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'preview' => 'Previzualizare',
 'preview_converters' => '',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
@@ -2085,6 +2087,7 @@ URL: [url]',
 'update_approvers' => 'Actualizare Listă de aprobatori',
 'update_document' => 'Actualizare document',
 'update_fulltext_index' => 'Actualizare index pe tot textul (fulltext index)',
+'update_fulltext_messages' => '',
 'update_info' => 'Informații actualizare',
 'update_locked_msg' => 'Acest document este blocat.',
 'update_recipients' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 21014db1f..6f2929ddc 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -767,6 +767,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => 'Ожидание',
 'individuals' => 'Пользователи',
 'individuals_in_groups' => 'Пользователи группы',
@@ -1103,6 +1104,7 @@ URL: [url]',
 'preview' => 'Предварительный просмотр',
 'preview_converters' => 'Предварительный просмотр конвертации документа',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => '',
 'preview_plain' => 'Текст',
@@ -2092,6 +2094,7 @@ URL: [url]',
 'update_approvers' => 'Обновить список утверждающих',
 'update_document' => 'Обновить документ',
 'update_fulltext_index' => 'Обновить полнотекстовый индекс',
+'update_fulltext_messages' => '',
 'update_info' => 'Обновить информацию',
 'update_locked_msg' => 'Этот документ заблокирован',
 'update_recipients' => 'Обновить список получателей',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 6e805be12..a5915ef6f 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -786,6 +786,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => 'Did not index content',
 'index_pending' => 'Pending',
+'index_processing' => '',
 'index_waiting' => 'Čakajte',
 'individuals' => 'Jednotlivci',
 'individuals_in_groups' => 'Členovia skupiny',
@@ -1125,6 +1126,7 @@ If you have still problems to login, then please contact your administrator.',
 'preview' => 'Náhľad',
 'preview_converters' => 'Ukážka konverzie dokumentu',
 'preview_images' => 'Náhľad obrázkov',
+'preview_images_text' => '',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Preview as PDF',
 'preview_plain' => 'Text',
@@ -2125,6 +2127,7 @@ URL: [url]',
 'update_approvers' => 'Aktualizovať zoznam schvaľovateľov',
 'update_document' => 'Aktualizovať',
 'update_fulltext_index' => 'Aktualizovať fulltext index',
+'update_fulltext_messages' => '',
 'update_info' => 'Aktualizovať informácie',
 'update_locked_msg' => 'Tento dokument je zamknutý.',
 'update_recipients' => 'Aktualizovať zoznam recipientov',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index e5fee5ec5..aa1f8b68a 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -773,6 +773,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => 'Förestående',
+'index_processing' => '',
 'index_waiting' => 'Väntar',
 'individuals' => 'Personer',
 'individuals_in_groups' => 'Medlemmar i en grupp',
@@ -1109,6 +1110,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'preview' => 'Förhandsgranskning',
 'preview_converters' => 'Konvertering för förhandsgranskning',
 'preview_images' => 'Förhandsgranska bilder',
+'preview_images_text' => '',
 'preview_markdown' => 'Förminskning',
 'preview_pdf' => 'Förhandsgranska som PDF',
 'preview_plain' => 'Text',
@@ -2098,6 +2100,7 @@ URL: [url]',
 'update_approvers' => 'Uppdatera lista med personer som godkänner',
 'update_document' => 'Uppdatera dokument',
 'update_fulltext_index' => 'Uppdatera fulltext-index',
+'update_fulltext_messages' => '',
 'update_info' => 'Uppdatera information',
 'update_locked_msg' => 'Dokumentet är låst',
 'update_recipients' => 'Uppdatera lista med mottagare',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 9d8818ed1..9bf9d1bb5 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -761,6 +761,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => 'Bekliyor',
 'individuals' => 'Bireysel',
 'individuals_in_groups' => 'Ekip Üyeleri',
@@ -1102,6 +1103,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'preview' => 'Önizle',
 'preview_converters' => '',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
@@ -2064,6 +2066,7 @@ URL: [url]',
 'update_approvers' => 'Onaylayanlar listesini güncelle',
 'update_document' => 'Doküman güncelle',
 'update_fulltext_index' => 'Tam metin indeksini güncelle',
+'update_fulltext_messages' => '',
 'update_info' => 'Bilgileri Güncelle',
 'update_locked_msg' => 'Bu doküman kilitli.',
 'update_recipients' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 1e97c88b6..92ae8c0ca 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -767,6 +767,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '',
 'index_pending' => '',
+'index_processing' => '',
 'index_waiting' => '',
 'individuals' => 'Користувачі',
 'individuals_in_groups' => 'Користувачі групи',
@@ -1103,6 +1104,7 @@ URL: [url]',
 'preview' => 'Попередній перегляд',
 'preview_converters' => 'Попередній перегляд перетворення документу',
 'preview_images' => '',
+'preview_images_text' => '',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => '',
 'preview_plain' => 'Текст',
@@ -2085,6 +2087,7 @@ URL: [url]',
 'update_approvers' => 'Оновити список затверджувачів',
 'update_document' => 'Оновити документ',
 'update_fulltext_index' => 'Оновити повнотекстовий пошук',
+'update_fulltext_messages' => '',
 'update_info' => 'Оновити інформацію',
 'update_locked_msg' => 'Цей документ заблоковано',
 'update_recipients' => 'Оновити список отримувачів',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index ee4aeb3b5..7913315c8 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -769,6 +769,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '没有索引内容',
 'index_pending' => '待处理',
+'index_processing' => '',
 'index_waiting' => '等待',
 'individuals' => '个人',
 'individuals_in_groups' => '组成员',
@@ -1108,6 +1109,7 @@ URL: [url]',
 'preview' => '预览',
 'preview_converters' => '预览文档',
 'preview_images' => '预览图片',
+'preview_images_text' => '',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => '作为PDF预览',
 'preview_plain' => 'TEXT',
@@ -2063,6 +2065,7 @@ URL: [url]',
 'update_approvers' => '更新审核人名单',
 'update_document' => '更新',
 'update_fulltext_index' => '更新全文索引',
+'update_fulltext_messages' => '',
 'update_info' => '更新信息',
 'update_locked_msg' => '该文档被锁定',
 'update_recipients' => '更新收件人列表',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index b6331d790..51d638b7d 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -786,6 +786,7 @@ URL: [url]',
 'index_folder_updated' => '',
 'index_no_content' => '沒有索引內容',
 'index_pending' => '待定',
+'index_processing' => '',
 'index_waiting' => '請稍後',
 'individuals' => '個人',
 'individuals_in_groups' => '小組成員',
@@ -1123,6 +1124,7 @@ URL: [url]',
 'preview' => '預覽',
 'preview_converters' => '預覽文件轉換',
 'preview_images' => '預覽圖像',
+'preview_images_text' => '',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => '預覽為PDF',
 'preview_plain' => '文本',
@@ -2123,6 +2125,7 @@ URL: [url]',
 'update_approvers' => '更新審核人名單',
 'update_document' => '更新',
 'update_fulltext_index' => '更新全文索引',
+'update_fulltext_messages' => '',
 'update_info' => '更新資訊',
 'update_locked_msg' => '該文件被鎖定',
 'update_recipients' => '',

From b5c773a4a3939b706b01e044f95d81fa75fa1159 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 Jan 2023 17:53:36 +0100
Subject: [PATCH 1691/2006] fix php error

---
 views/bootstrap/class.ExtensionMgr.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 9fd38afd6..e5b7cbeae 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -377,7 +377,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
           <?php $this->formSubmit("<i class=\"fa fa-refresh\"></i> " . getMLText('force_update'));?>
 					</form>
 				</div>
-			<?php $this->showEndPaneContent('repository', $currenttab); ?>
+<?php
+		}
+		$this->showEndPaneContent('repository', $currenttab);
+?>
 		</div>
 <?php
 		$this->columnEnd();

From dbe7f36eb0e01b31408727268b1f4d3c6ccbd334 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2023 14:30:45 +0100
Subject: [PATCH 1692/2006] add conversion service from text to image

---
 inc/inc.ClassConversionMgr.php                |   1 +
 inc/inc.ClassConversionServiceTextToImage.php | 143 ++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 inc/inc.ClassConversionServiceTextToImage.php

diff --git a/inc/inc.ClassConversionMgr.php b/inc/inc.ClassConversionMgr.php
index 8e98a44df..94ddd35a9 100644
--- a/inc/inc.ClassConversionMgr.php
+++ b/inc/inc.ClassConversionMgr.php
@@ -16,6 +16,7 @@ require_once("inc/inc.ClassConversionServiceImageToImage.php");
 require_once("inc/inc.ClassConversionServiceImageToText.php");
 require_once("inc/inc.ClassConversionServicePdfToImage.php");
 require_once("inc/inc.ClassConversionServiceTextToText.php");
+require_once("inc/inc.ClassConversionServiceTextToImage.php");
 
 /**
  * Implementation of conversion manager
diff --git a/inc/inc.ClassConversionServiceTextToImage.php b/inc/inc.ClassConversionServiceTextToImage.php
new file mode 100644
index 000000000..c34f32d98
--- /dev/null
+++ b/inc/inc.ClassConversionServiceTextToImage.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Implementation of conversion service class
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2023 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+require_once("inc/inc.ClassConversionServiceBase.php");
+
+/**
+ * Implementation of conversion service from text to image
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2023 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_ConversionServiceTextToImage extends SeedDMS_ConversionServiceBase {
+	public function __construct($from, $to) {
+		$this->from = $from;
+		$this->to = $to;
+	}
+
+	public function getInfo() {
+		return "Convert with imagick php functions";
+	}
+
+	public function getAdditionalParams() { /* {{{ */
+		return [
+			['name'=>'width', 'type'=>'number', 'description'=>'Width of converted image'],
+			['name'=>'page', 'type'=>'number', 'description'=>'Page of text document'],
+		];
+	} /* }}} */
+
+	private function wordWrapAnnotation($image, $draw, $text, $maxWidth) { /* {{{ */
+		$words = preg_split('%\s%', trim($text), -1, PREG_SPLIT_NO_EMPTY);
+		$lines = array();
+		$i = 0;
+		$lineHeight = 0;
+
+		while (count($words) > 0) {
+			$metrics = $image->queryFontMetrics($draw, implode(' ', array_slice($words, 0, ++$i)));
+			$lineHeight = max($metrics['textHeight'], $lineHeight);
+
+			// check if we have found the word that exceeds the line width
+			if ($metrics['textWidth'] > $maxWidth or count($words) < $i) {
+				// handle case where a single word is longer than the allowed line width (just add this as a word on its own line?)
+				if ($i == 1)
+					$i++;
+
+				$lines[] = implode(' ', array_slice($words, 0, --$i));
+				$words = array_slice($words, $i);
+				$i = 0;
+			}
+		}
+
+		return array($lines, $lineHeight);
+	} /* }}} */
+
+	public function convert($infile, $target = null, $params = array()) { /* {{{ */
+		$boxWidth = 596;
+		$boxHeight = 842;
+		$boxTop = 30;
+		$boxBottom = 30;
+		$boxLeft = 30;
+		$boxRight = 30;
+		$parSep = 10;
+		$fontSize = 10;
+
+		$start = microtime(true);
+		$imagick = new Imagick();
+		/* Setting a smaller resolution will speed up the conversion
+		 * A resolution of 72,72 will create a 596x842 image
+		 * Setting it to 36,36 will create a 298x421 image which should
+		 * be sufficient in most cases, but keep in mind that images are
+		 * not scaled up. Hence, a width of 400px still results in a 298px
+		 * wide image
+		 */
+		$imagick->setResolution(72,72);
+		$page = 0;
+		if(!empty($params['page']) && intval($params['page']) > 0)
+			$page = intval($params['page'])-1;
+		try {
+			if($imagick->newImage($boxWidth, $boxHeight, "white")) {
+				$draw = new ImagickDraw();
+				$draw->setStrokeColor("none");
+				$draw->setFont("Courier");
+				$draw->setFontSize($fontSize);
+				$draw->setTextAlignment(Imagick::ALIGN_LEFT);
+
+				$content = file_get_contents($infile);
+				$lines = preg_split('~\R~',$content);
+				$boxY = $boxTop;
+				$pagecount = 0;
+				foreach($lines as $line) {
+					if($line) {
+						$rlines = $this->wordWrapAnnotation($imagick, $draw, $line, $boxWidth-$boxLeft-$boxRight);
+						foreach($rlines[0] as $rline) {
+							if($pagecount == $page && $boxY < ($boxHeight-$boxBottom)) {
+								$imagick->annotateImage($draw, $boxLeft, $boxY, 0, $rline);
+							}
+							$boxY = $boxY + $rlines[1];
+						}
+					} else {
+						$boxY += $parSep;
+					}
+					if($boxY >= ($boxHeight-$boxBottom)) {
+						$pagecount++;
+						$boxY = $boxTop;
+						if($pagecount > $page)
+							break;
+					}
+				}
+
+				if(!empty($params['width']))
+					$imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0);
+				$imagick->setImageFormat('png');
+				$end = microtime(true);
+				if($this->logger) {
+					$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with text service took '.($end-$start).' sec.', PEAR_LOG_INFO);
+				}
+				if($target) {
+					return $imagick->writeImage($target);
+				} else {
+					return $imagick->getImageBlob();
+				}
+			}
+		} catch (ImagickException $e) {
+			return false;
+		}
+		return false;
+	} /* }}} */
+}
+
+
+

From 2cbe041b60a271107bba128e083d33cb877e0667 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2023 14:31:28 +0100
Subject: [PATCH 1693/2006] user getClassname() for SeedDMS_Core_DocumentFile

---
 SeedDMS_Preview/Preview/PdfPreviewer.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index 73a335821..73a538763 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -31,7 +31,8 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 	} /* }}} */
 
 	/**
-	 * Return the physical filename of the preview image on disk
+	 * Return the physical filename of the preview image on disc
+	 * including the path
 	 *
 	 * @param object $object document content or document file
 	 * @return string file name of preview image
@@ -47,7 +48,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 			case $dms->getClassname('documentcontent'):
 				$target = $dir.'p'.$object->getVersion();
 				break;
-			case "SeedDMS_Core_DocumentFile":
+			case $dms->getClassname('documentfile'):
 				$target = $dir.'f'.$object->getID();
 				break;
 			default:

From 18ea59bfc7ee80ac5fa992041321f1fd4a4a25ea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2023 14:31:59 +0100
Subject: [PATCH 1694/2006] add more documentation

---
 SeedDMS_Preview/Preview/Previewer.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 57b2a66ef..7a6937f11 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -29,6 +29,16 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 	 */
 	protected $width;
 
+	/**
+	 * Create instance of image previewer
+	 *
+	 * @param string $previewDir path of base directory where all images are
+	 * stored. This directory will have a subdirectory derived from the object id.
+	 * @param integer $width default width of an image
+	 * @param integer $timeout timeout for shell commands to create a preview image
+	 * @param boolean $xsendfile if set to true the apache module xsendfile will
+	 * be used.
+	 */
 	function __construct($previewDir, $width=40, $timeout=5, $xsendfile=true) { /* {{{ */
 		parent::__construct($previewDir, $timeout, $xsendfile);
 		$this->converters = array(
@@ -46,7 +56,8 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 	} /* }}} */
 
 	/**
-	 * Return the physical filename of the preview image on disk
+	 * Return the physical filename of the preview image on disc
+	 * including the path
 	 *
 	 * @param object $object document content or document file
 	 * @param integer $width width of preview image
@@ -103,6 +114,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 	 * @param string $mimetype MimeType of input file
 	 * @param integer $width width of generated preview image
 	 * @param string $target optional name of preview image (without extension)
+	 * @param boolean $new will be set to true if the preview images was created
 	 * @return boolean true on success, false on failure
 	 */
 	public function createRawPreview($infile, $dir, $mimetype, $width=0, $target='', &$new=false) { /* {{{ */
@@ -171,6 +183,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 	 * @param object $object instance of SeedDMS_Core_DocumentContent
 	 * or SeedDMS_Core_DocumentFile
 	 * @param integer $width desired width of preview image
+	 * @param boolean $new will be set to true if the preview images was created
 	 * @return boolean true on success, false on failure
 	 */
 	public function createPreview($object, $width=0, &$new=false) { /* {{{ */

From 722b5dfba5ae8e1fe19c627d22c1769410f9948d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2023 14:32:16 +0100
Subject: [PATCH 1695/2006] add converter from text to image

---
 doc/README.Converters | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/README.Converters b/doc/README.Converters
index e916159dc..dcb694138 100644
--- a/doc/README.Converters
+++ b/doc/README.Converters
@@ -90,6 +90,9 @@ image/jpeg
 image/png
   convert -resize %wx '%f' 'png:%o'
 
+text/plain
+  convert -density 100 -resize %wx 'text:%f[0]' 'png:%o'
+
 application/pdf
   gs -dBATCH -dNOPAUSE -sDEVICE=png16m -dPDFFitPage -r72x72 -sOutputFile=- -dFirstPage=1 -dLastPage=1 -q '%f' | convert -resize %wx png:- '%o'
 

From a80702e7b88e4390870b5798d3ebb5dd75e281c7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2023 14:32:52 +0100
Subject: [PATCH 1696/2006] add more documentation

---
 inc/inc.ClassFulltextService.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/inc/inc.ClassFulltextService.php b/inc/inc.ClassFulltextService.php
index 142943183..23309cf6c 100644
--- a/inc/inc.ClassFulltextService.php
+++ b/inc/inc.ClassFulltextService.php
@@ -7,17 +7,27 @@
  * @license    GPL 2
  * @version    @version@
  * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @copyright  Copyright (C) 2021-2023 Uwe Steinmann
  * @version    Release: @package_version@
  */
 
 /**
  * Implementation of fulltext service
  *
+ * The fulltext service is wrapper around single services for a full text
+ * search. Such a service can be based on Solr, SQlite, etc. It implements
+ * three major methods:
+ * IndexedDocument() for creating an instance of an indexed document
+ * Indexer() for creating an instance of the index
+ * Search() fro creating an instance of a search frontend
+ *
+ * Though this class can manage more than one service, it will only
+ * use the first one.
+ *
  * @category   DMS
  * @package    SeedDMS
  * @author     Uwe Steinmann <uwe@steinmann.cx>
- * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @copyright  Copyright (C) 2021-2023 Uwe Steinmann
  * @version    Release: @package_version@
  */
 class SeedDMS_FulltextService {
@@ -136,7 +146,7 @@ class SeedDMS_FulltextService {
 	/**
 	 * Returns callback function to convert a document into plain text
 	 *
-	 * This variant just uses the text previewer which
+	 * This variant uses the text previewer which
 	 * caches the converted document
 	 */
 	public function getConversionWithPreviewCallback() { /* {{{ */
@@ -162,7 +172,7 @@ class SeedDMS_FulltextService {
 	} /* }}} */
 
 	/**
-	 * Return an indexable document from the given document or folder
+	 * Return an indexable document based on the given document or folder
 	 *
 	 * @param SeedDMS_Core_Document|SeedDMS_Core_Folder $object document or folder
 	 * to be indexed
@@ -183,7 +193,7 @@ class SeedDMS_FulltextService {
 	/**
 	 * Returns an instance of the indexer
 	 *
-	 * The indexer provides access to fulltext index. It allows to add and
+	 * The indexer provides access to the fulltext index. It allows to add and
 	 * get documents.
 	 *
 	 * @return object instance of class specified in 'Indexer'

From dd65fe2e35fd0c7a327e59afd9a040e70c953ae9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2023 14:33:11 +0100
Subject: [PATCH 1697/2006] add conversion service from text to png

---
 inc/inc.ConversionInit.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/inc/inc.ConversionInit.php b/inc/inc.ConversionInit.php
index 880e488f1..4c2c9e64e 100644
--- a/inc/inc.ConversionInit.php
+++ b/inc/inc.ConversionInit.php
@@ -34,6 +34,10 @@ if(extension_loaded('gd') || extension_loaded('imagick')) {
 	$conversionmgr->addService(new SeedDMS_ConversionServiceImageToImage('image/gif', 'image/png'))->setLogger($logger);
 }
 
+if(extension_loaded('imagick')) {
+	$conversionmgr->addService(new SeedDMS_ConversionServiceTextToImage('text/plain', 'image/png'))->setLogger($logger);
+}
+
 $conversionmgr->addService(new SeedDMS_ConversionServiceImageToText('image/jpeg', 'text/plain'))->setLogger($logger);
 $conversionmgr->addService(new SeedDMS_ConversionServiceImageToText('image/jpg', 'text/plain'))->setLogger($logger);
 

From a9aa87332d8115baf4d14031bf6512cd16af6646 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 4 Jan 2023 14:33:36 +0100
Subject: [PATCH 1698/2006] add comment that converters are deprecated

---
 inc/inc.FulltextInit.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index 2368e5477..4a9fcba00 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -41,6 +41,7 @@ if($settings->_enableFullSearch) {
 			$fulltextservice->addService($settings->_fullSearchEngine, $indexconf);
 		}
 	}
+	/* setConverters() is deprecated */
 	$fulltextservice->setConverters(isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null);
 	$fulltextservice->setConversionMgr($conversionmgr);
 	$fulltextservice->setMaxSize($settings->_maxSizeForFullText);

From e28911711b7bdb4580181b85ccde02a829d6b62b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 08:01:48 +0100
Subject: [PATCH 1699/2006] make init() static

---
 SeedDMS_Lucene/Lucene/Indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Lucene/Lucene/Indexer.php b/SeedDMS_Lucene/Lucene/Indexer.php
index 7c3b3f68a..bc7321185 100644
--- a/SeedDMS_Lucene/Lucene/Indexer.php
+++ b/SeedDMS_Lucene/Lucene/Indexer.php
@@ -51,7 +51,7 @@ class SeedDMS_Lucene_Indexer {
 	 * Do some initialization
 	 *
 	 */
-	static function init($stopWordsFile='') { /* {{{ */
+	public function init($stopWordsFile='') { /* {{{ */
 		$analyzer = new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive();
 		if($stopWordsFile && file_exists($stopWordsFile)) {
 			$stopWordsFilter = new Zend_Search_Lucene_Analysis_TokenFilter_StopWords();

From b9ac1860cf4fd36fbd58f0aef7fa1e08a1eb31e9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 08:02:14 +0100
Subject: [PATCH 1700/2006] use stop words

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 42 +++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index bb9585c73..697843923 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -25,18 +25,48 @@
 class SeedDMS_SQLiteFTS_Indexer {
 
 	/**
-	 * @var string $ftstype
+	 * @var string $_ftstype
 	 * @access protected
 	 */
 	protected $_ftstype;
 
 	/**
-	 * @var object $index sqlite index
+	 * @var object $_conn sqlite index
 	 * @access protected
 	 */
 	protected $_conn;
 
+	/**
+	 * @var array $_stop_words array of stop words
+	 * @access protected
+	 */
+	protected $_stop_words;
+
 	const ftstype = 'fts5';
+
+	/**
+	 * Remove stopwords from string
+	 */
+  protected function strip_stopwords($str = "") { /* {{{ */
+    // 1.) break string into words
+    // [^-\w\'] matches characters, that are not [0-9a-zA-Z_-']
+    // if input is unicode/utf-8, the u flag is needed: /pattern/u
+    $words = preg_split('/[^-\w\']+/u', $str, -1, PREG_SPLIT_NO_EMPTY);
+
+    // 2.) if we have at least 2 words, remove stopwords
+    if(count($words) > 1) {
+      $stopwords = $this->_stop_words;
+      $words = array_filter($words, function ($w) use (&$stopwords) {
+        return ((mb_strlen($w, 'utf-8') > 2) && !isset($stopwords[mb_strtolower($w, "utf-    8")]));
+      });
+    }
+
+    // check if not too much was removed such as "the the" would return empty
+    if(!empty($words))
+      return implode(" ", $words);
+    return $str;
+  } /* }}} */
+
 	/**
 	 * Constructor
 	 *
@@ -48,6 +78,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 			$this->_rawid = 'rowid';
 		else
 			$this->_rawid = 'docid';
+		$this->_stop_words = [];
 	} /* }}} */
 
 	/**
@@ -109,7 +140,9 @@ class SeedDMS_SQLiteFTS_Indexer {
 	 * Do some initialization
 	 *
 	 */
-	static function init($stopWordsFile='') { /* {{{ */
+	public function init($stopWordsFile='') { /* {{{ */
+		if($stopWordsFile)
+			$this->_stop_words = array_flip(preg_split("/[\s,]+/", file_get_contents($stopWordsFile)));
 	} /* }}} */
 
 	/**
@@ -135,6 +168,9 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if($res === false) {
 			return false;
 		}
+		if($this->_stop_words)
+			$content = $this->strip_stopwords($content);
+
 		$sql = "INSERT INTO docs (documentid, record_type, title, comment, keywords, category, owner, content, mimetype, origfilename, created, indexed, users, status, path) VALUES (".$this->_conn->quote($doc->getFieldValue('document_id')).", ".$this->_conn->quote($doc->getFieldValue('record_type')).", ".$this->_conn->quote($doc->getFieldValue('title')).", ".$this->_conn->quote($comment).", ".$this->_conn->quote($keywords).", ".$this->_conn->quote($category).", ".$this->_conn->quote($doc->getFieldValue('owner')).", ".$this->_conn->quote($content).", ".$this->_conn->quote($mimetype).", ".$this->_conn->quote($origfilename).", ".(int)$created.", ".(int)$indexed.", ".$this->_conn->quote($doc->getFieldValue('users')).", ".$this->_conn->quote($status).", ".$this->_conn->quote($doc->getFieldValue('path'))/*time()*/.")";
 		$res = $this->_conn->exec($sql);
 		if($res === false) {

From 99ee18a336ade768206d269193c37b6f873bd851 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 08:03:13 +0100
Subject: [PATCH 1701/2006] add note for 1.1.18

---
 SeedDMS_SQLiteFTS/package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 452e8f74a..047d9cae1 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -26,6 +26,7 @@
 - add optional parameter $order to SeedDMS_SQLiteFTS_Indexer::find()
 - add optional parameters $query and $col to SeedDMS_SQLiteFTS_Indexer::terms()
 - IndexedDocument() accepts a callable for conversion to text
+- remove stop words from content
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 4540f85745c6347646068c0092ba3645cdbf2000 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 08:04:07 +0100
Subject: [PATCH 1702/2006] add var $success which is set to false if the
 conversion fails

---
 inc/inc.ClassConversionServiceBase.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/inc/inc.ClassConversionServiceBase.php b/inc/inc.ClassConversionServiceBase.php
index e4b75a474..9ea95812e 100644
--- a/inc/inc.ClassConversionServiceBase.php
+++ b/inc/inc.ClassConversionServiceBase.php
@@ -36,9 +36,15 @@ abstract class SeedDMS_ConversionServiceBase {
 	 */
 	protected $logger;
 
+	/**
+	 * @var $success set to false if conversion failed
+	 */
+	protected $success;
+
 	public function __construct() {
 		$this->from = null;
 		$this->to = null;
+		$this->success = true;
 	}
 
 	public function setLogger($logger) {
@@ -53,6 +59,10 @@ abstract class SeedDMS_ConversionServiceBase {
 		return [];
 	} /* }}} */
 
+	public function wasSuccessful() { /* {{{ */
+		return $this->success;
+	} /* }}} */
+
 	/**
 	 * This method does the conversion
 	 *

From 99e7623ea0f9ed931a9b759b64f91b1fc2203471 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 08:04:48 +0100
Subject: [PATCH 1703/2006] init index with stopwords file

---
 op/op.Ajax.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 36c47298c..f4c5ad884 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -984,6 +984,7 @@ switch($command) {
 				}
 				if($object) {
 					if($index = $fulltextservice->Indexer()) {
+						$index->init($settings->_stopWordsFile);
 						$idoc = $fulltextservice->IndexedDocument($object, true);
 							$error = $idoc->getErrorMsg();
 							if(!$error) {

From f48f649249fd10ec69d75d89bed82c9e51316275 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 08:05:46 +0100
Subject: [PATCH 1704/2006] call constructor of parent

---
 inc/inc.ClassConversionServiceExec.php         | 1 +
 inc/inc.ClassConversionServiceImageToImage.php | 1 +
 inc/inc.ClassConversionServiceImageToText.php  | 1 +
 inc/inc.ClassConversionServicePdfToImage.php   | 2 ++
 inc/inc.ClassConversionServiceTextToImage.php  | 1 +
 inc/inc.ClassConversionServiceTextToText.php   | 1 +
 6 files changed, 7 insertions(+)

diff --git a/inc/inc.ClassConversionServiceExec.php b/inc/inc.ClassConversionServiceExec.php
index eff1d5ab1..c03c2c441 100644
--- a/inc/inc.ClassConversionServiceExec.php
+++ b/inc/inc.ClassConversionServiceExec.php
@@ -92,6 +92,7 @@ class SeedDMS_ConversionServiceExec extends SeedDMS_ConversionServiceBase {
 	} /* }}} */
 
 	public function __construct($from, $to, $cmd, $timeout=5) {
+		parent::__construct();
 		$this->from = $from;
 		$this->to = $to;
 		$this->cmd = $cmd;
diff --git a/inc/inc.ClassConversionServiceImageToImage.php b/inc/inc.ClassConversionServiceImageToImage.php
index b5c9e7951..27905ad10 100644
--- a/inc/inc.ClassConversionServiceImageToImage.php
+++ b/inc/inc.ClassConversionServiceImageToImage.php
@@ -29,6 +29,7 @@ class SeedDMS_ConversionServiceImageToImage extends SeedDMS_ConversionServiceBas
 	public $timeout;
 
 	public function __construct($from, $to) { /* {{{ */
+		parent::__construct();
 		$this->from = $from;
 		$this->to = $to;
 		$this->timeout = 5;
diff --git a/inc/inc.ClassConversionServiceImageToText.php b/inc/inc.ClassConversionServiceImageToText.php
index 326dba28c..1672d55f2 100644
--- a/inc/inc.ClassConversionServiceImageToText.php
+++ b/inc/inc.ClassConversionServiceImageToText.php
@@ -29,6 +29,7 @@ class SeedDMS_ConversionServiceImageToText extends SeedDMS_ConversionServiceBase
 	public $timeout;
 
 	public function __construct($from, $to) { /* {{{ */
+		parent::__construct();
 		$this->from = $from;
 		$this->to = $to;
 	} /* }}} */
diff --git a/inc/inc.ClassConversionServicePdfToImage.php b/inc/inc.ClassConversionServicePdfToImage.php
index d42bed80f..349565232 100644
--- a/inc/inc.ClassConversionServicePdfToImage.php
+++ b/inc/inc.ClassConversionServicePdfToImage.php
@@ -29,6 +29,7 @@ class SeedDMS_ConversionServicePdfToImage extends SeedDMS_ConversionServiceBase
 	public $timeout;
 
 	public function __construct($from, $to) {
+		parent::__construct();
 		$this->from = $from;
 		$this->to = $to;
 		$this->timeout = 5;
@@ -75,6 +76,7 @@ class SeedDMS_ConversionServicePdfToImage extends SeedDMS_ConversionServiceBase
 				}
 			}
 		} catch (ImagickException $e) {
+			$this->success = false;
 			return false;
 		}
 		return false;
diff --git a/inc/inc.ClassConversionServiceTextToImage.php b/inc/inc.ClassConversionServiceTextToImage.php
index c34f32d98..6c526c695 100644
--- a/inc/inc.ClassConversionServiceTextToImage.php
+++ b/inc/inc.ClassConversionServiceTextToImage.php
@@ -24,6 +24,7 @@ require_once("inc/inc.ClassConversionServiceBase.php");
  */
 class SeedDMS_ConversionServiceTextToImage extends SeedDMS_ConversionServiceBase {
 	public function __construct($from, $to) {
+		parent::__construct();
 		$this->from = $from;
 		$this->to = $to;
 	}
diff --git a/inc/inc.ClassConversionServiceTextToText.php b/inc/inc.ClassConversionServiceTextToText.php
index 5342c9f4d..ae68c6080 100644
--- a/inc/inc.ClassConversionServiceTextToText.php
+++ b/inc/inc.ClassConversionServiceTextToText.php
@@ -24,6 +24,7 @@ require_once("inc/inc.ClassConversionServiceBase.php");
  */
 class SeedDMS_ConversionServiceTextToText extends SeedDMS_ConversionServiceBase {
 	public function __construct($from, $to) {
+		parent::__construct();
 		$this->from = $from;
 		$this->to = $to;
 	}

From 5a778a1b7516d63ad120f89d0901410cba5e2b3c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 09:02:30 +0100
Subject: [PATCH 1705/2006] add note about setting papersize for a2ps

---
 doc/README.Converters | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/README.Converters b/doc/README.Converters
index dcb694138..ed9214126 100644
--- a/doc/README.Converters
+++ b/doc/README.Converters
@@ -103,6 +103,9 @@ application/pdf
 text/plain
   a2ps -1 -a1 -R -B -o - '%f' | gs -dBATCH -dNOPAUSE -sDEVICE=png16m -dFirstPage=1 -dLastPage=1 -dPDFFitPage -r72x72 -sOutputFile=- -q - | convert -resize %wx png:- 'png:%o'
 
+	On Linux systems you will have to set the desired value in /etc/papersize for a2ps
+	e.g. a4, or letter
+
 application/msword
 application/vnd.oasis.opendocument.spreadsheet
 application/vnd.oasis.opendocument.text

From a8474b08c6492c648c6880c44b95442f7fb25d36 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 09:34:09 +0100
Subject: [PATCH 1706/2006] use method wasSuccessful() to check if conversion
 succeeded

---
 inc/inc.ClassConversionMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassConversionMgr.php b/inc/inc.ClassConversionMgr.php
index 94ddd35a9..a4606327e 100644
--- a/inc/inc.ClassConversionMgr.php
+++ b/inc/inc.ClassConversionMgr.php
@@ -86,7 +86,7 @@ class SeedDMS_ConversionMgr {
 			for(end($services); key($services)!==null; prev($services)) {
 				$service = current($services);
 				$text = $service->convert($file, $target, $params);
-				if($text === false)
+				if(!$service->wasSuccessful())
 					return false;
 				if($text)
 					return $text;

From 735fe4235f1b52ee58facdb327c67c357032e8b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 09:34:39 +0100
Subject: [PATCH 1707/2006] set $success to false if exec of command failed

---
 inc/inc.ClassConversionServiceExec.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/inc.ClassConversionServiceExec.php b/inc/inc.ClassConversionServiceExec.php
index c03c2c441..71e530732 100644
--- a/inc/inc.ClassConversionServiceExec.php
+++ b/inc/inc.ClassConversionServiceExec.php
@@ -168,6 +168,7 @@ class SeedDMS_ConversionServiceExec extends SeedDMS_ConversionServiceBase {
 		} catch(Exception $e) {
 			if($hastempfile)
 				unlink($tmpfile);
+			$this->success = false;
 			return false;
 		}
 		$end = microtime(true);

From 292ade83e7660b7f2dfbaed36fd911863a8bb72c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 09:35:13 +0100
Subject: [PATCH 1708/2006] return empty text if image has no iptc data

---
 inc/inc.ClassConversionServiceImageToText.php | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/inc/inc.ClassConversionServiceImageToText.php b/inc/inc.ClassConversionServiceImageToText.php
index 1672d55f2..a0cc2cd86 100644
--- a/inc/inc.ClassConversionServiceImageToText.php
+++ b/inc/inc.ClassConversionServiceImageToText.php
@@ -51,25 +51,24 @@ class SeedDMS_ConversionServiceImageToText extends SeedDMS_ConversionServiceBase
 	public function convert($infile, $target = null, $params = array()) { /* {{{ */
 		$start = microtime(true);
 		$imsize = getimagesize($infile, $moreinfo);
+		$txt = '';
 		if(!empty($moreinfo['APP13'])) {
-			$txt = '';
 			$iptcdata = iptcparse($moreinfo['APP13']);
 			foreach(['2#005', '2#015', '2#025', '2#105', '2#080', '2#115', '2#120'] as $key) {
 				if(isset($iptcdata[$key]))
 					$txt .= implode(' ', $iptcdata[$key])."\n";
 			}
 			$end = microtime(true);
-			if($this->logger) {
-				$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' by extracting iptc took '.($end-$start).' sec.', PEAR_LOG_INFO);
-			}
-			if($target) {
-				file_put_contents($target, $txt);
-				return true;
-			} else {
-				return $txt;
-			}
 		}
-		return false;
+		if($this->logger) {
+			$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' by extracting iptc took '.($end-$start).' sec.', PEAR_LOG_INFO);
+		}
+		if($target) {
+			file_put_contents($target, $txt);
+			return true;
+		} else {
+			return $txt;
+		}
 	} /* }}} */
 }
 

From 8cdafe49e05beb05a945a67033f217b579403f50 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 09:45:22 +0100
Subject: [PATCH 1709/2006] remove spaces which prevented reading the stop word
 list

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 697843923..506af59bc 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -57,7 +57,7 @@ class SeedDMS_SQLiteFTS_Indexer {
     if(count($words) > 1) {
       $stopwords = $this->_stop_words;
       $words = array_filter($words, function ($w) use (&$stopwords) {
-        return ((mb_strlen($w, 'utf-8') > 2) && !isset($stopwords[mb_strtolower($w, "utf-    8")]));
+        return ((mb_strlen($w, 'utf-8') > 2) && !isset($stopwords[mb_strtolower($w, "utf-8")]));
       });
     }
 

From ba8a2d5d8778dd758f36ec4f7d810c400ff19164 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 15:07:19 +0100
Subject: [PATCH 1710/2006] add method getPreviewDir()

---
 SeedDMS_Preview/Preview/Base.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index 1b67bcfae..d07897b6c 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -135,6 +135,15 @@ class SeedDMS_Preview_Base {
 		}
 	} /* }}} */
 
+	/**
+	 * Get preview dir
+	 *
+	 * @return string name of preview directory on disc
+	 */
+	public function getPreviewDir() { /* {{{ */
+		return $this->previewDir;
+	} /* }}} */
+
 	/**
 	 * Set a list of converters
 	 *

From 58fd8877fbb1352d94748e1b0256fe18246c006e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 15:08:05 +0100
Subject: [PATCH 1711/2006] use DIRECTORY_SEPARATOR, add prefix 'png', 'txt',
 'pdf' to previewDir

---
 SeedDMS_Preview/Preview/PdfPreviewer.php | 10 +++++-----
 SeedDMS_Preview/Preview/Previewer.php    | 19 +++++--------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index 73a538763..2a219b476 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -25,7 +25,7 @@
 class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 
 	function __construct($previewDir, $timeout=5, $xsendfile=true) { /* {{{ */
-		parent::__construct($previewDir, $timeout, $xsendfile);
+		parent::__construct($previewDir.DIRECTORY_SEPARATOR.'pdf', $timeout, $xsendfile);
 		$this->converters = array(
 		);
 	} /* }}} */
@@ -43,7 +43,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 
 		$document = $object->getDocument();
 		$dms = $document->_dms;
-		$dir = $this->previewDir.'/'.$document->getDir();
+		$dir = $this->previewDir.DIRECTORY_SEPARATOR.$document->getDir();
 		switch(get_class($object)) {
 			case $dms->getClassname('documentcontent'):
 				$target = $dir.'p'.$object->getVersion();
@@ -90,8 +90,8 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 
 		if(!$this->previewDir)
 			return false;
-		if(!is_dir($this->previewDir.'/'.$dir)) {
-			if (!SeedDMS_Core_File::makeDir($this->previewDir.'/'.$dir)) {
+		if(!is_dir($this->previewDir.DIRECTORY_SEPARATOR.$dir)) {
+			if (!SeedDMS_Core_File::makeDir($this->previewDir.DIRECTORY_SEPARATOR.$dir)) {
 				return false;
 			}
 		}
@@ -297,7 +297,7 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 		if(!$this->previewDir)
 			return false;
 
-		$dir = $this->previewDir.'/'.$document->getDir();
+		$dir = $this->previewDir.DIRECTORY_SEPARATOR.$document->getDir();
 		if(file_exists($dir) && is_dir($dir)) {
 			return SeedDMS_Preview_Previewer::recurseRmdir($dir);
 		} else {
diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index 7a6937f11..f53780e7a 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -40,17 +40,8 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 	 * be used.
 	 */
 	function __construct($previewDir, $width=40, $timeout=5, $xsendfile=true) { /* {{{ */
-		parent::__construct($previewDir, $timeout, $xsendfile);
+		parent::__construct($previewDir.DIRECTORY_SEPARATOR.'png', $timeout, $xsendfile);
 		$this->converters = array(
-			'image/png' => "convert -resize %wx '%f' '%o'",
-			'image/gif' => "convert -resize %wx '%f' '%o'",
-			'image/jpg' => "convert -resize %wx '%f' '%o'",
-			'image/jpeg' => "convert -resize %wx '%f' '%o'",
-			'image/svg+xml' => "convert -resize %wx '%f' '%o'",
-			'text/plain' => "convert -resize %wx '%f' '%o'",
-			'application/pdf' => "convert -density 100 -resize %wx '%f[0]' '%o'",
-			'application/postscript' => "convert -density 100 -resize %wx '%f[0]' '%o'",
-			'application/x-compressed-tar' => "tar tzvf '%f' | convert -density 100 -resize %wx text:-[0] '%o'",
 		);
 		$this->width = intval($width);
 	} /* }}} */
@@ -74,7 +65,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 
 		$document = $object->getDocument();
 		$dms = $document->_dms;
-		$dir = $this->previewDir.'/'.$document->getDir();
+		$dir = $this->previewDir.DIRECTORY_SEPARATOR.$document->getDir();
 		switch(get_class($object)) {
 			case $dms->getClassname('documentcontent'):
 				$target = $dir.'p'.$object->getVersion().'-'.$width;
@@ -127,8 +118,8 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 			$width = intval($width);
 		if(!$this->previewDir)
 			return false;
-		if(!is_dir($this->previewDir.'/'.$dir)) {
-			if (!SeedDMS_Core_File::makeDir($this->previewDir.'/'.$dir)) {
+		if(!is_dir($this->previewDir.DIRECTORY_SEPARATOR.$dir)) {
+			if (!SeedDMS_Core_File::makeDir($this->previewDir.DIRECTORY_SEPARATOR.$dir)) {
 				return false;
 			}
 		}
@@ -368,7 +359,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 		if(!$this->previewDir)
 			return false;
 
-		$dir = $this->previewDir.'/'.$document->getDir();
+		$dir = $this->previewDir.DIRECTORY_SEPARATOR.$document->getDir();
 		if(file_exists($dir) && is_dir($dir)) {
 			return SeedDMS_Preview_Previewer::recurseRmdir($dir);
 		} else {

From a94eccb6cf00eea03f74aba6ed6c4d2402ba95c6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 15:09:04 +0100
Subject: [PATCH 1712/2006] add converter for postscript

---
 doc/README.Converters | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/README.Converters b/doc/README.Converters
index ed9214126..730466e72 100644
--- a/doc/README.Converters
+++ b/doc/README.Converters
@@ -100,6 +100,9 @@ application/pdf
 
   mutool draw -F png -w %w -q -N -o %o %f 1
 
+application/postscript
+  convert -density 100 -resize %wx '%f[0]' 'png:%o'
+
 text/plain
   a2ps -1 -a1 -R -B -o - '%f' | gs -dBATCH -dNOPAUSE -sDEVICE=png16m -dFirstPage=1 -dLastPage=1 -dPDFFitPage -r72x72 -sOutputFile=- -q - | convert -resize %wx png:- 'png:%o'
 

From b01dd7655cfcd7d710b7cf0b7ef6fb50e4e5f9e7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 15:09:25 +0100
Subject: [PATCH 1713/2006] separate cache by png, txt, and pdf

---
 controllers/class.ClearCache.php     | 14 ++++++++++++--
 views/bootstrap/class.ClearCache.php |  8 +++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/controllers/class.ClearCache.php b/controllers/class.ClearCache.php
index 770abcdea..aef34fc5e 100644
--- a/controllers/class.ClearCache.php
+++ b/controllers/class.ClearCache.php
@@ -29,8 +29,18 @@ class SeedDMS_Controller_ClearCache extends SeedDMS_Controller_Common {
 		$post = $this->params['post'];
 
 		$ret = '';
-		if(!empty($post['preview'])) {
-			$cmd = 'rm -rf '.$settings->_cacheDir.'/[1-9]*';
+		if(!empty($post['previewpng'])) {
+			$cmd = 'rm -rf '.$settings->_cacheDir.'/png/[1-9]*';
+			system($cmd, $ret);
+		}
+
+		if(!empty($post['previewpdf'])) {
+			$cmd = 'rm -rf '.$settings->_cacheDir.'/pdf/[1-9]*';
+			system($cmd, $ret);
+		}
+
+		if(!empty($post['previewtxt'])) {
+			$cmd = 'rm -rf '.$settings->_cacheDir.'/txt/[1-9]*';
 			system($cmd, $ret);
 		}
 
diff --git a/views/bootstrap/class.ClearCache.php b/views/bootstrap/class.ClearCache.php
index b9b447c50..7f5736b7a 100644
--- a/views/bootstrap/class.ClearCache.php
+++ b/views/bootstrap/class.ClearCache.php
@@ -49,7 +49,13 @@ class SeedDMS_View_ClearCache extends SeedDMS_Theme_Style {
 		$this->contentContainerStart('warning');
 ?>
 <p>
-<input type="checkbox" name="preview" value="1" checked> <?php printMLText('preview_images_text'); ?>
+<input type="checkbox" name="previewpng" value="1" checked> <?php printMLText('preview_images'); ?>
+</p>
+<p>
+<input type="checkbox" name="previewpdf" value="1" checked> <?php printMLText('preview_pdf'); ?>
+</p>
+<p>
+<input type="checkbox" name="previewtxt" value="1" checked> <?php printMLText('preview_text'); ?>
 </p>
 <p>
 <input type="checkbox" name="js" value="1" checked> <?php printMLText('temp_jscode'); ?>

From 4ef60bbf10730efdf461d84ce7b09d550dd1a1ba Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 15:10:21 +0100
Subject: [PATCH 1714/2006] add note for 5.1.29

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index fc144fc55..2d6d1645d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - update jquery to 3.6.1 (only bootstrap4 theme)
 - introduce authentication service
 - new hook in restapi to add middleware
+- previews for png, txt, pdf in different directories
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.28

From 67163324bb056271800398d41f0483b2f97766e1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Jan 2023 16:57:18 +0100
Subject: [PATCH 1715/2006] set end of conversion in any case, not just if iptc
 data was found

---
 inc/inc.ClassConversionServiceImageToText.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassConversionServiceImageToText.php b/inc/inc.ClassConversionServiceImageToText.php
index a0cc2cd86..76816ea12 100644
--- a/inc/inc.ClassConversionServiceImageToText.php
+++ b/inc/inc.ClassConversionServiceImageToText.php
@@ -58,8 +58,8 @@ class SeedDMS_ConversionServiceImageToText extends SeedDMS_ConversionServiceBase
 				if(isset($iptcdata[$key]))
 					$txt .= implode(' ', $iptcdata[$key])."\n";
 			}
-			$end = microtime(true);
 		}
+		$end = microtime(true);
 		if($this->logger) {
 			$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' by extracting iptc took '.($end-$start).' sec.', PEAR_LOG_INFO);
 		}

From adbea2919a8cdfe383e84ead4552204cf347d72b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Jan 2023 07:48:32 +0100
Subject: [PATCH 1716/2006] do not set PDO::ATTR_AUTOCOMMIT because it prevents
 sql statements not in a transaction from being executed

---
 SeedDMS_Core/Core/inc.DBAccessPDO.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.DBAccessPDO.php b/SeedDMS_Core/Core/inc.DBAccessPDO.php
index 11f2541dc..c9d986cef 100644
--- a/SeedDMS_Core/Core/inc.DBAccessPDO.php
+++ b/SeedDMS_Core/Core/inc.DBAccessPDO.php
@@ -301,7 +301,7 @@ class SeedDMS_Core_DatabaseAccess {
 			switch($this->_driver) {
 				case 'mysql':
 					$this->_conn->exec('SET NAMES utf8');
-					$this->_conn->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
+//					$this->_conn->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
 					/* Turn this on if you want strict checking of default values, etc. */
 					/* $this->_conn->exec("SET SESSION sql_mode = 'STRICT_TRANS_TABLES'"); */
 					/* The following is the default on Ubuntu 16.04 */

From 8c86b4f61ce276d3be96dbdf1e7339e8ae91134b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Jan 2023 11:13:32 +0100
Subject: [PATCH 1717/2006] output homefolder and link email address

---
 views/bootstrap/class.SubstituteUser.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index 7ad0d639c..43e2ac02d 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -73,10 +73,12 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Theme_Style {
 			echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")";
 			if($hasemail)
 				echo "</a>";
-			echo "<br />";
+			if($currUser->getComment())
+				echo "<br /><small>".htmlspecialchars($currUser->getComment())."</small>";
 			if($hasemail)
-				echo "<small>".htmlspecialchars($currUser->getEmail())."</small><br />";
-			echo "<small>".htmlspecialchars($currUser->getComment())."</small>";
+				echo "<br /><small><i class=\"fa fa-envelope-o\"></i> <a href=\"mailto:".htmlspecialchars($currUser->getEmail())."\">".htmlspecialchars($currUser->getEmail())."</a></small>";
+			if($homefolder = $currUser->getHomeFolder())
+				echo "<br /><small><i class=\"fa fa-folder-o\"></i> <a href=\"../out/out.ViewFolder.php?folderid=".$homefolder."\">".htmlspecialchars($dms->getFolder($homefolder)->getName())."</a></small>";
 			echo "</td>";
 			echo "<td>";
 			echo getMLText('role').": ";

From 26e6f24565f4d6a5a34e348846bfbbc3b04711bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Jan 2023 13:46:33 +0100
Subject: [PATCH 1718/2006] fix checking for search result hits

---
 out/out.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 7d0a75da4..599004dd6 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -202,7 +202,7 @@ if($fullsearch) {
 				$facets = $searchresult['facets'];
 				$dcount = 0;
 				$fcount = 0;
-				if($searchresult) {
+				if($searchresult['hits']) {
 					foreach($searchresult['hits'] as $hit) {
 						if($hit['document_id'][0] == 'D') {
 							if($tmp = $dms->getDocument(substr($hit['document_id'], 1))) {

From f98df0efcc2d5af375ec186d323da8c99341243f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Jan 2023 13:46:58 +0100
Subject: [PATCH 1719/2006] better legend title

---
 views/bootstrap/class.IndexInfo.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.IndexInfo.php b/views/bootstrap/class.IndexInfo.php
index d578638c9..d5ade2b5c 100644
--- a/views/bootstrap/class.IndexInfo.php
+++ b/views/bootstrap/class.IndexInfo.php
@@ -44,6 +44,7 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Theme_Style {
 
 		$numDocs = $index->count();
 		echo "<legend>".$numDocs." ".getMLText('documents')."</legend>";
+		/*
 		$this->contentContainerStart('fulltextinfo');
 		for ($id = 0; $id < $numDocs; $id++) {
 			if (!$index->isDeleted($id)) {
@@ -52,9 +53,10 @@ class SeedDMS_View_IndexInfo extends SeedDMS_Theme_Style {
 			}
 		}
 		$this->contentContainerEnd();
+		 */
 
 		$terms = $index->terms();
-		echo "<legend>".count($terms)." Terms</legend>";
+		echo "<legend>".count($terms)." overall Terms</legend>";
 //		echo "<pre>";
 		$field = '';
 		foreach($terms as $term) {

From b14a421591c8ba601f5755ec5c60ece0101658ec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Jan 2023 18:41:29 +0100
Subject: [PATCH 1720/2006] do not auth because browsers do not send cookies to
 fetch opensearch desc

---
 out/out.OpensearchDesc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/out/out.OpensearchDesc.php b/out/out.OpensearchDesc.php
index d1240efab..246f80ea7 100644
--- a/out/out.OpensearchDesc.php
+++ b/out/out.OpensearchDesc.php
@@ -28,7 +28,8 @@ require_once("inc/inc.Extension.php");
 require_once("inc/inc.DBInit.php");
 require_once("inc/inc.ClassUI.php");
 require_once("inc/inc.ClassAccessOperation.php");
-require_once("inc/inc.Authentication.php");
+// No authentication because browsers do not send cookies when fetching the opensearch desc
+//require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));

From d35cf5d9f6683edf53d4264e8890982ef4722a7b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Jan 2023 18:43:18 +0100
Subject: [PATCH 1721/2006] fix syntax of url, set propper favicon

---
 views/bootstrap/class.OpensearchDesc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.OpensearchDesc.php b/views/bootstrap/class.OpensearchDesc.php
index 274e45fb3..bbd70aaa6 100644
--- a/views/bootstrap/class.OpensearchDesc.php
+++ b/views/bootstrap/class.OpensearchDesc.php
@@ -42,9 +42,9 @@ class SeedDMS_View_OpensearchDesc extends SeedDMS_Theme_Style {
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
 	<ShortName><?= $sitename ?></ShortName>
 	<Description><?= $sitename ?></Description>
-	<Image height="16" width="16" type="image/x-icon"><?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot ?>styles/<?= $this->theme ?>/favicon.ico</Image>
+	<Image height="16" width="16" type="image/x-icon"><?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot ?>views/<?= $this->theme ?>/images/favicon.ico</Image>
 	<Url type="text/html" method="get" template="<?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.Search.php?query={searchTerms}" ?>" />
-	<Url type="application/x-suggestions+xml" rel="suggestions" method="get" template="<?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.Search.php?action=opensearchsuggestion&query={searchTerms}" ?>" />
+	<Url type="application/x-suggestions+xml" rel="suggestions" method="get" template="<?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.Search.php?action=opensearchsuggestion&amp;query={searchTerms}" ?>" />
 	<moz:SearchForm><?= "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.Search.php" ?></moz:SearchForm>
   <OutputEncoding>UTF-8</OutputEncoding>
   <InputEncoding>UTF-8</InputEncoding>

From 1ec7715b26706afe170631a11238ea17e042c8ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 7 Jan 2023 12:18:03 +0100
Subject: [PATCH 1722/2006] set limit of typeahead search to 15

---
 views/bootstrap/styles/application.js  | 2 +-
 views/bootstrap4/styles/application.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/styles/application.js b/views/bootstrap/styles/application.js
index 8cafbb25d..922fc5772 100644
--- a/views/bootstrap/styles/application.js
+++ b/views/bootstrap/styles/application.js
@@ -99,7 +99,7 @@ function initMost() {
 //			$.get('../restapi/index.php/search', { query: query, limit: 8, mode: 'typeahead' }, function(data) {
 			var data = {
 				query: query,
-				limit: 18,
+				limit: 15,
 //				fullsearch: 1,
 //				creationdate: 1,
 //				createstart: d.toISOString().split('T')[0],
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index a39a2f604..bea3e79dd 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -104,7 +104,7 @@ function initMost() {
 //			$.get('../restapi/index.php/search', { query: query, limit: 8, mode: 'typeahead' }, function(data) {
 			var data = {
 				query: query,
-				limit: 18,
+				limit: 15,
 //				fullsearch: 1,
 //				creationdate: 1,
 //				createstart: d.toISOString().split('T')[0],

From 30ab2f9ef7e8becf9490843f25b2580fc3bce3a5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 7 Jan 2023 12:18:30 +0100
Subject: [PATCH 1723/2006] limit can be passed by url parameter, add '*' to
 query in typeahead mode

---
 out/out.Search.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 599004dd6..c28388f2e 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -66,11 +66,14 @@ if (isset($_GET["removecategory"]) && is_numeric($_GET["removecategory"]) && $_G
 	$removecategory = (int) $_GET['removecategory'];
 }
 
+$limit = (isset($_GET["limit"]) && is_numeric($_GET["limit"])) ? (int) $_GET['limit'] : 20;
 $fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch;
 if($fullsearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
 		$query = $_GET["query"];
+		if($_GET['action'] == 'typeahead')
+			$query .= '*';
 	}
 	else {
 		$query = "";
@@ -183,7 +186,7 @@ if($fullsearch) {
 		$searchTime = 0;
 	} else {
 		$startTime = getTime();
-		$limit = 20;
+//		$limit = 20;
 		$total = 0;
 		$index = $fulltextservice->Indexer();
 		if($index) {
@@ -471,7 +474,7 @@ if($fullsearch) {
 	//
 	// Default page to display is always one.
 	$pageNumber=1;
-	$limit = 15;
+//	$limit = 15;
 	if (isset($_GET["pg"])) {
 		if (is_numeric($_GET["pg"]) && $_GET["pg"]>0) {
 			$pageNumber = (int) $_GET["pg"];

From 3cc749786374522c71a4758e6764d6c7d082a61c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 8 Jan 2023 16:21:08 +0100
Subject: [PATCH 1724/2006] fix setting limit

---
 SeedDMS_Lucene/Lucene/Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index 5ca533d93..d3adb08a4 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -137,7 +137,7 @@ class SeedDMS_Lucene_Search {
 				$recs = array();
 				$c = 0;
 				foreach($hits as $hit) {
-					if($c >= $limit['offset'] && ($c-$limit['offset'] < $limit))
+					if($c >= $limit['offset'] && ($c-$limit['offset'] < $limit['limit']))
 						$recs[] = array('id'=>$hit->id, 'document_id'=>$hit->document_id);
 					$c++;
 				}

From 593792089f9fb0ca9f517a63f7a2e31731a8bd3d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 8 Jan 2023 16:22:01 +0100
Subject: [PATCH 1725/2006] implement Zend indexer as singleton in
 SeedDMS_Lucene_Indexer

---
 SeedDMS_Lucene/Lucene/Indexer.php | 145 +++++++++++++++++++++++++++++-
 1 file changed, 143 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/Indexer.php b/SeedDMS_Lucene/Lucene/Indexer.php
index bc7321185..f0dee91ce 100644
--- a/SeedDMS_Lucene/Lucene/Indexer.php
+++ b/SeedDMS_Lucene/Lucene/Indexer.php
@@ -29,10 +29,23 @@ class SeedDMS_Lucene_Indexer {
 	 */
 	protected $indexname;
 
+	/**
+	 * @var string $index lucene index
+	 * @access protected
+	 */
+	protected $index;
+
+	public function __construct($index) {
+		$this->index = $index;
+	}
+
 	static function open($conf) { /* {{{ */
 		try {
 			$index = Zend_Search_Lucene::open($conf['indexdir']);
-			return($index);
+			if($index)
+				return new self($index);
+			else
+				return null;
 		} catch (Exception $e) {
 			return null;
 		}
@@ -41,7 +54,10 @@ class SeedDMS_Lucene_Indexer {
 	static function create($conf) { /* {{{ */
 		try {
 			$index = Zend_Search_Lucene::create($conf['indexdir']);
-			return($index);
+			if($index)
+				return new self($index);
+			else
+				return null;
 		} catch (Exception $e) {
 			return null;
 		}
@@ -62,6 +78,131 @@ class SeedDMS_Lucene_Indexer {
 		Zend_Search_Lucene_Analysis_Analyzer::setDefault($analyzer);
 	} /* }}} */
 
+	/**
+	 * Add document to index
+	 *
+	 * @param object $doc indexed document of class 
+	 * SeedDMS_Lucene_IndexedDocument
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	function addDocument($doc) { /* {{{ */
+		if(!$this->index)
+			return false;
 
+		return $this->index->addDocument($doc);
+	} /* }}} */
+
+	/**
+	 * Remove document from index
+	 *
+	 * @param object $id internal id of document
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	public function delete($id) { /* {{{ */
+		if(!$this->index)
+			return false;
+
+		return $this->index->delete($id);
+	} /* }}} */
+
+	/**
+	 * Check if document was deleted
+	 *
+	 * @param object $id internal id of document
+	 * @return boolean true if document was deleted
+	 */
+	public function isDeleted($id) { /* {{{ */
+		if(!$this->index)
+			return false;
+
+		return $this->index->isDeleted($id);
+	} /* }}} */
+
+	/**
+	 * Search in index
+	 *
+	 * @param string $query
+	 * @return array result
+	 */
+	public function find($query) { /* {{{ */
+		if(!$this->index)
+			return false;
+
+		return $this->index->find($query);
+	} /* }}} */
+
+	/**
+	 * Get a single document from index
+	 *
+	 * @param string $id id of document
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	public function findById($id) { /* {{{ */
+		if(!$this->index)
+			return false;
+
+		return $this->index->findById($id);
+	} /* }}} */
+
+	/**
+	 * Get a single document from index
+	 *
+	 * @param integer $id id of index record
+	 * @return boolean false in case of an error, otherwise true
+	 */
+	public function getDocument($id, $content=true) { /* {{{ */
+		if(!$this->index)
+			return false;
+
+		return $this->index->getDocument($id);
+	} /* }}} */
+
+	/**
+	 * Return list of terms in index
+	 *
+	 * @return array list of Zend_Lucene_Term
+	 */
+	public function terms($prefix='', $col='') { /* {{{ */
+		if(!$this->index)
+			return false;
+
+		return $this->index->terms();
+	} /* }}} */
+
+	/**
+	 * Return number of documents in index
+	 *
+	 * @return interger number of documents
+	 */
+	public function count() { /* {{{ */
+		if(!$this->index)
+			return false;
+
+		return $this->index->count();
+	} /* }}} */
+
+	/**
+	 * Commit changes
+	 *
+	 * This function does nothing!
+	 */
+	function commit() { /* {{{ */
+		if(!$this->index)
+			return false;
+
+		return $this->index->commit();
+	} /* }}} */
+
+	/**
+	 * Optimize index
+	 *
+	 * This function does nothing!
+	 */
+	function optimize() { /* {{{ */
+		if(!$this->index)
+			return false;
+
+		return $this->index->optimize();
+	} /* }}} */
 }
 ?>

From 71b8b197da23ec72cdab7e7227bf29f5c04508a1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 8 Jan 2023 16:22:52 +0100
Subject: [PATCH 1726/2006] various minor improvements

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index 506af59bc..ed86ce32e 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -54,7 +54,7 @@ class SeedDMS_SQLiteFTS_Indexer {
     $words = preg_split('/[^-\w\']+/u', $str, -1, PREG_SPLIT_NO_EMPTY);
 
     // 2.) if we have at least 2 words, remove stopwords
-    if(count($words) > 1) {
+    if(!empty($words)) {
       $stopwords = $this->_stop_words;
       $words = array_filter($words, function ($w) use (&$stopwords) {
         return ((mb_strlen($w, 'utf-8') > 2) && !isset($stopwords[mb_strtolower($w, "utf-8")]));
@@ -90,7 +90,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 		if(file_exists($conf['indexdir'].'/index.db')) {
 			return new SeedDMS_SQLiteFTS_Indexer($conf['indexdir']);
 		} else
-			return self::create($conf);
+			return static::create($conf);
 	} /* }}} */
 
 	/**
@@ -183,8 +183,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 	/**
 	 * Remove document from index
 	 *
-	 * @param object $doc indexed document of class 
-	 * SeedDMS_SQLiteFTS_IndexedDocument
+	 * @param object $id internal id of document
 	 * @return boolean false in case of an error, otherwise true
 	 */
 	public function delete($id) { /* {{{ */
@@ -215,7 +214,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 	 * @return boolean false in case of an error, otherwise array with elements
 	 * 'count', 'hits', 'facets'. 'hits' is an array of SeedDMS_SQLiteFTS_QueryHit
 	 */
-	public function find($query, $filter, $limit=array(), $order=array()) { /* {{{ */
+	public function find($query, $filter='', $limit=array(), $order=array()) { /* {{{ */
 		if(!$this->_conn)
 			return false;
 
@@ -392,16 +391,16 @@ class SeedDMS_SQLiteFTS_Indexer {
 	 *
 	 * @return array list of SeedDMS_SQLiteFTS_Term
 	 */
-	public function terms($query='', $col='') { /* {{{ */
+	public function terms($prefix='', $col='') { /* {{{ */
 		if(!$this->_conn)
 			return false;
 
 		if($this->_ftstype == 'fts5') {
 			$sql = "SELECT term, col, doc as occurrences FROM docs_terms";
-			if($query || $col) {
+			if($prefix || $col) {
 				$sql .= " WHERE";
-				if($query) {
-					$sql .= " term like '".$query."%'";
+				if($prefix) {
+					$sql .= " term like '".$prefix."%'";
 					if($col)
 						$sql .= " AND";
 				}
@@ -411,8 +410,8 @@ class SeedDMS_SQLiteFTS_Indexer {
 			$sql .= " ORDER BY col, occurrences desc";
 		} else {
 			$sql = "SELECT term, col, occurrences FROM docs_terms WHERE col!='*'";
-			if($query)
-				$sql .= " AND term like '".$query."%'";
+			if($prefix)
+				$sql .= " AND term like '".$prefix."%'";
 			if($col)
 				$sql .= " AND col = '".$col."'";
 			$sql .=	" ORDER BY col, occurrences desc";

From 23c4327382a27a3bc6001a6a53b906d3f2947afd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 8 Jan 2023 16:23:27 +0100
Subject: [PATCH 1727/2006] escape html in typeahead action

---
 views/bootstrap/class.Search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index ff2ea8341..2526b0db7 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -367,10 +367,10 @@ function typeahead() { /* {{{ */
 			foreach ($entries as $entry) {
 				if($entry->isType('document')) {
 //					$recs[] = 'D'.$entry->getName();
-					$recs[] = array('type'=>'D', 'id'=>$entry->getId(), 'name'=>$entry->getName(), 'path'=>$entry->getParent()->getFolderPathPlain(true, '/'));
+					$recs[] = array('type'=>'D', 'id'=>$entry->getId(), 'name'=>htmlspecialchars($entry->getName()), 'path'=>htmlspecialchars($entry->getParent()->getFolderPathPlain(true, '/')));
 				} elseif($entry->isType('folder')) {
 //					$recs[] = 'F'.$entry->getName();
-					$recs[] = array('type'=>'F', 'id'=>$entry->getId(), 'name'=>$entry->getName(), 'path'=>$entry->getParent()->getFolderPathPlain(true, '/'));
+					$recs[] = array('type'=>'F', 'id'=>$entry->getId(), 'name'=>htmlspecialchars($entry->getName()), 'path'=>htmlspecialchars($entry->getParent()->getFolderPathPlain(true, '/')));
 				}
 			}
 		}

From 409df834a3dcfe53004de4f548b001f012a491c1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 8 Jan 2023 16:24:02 +0100
Subject: [PATCH 1728/2006] check for typeahead action without php warnings

---
 out/out.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index c28388f2e..51618c6bd 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -72,7 +72,7 @@ if($fullsearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
 		$query = $_GET["query"];
-		if($_GET['action'] == 'typeahead')
+		if(isset($_GET['action']) && ($_GET['action'] == 'typeahead'))
 			$query .= '*';
 	}
 	else {

From 732fd81018489393ce1439cd209b9beac405f399 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 15:29:58 +0100
Subject: [PATCH 1729/2006] add query for record_type

---
 SeedDMS_Lucene/Lucene/Search.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index d3adb08a4..6f53ee9ea 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -89,6 +89,13 @@ class SeedDMS_Lucene_Search {
 				$querystr .= '")';
 			}
 		}
+		if(!empty($fields['record_type'])) {
+			if($querystr)
+				$querystr .= ' && ';
+			$querystr .= '(record_type:';
+			$querystr .= implode(' || record_type:', $fields['record_type']);
+			$querystr .= ')';
+		}
 		if(!empty($fields['category'])) {
 			if($querystr)
 				$querystr .= ' && ';

From 0686cfecf506cec2f40a3fc6c92fdc913a3f6645 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 15:30:18 +0100
Subject: [PATCH 1730/2006] init only fulltext service which was selected in
 configuration

---
 inc/inc.FulltextInit.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index 4a9fcba00..87687d9bb 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -32,8 +32,10 @@ if($settings->_enableFullSearch) {
 		$indexconf = null;
 		if(isset($GLOBALS['SEEDDMS_HOOKS']['initFulltext'])) {
 			foreach($GLOBALS['SEEDDMS_HOOKS']['initFulltext'] as $hookObj) {
-				if (method_exists($hookObj, 'initFulltextService')) {
-					$indexconf = $hookObj->initFulltextService(array('engine'=>$settings->_fullSearchEngine, 'dms'=>$dms, 'settings'=>$settings));
+				if (method_exists($hookObj, 'isFulltextService') && $hookObj->isFulltextService($settings->_fullSearchEngine)) {
+					if (method_exists($hookObj, 'initFulltextService')) {
+						$indexconf = $hookObj->initFulltextService(array('engine'=>$settings->_fullSearchEngine, 'dms'=>$dms, 'settings'=>$settings));
+					}
 				}
 			}
 		}

From 2310395e46c83fc918d3214fa6435830fdfb3ebf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 15:30:44 +0100
Subject: [PATCH 1731/2006] add field record_type

---
 SeedDMS_Lucene/Lucene/IndexedDocument.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index 1ee2d93c7..c8e76b26c 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -145,6 +145,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 
 		if($document->isType('document')) {
 			$this->addField(Zend_Search_Lucene_Field::Keyword('document_id', 'D'.$document->getID()));
+			$this->addField(Zend_Search_Lucene_Field::Keyword('record_type', 'document'));
 			$version = $document->getLatestContent();
 			if($version) {
 				$this->addField(Zend_Search_Lucene_Field::Keyword('mimetype', $version->getMimeType()));
@@ -232,7 +233,9 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 			} 
 		} elseif($document->isType('folder')) {
 			$this->addField(Zend_Search_Lucene_Field::Keyword('document_id', 'F'.$document->getID()));
+			$this->addField(Zend_Search_Lucene_Field::Keyword('record_type', 'folder'));
 			$this->addField(Zend_Search_Lucene_Field::UnIndexed('created', $document->getDate()));
+			$this->addField(Zend_Search_Lucene_Field::UnIndexed('indexed', time()));
 		}
 	} /* }}} */
 

From 5e48d724acc07052be6e6a8f2d3a6917a3097cc5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 15:31:05 +0100
Subject: [PATCH 1732/2006] pass terms to view

---
 out/out.Search.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/out/out.Search.php b/out/out.Search.php
index 51618c6bd..99cdb822d 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -66,6 +66,7 @@ if (isset($_GET["removecategory"]) && is_numeric($_GET["removecategory"]) && $_G
 	$removecategory = (int) $_GET['removecategory'];
 }
 
+$terms = [];
 $limit = (isset($_GET["limit"]) && is_numeric($_GET["limit"])) ? (int) $_GET['limit'] : 20;
 $fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch;
 if($fullsearch) {
@@ -190,6 +191,7 @@ if($fullsearch) {
 		$total = 0;
 		$index = $fulltextservice->Indexer();
 		if($index) {
+//			$terms = $index->terms($_GET['query']);
 			$lucenesearch = $fulltextservice->Search();
 			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));
 			if($searchresult === false) {
@@ -575,6 +577,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('changecategory', $changecategory);
 		$view->setParam('removecategory', $removecategory);
 		$view->setParam('searchhits', $entries);
+		$view->setParam('terms', $terms);
 		$view->setParam('totalpages', $totalPages);
 		$view->setParam('pagenumber', $pageNumber);
 		$view->setParam('limit', $limit);

From 707082f6b69195b5857e15d6ad72cc0f6f1b644e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 15:31:30 +0100
Subject: [PATCH 1733/2006] list terms in auto complete if set

---
 views/bootstrap/class.Search.php | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 2526b0db7..92e5d5e5b 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -362,19 +362,22 @@ function typeahead() { /* {{{ */
 		$user = $this->params['user'];
 		$query = $this->params['query'];
 		$entries = $this->params['searchhits'];
+		$terms = $this->params['terms'];
 		$recs = array();
+		$recs[] = array('type'=>'S', 'name'=>$query, 'occurences'=>'');
+		if($terms) {
+			foreach($terms as $term)
+				$recs[] = array('type'=>'S', 'name'=>$term->text, 'occurences'=>$term->_occurrence);
+		}
 		if($entries) {
 			foreach ($entries as $entry) {
 				if($entry->isType('document')) {
-//					$recs[] = 'D'.$entry->getName();
 					$recs[] = array('type'=>'D', 'id'=>$entry->getId(), 'name'=>htmlspecialchars($entry->getName()), 'path'=>htmlspecialchars($entry->getParent()->getFolderPathPlain(true, '/')));
 				} elseif($entry->isType('folder')) {
-//					$recs[] = 'F'.$entry->getName();
 					$recs[] = array('type'=>'F', 'id'=>$entry->getId(), 'name'=>htmlspecialchars($entry->getName()), 'path'=>htmlspecialchars($entry->getParent()->getFolderPathPlain(true, '/')));
 				}
 			}
 		}
-		array_unshift($recs, array('type'=>'S', 'name'=>$query));
 		header('Content-Type: application/json');
 		echo json_encode($recs);
 	} /* }}} */
@@ -829,6 +832,22 @@ function typeahead() { /* {{{ */
 					)
 				);
 			}
+			if(!isset($facets['record_type'])) {
+				$options = array();
+				$options[] = array('document', getMLText('document'), in_array('document', $record_type));
+				$options[] = array('folder', getMLText('folder'), in_array('folder', $record_type));
+				$this->formField(
+					getMLText("record_type"),
+					array(
+						'element'=>'select',
+						'class'=>'chzn-select',
+						'name'=>'record_type[]',
+						'multiple'=>true,
+						'attributes'=>array(array('data-placeholder', getMLText('select_record_type'))),
+						'options'=>$options
+					)
+				);
+			}
 
 			if($facets) {
 				foreach($facets as $facetname=>$values) {

From bc5aa7703c27511ab018a8fadfeacd876795b90c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 15:32:00 +0100
Subject: [PATCH 1734/2006] display number of occurences of term

---
 views/bootstrap/styles/application.js  | 6 +-----
 views/bootstrap4/styles/application.js | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/views/bootstrap/styles/application.js b/views/bootstrap/styles/application.js
index 922fc5772..fef4a5614 100644
--- a/views/bootstrap/styles/application.js
+++ b/views/bootstrap/styles/application.js
@@ -96,13 +96,9 @@ function initMost() {
 			d.setFullYear(pastYear);
 //			console.log(d.toISOString().split('T')[0]);
 
-//			$.get('../restapi/index.php/search', { query: query, limit: 8, mode: 'typeahead' }, function(data) {
 			var data = {
 				query: query,
 				limit: 15,
-//				fullsearch: 1,
-//				creationdate: 1,
-//				createstart: d.toISOString().split('T')[0],
 				action: 'typeahead'
 			};
 			/* Return a list of json objects, each containing
@@ -152,7 +148,7 @@ function initMost() {
 			else if(item.type.charAt(0) == 'F')
 				return '<i class="fa fa-folder-o"></i> ' + item.name.replace(/</g, '&lt;') + '<br /><span class="path">' + item.path + '</span>';
 			else
-				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;');
+				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;') + (item.occurences > 0 ? ' (' + item.occurences + ')' : '');
 		},
 		/* This only works with a modified version of bootstrap typeahead located
 		 * in boostrap-typeahead.js Search for 'render'
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index bea3e79dd..208a2f4c3 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -101,13 +101,9 @@ function initMost() {
 			d.setFullYear(pastYear);
 //			console.log(d.toISOString().split('T')[0]);
 
-//			$.get('../restapi/index.php/search', { query: query, limit: 8, mode: 'typeahead' }, function(data) {
 			var data = {
 				query: query,
 				limit: 15,
-//				fullsearch: 1,
-//				creationdate: 1,
-//				createstart: d.toISOString().split('T')[0],
 				action: 'typeahead'
 			};
 			/* Return a list of json objects, each containing
@@ -157,7 +153,7 @@ function initMost() {
 			else if(item.type.charAt(0) == 'F')
 				return '<i class="fa fa-folder-o"></i> ' + item.name.replace(/</g, '&lt;') + '<br /><span class="path">' + item.path + '</span>';
 			else
-				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;');
+				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;') + (item.occurences > 0 ? ' (' + item.occurences + ')' : '');
 		},
 		/* This only works with a modified version of bootstrap typeahead located
 		 * in boostrap-typeahead.js Search for 'render'

From b1b16e1008e8f21dd3fcfc85f0e5126ec5a223ed Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 15:32:38 +0100
Subject: [PATCH 1735/2006] output time in secs for indexing

---
 utils/indexer.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/utils/indexer.php b/utils/indexer.php
index 0784c6398..868ebd0c9 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -192,6 +192,7 @@ $stats['folder']['update'] = 0;
 $stats['document']['add'] = 0;
 $stats['document']['unchanged'] = 0;
 $stats['document']['update'] = 0;
+$stats['time']['total'] = time();
 $numdocs = $fulltextservice->Indexer()->count();
 $folder = $dms->getFolder($settings->_rootFolderID);
 /* if numdocs is 0, then there is no need to check if a document/folder is already
@@ -201,8 +202,10 @@ tree($dms, $fulltextservice, $folder,'', $numdocs);
 
 $index->commit();
 $index->optimize();
+$stats['time']['total'] = time()-$stats['time']['total'];
 
 echo PHP_EOL;
+echo $themes->black("Total Time: ".$stats['time']['total'].' sec.').PHP_EOL;
 echo $themes->black("Documents").PHP_EOL;
 echo $themes->black("  added: ".$stats['document']['add']).PHP_EOL;
 echo $themes->black("  updated: ".$stats['document']['update']).PHP_EOL;

From 095605f85e20a58f38506c61fcf794ac1cecd2bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 15:33:56 +0100
Subject: [PATCH 1736/2006] add text preview

---
 SeedDMS_Preview/Preview/TxtPreviewer.php | 306 +++++++++++++++++++++++
 1 file changed, 306 insertions(+)
 create mode 100644 SeedDMS_Preview/Preview/TxtPreviewer.php

diff --git a/SeedDMS_Preview/Preview/TxtPreviewer.php b/SeedDMS_Preview/Preview/TxtPreviewer.php
new file mode 100644
index 000000000..7826ff793
--- /dev/null
+++ b/SeedDMS_Preview/Preview/TxtPreviewer.php
@@ -0,0 +1,306 @@
+<?php
+/**
+ * Implementation of text preview documents
+ *
+ * @category   DMS
+ * @package    SeedDMS_Preview
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+
+/**
+ * Class for managing creation of text preview for documents.
+ *
+ * @category   DMS
+ * @package    SeedDMS_Preview
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2011, Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Preview_TxtPreviewer extends SeedDMS_Preview_Base {
+
+	function __construct($previewDir, $timeout=5, $xsendfile=true) { /* {{{ */
+		parent::__construct($previewDir.DIRECTORY_SEPARATOR.'txt', $timeout, $xsendfile);
+		$this->converters = array(
+		);
+	} /* }}} */
+
+	/**
+	 * Return the physical filename of the preview image on disc
+	 * including the path
+	 *
+	 * @param object $object document content or document file
+	 * @return string file name of preview image
+	 */
+	public function getFileName($object) { /* {{{ */
+		if(!$object)
+			return false;
+
+		$document = $object->getDocument();
+		$dms = $document->_dms;
+		$dir = $this->previewDir.DIRECTORY_SEPARATOR.$document->getDir();
+		switch(get_class($object)) {
+			case $dms->getClassname('documentcontent'):
+				$target = $dir.'t'.$object->getVersion();
+				break;
+			default:
+				return false;
+		}
+		return $target;
+	} /* }}} */
+
+	/**
+	 * Check if converter for a given mimetype is set
+	 *
+	 * @param string $mimetype from mimetype
+	 *
+	 * @return boolean true if converter exists, otherwise false
+	 */
+	function hasConverter($from, $to='') { /* {{{ */
+		return parent::hasConverter($from, 'text/plain');
+	} /* }}} */
+
+	/**
+	 * Create a text preview for a given file
+	 *
+	 * This method creates a preview in text format for a regular file
+	 * in the file system and stores the result in the directory $dir relative
+	 * to the configured preview directory. The filename of the resulting preview
+	 * image is either $target.text (if set) or md5($infile).text.
+	 * The $mimetype is used to select the propper conversion programm.
+	 * An already existing text preview is replaced.
+	 *
+	 * @param string $infile name of input file including full path
+	 * @param string $dir directory relative to $this->previewDir
+	 * @param string $mimetype MimeType of input file
+	 * @param string $target optional name of preview image (without extension)
+	 * @return boolean true on success, false on failure
+	 */
+	public function createRawPreview($infile, $dir, $mimetype, $target='') { /* {{{ */
+		if(!self::hasConverter($mimetype))
+			return true;
+
+		if(!$this->previewDir)
+			return false;
+		if(!is_dir($this->previewDir.DIRECTORY_SEPARATOR.$dir)) {
+			if (!SeedDMS_Core_File::makeDir($this->previewDir.DIRECTORY_SEPARATOR.$dir)) {
+				return false;
+			}
+		}
+		if(!file_exists($infile))
+			return false;
+		if(!$target)
+			$target = $this->previewDir.$dir.md5($infile);
+		$this->lastpreviewfile = $target.'.txt';
+		if($target != '' && (!file_exists($target.'.txt') || filectime($target.'.txt') < filectime($infile))) {
+			if($this->conversionmgr) {
+				if(!$this->conversionmgr->convert($infile, $mimetype, 'text/plain', $target.'.txt')) {
+					$this->lastpreviewfile = '';
+					return false;
+				}
+				$new = true;
+			} else {
+				$cmd = '';
+				$mimeparts = explode('/', $mimetype, 2);
+				if(isset($this->converters[$mimetype])) {
+					$cmd = str_replace(array('%f', '%o', '%m'), array($infile, $target.'.txt', $mimetype), $this->converters[$mimetype]);
+				} elseif(isset($this->converters[$mimeparts[0].'/*'])) {
+					$cmd = str_replace(array('%f', '%o', '%m'), array($infile, $target.'.txt', $mimetype), $this->converters[$mimeparts[0].'/*']);
+				} elseif(isset($this->converters['*'])) {
+					$cmd = str_replace(array('%f', '%o', '%m'), array($infile, $target.'.txt', $mimetype), $this->converters['*']);
+				}
+
+				if($cmd) {
+					try {
+						self::execWithTimeout($cmd, $this->timeout);
+						$new = true;
+					} catch(Exception $e) {
+						$this->lastpreviewfile = '';
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		$new = false;
+		return true;
+			
+	} /* }}} */
+
+	/**
+	 * Create preview image
+	 *
+	 * This function creates a preview image for the given document
+	 * content or document file. It internally uses
+	 * {@link SeedDMS_Preview::createRawPreview()}. The filename of the
+	 * preview image is created by {@link SeedDMS_Preview_Previewer::getFileName()}
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean true on success, false on failure
+	 */
+	public function createPreview($object) { /* {{{ */
+		if(!$object)
+			return false;
+
+		$document = $object->getDocument();
+		$file = $document->_dms->contentDir.$object->getPath();
+		$target = $this->getFileName($object);
+		return $this->createRawPreview($file, $document->getDir(), $object->getMimeType(), $target);
+	} /* }}} */
+
+	/**
+	 * Check if a preview image already exists.
+	 *
+	 * This function is a companion to {@link SeedDMS_Preview_Previewer::createRawPreview()}.
+	 *
+	 * @param string $infile name of input file including full path
+	 * @param string $dir directory relative to $this->previewDir
+	 * @return boolean true if preview exists, otherwise false
+	 */
+	public function hasRawPreview($infile, $dir, $target='') { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+		if(!$target)
+			$target = $this->previewDir.$dir.md5($infile);
+		if($target !== false && file_exists($target.'.txt') && filectime($target.'.txt') >= filectime($infile)) {
+			return true;
+		}
+		return false;
+	} /* }}} */
+
+	/**
+	 * Check if a preview txt already exists.
+	 *
+	 * This function is a companion to {@link SeedDMS_Preview_Previewer::createPreview()}.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean true if preview exists, otherwise false
+	 */
+	public function hasPreview($object) { /* {{{ */
+		if(!$object)
+			return false;
+
+		if(!$this->previewDir)
+			return false;
+		$target = $this->getFileName($object);
+		if($target !== false && file_exists($target.'.txt') && filectime($target.'.txt') >= $object->getDate()) {
+			return true;
+		}
+		return false;
+	} /* }}} */
+
+	/**
+	 * Return a preview image.
+	 *
+	 * This function returns the content of a preview image if it exists..
+	 *
+	 * @param string $infile name of input file including full path
+	 * @param string $dir directory relative to $this->previewDir
+	 * @return boolean/string image content if preview exists, otherwise false
+	 */
+	public function getRawPreview($infile, $dir, $target='') { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+
+		if(!$target)
+			$target = $this->previewDir.$dir.md5($infile);
+		if($target && file_exists($target.'.txt')) {
+			$this->sendFile($target.'.txt');
+		}
+	} /* }}} */
+
+	/**
+	 * Return a preview image.
+	 *
+	 * This function returns the content of a preview image if it exists..
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean/string image content if preview exists, otherwise false
+	 */
+	public function getPreview($object) { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+
+		$target = $this->getFileName($object);
+		if($target && file_exists($target.'.txt')) {
+			$this->sendFile($target.'.txt');
+		}
+	} /* }}} */
+
+	/**
+	 * Return file size preview image.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean/integer size of preview image or false if image
+	 * does not exist
+	 */
+	public function getFilesize($object) { /* {{{ */
+		$target = $this->getFileName($object);
+		if($target && file_exists($target.'.txt')) {
+			return(filesize($target.'.txt'));
+		} else {
+			return false;
+		}
+
+	} /* }}} */
+
+	/**
+	 * Delete preview image.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @return boolean true if deletion succeded or false if file does not exist
+	 */
+	public function deletePreview($object) { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+
+		$target = $this->getFileName($object);
+		if($target && file_exists($target.'.txt')) {
+			return(unlink($target.'.txt'));
+		} else {
+			return false;
+		}
+	} /* }}} */
+
+	static function recurseRmdir($dir) {
+		$files = array_diff(scandir($dir), array('.','..'));
+		foreach ($files as $file) {
+			(is_dir("$dir/$file")) ? SeedDMS_Preview_Previewer::recurseRmdir("$dir/$file") : unlink("$dir/$file");
+		}
+		return rmdir($dir);
+	}
+
+	/**
+	 * Delete all preview text belonging to a document
+	 *
+	 * This function removes the preview text of all versions and
+	 * files of a document including the directory. It actually just
+	 * removes the directory for the document in the cache.
+	 *
+	 * @param object $document instance of SeedDMS_Core_Document
+	 * @return boolean true if deletion succeded or false if file does not exist
+	 */
+	public function deleteDocumentPreviews($document) { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+
+		$dir = $this->previewDir.DIRECTORY_SEPARATOR.$document->getDir();
+		if(file_exists($dir) && is_dir($dir)) {
+			return SeedDMS_Preview_Previewer::recurseRmdir($dir);
+		} else {
+			return false;
+		}
+
+	} /* }}} */
+}
+?>

From 627baa5cc8995c61afbbac248847721169f1d245 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 16:15:18 +0100
Subject: [PATCH 1737/2006] add logos to list of extensions

---
 views/bootstrap/class.Info.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Info.php b/views/bootstrap/class.Info.php
index e7623c98a..78350783a 100644
--- a/views/bootstrap/class.Info.php
+++ b/views/bootstrap/class.Info.php
@@ -35,6 +35,7 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
+		$httproot = $settings->_httpRoot;
 		$version = $this->params['version'];
 		$availversions = $this->params['availversions'];
 		$extmgr = $this->params['extmgr'];
@@ -67,16 +68,21 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
 		echo "</th>\n";
 		echo "</tr>\n</thead>\n<tbody>\n";
 		$dbversion = $dms->getDBVersion();
-		echo "<tr><td></td><td>".getMLText('seeddms_version')."</td><td>".$version->version()."</td></tr>\n";
+		echo "<tr><td></td><td></td><td>".getMLText('seeddms_version')."</td><td>".$version->version()."</td></tr>\n";
 		if($user->isAdmin()) {
-			echo "<tr><td><td>".getMLText('database_schema_version')."</td><td>".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."</td></tr>\n";
+			echo "<tr><td></td><td></td><td>".getMLText('database_schema_version')."</td><td>".$dbversion['major'].".".$dbversion['minor'].".".$dbversion['subminor']."</td></tr>\n";
 			foreach($seedextensions as $extname=>$extconf) {
 				echo "<tr><td>";
 				if(!$settings->extensionIsDisabled($extname))
 					echo "<i class=\"fa fa-circle text-success\"></i> ";
 				else
 					echo "<i class=\"fa fa-circle text-danger text-error\"></i> ";
-				echo "</td><td>".$extname."<br />".$extconf['title']."</td><td>".$extconf['version']."</td>";
+				echo "</td>";
+				echo "<td width=\"32\">";
+				if($extconf['icon'])
+					echo "<img width=\"32\" height=\"32\" src=\"".$httproot."ext/".$extname."/".$extconf['icon']."\" alt=\"".$extname."\" title=\"".$extname."\">";
+				echo "</td>";
+				echo "<td>".$extname."<br />".$extconf['title']."</td><td>".$extconf['version']."</td>";
 				echo "</tr>\n";
 			}
 		}

From 8c87816070b7dc699d170c4847736d0b56f4f58d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 16:15:36 +0100
Subject: [PATCH 1738/2006] check if $record_type is set

---
 views/bootstrap/class.Search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 92e5d5e5b..43e8992f1 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -834,8 +834,8 @@ function typeahead() { /* {{{ */
 			}
 			if(!isset($facets['record_type'])) {
 				$options = array();
-				$options[] = array('document', getMLText('document'), in_array('document', $record_type));
-				$options[] = array('folder', getMLText('folder'), in_array('folder', $record_type));
+				$options[] = array('document', getMLText('document'), $record_type && in_array('document', $record_type));
+				$options[] = array('folder', getMLText('folder'), $record_type && in_array('folder', $record_type));
 				$this->formField(
 					getMLText("record_type"),
 					array(

From 330a147533c45cc20959f88f230a3b0816358ec6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 9 Jan 2023 17:45:20 +0100
Subject: [PATCH 1739/2006] update release date and notes

---
 SeedDMS_Lucene/package.xml    | 3 ++-
 SeedDMS_Preview/package.xml   | 2 +-
 SeedDMS_SQLiteFTS/package.xml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index 6b901160b..3ccc53ec9 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,7 +11,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2023-01-03</date>
+ <date>2023-01-09</date>
  <time>08:55:43</time>
  <version>
   <release>1.1.18</release>
@@ -24,6 +24,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - IndexedDocument() accepts a callable for conversion to text
+- SeedDMS_Lucene_Search::open and create return itself but Zend_Search_Lucene
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 4e385c123..cddd83d25 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,7 +11,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2023-01-02</date>
+ <date>2023-01-09</date>
  <time>09:49:39</time>
  <version>
   <release>1.5.0</release>
diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 047d9cae1..3813a6252 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,7 +11,7 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2023-01-03</date>
+ <date>2023-01-09</date>
  <time>08:57:44</time>
  <version>
   <release>1.0.18</release>

From 1d217251c193832868fb567cd1d2785ab6d9327b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 08:10:33 +0100
Subject: [PATCH 1740/2006] add method
 SeedDMS_Core_KeywordCategory::countKeywordLists()

---
 SeedDMS_Core/Core/inc.ClassKeywords.php | 158 +++++++++++++-----------
 1 file changed, 86 insertions(+), 72 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassKeywords.php b/SeedDMS_Core/Core/inc.ClassKeywords.php
index aa11c9dc3..16afc994f 100644
--- a/SeedDMS_Core/Core/inc.ClassKeywords.php
+++ b/SeedDMS_Core/Core/inc.ClassKeywords.php
@@ -8,7 +8,7 @@
  * @version    @version@
  * @author     Uwe Steinmann <uwe@steinmann.cx>
  * @copyright  Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe,
- *             2010 Uwe Steinmann
+ *             2010-2023 Uwe Steinmann
  * @version    Release: @package_version@
  */
 
@@ -19,7 +19,7 @@
  * @package    SeedDMS_Core
  * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
  * @copyright  Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe,
- *             2010 Uwe Steinmann
+ *             2010-2023 Uwe Steinmann
  * @version    Release: @package_version@
  */
 class SeedDMS_Core_KeywordCategory {
@@ -47,53 +47,53 @@ class SeedDMS_Core_KeywordCategory {
 	 */
 	protected $_dms;
 
-    /**
-     * SeedDMS_Core_KeywordCategory constructor.
-     * @param $id
-     * @param $ownerID
-     * @param $name
-     */
-	function __construct($id, $ownerID, $name) {
+	/**
+	 * SeedDMS_Core_KeywordCategory constructor.
+	 * @param $id
+	 * @param $ownerID
+	 * @param $name
+	 */
+	function __construct($id, $ownerID, $name) { /* {{{ */
 		$this->_id = $id;
 		$this->_name = $name;
 		$this->_ownerID = $ownerID;
 		$this->_dms = null;
-	}
+	} /* }}} */
 
-    /**
-     * @param SeedDMS_Core_DMS $dms
-     */
-	function setDMS($dms) {
+	/**
+	 * @param SeedDMS_Core_DMS $dms
+	 */
+	function setDMS($dms) { /* {{{ */
 		$this->_dms = $dms;
-	}
+	} /* }}} */
 
-    /**
-     * @return int
-     */
+	/**
+	 * @return int
+	 */
 	function getID() { return $this->_id; }
 
-    /**
-     * @return string
-     */
+	/**
+	 * @return string
+	 */
 	function getName() { return $this->_name; }
 
-    /**
-     * @return bool|SeedDMS_Core_User
-     */
-	function getOwner() {
+	/**
+	 * @return bool|SeedDMS_Core_User
+	 */
+	function getOwner() { /* {{{ */
 		if (!isset($this->_owner))
 			$this->_owner = $this->_dms->getUser($this->_ownerID);
 		return $this->_owner;
-	}
+	} /* }}} */
 
-    /**
-     * @param $newName
-     * @return bool
-     */
-	function setName($newName) {
-        $newName = trim($newName);
-        if(!$newName)
-            return false;
+	/**
+	 * @param $newName
+	 * @return bool
+	 */
+	function setName($newName) { /* {{{ */
+		$newName = trim($newName);
+		if(!$newName)
+			return false;
 
 		$db = $this->_dms->getDB();
 
@@ -103,75 +103,89 @@ class SeedDMS_Core_KeywordCategory {
 
 		$this->_name = $newName;
 		return true;
-	}
+	} /* }}} */
 
-    /**
-     * @param SeedDMS_Core_User $user
-     * @return bool
-     */
-    function setOwner($user) {
-        if(!$user || !$user->isType('user'))
-            return false;
+	/**
+	 * @param SeedDMS_Core_User $user
+	 * @return bool
+	 */
+	function setOwner($user) { /* {{{ */
+		if(!$user || !$user->isType('user'))
+			return false;
 
 		$db = $this->_dms->getDB();
 
-        $queryStr = "UPDATE `tblKeywordCategories` SET `owner` = " . $user->getID() . " WHERE `id` = " . $this->_id;
+		$queryStr = "UPDATE `tblKeywordCategories` SET `owner` = " . $user->getID() . " WHERE `id` = " . $this->_id;
 		if (!$db->getResult($queryStr))
 			return false;
 
 		$this->_ownerID = $user->getID();
 		$this->_owner = $user;
 		return true;
-	}
+	} /* }}} */
 
-    /**
-     * @return array
-     */
-	function getKeywordLists() {
+	/**
+	 * @return array keywords in this list
+	 */
+	function getKeywordLists() { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "SELECT * FROM `tblKeywords` WHERE `category` = " . $this->_id . " order by `keywords`";
 		return $db->getResultArray($queryStr);
 	}
 
-    /**
-     * @param $listID
-     * @param $keywords
-     * @return bool
-     */
-	function editKeywordList($listID, $keywords) {
+	/**
+	 * @return integer number of keywords in this list
+	 */
+	function countKeywordLists() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "SELECT COUNT(*) as `c` FROM `tblKeywords` where `category`=".$this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+
+		return $resArr[0]['c'];
+	} /* }}} */
+
+	/**
+	 * @param $listID
+	 * @param $keywords
+	 * @return bool
+	 */
+	function editKeywordList($listID, $keywords) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "UPDATE `tblKeywords` SET `keywords` = ".$db->qstr($keywords)." WHERE `id` = $listID";
 		return $db->getResult($queryStr);
-	}
+	} /* }}} */
 
-    /**
-     * @param $keywords
-     * @return bool
-     */
-	function addKeywordList($keywords) {
+	/**
+	 * @param $keywords
+	 * @return bool
+	 */
+	function addKeywordList($keywords) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "INSERT INTO `tblKeywords` (`category`, `keywords`) VALUES (" . $this->_id . ", ".$db->qstr($keywords).")";
 		return $db->getResult($queryStr);
-	}
+	} /* }}} */
 
-    /**
-     * @param $listID
-     * @return bool
-     */
-	function removeKeywordList($listID) {
+	/**
+	 * @param $listID
+	 * @return bool
+	 */
+	function removeKeywordList($listID) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$queryStr = "DELETE FROM `tblKeywords` WHERE `id` = $listID";
 		return $db->getResult($queryStr);
-	}
+	} /* }}} */
 
-    /**
-     * @return bool
-     */
-	function remove() {
+	/**
+	 * @return bool
+	 */
+	function remove() { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$db->startTransaction();
@@ -189,5 +203,5 @@ class SeedDMS_Core_KeywordCategory {
 
 		$db->commitTransaction();
 		return true;
-	}
+	} /* }}} */
 }

From da4aafff8697dd2fad4739f2dade4e14639b5fb6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 08:10:51 +0100
Subject: [PATCH 1741/2006] add more notes for 5.1.29

---
 SeedDMS_Core/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 6cfa5d734..046973024 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -26,8 +26,8 @@
  <notes>
 - SeedDMS_Core_Folder::addDocument() does rollback transaction propperly when setting document categories fail
 - add $skiproot and $sep parameter to SeedDMS_Core_Folder::getFolderPathPlain()
-- turn off auto commit for mysql
 - add class name for 'documentfile'
+- add method SeedDMS_Core_KeywordCategory::countKeywordLists()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From 913baaa7ce649c4caf3a2a2c75f0eaa4cb22b627 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 08:11:24 +0100
Subject: [PATCH 1742/2006] show number of documents per category in select
 menu

---
 views/bootstrap/class.Categories.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index 639e73125..35f775cca 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -155,7 +155,7 @@ $(document).ready( function() {
 		$options[] = array("-1", getMLText("choose_category"));
 		$options[] = array("0", getMLText("new_document_category"));
 		foreach ($categories as $category) {
-			$options[] = array($category->getID(), htmlspecialchars($category->getName()), $selcat && $category->getID()==$selcat->getID());
+			$options[] = array($category->getID(), htmlspecialchars($category->getName()), $selcat && $category->getID()==$selcat->getID(), array(array('data-subtitle', $category->countDocumentsByCategory().' '.getMLText('documents'))));
 		}
 		$this->formField(
 			null, //getMLText("selection"),

From cc144f6c0f6a3d5a6748ead1c1c6bd46043cff4b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 08:11:52 +0100
Subject: [PATCH 1743/2006] show number of keywords per category in select menu

---
 views/bootstrap/class.DefaultKeywords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index f21846d08..1fdfd3313 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -221,7 +221,7 @@ $(document).ready( function() {
 		foreach ($categories as $category) {
 			$owner = $category->getOwner();
 			if ($user->isAdmin() || ($owner->getID() == $user->getID()))
-				$options[] = array($category->getID(), htmlspecialchars($category->getName()), $selcategory && $category->getID()==$selcategory->getID());
+				$options[] = array($category->getID(), htmlspecialchars($category->getName()), $selcategory && $category->getID()==$selcategory->getID(), array(array('data-subtitle', $category->countKeywordLists().' '.getMLText('keywords'))));
 		}
 		$this->formField(
 			null, //getMLText("selection"),

From acd96034d84cc83c49cd3755076437a0569a9fdd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 08:12:06 +0100
Subject: [PATCH 1744/2006] add changes of 5.1.29

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 2d6d1645d..8c795065d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,9 @@
 - introduce authentication service
 - new hook in restapi to add middleware
 - previews for png, txt, pdf in different directories
+- various improvements of fulltext service
+- show number of documents per category in category manager
+- show number of keywords per category in keyword manager
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.28

From 244a5da6d8dcaaf4a897cd9a80c352107798e13b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 15:42:50 +0100
Subject: [PATCH 1745/2006] get logger

---
 controllers/class.Cron.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/controllers/class.Cron.php b/controllers/class.Cron.php
index 0ea71e76b..135a227dc 100644
--- a/controllers/class.Cron.php
+++ b/controllers/class.Cron.php
@@ -26,6 +26,7 @@ class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
+		$logger = $this->params['logger'];
 		$mode = $this->params['mode'];
 		$db = $dms->getDb();
 

From 41b2ae91e1cda34c9a6f79445b1a56f54adcefda Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 15:43:06 +0100
Subject: [PATCH 1746/2006] use authenticator

---
 inc/inc.BasicAuthentication.php | 42 +--------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/inc/inc.BasicAuthentication.php b/inc/inc.BasicAuthentication.php
index 37f4cf8c4..8d9a69bdb 100644
--- a/inc/inc.BasicAuthentication.php
+++ b/inc/inc.BasicAuthentication.php
@@ -18,53 +18,13 @@ require_once("inc.ClassEmailNotify.php");
 require_once("inc.ClassSession.php");
 require_once("inc.ClassAccessOperation.php");
 
-function __authenticate($username, $password) { /* {{{ */
-	global $dms, $settings;
-
-	$user = false;
-
-	/* Authenticate against LDAP server {{{ */
-	if (!$user && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
-		require_once("../inc/inc.ClassLdapAuthentication.php");
-		$authobj = new SeedDMS_LdapAuthentication($dms, $settings);
-		$user = $authobj->authenticate($username, $password);
-	} /* }}} */
-
-	/* Authenticate against SeedDMS database {{{ */
-	else {
-		require_once("../inc/inc.ClassDbAuthentication.php");
-		$authobj = new SeedDMS_DbAuthentication($dms, $settings);
-		$user = $authobj->authenticate($username, $password);
-	} /* }}} */
-
-	if (!$user) {
-		return false;
-	}
-
-	if (($user->getID() == $settings->_guestID) && (!$settings->_enableGuestLogin)) {
-		return false;
-	}
-
-	// Check if account is disabled
-	if($user->isDisabled()) {
-		return false;
-	}
-
-	// control admin IP address if required
-	if ($user->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $settings->_adminIP != "") ){
-		return false;
-	}
-
-	return $user;
-} /* }}} */
-
 if (!isset($_SERVER['PHP_AUTH_USER'])) {
 	header('WWW-Authenticate: Basic realm="'.$settings->_siteName.'"');
 	header('HTTP/1.0 401 Unauthorized');
 	echo getMLText('cancel_basic_authentication');
 	exit;
 } else {
-	if(!($user = __authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']))) {
+	if(!($user = $authenticator->authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']))) {
 		header('WWW-Authenticate: Basic realm="'.$settings->_siteName.'"');
 		header('HTTP/1.0 401 Unauthorized');
 		echo getMLText('cancel_basic_authentication');

From aa733c75313b3334538fc26abd8ec443ff60eef9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 15:43:37 +0100
Subject: [PATCH 1747/2006] pass logger to controller, fix including php files

---
 op/op.Cron.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/op/op.Cron.php b/op/op.Cron.php
index ac05baacc..3ecd68d2e 100644
--- a/op/op.Cron.php
+++ b/op/op.Cron.php
@@ -19,16 +19,16 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
-include("../inc/inc.Language.php");
-include("../inc/inc.Utils.php");
-include("../inc/inc.Init.php");
-include("../inc/inc.Extension.php");
-include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassController.php");
-include("../inc/inc.Scheduler.php");
-include("../inc/inc.BasicAuthentication.php");
+require_once("../inc/inc.Settings.php");
+require_once("../inc/inc.Utils.php");
+require_once("../inc/inc.LogInit.php");
+require_once("../inc/inc.Language.php");
+require_once("../inc/inc.Init.php");
+require_once("../inc/inc.Extension.php");
+require_once("../inc/inc.DBInit.php");
+require_once("../inc/inc.ClassController.php");
+require_once("../inc/inc.Scheduler.php");
+require_once("../inc/inc.BasicAuthentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
@@ -44,6 +44,7 @@ if(!empty($_GET['mode']) && in_array($_GET['mode'], array('list', 'run', 'dryrun
 	$mode = $_GET['mode'];
 
 $controller->setParam('settings', $settings);
+$controller->setParam('logger', $logger);
 $controller->setParam('mode', $mode);
 if(!$controller->run()) {
 	echo getMLText("error_occured");

From 6d6bbca94b6e1607717971f9d5fcb1862c99d5a0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 15:44:09 +0100
Subject: [PATCH 1748/2006] set placeholder of task frequency

---
 views/bootstrap/class.SchedulerTaskMgr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 12577128f..64ec3706b 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -351,6 +351,7 @@ $(document).ready( function() {
 				'name'=>'frequency',
 				'value'=>$task->getFrequency(),
 				'required'=>true,
+				'placeholder'=>getMLText('task_frequency_placeholder'),
 			)
 		);
 		$this->formField(

From 328cbd9eb92e3f00cbfe4f282f1b81d0f16efcb0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 15:44:30 +0100
Subject: [PATCH 1749/2006] fix indexing documents

---
 inc/inc.Tasks.php | 103 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 75 insertions(+), 28 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index f198808c3..50418cbc6 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -125,17 +125,33 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 
 	protected $fulltextservice;
 
-	public function __construct($scheduler, $fulltextservice, $forceupdate) { /* {{{ */
+	protected $logger;
+
+	protected $dacount;
+
+	protected $facount;
+
+	protected $ducount;
+
+	protected $fucount;
+
+	public function __construct($scheduler, $fulltextservice, $forceupdate, $logger) { /* {{{ */
 		$this->scheduler = $scheduler;
 		$this->fulltextservice = $fulltextservice;
+		$this->logger = $logger;
 		$this->forceupdate = $forceupdate;
 		$this->numdocs = $this->fulltextservice->Indexer()->count();
+		$this->dacount = 0;
+		$this->facount = 0;
+		$this->ducount = 0;
+		$this->fucount = 0;
 	} /* }}} */
 
 	public function process($folder, $depth=0) { /* {{{ */
 		$lucenesearch = $this->fulltextservice->Search();
 		$documents = $folder->getDocuments();
-		echo str_repeat('  ', $depth+1).$folder->getId().":".$folder->getFolderPathPlain()." ";
+		$logger = $this->logger;
+//		echo str_repeat('  ', $depth+1).$folder->getId().":".$folder->getFolderPathPlain()." ";
 		if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
 			try {
 				$idoc = $this->fulltextservice->IndexedDocument($folder, true);
@@ -149,12 +165,16 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 						}
 					}
 					$this->fulltextservice->Indexer()->addDocument($idoc);
-					echo "(".getMLText('index_folder_added').")".PHP_EOL;
+//					echo "(".getMLText('index_folder_added').")".PHP_EOL;
+					$logger->log('Task \'indexingdocs\': folder '.$folder->getId().' added', PEAR_LOG_INFO);
+					$this->facount++;
 				} else {
-					echo "(".$error.")".PHP_EOL;
+//					echo "(".$error.")".PHP_EOL;
+					$logger->log('Task \'indexingdocs\': adding folder '.$folder->getId().' failed', PEAR_LOG_ERR);
 				}
 			} catch(Exception $e) {
-				echo "(Timeout)".PHP_EOL;
+//				echo "(Timeout)".PHP_EOL;
+				$logger->log('Task \'indexingdocs\': adding folder '.$folder->getId().' failed', PEAR_LOG_ERR);
 			}
 		} else {
 			/* Check if the attribute indexed is set or has a value older
@@ -168,7 +188,7 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 				$indexed = 0;
 			}
 			if($indexed >= $folder->getDate() && !$this->forceupdate) {
-				echo "(".getMLText('index_folder_unchanged').")".PHP_EOL;
+//				echo "(".getMLText('index_folder_unchanged').")".PHP_EOL;
 			} else {
 				$this->fulltextservice->Indexer()->delete($hit->id);
 				try {
@@ -183,18 +203,22 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 							}
 						}
 						$this->fulltextservice->Indexer()->addDocument($idoc);
-						echo "(".getMLText('index_folder_updated').")".PHP_EOL;
+//						echo "(".getMLText('index_folder_updated').")".PHP_EOL;
+						$logger->log('Task \'indexingdocs\': folder '.$folder->getId().' updated', PEAR_LOG_INFO);
+						$this->fucount++;
 					} else {
-						echo "(".$error.")".PHP_EOL;
+//						echo "(".$error.")".PHP_EOL;
+						$logger->log('Task \'indexingdocs\': updating folder '.$folder->getId().' failed', PEAR_LOG_ERR);
 					}
 				} catch(Exception $e) {
-					echo "(Timeout)".PHP_EOL;
+//					echo "(Timeout)".PHP_EOL;
+					$logger->log('Task \'indexingdocs\': updating folder '.$folder->getId().' failed. '.$e->getMessage(), PEAR_LOG_ERR);
 				}
 			}
 		}
 		if($documents) {
 			foreach($documents as $document) {
-				echo str_repeat('  ', $depth+2).$document->getId().":".$document->getName()." ";
+//				echo str_repeat('  ', $depth+2).$document->getId().":".$document->getName()." ";
 				/* If the document wasn't indexed before then just add it */
 				if(($this->numdocs == 0) || !($hit = $lucenesearch->getDocument($document->getId()))) {
 					try {
@@ -206,10 +230,16 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 								}
 							}
 						}
-						$this->fulltextservice->Indexer()->addDocument($idoc);
-						echo "(".getMLText('index_document_added').")".PHP_EOL;
+						if($this->fulltextservice->Indexer()->addDocument($idoc)) {
+//						echo "(".getMLText('index_document_added').")".PHP_EOL;
+							$logger->log('Task \'indexingdocs\': document '.$document->getId().' added', PEAR_LOG_INFO);
+						} else {
+							$logger->log('Task \'indexingdocs\': adding document '.$document->getId().' failed', PEAR_LOG_ERR);
+						}
+						$this->dacount++;
 					} catch(Exception $e) {
-						echo "(Timeout)".PHP_EOL;
+//						echo "(Timeout)".PHP_EOL;
+						$logger->log('Task \'indexingdocs\': adding document '.$document->getId().' failed. '.$e->getMessage(), PEAR_LOG_ERR);
 					}
 				} else {
 					/* Check if the attribute indexed is set or has a value older
@@ -223,29 +253,44 @@ class SeedDMS_Task_Indexer_Process_Folder { /* {{{ */
 						$indexed = 0;
 					}
 					$content = $document->getLatestContent();
-					if($indexed >= $content->getDate() && !$this->forceupdate) {
-						echo "(".getMLText('index_document_unchanged').")".PHP_EOL;
-					} else {
-						$this->fulltextservice->Indexer()->delete($hit->id);
-						try {
-							$idoc = $this->fulltextservice->IndexedDocument($document, true);
-							if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
-								foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
-									if (method_exists($hookObj, 'preIndexDocument')) {
-										$hookObj->preIndexDocument(null, $document, $idoc);
+					if($content) {
+						if($indexed >= $content->getDate() && !$this->forceupdate) {
+//							echo "(".getMLText('index_document_unchanged').")".PHP_EOL;
+						} else {
+							$this->fulltextservice->Indexer()->delete($hit->id);
+							try {
+								$idoc = $this->fulltextservice->IndexedDocument($document, true);
+								if(isset($GLOBALS['SEEDDMS_HOOKS']['indexDocument'])) {
+									foreach($GLOBALS['SEEDDMS_HOOKS']['indexDocument'] as $hookObj) {
+										if (method_exists($hookObj, 'preIndexDocument')) {
+											$hookObj->preIndexDocument(null, $document, $idoc);
+										}
 									}
 								}
+								if($this->fulltextservice->Indexer()->addDocument($idoc)) {
+//								echo "(".getMLText('index_document_updated').")".PHP_EOL;
+									$logger->log('Task \'indexingdocs\': document '.$document->getId().' updated', PEAR_LOG_INFO);
+								} else {
+									$logger->log('Task \'indexingdocs\': updating document '.$document->getId().' failed', PEAR_LOG_ERR);
+								}
+								$this->ducount++;
+							} catch(Exception $e) {
+//								echo "(Timeout)".PHP_EOL;
+								$logger->log('Task \'indexingdocs\': updating document '.$document->getId().' failed', PEAR_LOG_ERR);
 							}
-							$this->fulltextservice->Indexer()->addDocument($idoc);
-							echo "(".getMLText('index_document_updated').")".PHP_EOL;
-						} catch(Exception $e) {
-							echo "(Timeout)".PHP_EOL;
 						}
+					} else {
+//						echo "(Missing content)".PHP_EOL;
+						$logger->log('Task \'indexingdocs\': document '.$document->getId().' misses content', PEAR_LOG_ERR);
 					}
 				}
 			}
 		}
 	} /* }}} */
+
+	public function statistics() {
+		return array('folder'=>array('add'=>$this->facount, 'update'=>$this->fucount), 'document'=>array('add'=>$this->dacount, 'update'=>$this->ducount));
+	}
 } /* }}} */
 
 /**
@@ -287,9 +332,11 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 				}
 			}
 
-			$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($this, $fulltextservice, $recreate);
+			$folderprocess = new SeedDMS_Task_Indexer_Process_Folder($this, $fulltextservice, $recreate, $logger);
 			call_user_func(array($folderprocess, 'process'), $folder, -1);
 			$tree = new SeedDMS_FolderTree($folder, array($folderprocess, 'process'));
+			$stat = $folderprocess->statistics();
+			$logger->log('Task \'indexingdocs\': '.$stat['folder']['add'].' folders added, '.$stat['folder']['update'].' folders updated, '.$stat['document']['add'].' documents added, '.$stat['document']['update'].' documents updated', PEAR_LOG_INFO);
 		} else {
 			$logger->log('Task \'indexingdocs\': fulltext search is turned off', PEAR_LOG_WARNING);
 		}

From 28f16a5da53cc1934bb218fcb93c9007060cc976 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 16:27:17 +0100
Subject: [PATCH 1750/2006] check field 'indexed', count errors

---
 utils/indexer.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/utils/indexer.php b/utils/indexer.php
index 868ebd0c9..d04fcf1f1 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -89,15 +89,16 @@ function tree($dms, $fulltextservice, $folder, $indent='', $numdocs) { /* {{{ */
 			echo $prefix.$themes->green(" (Folder added)").PHP_EOL;
 			$stats['folder']['add']++;
 		} catch(Exception $e) {
+			$stats['folder']['error']++;
 			echo $prefix.$themes->error(" (Timeout)").PHP_EOL;
 		}
 	} else {
 		try {
-			$created = (int) $hit->getDocument()->getFieldValue('created');
+			$indexed = (int) $hit->getDocument()->getFieldValue('indexed');
 		} catch (Exception $e) {
-			$created = 0;
+			$indexed = 0;
 		}
-		if($created >= $folder->getDate()) {
+		if($indexed >= $folder->getDate()) {
 			if($config['verbosity'] >= 3)
 				echo $prefix.$themes->italic(" (Folder unchanged)").PHP_EOL;
 			$stats['folder']['unchanged']++;
@@ -116,6 +117,7 @@ function tree($dms, $fulltextservice, $folder, $indent='', $numdocs) { /* {{{ */
 				echo $prefix.$themes->green(" (Folder updated)").PHP_EOL;
 				$stats['folder']['update']++;
 			} catch(Exception $e) {
+				$stats['folder']['error']++;
 				echo $prefix.$themes->error(" (Timeout)").PHP_EOL;
 			}
 		}
@@ -143,16 +145,17 @@ function tree($dms, $fulltextservice, $folder, $indent='', $numdocs) { /* {{{ */
 				echo $prefix.$themes->green(" (Document added)").PHP_EOL;
 				$stats['document']['add']++;
 			} catch(Exception $e) {
+				$stats['document']['error']++;
 				echo $prefix.$themes->error(" (Timeout)").PHP_EOL;
 			}
 		} else {
 			try {
-				$created = (int) $hit->getDocument()->getFieldValue('created');
+				$indexed = (int) $hit->getDocument()->getFieldValue('indexed');
 			} catch (Exception $e) {
-				$created = 0;
+				$indexed = 0;
 			}
 			$content = $document->getLatestContent();
-			if($created >= $content->getDate()) {
+			if($indexed >= $content->getDate()) {
 				if($config['verbosity'] >= 3)
 					echo $prefix.$themes->italic(" (Document unchanged)").PHP_EOL;
 				$stats['document']['unchanged']++;
@@ -171,6 +174,7 @@ function tree($dms, $fulltextservice, $folder, $indent='', $numdocs) { /* {{{ */
 					echo $prefix.$themes->green(" (Document updated)").PHP_EOL;
 					$stats['document']['update']++;
 				} catch(Exception $e) {
+					$stats['document']['error']++;
 					echo $prefix.$themes->error(" (Timeout)").PHP_EOL;
 				}
 			}
@@ -189,9 +193,11 @@ if(!$index) {
 $stats['folder']['add'] = 0;
 $stats['folder']['unchanged'] = 0;
 $stats['folder']['update'] = 0;
+$stats['folder']['error'] = 0;
 $stats['document']['add'] = 0;
 $stats['document']['unchanged'] = 0;
 $stats['document']['update'] = 0;
+$stats['document']['error'] = 0;
 $stats['time']['total'] = time();
 $numdocs = $fulltextservice->Indexer()->count();
 $folder = $dms->getFolder($settings->_rootFolderID);
@@ -210,7 +216,9 @@ echo $themes->black("Documents").PHP_EOL;
 echo $themes->black("  added: ".$stats['document']['add']).PHP_EOL;
 echo $themes->black("  updated: ".$stats['document']['update']).PHP_EOL;
 echo $themes->black("  unchanged: ".$stats['document']['unchanged']).PHP_EOL;
+echo $themes->black("  error: ".$stats['document']['error']).PHP_EOL;
 echo $themes->black("Folders").PHP_EOL;
 echo $themes->black("  added: ".$stats['folder']['add']).PHP_EOL;
 echo $themes->black("  updated: ".$stats['folder']['update']).PHP_EOL;
 echo $themes->black("  unchanged: ".$stats['folder']['unchanged']).PHP_EOL;
+echo $themes->black("  error: ".$stats['folder']['error']).PHP_EOL;

From 7531afca4b08d3d8c77b017e002bea28b8da72bd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 18:33:23 +0100
Subject: [PATCH 1751/2006] do not set user in view

---
 out/out.OpensearchDesc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.OpensearchDesc.php b/out/out.OpensearchDesc.php
index 246f80ea7..1055d87dd 100644
--- a/out/out.OpensearchDesc.php
+++ b/out/out.OpensearchDesc.php
@@ -32,7 +32,7 @@ require_once("inc/inc.ClassAccessOperation.php");
 //require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=null));
 if($view) {
 	$view($_GET);
 	exit;

From fa683ba65f2435d743a0e3b73191936349037fc9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 20:39:42 +0100
Subject: [PATCH 1752/2006] set separator between categories to '#'

---
 SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php | 2 +-
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index 6ab17c461..1bb3a32f0 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -169,7 +169,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 				foreach($categories as $cat) {
 					$names[] = $cat->getName();
 				}
-				$this->addField(SeedDMS_SQLiteFTS_Field::Text('category', implode(' ', $names)));
+				$this->addField(SeedDMS_SQLiteFTS_Field::Text('category', implode('#', $names)));
 			}
 			if($keywords = $document->getKeywords()) {
 				$this->addField(SeedDMS_SQLiteFTS_Field::Text('keywords', $keywords));
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index ed86ce32e..addb700ea 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -238,7 +238,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 			foreach($res as $row) {
 				if($row[$facetname] && $row['c']) {
 					if($facetname == 'category') {
-						$tmp = explode(' ', $row[$facetname]);
+						$tmp = explode('#', $row[$facetname]);
 						if(count($tmp) > 1) {
 							foreach($tmp as $t) {
 								if(!isset($facets[$facetname][$t]))

From 824742b5bb2fa7ffe440082ff81de7896fa2bb94 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 10 Jan 2023 20:39:42 +0100
Subject: [PATCH 1753/2006] set separator between categories to '#'

---
 SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php | 2 +-
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index 6ab17c461..1bb3a32f0 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -169,7 +169,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 				foreach($categories as $cat) {
 					$names[] = $cat->getName();
 				}
-				$this->addField(SeedDMS_SQLiteFTS_Field::Text('category', implode(' ', $names)));
+				$this->addField(SeedDMS_SQLiteFTS_Field::Text('category', implode('#', $names)));
 			}
 			if($keywords = $document->getKeywords()) {
 				$this->addField(SeedDMS_SQLiteFTS_Field::Text('keywords', $keywords));
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index ed86ce32e..addb700ea 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -238,7 +238,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 			foreach($res as $row) {
 				if($row[$facetname] && $row['c']) {
 					if($facetname == 'category') {
-						$tmp = explode(' ', $row[$facetname]);
+						$tmp = explode('#', $row[$facetname]);
 						if(count($tmp) > 1) {
 							foreach($tmp as $t) {
 								if(!isset($facets[$facetname][$t]))

From f2381dca729f72cfb54efbd2503533208ff161b2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Jan 2023 11:57:58 +0100
Subject: [PATCH 1754/2006] owner wasn't handled propperly

---
 SeedDMS_Lucene/Lucene/Search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Lucene/Lucene/Search.php b/SeedDMS_Lucene/Lucene/Search.php
index 6f53ee9ea..38827a02b 100644
--- a/SeedDMS_Lucene/Lucene/Search.php
+++ b/SeedDMS_Lucene/Lucene/Search.php
@@ -77,10 +77,10 @@ class SeedDMS_Lucene_Search {
 			$querystr = substr($term, -1) != '*' ? $term.'*' : $term;
 		}
 		if(!empty($fields['owner'])) {
-			if(is_string($owner)) {
+			if(is_string($fields['owner'])) {
 				if($querystr)
 					$querystr .= ' && ';
-				$querystr .= 'owner:'.$owner;
+				$querystr .= 'owner:'.$fields['owner'];
 			} elseif(is_array($fields['owner'])) {
 				if($querystr)
 					$querystr .= ' && ';

From 69a70242b06f527bf7126acd19ba37dcbc021ebc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Jan 2023 11:58:15 +0100
Subject: [PATCH 1755/2006] move record type further up in form

---
 views/bootstrap/class.Search.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 43e8992f1..9f919b609 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -785,6 +785,22 @@ function typeahead() { /* {{{ */
 					)
 				);
 			}
+			if(!isset($facets['record_type'])) {
+				$options = array();
+				$options[] = array('document', getMLText('document'), $record_type && in_array('document', $record_type));
+				$options[] = array('folder', getMLText('folder'), $record_type && in_array('folder', $record_type));
+				$this->formField(
+					getMLText("record_type"),
+					array(
+						'element'=>'select',
+						'class'=>'chzn-select',
+						'name'=>'record_type[]',
+						'multiple'=>true,
+						'attributes'=>array(array('data-placeholder', getMLText('select_record_type'))),
+						'options'=>$options
+					)
+				);
+			}
 			if(!isset($facets['category'])) {
 				$tmpcatids = array();
 				foreach($categories as $tmpcat)
@@ -832,22 +848,6 @@ function typeahead() { /* {{{ */
 					)
 				);
 			}
-			if(!isset($facets['record_type'])) {
-				$options = array();
-				$options[] = array('document', getMLText('document'), $record_type && in_array('document', $record_type));
-				$options[] = array('folder', getMLText('folder'), $record_type && in_array('folder', $record_type));
-				$this->formField(
-					getMLText("record_type"),
-					array(
-						'element'=>'select',
-						'class'=>'chzn-select',
-						'name'=>'record_type[]',
-						'multiple'=>true,
-						'attributes'=>array(array('data-placeholder', getMLText('select_record_type'))),
-						'options'=>$options
-					)
-				);
-			}
 
 			if($facets) {
 				foreach($facets as $facetname=>$values) {

From e42af89bcf98ed387760b1b93c0033a4fbe3afdf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Jan 2023 13:26:12 +0100
Subject: [PATCH 1756/2006] fix indenting

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Document.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php
index ea63d733e..7b299a9a0 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php
@@ -111,7 +111,7 @@ class SeedDMS_SQLiteFTS_Document {
 	 * @return string
 	 */
 	public function getFieldValue($fieldName) {
-			return $this->getField($fieldName)->value;
+		return $this->getField($fieldName)->value;
 	}
 }
 ?>

From b1d6cc13579f1df6a6fdb2166a4bd6d4856fbb35 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Jan 2023 13:26:52 +0100
Subject: [PATCH 1757/2006] return 'status' as facet, get path as array of
 folder ids

---
 SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
index addb700ea..559b93bc4 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Indexer.php
@@ -219,7 +219,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 			return false;
 
 		/* First count some records for facets */
-		foreach(array('owner', 'mimetype', 'category') as $facetname) {
+		foreach(array('owner', 'mimetype', 'category', 'status') as $facetname) {
 			$sql = "SELECT `".$facetname."`, count(*) AS `c` FROM `docs`";
 			if($query) {
 				$sql .= " WHERE docs MATCH ".$this->_conn->quote($query);
@@ -252,6 +252,8 @@ class SeedDMS_SQLiteFTS_Indexer {
 							else
 								$facets[$facetname][$row[$facetname]] += $row['c'];
 						}
+					} elseif($facetname == 'status') {
+						$facets[$facetname][($row[$facetname]-10).''] = $row['c'];
 					} else
 						$facets[$facetname][$row[$facetname]] = $row['c'];
 				}
@@ -379,7 +381,7 @@ class SeedDMS_SQLiteFTS_Indexer {
 			$doc->addField(SeedDMS_SQLiteFTS_Field::Keyword('indexed', $rec['indexed']));
 			$doc->addField(SeedDMS_SQLiteFTS_Field::Text('users', $rec['users']));
 			$doc->addField(SeedDMS_SQLiteFTS_Field::Keyword('status', $rec['status']));
-			$doc->addField(SeedDMS_SQLiteFTS_Field::Keyword('path', $rec['path']));
+			$doc->addField(SeedDMS_SQLiteFTS_Field::Keyword('path', explode('x', substr($rec['path'], 1, -1))));
 			if($content)
 				$doc->addField(SeedDMS_SQLiteFTS_Field::UnStored('content', $rec['content']));
 		}

From 795b0e08d34f1ae85b4b6c77a161a32b3b39370f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Jan 2023 06:46:00 +0100
Subject: [PATCH 1758/2006] add rule to provide auth info if php is run in fpm
 mode

---
 op/.htaccess | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/op/.htaccess b/op/.htaccess
index 85718b048..deb356312 100644
--- a/op/.htaccess
+++ b/op/.htaccess
@@ -1,3 +1,4 @@
-RewriteEngine on
-RewriteCond %{REQUEST_URI} (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$
-RewriteRule (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$ $1op.ViewOnline.php?request=$2:$3 [PT]
+RewriteEngine on
+RewriteCond %{REQUEST_URI} (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$
+RewriteRule (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$ $1op.ViewOnline.php?request=$2:$3 [PT]
+RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]

From cf8209414971b1ff5852baa8f8144cd35a2231d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Jan 2023 06:46:00 +0100
Subject: [PATCH 1759/2006] add rule to provide auth info if php is run in fpm
 mode

---
 op/.htaccess | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/op/.htaccess b/op/.htaccess
index 85718b048..deb356312 100644
--- a/op/.htaccess
+++ b/op/.htaccess
@@ -1,3 +1,4 @@
-RewriteEngine on
-RewriteCond %{REQUEST_URI} (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$
-RewriteRule (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$ $1op.ViewOnline.php?request=$2:$3 [PT]
+RewriteEngine on
+RewriteCond %{REQUEST_URI} (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$
+RewriteRule (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$ $1op.ViewOnline.php?request=$2:$3 [PT]
+RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]

From c77938cd11e74cbbf9f33ddb9f2a53e7e2e65a90 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Jan 2023 13:51:44 +0100
Subject: [PATCH 1760/2006] add extra content in document list row after last
 column

---
 views/bootstrap/class.Bootstrap.php   | 5 +++++
 views/bootstrap4/class.Bootstrap4.php | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 035e390e0..7d52d926e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -3172,6 +3172,11 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			$content .= "<td>";
 			$content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent);
 			$content .= "</td>";
+			if(!empty($extracontent['columns_last'])) {
+				foreach($extracontent['columns_last'] as $col)
+					$content .= '<td>'.$col.'</td>';
+			}
+
 			if(!$skipcont)
 				$content .= $this->documentListRowEnd($document);
 		}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 1bf5b646d..2c7a509f6 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -3250,6 +3250,11 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			$content .= "<td>";
 			$content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent);
 			$content .= "</td>";
+			if(!empty($extracontent['columns_last'])) {
+				foreach($extracontent['columns_last'] as $col)
+					$content .= '<td>'.$col.'</td>';
+			}
+
 			if(!$skipcont)
 				$content .= $this->documentListRowEnd($document);
 		}

From cafc50ca4b5a1179ba08960f766584f36d0cb875 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Jan 2023 21:21:41 +0100
Subject: [PATCH 1761/2006] pass logger to hooks

---
 inc/inc.DBInit.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index 7c1eff742..9949c5e9f 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -21,7 +21,7 @@
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDB'] as $hookObj) {
 		if (method_exists($hookObj, 'pretInitDB')) {
-			$hookObj->preInitDB(array('settings'=>$settings));
+			$hookObj->preInitDB(array('settings'=>$settings, 'logger'=>$logger));
 		}
 	}
 }
@@ -32,7 +32,7 @@ $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostn
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDB'] as $hookObj) {
 		if (method_exists($hookObj, 'postInitDB')) {
-			$hookObj->postInitDB(array('db'=>$db, 'settings'=>$settings));
+			$hookObj->postInitDB(array('db'=>$db, 'settings'=>$settings, 'logger'=>$logger));
 		}
 	}
 }
@@ -40,7 +40,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) {
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
 		if (method_exists($hookObj, 'pretInitDMS')) {
-			$hookObj->preInitDMS(array('db'=>$db, 'settings'=>$settings));
+			$hookObj->preInitDMS(array('db'=>$db, 'settings'=>$settings, 'logger'=>$logger));
 		}
 	}
 }
@@ -61,7 +61,7 @@ $dms->setMaxDirID($settings->_maxDirID);
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
 		if (method_exists($hookObj, 'postInitDMS')) {
-			$hookObj->postInitDMS(array('dms'=>$dms, 'settings'=>$settings));
+			$hookObj->postInitDMS(array('dms'=>$dms, 'settings'=>$settings, 'logger'=>$logger));
 		}
 	}
 }

From 0825ab0113f56be3e3feb4248cf8adff7df23f34 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 17 Jan 2023 12:31:55 +0100
Subject: [PATCH 1762/2006] add list of all extension at beginning of
 extensions tab

---
 views/bootstrap/class.Settings.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 936bf828a..761939b44 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -230,6 +230,17 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 
 		header('Content-Type: application/javascript; charset=UTF-8');
 ?>
+function scrollToTargetAdjusted(target){
+	var element = document.getElementById(target);
+	var headerOffset = 60;
+	var elementPosition = element.getBoundingClientRect().top;
+	var offsetPosition = elementPosition + window.pageYOffset - headerOffset;
+
+	window.scrollTo({
+		top: offsetPosition,
+		behavior: "smooth"
+	});
+}
 		$(document).ready( function() {
 			$('#settingstab li a').click(function(event) {
 				$('#currenttab').val($(event.currentTarget).data('target').substring(1));
@@ -256,6 +267,11 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 					}
 				}); 
 			});
+
+			$('a.scrollto').click(function(event) {
+console.log($(event.currentTarget).data('target').substring(1));
+				scrollToTargetAdjusted($(event.currentTarget).data('target').substring(1));
+			});
 		});
 <?php
 	} /* }}} */
@@ -537,12 +553,15 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
         -- SETTINGS - ADVANCED - DISPLAY
       -->
 <?php
+	foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
+		echo '<a class="scrollto" data-target="#'.$extname.'">'.$extconf['title']."</a> ● ";
+	}
 	foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
 		if($this->hasHook('processConfig'))
 			$extconf = $this->callHook('processConfig', $extname, $extconf);
 		if($this->isVisible($extname.'|')) {
 			if($extconf['config']) {
-				$this->showRawConfigHeadline("<a name=\"".$extname."\"></a>".'<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" /><i class="fa fa-circle'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? ' disabled' : ' enabled').'"></i> <span title="'.$extname.'">'.$extconf['title'].'</span>');
+				$this->showRawConfigHeadline("<a id=\"".$extname."\" name=\"".$extname."\"></a>".'<input type="hidden" name="extensions['.$extname.'][__disable__]" value="'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? '1' : '').'" /><i class="fa fa-circle'.(isset($settings->_extensions[$extname]["__disable__"]) && $settings->_extensions[$extname]["__disable__"] ? ' disabled' : ' enabled').'"></i> <span title="'.$extname.'">'.$extconf['title'].'</span>');
 				foreach($extconf['config'] as $confkey=>$conf) {
 					ob_start();
 					if($this->isVisible($extname.'|'.$confkey)) {

From 9d69bd12eba4f05eaae1d533e542e5ca9e56e5c7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Jan 2023 07:05:41 +0100
Subject: [PATCH 1763/2006] fix text in comment

---
 inc/inc.ClassConversionMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassConversionMgr.php b/inc/inc.ClassConversionMgr.php
index a4606327e..13fd47e6f 100644
--- a/inc/inc.ClassConversionMgr.php
+++ b/inc/inc.ClassConversionMgr.php
@@ -29,7 +29,7 @@ require_once("inc/inc.ClassConversionServiceTextToImage.php");
  */
 class SeedDMS_ConversionMgr {
 	/**
-	 * List of services for searching fulltext
+	 * List of services for converting documents
 	 */
 	public $services;
 

From 2f0fdfca199e9f6da9d2a1604df00aea2170c02a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Jan 2023 07:06:45 +0100
Subject: [PATCH 1764/2006] make it work in recent versions of seeddms

---
 install/update-1.8.1/update.php | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/install/update-1.8.1/update.php b/install/update-1.8.1/update.php
index 9e483850b..388b970c8 100644
--- a/install/update-1.8.1/update.php
+++ b/install/update-1.8.1/update.php
@@ -18,16 +18,12 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("../inc/inc.Settings.php");
-include("../inc/inc.AccessUtils.php");
-include("../inc/inc.ClassAccess.php");
-include("../inc/inc.ClassDocument.php");
-include("../inc/inc.ClassFolder.php");
-include("../inc/inc.ClassGroup.php");
-include("../inc/inc.ClassUser.php");
-include("../inc/inc.DBAccess.php");
-include("../inc/inc.FileUtils.php");
-include("../inc/inc.Authentication.php");
+include("../../inc/inc.Settings.php");
+include("../../inc/inc.Utils.php");
+include("../../inc/inc.LogInit.php");
+include("../../inc/inc.Language.php");
+include("../../inc/inc.Init.php");
+include("../../inc/inc.DBInit.php");
 
 print "<html></body>";
 
@@ -42,7 +38,7 @@ function update_content()
 	GLOBAL $db,$settings;
 	
 	// create temp folder
-	if (!makedir($settings->_contentDir."/temp")) return false;
+	if (!SeedDMS_Core_File::makeDir($settings->_contentDir."/temp")) return false;
 	
 	// for all contents
 	$queryStr = "SELECT * FROM tblDocumentContent";
@@ -53,19 +49,19 @@ function update_content()
 	for ($i=0;$i<count($contents);$i++){
 	
 		// create temp/documentID folder
-		if (!makedir($settings->_contentDir."/temp/".$contents[$i]["document"])) return false;
+		if (!SeedDMS_Core_File::makeDir($settings->_contentDir."/temp/".$contents[$i]["document"])) return false;
 		
 		// move every content in temp/documentID/version.fileType
 		$source = $settings->_contentDir."/".$contents[$i]["dir"]."/data".$contents[$i]["fileType"];
 
 		$target = $settings->_contentDir."/temp/".$contents[$i]["document"]."/".$contents[$i]["version"].$contents[$i]["fileType"];		
-		if (!copyFile($source, $target)) return false;
+		if (!SeedDMS_Core_File::copyFile($source, $target)) return false;
 	}
 	
 	
 	// change directory
-	if (!renameDir($settings->_contentDir."/".$settings->_contentOffsetDir,$settings->_contentDir."/old")) return false;
-	if (!renameDir($settings->_contentDir."/temp",$settings->_contentDir."/".$settings->_contentOffsetDir)) return false;
+	if (!SeedDMS_Core_File::renameDir($settings->_contentDir."/".$settings->_contentOffsetDir,$settings->_contentDir."/old")) return false;
+	if (!SeedDMS_Core_File::renameDir($settings->_contentDir."/temp",$settings->_contentDir."/".$settings->_contentOffsetDir)) return false;
 	
 	return true;
 }

From 19cdccbd880f4f9177fad47d4d603f6198a151ce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Jan 2023 07:07:08 +0100
Subject: [PATCH 1765/2006] fix syntax error

---
 out/out.OpensearchDesc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.OpensearchDesc.php b/out/out.OpensearchDesc.php
index 1055d87dd..18569d6fb 100644
--- a/out/out.OpensearchDesc.php
+++ b/out/out.OpensearchDesc.php
@@ -32,7 +32,7 @@ require_once("inc/inc.ClassAccessOperation.php");
 //require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=null));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>null));
 if($view) {
 	$view($_GET);
 	exit;

From b6a52ee4de1bc15fb774b06bc8bac2c399a642a5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Jan 2023 07:07:36 +0100
Subject: [PATCH 1766/2006] _getDocumentsData returns filetype and origfilename

---
 restapi/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/restapi/index.php b/restapi/index.php
index a988a63f2..ae5339117 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -91,6 +91,8 @@ class RestapiController { /* {{{ */
             'sequence'=>$document->getSequence(),
             'expires'=>$document->getExpires() ? date('Y-m-d H:i:s', $document->getExpires()) : "",
             'mimetype'=>$lc->getMimeType(),
+            'filetype'=>$lc->getFileType(),
+            'origfilename'=>$lc->getOriginalFileName(),
             'version'=>$lc->getVersion(),
             'version_comment'=>$lc->getComment(),
             'version_date'=>date('Y-m-d H:i:s', $lc->getDate()),

From 9ec87a727eeee19299454e7988f52d503ee79e6b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Jan 2023 07:08:04 +0100
Subject: [PATCH 1767/2006] do not show batch operation on categories if none
 are defined

---
 views/bootstrap/class.Search.php | 63 ++++++++++++++++----------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 9f919b609..9d947d802 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -968,38 +968,39 @@ function typeahead() { /* {{{ */
 
 			ob_start();
 			$cats = $dms->getDocumentCategories();
-			$options = array();
-			$options[] = array("-1", getMLText("choose_category"));
-			foreach ($cats as $currcat) {
-				$options[] = array($currcat->getID(), htmlspecialchars($currcat->getName()), false);
+			if($cats) {
+				$options = array();
+				$options[] = array("-1", getMLText("choose_category"));
+				foreach ($cats as $currcat) {
+					$options[] = array($currcat->getID(), htmlspecialchars($currcat->getName()), false);
+				}
+				$this->formField(
+					null, 
+					array(
+						'element'=>'select',
+						'id'=>'batchcategory',
+						'class'=>'chzn-select',
+						'options'=>$options,
+						'multiple'=>false,
+						'placeholder'=>getMLText('select_category'),
+						'attributes'=>array(array('style', 'width: 100%;'))
+					)
+				);
+				$this->formField(
+					getMLText("batch_remove_category"),
+					array(
+						'element'=>'input',
+						'type'=>'checkbox',
+						'id'=>'removecategory',
+						'value'=>'1',
+					)
+				);
+
+				print $this->html_link('Search', array_merge($_GET, array('action'=>'changecategory')), array('class'=>'btn btn-primary change-category-btn mt-4', 'id'=>'changecategory'), "<i class=\"fa fa-user\"></i> ".getMLText("batch_change_category"), false, true)."\n";
+
+				$content = ob_get_clean();
+				$this->printAccordion(getMLText('batch_change_category'), $content);
 			}
-			$this->formField(
-				null, 
-				array(
-					'element'=>'select',
-					'id'=>'batchcategory',
-					'class'=>'chzn-select',
-					'options'=>$options,
-					'multiple'=>false,
-					'placeholder'=>getMLText('select_category'),
-					'attributes'=>array(array('style', 'width: 100%;'))
-				)
-			);
-			$this->formField(
-				getMLText("batch_remove_category"),
-				array(
-					'element'=>'input',
-					'type'=>'checkbox',
-					'id'=>'removecategory',
-					'value'=>'1',
-				)
-			);
-//			print $this->html_link('Search', array_merge($_GET, array('action'=>'changeowner')), array('class'=>'btn btn-primary', 'id'=>'changeowner'), "<i class=\"fa fa-user\"></i> ".getMLText("batch_change_owner"), false, true)."\n";
-
-			print $this->html_link('Search', array_merge($_GET, array('action'=>'changecategory')), array('class'=>'btn btn-primary change-category-btn mt-4', 'id'=>'changecategory'), "<i class=\"fa fa-user\"></i> ".getMLText("batch_change_category"), false, true)."\n";
-
-			$content = ob_get_clean();
-			$this->printAccordion(getMLText('batch_change_category'), $content);
 		}
 		// }}}
 

From fb43a8281855d906647181651713a248583f5276 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Jan 2023 08:59:49 +0100
Subject: [PATCH 1768/2006] check for more mimetypes in
 getWrongFiletypeDocumentContent()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index c0affa302..b2ada7676 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -3957,7 +3957,7 @@ class SeedDMS_Core_DMS {
 	 * @return bool|SeedDMS_Core_Document[]
 	 */
 	function getWrongFiletypeDocumentContent() { /* {{{ */
-		$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `mimeType` in ('application/pdf', 'image/png', 'image/gif', 'image/jpg')";
+		$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `mimeType` in ('application/zip', 'application/pdf', 'image/png', 'image/gif', 'image/jpg', 'audio/mp3', 'text/rtf')";
 		$resArr = $this->db->getResultArray($queryStr);
 		if ($resArr === false)
 			return false;
@@ -3967,10 +3967,13 @@ class SeedDMS_Core_DMS {
 		foreach($resArr as $row) {
 			$expect = '';
 			switch($row['mimeType']) {
+			case "application/zip":
 			case "application/pdf":
 			case "image/png":
 			case "image/gif":
 			case "image/jpg":
+			case "audio/mp3":
+			case "text/rtf":
 				$expect = substr($row['mimeType'], -3, 3);
 				break;
 			}

From 0a3f8dd180c6942880ed8542d532db04fb94b228 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Jan 2023 09:36:46 +0100
Subject: [PATCH 1769/2006] add endpoint 'version', send notification after
 document or content was added

---
 restapi/index.php | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index ae5339117..215674dc9 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -629,6 +629,7 @@ class RestapiController { /* {{{ */
         $dms = $this->container->dms;
         $userobj = $this->container->userobj;
         $settings = $this->container->config;
+        $notifier = $this->container->notifier;
 
         if(!$userobj) {
             return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
@@ -720,13 +721,12 @@ class RestapiController { /* {{{ */
                 $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
                 finfo_close($finfo);
                 $res = $mfolder->addDocument($docname, $comment, $expires, $owner ? $owner : $userobj, $keywords, $cats, $temp, $origfilename ? $origfilename : basename($temp), $fileType, $userfiletype, $sequence, array(), array(), $reqversion, $version_comment, $attributes);
-    //            addDocumentCategories($res, $categories);
-    //            setDocumentAttributes($res, $attributes);
-
                 unlink($temp);
                 if($res) {
                     $doc = $res[0];
-    //                $rec = array('id'=>(int)$doc->getId(), 'name'=>$doc->getName(), 'version'=>$doc->getLatestContent()->getVersion());
+                    if($notifier) {
+                        $notifier->sendNewDocumentMail($doc, $userobj);
+                    }
                     return $response->withJson(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$this->__getLatestVersionData($doc->getLatestContent())), 201);
                 } else {
                     return $response->withJson(array('success'=>false, 'message'=>'Upload failed', 'data'=>''), 500);
@@ -747,6 +747,7 @@ class RestapiController { /* {{{ */
         $dms = $this->container->dms;
         $userobj = $this->container->userobj;
         $settings = $this->container->config;
+        $notifier = $this->container->notifier;
 
         if(!$userobj) {
             return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
@@ -803,10 +804,20 @@ class RestapiController { /* {{{ */
                 $userfiletype = finfo_file($finfo, $temp);
                 $fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
                 finfo_close($finfo);
+                $oldexpires = $document->getExpires();
                 $res=$document->addContent($comment, $userobj, $temp, $origfilename, $fileType, $userfiletype, array(), array(), 0, $attributes);
 
                 unlink($temp);
                 if($res) {
+                    if($notifier) {
+                        $notifier->sendNewDocumentVersionMail($document, $userobj);
+
+                        /* Actually there is not need to even try sending this mail
+                         * because the expiration date cannot be set when calling
+                         * this rest api endpoint.
+                         */
+                        $notifier->sendChangedExpiryMail($document, $userobj, $oldexpires);
+                    }
                     $rec = array('id'=>(int)$document->getId(), 'name'=>$document->getName(), 'version'=>$document->getLatestContent()->getVersion());
                     return $response->withJson(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec), 200);
                 } else {
@@ -827,6 +838,7 @@ class RestapiController { /* {{{ */
         $dms = $this->container->dms;
         $userobj = $this->container->userobj;
         $settings = $this->container->config;
+        $notifier = $this->container->notifier;
 
         if(!$userobj) {
             return $response->withJson(array('success'=>false, 'message'=>'Not logged in', 'data'=>''), 403);
@@ -869,6 +881,9 @@ class RestapiController { /* {{{ */
                 unlink($temp);
                 if($res) {
                     $doc = $res[0];
+                    if($notifier) {
+                        $notifier->sendNewDocumentMail($doc, $userobj);
+                    }
                     $rec = array('id'=>(int)$doc->getId(), 'name'=>$doc->getName());
                     return $response->withJson(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec), 200);
                 } else {
@@ -2596,6 +2611,13 @@ class TestController { /* {{{ */
     public function echoData($request, $response, $args) { /* {{{ */
         return $response->withJson(array('success'=>true, 'message'=>'This is the result of the echo call.', 'data'=>$args['data']), 200);
     } /* }}} */
+
+    public function version($request, $response, $args) { /* {{{ */
+        $logger = $this->container->logger;
+
+        $v = new SeedDMS_Version();
+        return $response->withJson(array('success'=>true, 'message'=>'This is '.$v->banner(), 'data'=>['major'=>$v->majorVersion(), 'minor'=>$v->minorVersion(), 'subminor'=>$v->subminorVersion()]), 200);
+    } /* }}} */
 } /* }}} */
 
 /* Middleware for authentication */
@@ -2645,7 +2667,7 @@ class RestapiAuth { /* {{{ */
          */
         if($request->getMethod() == 'OPTIONS') {
             $logger->log("Received preflight options request", PEAR_LOG_DEBUG);
-        } elseif(!in_array($request->getUri()->getPath(), array('login')) && substr($request->getUri()->getPath(), 0, 5) != 'echo/') {
+        } elseif(!in_array($request->getUri()->getPath(), array('login')) && substr($request->getUri()->getPath(), 0, 5) != 'echo/' && $request->getUri()->getPath() != 'version') {
             $userobj = null;
             if(!empty($this->container->environment['HTTP_AUTHORIZATION']) && !empty($settings->_apiKey) && !empty($settings->_apiUserId)) {
                 $logger->log("Authorization key: ".$this->container->environment['HTTP_AUTHORIZATION'], PEAR_LOG_DEBUG);
@@ -2803,6 +2825,7 @@ $app->put('/categories/{id}/name', \RestapiController::class.':changeCategoryNam
 $app->get('/attributedefinitions', \RestapiController::class.':getAttributeDefinitions');
 $app->put('/attributedefinitions/{id}/name', \RestapiController::class.':changeAttributeDefinitionName');
 $app->get('/echo/{data}', \TestController::class.':echoData');
+$app->get('/version', \TestController::class.':version');
 $app->get('/statstotal', \RestapiController::class.':getStatsTotal');
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initRestAPI'])) {

From 872c66158bc184858ea7191e9b0edf4ed8f2fed0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Jan 2023 12:10:33 +0100
Subject: [PATCH 1770/2006] conversion service gets reference to conversion mgr
 when service is added

---
 inc/inc.ClassConversionMgr.php         |  1 +
 inc/inc.ClassConversionServiceBase.php | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/inc/inc.ClassConversionMgr.php b/inc/inc.ClassConversionMgr.php
index 13fd47e6f..121e337a4 100644
--- a/inc/inc.ClassConversionMgr.php
+++ b/inc/inc.ClassConversionMgr.php
@@ -38,6 +38,7 @@ class SeedDMS_ConversionMgr {
 	}
 
 	public function addService($service) {
+		$service->setConversionMgr($this);
 		$this->services[$service->from][$service->to][] = $service;
 		return $service;
 	}
diff --git a/inc/inc.ClassConversionServiceBase.php b/inc/inc.ClassConversionServiceBase.php
index 9ea95812e..b90d3e4bc 100644
--- a/inc/inc.ClassConversionServiceBase.php
+++ b/inc/inc.ClassConversionServiceBase.php
@@ -36,6 +36,11 @@ abstract class SeedDMS_ConversionServiceBase {
 	 */
 	protected $logger;
 
+	/**
+	 * conversion manager
+	 */
+	protected $conversionmgr;
+
 	/**
 	 * @var $success set to false if conversion failed
 	 */
@@ -45,12 +50,22 @@ abstract class SeedDMS_ConversionServiceBase {
 		$this->from = null;
 		$this->to = null;
 		$this->success = true;
+		$this->logger = null;
+		$this->conversionmgr = null;
 	}
 
 	public function setLogger($logger) {
 		$this->logger = $logger;
 	}
 
+	public function setConversionMgr($conversionmgr) {
+		$this->conversionmgr = $conversionmgr;
+	}
+
+	public function getConversionMgr() {
+		return $this->conversionmgr;
+	}
+
 	public function getInfo() {
 		return 'Conversion service';
 	}

From b197639dd22c55143eb845eca9edbe0c6374a61d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Jan 2023 15:01:43 +0100
Subject: [PATCH 1771/2006] add wasSuccessful() to check if last conversion was
 successful

---
 inc/inc.ClassConversionMgr.php | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/inc/inc.ClassConversionMgr.php b/inc/inc.ClassConversionMgr.php
index 121e337a4..557f796c8 100644
--- a/inc/inc.ClassConversionMgr.php
+++ b/inc/inc.ClassConversionMgr.php
@@ -33,8 +33,14 @@ class SeedDMS_ConversionMgr {
 	 */
 	public $services;
 
+	/**
+	 * @var $success set to false if conversion failed
+	 */
+	protected $success;
+
 	public function __construct() {
 		$this->services = array();
+		$this->success = true;
 	}
 
 	public function addService($service) {
@@ -54,22 +60,30 @@ class SeedDMS_ConversionMgr {
 	 * Return the service that would be tried first for converting
 	 * the document.
 	 *
-	 * The conversion may not use this service but choose a different
+	 * The conversion manager may not use this service but choose a different
 	 * one when it fails.
 	 */
-	public function getService($from, $to) {
+	public function getService($from, $to) { /* {{{ */
 		if(!empty($this->services[$from][$to]))
 			return end($this->services[$from][$to]);
 		else
 			return null;
-	}
+	} /* }}} */
 
-	public function getServices() {
+	public function getServices() { /* {{{ */
 		return $this->services;
-	}
+	} /* }}} */
+
+	public function wasSuccessful() { /* {{{ */
+		return $this->success;
+	} /* }}} */
 
 	/**
-	 * Convert a file
+	 * Convert a file from one format into another format
+	 *
+	 * This method will try each conversion service until a service
+	 * fails or was successful. If a service succeeds it must not
+	 * return false, null, '' or 0
 	 *
 	 * @param string $file name of file to convert
 	 * @param string $from mimetype of input file
@@ -87,8 +101,10 @@ class SeedDMS_ConversionMgr {
 			for(end($services); key($services)!==null; prev($services)) {
 				$service = current($services);
 				$text = $service->convert($file, $target, $params);
-				if(!$service->wasSuccessful())
+				if(!$service->wasSuccessful()) {
+					$this->success = false;
 					return false;
+				}
 				if($text)
 					return $text;
 			}

From 7bfc2c46020567699146ffe72a00488b9b2f47ea Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 10:48:00 +0100
Subject: [PATCH 1772/2006] various minor changes to easy conversion into a
 markdown file

---
 SeedDMS_Core/package.xml | 50 ++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 046973024..050f9a716 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -115,6 +115,7 @@
  <phprelease />
  <changelog>
   <release>
+   <date>2010-04-27</date>
    <version>
     <release>3.0.0</release>
     <api>3.0.0</api>
@@ -123,13 +124,14 @@
     <release>stable</release>
     <api>stable</api>
    </stability>
-   <date>2010-04-27</date>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 Initial release
    </notes>
   </release>
   <release>
+   <date>2011-07-23</date>
+   <time>08:05:38</time>
    <version>
     <release>3.2.0</release>
     <api>3.2.0</api>
@@ -138,8 +140,6 @@ Initial release
     <release>stable</release>
     <api>stable</api>
    </stability>
-   <date>2011-07-23</date>
-   <time>08:05:38</time>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 New release
@@ -1501,13 +1501,13 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
-if the owner tries to access them
-Check return value of onPreRemove[Document|Folder], return from calling method if bool
-Add SeedDMS_Core_DMS::getDocumentList()
-Limit number of duplicate files to 1000
-Add hook on(Pre|Post)RemoveContent
-Add hook onAttributeValidate
+- SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
+  if the owner tries to access them
+- Check return value of onPreRemove[Document|Folder], return from calling method if bool
+- Add SeedDMS_Core_DMS::getDocumentList()
+- Limit number of duplicate files to 1000
+- Add hook on(Pre|Post)RemoveContent
+- Add hook onAttributeValidate
    </notes>
   </release>
   <release>
@@ -1590,9 +1590,9 @@ returns just users which are not disabled
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add SeedDMS_Core_Folder::getDocumentsMinMax()
-add lots of DocBlocks from merge request #8
-add SeedDMS_Core_AttributeDefinition::removeValue()
+- add SeedDMS_Core_Folder::getDocumentsMinMax()
+- add lots of DocBlocks from merge request #8
+- add SeedDMS_Core_AttributeDefinition::removeValue()
    </notes>
   </release>
   <release>
@@ -1608,7 +1608,7 @@ add SeedDMS_Core_AttributeDefinition::removeValue()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-just bump version
+- just bump version
    </notes>
   </release>
   <release>
@@ -1624,10 +1624,10 @@ just bump version
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-SeedDMS_Core_DMS::search() returns false in case of an error
-do not use views in DBAccessPDO by default anymore, use temp. tables
-SeedDMS_Core_Document::getNotifyList() has new parameter to include disabled user in list
-fix possible sql injection in SeedDMS_Core_User
+- SeedDMS_Core_DMS::search() returns false in case of an error
+- do not use views in DBAccessPDO by default anymore, use temp. tables
+- SeedDMS_Core_Document::getNotifyList() has new parameter to include disabled user in list
+- fix possible sql injection in SeedDMS_Core_User
    </notes>
   </release>
   <release>
@@ -1643,10 +1643,10 @@ fix possible sql injection in SeedDMS_Core_User
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-context can be passed to getAccessMode()
-call hook in SeedDMS_Core_Folder::getAccessMode()
-new optional parameter $listguest for SeedDMS_Core_Document::getReadAccessList()
-remove deprecated methods SeedDMS_Core_Document::convert(), SeedDMS_Core_Document::wasConverted(), SeedDMS_Core_Document::viewOnline(), SeedDMS_Core_Document::getUrl()
+- context can be passed to getAccessMode()
+- call hook in SeedDMS_Core_Folder::getAccessMode()
+- new optional parameter $listguest for SeedDMS_Core_Document::getReadAccessList()
+- remove deprecated methods SeedDMS_Core_Document::convert(), SeedDMS_Core_Document::wasConverted(), SeedDMS_Core_Document::viewOnline(), SeedDMS_Core_Document::getUrl()
    </notes>
   </release>
   <release>
@@ -1662,8 +1662,8 @@ remove deprecated methods SeedDMS_Core_Document::convert(), SeedDMS_Core_Documen
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-fix php warning if workflow state doesn' have next transition
-add method SeedDMS_Core_DatabaseAccess::setLogFp()
+- fix php warning if workflow state doesn' have next transition
+- add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </notes>
   </release>
   <release>
@@ -1679,7 +1679,7 @@ add method SeedDMS_Core_DatabaseAccess::setLogFp()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-???
+- ???
    </notes>
   </release>
   <release>

From 42828065ce24d0e04aa722b373b9a991d6a3fb4d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 10:48:28 +0100
Subject: [PATCH 1773/2006] add target changelog which turns a package.xml into
 markdown

---
 Makefile | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 64114fe21..5479e2391 100644
--- a/Makefile
+++ b/Makefile
@@ -67,4 +67,31 @@ doc:
 apidoc:
 	tools/apigen/bin/apigen SeedDMS_Core/Core --exclude "tests/*" --output html
 
-.PHONY: doc webdav webapp repository
+# Turn the package.xml file into CHANGELOG.md
+#
+# The idea is to form blocks of lines separated by an empty line.
+# Echo block consists of the version number, release date und notes.
+# This blocks are turned into single lines which are than sorted.
+# Afterwards the single lines are turned back into blocks.
+#
+# It first uses sgrep to extract the version, date und notes. This is
+# feed to sed to isolated the date and version and put them on separate
+# lines. Each version
+# forms a block of n lines with the first two being the version and date.
+# All remaining lines are notes. Blocks are separated by an empty line.
+# It's important to form blocks without ane empty lines because the following
+# awk will create a single line from each block which can then be sorted
+# (or simply reversed in order).
+# Because the blocks are listed in the wrong order (last version first and
+# previous version last, e.g. 5.1.29, 3.3.0, 3.3.1, ...., 5.1.27, 5.1.28) they
+# need to be reversed in order. This is done by turning each block into line
+# with the former new lines replaced by a '|'. So it's basically a '|' separated
+# csv file which is then reversed in order by 'sort -r'. In order to separate
+# blocks by a newline, each line of that output is appended by another
+# line break. Result is put back
+# into the original format by replacing all '|' by newline.
+#
+changelog:
+	@sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' SeedDMS_Core/package.xml | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n'
+
+.PHONY: doc webdav webapp repository changelog

From 93088edfcecd93abab26226f8c687e7d4edab2c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 10:51:13 +0100
Subject: [PATCH 1774/2006] set SEEDDMS_CORE_SQL before running unit tests

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index b02d9167e..81caffe74 100644
--- a/build.xml
+++ b/build.xml
@@ -63,7 +63,7 @@
 
 	<!-- PHPUnit -->
 	<target name="phpunitfast" description="Run tests">
-		<exec dir="${srcdir}/SeedDMS_Core" command="XDEBUG_MODE=coverage ${srcdir}/vendor/bin/phpunit --bootstrap ${srcdir}/SeedDMS_Core/bootstrap-${majorversion}.php --coverage-html ${srcdir}/coverage/" passthru="true" checkreturn="true" />
+		<exec dir="${srcdir}/SeedDMS_Core" command="XDEBUG_MODE=coverage SEEDDMS_CORE_SQL=../install/create_tables-sqlite3.sql ${srcdir}/vendor/bin/phpunit --bootstrap ${srcdir}/SeedDMS_Core/bootstrap-${majorversion}.php --coverage-html ${srcdir}/coverage/" passthru="true" checkreturn="true" />
 		<!-- exec dir="${srcdir}/tests" command="SEEDDMS_URL=${seeddmsurl} SEEDDMS_MINK_DRIVER=${mink_driver} SEEDDMS_SNOOZE_MULTIPLIER=${snooze_multiplier} ${srcdir}/vendor/bin/phpunit" passthru="true" checkreturn="true" / -->
 	</target>
 

From c8057fc72f1fa16369c642ed4f684203fb19ccbe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 10:57:59 +0100
Subject: [PATCH 1775/2006] replace tabs by spaces

---
 SeedDMS_Core/package.xml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 050f9a716..46c4d4218 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -699,21 +699,21 @@ no changes
    </notes>
   </release>
   <release>
-	 <date>2014-07-30</date>
-	 <time>09:03:59</time>
-	 <version>
-		<release>4.3.9</release>
-		<api>4.3.9</api>
-	 </version>
-	 <stability>
-		<release>stable</release>
-		<api>stable</api>
-	 </stability>
-	 <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
-	 <notes>
+   <date>2014-07-30</date>
+   <time>09:03:59</time>
+   <version>
+    <release>4.3.9</release>
+    <api>4.3.9</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
 - SeedDMS_Core_KeywordCategory::getKeywordLists() sorts keywords aphabetically
 - SeedDMS_Core_DMS::addUser() doesn't throw an error if sql_mode is set to STRICT_TRANS_TABLES and pwdexpiration is not set to a valid date.
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2014-10-22</date>
@@ -955,7 +955,7 @@ by a group or user right
    <notes>
 - new method SeedDMS_Core_DMS::createDump()
 - minor improvements int SeedDMS_Core_Document::getReadAccessList()
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2016-01-22</date>
@@ -979,7 +979,7 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - SeedDMS_Core_DocumentCategory::getDocumentsByCategory() now returns the documents
 - add SeedDMS_Core_Group::getWorkflowStatus()
 - SeedDMS_Core_User::getDocumentsLocked() sets locking user propperly
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2016-01-22</date>
@@ -1054,7 +1054,7 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - add more callbacks
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2016-04-26</date>
@@ -1275,7 +1275,7 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - all changes from 4.3.25 merged
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2016-04-04</date>
@@ -1435,7 +1435,7 @@ do not sort some temporary tables anymore, because it causes an error in mysql i
     <api>stable</api>
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
-	 <notes>
+   <notes>
 all sql statements can be logged to a file
 do not sort some temporary tables anymore, because it causes an error in mysql if            sql_mode=only_full_group_by is set
    </notes>
@@ -1906,7 +1906,7 @@ returns just users which are not disabled
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - SeedDMS_Core_DMS::getTimeline() uses status log instead of document content
-- add methods SeedDMS_Core_DocumentContent::getReviewers() and SeedDMS_Core_DocumentContent::getApprovers()	
+- add methods SeedDMS_Core_DocumentContent::getReviewers() and SeedDMS_Core_DocumentContent::getApprovers()
 - add methods SeedDMS_Core_DocumentContent::getApproveLog() and SeedDMS_Core_DocumentContent::getReviewLog()
 - better handling of document with an empty workflow state
 - fix checking of email addresses by using filter_var instead of regex

From 1da52544af01cf89c3799d4df39debff4cd932ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 10:58:16 +0100
Subject: [PATCH 1776/2006] handle none numberic versions when creating
 changelog

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5479e2391..8d94c6b56 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,6 @@ apidoc:
 # into the original format by replacing all '|' by newline.
 #
 changelog:
-	@sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' SeedDMS_Core/package.xml | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n'
+	@sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' SeedDMS_Core/package.xml | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.preRC]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n'
 
 .PHONY: doc webdav webapp repository changelog

From 4f6261321f73ce2ae9beedc997439b99904c596b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 11:00:07 +0100
Subject: [PATCH 1777/2006] replace tabs by spaces

---
 SeedDMS_Core/package.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 03e497d8b..ecc20d28a 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1735,7 +1735,7 @@ returns just users which are not disabled
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - speed up SeedDMS_Core_Folder::getSubFolders() SeedDMS_Core_Folder::getDocuments() by minimizing the number of sql queries.
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2020-02-18</date>
@@ -1751,7 +1751,7 @@ returns just users which are not disabled
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
 - no changes, just keep same version as seeddms application
-	 </notes>
+   </notes>
   </release>
   <release>
    <date>2020-04-14</date>

From 1c8d267a6654edb6537e594e51f139c230661ed7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 11:05:58 +0100
Subject: [PATCH 1778/2006] minor correction of old release dates

---
 SeedDMS_Core/package.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 46c4d4218..9f4881c4f 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1704,7 +1704,7 @@ returns just users which are not disabled
    </notes>
   </release>
   <release>
-   <date>2019-08-07</date>
+   <date>2019-09-06</date>
    <time>07:31:17</time>
    <version>
     <release>5.1.13</release>
@@ -1809,7 +1809,7 @@ returns just users which are not disabled
    </notes>
   </release>
   <release>
-   <date>2020-07-28</date>
+   <date>2020-07-30</date>
    <time>09:43:12</time>
    <version>
     <release>5.1.19</release>
@@ -1973,7 +1973,7 @@ returns just users which are not disabled
    </notes>
   </release>
   <release>
-   <date>2022-04-25</date>
+   <date>2022-05-20</date>
    <time>13:44:55</time>
    <version>
     <release>5.1.26</release>

From 6dc9cc8b8e1ad6eeb191c50d6147b09723d35834 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 11:11:10 +0100
Subject: [PATCH 1779/2006] minor corrections to sync with seeddms 5

---
 SeedDMS_Core/package.xml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ecc20d28a..7afb44684 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1738,7 +1738,7 @@ returns just users which are not disabled
    </notes>
   </release>
   <release>
-   <date>2020-02-18</date>
+   <date>2020-03-02</date>
    <time>09:16:48</time>
    <version>
     <release>5.1.15</release>
@@ -1969,6 +1969,7 @@ returns just users which are not disabled
 - backport setFileType() from 6.0.x
 - add SeedDMS_Core_File::fileExtension()
 - add callbacks on onPostUpdateAttribute, onPostRemoveAttribute, onPostAddAttribute
+- fix searching for document content with a custom attribute having a value set
    </notes>
   </release>
   <release>
@@ -2404,27 +2405,6 @@ better error checking in SeedDMS_Core_Document::cancelCheckOut()
 - SeedDMS_Core_DocumentContent::getWorkflow() has optional parameter to return data from table tblWorkflowDocumentContent
    </notes>
   </release>
-  <release>
-   <date>2022-04-25</date>
-   <time>13:44:55</time>
-   <version>
-    <release>5.1.26</release>
-    <api>5.1.26</api>
-   </version>
-   <stability>
-    <release>stable</release>
-    <api>stable</api>
-   </stability>
-   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
-   <notes>
-- fix validating multi value attributes
-- SeedDMS_Core_User::removeFromProcesses() can be limited to a list of documents. In that case only the last version will be modified.
-- add more types to getStatisticalData()
-- add optional parameter $op to SeedDMS_Core_AttributeDefinition::getObjects()
-- SeedDMS_Core_AttributeDefinition::getObjects() will not filter by value if null is passed
-- SeedDMS_Core_DMS::getAllAttributeDefinitions() has second parameter to filter attributes by type
-   </notes>
-  </release>
   <release>
    <date>2022-05-20</date>
    <time>13:44:55</time>

From 88874155b02606feed47d515446f02a5d1536e62 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 12:09:45 +0100
Subject: [PATCH 1780/2006] add seeddms/core

---
 composer-dist.json | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/composer-dist.json b/composer-dist.json
index 7c0171634..1c69d8361 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -12,6 +12,17 @@
         "pear/db": "*",
         "alecrabbit/php-console-colour": "*",
         "zf1/zend-search-lucene": "*",
-        "symfony/http-foundation": "^5.4"
-    }
+        "symfony/http-foundation": "^5.4",
+        "seeddms/core": "dev-master"
+    },
+    "repositories": [
+        {
+            "type": "path",
+            "url": "/home/cvs/seeddms/SeedDMS_Core",
+            "options": {
+                "symlink": false
+            }
+        }
+    ]
+
 }

From 9df57ebe675e382371f0958257ff9ecaa28383b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 12:21:14 +0100
Subject: [PATCH 1781/2006] no longer include Core.php from SeedDMS, use
 vendor/seeddms/core instead

---
 inc/inc.ClassSettings.php | 2 +-
 inc/inc.Init.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 9e65b2f8c..e695242fc 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -1479,7 +1479,7 @@ class Settings { /* {{{ */
 						if(!empty($this->_coreDir))
 							require_once($this->_coreDir.'/Core.php');
 						else
-							require_once($this->_rootDir.'../pear/SeedDMS/Core.php');
+							require_once($this->_rootDir.'../pear/vendor/seeddms/core/Core.php');
 						$tmpcore = new SeedDMS_Core_DMS(null, $this->_contentDir);
 						$db = new SeedDMS_Core_DatabaseAccess($this->_dbDriver, $this->_dbHostname, $this->_dbUser, $this->_dbPass, $this->_dbDatabase);
 						if(!$db->connect()) {
diff --git a/inc/inc.Init.php b/inc/inc.Init.php
index 69ed0c6a4..1b4aaba5a 100644
--- a/inc/inc.Init.php
+++ b/inc/inc.Init.php
@@ -23,6 +23,6 @@ use Symfony\Component\HttpFoundation\Request;
 if(!empty($settings->_coreDir))
 	require_once($settings->_coreDir.'/Core.php');
 else
-	require_once('SeedDMS/Core.php');
+	require_once('vendor/seeddms/core/Core.php');
 
 $request = Request::createFromGlobals();

From b7a718732d34072a6112c4c1207bfc9c63badaaa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 12:27:22 +0100
Subject: [PATCH 1782/2006] new changelog created from package.xml

---
 SeedDMS_Core/CHANGELOG.md | 639 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 639 insertions(+)
 create mode 100644 SeedDMS_Core/CHANGELOG.md

diff --git a/SeedDMS_Core/CHANGELOG.md b/SeedDMS_Core/CHANGELOG.md
new file mode 100644
index 000000000..8ac741064
--- /dev/null
+++ b/SeedDMS_Core/CHANGELOG.md
@@ -0,0 +1,639 @@
+5.1.29 (2022-11-21)
+---------------------
+- SeedDMS_Core_Folder::addDocument() does rollback transaction propperly when setting document categories fail
+- add $skiproot and $sep parameter to SeedDMS_Core_Folder::getFolderPathPlain()
+- add class name for 'documentfile'
+- add method SeedDMS_Core_KeywordCategory::countKeywordLists()
+
+5.1.28 (2022-11-07)
+---------------------
+- fix SeedDMS_Core_User::getDocumentContents()
+- fix SeedDMS_Core_File::fileExtension()
+- SeedDMS_Core_DMS::createPasswordRequest() creates a cryptographically secure hash
+- fix sql error when deleting a folder attribute
+- add SeedDMS_Core_Attribute::getParsedValue() and use it in SeedDMS_Core_Object::getAttributeValue()
+- add SeedDMS_Core_DMS::getDuplicateSequenceNo() and SeedDMS_Core_Folder::reorderDocuments()
+- add SeedDMS_Core_File::mimetype(), fix SeedDMS_Core_File::moveDir()
+- all file operations use methods of SeedDMS_Core_File
+- change namespace of iterators from SeedDMS to SeedDMS\Core
+   
+
+5.1.27 (2022-08-31)
+---------------------
+- fix SeedDMS_Core_DMS::addAttributeDefinition() when objtype is 0
+- sort search result even if sortorder is 'i' or 'n'
+- pass an array as an attribute to search() will OR each element
+
+5.1.26 (2022-05-20)
+---------------------
+- fix validating multi value attributes
+- SeedDMS_Core_User::removeFromProcesses() can be limited to a list of documents. In that case only the last version will be modified.
+- add more types to getStatisticalData()
+- add optional parameter $op to SeedDMS_Core_AttributeDefinition::getObjects()
+- SeedDMS_Core_AttributeDefinition::getObjects() will not filter by value if null is passed
+- SeedDMS_Core_DMS::getAllAttributeDefinitions() has second parameter to filter attributes by type
+
+5.1.25 (2022-04-22)
+---------------------
+- rename getLastWorkflowTransition() to getLastWorkflowLog()
+- getLastWorkflowLog() returns a workflow entry even if the workflow has ended
+- backport setFileType() from 6.0.x
+- add SeedDMS_Core_File::fileExtension()
+- add callbacks on onPostUpdateAttribute, onPostRemoveAttribute, onPostAddAttribute
+- fix searching for document content with a custom attribute having a value set
+
+5.1.24 (2021-12-11)
+---------------------
+- in SeedDMS_Core_DocumentContent::removeWorkflow() remove records from tblWorklflowLog before tblDWorkflowDocumentContent
+- make all class variables of SeedDMS_Core_User protected
+- fix various errors in SeedDMS_Core_AttributeDefinition::validate()
+- add lots of unit tests
+- replace incorrect use of array_search() by in_array()
+- move method SeedDMS_Core_DMS::createDump() into SeedDMS_Core_DatabaseAccess
+- lots of parameter checking when calling methods()
+- make sure callbacks are callable
+- SeedDMS_Core_Folder::getParent() returns null if there is no parent (used to be false)
+- SeedDMS_Core_DMS::search() will not find document without an expiration date anymore, if the search is limited by an expiration end date but no start date
+- add method SeedDMS_Core_Folder::getFoldersMinMax()
+- init internal cache variables of SeedDMS_Core_Folder/SeedDMS_Core_Document and add method clearCache()
+- SeedDMS_Core_Folder::hasDocuments() does not use the interal document cache anymore
+- SeedDMS_Core_Document::addDocumentLink() returns an object of type SeedDMS_Core_DocumentLink in case of success
+- trim email, comment, language, theme when setting data of user
+- more checks whether an id > 0 when getting a database record
+
+5.1.23 (2021-08-19)
+---------------------
+- SeedDMS_Core_DMS::getTimeline() uses status log instead of document content
+- add methods SeedDMS_Core_DocumentContent::getReviewers() and SeedDMS_Core_DocumentContent::getApprovers()
+- add methods SeedDMS_Core_DocumentContent::getApproveLog() and SeedDMS_Core_DocumentContent::getReviewLog()
+- better handling of document with an empty workflow state
+- fix checking of email addresses by using filter_var instead of regex
+- add new method SeedDMS_Core_Document::hasCategory()
+- add new method SeedDMS_Core_DocumentContent::removeReview()
+- add new method SeedDMS_Core_DocumentContent::removeApproval()
+- add new method SeedDMS_Core_User::getFolders()
+- add new method SeedDMS_Core_User::getDocumentContents()
+- add new method SeedDMS_Core_User::getDocumentFiles()
+- add new method SeedDMS_Core_User::getDocumentLinks()
+- add new type 'foldersperuser' to method SeedDMS_Core_DMS::getStatisticalData()
+
+5.1.22 (2021-03-15)
+---------------------
+- add SeedDMS_Core_DatabaseAccess::hasTable()
+- add SeedDMS_Core_User->isType() and SeedDMS_Core_Group->isType()
+- add SeedDMS_Core_User->getDMS() and SeedDMS_Core_Group->getDMS()
+- add new parameter to SeedDMS_Core_DMS->getDocumentList() for skipping expired documents
+- add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList()
+- do not validate value in SeedDMS_Core_Attribute::setValue(), it should have been done before
+- SeedDMS_Core_DMS::search() can search for last date of document status change
+- smarter caching in SeedDMS_Core_Document::getDocumentFiles() which fixes a potential
+  problem when removing a document
+
+5.1.21 (2020-09-29)
+---------------------
+- SeedDMS_Folder_DMS::getAccessList() and getDefaultAccess() do not return fals anymore if the parent does not exists. They just stop inheritance.
+- pass attribute value to callback 'onAttributeValidate'
+- new paramter 'new' of methode SeedDMЅ_Core_AttributeDefinition::validate()
+- check if folder/document is below rootDir can be turned on (default off)
+- SeedDMS_Core_User::setHomeFolder() can be used to unset the home folder
+- check if attribute definition exists when setting attributes of folders and documents
+
+5.1.20 (2020-09-29)
+---------------------
+- SeedDMS_Core_DMS::getDocumentList() returns false, if an unknown list is passed
+- SeedDMS_Core_Document::getDocumentFiles() has new parameter to select only those files attached to a specific version of the document
+- removing a document version will not remove attachments of the document anymore
+- set dms of new user instances in SeedDMS_Core_Group
+
+5.1.19 (2020-07-30)
+---------------------
+- add method SeedDMS_Core_Document::setParent() as an alias for setFolder()
+- clear the save content list and latest content in SeedDMS_Core_Document after
+  a version has been deleted.
+- new method SeedDMS_Core_Document::isLatestVersion()
+- add new attribute types 'document', 'folder', 'user', 'group'
+
+5.1.18 (2020-05-28)
+---------------------
+- fixed remaining todos
+- fixed parsing of file size in SeedDMS_Core_File::parse_filesize()
+- fix SeedDMS_Core_DMS::getDocumentByOriginalFilename()
+
+5.1.17 (2020-05-22)
+---------------------
+- add new callback onSetStatus
+- fix SeedDMS_Core_DMS::getExpiredDocuments(), sql statement failed because temp. tables were not created
+- add parameters $orderdir, $orderby, $update to SeedDMS_Core::getExpiredDocuments()
+
+5.1.16 (2020-04-14)
+---------------------
+- fix call of hooks in SeedDMS_Core
+- add variable lasterror in SeedDMS_Core_DMS which can be set by hooks to pass an
+  error msg to the calling application
+- better error checking in SeedDMS_Core_Document::addDocumentFile()
+
+5.1.15 (2020-03-02)
+---------------------
+- no changes, just keep same version as seeddms application
+
+5.1.14 (2020-02-17)
+---------------------
+- speed up SeedDMS_Core_Folder::getSubFolders() SeedDMS_Core_Folder::getDocuments() by minimizing the number of sql queries.
+
+5.1.13 (2019-09-06)
+---------------------
+- add decorators
+- add new methods SeedDMS_Core_Document::isType(), SeedDMS_Core_Folder::isType(), SeedDMS_Core_DocumentContent::isType(). Use them instead of checking the class name.
+- skip a fileType with just a '.'
+
+5.1.12 (2019-07-01)
+---------------------
+- parameter $orderby passed to SeedDMS_Core_Folder::getDocuments() and SeedDMS_Core_Folder::getSubFolders() can be a string, but only the first char is evaluated
+- SeedDMS_Core_DMS::search() excepts parameters as array, added orderby
+- add SeedDMS_Core_Folder::hasSubFolderByName()
+- fix SeedDMS_Core_Folder::hasDocumentByName() which returned an int > 0 if documents
+  has been loaded before and even if the document searching for was not among them.
+- add new method SeedDMS_Core_Folder::empty()
+
+5.1.11 (2019-05-03)
+---------------------
+- ???
+
+5.1.10 (2019-04-04)
+---------------------
+- fix php warning if workflow state doesn' have next transition
+- add method SeedDMS_Core_DatabaseAccess::setLogFp()
+
+5.1.9 (2018-11-13)
+---------------------
+- context can be passed to getAccessMode()
+- call hook in SeedDMS_Core_Folder::getAccessMode()
+- new optional parameter $listguest for SeedDMS_Core_Document::getReadAccessList()
+- remove deprecated methods SeedDMS_Core_Document::convert(), SeedDMS_Core_Document::wasConverted(), SeedDMS_Core_Document::viewOnline(), SeedDMS_Core_Document::getUrl()
+
+5.1.8 (2018-07-02)
+---------------------
+- SeedDMS_Core_DMS::search() returns false in case of an error
+- do not use views in DBAccessPDO by default anymore, use temp. tables
+- SeedDMS_Core_Document::getNotifyList() has new parameter to include disabled user in list
+- fix possible sql injection in SeedDMS_Core_User
+
+5.1.7 (2018-04-05)
+---------------------
+- just bump version
+
+5.1.6 (2018-02-14)
+---------------------
+- add SeedDMS_Core_Folder::getDocumentsMinMax()
+- add lots of DocBlocks from merge request #8
+- add SeedDMS_Core_AttributeDefinition::removeValue()
+
+5.1.5 (2017-11-07)
+---------------------
+- use views instead of temp. tables
+- add list of expired documents in SeedDMS_Core_DMS::getDocumentList()
+- add methods to set comment, name, public, version of document files
+- add method SeedDMS_Core_Document::transferToUser()
+- SeedDMS_Core_Document::addDocumentFile() returns object of file
+- add SeedDMS_Core_DocumentFile::setDate()
+- remove SeedDMS_Core_DocumentCategory::addCategory() and getCategories()
+- add optional parameters $limit and $offset to SeedDMS_Core_Folder::getDocuments()
+  and SeedDMS_Core_Folder::getSubFolders()
+- getInstance() returns now null instead of false if the object was not found in the db
+- add new methods SeedDMS_Core_Document::addCategories() and
+  SeedDMS_Core_Document::removeCategories()
+
+5.1.4 (2017-09-05)
+---------------------
+- add virtual access mode for document links and attachments plus callbacks to
+  check access mode in a hook
+- add new method SeedDMS_Core_DMS::getDocumentsExpired()
+- all changes from 5.0.14 merged
+
+5.1.3 (2017-08-23)
+---------------------
+- SeedDMS_Core_Document::getNotifyList() and SeedDMS_Core_Folder::getNotifyList()
+returns just users which are not disabled
+- add new methods removeFromProcesses(), getWorkflowsInvolved(), getKeywordCategories() to SeedDMS_Core_User
+- add methods isMandatoryReviewerOf() and isMandatoryApproverOf()
+- add methods transferDocumentsFolders() and transferEvents()
+- add method SeedDMS_Core_DMS::getDocumentByOriginalFilename()
+
+5.1.2 (2017-03-23)
+---------------------
+- SeedDMS_Core_DMS::filterDocumentFiles() returns also documents which are not public
+  if the owner tries to access them
+- Check return value of onPreRemove[Document
+Folder], return from calling method if bool
+- Add SeedDMS_Core_DMS::getDocumentList()
+- Limit number of duplicate files to 1000
+- Add hook on(Pre
+Post)RemoveContent
+- Add hook onAttributeValidate
+
+5.1.1 (2017-02-20)
+---------------------
+- all changes from 5.0.11 merged
+
+5.1.0 (2017-02-20)
+---------------------
+- added postgres support
+
+5.0.13 (2017-07-13)
+---------------------
+- all changes from 4.3.36 merged
+
+5.0.12 (2017-03-23)
+---------------------
+all sql statements can be logged to a file
+do not sort some temporary tables anymore, because it causes an error in mysql if            sql_mode=only_full_group_by is set
+
+5.0.11 (2017-02-28)
+---------------------
+- all changes from 4.3.34 merged
+
+5.0.10 (2017-02-20)
+---------------------
+- all changes from 4.3.33 merged
+
+5.0.9 (2016-11-02)
+---------------------
+- all changes from 4.3.32 merged
+
+5.0.8 (2016-11-02)
+---------------------
+- all changes from 4.3.31 merged
+
+5.0.7 (2016-11-02)
+---------------------
+- all changes from 4.3.30 merged
+- better attribute value checking
+
+5.0.6 (2016-09-06)
+---------------------
+- all changes from 4.3.29 merged
+
+5.0.5 (2016-08-09)
+---------------------
+- all changes from 4.3.28 merged
+
+5.0.4 (2016-05-03)
+---------------------
+- all changes from 4.3.27 merged
+
+5.0.3 (2016-04-04)
+---------------------
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+- all changes from 4.3.26 merged
+
+5.0.2 (2016-04-26)
+---------------------
+- all changes from 4.3.25 merged
+
+5.0.1 (2016-01-22)
+---------------------
+- all changes from 4.3.24 merged
+
+5.0.0 (2016-01-22)
+---------------------
+- classes can be overloaded
+- clean workflow log when a document version was deleted
+
+4.3.37 (2018-02-14)
+---------------------
+- SeedDMS_Core_DMS::search() finds documents without a status log
+
+4.3.36 (2017-03-22)
+---------------------
+- fix sql statement for creating temp. tables (sqlite)
+
+4.3.35 (2017-07-11)
+---------------------
+do not sort some temporary tables anymore, because it causes an error in mysql if sql_mode=only_full_group_by is set
+
+4.3.34 (2017-02-28)
+---------------------
+SeedDMS_Core_DMS::getDuplicateDocumentContent() returns complete document
+
+4.3.33 (2017-02-22)
+---------------------
+- SeedDMЅ_Core_DMS::getTimeline() no longer returns duplicate documents
+- SeedDMЅ_Core_Document::addContent() sets workflow after status was set
+- SeedDMЅ_Core_Keyword::setOwner() fix sql statement
+- SeedDMЅ_Core_User::setFullname() minor fix in sql statement
+
+4.3.32 (2017-01-12)
+---------------------
+- order groups by name returned by getReadAccessList()
+- add optional parameter to SeedDMS_Core_DMS::filterDocumentLinks()
+- SeedDMS_Core_DMS::search() can search for document/folder id
+
+4.3.31 (2016-11-02)
+---------------------
+- new method SeedDMЅ_Core_WorkflowAction::getTransitions() 
+- new method SeedDMЅ_Core_WorkflowState::getTransitions() 
+- new method SeedDMЅ_Core_AttributeDefinition::parseValue() 
+- add check for cycles in workflow SeedDMS_Core_Workflow::checkForCycles()
+
+4.3.30 (2016-10-07)
+---------------------
+- new method SeedDMЅ_Core_AttributeDefinition::getValueSetSeparator() 
+- trim each value of a value set before saving the complete value set as a string
+
+4.3.29 (2016-09-06)
+---------------------
+- SeedDMЅ_Core_Object::getAttributes() orders attributes by name of attribute definition
+- SeedDMЅ_Core_Workflow::addTransition() force reload of transition list after adding a
+- SeedDMЅ_Core_Document::rewrite[Review
+Approval]Log() will also copy file if it exists
+- add method SeedDMЅ_Core_Document::rewriteWorkflowLog()
+
+4.3.28 (2016-08-24)
+---------------------
+- SeedDMЅ_Core_DMS::search() searches also comment of document version
+
+4.3.27 (2016-04-26)
+---------------------
+- callbacks can have more then one user function
+- fix some sql statements, because they didn't work with mysql 5.7.5 anymore
+
+4.3.26 (2016-04-04)
+---------------------
+- add more callbacks
+
+4.3.25 (2016-03-08)
+---------------------
+- rename SeedDMS_Core_Group::getNotificationsByGroup() to getNotifications()
+- use __construct() for all constructors
+- fix setting multi value attributes for versions
+
+4.3.24 (2016-01-22)
+---------------------
+- make sure boolean attribute is saved as 0/1
+- add SeedDMS_Core_User::[g
+s]etMandatoryWorkflows()
+- add SeedDMS_Core_User::getNotifications()
+- add SeedDMS_Core_Group::getNotifications()
+- SeedDMS_Core_DMS::getNotificationsByGroup() and
+SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
+- SeedDMS_Core_DocumentCategory::getDocumentsByCategory() now returns the documents
+- add SeedDMS_Core_Group::getWorkflowStatus()
+- SeedDMS_Core_User::getDocumentsLocked() sets locking user propperly
+
+4.3.24 (2016-01-21)
+---------------------
+- make sure boolean attribute is saved as 0/1
+- add SeedDMS_Core_User::[g
+s]etMandatoryWorkflows()
+- add SeedDMS_Core_User::getNotifications()
+- add SeedDMS_Core_Group::getNotifications()
+- SeedDMS_Core_DMS::getNotificationsByGroup() and
+SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
+- SeedDMS_Core_DocumentCategory::getDocumentsByCategory() now returns the documents
+- add SeedDMS_Core_Group::getWorkflowStatus()
+- SeedDMS_Core_User::getDocumentsLocked() sets locking user propperly
+
+4.3.23 (2016-01-21)
+---------------------
+- new method SeedDMS_Core_DMS::createDump()
+- minor improvements int SeedDMS_Core_Document::getReadAccessList()
+
+4.3.22 (2015-11-09)
+---------------------
+- fix sql statement to reset password
+- pass some more information for timeline
+
+4.3.21 (2015-09-28)
+---------------------
+- add method SeedDMS_Core_Database::getCurrentTimestamp()
+- add method SeedDMS_Core_Database::getCurrentDatetime()
+- user getCurrentTimestamp() and getCurrentDatetime() whenever possible
+
+4.3.20 (2015-06-26)
+---------------------
+- add method SeedDMS_Core_DMS::checkDate()
+- add method SeedDMS_Core_Document::setDate()
+- add method SeedDMS_Core_Folder::setDate()
+- date can be passed to SeedDMS_Core_DocumentContent::setStatus()
+- add method SeedDMS_Core_DocumentContent::rewriteStatusLog()
+- add method SeedDMS_Core_DocumentContent::rewriteReviewLog()
+- add method SeedDMS_Core_DocumentContent::rewriteApprovalLog()
+- access rights for guest are also taken into account if set in an acl. Previously guest could gain read rights even if the access was probibited
+by a group or user right
+
+4.3.19 (2015-06-26)
+---------------------
+- add optional paramter $noclean to clearAccessList(), setDefaultAccess(), setInheritAccess()
+- clearAccessList() will clean up the notifier list
+- new method cleanNotifyList()
+
+4.3.18 (2015-06-09)
+---------------------
+- add optional paramter $msg to SeedDMS_Core_DocumentContent::verifyStatus()
+- add method SeedDMS_Core_DMS::getDuplicateDocumentContent()
+
+4.3.17 (2015-03-27)
+---------------------
+clean workflow log when a document version was deleted
+
+4.3.16 (2015-03-20)
+---------------------
+no changes
+
+4.3.15 (2015-02-12)
+---------------------
+users returned by SeedDMS_Core_DMS::getAllUsers() have language and theme set again
+
+4.3.13 (2014-11-27)
+---------------------
+- fix searching for attributes
+- add some more documentation
+- SeedDMS_Core_DMS::getDocumentCategories() returns categories sorted by name (Bug #181)
+- new methode SeedDMS_Core_Document::replaceContent() which replaces the content of a version.
+   <release>4.3.14</release>
+- add missing start transaction in SeedDMD_Core_Folder::remove()
+- SeedDMD_Core_Folder::isSubFolder() doesn't compare object instances anymore (Bug #194)
+
+4.3.12 (2014-11-17)
+---------------------
+- fix searching folders with multivalue attributes
+
+4.3.11 (2014-11-13)
+---------------------
+- fixed saving multivalue attributes
+- add method SeedDMS_Core_Attribute::getValueAsArray()
+
+4.3.10 (2014-10-22)
+---------------------
+new release
+
+4.3.9 (2014-07-30)
+---------------------
+- SeedDMS_Core_KeywordCategory::getKeywordLists() sorts keywords aphabetically
+- SeedDMS_Core_DMS::addUser() doesn't throw an error if sql_mode is set to STRICT_TRANS_TABLES and pwdexpiration is not set to a valid date.
+
+4.3.8 (2014-04-09)
+---------------------
+- new method SeedDMS_Core_DMS::getStatisticalData()
+
+4.3.7 (2014-03-21)
+---------------------
+no changes
+
+4.3.6 (2014-03-18)
+---------------------
+- add optional parameters $publiconly=false and $user=null to SeedDMS_Core_Document::getDocumentLinks()
+- add new method SeedDMS_Core_Document::getReverseDocumentLinks()
+
+4.3.5 (2014-03-04)
+---------------------
+no changes
+
+4.3.4 (2014-02-01)
+---------------------
+- fix handling of multivalue attributes
+
+4.3.3 (2014-02-01)
+---------------------
+- SeedDMS_Folder::getDocuments() and SeedDMS_Folder::getSubFolders() do not
+  do any sorting if $orderby is not set.
+- database hostname can have port seperated by ':'
+- make all functions in SeedDMS_Core_File static (fixes problem with php 5.5.x)
+
+4.3.2 (2013-11-27)
+---------------------
+- new method SeedDMS_Core_Folder::isSubFolder()
+- check for subFolder in SeedDMS_Core_Folder::setParent()
+- new methods SeedDMS_Core_DMS::checkFolders() and SeedDMS_Core_DMS::checkDocuments()
+
+4.3.0 (2013-09-05)
+---------------------
+- various small corrections
+- comment of version is no longer taken from document if version comment is empty
+- passing an array of users to SeedDMЅ_Core_DMS::search() instead of a single user ist now allowed
+- turn on foreign key constraints for sqlite3
+- SeedDMЅ_Core_Folder::getPath() can handle a subfolder treated as a root folder
+
+4.2.2 (2013-05-17)
+---------------------
+- admins can be added as reviewer/approver again
+
+4.2.1 (2013-04-30)
+---------------------
+- fixed bug in SeedDMS_Core_DocumentContent::addIndApp()
+
+4.2.0 (2013-04-22)
+---------------------
+- fixed bug in SeedDMS_Core_DocumentContent::addIndApp()
+
+4.1.3 (2013-04-08)
+---------------------
+- stay in sync with seeddms application
+
+4.1.2 (2013-04-05)
+---------------------
+- set propper folderList of sub folders after moving a folder
+
+4.1.1 (2013-04-05)
+---------------------
+- stay in sync with seeddms application
+
+4.1.0 (2013-03-28)
+---------------------
+- minor bugfixes
+
+4.0.0 (2013-02-26)
+---------------------
+- minor bugfixes
+
+4.0.0pre5 (2013-02-14)
+---------------------
+- changed name from letodms to seeddms
+- fixed SeedDMS_Database::TableList()
+
+4.0.0pre4 (2013-02-11)
+---------------------
+- calculate checksum for document versions
+- some bug fixes
+- some more documentation
+- added new methods SeedDMS_Core_Document::getReadUserList() and
+  SeedDMS_Core_Folder::getReadUserList() which replaces getApproversList()
+- fixed sql statement in getReadUserList() for sqlite3
+
+4.0.0pre3 (2013-02-08)
+---------------------
+- minor bug fixes
+
+4.0.0pre2 (2013-02-06)
+---------------------
+- lots of bug fixes
+- replaced more of old var declaration
+- more code documentation
+
+4.0.0pre1 (2013-01-24)
+---------------------
+- added database transactions
+- new workflow
+- replaced old var declaration
+
+4.0.0RC1 (2013-02-20)
+---------------------
+- minor bugfixes
+
+3.4.0 (2012-12-13)
+---------------------
+- added PDO database driver, several sql changes for better compatiblity
+- fixed bug when adding a new document category
+- make sure the database remains consistent even in case of errors
+
+3.3.9 (2012-09-19)
+---------------------
+- version update to be in sync with letodms application
+
+3.3.8 (2012-09-16)
+---------------------
+- more sql injection protection in LetoDMS_Core_User
+
+3.3.7 (2012-08-25)
+---------------------
+- no changes, just keep same version as letodms application
+
+3.3.6 (2012-07-16)
+---------------------
+- no changes, just keep same version as letodms application
+
+3.3.5 (2012-04-30)
+---------------------
+- minor corrections
+
+3.3.4 (2012-04-11)
+---------------------
+- fixed bug in LetoDMS_Core_DocumentFile::getPath()
+
+3.3.3 (2012-03-28)
+---------------------
+- fixed bug in LetoDMS_Core_Document::getPath()
+
+3.3.2 (2012-03-22)
+---------------------
+- fixed bug in LetoDMS_Core_Document::getDir()
+
+3.3.1 (2012-03-21)
+---------------------
+- new release
+
+3.3.0 (2012-02-08)
+---------------------
+- added methods to find and repair errors in document and folder records
+- removed sendmail parameter from some methods in LetoDMS_Core_Document
+- do not use some of the temporay tables anymore
+- SetFetchMode(ADODB_FETCH_ASSOC) in LetoDMS_Core_DatabaseAccess::connect()
+
+3.2.0 (2011-07-23)
+---------------------
+New release
+
+3.0.0 (2010-04-27)
+---------------------
+Initial release
+

From 33f7567241412354ed6e249325d9097394935342 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 12:28:35 +0100
Subject: [PATCH 1783/2006] add unit tests

---
 SeedDMS_Core/bootstrap-5.php                  |    3 +
 SeedDMS_Core/bootstrap-6.php                  |    3 +
 SeedDMS_Core/phpunit.xml                      |   26 +
 SeedDMS_Core/tests/.phpunit.result.cache      |    1 +
 .../tests/AttributeDefinitionTest.php         |  574 ++++
 SeedDMS_Core/tests/AttributeTest.php          |  155 +
 SeedDMS_Core/tests/DatabaseTest.php           |  324 ++
 SeedDMS_Core/tests/DmsTest.php                | 2956 +++++++++++++++++
 SeedDMS_Core/tests/DmsWithDataTest.php        |  290 ++
 SeedDMS_Core/tests/DocumentCategoryTest.php   |  295 ++
 SeedDMS_Core/tests/DocumentContentTest.php    |  593 ++++
 SeedDMS_Core/tests/DocumentFileTest.php       |  290 ++
 SeedDMS_Core/tests/DocumentLinkTest.php       |  125 +
 SeedDMS_Core/tests/DocumentTest.php           | 1323 ++++++++
 SeedDMS_Core/tests/FileUtilsTest.php          |  219 ++
 SeedDMS_Core/tests/FolderTest.php             | 1221 +++++++
 SeedDMS_Core/tests/GroupTest.php              |  410 +++
 SeedDMS_Core/tests/KeywordCategoryTest.php    |  147 +
 SeedDMS_Core/tests/ReviewApprovalTest.php     |  477 +++
 SeedDMS_Core/tests/SeedDmsBase.php            |  365 ++
 SeedDMS_Core/tests/UserTest.php               | 1679 ++++++++++
 SeedDMS_Core/tests/WorkflowTest.php           |  638 ++++
 22 files changed, 12114 insertions(+)
 create mode 100644 SeedDMS_Core/bootstrap-5.php
 create mode 100644 SeedDMS_Core/bootstrap-6.php
 create mode 100644 SeedDMS_Core/phpunit.xml
 create mode 100644 SeedDMS_Core/tests/.phpunit.result.cache
 create mode 100644 SeedDMS_Core/tests/AttributeDefinitionTest.php
 create mode 100644 SeedDMS_Core/tests/AttributeTest.php
 create mode 100644 SeedDMS_Core/tests/DatabaseTest.php
 create mode 100644 SeedDMS_Core/tests/DmsTest.php
 create mode 100644 SeedDMS_Core/tests/DmsWithDataTest.php
 create mode 100644 SeedDMS_Core/tests/DocumentCategoryTest.php
 create mode 100644 SeedDMS_Core/tests/DocumentContentTest.php
 create mode 100644 SeedDMS_Core/tests/DocumentFileTest.php
 create mode 100644 SeedDMS_Core/tests/DocumentLinkTest.php
 create mode 100644 SeedDMS_Core/tests/DocumentTest.php
 create mode 100644 SeedDMS_Core/tests/FileUtilsTest.php
 create mode 100644 SeedDMS_Core/tests/FolderTest.php
 create mode 100644 SeedDMS_Core/tests/GroupTest.php
 create mode 100644 SeedDMS_Core/tests/KeywordCategoryTest.php
 create mode 100644 SeedDMS_Core/tests/ReviewApprovalTest.php
 create mode 100644 SeedDMS_Core/tests/SeedDmsBase.php
 create mode 100644 SeedDMS_Core/tests/UserTest.php
 create mode 100644 SeedDMS_Core/tests/WorkflowTest.php

diff --git a/SeedDMS_Core/bootstrap-5.php b/SeedDMS_Core/bootstrap-5.php
new file mode 100644
index 000000000..5d0d0e4a5
--- /dev/null
+++ b/SeedDMS_Core/bootstrap-5.php
@@ -0,0 +1,3 @@
+<?php
+// Do any kind of bootstraping for major database version 5
+$majorversion = 5; // just an example, currently not used
diff --git a/SeedDMS_Core/bootstrap-6.php b/SeedDMS_Core/bootstrap-6.php
new file mode 100644
index 000000000..3f8edea6b
--- /dev/null
+++ b/SeedDMS_Core/bootstrap-6.php
@@ -0,0 +1,3 @@
+<?php
+// Do any kind of bootstraping for major database version 6
+$majorversion = 6; // just an example, currently not used
diff --git a/SeedDMS_Core/phpunit.xml b/SeedDMS_Core/phpunit.xml
new file mode 100644
index 000000000..103f11089
--- /dev/null
+++ b/SeedDMS_Core/phpunit.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         cacheResultFile=".phpunit.cache/test-results"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="false"
+         beStrictAboutCoversAnnotation="false"
+         beStrictAboutOutputDuringTests="false"
+         beStrictAboutTodoAnnotatedTests="false"
+         failOnRisky="false"
+         failOnWarning="true"
+         verbose="true">
+    <testsuites>
+        <testsuite name="default">
+            <directory suffix="Test.php">tests</directory>
+        </testsuite>
+    </testsuites>
+
+		<coverage cacheDirectory=".phpunit.cache/code-coverage"
+              includeUncoveredFiles="true"
+              processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">Core</directory>
+        </include>
+    </coverage>
+</phpunit>
diff --git a/SeedDMS_Core/tests/.phpunit.result.cache b/SeedDMS_Core/tests/.phpunit.result.cache
new file mode 100644
index 000000000..007ae03d8
--- /dev/null
+++ b/SeedDMS_Core/tests/.phpunit.result.cache
@@ -0,0 +1 @@
+C:37:"PHPUnit\Runner\DefaultTestResultCache":106:{a:2:{s:7:"defects";a:1:{s:17:"DmsTest::testInit";i:3;}s:5:"times";a:1:{s:17:"DmsTest::testInit";d:0.002;}}}
\ No newline at end of file
diff --git a/SeedDMS_Core/tests/AttributeDefinitionTest.php b/SeedDMS_Core/tests/AttributeDefinitionTest.php
new file mode 100644
index 000000000..f6276e536
--- /dev/null
+++ b/SeedDMS_Core/tests/AttributeDefinitionTest.php
@@ -0,0 +1,574 @@
+<?php
+/**
+ * Implementation of the attribute definiton tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Attribute definition test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class AttributeDefinitionTest extends TestCase
+{
+
+    /**
+     * Create a real dms object with a mocked db
+     *
+     * This mock is only used if \SeedDMS_Core_DatabaseAccess::getResult() is
+     * called once. This is the case for all \SeedDMS_Core_AttributeDefinition::setXXX()
+     * methods like setName().
+     *
+     * @return \SeedDMS_Core_DMS
+     */
+    protected function getDmsWithMockedDb() : \SeedDMS_Core_DMS
+    {
+        $db = $this->createMock(\SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE "))
+            ->willReturn(true);
+        $dms = new \SeedDMS_Core_DMS($db, '');
+        return $dms;
+    }
+
+    /**
+     * Create a mocked dms
+     *
+     * @return \SeedDMS_Core_DMS
+     */
+    protected function getDmsMock() : \SeedDMS_Core_DMS
+    {
+        $dms = $this->createMock(\SeedDMS_Core_DMS::class);
+        $dms->expects($this->any())
+            ->method('getDocument')
+            ->with(1)
+            ->willReturn(true);
+        $dms->expects($this->any())
+            ->method('getFolder')
+            ->with(1)
+            ->willReturn(true);
+        $dms->expects($this->any())
+            ->method('getUser')
+            ->will(
+                $this->returnValueMap(
+                    array(
+                        array(1, new \SeedDMS_Core_User(1, 'admin', 'pass', 'Joe Foo', 'baz@foo.de', 'en_GB', 'bootstrap', 'My comment', \SeedDMS_Core_User::role_admin)),
+                        array(2, new \SeedDMS_Core_User(2, 'admin2', 'pass', 'Joe Bar', 'bar@foo.de', 'en_GB', 'bootstrap', 'My comment', \SeedDMS_Core_User::role_admin)),
+                        array(3, null)
+                    )
+                )
+            );
+        $dms->expects($this->any())
+            ->method('getGroup')
+            ->will(
+                $this->returnValueMap(
+                    array(
+                        array(1, new \SeedDMS_Core_Group(1, 'admin group 1', 'My comment')),
+                        array(2, new \SeedDMS_Core_Group(2, 'admin group 2', 'My comment')),
+                        array(3, null)
+                    )
+                )
+            );
+        return $dms;
+    }
+
+    /**
+     * Create a mock attribute definition object
+     *
+     * @param int     $type      type of attribute
+     * @param boolean $multiple  set to true for multi value attributes
+     * @param int     $minvalues minimum number of attribute values
+     * @param int     $maxvalues maximum number of attribute values
+     * @param string  $valueset  list of allowed values separated by the first char
+     * @param string  $regex     regular expression that must match the attribute value
+     *
+     * @return \SeedDMS_Core_AttributeDefinition
+     */
+    protected function getAttributeDefinition($type, $multiple=false, $minvalues=0, $maxvalues=0, $valueset='', $regex='')
+    {
+        $attrdef = new \SeedDMS_Core_AttributeDefinition(1, 'foo attr', \SeedDMS_Core_AttributeDefinition::objtype_folder, $type, $multiple, $minvalues, $maxvalues, $valueset, $regex);
+        return $attrdef;
+    }
+
+    /**
+     * Test getId()
+     *
+     * @return void
+     */
+    public function testGetId()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        $this->assertEquals(1, $attrdef->getId());
+    }
+
+    /**
+     * Test getName()
+     *
+     * @return void
+     */
+    public function testGetName()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        $this->assertEquals('foo attr', $attrdef->getName());
+    }
+
+    /**
+     * Test setName()
+     *
+     * @return void
+     */
+    public function testSetName()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        /* A mocked dms is needed for updating the database */
+        $attrdef->setDMS(self::getDmsWithMockedDb());
+        $attrdef->setName('bar attr');
+        $this->assertEquals('bar attr', $attrdef->getName());
+    }
+
+    /**
+     * Test getObjType()
+     *
+     * @return void
+     */
+    public function testGetObjType()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::objtype_folder, $attrdef->getObjType());
+    }
+
+    /**
+     * Test setObjType()
+     *
+     * @return void
+     */
+    public function testSetObjType()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        /* A mocked dms is needed for updating the database */
+        $attrdef->setDMS(self::getDmsWithMockedDb());
+        $attrdef->setObjType(\SeedDMS_Core_AttributeDefinition::objtype_document);
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::objtype_document, $attrdef->getObjType());
+    }
+
+    /**
+     * Test getType()
+     *
+     * @return void
+     */
+    public function testGetType()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::type_int, $attrdef->getType());
+    }
+
+    /**
+     * Test setType()
+     *
+     * @return void
+     */
+    public function testSetType()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        /* A mocked dms is needed for updating the database */
+        $attrdef->setDMS(self::getDmsWithMockedDb());
+        $attrdef->setType(\SeedDMS_Core_AttributeDefinition::type_string);
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::type_string, $attrdef->getType());
+    }
+
+    /**
+     * Test getMultipleValues()
+     *
+     * @return void
+     */
+    public function testGetMultipleValues()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        $this->assertEquals(false, $attrdef->getMultipleValues());
+    }
+
+    /**
+     * Test setMultipleValues()
+     *
+     * @return void
+     */
+    public function testSetMultipleValues()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        /* A mocked dms is needed for updating the database */
+        $attrdef->setDMS(self::getDmsWithMockedDb());
+        /* Toogle the current value of multiple values */
+        $oldvalue = $attrdef->getMultipleValues();
+        $attrdef->setMultipleValues(!$oldvalue);
+        $this->assertEquals(!$oldvalue, $attrdef->getMultipleValues());
+    }
+
+    /**
+     * Test getMinValues()
+     *
+     * @return void
+     */
+    public function testGetMinValues()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        $this->assertEquals(0, $attrdef->getMinValues());
+    }
+
+    /**
+     * Test setMinValues()
+     *
+     * @return void
+     */
+    public function testSetMinValues()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        /* A mocked dms is needed for updating the database */
+        $attrdef->setDMS(self::getDmsWithMockedDb());
+        /* add 5 to value of min values */
+        $oldvalue = $attrdef->getMinValues();
+        $attrdef->setMinValues($oldvalue+5);
+        $this->assertEquals($oldvalue+5, $attrdef->getMinValues());
+    }
+
+    /**
+     * Test getMaxValues()
+     *
+     * @return void
+     */
+    public function testGetMaxValues()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        $this->assertEquals(0, $attrdef->getMaxValues());
+    }
+
+    /**
+     * Test setMaxValues()
+     *
+     * @return void
+     */
+    public function testSetMaxValues()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        /* A mocked dms is needed for updating the database */
+        $attrdef->setDMS(self::getDmsWithMockedDb());
+        /* add 5 to value of max values */
+        $oldvalue = $attrdef->getMaxValues();
+        $attrdef->setMaxValues($oldvalue+5);
+        $this->assertEquals($oldvalue+5, $attrdef->getMaxValues());
+    }
+
+    /**
+     * Test getValueSet()
+     *
+     * @return void
+     */
+    public function testGetValueSet()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, false, 0, 0, '|foo|bar|baz');
+        $this->assertEquals('|foo|bar|baz', $attrdef->getValueSet());
+    }
+
+    /**
+     * Test getValueSetSeparator()
+     *
+     * @return void
+     */
+    public function testGetValueSetSeparator()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, false, 0, 0, '|foo|bar|baz');
+        $this->assertEquals('|', $attrdef->getValueSetSeparator());
+        /* No value set will return no separator */
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        $this->assertEmpty($attrdef->getValueSetSeparator());
+        /* Even a 1 char value set will return no separator */
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, false, 0, 0, '|');
+        $this->assertEmpty($attrdef->getValueSetSeparator());
+        /* Multiple users or groups always use a ',' as a separator */
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_user, true);
+        $this->assertEquals(',', $attrdef->getValueSetSeparator());
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_group, true);
+        $this->assertEquals(',', $attrdef->getValueSetSeparator());
+    }
+
+    /**
+     * Test getValueSetAsArray()
+     *
+     * @return void
+     */
+    public function testGetValueSetAsArray()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, false, 0, 0, '|foo|bar|baz  ');
+        $valueset = $attrdef->getValueSetAsArray();
+        $this->assertIsArray($valueset);
+        $this->assertCount(3, $valueset);
+        /* value set must contain 'baz' though 'baz  ' was originally set */
+        $this->assertContains('baz', $valueset);
+        /* No value set will return an empty array */
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string);
+        $valueset = $attrdef->getValueSetAsArray();
+        $this->assertIsArray($valueset);
+        $this->assertEmpty($valueset);
+    }
+
+    /**
+     * Test getValueSetValue()
+     *
+     * @return void
+     */
+    public function testGetValueSetValue()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, false, 0, 0, '|foo|bar|baz  ');
+        $this->assertEquals('foo', $attrdef->getValueSetValue(0));
+        /* Check if trimming of 'baz  ' worked */
+        $this->assertEquals('baz', $attrdef->getValueSetValue(2));
+        /* Getting the value of a none existing index returns false */
+        $this->assertFalse($attrdef->getValueSetValue(3));
+
+        /* Getting a value from a none existing value set returns false as well */
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string);
+        $this->assertFalse($attrdef->getValueSetValue(0));
+    }
+
+    /**
+     * Test setValueSet()
+     *
+     * @return void
+     */
+    public function testSetValueSet()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        /* A mocked dms is needed for updating the database */
+        $attrdef->setDMS(self::getDmsWithMockedDb());
+        /* add 5 to value of min values */
+        $attrdef->setValueSet(' |foo|bar | baz ');
+        $this->assertEquals('|foo|bar|baz', $attrdef->getValueSet());
+    }
+
+    /**
+     * Test getRegex()
+     *
+     * @return void
+     */
+    public function testGetRegex()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, false, 0, 0, '', '[0-9].*');
+        $this->assertEquals('[0-9].*', $attrdef->getRegex());
+    }
+
+    /**
+     * Test setRegex()
+     *
+     * @return void
+     */
+    public function testSetRegex()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string);
+        /* A mocked dms is needed for updating the database */
+        $attrdef->setDMS(self::getDmsWithMockedDb());
+        /* set a new valid regex */
+        $this->assertTrue($attrdef->setRegex(' /[0-9].*/i '));
+        $this->assertEquals('/[0-9].*/i', $attrdef->getRegex());
+        /* set a new invalid regex will return false and keep the old regex */
+        $this->assertFalse($attrdef->setRegex(' /([0-9].*/i '));
+        $this->assertEquals('/[0-9].*/i', $attrdef->getRegex());
+    }
+
+    /**
+     * Test setEmptyRegex()
+     *
+     * @return void
+     */
+    public function testSetEmptyRegex()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string);
+        /* A mocked dms is needed for updating the database */
+        $attrdef->setDMS(self::getDmsWithMockedDb());
+        /* set an empty regex */
+        $this->assertTrue($attrdef->setRegex(''));
+    }
+
+    /**
+     * Test parseValue()
+     *
+     * @return void
+     */
+    public function testParseValue()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string);
+        $value = $attrdef->parseValue('foo');
+        $this->assertIsArray($value);
+        $this->assertCount(1, $value);
+        $this->assertContains('foo', $value);
+        /* An attribute definition with multiple values will split the value by the first char */
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, true, 0, 0, '|baz|bar|foo');
+        $value = $attrdef->parseValue('|bar|baz');
+        $this->assertIsArray($value);
+        $this->assertCount(2, $value);
+        /* An attribute definition without multiple values, will treat the value as a string */
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, false, 0, 0, '|baz|bar|foo');
+        $value = $attrdef->parseValue('|bar|baz');
+        $this->assertIsArray($value);
+        $this->assertCount(1, $value);
+        $this->assertContains('|bar|baz', $value);
+    }
+
+    /**
+     * Test validate()
+     *
+     * @TODO Instead of having a lengthy list of assert calls, this could be
+     * implemented with data providers for each attribute type
+     *
+     * @return void
+     */
+    public function testValidate()
+    {
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string);
+        $this->assertTrue($attrdef->validate('')); // even an empty string is valid
+        $this->assertTrue($attrdef->validate('foo')); // there is no invalid string
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, false, 0, 0, '', '/[0-9]*S/');
+        $this->assertFalse($attrdef->validate('foo')); // doesn't match the regex
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_regex, $attrdef->getValidationError());
+        $this->assertTrue($attrdef->validate('S')); // no leading numbers needed
+        $this->assertTrue($attrdef->validate('8980S')); // leading numbers are ok
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, false, 0, 0, '|foo|bar|baz', '');
+        $this->assertTrue($attrdef->validate('foo')); // is part of value map
+        $this->assertFalse($attrdef->validate('foz')); // is not part of value map
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_valueset, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, true, 0, 0, '|foo|bar|baz', '');
+        $this->assertTrue($attrdef->validate('foo')); // is part of value map
+        $this->assertFalse($attrdef->validate('')); // an empty value cannot be in the valueset
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_valueset, $attrdef->getValidationError());
+        $this->assertTrue($attrdef->validate('|foo|baz')); // both are part of value map
+        $this->assertFalse($attrdef->validate('|foz|baz')); // 'foz' is not part of value map
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_valueset, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_string, true, 1, 1, '|foo|bar|baz', '');
+        $this->assertTrue($attrdef->validate('foo')); // is part of value map
+        $this->assertFalse($attrdef->validate('')); // empty string is invalid because of min values = 1
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_min_values, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('|foo|baz')); // both are part of value map, but only value is allowed
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_max_values, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_boolean);
+        $this->assertTrue($attrdef->validate(0));
+        $this->assertTrue($attrdef->validate(1));
+        $this->assertFalse($attrdef->validate(2));
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_boolean, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_int);
+        $this->assertTrue($attrdef->validate(0));
+        $this->assertTrue($attrdef->validate('0'));
+        $this->assertFalse($attrdef->validate('a'));
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_int, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_date);
+        $this->assertTrue($attrdef->validate('2021-09-30'));
+        $this->assertTrue($attrdef->validate('1968-02-29')); // 1968 was a leap year
+        $this->assertTrue($attrdef->validate('2000-02-29')); // 2000 was a leap year
+        $this->assertFalse($attrdef->validate('1900-02-29')); // 1900 didn't was a leap year
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_date, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('1970-02-29')); // 1970 didn't was a leap year
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_date, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('2010/02/28')); // This has the wrong format
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_date, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('1970-00-29')); // 0 month is not allowed
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_date, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('1970-01-00')); // 0 day is not allowed
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_date, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_float);
+        $this->assertTrue($attrdef->validate('0.567'));
+        $this->assertTrue($attrdef->validate('1000'));
+        $this->assertTrue($attrdef->validate('1000e3'));
+        $this->assertTrue($attrdef->validate('1000e-3'));
+        $this->assertTrue($attrdef->validate('-1000'));
+        $this->assertTrue($attrdef->validate('+1000'));
+        $this->assertFalse($attrdef->validate('0,567')); // wrong decimal point
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_float, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('0.56.7')); // two decimal point
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_float, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_email);
+        $this->assertTrue($attrdef->validate('info@seeddms.org'));
+        $this->assertTrue($attrdef->validate('info@seeddms.verylongtopleveldomain'));
+        $this->assertFalse($attrdef->validate('@seeddms.org')); // no user
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_email, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('info@localhost')); // no tld
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_email, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('info@@seeddms.org')); // double @
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_email, $attrdef->getValidationError());
+        $this->assertTrue($attrdef->validate('info@subsubdomain.subdomain.seeddms.org')); // multiple subdomains are ok
+        $this->assertFalse($attrdef->validate('info@seeddms..org')); // double . is not allowed
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_email, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('info@s.org')); // 2nd level domain name is too short
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_email, $attrdef->getValidationError());
+        $this->assertFalse($attrdef->validate('info@seeddms.o')); // top level domain name is too short
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_email, $attrdef->getValidationError());
+        $this->assertTrue($attrdef->validate('info@0123456789-0123456789-0123456789-0123456789-0123456789-01234567.org')); // domain name is 63 chars long, which is the max length
+        $this->assertFalse($attrdef->validate('info@0123456789-0123456789-0123456789-0123456789-0123456789-012345678.org')); // domain name is 1 char longer than 63 chars
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_email, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_url);
+        $this->assertTrue($attrdef->validate('http://seeddms.org'));
+        $this->assertTrue($attrdef->validate('https://seeddms.org'));
+        $this->assertFalse($attrdef->validate('ftp://seeddms.org')); // ftp is not allowed
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_url, $attrdef->getValidationError());
+        $this->assertTrue($attrdef->validate('http://localhost')); // no tld is just fine
+        $this->assertFalse($attrdef->validate('http://localhost.o')); // tld is to short
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_url, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_user);
+        $attrdef->setDMS(self::getDmsMock());
+        $this->assertTrue($attrdef->validate(1));
+        $this->assertFalse($attrdef->validate(3));
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_user, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_group);
+        $attrdef->setDMS(self::getDmsMock());
+        $this->assertTrue($attrdef->validate('1'));
+        $this->assertTrue($attrdef->validate('2'));
+        $this->assertFalse($attrdef->validate('3')); // there is no group with id=3
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_group, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_group, true);
+        $attrdef->setDMS(self::getDmsMock());
+        $this->assertTrue($attrdef->validate(',1,2'));
+        $this->assertFalse($attrdef->validate(',1,2,3')); // there is no group with id=3
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_group, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_user);
+        $attrdef->setDMS(self::getDmsMock());
+        $this->assertTrue($attrdef->validate('1'));
+        $this->assertTrue($attrdef->validate('2'));
+        $this->assertFalse($attrdef->validate('3')); // there is no user with id=3
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_user, $attrdef->getValidationError());
+
+        $attrdef = self::getAttributeDefinition(\SeedDMS_Core_AttributeDefinition::type_user, true);
+        $attrdef->setDMS(self::getDmsMock());
+        $this->assertTrue($attrdef->validate(',1,2'));
+        $this->assertFalse($attrdef->validate(',1,2,3')); // there is no user with id=3
+        $this->assertEquals(\SeedDMS_Core_AttributeDefinition::val_error_user, $attrdef->getValidationError());
+    }
+
+}
diff --git a/SeedDMS_Core/tests/AttributeTest.php b/SeedDMS_Core/tests/AttributeTest.php
new file mode 100644
index 000000000..66d7dba84
--- /dev/null
+++ b/SeedDMS_Core/tests/AttributeTest.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Implementation of the attribute tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Attribute and attribute definition test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class AttributeTest extends TestCase
+{
+
+    /**
+     * Create a mock dms object
+     *
+     * @return SeedDMS_Core_DMS
+     */
+    protected function getMockDMS() : SeedDMS_Core_DMS
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->any())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE "))
+            ->willReturn(true);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        return $dms;
+    }
+
+    /**
+     * Create a mock attribute definition object
+     *
+     * @param int     $type      type of attribute
+     * @param boolean $multiple  true if multiple values are allowed
+     * @param int     $minvalues minimum number of required values
+     * @param int     $maxvalues maximum number of required value
+     * @param string  $valueset  list of allowed values separated by the first char
+     * @param string  $regex     regular expression the attribute value must match
+     *
+     * @return SeedDMS_Core_AttributeDefinition
+     */
+    protected function getAttributeDefinition($type, $multiple=false, $minvalues=0, $maxvalues=0, $valueset='', $regex='')
+    {
+        $attrdef = new SeedDMS_Core_AttributeDefinition(1, 'foo attrdef', SeedDMS_Core_AttributeDefinition::objtype_folder, $type, $multiple, $minvalues, $maxvalues, $valueset, $regex);
+        return $attrdef;
+    }
+
+    /**
+     * Create a mock attribute object
+     *
+     * @param SeedDMS_Core_AttributeDefinition $attrdef attribute defintion of attribute
+     * @param mixed                            $value   value of attribute
+     *
+     * @return SeedDMS_Core_Attribute
+     */
+    static protected function getAttribute($attrdef, $value)
+    {
+        $folder = new SeedDMS_Core_Folder(1, 'Folder', null, '', '', '', 0, 0, 0);
+        $attribute = new SeedDMS_Core_Attribute(1, $folder, $attrdef, $value);
+        $attribute->setDMS($attrdef->getDMS());
+        return $attribute;
+    }
+
+    /**
+     * Test getId()
+     *
+     * @return void
+     */
+    public function testGetId()
+    {
+        $attrdef = self::getAttributeDefinition(SeedDMS_Core_AttributeDefinition::type_int);
+        $attribute = self::getAttribute($attrdef, '');
+        $this->assertEquals(1, $attribute->getId());
+    }
+
+    /**
+     * Test getValue()
+     *
+     * @return void
+     */
+    public function testGetValue()
+    {
+        $attrdef = self::getAttributeDefinition(SeedDMS_Core_AttributeDefinition::type_int);
+        $attribute = self::getAttribute($attrdef, 7);
+        $this->assertEquals(7, $attribute->getValue());
+    }
+
+    /**
+     * Test getValueAsArray()
+     *
+     * @return void
+     */
+    public function testGetValueAsArray()
+    {
+        $attrdef = self::getAttributeDefinition(SeedDMS_Core_AttributeDefinition::type_int);
+        $attribute = self::getAttribute($attrdef, 7);
+        $this->assertIsArray($attribute->getValueAsArray());
+        $this->assertCount(1, $attribute->getValueAsArray());
+        $this->assertContains(7, $attribute->getValueAsArray());
+
+        /* Test a multi value integer */
+        $attrdef = self::getAttributeDefinition(SeedDMS_Core_AttributeDefinition::type_int, true);
+        $attribute = self::getAttribute($attrdef, ',3,4,6');
+        $value = $attribute->getValueAsArray();
+        $this->assertIsArray($attribute->getValueAsArray());
+        $this->assertCount(3, $attribute->getValueAsArray());
+        $this->assertContains('6', $attribute->getValueAsArray());
+    }
+
+    /**
+     * Test setValue()
+     *
+     * @return void
+     */
+    public function testSetValue()
+    {
+        $attrdef = self::getAttributeDefinition(SeedDMS_Core_AttributeDefinition::type_int);
+        $attrdef->setDMS(self::getMockDMS());
+        $attribute = self::getAttribute($attrdef, 0);
+        $this->assertTrue($attribute->setValue(9));
+        $this->assertEquals(9, $attribute->getValue());
+        /* Setting an array of values for a none multi value attribute will just take the
+         * element of the array.
+         */
+        $this->assertTrue($attribute->setValue([8,9]));
+        $this->assertEquals(8, $attribute->getValue());
+
+        $attrdef = self::getAttributeDefinition(SeedDMS_Core_AttributeDefinition::type_int, true);
+        $attrdef->setDMS(self::getMockDMS());
+        $attribute = self::getAttribute($attrdef, ',3,4,6');
+        $attribute->setValue([8,9,10]);
+        $this->assertEquals(',8,9,10', $attribute->getValue());
+        $this->assertIsArray($attribute->getValueAsArray());
+        $this->assertCount(3, $attribute->getValueAsArray());
+        $this->assertContains('9', $attribute->getValueAsArray());
+    }
+}
diff --git a/SeedDMS_Core/tests/DatabaseTest.php b/SeedDMS_Core/tests/DatabaseTest.php
new file mode 100644
index 000000000..bfbc5ce42
--- /dev/null
+++ b/SeedDMS_Core/tests/DatabaseTest.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * Implementation of the low level database tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+namespace PHPUnit\Framework;
+
+use PHPUnit\Framework\SeedDmsTest;
+
+require_once('SeedDmsBase.php');
+
+/**
+ * Low level Database test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class DatabaseTest extends SeedDmsTest
+{
+
+    /**
+     * Create a sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+    }
+
+    /**
+     * Check if connection to database exists
+     *
+     * @return void
+     */
+    public function testIsConnected()
+    {
+        $this->assertTrue(self::$dbh->ensureConnected());
+    }
+
+    /**
+     * Test for number of tables in database
+     *
+     * @return void
+     */
+    public function testTableList()
+    {
+        $tablelist = self::$dbh->TableList();
+        $this->assertIsArray($tablelist);
+        // There are just 42 tables in SeedDMS5 and 55 tables in SeedDMS6,
+        // but one additional
+        // table 'sqlite_sequence'
+        $dms = new \SeedDMS_Core_DMS(null, '');
+        if($dms->version[0] == '5')
+            $this->assertCount(43, $tablelist);
+        else
+            $this->assertCount(56, $tablelist);
+    }
+
+    /**
+     * Test createTemporaryTable()
+     *
+     * @return void
+     */
+    public function testCreateTemporaryTable()
+    {
+        foreach (['ttreviewid', 'ttapproveid', 'ttstatid', 'ttcontentid'] as $temp) {
+            $ret = self::$dbh->createTemporaryTable($temp);
+            $rec = self::$dbh->getResultArray("SELECT * FROM `".$temp."`");
+            $this->assertIsArray($rec);
+        }
+        /* Running it again will not harm */
+        foreach (['ttreviewid', 'ttapproveid', 'ttstatid', 'ttcontentid'] as $temp) {
+            $ret = self::$dbh->createTemporaryTable($temp);
+            $rec = self::$dbh->getResultArray("SELECT * FROM `".$temp."`");
+            $this->assertIsArray($rec);
+        }
+        /* Running it again and overwrite the old table contents */
+        foreach (['ttreviewid', 'ttapproveid', 'ttstatid', 'ttcontentid'] as $temp) {
+            $ret = self::$dbh->createTemporaryTable($temp, true);
+            $rec = self::$dbh->getResultArray("SELECT * FROM `".$temp."`");
+            $this->assertIsArray($rec);
+        }
+    }
+
+    /**
+     * Test createTemporaryTable() based on views
+     *
+     * @return void
+     */
+    public function testCreateTemporaryTableBasedOnViews()
+    {
+        self::$dbh->useViews(true);
+        foreach (['ttreviewid', 'ttapproveid', 'ttstatid', 'ttcontentid'] as $temp) {
+            $ret = self::$dbh->createTemporaryTable($temp);
+            $rec = self::$dbh->getResultArray("SELECT * FROM `".$temp."`");
+            $this->assertIsArray($rec);
+        }
+        $viewlist = self::$dbh->ViewList();
+        $this->assertIsArray($viewlist);
+        $this->assertCount(4, $viewlist);
+
+        /* Running it again will not harm */
+        foreach (['ttreviewid', 'ttapproveid', 'ttstatid', 'ttcontentid'] as $temp) {
+            $ret = self::$dbh->createTemporaryTable($temp);
+            $rec = self::$dbh->getResultArray("SELECT * FROM `".$temp."`");
+            $this->assertIsArray($rec);
+        }
+        /* Running it again and replace the old view */
+        foreach (['ttreviewid', 'ttapproveid', 'ttstatid', 'ttcontentid'] as $temp) {
+            $ret = self::$dbh->createTemporaryTable($temp, true);
+            $rec = self::$dbh->getResultArray("SELECT * FROM `".$temp."`");
+            $this->assertIsArray($rec);
+        }
+    }
+
+    /**
+     * Test for number of views in database
+     *
+     * @return void
+     */
+    public function testViewList()
+    {
+        $viewlist = self::$dbh->ViewList();
+        $this->assertIsArray($viewlist);
+        // There are 0 views
+        $this->assertCount(0, $viewlist);
+    }
+
+    /**
+     * Test getDriver()
+     *
+     * @return void
+     */
+    public function testGetDriver()
+    {
+        $driver = self::$dbh->getDriver();
+        $this->assertEquals('sqlite', $driver);
+    }
+
+    /**
+     * Test rbt()
+     *
+     * @return void
+     */
+    public function testRbt()
+    {
+        $str = self::$dbh->rbt("SELECT * FROM `tblUsers`");
+        $this->assertEquals('SELECT * FROM "tblUsers"', $str);
+    }
+
+    /**
+     * Test if table tblFolders has root folder
+     *
+     * @return void
+     */
+    public function testInitialRootFolder()
+    {
+        $this->assertTrue(self::$dbh->hasTable('tblFolders'));
+        $query = 'SELECT * FROM `tblFolders`';
+        $recs = self::$dbh->getResultArray($query);
+        $this->assertIsArray($recs);
+        $this->assertCount(1, $recs);
+    }
+
+    /**
+     * Test if table tblUsers has two initial users
+     *
+     * @return void
+     */
+    public function testInitialUsers()
+    {
+        $this->assertTrue(self::$dbh->hasTable('tblUsers'));
+        $query = 'SELECT * FROM `tblUsers`';
+        $recs = self::$dbh->getResultArray($query);
+        $this->assertIsArray($recs);
+        $this->assertCount(2, $recs);
+    }
+
+    /**
+     * Test getCurrentDatetime()
+     *
+     * @return void
+     */
+    public function testGetCurrentDatetime()
+    {
+        $query = 'SELECT '.self::$dbh->getCurrentDatetime().' as a';
+        $recs = self::$dbh->getResultArray($query);
+        $now = date('Y-m-d H:i:s');
+        $this->assertIsArray($recs);
+        $this->assertEquals($now, $recs[0]['a'], 'Make sure php.ini has the proper timezone configured');
+    }
+
+    /**
+     * Test getCurrentTimestamp()
+     *
+     * @return void
+     */
+    public function testGetCurrentTimestamp()
+    {
+        $query = 'SELECT '.self::$dbh->getCurrentTimestamp().' as a';
+        $recs = self::$dbh->getResultArray($query);
+        $now = time();
+        $this->assertIsArray($recs);
+        $this->assertEquals($now, $recs[0]['a'], 'Make sure php.ini has the proper timezone configured');
+    }
+
+    /**
+     * Test concat()
+     *
+     * @return void
+     */
+    public function testConcat()
+    {
+        $query = 'SELECT '.self::$dbh->concat(["'foo'", "'baz'", "'bar'"]).' as a';
+        $recs = self::$dbh->getResultArray($query);
+        $this->assertIsArray($recs);
+        $this->assertEquals('foobazbar', $recs[0]['a']);
+    }
+
+    /**
+     * Test qstr()
+     *
+     * @return void
+     */
+    public function testQstr()
+    {
+        $str = self::$dbh->qstr("bar");
+        $this->assertEquals("'bar'", $str);
+    }
+
+    /**
+     * Test getResult() if the sql fails
+     *
+     * @return void
+     */
+    public function testGetResultSqlFail()
+    {
+        $ret = self::$dbh->getResult("UPDATE FOO SET `name`='foo'");
+        $this->assertFalse($ret);
+        $errmsg = self::$dbh->getErrorMsg();
+        $this->assertStringContainsString('no such table: FOO', $errmsg);
+    }
+
+    /**
+     * Test getResultArray() if the sql fails
+     *
+     * @return void
+     */
+    public function testGetResultArraySqlFail()
+    {
+        $ret = self::$dbh->getResultArray("SELECT * FROM FOO");
+        $this->assertFalse($ret);
+        $errmsg = self::$dbh->getErrorMsg();
+        $this->assertStringContainsString('no such table: FOO', $errmsg);
+    }
+
+    /**
+     * Test logging into file
+     *
+     * @return void
+     */
+    public function testLogging()
+    {
+        $fp = fopen('php://memory', 'r+');
+        self::$dbh->setLogFp($fp);
+        $sql = "SELECT * FROM `tblUsers`";
+        $ret = self::$dbh->getResultArray($sql);
+        $this->assertIsArray($ret);
+        fseek($fp, 0);
+        $contents = fread($fp, 200);
+        /* Check if sql statement was logged into file */
+        $this->assertStringContainsString($sql, $contents);
+        fclose($fp);
+    }
+
+    /**
+     * Test createDump()
+     *
+     * @return void
+     */
+    public function testCreateDump()
+    {
+        $fp = fopen('php://memory', 'r+');
+        $ret = self::$dbh->createDump($fp);
+        $this->assertTrue($ret);
+        $stat = fstat($fp);
+        $this->assertIsArray($stat);
+        $dms = new \SeedDMS_Core_DMS(null, '');
+        if($dms->version[0] == '5')
+            $this->assertEquals(1724, $stat['size']);
+        else
+            $this->assertEquals(2272, $stat['size']);
+//        fseek($fp, 0);
+//        echo fread($fp, 200);
+        fclose($fp);
+    }
+}
+
diff --git a/SeedDMS_Core/tests/DmsTest.php b/SeedDMS_Core/tests/DmsTest.php
new file mode 100644
index 000000000..a6811c5d6
--- /dev/null
+++ b/SeedDMS_Core/tests/DmsTest.php
@@ -0,0 +1,2956 @@
+<?php
+/**
+ * Implementation of the dms tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * DMS test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class DmsTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+        self::$dbversion = self::$dms->getDBVersion();
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Create a mock admin role object (only used for SeedDMS 6)
+     *
+     * @return SeedDMS_Core_User
+     */
+    protected function getAdminRole()
+    {
+        $role = new SeedDMS_Core_Role(1, 'admin', SeedDMS_Core_Role::role_admin);
+        return $role;
+    }
+
+    /**
+     * Test checkIfEqual()
+     *
+     * @return void
+     */
+    public function testCheckIfEqual()
+    {
+        $user1 = new SeedDMS_Core_User(1, 'user 1', '', '', '', '', '', '', 1);
+        $group1 = new SeedDMS_Core_Group(1, 'group 1', '');
+        $group1n = new SeedDMS_Core_Group(1, 'group 1n', '');
+        $group1c = clone $group1;
+        $group2 = new SeedDMS_Core_Group(2, 'group 1', '');
+        $dms = new SeedDMS_Core_DMS(null, '');
+        $this->assertFalse($dms->checkIfEqual($group1, $user1)); // different classes
+        $this->assertFalse($dms->checkIfEqual($group1, $group2)); // different id
+        $this->assertTrue($dms->checkIfEqual($group1, $group1c)); // a clone is always equal
+        $this->assertTrue($dms->checkIfEqual($group1, $group1n)); // different instances but same id is sufficient to be equal
+    } /* }}} */
+
+    /**
+     * Test checkDate()
+     *
+     * @return void
+     */
+    public function testCheckDate()
+    {
+        $dms = new SeedDMS_Core_DMS(null, '');
+        $this->assertTrue($dms->checkDate('2020-02-28 10:12:34'));
+        $this->assertTrue($dms->checkDate('2020-02-29 10:12:34')); // a leap year
+        $this->assertFalse($dms->checkDate('2020-02-30 10:12:34')); // feb has never 30 days
+        $this->assertFalse($dms->checkDate('2021-02-29 10:12:34')); // not a leap year
+        $this->assertFalse($dms->checkDate('2020-02-28 24:12:34')); // hour is out of range
+        $this->assertFalse($dms->checkDate('2020-02-28 23:60:34')); // minute is out of range
+        $this->assertFalse($dms->checkDate('2020-02-28 23:59:60')); // second is out of range
+        $this->assertFalse($dms->checkDate('2020-02-28 23:59:')); // second is missing
+        $this->assertTrue($dms->checkDate('2020-02-28', 'Y-m-d')); // just checking the date
+        $this->assertFalse($dms->checkDate('28.2.2020', 'd.m.Y')); // month must be 01-12
+        $this->assertTrue($dms->checkDate('28.2.2020', 'd.n.Y')); // month must be 1-12
+        $this->assertFalse($dms->checkDate('28.02.2020', 'd.n.Y')); // month must be 1-12
+    } /* }}} */
+
+    /**
+     * Test getClassname()
+     *
+     * @return void
+     */
+    public function testGetClassName()
+    {
+        /* Do not mess up the global instance self::$dms, but create my own */
+        $dms = new SeedDMS_Core_DMS(null, '');
+        $this->assertEquals('SeedDMS_Core_Folder', $dms->getClassname('folder'));
+        $this->assertEquals('SeedDMS_Core_Document', $dms->getClassname('document'));
+        $this->assertEquals('SeedDMS_Core_DocumentContent', $dms->getClassname('documentcontent'));
+        $this->assertEquals('SeedDMS_Core_User', $dms->getClassname('user'));
+        $this->assertEquals('SeedDMS_Core_Group', $dms->getClassname('group'));
+        $this->assertFalse($dms->getClassname('foo'));
+    }
+
+    /**
+     * Test setClassname()
+     *
+     * @return void
+     */
+    public function testSetClassName()
+    {
+        /* Do not mess up the global instance self::$dms, but create my own */
+        $dms = new SeedDMS_Core_DMS(null, '');
+        $this->assertEquals('SeedDMS_Core_Folder', $dms->setClassname('folder', 'MyNewFolderClass'));
+        $this->assertEquals('MyNewFolderClass', $dms->getClassname('folder'));
+        $this->assertEquals('MyNewFolderClass', $dms->setClassname('folder', 'MySuperNewFolderClass'));
+        $this->assertFalse($dms->setClassname('foo', 'MyNewFolderClass'));
+    }
+
+    /**
+     * Test addCallback()
+     *
+     * @return void
+     */
+    public function testAddCallback()
+    {
+        /* Do not mess up the global instance self::$dms, but create my own */
+        $dms = new SeedDMS_Core_DMS(null, '');
+        /* Add a closure as a callback is just fine */
+        $this->assertTrue(
+            $dms->addCallback(
+                'onPostSomething', function () {
+                }
+            )
+        );
+        /* An empty callback will make addCallback() fail */
+        $this->assertFalse(
+            $dms->addCallback(
+                '', function () {
+                }
+            )
+        );
+        /* Passing a class method is ok */
+        $this->assertTrue($dms->addCallback('onPostSomething', 'DmsTest::testAddCallback'));
+        /* Passing a none existing class mehtod makes addCallback() fail */
+        $this->assertFalse($dms->addCallback('onPostSomething', 'DmsTest::thisMethodDoesNotExist'));
+    }
+
+    /**
+     * Test for hasCallback
+     *
+     * @return void
+     */
+    public function testHasCallback()
+    {
+        /* Do not mess up the global instance self::$dms, but create my own */
+        $dms = new SeedDMS_Core_DMS(null, '');
+        /* Add a closure as a callback is just fine */
+        $this->assertTrue(
+            $dms->addCallback(
+                'onPostSomething', function () {
+                }
+            )
+        );
+        $this->assertTrue($dms->hasCallback('onPostSomething'));
+        $this->assertFalse($dms->hasCallback('thisOneDoesNotExist'));
+    }
+
+    /**
+     * Test for getDecorators
+     *
+     * @return void
+     */
+    public function testGetDecorators()
+    {
+        /* Do not mess up the global instance self::$dms, but create my own */
+        $dms = new SeedDMS_Core_DMS(null, '');
+        $this->assertFalse($dms->getDecorators('folder'));
+    }
+
+    /**
+     * Test for addDecorator
+     *
+     * @return void
+     */
+    public function testaddDecorator()
+    {
+        /* Do not mess up the global instance self::$dms, but create my own */
+        $dms = new SeedDMS_Core_DMS(null, '');
+        $this->assertTrue($dms->addDecorator('folder', 'MyNewDecorator'));
+        $decorators = $dms->getDecorators('folder');
+        $this->assertIsArray($decorators);
+        $this->assertCount(1, $decorators);
+    }
+
+    /**
+     * Test getDb()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDb()
+    {
+        $this->assertEquals(self::$dbh, self::$dms->getDb());
+    }
+
+    /**
+     * Test getDBVersion()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDbVersion()
+    {
+        $version = self::$dms->getDBVersion();
+        $this->assertCount(4, $version);
+        $this->assertGreaterThanOrEqual(5, $version['major']);
+        $this->assertGreaterThanOrEqual(0, $version['minor']);
+    }
+
+    /**
+     * Test getDBVersionFailMissingTable()
+     *
+     * This method checks if getDBVersion() returns false if the table
+     * list of the database does not contain the table 'tblVersion'
+     *
+     * @return void
+     */
+    public function testGetDbVersionFailMissingTable()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('TableList')
+            ->willReturn(['tblFolders', 'tblDocuments']);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $version = $dms->getDBVersion();
+        $this->assertFalse($version);
+    }
+
+    /**
+     * Test getDBVersionSqlFail()
+     *
+     * This method checks if getDBVersion() returns false if the sql
+     * for selecting the records in table 'tblVersion' fail
+     *
+     * @return void
+     */
+    public function testGetDbVersionSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblVersion` ORDER BY `major`,`minor`,`subminor` LIMIT 1")
+            ->willReturn(false);
+        $db->expects($this->once())
+            ->method('TableList')
+            ->willReturn(['tblVersion', 'tblFolders', 'tblDocuments']);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $version = $dms->getDBVersion();
+        $this->assertFalse($version);
+    }
+
+    /**
+     * Test getDBVersionNoRecord()
+     *
+     * This method checks if getDBVersion() returns false a table 'tblVersion'
+     * exists but has no record
+     *
+     * @return void
+     */
+    public function testGetDbVersionNoRecord()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblVersion` ORDER BY `major`,`minor`,`subminor` LIMIT 1")
+            ->willReturn(array());
+        $db->expects($this->once())
+            ->method('TableList')
+            ->willReturn(['tblVersion', 'tblFolders', 'tblDocuments']);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $version = $dms->getDBVersion();
+        $this->assertFalse($version);
+    }
+
+    /**
+     * Test checkVersion()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testCheckVersion()
+    {
+        $this->assertTrue(self::$dms->checkVersion());
+    }
+
+    /**
+     * Test checkVersionFail()
+     *
+     * This method checks if checkVersion() returns false if the version
+     * in table 'tblVersion' does not match the version in the class variable
+     * $version. To make this method independant of version changes, the
+     * current version is taken from SeedDMS_Core_DMS::version and modified
+     * in order to differ from the version stored in the database.
+     *
+     * @return void
+     */
+    public function testcheckVersionFail()
+    {
+        $verstr = (new SeedDMS_Core_DMS(null, ''))->version;
+        $verarr = explode('.', $verstr);
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblVersion` ORDER BY `major`,`minor`,`subminor` LIMIT 1")
+            ->willReturn([['major'=>$verarr[0], 'minor'=>$verarr[1]+1]]);
+        $db->expects($this->once())
+            ->method('TableList')
+            ->willReturn(['tblVersion', 'tblFolders', 'tblDocuments']);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $version = $dms->checkVersion();
+        $this->assertFalse($version);
+    }
+
+    /**
+     * Test checkVersionSqlFail()
+     *
+     * This method checks if checkVersion() returns false if the sql
+     * for selecting the records in table 'tblVersion' fail
+     *
+     * @return void
+     */
+    public function testcheckVersionSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblVersion` ORDER BY `major`,`minor`,`subminor` LIMIT 1")
+            ->willReturn(false);
+        $db->expects($this->once())
+            ->method('TableList')
+            ->willReturn(['tblVersion', 'tblFolders', 'tblDocuments']);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $version = $dms->checkVersion();
+        $this->assertFalse($version);
+    }
+
+    /**
+     * Test checkVersionFailMissingTable()
+     *
+     * This method checks if checkVersion() returns false if the table
+     * list of the database does not contain the table 'tblVersion'
+     *
+     * @return void
+     */
+    public function testCheckVersionFailMissingTable()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('TableList')
+            ->willReturn(['tblFolders', 'tblDocuments']);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $version = $dms->checkVersion();
+        $this->assertTrue($version); // A missing table tblVersion returns true!
+    }
+
+    /**
+     * Test checkVersionNoRecord()
+     *
+     * This method checks if checkVersion() returns false a table 'tblVersion'
+     * exists but has no record
+     *
+     * @return void
+     */
+    public function testCheckVersionNoRecord()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblVersion` ORDER BY `major`,`minor`,`subminor` LIMIT 1")
+            ->willReturn(array());
+        $db->expects($this->once())
+            ->method('TableList')
+            ->willReturn(['tblVersion', 'tblFolders', 'tblDocuments']);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $version = $dms->checkVersion();
+        $this->assertFalse($version);
+    }
+
+    /**
+     * Test setRootFolderID()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetRootFolderID()
+    {
+        /* Setting the same root folder is ok */
+        $oldid = self::$dms->setRootFolderID(1);
+        $this->assertEquals(1, $oldid);
+        /* Setting a none existing root folder id will not change the root folder */
+        $oldid = self::$dms->setRootFolderID(2);
+        $this->assertFalse($oldid);
+        /* Make sure the old root folder is still set */
+        $rootfolder = self::$dms->getRootFolder();
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $rootfolder);
+        $this->assertEquals(1, $rootfolder->getId());
+    }
+
+    /**
+     * Test getRootFolder()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetRootFolder()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $rootfolder);
+        $this->assertEquals(1, $rootfolder->getId());
+    }
+
+    /**
+     * Test setUser()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetUser()
+    {
+        $user = self::$dms->getUser(1);
+        $olduser = self::$dms->setUser($user); // returns null because there is no old user
+        $this->assertNull($olduser);
+        $olduser = self::$dms->setUser($user); // second call will return the user set before
+        $this->assertIsObject($olduser);
+        $olduser = self::$dms->setUser(null); // old user is still an object
+        $this->assertIsObject($olduser);
+        $olduser = self::$dms->setUser(8); // invalid user
+        $this->assertFalse($olduser);
+    }
+
+    /**
+     * Test getLoggedInUser()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetLoggedInUser()
+    {
+        $olduser = self::$dms->getLoggedInUser(); // initially this is set to null
+        $this->assertNull($olduser);
+        $user = self::$dms->getUser(1);
+        self::$dms->setUser($user);
+        $olduser = self::$dms->getLoggedInUser();
+        $this->assertEquals($olduser->getId(), $user->getId());
+    }
+
+    /**
+     * Test getDocument()
+     *
+     * As there is currently no document, getDocument() must return null.
+     * If false was returned it would indicated an sql error.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocument()
+    {
+        $document = self::$dms->getDocument(1);
+        $this->assertNull($document);
+    }
+
+    /**
+     * Test getDocumentsByUser()
+     *
+     * As there is currently no document, getDocumentsByUser() must return
+     * an empty array.
+     * If false was returned it would indicated an sql error.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentsByUser()
+    {
+        $documents = self::$dms->getDocumentsByUser(self::$dms->getUser(1));
+        $this->assertIsArray($documents);
+        $this->assertCount(0, $documents);
+    }
+
+    /**
+     * Test getDocumentsLockedByUser()
+     *
+     * As there is currently no document, getDocumentsLockedByUser() must return
+     * an empty array.
+     * If false was returned it would indicated an sql error.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentsLockedByUser()
+    {
+        $documents = self::$dms->getDocumentsLockedByUser(self::$dms->getUser(1));
+        $this->assertIsArray($documents);
+        $this->assertCount(0, $documents);
+    }
+
+    /**
+     * Test makeTimeStamp()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testMakeTimeStamp()
+    {
+        /* Assert correct date */
+        $this->assertEquals(0, self::$dms->makeTimeStamp(1, 0, 0, 1970, 1, 1));
+        $this->assertEquals(68166000, self::$dms->makeTimeStamp(0, 0, 0, 1972, 2, 29));
+        /* Assert incorrect dates */
+        $this->assertFalse(self::$dms->makeTimeStamp(0, 0, 0, 1970, 13, 1), 'Incorrect month not recognized');
+        $this->assertFalse(self::$dms->makeTimeStamp(0, 0, 0, 1970, 1, 32), 'Incorrect day in january not recognized');
+        $this->assertFalse(self::$dms->makeTimeStamp(0, 0, 0, 1970, 4, 31), 'Incorrect day in april not recognized');
+        $this->assertFalse(self::$dms->makeTimeStamp(0, 0, 0, 1970, 2, 29), 'Incorrect day in february not recognized');
+        $this->assertFalse(self::$dms->makeTimeStamp(24, 0, 0, 1970, 1, 1), 'Incorrect hour not recognized');
+        $this->assertFalse(self::$dms->makeTimeStamp(0, 60, 0, 1970, 1, 1), 'Incorrect minute not recognized');
+        $this->assertFalse(self::$dms->makeTimeStamp(0, 0, 60, 1970, 1, 1), 'Incorrect second not recognized');
+    }
+
+    /**
+     * Test search()
+     *
+     * Just search the root folder in different ways. Because the initial database
+     * does not have any documents, this method will test various ways to
+     * find the root folder 'DMS' with id=1
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSearchRootFolder()
+    {
+        /* searching for folders/documents in any field */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS'
+            )
+        );
+        $this->assertEquals(1, $result['totalFolders']);
+        $this->assertCount(1, $result['folders']);
+        $this->assertEquals(0, $result['totalDocs']);
+        $this->assertCount(0, $result['docs']);
+
+        /* searching for folders in any field */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS',
+                'mode'=>0x2
+            )
+        );
+        $this->assertEquals(1, $result['totalFolders']);
+        $this->assertCount(1, $result['folders']);
+        $this->assertEquals(0, $result['totalDocs']);
+        $this->assertCount(0, $result['docs']);
+
+        /* searching for documents in any field will not return any folders*/
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS',
+                'mode'=>0x1
+            )
+        );
+        $this->assertEquals(0, $result['totalFolders']);
+        $this->assertCount(0, $result['folders']);
+        $this->assertEquals(0, $result['totalDocs']);
+        $this->assertCount(0, $result['docs']);
+
+        /* searching for folders with a bogus name may not return any folders */
+        $result = self::$dms->search(
+            array(
+                'query'=>'foo',
+                'mode'=>0x2
+            )
+        );
+        $this->assertEquals(0, $result['totalFolders']);
+        $this->assertCount(0, $result['folders']);
+
+        /* searching for folders by its id */
+        $result = self::$dms->search(
+            array(
+                'query'=>'1',
+                'mode'=>0x2
+            )
+        );
+        $this->assertEquals(1, $result['totalFolders']);
+        $this->assertCount(1, $result['folders']);
+
+        /* searching for folders by an unknown id */
+        $result = self::$dms->search(
+            array(
+                'query'=>'2',
+                'mode'=>0x2
+            )
+        );
+        $this->assertEquals(0, $result['totalFolders']);
+        $this->assertCount(0, $result['folders']);
+
+        /* searching for folders with two terms ANDed, but only one matches */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS foo',
+                'mode'=>0x2,
+                'logicalmode'=>'AND',
+            )
+        );
+        $this->assertEquals(0, $result['totalFolders']);
+        $this->assertCount(0, $result['folders']);
+
+        /* searching for folders with two terms ORed, but only one matches */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS foo',
+                'mode'=>0x2,
+                'logicalmode'=>'OR',
+            )
+        );
+        $this->assertEquals(1, $result['totalFolders']);
+        $this->assertCount(1, $result['folders']);
+
+        /* searching for folders with two terms ANDed, both match, but in different fields (name and id) */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS 1',
+                'mode'=>0x2,
+                'logicalmode'=>'AND',
+            )
+        );
+        $this->assertEquals(1, $result['totalFolders']);
+        $this->assertCount(1, $result['folders']);
+
+        /* searching for folders with two terms ANDed, both match, but in different fields (name and id). But only one field is searched. */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS 1',
+                'mode'=>0x2,
+                'logicalmode'=>'AND',
+                'searchin'=>array(2,3), // name, comment
+            )
+        );
+        $this->assertEquals(0, $result['totalFolders']);
+        $this->assertCount(0, $result['folders']);
+
+        /* searching for folders below a start folder will not find the folder 'DMS'
+         * anymore, because the start folder itself will not be found.
+         */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS',
+                'mode'=>0x2,
+                'startFolder'=>self::$dms->getRootFolder()
+            )
+        );
+        $this->assertEquals(0, $result['totalFolders']);
+        $this->assertCount(0, $result['folders']);
+
+        /* Restrict search to the owner of the folder 'DMS'
+         */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS',
+                'mode'=>0x2,
+                'owner'=>self::$dms->getUser(1)
+            )
+        );
+        $this->assertEquals(1, $result['totalFolders']);
+        $this->assertCount(1, $result['folders']);
+
+        /* Restrict search to user who does not own a document
+         */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS',
+                'mode'=>0x2,
+                'owner'=>self::$dms->getUser(2)
+            )
+        );
+        $this->assertEquals(0, $result['totalFolders']);
+        $this->assertCount(0, $result['folders']);
+
+        /* Restrict search to a list of owners (in this case all users)
+         */
+        $result = self::$dms->search(
+            array(
+                'query'=>'DMS',
+                'mode'=>0x2,
+                'owner'=>self::$dms->getAllUsers()
+            )
+        );
+        $this->assertEquals(1, $result['totalFolders']);
+        $this->assertCount(1, $result['folders']);
+
+    }
+
+    /**
+     * Test getFolder()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetFolder()
+    {
+        $folder = self::$dms->getFolder(1);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $folder);
+        $this->assertEquals(1, $folder->getId());
+    }
+
+    /**
+     * Test getFolderByName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetFolderByName()
+    {
+        $folder = self::$dms->getFolderByName('DMS');
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $folder);
+        $this->assertEquals(1, $folder->getId());
+        $folder = self::$dms->getFolderByName('FOO');
+        $this->assertNull($folder);
+    }
+
+    /**
+     * Test checkFolders()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testCheckFolders()
+    {
+        $errors = self::$dms->checkFolders();
+        $this->assertIsArray($errors);
+        $this->assertCount(0, $errors);
+    }
+
+    /**
+     * Test checkFoldersSqlFail()
+     *
+     * This test catches the case when the sql statement for getting all
+     * folders fails.
+     *
+     * @return void
+     */
+    public function testCheckFoldersSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblFolders`")
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->checkFolders());
+    }
+
+    /**
+     * Test checkFoldersFailNoParent()
+     *
+     * This test catches the case when a folder's parent is not present
+     *
+     * @return void
+     */
+    public function testCheckFoldersFailNoParent()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblFolders`")
+            ->willReturn(
+                array(
+                array('id'=>1, 'name'=>'DMS', 'parent'=>0, 'folderList'=>''),
+                array('id'=>5, 'name'=>'Subfolder', 'parent'=>3, 'folderList'=>':1:'),
+                )
+            );
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $errors = $dms->checkFolders();
+        $this->assertIsArray($errors);
+        $this->assertCount(1, $errors); // there should be 1 error
+        $this->assertArrayHasKey(5, $errors); // folder with id=5 has the wrong parent
+        $this->assertEquals('Missing parent', $errors[5]['msg']);
+    }
+
+    /**
+     * Test checkFoldersFailWrongFolderList()
+     *
+     * This test catches the case when a folder's parent is not present
+     *
+     * @return void
+     */
+    public function testCheckFoldersFailWrongFolderList()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblFolders`")
+            ->willReturn(
+                array(
+                array('id'=>1, 'name'=>'DMS', 'parent'=>0, 'folderList'=>''),
+                array('id'=>5, 'name'=>'Subfolder', 'parent'=>1, 'folderList'=>':1:2:'),
+                )
+            );
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $errors = $dms->checkFolders();
+        $this->assertIsArray($errors);
+        $this->assertCount(1, $errors); // there should be 1 error
+        $this->assertArrayHasKey(5, $errors); // folder with id=5 has the wrong parent
+        $this->assertStringContainsString('Wrong folder list', $errors[5]['msg']);
+    }
+
+    /**
+    /**
+     * Test checkDocuments()
+     *
+     * The intitial database does not have any documents which makes this
+     * test less usefull.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testCheckDocuments()
+    {
+        $errors = self::$dms->checkDocuments();
+        $this->assertIsArray($errors);
+        $this->assertCount(0, $errors);
+    }
+
+    /**
+     * Test checkDocumentsSqlFoldersFail()
+     *
+     * This test catches the case when the sql statement for getting all
+     * folders fails.
+     *
+     * @return void
+     */
+    public function testCheckDocumentsSqlFoldersFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblFolders`")
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->checkDocuments());
+    }
+
+    /**
+     * Test checkDocumentsSqlDocumentsFail()
+     *
+     * This test catches the case when the sql statement for getting all
+     * documents fails, after getting all folders succeeded.
+     *
+     * @return void
+     */
+    public function testCheckDocumentsSqlDocumentsFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->exactly(2))
+            ->method('getResultArray')
+            ->will(
+                $this->returnValueMap(
+                    array(
+                        array("SELECT * FROM `tblFolders`", true, array(
+                            array('id'=>1, 'name'=>'DMS', 'parent'=>0, 'folderList'=>'')
+                        )),
+                        array("SELECT * FROM `tblDocuments`", true, false)
+                    )
+                )
+            );
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->checkDocuments());
+    }
+
+    /**
+     * Test checkDocumentsFailNoParent()
+     *
+     * This test catches the case when a documents's parent is not present
+     *
+     * @return void
+     */
+    public function testCheckDocumentsFailNoParent()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->exactly(2))
+            ->method('getResultArray')
+            ->will(
+                $this->returnValueMap(
+                    array(
+                        array("SELECT * FROM `tblFolders`", true, array(
+                            array('id'=>1, 'name'=>'DMS', 'parent'=>0, 'folderList'=>''),
+                            array('id'=>5, 'name'=>'Subfolder', 'parent'=>1, 'folderList'=>':1:'),
+                        )),
+                        array("SELECT * FROM `tblDocuments`", true, array(
+                            array('id'=>1, 'name'=>'Document 1', 'folder'=>1, 'folderList'=>':1:'),
+                            array('id'=>2, 'name'=>'Document 2', 'folder'=>2, 'folderList'=>':1:5:'),
+                        ))
+                    )
+                )
+            );
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $errors = $dms->checkDocuments();
+        $this->assertIsArray($errors);
+        $this->assertCount(1, $errors); // there should be 1 error
+        $this->assertArrayHasKey(2, $errors); // document with id=2 has the wrong parent
+        $this->assertEquals('Missing parent', $errors[2]['msg']);
+    }
+
+    /**
+     * Test checkDocumentsFailWrongFolderList()
+     *
+     * This test catches the case when a documents's parent is not present
+     *
+     * @return void
+     */
+    public function testCheckDocumentsFailWrongFolderList()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->exactly(2))
+            ->method('getResultArray')
+            ->will(
+                $this->returnValueMap(
+                    array(
+                        array("SELECT * FROM `tblFolders`", true, array(
+                            array('id'=>1, 'name'=>'DMS', 'parent'=>0, 'folderList'=>''),
+                            array('id'=>5, 'name'=>'Subfolder', 'parent'=>1, 'folderList'=>':1:'),
+                        )),
+                        array("SELECT * FROM `tblDocuments`", true, array(
+                            array('id'=>1, 'name'=>'Document 1', 'folder'=>1, 'folderList'=>':1:'),
+                            array('id'=>2, 'name'=>'Document 2', 'folder'=>5, 'folderList'=>':1:2:'),
+                        ))
+                    )
+                )
+            );
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $errors = $dms->checkDocuments();
+        $this->assertIsArray($errors);
+        $this->assertCount(1, $errors); // there should be 1 error
+        $this->assertArrayHasKey(2, $errors); // document with id=2 has the wrong parent
+        $this->assertStringContainsString('Wrong folder list', $errors[2]['msg']);
+    }
+
+    /**
+     * Test getUser()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetUser()
+    {
+        $user = self::$dms->getUser(1);
+        $this->assertInstanceOf(SeedDMS_Core_User::class, $user);
+        $this->assertEquals(1, $user->getId());
+    }
+
+    /**
+     * Test getUserByLogin()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetUserByLogin()
+    {
+        $user = self::$dms->getUserByLogin('admin');
+        $this->assertInstanceOf(SeedDMS_Core_User::class, $user);
+        $this->assertEquals('admin', $user->getLogin());
+    }
+
+    /**
+     * Test getUserByEmail()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetUserByEmail()
+    {
+        $user = self::$dms->getUserByEmail('info@seeddms.org');
+        $this->assertInstanceOf(SeedDMS_Core_User::class, $user);
+        $this->assertEquals('admin', $user->getLogin());
+    }
+
+    /**
+     * Test getAllUsers()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAllUsers()
+    {
+        $users = self::$dms->getAllUsers();
+        $this->assertIsArray($users);
+        $this->assertCount(2, $users);
+    }
+
+    /**
+     * Test addUser()
+     *
+     * Add a new user and retrieve it afterwards. Also check if the number
+     * of users has increased by one. Add a user with the same name a
+     * second time and check if it returns false.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddUser()
+    {
+        /* Adding a new user */
+        $user = self::$dms->addUser('new user', 'pwd', 'Full Name', 'newuser@seeddms.org', 'en_GB', 'bootstrap', 'with comment');
+        $this->assertIsObject($user);
+        $this->assertEquals('new user', $user->getLogin());
+        $this->assertEquals('with comment', $user->getComment());
+
+        /* Adding a user with the same login must fail */
+        $user = self::$dms->addUser('new user', 'pwd', 'Full Name', 'newuser@seeddms.org', 'en_GB', 'bootstrap', 'with comment');
+        $this->assertFalse($user);
+
+        /* There should be 3 users now */
+        $users = self::$dms->getAllUsers();
+        $this->assertIsArray($users);
+        $this->assertCount(3, $users);
+
+        /* Check if setting the password expiration to 'now' works */
+        $now = date('Y-m-d H:i:s');
+        $user = self::$dms->addUser('new user pwdexpiration 1', 'pwd', 'Full Name', 'newuser@seeddms.org', 'en_GB', 'bootstrap', 'with comment', '', false, false, 'now');
+        $this->assertEquals($now, $user->getPwdExpiration());
+        $now = date('Y-m-d H:i:s');
+        $user = self::$dms->addUser('new user pwdexpiration 2', 'pwd', 'Full Name', 'newuser@seeddms.org', 'en_GB', 'bootstrap', 'with comment', '', false, false, $now);
+        $this->assertEquals($now, $user->getPwdExpiration());
+    }
+
+    /**
+     * Test addUserWithPostAddHook()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddUserWithPostAddHook()
+    {
+        /* Add the 'onPostAddUser' callback */
+        $ret = 0;
+        $callback = function ($param, $user) use (&$ret) {
+            $ret = 1; 
+        };
+        self::$dms->addCallback('onPostAddUser', $callback, 1);
+        /* Adding a new user */
+        $user = self::$dms->addUser('new user', 'pwd', 'Full Name', 'newuser@seeddms.org', 'en_GB', 'bootstrap', 'with comment');
+        $this->assertIsObject($user);
+        $this->assertEquals('new user', $user->getLogin());
+        $this->assertEquals(1, $ret);
+    }
+
+    /**
+     * Test addUser() with sql failure
+     *
+     * @return void
+     */
+    public function testAddUserSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("INSERT INTO `tblUsers`"))
+            ->willReturn(false);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblUsers` WHERE `login` = ")
+            ->willReturn([]);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        if(self::$dbversion['major'] < 6)
+            $role = 1;
+        else
+            $role = $this->getAdminRole();
+        $user = $dms->addUser('new user', 'pwd', 'Full Name', 'newuser@seeddms.org', 'en_GB', 'bootstrap', 'with comment', $role);
+        $this->assertFalse($user);
+    }
+
+    /**
+     * Test getGroup()
+     *
+     * Get a group by its id
+     *
+     * @return void
+     */
+    public function testGetGroup()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblGroups` WHERE `id` = 1")
+            ->willReturn([['id'=>1, 'name'=>'foo', 'comment'=>'']]);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $group = $dms->getGroup(1);
+        $this->assertIsObject($group);
+        $this->assertEquals(1, $group->getId());
+    }
+
+    /**
+     * Test getGroupByName()
+     *
+     * Get a group by its name
+     *
+     * qstr must be mocked because it is used in the sql statement to quote
+     * the name.
+     *
+     * @return void
+     */
+    public function testGetGroupByName()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblGroups` WHERE `name` = 'foo'")
+            ->willReturn([['id'=>1, 'name'=>'foo', 'comment'=>'']]);
+        $db->expects($this->once())
+            ->method('qstr')
+            ->will(
+                $this->returnCallback(
+                    function ($a) {
+                        return "'".$a."'";
+                    }
+                )
+            );
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $group = $dms->getGroupByName('foo');
+        $this->assertIsObject($group);
+        $this->assertEquals('foo', $group->getName());
+    }
+
+    /**
+     * Test getAllGroups()
+     *
+     * The intitial database does not have any groups
+     *
+     * @return void
+     */
+    public function testGetAllGroups()
+    {
+        $groups = self::$dms->getAllGroups();
+        $this->assertIsArray($groups);
+        $this->assertCount(0, $groups);
+    }
+
+    /**
+     * Test addGroup()
+     *
+     * Add a new group and retrieve it afterwards. Also check if the number
+     * of groups has increased by one. Add a group with the same name a
+     * second time and check if it returns false.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddGroup()
+    {
+        /* Adding a new group */
+        $group = self::$dms->addGroup('new group', 'with comment');
+        $this->assertIsObject($group);
+        $this->assertEquals('new group', $group->getName());
+        /* Adding a group with the same name must fail */
+        $group = self::$dms->addGroup('new group', 'with comment');
+        $this->assertFalse($group);
+        /* There should be one group now */
+        $groups = self::$dms->getAllGroups();
+        $this->assertIsArray($groups);
+        $this->assertCount(1, $groups);
+    }
+
+    /**
+     * Test addGroupWithPostAddHook()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddGroupWithPostAddHook()
+    {
+        /* Add the 'onPostAddGroup' callback */
+        $ret = 0;
+        $callback = function ($param, $group) use (&$ret) {
+            $ret = 1; 
+        };
+        self::$dms->addCallback('onPostAddGroup', $callback, 1);
+        /* Adding a new group */
+        $group = self::$dms->addGroup('new group', 'with comment');
+        $this->assertIsObject($group);
+        $this->assertEquals('new group', $group->getName());
+        $this->assertEquals(1, $ret);
+    }
+
+    /**
+     * Test addGroup() with sql failure
+     *
+     * @return void
+     */
+    public function testAddGroupSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("INSERT INTO `tblGroups`"))
+            ->willReturn(false);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblGroups` WHERE `name` = ")
+            ->willReturn([]);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $group = $dms->addGroup('new group', 'with comment');
+        $this->assertFalse($group);
+    }
+
+    /**
+     * Test getAllKeywordCategories()
+     *
+     * The intitial database does not have any keyword categories
+     *
+     * @return void
+     */
+    public function testGetAllKeywordCategories()
+    {
+        $cats = self::$dms->getAllKeywordCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(0, $cats);
+        /* Even passing bogus ids is handled propperly */
+        $cats = self::$dms->getAllKeywordCategories(['kk', '0', 3, true]);
+        $this->assertIsArray($cats);
+        $this->assertCount(0, $cats);
+    }
+
+    /**
+     * Test getAllUserKeywordCategories()
+     *
+     * Method getAllUserKeywordCategories() actually uses
+     * getAllKeywordCategories()
+     *
+     * The intitial database does not have any keyword categories
+     *
+     * @return void
+     */
+    public function testGetAllUserKeywordCategories()
+    {
+        $cats = self::$dms->getAllUserKeywordCategories(1);
+        $this->assertIsArray($cats);
+        $this->assertCount(0, $cats);
+        /* Passing a none existing user id will return an empty array */
+        $cats = self::$dms->getAllUserKeywordCategories(3);
+        $this->assertIsArray($cats);
+        $this->assertCount(0, $cats);
+        /* Passing an invalid user id will return false */
+        $cats = self::$dms->getAllUserKeywordCategories(0);
+        $this->assertFalse($cats);
+    }
+
+    /**
+     * Test getAllKeywordCategories() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAllKeywordCategoriesSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblKeywordCategories`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $cats = $dms->getAllKeywordCategories();
+        $this->assertFalse($cats);
+    }
+
+    /**
+     * Test addKeywordCategory()
+     *
+     * Add a new keyword category and retrieve it afterwards. Also check if the
+     * number of keyword categories has increased by one. Add a keyword category
+     * with the same name a second time and check if it returns false.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddKeywordCategory()
+    {
+        /* Adding a new keyword category */
+        $cat = self::$dms->addKeywordCategory(1, 'new category');
+        $this->assertIsObject($cat);
+        $this->assertEquals('new category', $cat->getName());
+
+        /* Adding a keyword category for the same user and with the same name must fail */
+        $cat = self::$dms->addKeywordCategory(1, 'new category');
+        $this->assertFalse($cat);
+
+        /* Adding a keyword category with a non existing user id must fail */
+        $cat = self::$dms->addKeywordCategory(0, 'new category');
+        $this->assertFalse($cat);
+
+        /* Adding a keyword category with an empty name must fail */
+        $cat = self::$dms->addKeywordCategory(1, ' ');
+        $this->assertFalse($cat);
+
+        /* Adding a keyword category with a non existing user id must fail */
+        //      $cat = self::$dms->addKeywordCategory(3, 'new category');
+        //      $this->assertFalse($cat);
+
+        /* There should be 1 keyword category now */
+        $cats = self::$dms->getAllKeywordCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(1, $cats);
+    }
+
+    /**
+     * Test addKeywordCategoryWithPostAddHook()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddKeywordCategoryWithPostAddHook()
+    {
+        /* Add the 'onPostAddKeywordCategory' callback */
+        $ret = 0;
+        $callback = function ($param, $cat) use (&$ret) {
+            $ret = 1; 
+        };
+        self::$dms->addCallback('onPostAddKeywordCategory', $callback, 1);
+        /* Adding a new keyword category */
+        $cat = self::$dms->addKeywordCategory(1, 'new category');
+        $this->assertIsObject($cat);
+        $this->assertEquals('new category', $cat->getName());
+        $this->assertEquals(1, $ret);
+    }
+
+    /**
+     * Test addKeywordCategory() with sql failure
+     *
+     * @return void
+     */
+    public function testAddKeywordCategorySqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("INSERT INTO `tblKeywordCategories`"))
+            ->willReturn(false);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblKeywordCategories` WHERE `name` ="))
+            ->willReturn([]);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $cat = $dms->addKeywordCategory(1, 'new category');
+        $this->assertFalse($cat);
+    }
+
+    /**
+     * Test getKeywordCategory()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetKeywordCategory()
+    {
+        $cat = self::$dms->addKeywordCategory(1, 'new category');
+        $cat = self::$dms->getKeywordCategory(1);
+        $this->assertInstanceOf(SeedDMS_Core_Keywordcategory::class, $cat);
+        $this->assertEquals(1, $cat->getId());
+        /* Return false if the id is invalid */
+        $cat = self::$dms->getKeywordCategory(0);
+        $this->assertFalse($cat);
+        /* Return null if the keyword category with the id does not exist */
+        $cat = self::$dms->getKeywordCategory(2);
+        $this->assertNull($cat);
+    }
+
+    /**
+     * Test getKeywordCategory() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetKeywordCategorySqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblKeywordCategories` WHERE `id` = 1")
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $cat = $dms->getKeywordCategory(1);
+        $this->assertFalse($cat);
+    }
+
+    /**
+     * Test getKeywordCategoryByName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetKeywordCategoryByName()
+    {
+        $cat = self::$dms->addKeywordCategory(1, 'new category');
+        $cat = self::$dms->getKeywordCategory(1);
+        $this->assertInstanceOf(SeedDMS_Core_Keywordcategory::class, $cat);
+        $this->assertEquals(1, $cat->getId());
+        /* Return false if the user id is invalid */
+        $cat = self::$dms->getKeywordCategoryByName('new category', 0);
+        $this->assertFalse($cat);
+        /* Return null if the keyword category with the passed name does not exist */
+        $cat = self::$dms->getKeywordCategoryByName('foo', 1);
+        $this->assertNull($cat);
+        /* Return category if the keyword category with the passed name exists */
+        $cat = self::$dms->getKeywordCategoryByName('new category', 1);
+        $this->assertIsObject($cat);
+        $this->assertInstanceOf(SeedDMS_Core_Keywordcategory::class, $cat);
+    }
+
+    /**
+     * Test getKeywordCategoryByName() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetKeywordCategoryByNameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblKeywordCategories` WHERE `name` ="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $cat = $dms->getKeywordCategoryByName('foo', 1);
+        $this->assertFalse($cat);
+    }
+
+    /**
+     * Test getDocumentCategories()
+     *
+     * The intitial database does not have any document categories
+     *
+     * @return void
+     */
+    public function testGetDocumentCategories()
+    {
+        $cats = self::$dms->getDocumentCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(0, $cats);
+    }
+
+    /**
+     * Test getDocumentCategories() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentCategoriesNameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblCategory`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $cats = $dms->getDocumentCategories();
+        $this->assertFalse($cats);
+    }
+
+    /**
+     * Test getDocumentCategory()
+     *
+     * The intitial database does not have any document categories
+     *
+     * @return void
+     */
+    public function testGetDocumentCategory()
+    {
+        /* Adding a new keyword category */
+        $cat = self::$dms->addDocumentCategory('new category');
+        $this->assertIsObject($cat);
+        $this->assertEquals('new category', $cat->getName());
+
+        $cat = self::$dms->getDocumentCategory($cat->getId());
+        $this->assertIsObject($cat);
+
+        /* Return false if the id is out of range */
+        $cat = self::$dms->getDocumentCategory(0);
+        $this->assertFalse($cat);
+
+        /* Return null if the keyword category with the id does not exist */
+        $cat = self::$dms->getDocumentCategory(2);
+        $this->assertNull($cat);
+    }
+
+    /**
+     * Test getDocumentCategory() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentCategorySqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with("SELECT * FROM `tblCategory` WHERE `id` = 1")
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $cat = $dms->getDocumentCategory(1);
+        $this->assertFalse($cat);
+    }
+
+    /**
+     * Test getDocumentCategoryByName()
+     *
+     * The intitial database does not have any document categories
+     *
+     * @return void
+     */
+    public function testGetDocumentCategoryByName()
+    {
+        /* Adding a new keyword category with leading and trailing spaces*/
+        $cat = self::$dms->addDocumentCategory(' new category ');
+        $this->assertIsObject($cat);
+        $this->assertEquals('new category', $cat->getName());
+
+        $cat = self::$dms->getDocumentCategoryByName($cat->getName());
+        $this->assertIsObject($cat);
+
+        $cat = self::$dms->getDocumentCategoryByName(' ');
+        $this->assertFalse($cat);
+    }
+
+    /**
+     * Test getDocumentCategoryByName() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentCategoryByNameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblCategory` WHERE `name`="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $cat = $dms->getDocumentCategoryByName('foo');
+        $this->assertFalse($cat);
+    }
+
+    /**
+     * Test addDocumentCategory()
+     *
+     * Add a new keyword category and retrieve it afterwards. Also check if the
+     * number of keyword categories has increased by one. Add a keyword category
+     * with the same name a second time and check if it returns false.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddDocumentCategory()
+    {
+        /* Adding a new keyword category */
+        $cat = self::$dms->addDocumentCategory('new category');
+        $this->assertIsObject($cat);
+        $this->assertEquals('new category', $cat->getName());
+
+        /* Adding a document category with the same name must fail */
+        $cat = self::$dms->addDocumentCategory('new category');
+        $this->assertFalse($cat);
+
+        /* Adding a document category with an empty name must fail */
+        $cat = self::$dms->addDocumentCategory(' ');
+        $this->assertFalse($cat);
+
+        /* There should be 1 document category now */
+        $cats = self::$dms->getDocumentCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(1, $cats);
+    }
+
+    /**
+     * Test addDocumentCategoryWithPostAddHook()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddDocumentCategoryWithPostAddHook()
+    {
+        /* Add the 'onPostAddDocumentCategory' callback */
+        $ret = 0;
+        $callback = function ($param, $group) use (&$ret) {
+            $ret = 1; 
+        };
+        self::$dms->addCallback('onPostAddDocumentCategory', $callback, 1);
+        /* Adding a new group */
+        $cat = self::$dms->addDocumentCategory('new category');
+        $this->assertIsObject($cat);
+        $this->assertEquals('new category', $cat->getName());
+        $this->assertEquals(1, $ret);
+    }
+
+    /**
+     * Test addDocumentCategory() with sql failure
+     *
+     * @return void
+     */
+    public function testAddDocumentCategorySqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("INSERT INTO `tblCategory`"))
+            ->willReturn(false);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblCategory` WHERE `name`="))
+            ->willReturn([]);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $cat = $dms->addDocumentCategory('new category');
+        $this->assertFalse($cat);
+    }
+
+    /**
+     * Test getAttributeDefinition() with a none existing workflow
+     *
+     * The intitial database does not have any workflows
+     *
+     * @return void
+     */
+    public function testGetAttributeDefinitionNoExists()
+    {
+        $workflow = self::$dms->getAttributeDefinition(1);
+        $this->assertNull($workflow);
+        /* Passing an id not a numeric value returns false */
+        $workflow = self::$dms->getAttributeDefinition('foo');
+        $this->assertFalse($workflow);
+        /* Passing an id out of range returns false */
+        $workflow = self::$dms->getAttributeDefinition(0);
+        $this->assertFalse($workflow);
+    }
+
+    /**
+     * Test getAttributeDefinition() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAttributeDefinitionSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblAttributeDefinitions` WHERE `id` ="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $attrdef = $dms->getAttributeDefinition(1);
+        $this->assertFalse($attrdef);
+    }
+
+    /**
+     * Test getAttributeDefinitionByName() with a none existing workflow
+     *
+     * The intitial database does not have any workflows
+     *
+     * @return void
+     */
+    public function testGetAttributeDefinitionByNameNoExists()
+    {
+        $workflow = self::$dms->getAttributeDefinitionByName('foo');
+        $this->assertNull($workflow);
+    }
+
+    /**
+     * Test getAttributeDefinitionByName() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAttributeDefinitionByNameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblAttributeDefinitions` WHERE `name` ="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $attrdef = $dms->getAttributeDefinitionByName('foo');
+        $this->assertFalse($attrdef);
+    }
+
+    /**
+     * Test getAllAttributeDefinitions()
+     *
+     * The intitial database does not have any attribute definitions
+     *
+     * @return void
+     */
+    public function testGetAllAttributeDefinitions()
+    {
+        $attrdefs = self::$dms->getAllAttributeDefinitions();
+        $this->assertIsArray($attrdefs);
+        $this->assertCount(0, $attrdefs);
+    }
+
+    /**
+     * Test getAllAttributeDefinitions() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAllAttributeDefinitionsSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblAttributeDefinitions`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $attrdef = $dms->getAllAttributeDefinitions();
+        $this->assertFalse($attrdef);
+    }
+
+    /**
+     * Test addAttributeDefinition()
+     *
+     * Add a new group and retrieve it afterwards. Also check if the number
+     * of groups has increased by one. Add a group with the same name a
+     * second time and check if it returns false.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddAttributeDefinition()
+    {
+        /* Adding a new attribute definition */
+        $attrdef = self::$dms->addAttributeDefinition('new attribute definition', SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::type_int, false, 0, 0, '', '');
+        $this->assertIsObject($attrdef);
+        $this->assertEquals('new attribute definition', $attrdef->getName());
+        /* Get the new attribute definition by its id */
+        $newattrdef = self::$dms->getAttributeDefinition($attrdef->getId());
+        $this->assertIsObject($newattrdef);
+        $this->assertEquals($attrdef->getId(), $newattrdef->getId());
+        /* Get the new attribute definition by its name */
+        $newattrdef = self::$dms->getAttributeDefinitionByName('new attribute definition');
+        $this->assertIsObject($newattrdef);
+        $this->assertEquals($attrdef->getId(), $newattrdef->getId());
+        /* Adding an attribute definition with the same name must fail */
+        $attrdef = self::$dms->addAttributeDefinition('new attribute definition', SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::type_int, false, 0, 0, '', '');
+        $this->assertFalse($attrdef);
+        /* Adding an attribute definition with an empty name must fail */
+        $attrdef = self::$dms->addAttributeDefinition(' ', SeedDMS_Core_AttributeDefinition::objtype_folder, SeedDMS_Core_AttributeDefinition::type_int, false, 0, 0, '', '');
+        $this->assertFalse($attrdef);
+        /* Adding an attribute definition with an invalid object type must fail */
+        $attrdef = self::$dms->addAttributeDefinition('no object type', -1, SeedDMS_Core_AttributeDefinition::type_int, false, 0, 0, '', '');
+        $this->assertFalse($attrdef);
+        /* Adding an attribute definition without a type must fail */
+        $attrdef = self::$dms->addAttributeDefinition('no type', SeedDMS_Core_AttributeDefinition::objtype_folder, 0, 0, '', '');
+        $this->assertFalse($attrdef);
+        /* There should be one attribute definition now */
+        $attrdefs = self::$dms->getAllAttributeDefinitions();
+        $this->assertIsArray($attrdefs);
+        $this->assertCount(1, $attrdefs);
+        /* There should be one attribute definition of object type folder now */
+        $attrdefs = self::$dms->getAllAttributeDefinitions(SeedDMS_Core_AttributeDefinition::objtype_folder);
+        $this->assertIsArray($attrdefs);
+        $this->assertCount(1, $attrdefs);
+        /* The object type can also be passed as an array */
+        $attrdefs = self::$dms->getAllAttributeDefinitions([SeedDMS_Core_AttributeDefinition::objtype_folder]);
+        $this->assertIsArray($attrdefs);
+        $this->assertCount(1, $attrdefs);
+        /* Adding more attribute definitions of different object type */
+        $attrdef = self::$dms->addAttributeDefinition('new attribute definition all', SeedDMS_Core_AttributeDefinition::objtype_all, SeedDMS_Core_AttributeDefinition::type_int, false, 0, 0, '', '');
+        $this->assertIsObject($attrdef);
+        $this->assertEquals('new attribute definition all', $attrdef->getName());
+        $attrdef = self::$dms->addAttributeDefinition('new attribute definition document', SeedDMS_Core_AttributeDefinition::objtype_all, SeedDMS_Core_AttributeDefinition::type_int, false, 0, 0, '', '');
+        $this->assertIsObject($attrdef);
+        $this->assertEquals('new attribute definition document', $attrdef->getName());
+        $attrdef = self::$dms->addAttributeDefinition('new attribute definition documentcontent', SeedDMS_Core_AttributeDefinition::objtype_all, SeedDMS_Core_AttributeDefinition::type_int, false, 0, 0, '', '');
+        $this->assertIsObject($attrdef);
+        $this->assertEquals('new attribute definition documentcontent', $attrdef->getName());
+        /* There should be four attribute definitions now */
+        $attrdefs = self::$dms->getAllAttributeDefinitions();
+        $this->assertIsArray($attrdefs);
+        $this->assertCount(4, $attrdefs);
+    }
+
+    /**
+     * Test getAllWorkflows()
+     *
+     * The intitial database does not have any workflows
+     *
+     * @return void
+     */
+    public function testGetAllWorkflows()
+    {
+        $workflows = self::$dms->getAllWorkflows();
+        $this->assertIsArray($workflows);
+        $this->assertCount(0, $workflows);
+    }
+
+    /**
+     * Test getAllWorkflows() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAllWorkflowsSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblWorkflows`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $workflows = $dms->getAllWorkflows();
+        $this->assertFalse($workflows);
+    }
+
+    /**
+     * Test getWorkflow() with a none existing workflow
+     *
+     * The intitial database does not have any workflows
+     *
+     * @return void
+     */
+    public function testGetWorkflowNoExists()
+    {
+        $workflow = self::$dms->getWorkflow(1);
+        $this->assertNull($workflow);
+        /* Passing an id not a numeric value returns false */
+        $workflow = self::$dms->getWorkflow('foo');
+        $this->assertFalse($workflow);
+        /* Passing an id out of range returns false */
+        $workflow = self::$dms->getWorkflow(0);
+        $this->assertFalse($workflow);
+    }
+
+    /**
+     * Test getWorkflow() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetWorkflowSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblWorkflows` WHERE `id`="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $workflow = $dms->getWorkflow(1);
+        $this->assertFalse($workflow);
+    }
+
+    /**
+     * Test getWorkflowByName() with a none existing workflow
+     *
+     * The intitial database does not have any workflows
+     *
+     * @return void
+     */
+    public function testGetWorkflowByNameNoExists()
+    {
+        $workflow = self::$dms->getWorkflowByName('foo');
+        $this->assertNull($workflow);
+    }
+
+    /**
+     * Test getWorkflowByName() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetWorkflowByNameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblWorkflows` WHERE `name`="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $workflow = $dms->getWorkflowByName('foo');
+        $this->assertFalse($workflow);
+    }
+
+    /**
+     * Test addWorkflow()
+     *
+     * Add a new workflow and retrieve it afterwards. Also check if the number
+     * of workflows has increased by one. Add a workflow with the same name a
+     * second time and check if it returns false.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddWorkflow()
+    {
+        /* Adding a new workflow */
+        $workflowstate = self::$dms->addWorkflowState('new workflow state', S_RELEASED);
+        $workflow = self::$dms->addWorkflow('new workflow', $workflowstate);
+        $this->assertIsObject($workflow);
+        $this->assertEquals('new workflow', $workflow->getName());
+        /* Adding a workflow with the same name must fail */
+        $workflow = self::$dms->addWorkflow('new workflow', $workflowstate);
+        $this->assertFalse($workflow);
+        /* Adding a workflow with an empty name must fail */
+        $workflow = self::$dms->addWorkflow(' ', $workflowstate);
+        $this->assertFalse($workflow);
+        /* There should be one workflow now */
+        $workflows = self::$dms->getAllWorkflows();
+        $this->assertIsArray($workflows);
+        $this->assertCount(1, $workflows);
+    }
+
+    /**
+     * Test getAllWorkflowStates()
+     *
+     * The intitial database does not have any workflow states
+     *
+     * @return void
+     */
+    public function testGetAllWorkflowStates()
+    {
+        $states = self::$dms->getAllWorkflowStates();
+        $this->assertIsArray($states);
+        $this->assertCount(0, $states);
+    }
+
+    /**
+     * Test getAllWorkflowStates() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAllWorkflowStatesSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblWorkflowStates`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $states = $dms->getAllWorkflowStates();
+        $this->assertFalse($states);
+    }
+
+    /**
+     * Test getWorkflowState() with a none existing workflow state
+     *
+     * The intitial database does not have any workflow states
+     *
+     * @return void
+     */
+    public function testGetWorkflowStateNoExists()
+    {
+        $workflowstate = self::$dms->getWorkflowState(1);
+        $this->assertNull($workflowstate);
+        /* Passing an id not a numeric value returns false */
+        $workflowstate = self::$dms->getWorkflowState('foo');
+        $this->assertFalse($workflowstate);
+        /* Passing an id out of range returns false */
+        $workflowstate = self::$dms->getWorkflowState(0);
+        $this->assertFalse($workflowstate);
+    }
+
+    /**
+     * Test getWorkflowState() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetWorkflowStateSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblWorkflowStates` WHERE `id` ="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $state = $dms->getWorkflowState(1);
+        $this->assertFalse($state);
+    }
+
+    /**
+     * Test getWorkflowStateByName() with a none existing workflow state
+     *
+     * The intitial database does not have any workflow states
+     *
+     * @return void
+     */
+    public function testGetWorkflowStateByNameNoExists()
+    {
+        $workflowstate = self::$dms->getWorkflowStateByName('foo');
+        $this->assertNull($workflowstate);
+    }
+
+    /**
+     * Test getWorkflowStateByName() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetWorkflowStateByNameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblWorkflowStates` WHERE `name`="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $state = $dms->getWorkflowStateByName('foo');
+        $this->assertFalse($state);
+    }
+
+    /**
+     * Test addWorkflowState()
+     *
+     * Add a new workflow state and retrieve it afterwards. Also check if the number
+     * of workflow states has increased by one. Add a workflow state with the same name a
+     * second time and check if it returns false.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddWorkflowState()
+    {
+        /* Adding a new workflow state */
+        $workflowstate = self::$dms->addWorkflowState('new workflow state', S_RELEASED);
+        $this->assertIsObject($workflowstate);
+        $this->assertEquals('new workflow state', $workflowstate->getName());
+        /* Adding a workflow state with the same name must fail */
+        $workflowstate = self::$dms->addWorkflowState('new workflow state', S_RELEASED);
+        $this->assertFalse($workflowstate);
+        /* Adding a workflow state with an empty name must fail */
+        $workflowstate = self::$dms->addWorkflowState(' ', S_RELEASED);
+        $this->assertFalse($workflowstate);
+        /* There should be one workflow state now */
+        $workflowstates = self::$dms->getAllWorkflowStates();
+        $this->assertIsArray($workflowstates);
+        $this->assertCount(1, $workflowstates);
+    }
+
+    /**
+     * Test getAllWorkflowActions()
+     *
+     * The intitial database does not have any workflow actions
+     *
+     * @return void
+     */
+    public function testGetAllWorkflowActions()
+    {
+        $actions = self::$dms->getAllWorkflowActions();
+        $this->assertIsArray($actions);
+        $this->assertCount(0, $actions);
+    }
+
+    /**
+     * Test getAllWorkflowActions() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAllWorkflowActionsSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblWorkflowActions`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $actions = $dms->getAllWorkflowActions();
+        $this->assertFalse($actions);
+    }
+
+    /**
+     * Test getWorkflowAction() with a none existing workflow
+     *
+     * The intitial database does not have any workflow actions
+     *
+     * @return void
+     */
+    public function testGetWorkflowActionNoExists()
+    {
+        $workflowaction = self::$dms->getWorkflowAction(1);
+        $this->assertNull($workflowaction);
+        /* Passing an id not a numeric value returns false */
+        $workflowaction = self::$dms->getWorkflowAction('foo');
+        $this->assertFalse($workflowaction);
+        /* Passing an id out of range returns false */
+        $workflowaction = self::$dms->getWorkflowAction(0);
+        $this->assertFalse($workflowaction);
+    }
+
+    /**
+     * Test getWorkflowAction() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetWorkflowActionSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblWorkflowActions` WHERE `id` ="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $action = $dms->getWorkflowAction(1);
+        $this->assertFalse($action);
+    }
+
+    /**
+     * Test getWorkflowActionByName() with a none existing workflow action
+     *
+     * The intitial database does not have any workflow actions
+     *
+     * @return void
+     */
+    public function testGetWorkflowActionByNameNoExists()
+    {
+        $workflowaction = self::$dms->getWorkflowActionByName('foo');
+        $this->assertNull($workflowaction);
+    }
+
+    /**
+     * Test getWorkflowActionByName() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetWorkflowActionByNameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblWorkflowActions` WHERE `name` ="))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $action = $dms->getWorkflowActionByName('foo');
+        $this->assertFalse($action);
+    }
+
+    /**
+     * Test addWorkflowAction()
+     *
+     * Add a new workflow state and retrieve it afterwards. Also check if the number
+     * of workflow states has increased by one. Add a workflow state with the same name a
+     * second time and check if it returns false.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddWorkflowAction()
+    {
+        /* Adding a new workflow action */
+        $workflowaction = self::$dms->addWorkflowAction('new workflow action', S_RELEASED);
+        $this->assertIsObject($workflowaction);
+        $this->assertEquals('new workflow action', $workflowaction->getName());
+        /* Adding a workflow action with the same name must fail */
+        $workflowaction = self::$dms->addWorkflowAction('new workflow action', S_RELEASED);
+        $this->assertFalse($workflowaction);
+        /* Adding a workflow action with an empty name must fail */
+        $workflowaction = self::$dms->addWorkflowAction(' ', S_RELEASED);
+        $this->assertFalse($workflowaction);
+        /* There should be one workflow action now */
+        $workflowactions = self::$dms->getAllWorkflowActions();
+        $this->assertIsArray($workflowactions);
+        $this->assertCount(1, $workflowactions);
+    }
+
+    /**
+     * Test getStatisticalData()
+     *
+     * @return void
+     */
+    public function testGetStatisticalData()
+    {
+        /* There should one folder (root folder) */
+        $data = self::$dms->getStatisticalData('foldersperuser');
+        $this->assertIsArray($data);
+        $this->assertEquals(1, $data[0]['total']);
+        /* There should be no documents */
+        foreach (array('docsperuser', 'docspermimetype', 'docspercategory', 'docspermonth', 'docsperstatus', 'docsaccumulated', 'sizeperuser') as $type) {
+            $data = self::$dms->getStatisticalData($type);
+            $this->assertIsArray($data);
+            $this->assertCount(0, $data);
+        }
+        /* Passing an unknown name returns an empty array */
+        $data = self::$dms->getStatisticalData('foo');
+        $this->assertIsArray($data);
+        $this->assertCount(0, $data);
+    }
+
+    /**
+     * Test getStatisticalDataFail()
+     *
+     * Check if getStatisticalData() fails if the sql statements fail
+     *
+     * @return void
+     */
+    public function testGetStatisticalDataFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->any())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT "))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        foreach (array('foldersperuser', 'docsperuser', 'docspermimetype', 'docspercategory', 'docspermonth', 'docsperstatus', 'docsaccumulated', 'sizeperuser') as $type) {
+            $data = $dms->getStatisticalData($type);
+            $this->assertFalse($data);
+        }
+    }
+
+    /**
+     * Test createPasswordRequest() and checkPasswordRequest()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testCreateAndCheckAndDeletePasswordRequest()
+    {
+        $user = self::$dms->getUser(1);
+        $hash = self::$dms->createPasswordRequest($user);
+        $this->assertIsString($hash);
+        $user = self::$dms->checkPasswordRequest($hash);
+        $this->assertIsObject($user);
+        $this->assertEquals(1, $user->getId());
+        /* Check a non existing hash */
+        $user = self::$dms->checkPasswordRequest('foo');
+        $this->assertFalse($user);
+        /* Delete the hash */
+        $ret = self::$dms->deletePasswordRequest($hash);
+        $this->assertTrue($ret);
+        /* Checking the hash again must return false, because it was deleted */
+        $user = self::$dms->checkPasswordRequest($hash);
+        $this->assertFalse($user);
+    }
+
+    /**
+     * Test method checkPasswordRequest() with sql failure
+     *
+     * @return void
+     */
+    public function testCheckPasswordRequestSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblUserPasswordRequest`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->checkPasswordRequest('foo'));
+    }
+
+    /**
+     * Test method deletePasswordRequest() with sql failure
+     *
+     * @return void
+     */
+    public function testDeletePasswordRequestSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("DELETE FROM `tblUserPasswordRequest`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->deletePasswordRequest('foo'));
+    }
+
+    /**
+     * Test getTimeline()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetTimeline()
+    {
+        $timeline = self::$dms->getTimeline();
+        $this->assertIsArray($timeline);
+    }
+
+    /**
+     * Test getUnlinkedDocumentContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetUnlinkedDocumentContent()
+    {
+        $contents = self::$dms->getUnlinkedDocumentContent();
+        $this->assertIsArray($contents);
+        $this->assertCount(0, $contents);
+    }
+
+    /**
+     * Test getNoFileSizeDocumentContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetNoFileSizeDocumentContent()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $contents = self::$dms->getNoFileSizeDocumentContent();
+        $this->assertIsArray($contents);
+        $this->assertCount(0, $contents);
+        /* Manipulate the file size right in the database */
+        $dbh = self::$dms->getDB();
+        $ret = $dbh->getResult("UPDATE `tblDocumentContent` SET `fileSize` = 0");
+        $this->assertTrue($ret);
+        $contents = self::$dms->getNoFileSizeDocumentContent();
+        $this->assertIsArray($contents);
+        $this->assertCount(1, $contents);
+    }
+
+    /**
+     * Test getNoFileSizeDocumentContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetNoFileSizeDocumentContentSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblDocumentContent` WHERE `fileSize`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->getNoFileSizeDocumentContent());
+    }
+
+    /**
+     * Test getNoChecksumDocumentContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetNoChecksumDocumentContent()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $contents = self::$dms->getNoChecksumDocumentContent();
+        $this->assertIsArray($contents);
+        $this->assertCount(0, $contents);
+        /* Manipulate the checksum right in the database */
+        $dbh = self::$dms->getDB();
+        $ret = $dbh->getResult("UPDATE `tblDocumentContent` SET `checksum` = null");
+        $this->assertTrue($ret);
+        $contents = self::$dms->getNoChecksumDocumentContent();
+        $this->assertIsArray($contents);
+        $this->assertCount(1, $contents);
+    }
+
+    /**
+     * Test getNoChecksumDocumentContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetNoChecksumDocumentContentSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblDocumentContent` WHERE `checksum`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->getNoChecksumDocumentContent());
+    }
+
+    /**
+     * Test getDuplicateDocumentContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDuplicateDocumentContent()
+    {
+        $contents = self::$dms->getDuplicateDocumentContent();
+        $this->assertIsArray($contents);
+        $this->assertCount(0, $contents);
+    }
+
+    /**
+     * Test getDuplicateDocumentContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDuplicateDocumentContentWithDuplicates()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $document1 = self::createDocument($rootfolder, $user, 'Document 1');
+
+        $filename = self::createTempFile(200);
+        list($document2, $res) = $rootfolder->addDocument(
+            'Documet 2', // name
+            '', // comment
+            null, // no expiration
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        list($document3, $res) = $rootfolder->addDocument(
+            'Documet 3', // name
+            '', // comment
+            null, // no expiration
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+
+        $contents = self::$dms->getDuplicateDocumentContent();
+        $this->assertIsArray($contents);
+        $this->assertCount(1, $contents);
+    }
+
+    /**
+     * Test method getDuplicateDocumentContent() with sql failure
+     *
+     * @return void
+     */
+    public function testGetDuplicateDocumentContentSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT a.*, b.`id` as dupid FROM `tblDocumentContent`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->getDuplicateDocumentContent());
+    }
+
+    /**
+     * Test getNotificationsByUser()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetNotificationsByUser()
+    {
+        $user = self::$dms->getUser(1);
+        $notifications = self::$dms->getNotificationsByUser($user, 0);
+        $this->assertIsArray($notifications);
+        $this->assertCount(0, $notifications);
+        $notifications = self::$dms->getNotificationsByUser($user, 1);
+        $this->assertIsArray($notifications);
+        $this->assertCount(0, $notifications);
+    }
+
+    /**
+     * Test getNotificationsByGroup()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetNotificationsByGroup()
+    {
+        $group = self::$dms->addGroup('new group', 'with comment');
+        $this->assertIsObject($group);
+        $notifications = self::$dms->getNotificationsByGroup($group, 0);
+        $this->assertIsArray($notifications);
+        $this->assertCount(0, $notifications);
+        $notifications = self::$dms->getNotificationsByGroup($group, 1);
+        $this->assertIsArray($notifications);
+        $this->assertCount(0, $notifications);
+    }
+
+    /**
+     * Test getDocumentsExpired()
+     *
+     * Check if getDocumentsExpired() fails if the parameters are wrong
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentsExpiredFail()
+    {
+        $documents = self::$dms->getDocumentsExpired(false);
+        $this->assertFalse($documents);
+        $documents = self::$dms->getDocumentsExpired('2021-04');
+        $this->assertFalse($documents);
+        $documents = self::$dms->getDocumentsExpired('2021-01-32');
+        $this->assertFalse($documents);
+        $documents = self::$dms->getDocumentsExpired('2021-01-31'); // valid date
+        $this->assertIsArray($documents);
+    }
+
+    /**
+     * Test method getDocumentsExpired() with sql failure
+     *
+     * @return void
+     */
+    public function testGetDocumentsExpiredSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('createTemporaryTable')
+            ->with('ttstatid')
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->getDocumentsExpired(1));
+    }
+
+    /**
+     * Test getDocumentByName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentByName()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $rootfolder);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $subfolder);
+
+        /* Add a new document */
+        $filename = self::createTempFile(200);
+        list($document, $res) = $subfolder->addDocument(
+            'Document 1', // name
+            '', // comment
+            null, // no expiration
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertIsObject($document);
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        /* Search without a parent folder restriction */
+        $document = self::$dms->getDocumentByName('Document 1');
+        $this->assertInstanceOf(SeedDMS_Core_Document::class, $document);
+        /* Searching in the root folder will return no document */
+        $document = self::$dms->getDocumentByName('Document 1', $rootfolder);
+        $this->assertNull($document);
+        /* Searching in the sub folder will return the document */
+        $document = self::$dms->getDocumentByName('Document 1', $subfolder);
+        $this->assertInstanceOf(SeedDMS_Core_Document::class, $document);
+        /* Searching for an empty name returns false */
+        $document = self::$dms->getDocumentByName('  ');
+        $this->assertFalse($document);
+    }
+
+    /**
+     * Test getDocumentByName() with sql failure
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentByNameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document = $dms->getDocumentByName('foo');
+        $this->assertFalse($document);
+    }
+
+    /**
+     * Test getDocumentByOriginalFilename()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentByOriginalFilename()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $rootfolder);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $subfolder);
+
+        /* Add a new document */
+        $filename = self::createTempFile(200);
+        list($document, $res) = $subfolder->addDocument(
+            'Document 1', // name
+            '', // comment
+            null, // no expiration
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertIsObject($document);
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        /* Search without a parent folder restriction */
+        $document = self::$dms->getDocumentByOriginalFilename('file1.txt');
+        $this->assertInstanceOf(SeedDMS_Core_Document::class, $document);
+        /* Searching in the root folder will return no document */
+        $document = self::$dms->getDocumentByOriginalFilename('file1.txt', $rootfolder);
+        $this->assertNull($document);
+        /* Searching in the sub folder will return the document */
+        $document = self::$dms->getDocumentByOriginalFilename('file1.txt', $subfolder);
+        $this->assertInstanceOf(SeedDMS_Core_Document::class, $document);
+        /* Searching for an empty name returns false */
+        $document = self::$dms->getDocumentByOriginalFilename('  ');
+        $this->assertFalse($document);
+    }
+
+    /**
+     * Test method getDocumentByOriginalFilename() with sql failure
+     *
+     * @return void
+     */
+    public function testGetDocumentByOriginalFilenameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('createTemporaryTable')
+            ->with('ttcontentid')
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->getDocumentByOriginalFilename(1));
+    }
+
+    /**
+     * Test getDocumentList()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentList()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $rootfolder);
+
+        /* Add a new document */
+        $filename = self::createTempFile(200);
+        list($document, $res) = $rootfolder->addDocument(
+            'Document 1', // name
+            '', // comment
+            null, // no expiration
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $this->assertIsObject($document);
+
+        /* Add a second new document */
+        $filename = self::createTempFile(200);
+        list($document, $res) = $rootfolder->addDocument(
+            'Document 2', // name
+            '', // comment
+            mktime(0, 0, 0), // expires today
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file2.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $this->assertIsObject($document);
+
+        $documents = self::$dms->getDocumentList('MyDocs', $user);
+        $this->assertIsArray($documents);
+        $this->assertCount(2, $documents);
+        /* All documents expiring from 1 year ago till today */
+        $documents = self::$dms->getDocumentList('ExpiredOwner', $user);
+        $this->assertIsArray($documents);
+        $this->assertCount(1, $documents);
+        /* All documents expiring today */
+        $documents = self::$dms->getDocumentList('ExpiredOwner', $user, 0);
+        $this->assertIsArray($documents);
+        $this->assertCount(1, $documents);
+        /* All documents expiring tomorrow */
+        $documents = self::$dms->getDocumentList('ExpiredOwner', $user, date("Y-m-d", time()+86400));
+        $this->assertIsArray($documents);
+        $this->assertCount(1, $documents);
+        /* Get unknown list */
+        $documents = self::$dms->getDocumentList('foo', $user);
+        $this->assertFalse($documents);
+    }
+
+    /**
+     * Test search()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSearch()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $rootfolder);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $subfolder);
+
+        /* Add a new document to the subfolder*/
+        $filename = self::createTempFile(200);
+        list($document, $res) = $subfolder->addDocument(
+            'Document 1', // name
+            '', // comment
+            null, // no expiration
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        /* Add a new document to the root folder. All documents expire. The first
+         * expires today, the second expires tomorrow, etc.
+         */
+        for ($i=2; $i<=30; $i++) {
+            $filename = self::createTempFile(200);
+            list($document, $res) = $rootfolder->addDocument(
+                'Document '.$i, // name
+                '', // comment
+                mktime(0, 0, 0)+($i-2)*86400, // expires in $i-2 days
+                $user, // owner
+                '', // keywords
+                [], // categories
+                $filename, // name of file
+                'file'.$i.'.txt', // original file name
+                '.txt', // file type
+                'text/plain', // mime type
+                1.0+$i // sequence
+            );
+            $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        }
+        $hits = self::$dms->search(['query'=>'Document']);
+        $this->assertIsArray($hits);
+        $this->assertCount(5, $hits);
+        $this->assertEquals(30, $hits['totalDocs']);
+        $this->assertCount(30, $hits['docs']);
+        /* Limit number of documents to 10 */
+        $hits = self::$dms->search(['query'=>'Document', 'limit'=>10]);
+        $this->assertIsArray($hits);
+        $this->assertCount(5, $hits);
+        $this->assertEquals(30, $hits['totalDocs']);
+        $this->assertCount(10, $hits['docs']);
+        /* Same number of documents if startFolder is the root folder */
+        $hits = self::$dms->search(['query'=>'Document', 'startFolder'=>$rootfolder]);
+        $this->assertIsArray($hits);
+        $this->assertCount(5, $hits);
+        $this->assertEquals(30, $hits['totalDocs']);
+        $this->assertCount(30, $hits['docs']);
+        /* There is just one document below the sub folder */
+        $hits = self::$dms->search(['query'=>'Document', 'startFolder'=>$subfolder]);
+        $this->assertIsArray($hits);
+        $this->assertCount(5, $hits);
+        $this->assertEquals(1, $hits['totalDocs']);
+        /* Get documents with a given expiration date in the future
+         * All documents in subfolder, but not the one in the root folder
+         */
+        $expts = mktime(0, 0, 0);
+        $expstart = [
+            'year'=>date('Y', $expts),
+            'month'=>date('m', $expts),
+            'day'=>date('d', $expts),
+            'hour'=>date('H', $expts),
+            'minute'=>date('i', $expts),
+            'second'=>date('s', $expts)
+        ];
+        $hits = self::$dms->search(['query'=>'Document', 'expirationstartdate'=>$expstart]);
+        $this->assertIsArray($hits);
+        $this->assertCount(5, $hits);
+        $this->assertEquals(29, $hits['totalDocs']);
+        /* Get documents with a given expiration date in the future, starting tomorrow
+         * All documents in subfolder - 1
+         */
+        $expts = mktime(0, 0, 0)+86400;
+        $expstart = [
+            'year'=>date('Y', $expts),
+            'month'=>date('m', $expts),
+            'day'=>date('d', $expts),
+            'hour'=>date('H', $expts),
+            'minute'=>date('i', $expts),
+            'second'=>date('s', $expts)
+        ];
+        $hits = self::$dms->search(['query'=>'Document', 'expirationstartdate'=>$expstart]);
+        $this->assertIsArray($hits);
+        $this->assertCount(5, $hits);
+        $this->assertEquals(28, $hits['totalDocs']);
+        /* Get documents expire today or tomorrow
+         * 2 documents in subfolder 
+         */
+        $expts = mktime(0, 0, 0);
+        $expstart = [
+            'year'=>date('Y', $expts),
+            'month'=>date('m', $expts),
+            'day'=>date('d', $expts),
+            'hour'=>date('H', $expts),
+            'minute'=>date('i', $expts),
+            'second'=>date('s', $expts)
+        ];
+        $expts += 1*86400;
+        $expstop = [
+            'year'=>date('Y', $expts),
+            'month'=>date('m', $expts),
+            'day'=>date('d', $expts),
+            'hour'=>date('H', $expts),
+            'minute'=>date('i', $expts),
+            'second'=>date('s', $expts)
+        ];
+        $hits = self::$dms->search(['query'=>'Document', 'expirationstartdate'=>$expstart, 'expirationenddate'=>$expstop]);
+        $this->assertIsArray($hits);
+        $this->assertCount(5, $hits);
+        $this->assertEquals(2, $hits['totalDocs']);
+        /* Get documents expire before and tomorrow
+         * 2 documents in subfolder 
+         */
+        $expts = mktime(0, 0, 0); // Start of today
+        $expts += 1*86400; // Start of tomorrow
+        $expstop = [
+            'year'=>date('Y', $expts),
+            'month'=>date('m', $expts),
+            'day'=>date('d', $expts),
+            'hour'=>date('H', $expts),
+            'minute'=>date('i', $expts),
+            'second'=>date('s', $expts)
+        ];
+        $hits = self::$dms->search(['query'=>'Document', 'expirationenddate'=>$expstop]);
+        $this->assertIsArray($hits);
+        $this->assertCount(5, $hits);
+        $this->assertEquals(2, $hits['totalDocs']);
+    }
+
+}
+
diff --git a/SeedDMS_Core/tests/DmsWithDataTest.php b/SeedDMS_Core/tests/DmsWithDataTest.php
new file mode 100644
index 000000000..17fde09e7
--- /dev/null
+++ b/SeedDMS_Core/tests/DmsWithDataTest.php
@@ -0,0 +1,290 @@
+<?php
+/**
+ * Implementation of the complex dms tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * DMS test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class DmsWithDataTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test getFoldersMinMax()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetFoldersMinMax()
+    {
+        self::createSimpleFolderStructure();
+        $rootfolder = self::$dms->getRootFolder();
+        $minmax = $rootfolder->getFoldersMinMax();
+        $this->assertIsArray($minmax);
+        $this->assertCount(2, $minmax);
+        $this->assertEquals(0.5, $minmax['min']);
+        $this->assertEquals(2.0, $minmax['max']);
+    }
+
+    /**
+     * Test method getFoldersMinMax()
+     *
+     * @return void
+     */
+    public function testGetFoldersMinMaxSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT min(`sequence`) AS `min`, max(`sequence`) AS `max` FROM `tblFolders`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->getFoldersMinMax());
+    }
+
+    /**
+     * Test getDocumentsMinMax()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentsMinMax()
+    {
+        self::createSimpleFolderStructureWithDocuments();
+        $subfolder = self::$dms->getFolderByName('Subfolder 1');
+        $this->assertIsObject($subfolder);
+        $minmax = $subfolder->getDocumentsMinMax();
+        $this->assertIsArray($minmax);
+        $this->assertCount(2, $minmax);
+        $this->assertEquals(2.0, $minmax['min']);
+        $this->assertEquals(16.0, $minmax['max']);
+    }
+
+    /**
+     * Test method getDocumentsMinMax()
+     *
+     * @return void
+     */
+    public function testGetDocumentsMinMaxSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT min(`sequence`) AS `min`, max(`sequence`) AS `max` FROM `tblDocuments`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->getDocumentsMinMax());
+    }
+
+    /**
+     * Test addDocument()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddDocument()
+    {
+        self::createSimpleFolderStructure();
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $rootfolder);
+        $this->assertEquals(1, $rootfolder->getId());
+        /* Add a new document */
+        $filename = self::createTempFile(200);
+        list($document, $res) = $rootfolder->addDocument(
+            'Document 1', // name
+            '', // comment
+            null, // expiration
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $this->assertIsObject($document);
+        $this->assertInstanceOf(SeedDMS_Core_Document::class, $document);
+        $this->assertEquals('Document 1', $document->getName());
+    }
+
+    /**
+     * Test getDocumentsExpired()
+     *
+     * Create two documents which will expired today and tomorrow
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentsExpiredFuture()
+    {
+        self::createSimpleFolderStructure();
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $rootfolder);
+        $this->assertEquals(1, $rootfolder->getId());
+        /* Add a new document */
+        $filename = self::createTempFile(200);
+        list($document, $res) = $rootfolder->addDocument(
+            'Document 1', // name
+            '', // comment
+            mktime(23,59,59), // expiration is still today at 23:59:59
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertIsObject($document);
+        list($document, $res) = $rootfolder->addDocument(
+            'Document 2', // name
+            '', // comment
+            mktime(23,59,59)+1, // expiration is tomorrow today at 0:00:00
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertIsObject($document);
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $documents = self::$dms->getDocumentsExpired(0); /* Docs expire today */
+        $this->assertIsArray($documents);
+        $this->assertCount(1, $documents);
+        $documents = self::$dms->getDocumentsExpired(date('Y-m-d')); /* Docs expire today */
+        $this->assertIsArray($documents);
+        $this->assertCount(1, $documents);
+        $documents = self::$dms->getDocumentsExpired(1); /* Docs expire till tomorrow 23:59:59 */
+        $this->assertIsArray($documents);
+        $this->assertCount(2, $documents);
+        $documents = self::$dms->getDocumentsExpired(date('Y-m-d', time()+86400)); /* Docs expire till tomorrow 23:59:59 */
+        $this->assertIsArray($documents);
+        $this->assertCount(2, $documents);
+        $documents = self::$dms->getDocumentsExpired(date('Y-m-d', time()+86400), $user); /* Docs expire till tomorrow 23:59:59 owned by $user */
+        $this->assertIsArray($documents);
+        $this->assertCount(2, $documents);
+    }
+
+    /**
+     * Test getDocumentsExpired()
+     *
+     * Create two documents which have expired yesterday and the day before
+     * yesterday
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentsExpiredPast()
+    {
+        self::createSimpleFolderStructure();
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $rootfolder);
+        $this->assertEquals(1, $rootfolder->getId());
+        /* Add a new document */
+        $filename = self::createTempFile(200);
+        list($document, $res) = $rootfolder->addDocument(
+            'Document 1', // name
+            '', // comment
+            mktime(0,0,0)-1, // expiration was yesterday
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertIsObject($document);
+        list($document, $res) = $rootfolder->addDocument(
+            'Document 2', // name
+            '', // comment
+            mktime(0,0,0)-1-86400, // expiration the day before yesterday
+            $user, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $this->assertIsObject($document);
+        $documents = self::$dms->getDocumentsExpired(0); /* No Docs expire today */
+        $this->assertIsArray($documents);
+        $this->assertCount(0, $documents);
+        $documents = self::$dms->getDocumentsExpired(-1); /* Docs expired yesterday */
+        $this->assertIsArray($documents);
+        $this->assertCount(1, $documents);
+        $documents = self::$dms->getDocumentsExpired(-2); /* Docs expired since the day before yesterday */
+        $this->assertIsArray($documents);
+        $this->assertCount(2, $documents);
+    }
+
+
+}
diff --git a/SeedDMS_Core/tests/DocumentCategoryTest.php b/SeedDMS_Core/tests/DocumentCategoryTest.php
new file mode 100644
index 000000000..37309d9a1
--- /dev/null
+++ b/SeedDMS_Core/tests/DocumentCategoryTest.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * Implementation of the category tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * User test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class DocumentCategoryTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method getName() and setName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetName()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $cat = self::$dms->addDocumentCategory('Category 1');
+        $name = $cat->getName();
+        $ret = $cat->setName('foo');
+        $this->assertTrue($ret);
+        $name = $cat->getName();
+        $this->assertEquals('foo', $name);
+        $ret = $cat->setName(' ');
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method addCategories(), hasCategory(), setCategory()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddCategoryToDocument()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+
+        /* Add a new document and two categories */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $cat1 = self::$dms->addDocumentCategory('Category 1');
+        $cat2 = self::$dms->addDocumentCategory('Category 2');
+
+        /* There are no categories yet */
+        $ret = $document->hasCategory($cat1);
+        $this->assertFalse($ret);
+
+        /* Not passing a category yields on error */
+        $ret = $document->hasCategory(null);
+        $this->assertFalse($ret);
+
+        /* Adding a category ... */
+        $ret = $document->addCategories([$cat1]);
+        $this->assertTrue($ret);
+
+        /* ... and check if it is there */
+        $ret = $document->hasCategory($cat1);
+        $this->assertTrue($ret);
+
+        /* There should be one category now */
+        $cats = $document->getCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(1, $cats);
+        $this->assertEquals($cat1->getName(), $cats[0]->getName());
+
+        /* Adding the same category shouldn't change anything */
+        $ret = $document->addCategories([$cat1]);
+        $this->assertTrue($ret);
+
+        /* Check if category is used */
+        $ret = $cat1->isUsed();
+        $this->assertTrue($ret);
+        $ret = $cat2->isUsed();
+        $this->assertFalse($ret);
+
+        /* There is one document with cat 1 but none with cat 2 */
+        $docs = $cat1->getDocumentsByCategory();
+        $this->assertIsArray($docs);
+        $this->assertCount(1, $docs);
+        $num = $cat1->countDocumentsByCategory();
+        $this->assertEquals(1, $num);
+        $docs = $cat2->getDocumentsByCategory();
+        $this->assertIsArray($docs);
+        $this->assertCount(0, $docs);
+        $num = $cat2->countDocumentsByCategory();
+        $this->assertEquals(0, $num);
+
+        /* Still only one category */
+        $cats = $document->getCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(1, $cats);
+
+        /* Setting new categories will replace the old ones */
+        $ret = $document->setCategories([$cat1, $cat2]);
+        $this->assertTrue($ret);
+
+        /* Now we have two categories */
+        $cats = $document->getCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(2, $cats);
+
+        /* Remove a category */
+        $ret = $document->removeCategories([$cat1]);
+        $this->assertTrue($ret);
+
+        /* Removing the same category again does not harm*/
+        $ret = $document->removeCategories([$cat1]);
+        $this->assertTrue($ret);
+
+        /* We are back to one category */
+        $cats = $document->getCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(1, $cats);
+
+        /* Remove the remaining category from the document */
+        $ret = $document->removeCategories($cats);
+        $this->assertTrue($ret);
+
+        /* No category left */
+        $cats = $document->getCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(0, $cats);
+
+        /* Remove the category itself */
+        $cats = self::$dms->getDocumentCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(2, $cats);
+        $ret = $cat1->remove();
+        $cats = self::$dms->getDocumentCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(1, $cats);
+    }
+
+    /**
+     * Test method getCategories() with sql fail
+     *
+     * @return void
+     */
+    public function testGetCategoriesSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblCategory` WHERE"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->getCategories());
+    }
+
+    /**
+     * Test method addCategories() with sql fail
+     *
+     * @return void
+     */
+    public function testAddCategoriesSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        /* mock sql statement in getCategories() which is called in addCategories() */
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblCategory` WHERE"))
+            ->willReturn([]);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("INSERT INTO `tblDocumentCategory`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document = $this->getMockedDocument();
+        $document->setDMS($dms);
+		$cat = new SeedDMS_Core_DocumentCategory(1, 'Category');
+		$cat->setDMS($dms);
+        $this->assertFalse($document->addCategories([$cat]));
+    }
+
+    /**
+     * Test method removeCategories() with sql fail
+     *
+     * @return void
+     */
+    public function testRemoveCategoriesSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("DELETE FROM `tblDocumentCategory` WHERE"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document = $this->getMockedDocument();
+        $document->setDMS($dms);
+		$cat = new SeedDMS_Core_DocumentCategory(1, 'Category');
+		$cat->setDMS($dms);
+        $this->assertFalse($document->removeCategories([$cat]));
+    }
+
+    /**
+     * Test method setCategories() with sql fail when deleting categories
+     *
+     * @return void
+     */
+    public function testSetCategoriesSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("DELETE FROM `tblDocumentCategory` WHERE"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document = $this->getMockedDocument();
+        $document->setDMS($dms);
+		$cat = new SeedDMS_Core_DocumentCategory(1, 'Category');
+		$cat->setDMS($dms);
+        $this->assertFalse($document->setCategories([$cat]));
+    }
+
+    /**
+     * Test method setCategories() with sql fail when inserting new categories
+     *
+     * @return void
+     */
+    public function testSetCategoriesSqlFail2()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->exactly(2))
+            ->method('getResult')
+            ->will(
+                $this->returnValueMap(
+                    array(
+                        array("DELETE FROM `tblDocumentCategory` WHERE `documentID` = 1", true, true),
+                        array("INSERT INTO `tblDocumentCategory`", true, false)
+                    )
+                )
+            );
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document = $this->getMockedDocument();
+        $document->setDMS($dms);
+		$cat = new SeedDMS_Core_DocumentCategory(1, 'Category');
+		$cat->setDMS($dms);
+        $this->assertFalse($document->setCategories([$cat]));
+    }
+
+}
+
diff --git a/SeedDMS_Core/tests/DocumentContentTest.php b/SeedDMS_Core/tests/DocumentContentTest.php
new file mode 100644
index 000000000..9a8e9a14b
--- /dev/null
+++ b/SeedDMS_Core/tests/DocumentContentTest.php
@@ -0,0 +1,593 @@
+<?php
+/**
+ * Implementation of the document content tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * Group test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class DocumentContentTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method getContent(), getContentByVersion(), getLatestContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetContent()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+        $version = $document->getContentByVersion(1);
+        $this->assertIsObject($version);
+        $this->assertEquals($version->getId(), $lcontent->getId());
+        $content = $document->getContent();
+        $this->assertIsArray($content);
+        $this->assertCount(1, $content);
+        $this->assertEquals($version->getId(), $content[0]->getId());
+    }
+
+    /**
+     * Test method getContent() mit sql fail
+     *
+     * @return void
+     */
+    public function testGetContentSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblDocumentContent` WHERE `document` "))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->getContent());
+    }
+
+    /**
+     * Test method getContentByVersion() mit sql fail
+     *
+     * @return void
+     */
+    public function testGetContentByVersionSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblDocumentContent` WHERE `document` "))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->getContentByVersion(1));
+    }
+
+    /**
+     * Test method getLatestContent() mit sql fail
+     *
+     * @return void
+     */
+    public function testGetLatestContentSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblDocumentContent` WHERE `document` "))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->getLatestContent());
+    }
+
+    /**
+     * Test method removeContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testRemoveContent()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+
+        /* Removing the only version will fail */
+        $ret = $document->removeContent($lcontent);
+        $this->assertFalse($ret);
+
+        /* Add a new version */
+        $filename = self::createTempFile(300);
+        $result = $document->addContent('', $user, $filename, 'file2.txt', '.txt', 'text/plain');
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $this->assertIsObject($result);
+        $this->assertIsObject($result->getContent());
+
+        /* Second trial to remove a version. Now it succeeds because it is not
+         * the last version anymore.
+         */
+        $ret = $document->removeContent($lcontent);
+        $this->assertTrue($ret);
+
+        /* The latest version is now version 2 */
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+        $this->assertEquals(2, $lcontent->getVersion());
+
+        /* There is only 1 version left */
+        $contents = $document->getContent();
+        $this->assertIsArray($contents);
+        $this->assertCount(1, $contents);
+    }
+
+    /**
+     * Test method isType()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testIsType()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+        $ret = $lcontent->isType('documentcontent');
+        $this->assertTrue($ret);
+    }
+
+    /**
+     * Test method getUser(), getDocument()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testVarious()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+        $ret = $lcontent->isType('documentcontent');
+        $this->assertTrue($ret);
+        $doc = $lcontent->getDocument();
+        $this->assertEquals($document->getId(), $doc->getId());
+        $u = $lcontent->getUser();
+        $this->assertEquals($user->getId(), $u->getId());
+        $filetype = $lcontent->getFileType();
+        $this->assertEquals('.txt', $filetype);
+        $origfilename = $lcontent->getOriginalFileName();
+        $this->assertEquals('file1.txt', $origfilename);
+    }
+
+    /**
+     * Test method getComment(), setComment()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetComment()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+        $comment = $lcontent->getComment();
+        $this->assertEquals('', $comment);
+        $ret = $lcontent->setComment('Document content comment');
+        $this->assertTrue($ret);
+        /* Retrieve the document content from the database again */
+        $content = self::$dms->getDocumentContent($lcontent->getId());
+        $comment = $content->getComment();
+        $this->assertEquals('Document content comment', $comment);
+    }
+
+    /**
+     * Test method getDate(), setDate()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetDate()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+        $date = $lcontent->getDate();
+        $this->assertIsInt($date);
+        $this->assertGreaterThanOrEqual(time(), $date);
+
+        /* Set date as timestamp */
+        $ret = $lcontent->setDate($date-1000);
+        $this->assertTrue($ret);
+        /* Retrieve the document content from the database again */
+        $content = self::$dms->getDocumentContent($lcontent->getId());
+        $newdate = $content->getDate();
+        $this->assertEquals($date-1000, $newdate);
+
+        /* Set date in Y-m-d H:i:s format */
+        $date = time()-500;
+        $ret = $lcontent->setDate(date('Y-m-d H:i:s', $date));
+        $this->assertTrue($ret);
+        /* Retrieve the document content from the database again */
+        $content = self::$dms->getDocumentContent($lcontent->getId());
+        $newdate = $content->getDate();
+        $this->assertEquals($date, $newdate);
+
+        /* Not passing a date will set the current date/time */
+        $date = time();
+        $ret = $lcontent->setDate();
+        $this->assertTrue($ret);
+        /* Retrieve the document content from the database again */
+        $content = self::$dms->getDocumentContent($lcontent->getId());
+        $newdate = $content->getDate();
+        $this->assertEquals($date, $newdate);
+    }
+
+    /**
+     * Test method getFileSize(), setFileSize()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetFileSize()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1', 200);
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+        $filesize = $lcontent->getFileSize();
+        $this->assertEquals(200, $filesize);
+
+        /* Intentially corrupt the file size */
+        $db = self::$dms->getDb();
+        $ret = $db->getResult("UPDATE `tblDocumentContent` SET `fileSize` = 300  WHERE `document` = " . $document->getID() . " AND `version` = " . $lcontent->getVersion());
+        $this->assertTrue($ret);
+
+        $corcontent = self::$dms->getDocumentContent($lcontent->getId());
+        $filesize = $corcontent->getFileSize();
+        $this->assertEquals(300, $filesize);
+
+        /* Repair filesize by calling setFileSize() */
+        $ret = $corcontent->setFileSize();
+        $this->assertTrue($ret);
+        $filesize = $corcontent->getFileSize();
+        $this->assertEquals(200, $filesize);
+    }
+
+    /**
+     * Test method getChecksum(), setChecksum()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetChecksum()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1', 200);
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+        $orgchecksum = $lcontent->getChecksum();
+        $this->assertIsString($orgchecksum);
+        $this->assertEquals(32, strlen($orgchecksum));
+
+        /* Intentially corrupt the checksum */
+        $db = self::$dms->getDb();
+        $ret = $db->getResult("UPDATE `tblDocumentContent` SET `checksum` = 'foobar'  WHERE `document` = " . $document->getID() . " AND `version` = " . $lcontent->getVersion());
+        $this->assertTrue($ret);
+
+        $corcontent = self::$dms->getDocumentContent($lcontent->getId());
+        $checksum = $corcontent->getChecksum();
+        $this->assertEquals('foobar', $checksum);
+
+        /* Repair filesize by calling setChecksum() */
+        $ret = $corcontent->setChecksum();
+        $this->assertTrue($ret);
+        $checksum = $corcontent->getChecksum();
+        $this->assertEquals($orgchecksum, $checksum);
+    }
+
+    /**
+     * Test method getStatus(), setStatus(), getStatusLog()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetStatus()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1', 200);
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+
+        $status = $lcontent->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_RELEASED, $status['status']);
+
+        $statuslog = $lcontent->getStatusLog();
+        $this->assertIsArray($statuslog);
+        $this->assertCount(1, $statuslog);
+
+        /* Missing update user returns false */
+        $ret = $lcontent->setStatus(S_OBSOLETE, '', null);
+        $this->assertFalse($ret);
+
+        /* A status out of range returns false */
+        $ret = $lcontent->setStatus(9, '', $user);
+        $this->assertFalse($ret);
+
+        /* A wrong date returns false */
+        $ret = $lcontent->setStatus(S_OBSOLETE, '', $user, '2021-02-29 10:10:10');
+        $this->assertFalse($ret);
+
+        $ret = $lcontent->setStatus(S_OBSOLETE, 'No longer valid', $user, date('Y-m-d H:i:s'));
+        $status = $lcontent->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_OBSOLETE, $status['status']);
+
+        /* Status log has now 2 entries */
+        $statuslog = $lcontent->getStatusLog();
+        $this->assertIsArray($statuslog);
+        $this->assertCount(2, $statuslog);
+
+        /* Add the 'onSetStatus' callback */
+        $callret = '';
+        $callback = function ($param, $content, $updateuser, $oldstatus, $newstatus) use (&$callret) {
+            $callret = $oldstatus.' to '.$newstatus; 
+            return $param;
+        };
+        /* Because the callback will return false, the status will not be set */
+        self::$dms->setCallback('onSetStatus', $callback, false);
+        /* Trying to go back to status released with a callback returning false */
+        $ret = $lcontent->setStatus(S_RELEASED, 'Valid again', $user);
+        $status = $lcontent->getStatus();
+        $this->assertIsArray($status);
+        /* Status is still S_OBSOLETE because the callback returned false */
+        $this->assertEquals(S_OBSOLETE, $status['status']);
+        $this->assertEquals(S_OBSOLETE.' to '.S_RELEASED, $callret);
+
+        /* Do it again, but this time the callback returns true */
+        self::$dms->setCallback('onSetStatus', $callback, true);
+        /* Trying to go back to status released with a callback returning true */
+        $ret = $lcontent->setStatus(S_RELEASED, 'Valid again', $user);
+        $status = $lcontent->getStatus();
+        $this->assertIsArray($status);
+        /* Status updated to S_RELEASED because the callback returned true */
+        $this->assertEquals(S_RELEASED, $status['status']);
+        $this->assertEquals(S_OBSOLETE.' to '.S_RELEASED, $callret);
+
+        /* Status log has now 3 entries */
+        $statuslog = $lcontent->getStatusLog();
+        $this->assertIsArray($statuslog);
+        $this->assertCount(3, $statuslog);
+
+        /* Get just the last entry */
+        $statuslog = $lcontent->getStatusLog(1);
+        $this->assertIsArray($statuslog);
+        $this->assertCount(1, $statuslog);
+        $this->assertEquals('Valid again', $statuslog[0]['comment']);
+    }
+
+    /**
+     * Test method getMimeType(), setMimeType()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetMimeType()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1', 200);
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+
+        $ret = $lcontent->setMimeType('text/csv');
+        $this->assertTrue($ret);
+
+        /* Retrieve the document content from the database again */
+        $content = self::$dms->getDocumentContent($lcontent->getId());
+        $this->assertIsObject($content);
+        $this->assertEquals('text/csv', $content->getMimeType());
+    }
+
+    /**
+     * Test method getFileType(), setFileType()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetFileType()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1', 200);
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+
+        $ret = $lcontent->setMimeType('text/css');
+        $this->assertTrue($ret);
+
+        $ret = $lcontent->setFileType();
+        $this->assertTrue($ret);
+
+        /* Retrieve the document content from the database again */
+        $content = self::$dms->getDocumentContent($lcontent->getId());
+        $this->assertIsObject($content);
+        $this->assertEquals('.css', $content->getFileType());
+
+        /* Also get the file content to ensure the renaming of the file
+         * on disc has succeeded.
+         */
+        $c = file_get_contents(self::$dms->contentDir.$lcontent->getPath());
+        $this->assertEquals(200, strlen($c));
+    }
+
+    /**
+     * Test method replaceContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testReplaceContent()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $guest = self::$dms->getUser(2);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1', 200);
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+
+        $filename = self::createTempFile(300);
+        /* Not using the same user yields an error */
+        $ret = $document->replaceContent(1, $guest, $filename, 'file1.txt', '.txt', 'text/plain');
+        $this->assertFalse($ret);
+        /* Not using the same orig. file name yields an error */
+        $ret = $document->replaceContent(1, $user, $filename, 'file2.txt', '.txt', 'text/plain');
+        $this->assertFalse($ret);
+        /* Not using the same file type yields an error */
+        $ret = $document->replaceContent(1, $user, $filename, 'file1.txt', '.csv', 'text/plain');
+        $this->assertFalse($ret);
+        /* Not using the same mime type yields an error */
+        $ret = $document->replaceContent(1, $user, $filename, 'file1.txt', '.txt', 'text/csv');
+        $this->assertFalse($ret);
+
+        /* Setting version to 0 will replace the latest version */
+        $ret = $document->replaceContent(0, $user, $filename, 'file1.txt', '.txt', 'text/plain');
+        $this->assertTrue($ret);
+
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+
+        /* Retrieve the document content from the database again */
+        $newcontent = $document->getLatestContent();
+        $this->assertIsObject($newcontent);
+        $this->assertEquals('text/plain', $newcontent->getMimeType());
+        /* File size has grown from 200 to 300 bytes */
+        $filesize = $newcontent->getFileSize();
+        $this->assertEquals(300, $filesize);
+        /* Still version 1 */
+        $version = $newcontent->getVersion();
+        $this->assertEquals(1, $version);
+    }
+
+    /**
+     * Test method replaceContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAccessMode()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $guest = self::$dms->getUser(2);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1', 200);
+        $this->assertIsObject($document);
+        $lcontent = $document->getLatestContent();
+        $this->assertIsObject($lcontent);
+
+        /* Access rights on a document content are always M_READ unless the callback
+         * onCheckAccessDocumentContent is implemented */
+        $mode = $lcontent->getAccessMode($user);
+        $this->assertEquals(M_READ, $mode);
+    }
+}
diff --git a/SeedDMS_Core/tests/DocumentFileTest.php b/SeedDMS_Core/tests/DocumentFileTest.php
new file mode 100644
index 000000000..95d758c56
--- /dev/null
+++ b/SeedDMS_Core/tests/DocumentFileTest.php
@@ -0,0 +1,290 @@
+<?php
+/**
+ * Implementation of the document file tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * Group test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class DocumentFileTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+        self::$dbversion = self::$dms->getDBVersion();
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method getInstance()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetMockedDocumentFile()
+    {
+        $user = self::getMockedUser();
+        $document1 = self::getMockedDocument(1, 'Document 1');
+        $file = new SeedDMS_Core_DocumentFile(1, $document1, $user->getId(), 'comment', time(), '', '.txt', 'text/plain', 'test.txt', 'name', 1, true);
+        $this->assertIsObject($file);
+        $this->assertTrue($file->isType('documentfile'));
+
+        $document = $file->getDocument();
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+        $this->assertEquals('Document 1', $document->getName());
+
+        $ispublic = $file->isPublic();
+        $this->assertTrue($ispublic);
+
+        $comment = $file->getComment();
+        $this->assertEquals('comment', $comment);
+
+        $filetype = $file->getFileType();
+        $this->assertEquals('.txt', $filetype);
+
+        $mimetype = $file->getMimeType();
+        $this->assertEquals('text/plain', $mimetype);
+
+        $name = $file->getName();
+        $this->assertEquals('name', $name);
+
+        $origfilename = $file->getOriginalFileName();
+        $this->assertEquals('test.txt', $origfilename);
+
+        $version = $file->getVersion();
+        $this->assertEquals(1, $version);
+
+        $accessmode = $file->getAccessMode($user);
+        $this->assertEquals(M_READ, $accessmode);
+    }
+
+    /**
+     * Test method setComment() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetCommentSqlFail()
+    {
+        $user = self::getMockedUser();
+        $document = $this->getMockedDocument();
+        $file = new SeedDMS_Core_DocumentFile(1, $document, $user->getId(), 'comment', time(), '', '.txt', 'text/plain', 'test.txt', 'name', 1, true);
+        $this->assertIsObject($file);
+        $this->assertTrue($file->isType('documentfile'));
+
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocumentFiles` SET `comment`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($file->setComment('my comment'));
+    }
+
+    /**
+     * Test method setName() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetNameSqlFail()
+    {
+        $user = self::getMockedUser();
+        $document = $this->getMockedDocument();
+        $file = new SeedDMS_Core_DocumentFile(1, $document, $user->getId(), 'comment', time(), '', '.txt', 'text/plain', 'test.txt', 'name', 1, true);
+        $this->assertIsObject($file);
+        $this->assertTrue($file->isType('documentfile'));
+
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocumentFiles` SET `name`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($file->setName('my name'));
+    }
+
+    /**
+     * Test method setDate() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetDateSqlFail()
+    {
+        $user = self::getMockedUser();
+        $document = $this->getMockedDocument();
+        $file = new SeedDMS_Core_DocumentFile(1, $document, $user->getId(), 'comment', time(), '', '.txt', 'text/plain', 'test.txt', 'name', 1, true);
+        $this->assertIsObject($file);
+        $this->assertTrue($file->isType('documentfile'));
+
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocumentFiles` SET `date`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($file->setDate());
+    }
+
+    /**
+     * Test method setVersion() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetVersionSqlFail()
+    {
+        $user = self::getMockedUser();
+        $document = $this->getMockedDocument();
+        $file = new SeedDMS_Core_DocumentFile(1, $document, $user->getId(), 'comment', time(), '', '.txt', 'text/plain', 'test.txt', 'name', 1, true);
+        $this->assertIsObject($file);
+        $this->assertTrue($file->isType('documentfile'));
+
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocumentFiles` SET `version`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($file->setVersion(1));
+    }
+
+    /**
+     * Test method setPublic() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetPublicnSqlFail()
+    {
+        $user = self::getMockedUser();
+        $document = $this->getMockedDocument();
+        $file = new SeedDMS_Core_DocumentFile(1, $document, $user->getId(), 'comment', time(), '', '.txt', 'text/plain', 'test.txt', 'name', 1, true);
+        $this->assertIsObject($file);
+        $this->assertTrue($file->isType('documentfile'));
+
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocumentFiles` SET `public`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($file->setPublic(true));
+    }
+
+    /**
+     * Test method addDocumentFile(), getDocumentFile()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddDocumentFile()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $tmpfile = self::createTempFile();
+        $file = $document->addDocumentFile('attachment.txt', 'comment', $user, $tmpfile, 'attachment.txt', '.txt', 'text/plain', 0, true);
+        $this->assertTrue(SeedDMS_Core_File::removeFile($tmpfile));
+        $this->assertIsObject($file);
+        $this->assertTrue($file->isType('documentfile'));
+
+        $files = $document->getDocumentFiles();
+        $this->assertIsArray($files);
+        $this->assertCount(1, $files);
+
+        $file = $files[0];
+
+        $document = $file->getDocument();
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+        $this->assertEquals('Document 1', $document->getName());
+
+        $ispublic = $file->isPublic();
+        $this->assertTrue($ispublic);
+
+        $luser = $file->getUser();
+        $this->assertIsObject($luser);
+        $this->assertTrue($luser->isType('user'));
+
+        $ret = $file->setComment('new comment');
+        $this->assertTrue($ret);
+        $comment = $file->getComment();
+        $this->assertEquals('new comment', $comment);
+
+        $ret = $file->setName('new name');
+        $this->assertTrue($ret);
+        $name = $file->getName();
+        $this->assertEquals('new name', $name);
+
+        $now = time();
+        $ret = $file->setDate($now);
+        $this->assertTrue($ret);
+        $date = $file->getDate();
+        $this->assertEquals($now, $date);
+
+        $ret = $file->setDate('fail');
+        $this->assertFalse($ret);
+
+        $ret = $file->setVersion(2);
+        $this->assertTrue($ret);
+        $version = $file->getVersion();
+        $this->assertEquals(2, $version);
+
+        $ret = $file->setVersion('fail');
+        $this->assertFalse($ret);
+
+        $ret = $file->setPublic(true);
+        $this->assertTrue($ret);
+        $ispublic = $file->isPublic();
+        $this->assertEquals(1, $ispublic);
+
+
+    }
+}
diff --git a/SeedDMS_Core/tests/DocumentLinkTest.php b/SeedDMS_Core/tests/DocumentLinkTest.php
new file mode 100644
index 000000000..d646607e9
--- /dev/null
+++ b/SeedDMS_Core/tests/DocumentLinkTest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Implementation of the document link tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * Group test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class DocumentLinkTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+        self::$dbversion = self::$dms->getDBVersion();
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method getInstance()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetMockedDocumentLink()
+    {
+        $user = self::getMockedUser();
+        $document1 = self::getMockedDocument(1, 'Document 1');
+        $document2 = self::getMockedDocument(2, 'Document 2');
+        $link = new SeedDMS_Core_DocumentLink(1, $document1, $document2, $user, true);
+        $this->assertIsObject($link);
+        $this->assertTrue($link->isType('documentlink'));
+
+        $document = $link->getDocument();
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+        $this->assertEquals('Document 1', $document->getName());
+
+        $document = $link->getTarget();
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+        $this->assertEquals('Document 2', $document->getName());
+
+        $ispublic = $link->isPublic();
+        $this->assertTrue($ispublic);
+    }
+
+    /**
+     * Test method addDocumentLink(), getDocumentLink()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddDocumentLink()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $document1 = self::createDocument($rootfolder, $user, 'Document 1');
+        $this->assertIsObject($document1);
+        $document2 = self::createDocument($rootfolder, $user, 'Document 2');
+        $this->assertIsObject($document2);
+        $link = $document1->addDocumentLink($document2->getId(), $user->getId(), true);
+        $this->assertIsObject($link);
+        $this->assertTrue($link->isType('documentlink'));
+
+        $document = $link->getDocument();
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+        $this->assertEquals('Document 1', $document->getName());
+
+        $document = $link->getTarget();
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+        $this->assertEquals('Document 2', $document->getName());
+
+        $ispublic = $link->isPublic();
+        $this->assertTrue($ispublic);
+
+        $luser = $link->getUser();
+        $this->assertIsObject($luser);
+        $this->assertTrue($luser->isType('user'));
+    }
+}
diff --git a/SeedDMS_Core/tests/DocumentTest.php b/SeedDMS_Core/tests/DocumentTest.php
new file mode 100644
index 000000000..5331f367d
--- /dev/null
+++ b/SeedDMS_Core/tests/DocumentTest.php
@@ -0,0 +1,1323 @@
+<?php
+/**
+ * Implementation of the document tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * Group test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class DocumentTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+        self::$dbversion = self::$dms->getDBVersion();
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method getInstance()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetInstance()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        /* Get the document with id 1, which must be 'Document 1' */
+        $document = SeedDMS_Core_Document::getInstance(1, self::$dms);
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+        $this->assertEquals('Document 1', $document->getName());
+        /* Get a none existing document */
+        $document = SeedDMS_Core_Document::getInstance(2, self::$dms);
+        $this->assertNull($document);
+    }
+
+    /**
+     * Test method getInstance() within a root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetInstanceWithinRoot()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* The simple folder structure will create to subfolders, each
+         * with 15 documents.
+         */
+        self::createSimpleFolderStructureWithDocuments();
+        $subfolder = self::$dms->getFolderByName('Subfolder 1');
+        /* Get a document in Subfolder 1 */
+        $document1 = self::$dms->getDocumentByName('Document 1-1');
+        /* Get a document in Subfolder 2 */
+        $document2 = self::$dms->getDocumentByName('Document 2-1');
+
+        /* Getting a document in subfolder 1 without any restrictions must succeed */
+        $document = SeedDMS_Core_Document::getInstance($document1->getId(), self::$dms);
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+
+        /* Make Subfolder 1 the root folder */
+        self::$dms->checkWithinRootDir = true;
+        self::$dms->setRootFolderID($subfolder->getId());
+
+        /* Getting a document by id in subfolder 1 still must succeed */
+        $document = SeedDMS_Core_Document::getInstance($document1->getId(), self::$dms);
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+
+        /* Getting a document by id in subfolder 2 must fail */
+        $document = SeedDMS_Core_Document::getInstance($document2->getId(), self::$dms);
+        $this->assertNull($document);
+
+        /* Get a document in Subfolder 1 */
+        $document = self::$dms->getDocumentByName('Document 1-1');
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+
+        /* Get a document in Subfolder 2 */
+        $document = self::$dms->getDocumentByName('Document 2-1');
+        $this->assertNull($document);
+    }
+
+    /**
+     * Test method getInstance()
+     *
+     * @return void
+     */
+    public function testGetInstanceSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lock` FROM `tblDocuments`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse(SeedDMS_Core_Document::getInstance(1, $dms));
+    }
+
+    /**
+     * Test method getDir()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDir()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $this->assertEquals('1/', $document->getDir());
+    }
+
+    /**
+     * Test method getComment() and setComment()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetComment()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $document = self::createDocument($folder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $comment = $document->getComment();
+        $this->assertEquals('', $comment);
+        $ret = $document->setComment('foo');
+        $this->assertTrue($ret);
+        $comment = $document->getComment();
+        $this->assertEquals('foo', $comment);
+    }
+
+    /**
+     * Test method setComment() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetCommentSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `comment`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setComment('my comment'));
+    }
+
+    /**
+     * Test method getKeywords() and setKeywords()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetKeywords()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $document = self::createDocument($folder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $keywords = $document->getKeywords();
+        $this->assertEquals('', $keywords);
+        $ret = $document->setKeywords('foo bar');
+        $this->assertTrue($ret);
+        $keywords = $document->getKeywords();
+        $this->assertEquals('foo bar', $keywords);
+    }
+
+    /**
+     * Test method setKeywords() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetKeywordsSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `keywords`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setKeywords('keywords'));
+    }
+
+    /**
+     * Test method getName() and setName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetName()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $document = self::createDocument($folder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $name = $document->getName();
+        $this->assertEquals('Document 1', $name);
+        $ret = $document->setName('foo');
+        $this->assertTrue($ret);
+        $name = $document->getName();
+        $this->assertEquals('foo', $name);
+    }
+
+    /**
+     * Test method setName() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetNameSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `name`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setName('my name'));
+    }
+
+    /**
+     * Test method getDate() and setDate()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetDate()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $document = self::createDocument($folder, $user, 'Document 1');
+        $now = time();
+        /* Passing false as a time stamp will take current time stamp */
+        $ret = $document->setDate(false);
+        $this->assertTrue($ret);
+        $date = $document->getDate();
+        $this->assertEquals($now, $date);
+        /* Setting a time stamp */
+        $now -= 1000;
+        $ret = $document->setDate($now);
+        $this->assertTrue($ret);
+        $date = $document->getDate();
+        $this->assertEquals($now, $date);
+        /* Setting a none numeric value will fail */
+        $ret = $document->setDate('foo');
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method setDate() with sql fail
+     *
+     * @return void
+     */
+    public function testSetDateSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `date` = "))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setDate(null));
+    }
+
+    /**
+     * Test method getDefaultAccess() and setDefaultAccess()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetDefaultAccess()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $document = self::createDocument($folder, $user, 'Document 1');
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+        $defaultaccess = $document->getDefaultAccess();
+        $this->assertEquals(M_READ, $defaultaccess);
+
+        /* Setting a default access out of range yields an error */
+        $ret = $document->setDefaultAccess(0, true);
+        $this->assertFalse($ret);
+
+        /* Setting a default access out of range yields an error */
+        $ret = $document->setDefaultAccess(M_ALL+1, true);
+        $this->assertFalse($ret);
+
+        /* Setting the default access will have no effect as long as access
+         * rights are inherited. */
+        $ret = $document->setDefaultAccess(M_READWRITE, true);
+        $this->assertTrue($ret);
+        $defaultaccess = $document->getDefaultAccess();
+        $this->assertEquals(M_READ, $defaultaccess);
+
+        /* Once inheritance of access rights is turned off, the previously
+         * set default access right will take effect. */
+        $ret = $document->setInheritAccess(false, true);
+        $this->assertTrue($ret);
+        $defaultaccess = $document->getDefaultAccess();
+        $this->assertEquals(M_READWRITE, $defaultaccess);
+
+        /* Also check if inherited access was turned off */
+        $ret = $document->getInheritAccess();
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method setDefaultAccess() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetDefaultAccessSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `defaultAccess`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setDefaultAccess(M_READ));
+    }
+
+    /**
+     * Test method setInheritAccess() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetInheritAccessSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `inheritAccess`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setInheritAccess(0));
+    }
+
+    /**
+     * Test method addAccess(), removeAccess(), changeAccess(), getAccessList()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetAccess()
+    {
+        self::createGroupsAndUsers();
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $adminuser = self::$dms->getUser(1);
+        $guestuser = self::$dms->getUser(2);
+        $user = self::$dms->getUserByLogin('user-1-1');
+        $this->assertIsObject($user);
+        $this->assertTrue($user->isType('user'));
+        $group = self::$dms->getGroupByName('Group 1');
+        $this->assertIsObject($group);
+        $this->assertTrue($group->isType('group'));
+        $document = self::createDocument($folder, $adminuser, 'Document 1');
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+        $defaultaccess = $document->getDefaultAccess();
+        $this->assertEquals(M_READ, $defaultaccess);
+
+        /* Turn off inheritance, otherwise the access rights have no effect */
+        $ret = $document->setInheritAccess(false, true);
+        $this->assertTrue($ret);
+
+        /* Retrieving an access mode without a valid user will always return M_NONE */
+        $mode = $document->getAccessMode(null);
+        $this->assertEquals(M_NONE, $mode);
+
+        /* The admin user has always unlimited access */
+        $mode = $document->getAccessMode($adminuser);
+        $this->assertEquals(M_ALL, $mode);
+
+        /* Without setting any specific access, the document has a default mode M_READ */
+        $mode = $document->getAccessMode($user);
+        $this->assertEquals(M_READ, $mode);
+
+        /* Access mode for group is also the default access */
+        $mode = $document->getGroupAccessMode($group);
+        $this->assertEquals(M_READ, $mode);
+
+        /* Set unlimited access rights for everybody */
+        $ret = $document->setDefaultAccess(M_ALL);
+        $this->assertTrue($ret);
+        $mode = $document->getAccessMode($user);
+        $this->assertEquals(M_ALL, $mode);
+        $mode = $document->getGroupAccessMode($group);
+        $this->assertEquals(M_ALL, $mode);
+
+        /* Guest still have just read access */
+        $mode = $document->getAccessMode($guestuser);
+        $this->assertEquals(M_READ, $mode);
+
+        /* Add wrong access type returns false */
+        $ret = $document->addAccess(M_ALL+1, $user->getId(), true);
+        $this->assertFalse($ret);
+
+        /* Add read/write access on the document for user */
+        $ret = $document->addAccess(M_READWRITE, $user->getId(), true);
+        $this->assertTrue($ret);
+        /* Adding another access right (not matter which one) for the
+         * same user yields an error
+         */
+        $ret = $document->addAccess(M_READ, $user->getId(), true);
+        $this->assertFalse($ret);
+
+        /* Passing an invalid second parameter will return false */
+        $accesslist = $document->getAccessList(M_ANY, 5);
+        $this->assertFalse($accesslist);
+
+        /* Searching for mode == M_READ will return neither a group nor
+         * the user, because the user has read&write access
+         */
+        $accesslist = $document->getAccessList(M_READ);
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['groups']);
+        $this->assertCount(0, $accesslist['users']);
+
+        $accesslist = $document->getAccessList(M_READWRITE);
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['groups']);
+        $this->assertCount(1, $accesslist['users']);
+
+        $accesslist = $document->getAccessList();
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['groups']);
+        $this->assertCount(1, $accesslist['users']);
+
+        /* Access mode is just read/write for the user thought the default is unlimited */
+        $mode = $document->getAccessMode($user);
+        $this->assertEquals(M_READWRITE, $mode);
+        /* Access mode for the group is still unlimited */
+        $mode = $document->getGroupAccessMode($group);
+        $this->assertEquals(M_ALL, $mode);
+
+        /* Setting default access to M_READ
+         * is just a precaution to ensure the unlimeted access rights is not
+         * derived from the default access which was set to M_ALL above.
+         */
+        $ret = $document->setDefaultAccess(M_READ);
+        $this->assertTrue($ret);
+        $mode = $document->getGroupAccessMode($group);
+        $this->assertEquals(M_READ, $mode);
+
+        /* Add unlimeted access on the document for group */
+        $ret = $document->addAccess(M_ALL, $group->getId(), false);
+        $this->assertTrue($ret);
+        /* Adding another access right (not matter which one) for the
+         * same group yields an error
+         */
+        $ret = $document->addAccess(M_READ, $group->getId(), false);
+        $this->assertFalse($ret);
+
+        $accesslist = $document->getAccessList();
+        $this->assertIsArray($accesslist);
+        $this->assertCount(1, $accesslist['groups']);
+        $this->assertCount(1, $accesslist['users']);
+
+        /* The group has now unlimited access rights */
+        $mode = $document->getGroupAccessMode($group);
+        $this->assertEquals(M_ALL, $mode);
+
+        /* The user still has just read/write access, though the group he belongs
+         * to has unlimeted rights. The specific user rights has higher priority.
+         */
+        $mode = $document->getAccessMode($user);
+        $this->assertEquals(M_READWRITE, $mode);
+
+        /* Remove all specific access rights for the user */
+        $ret = $document->removeAccess($user->getId(), true);
+        $this->assertTrue($ret);
+
+        /* Now the group rights apply for the user, because there are no
+         * specific user rights anymore.
+         */
+        $mode = $document->getAccessMode($user);
+        $this->assertEquals(M_ALL, $mode);
+
+        /* change unlimeted access on the document for group to none */
+        $ret = $document->changeAccess(M_NONE, $group->getId(), false);
+        $this->assertTrue($ret);
+        $mode = $document->getAccessMode($user);
+        $this->assertEquals(M_NONE, $mode);
+
+        /* clear all access rights */
+        $ret = $document->clearAccessList();
+        $this->assertTrue($ret);
+        $accesslist = $document->getAccessList();
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['groups']);
+        $this->assertCount(0, $accesslist['users']);
+
+        /* We are back to the default access rights */
+        $mode = $document->getAccessMode($user);
+        $this->assertEquals(M_READ, $mode);
+
+    }
+
+    /**
+     * Test method addNotify(), removeNotify(), getNotifyList(), cleanNotifyList()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetNotify()
+    {
+        self::createGroupsAndUsers();
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $adminuser = self::$dms->getUser(1);
+        $guestuser = self::$dms->getUser(2);
+        $user = self::$dms->getUserByLogin('user-1-1');
+        $this->assertIsObject($user);
+        $this->assertTrue($user->isType('user'));
+        $group = self::$dms->getGroupByName('Group 1');
+        $this->assertIsObject($group);
+        $this->assertTrue($group->isType('group'));
+        $document = self::createDocument($folder, $adminuser, 'Document 1');
+        $this->assertIsObject($document);
+        $this->assertTrue($document->isType('document'));
+
+        $notifylist = $document->getNotifyList();
+        $this->assertIsArray($notifylist);
+        $this->assertCount(0, $notifylist['groups']);
+        $this->assertCount(0, $notifylist['users']);
+
+        /* Add notify on the document for user */
+        $ret = $document->addNotify($user->getId(), true);
+        $this->assertEquals(0, $ret);
+
+        /* Add notify on the document for group */
+        $ret = $document->addNotify($group->getId(), false);
+        $this->assertEquals(0, $ret);
+
+        /* Add notify on the document for a user that does not exists */
+        $ret = $document->addNotify(15, true);
+        $this->assertEquals(-1, $ret);
+
+        $notifylist = $document->getNotifyList();
+        $this->assertIsArray($notifylist);
+        $this->assertCount(1, $notifylist['groups']);
+        $this->assertCount(1, $notifylist['users']);
+
+        /* Setting the default access to M_NONE and turning off inheritance
+         * will clean the notification list, because the notifiers have no
+         * longer read access on the document and therefore will be removed
+         * from the notification list.
+         */
+        $ret = $document->setInheritAccess(false);
+        $this->assertTrue($ret);
+        $ret = $document->setDefaultAccess(M_NONE);
+        $this->assertTrue($ret);
+
+        $notifylist = $document->getNotifyList();
+        $this->assertIsArray($notifylist);
+        $this->assertCount(0, $notifylist['groups']);
+        $this->assertCount(0, $notifylist['users']);
+    }
+
+    /**
+     * Test method isDescendant()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testIsDescendant()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $subfolder1 = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subfolder2 = $rootfolder->addSubFolder('Subfolder 2', '', $user, 1.0);
+        $document = self::createDocument($subfolder1, $user, 'Document 1');
+        /* document is a descendant of root folder and subfolder 1 */
+        $this->assertTrue($document->isDescendant($rootfolder));
+        $this->assertTrue($document->isDescendant($subfolder1));
+        /* subfolder is not a descendant of subfolder 2 */
+        $this->assertFalse($document->isDescendant($subfolder2));
+    }
+
+    /**
+     * Test method getParent()
+     *
+     * Create a new document below root folder and check if parent
+     * of the document is the root folder.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetParent()
+    {
+        $user = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $parent = $document->getParent();
+        $this->assertIsObject($parent);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $parent);
+        $this->assertEquals(1, $parent->getId());
+    }
+
+    /**
+     * Test method setParent()
+     *
+     * Create a new document below root folder, move it to a subfolder
+     * and check if parent of the document is the sub folder.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetParent()
+    {
+        $user = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 0);
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        /* Setting a null folder is not allowed */
+        $ret = $document->setParent(null);
+        $this->assertFalse($ret);
+
+        /* Passed object must be a folder  */
+        $ret = $document->setParent($user);
+        $this->assertFalse($ret);
+
+        $ret = $document->setParent($subfolder);
+        $this->assertTrue($ret);
+        $parent = $document->getParent();
+        $this->assertIsObject($parent);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $parent);
+        $this->assertEquals(2, $parent->getId());
+    }
+
+    /**
+     * Test method setParent() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetParentSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `folder`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setParent($rootfolder));
+    }
+
+    /**
+     * Test method setOwner()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetOwner()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->addUser('user1', 'user1', 'User One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($user);
+        $document = self::createDocument($rootfolder, $adminuser, 'Document 1');
+        /* Setting a null user is not allowed */
+        $ret = $document->setOwner(null);
+        $this->assertFalse($ret);
+
+        /* Passed object must be a folder  */
+        $ret = $document->setOwner($rootfolder);
+        $this->assertFalse($ret);
+
+        $res = $document->setOwner($user);
+        $this->assertTrue($res);
+        $owner = $document->getOwner();
+        $this->assertIsObject($owner);
+        $this->assertInstanceOf(SeedDMS_Core_User::class, $owner);
+        $this->assertEquals($user->getId(), $owner->getId());
+    }
+
+    /**
+     * Test method setOwner() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetOwnerSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $user = $this->getMockedUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `owner`"))
+            ->willReturn(false);
+        // SeedDMS 6 will fetch the old owner in setOwner() before setting the
+        // new owner
+        if(self::$dbversion['major'] == 6) {
+            $db->expects($this->once())
+                ->method('getResultArray')
+                ->with($this->stringContains("SELECT * FROM `tblUsers` WHERE `id` = "))
+                ->willReturn([]);
+        }
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setOwner($user));
+    }
+
+    /**
+     * Test method expires(), setExpires(), getExpires()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetExpires()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $document = self::createDocument($rootfolder, $adminuser, 'Document 1');
+        $expires = $document->expires();
+        $this->assertFalse($expires);
+        $expires = $document->getExpires();
+        $this->assertFalse($expires);
+        $now = time();
+        $res = $document->setExpires($now);
+        $this->assertTrue($res);
+        /* Setting it again will return true */
+        $res = $document->setExpires($now);
+        $this->assertTrue($res);
+        $expires = $document->expires();
+        $this->assertTrue($res);
+        $expirets = $document->getExpires();
+        $this->assertEquals($now, $expirets);
+    }
+
+    /**
+     * Test method setExpires() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetExpiresSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `expires`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setExpires(time()));
+    }
+
+    /**
+     * Test method setLocked(), isLocked()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetAndIsLocked()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->addUser('user1', 'user1', 'User One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($user);
+        $document = self::createDocument($rootfolder, $adminuser, 'Document 1');
+        $res = $document->isLocked();
+        $this->assertFalse($res);
+        $res = $document->setLocked($user);
+        $this->assertTrue($res);
+        $res = $document->isLocked();
+        $this->assertTrue($res);
+        $lockuser = $document->getLockingUser();
+        $this->assertIsObject($lockuser);
+        $this->assertInstanceOf(SeedDMS_Core_User::class, $lockuser);
+        $this->assertEquals($user->getId(), $lockuser->getId());
+        /* parameter passed to setLocked must be false or a user */
+        $res = $document->setLocked(null);
+        /* document is still locked and locking user is unchanged */
+        $res = $document->isLocked();
+        $this->assertTrue($res);
+        $lockuser = $document->getLockingUser();
+        $this->assertIsObject($lockuser);
+        $this->assertInstanceOf(SeedDMS_Core_User::class, $lockuser);
+        $this->assertEquals($user->getId(), $lockuser->getId());
+        /* Unlock the document */
+        $res = $document->setLocked(false);
+        $this->assertTrue($res);
+        $res = $document->isLocked();
+        $this->assertFalse($res);
+        $lockuser = $document->getLockingUser();
+        $this->assertFalse($lockuser);
+    }
+
+    /**
+     * Test method setLocked() with sql fail
+     *
+     * @return void
+     */
+    public function testSetLockedSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("DELETE FROM `tblDocumentLocks`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setLocked(false));
+    }
+
+    /**
+     * Test method getSequence() and setSequence()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetSequence()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $document = self::createDocument($folder, $adminuser, 'Document 1');
+        /* The document still has sequence = 1.0 */
+        $sequence = $document->getSequence();
+        $this->assertEquals(1.0, $sequence);
+        $ret = $document->setSequence(1.5);
+        $this->assertTrue($ret);
+        $sequence = $document->getSequence();
+        $this->assertEquals(1.5, $sequence);
+    }
+
+    /**
+     * Test method setSequence() mit sql fail
+     *
+     * @return void
+     */
+    public function testSetSequenceSqlFail()
+    {
+        $document = $this->getMockedDocument();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblDocuments` SET `sequence`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $document->setDMS($dms);
+        $this->assertFalse($document->setSequence(1.1));
+    }
+
+    /**
+     * Test method getContentByVersion(), isLatestContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetContentByVersion()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $document = self::createDocument($folder, $adminuser, 'Document 1');
+        /* Get version 1 */
+        $content = $document->getContentByVersion(1);
+        $this->assertIsObject($content);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentContent::class, $content);
+        /* There is no version 2 */
+        $content = $document->getContentByVersion(2);
+        $this->assertNull($content);
+        /* version must be numeric */
+        $content = $document->getContentByVersion('foo');
+        $this->assertFalse($content);
+        /* Check if 1 is the latest version number */
+        $ret = $document->isLatestContent(1);
+        $this->assertTrue($ret);
+        $ret = $document->isLatestContent(2);
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method getDocumentContent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentContent()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $document = self::createDocument($folder, $adminuser, 'Document 1');
+        /* Get version 1 */
+        $content = $document->getContentByVersion(1);
+        $this->assertIsObject($content);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentContent::class, $content);
+        $again = self::$dms->getDocumentContent($content->getId());
+        $this->assertIsObject($again);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentContent::class, $again);
+        $this->assertEquals($content->getId(), $again->getId());
+        $none = self::$dms->getDocumentContent(2);
+        $this->assertNull($none);
+    }
+
+    /**
+     * Test method getDocumentContent() with sql failure
+     *
+     * @return void
+     */
+    public function testGetDocumentContentSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblDocumentContent` WHERE `id`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse($dms->getDocumentContent(1));
+    }
+
+    /**
+     * Test method addDocumentLink(), getDocumentLinks(), getReverseDocumentLinks()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddAndGetDocumentLinks()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->addUser('user1', 'user1', 'User One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($user);
+        $document1 = self::createDocument($folder, $adminuser, 'Document 1');
+        $document2 = self::createDocument($folder, $adminuser, 'Document 2');
+
+        /* document 1 has no links */
+        $links = $document1->getDocumentLinks();
+        $this->assertIsArray($links);
+        $this->assertCount(0, $links);
+        $links = $document1->getReverseDocumentLinks();
+        $this->assertIsArray($links);
+        $this->assertCount(0, $links);
+
+        /* Adding a link to none existing target or by a none existing user fails */
+        $ret = $document1->addDocumentLink(3, $user->getId(), false);
+        $this->assertFalse($ret);
+        $ret = $document1->addDocumentLink($document2->getId(), 4, false);
+        $this->assertFalse($ret);
+
+        /* Adding a link with a bogus target or user must fail */
+        $ret = $document1->addDocumentLink('foo', 1, false);
+        $this->assertFalse($ret);
+        $ret = $document1->addDocumentLink(3, 'foo', false);
+        $this->assertFalse($ret);
+
+        /* Adding a link to myself must fail */
+        $ret = $document1->addDocumentLink($document1->getId(), $user->getId(), false);
+        $this->assertFalse($ret);
+
+        /* Add a non public link to document 2 by user */
+        $link = $document1->addDocumentLink($document2->getId(), $user->getId(), false);
+        $this->assertIsObject($link);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentLink::class, $link);
+        $links = $document1->getDocumentLinks();
+        $this->assertIsArray($links);
+        $this->assertCount(1, $links);
+        $links = $document2->getReverseDocumentLinks();
+        $this->assertIsArray($links);
+        $this->assertCount(1, $links);
+        /* There is one reverse link of a user */
+        $links = $document2->getReverseDocumentLinks(false, $user);
+        $this->assertIsArray($links);
+        $this->assertCount(1, $links);
+        /* There are no public reverse links */
+        $links = $document2->getReverseDocumentLinks(true);
+        $this->assertIsArray($links);
+        $this->assertCount(0, $links);
+
+        /* There are no public links of document 1 */
+        $document1->clearCache();
+        $links = $document1->getDocumentLinks(true);
+        $this->assertIsArray($links);
+        $this->assertCount(0, $links);
+
+        /* There are no links by adminuser of document 1 */
+        $document1->clearCache();
+        $links = $document1->getDocumentLinks(false, $adminuser);
+        $this->assertIsArray($links);
+        $this->assertCount(0, $links);
+
+        /* There are links by user of document 1 */
+        $document1->clearCache();
+        $links = $document1->getDocumentLinks(false, $user);
+        $this->assertIsArray($links);
+        $this->assertCount(1, $links);
+
+        $link = $document1->getDocumentLink($links[0]->getId());
+        $this->assertIsObject($link);
+        $this->assertTrue($link->isType('documentlink'));
+    }
+
+    /**
+     * Test method addDocumentLink(), removeDocumentLinks()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddAndRemoveDocumentLink()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->addUser('user1', 'user1', 'User One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($user);
+        $document1 = self::createDocument($folder, $adminuser, 'Document 1');
+        $document2 = self::createDocument($folder, $adminuser, 'Document 2');
+
+        /* Add a non public link to document 2 by user */
+        $link = $document1->addDocumentLink($document2->getId(), $user->getId(), false);
+        $this->assertIsObject($link);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentLink::class, $link);
+        $links = $document1->getDocumentLinks();
+        $this->assertIsArray($links);
+        $this->assertCount(1, $links);
+
+        /* Remove the link again */
+        $link = $links[0];
+        $ret = $document1->removeDocumentLink($link->getId());
+        $this->assertTrue($ret);
+        $links = $document1->getDocumentLinks();
+        $this->assertIsArray($links);
+        $this->assertCount(0, $links);
+    }
+
+    /**
+     * Test method addDocumentFile(), getDocumentFiles()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddAndGetDocumentFiles()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->addUser('user1', 'user1', 'User One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($user);
+        $document = self::createDocument($folder, $adminuser, 'Document 1');
+
+        /* document has no files */
+        $files = $document->getDocumentFiles();
+        $this->assertIsArray($files);
+        $this->assertCount(0, $files);
+
+        $filename = self::createTempFile(100);
+        $file1 = $document->addDocumentFile('Attachment 1', '', $user, $filename, 'attachment1.txt', '.txt', 'plain/text');
+        unlink($filename);
+        $this->assertIsObject($file1);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentFile::class, $file1);
+
+        $filename = self::createTempFile(100);
+        $file2 = $document->addDocumentFile('Attachment 2', '', $user, $filename, 'attachment2.txt', '.txt', 'plain/text', 1);
+        unlink($filename);
+        $this->assertIsObject($file2);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentFile::class, $file2);
+
+        /* Get all attachments */
+        $files = $document->getDocumentFiles();
+        $this->assertIsArray($files);
+        $this->assertCount(2, $files);
+
+        /* Get attachments for version 1 only */
+        $files = $document->getDocumentFiles(1, false);
+        $this->assertIsArray($files);
+        $this->assertCount(1, $files);
+
+        /* Get attachments for version 1 and version independed */
+        $files = $document->getDocumentFiles(1, true);
+        $this->assertIsArray($files);
+        $this->assertCount(2, $files);
+    }
+
+    /**
+     * Test method addDocumentFile(), removeDocumentFile()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddAndRemoveDocumentFiles()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->addUser('user1', 'user1', 'User One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($user);
+        $document = self::createDocument($folder, $adminuser, 'Document 1');
+
+        /* document has no files */
+        $files = $document->getDocumentFiles();
+        $this->assertIsArray($files);
+        $this->assertCount(0, $files);
+
+        $filename = self::createTempFile(100);
+        $file1 = $document->addDocumentFile('Attachment 1', '', $user, $filename, 'attachment1.txt', '.txt', 'plain/text');
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $this->assertIsObject($file1);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentFile::class, $file1);
+
+        /* document has now 1 file */
+        $files = $document->getDocumentFiles();
+        $this->assertIsArray($files);
+        $this->assertCount(1, $files);
+
+        /* Removing a file with a none exiting or bogus id must fail */
+        $ret = $document->removeDocumentFile(2);
+        $this->assertFalse($ret);
+        $ret = $document->removeDocumentFile('foo');
+        $this->assertFalse($ret);
+
+        $ret = $document->removeDocumentFile($files[0]->getId());
+        $this->assertTrue($ret);
+
+        $files = $document->getDocumentFiles();
+        $this->assertIsArray($files);
+        $this->assertCount(0, $files);
+    }
+
+    /**
+     * Test method addDocument(), removeDocument()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddAndRemoveDocument()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->addUser('user1', 'user1', 'User One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($user);
+        $document = self::createDocument($folder, $adminuser, 'Document 1');
+        $docid = $document->getId();
+
+        $filename = self::createTempFile(100);
+        $file1 = $document->addDocumentFile('Attachment 1', '', $user, $filename, 'attachment1.txt', '.txt', 'plain/text');
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $this->assertIsObject($file1);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentFile::class, $file1);
+
+        $ret = $document->remove();
+        $this->assertTrue($ret);
+        $document = self::$dms->getDocument($docid);
+        $this->assertNull($document);
+    }
+
+    /**
+     * Test method getUsedDiskSpace()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetUsedDiskSpace()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        /* Create a document with 1234 Bytes */
+        $document = self::createDocument($folder, $adminuser, 'Document 1', 1234);
+        $size = $document->getUsedDiskSpace();
+        $this->assertEquals(1234, $size);
+    }
+
+    /**
+     * Test method getTimeline()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetTimeline()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        /* Create a document */
+        $document = self::createDocument($folder, $adminuser, 'Document 1');
+        /* Attach a file */
+        $filename = self::createTempFile(100);
+        $file1 = $document->addDocumentFile('Attachment 1', '', $adminuser, $filename, 'attachment1.txt', '.txt', 'plain/text');
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $this->assertIsObject($file1);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentFile::class, $file1);
+
+        /* Get the timeline. It must contain two entries
+         * - the initial release of the document
+         * - adding the attachment
+         */
+        $timeline = $document->getTimeLine();
+        $this->assertIsArray($timeline);
+        $this->assertCount(2, $timeline);
+    }
+
+    /**
+     * Test method transferToUser()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testTransferToUser()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $user = self::$dms->addUser('user1', 'user1', 'User One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($user);
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        /* Create two documents */
+        $document1 = self::createDocument($folder, $adminuser, 'Document 1');
+        $document2 = self::createDocument($folder, $adminuser, 'Document 2');
+
+        /* Attach a file */
+        $filename = self::createTempFile(100);
+        $file1 = $document1->addDocumentFile('Attachment 1', '', $adminuser, $filename, 'attachment1.txt', '.txt', 'plain/text');
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+        $this->assertIsObject($file1);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentFile::class, $file1);
+
+        /* Add a non public link to document 2 */
+        $link = $document1->addDocumentLink($document2->getId(), $adminuser->getId(), false);
+        $this->assertIsObject($link);
+        $this->assertInstanceOf(SeedDMS_Core_DocumentLink::class, $link);
+
+        /* Transfer document to $user */
+        $this->assertEquals('admin', $document1->getOwner()->getLogin());
+        $links = $document1->getDocumentLinks(false, $adminuser);
+        $this->assertIsArray($links);
+        $this->assertCount(1, $links);
+
+        $ret = $document1->transferToUser($user);
+        $this->assertTrue($ret);
+        $this->assertEquals('user1', $document1->getOwner()->getLogin());
+        $links = $document1->getDocumentLinks(false, $user);
+        $this->assertIsArray($links);
+        $this->assertCount(1, $links);
+        $files = $document1->getDocumentFiles();
+        $this->assertIsArray($files);
+        $this->assertCount(1, $files);
+        $this->assertEquals($files[0]->getUserID(), $user->getId());
+    }
+}
diff --git a/SeedDMS_Core/tests/FileUtilsTest.php b/SeedDMS_Core/tests/FileUtilsTest.php
new file mode 100644
index 000000000..7e1b87cfb
--- /dev/null
+++ b/SeedDMS_Core/tests/FileUtilsTest.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Implementation of the file utils tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * Group test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class FileUtilsTest extends SeedDmsTest
+{
+    /**
+     * Create temporary directory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method format_filesize()
+     *
+     * @return void
+     */
+    public function testFormatFileSize()
+    {
+        $this->assertEquals('1 Byte', SeedDMS_Core_File::format_filesize(1));
+        $this->assertEquals('0 Bytes', SeedDMS_Core_File::format_filesize(0));
+        $this->assertEquals('1000 Bytes', SeedDMS_Core_File::format_filesize(1000));
+        $this->assertEquals('1 KiB', SeedDMS_Core_File::format_filesize(1024));
+        $this->assertEquals('1 KiB', SeedDMS_Core_File::format_filesize(1025));
+        $this->assertEquals('2 KiB', SeedDMS_Core_File::format_filesize(2047));
+        $this->assertEquals('1 MiB', SeedDMS_Core_File::format_filesize(1024*1024));
+        $this->assertEquals('1 GiB', SeedDMS_Core_File::format_filesize(1024*1024*1024));
+    }
+
+    /**
+     * Test method format_filesize()
+     *
+     * @return void
+     */
+    public function testParseFileSize()
+    {
+        $this->assertEquals(200, SeedDMS_Core_File::parse_filesize('200B'));
+        $this->assertEquals(200, SeedDMS_Core_File::parse_filesize('200 B'));
+        $this->assertEquals(200, SeedDMS_Core_File::parse_filesize('200'));
+        $this->assertEquals(1024, SeedDMS_Core_File::parse_filesize('1K'));
+        $this->assertEquals(2*1024*1024, SeedDMS_Core_File::parse_filesize('2M'));
+        $this->assertEquals(3*1024*1024*1024, SeedDMS_Core_File::parse_filesize('3 G'));
+        $this->assertEquals(4*1024*1024*1024*1024, SeedDMS_Core_File::parse_filesize('4 T'));
+        $this->assertFalse(SeedDMS_Core_File::parse_filesize('4 t'));
+        $this->assertFalse(SeedDMS_Core_File::parse_filesize('-4T'));
+    }
+
+    /**
+     * Test method fileSize()
+     *
+     * @return void
+     */
+    public function testFileSize()
+    {
+        $filename = self::createTempFile(200, self::$contentdir);
+        $this->assertEquals(200, SeedDMS_Core_File::fileSize($filename));
+        /* Getting the size of a none existing file returns false */
+        $this->assertFalse(SeedDMS_Core_File::fileSize('foobar'));
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+    }
+
+    /**
+     * Test method file_exists()
+     *
+     * @return void
+     */
+    public function testFileExists()
+    {
+        $filename = self::createTempFile(200, self::$contentdir);
+        $this->assertTrue(SeedDMS_Core_File::file_exists($filename));
+        $this->assertFalse(SeedDMS_Core_File::file_exists($filename.'bla'));
+        $this->assertTrue(SeedDMS_Core_File::removeFile($filename));
+    }
+
+    /**
+     * Test method fileExtension()
+     *
+     * @return void
+     */
+    public function testFileExtension()
+    {
+        $this->assertEquals('png', SeedDMS_Core_File::fileExtension('image/png'));
+        $this->assertEquals('', SeedDMS_Core_File::fileExtension('image/kpng'));
+        $this->assertEquals('txt', SeedDMS_Core_File::fileExtension('text/plain'));
+        $this->assertEquals('md', SeedDMS_Core_File::fileExtension('text/markdown'));
+    }
+
+    /**
+     * Test method moveFile()
+     *
+     * @return void
+     */
+    public function testMoveFile()
+    {
+        $filename = self::createTempFile(200, self::$contentdir);
+        $this->assertEquals(200, SeedDMS_Core_File::fileSize($filename));
+        $ret = SeedDMS_Core_File::moveFile($filename, self::$contentdir.DIRECTORY_SEPARATOR."foobar");
+        $this->assertTrue($ret);
+        /* Getting the file size of the old doc must fail now */
+        $this->assertFalse(SeedDMS_Core_File::fileSize($filename));
+        /* Getting the file size of the new doc succeds */
+        $this->assertEquals(200, SeedDMS_Core_File::fileSize(self::$contentdir.DIRECTORY_SEPARATOR."foobar"));
+        $this->assertTrue(SeedDMS_Core_File::removeFile(self::$contentdir.DIRECTORY_SEPARATOR."foobar"));
+    }
+
+    /**
+     * Test method makeDir(), renameDir(), removeDir()
+     *
+     * @return void
+     */
+    public function testMakeRenameAndRemoveDir()
+    {
+        /* Create a directory and put a file into it */
+        $ret = SeedDMS_Core_File::makeDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar");
+        system('touch '.self::$contentdir.DIRECTORY_SEPARATOR."foobar".DIRECTORY_SEPARATOR."tt");
+        /* Rename the directory */
+        $ret = SeedDMS_Core_File::renameDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar", self::$contentdir.DIRECTORY_SEPARATOR."bazfoo");
+        $this->assertTrue($ret);
+        /* The new must exist and the old one is gone */
+        $this->assertTrue(is_dir(self::$contentdir.DIRECTORY_SEPARATOR."bazfoo"));
+        $this->assertFalse(is_dir(self::$contentdir.DIRECTORY_SEPARATOR."foobar"));
+        $this->assertTrue(SeedDMS_Core_File::removeDir(self::$contentdir.DIRECTORY_SEPARATOR."bazfoo"));
+        $this->assertFalse(SeedDMS_Core_File::removeDir(self::$contentdir.DIRECTORY_SEPARATOR."bazfoo"));
+        $this->assertFalse(SeedDMS_Core_File::removeDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar"));
+
+        /* Create a directory, a sub directory and a file */
+        $ret = SeedDMS_Core_File::makeDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar");
+        $this->assertTrue($ret);
+        $ret = SeedDMS_Core_File::makeDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar".DIRECTORY_SEPARATOR."bazfoo");
+        $this->assertTrue($ret);
+        system('touch '.self::$contentdir.DIRECTORY_SEPARATOR."foobar".DIRECTORY_SEPARATOR."bazfoo".DIRECTORY_SEPARATOR."tt");
+        $this->assertTrue(SeedDMS_Core_File::file_exists(self::$contentdir.DIRECTORY_SEPARATOR."foobar".DIRECTORY_SEPARATOR."bazfoo".DIRECTORY_SEPARATOR."tt"));
+
+        $ret = SeedDMS_Core_File::removeDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar");
+        $this->assertTrue($ret);
+        $this->assertFalse(SeedDMS_Core_File::file_exists(self::$contentdir.DIRECTORY_SEPARATOR."foobar"));
+        $this->assertFalse(SeedDMS_Core_File::file_exists(self::$contentdir.DIRECTORY_SEPARATOR."foobar".DIRECTORY_SEPARATOR."bazfoo"));
+        $this->assertFalse(SeedDMS_Core_File::file_exists(self::$contentdir.DIRECTORY_SEPARATOR."foobar".DIRECTORY_SEPARATOR."bazfoo".DIRECTORY_SEPARATOR."tt"));
+    }
+
+    /**
+     * Test method makeDir(), copyDir(), removeDir()
+     *
+     * @return void
+     */
+    public function testMakeCopyAndRemoveDir()
+    {
+        /* Create a directory and put a file into it */
+        $ret = SeedDMS_Core_File::makeDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar");
+        system('touch '.self::$contentdir.DIRECTORY_SEPARATOR."foobar".DIRECTORY_SEPARATOR."tt");
+        /* Rename the directory */
+        $ret = SeedDMS_Core_File::copyDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar", self::$contentdir.DIRECTORY_SEPARATOR."bazfoo");
+        $this->assertTrue($ret);
+        /* The new and the old dir must exist */
+        $this->assertTrue(is_dir(self::$contentdir.DIRECTORY_SEPARATOR."bazfoo"));
+        $this->assertTrue(is_dir(self::$contentdir.DIRECTORY_SEPARATOR."foobar"));
+        $this->assertTrue(SeedDMS_Core_File::removeDir(self::$contentdir.DIRECTORY_SEPARATOR."bazfoo"));
+        $this->assertTrue(SeedDMS_Core_File::removeDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar"));
+    }
+
+    /**
+     * Test method moveDir()
+     *
+     * @return void
+     */
+    public function testMakeAndMoveDir()
+    {
+        /* Create a directory and put a file into it */
+        $ret = SeedDMS_Core_File::makeDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar");
+        system('touch '.self::$contentdir.DIRECTORY_SEPARATOR."foobar".DIRECTORY_SEPARATOR."tt");
+        /* Rename the directory */
+        $ret = SeedDMS_Core_File::moveDir(self::$contentdir.DIRECTORY_SEPARATOR."foobar", self::$contentdir.DIRECTORY_SEPARATOR."bazfoo");
+        $this->assertTrue($ret);
+        /* The new must exist and the old dir must be disappeared */
+        $this->assertTrue(is_dir(self::$contentdir.DIRECTORY_SEPARATOR."bazfoo"));
+        $this->assertFalse(is_dir(self::$contentdir.DIRECTORY_SEPARATOR."foobar"));
+        $this->assertTrue(SeedDMS_Core_File::removeDir(self::$contentdir.DIRECTORY_SEPARATOR."bazfoo"));
+        $this->assertFalse(is_dir(self::$contentdir.DIRECTORY_SEPARATOR."bazfoo"));
+    }
+}
diff --git a/SeedDMS_Core/tests/FolderTest.php b/SeedDMS_Core/tests/FolderTest.php
new file mode 100644
index 000000000..ee05f0b8c
--- /dev/null
+++ b/SeedDMS_Core/tests/FolderTest.php
@@ -0,0 +1,1221 @@
+<?php
+/**
+ * Implementation of the folder tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * Group test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class FolderTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method getInstance()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetInstanceRootFolder()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $this->assertIsObject($folder);
+        $this->assertEquals('DMS', $folder->getName());
+        /* get instance of none existing folder */
+        $folder = SeedDMS_Core_Folder::getInstance(2, self::$dms);
+        $this->assertNull($folder);
+    }
+
+    /**
+     * Test method isType()
+     *
+     * @return void
+     */
+    public function testIsType()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $this->assertTrue($folder->isType('folder'));
+    }
+
+    /**
+     * Test method getInstance()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetInstance()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subsubfolder = $subfolder->addSubFolder('Subsubfolder 1', '', $user, 1.0);
+        /* Get the folder with id 2, which must be 'Subfolder 1' */
+        $folder = SeedDMS_Core_Folder::getInstance(2, self::$dms);
+        $this->assertIsObject($folder);
+        $this->assertEquals('Subfolder 1', $folder->getName());
+        /* Get a none existing folder */
+        $folder = SeedDMS_Core_Folder::getInstance(4, self::$dms);
+        $this->assertNull($folder);
+    }
+
+    /**
+     * Test method getInstance()
+     *
+     * @return void
+     */
+    public function testGetInstanceSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblFolders`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse(SeedDMS_Core_Folder::getInstance(1, $dms));
+    }
+
+    /**
+     * Test method getInstanceByName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetInstanceByName()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subsubfolder = $subfolder->addSubFolder('Subsubfolder 1', '', $user, 1.0);
+        /* Search for it anywhere in the folder hierarchy */
+        $folder = SeedDMS_Core_Folder::getInstanceByName('Subsubfolder 1', null, self::$dms);
+        $this->assertIsObject($folder);
+        $this->assertEquals('Subsubfolder 1', $folder->getName());
+        /* Search for it within 'Subfolder 1' will find it */
+        $folder = SeedDMS_Core_Folder::getInstanceByName('Subsubfolder 1', $subfolder, self::$dms);
+        $this->assertIsObject($folder);
+        $this->assertEquals('Subsubfolder 1', $folder->getName());
+        /* Search for it within root folder will not find it */
+        $folder = SeedDMS_Core_Folder::getInstanceByName('Subsubfolder 1', $rootfolder, self::$dms);
+        $this->assertNull($folder);
+    }
+
+    /**
+     * Test method getInstanceByName()
+     *
+     * @return void
+     */
+    public function testGetInstanceByNameSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblFolders`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $this->assertFalse(SeedDMS_Core_Folder::getInstanceByName('foo', null, $dms));
+    }
+
+    /**
+     * Test method getName() and setName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetName()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $name = $folder->getName();
+        $this->assertEquals('DMS', $name);
+        $ret = $folder->setName('foo');
+        $this->assertTrue($ret);
+        $name = $folder->getName();
+        $this->assertEquals('foo', $name);
+    }
+
+    /**
+     * Test method setName()
+     *
+     * @return void
+     */
+    public function testSetNameSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblFolders` SET `name`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->setName('foo'));
+    }
+
+    /**
+     * Test method getComment() and setComment()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetComment()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $comment = $folder->getComment();
+        $this->assertEquals('DMS root', $comment);
+        $ret = $folder->setComment('foo');
+        $this->assertTrue($ret);
+        $comment = $folder->getComment();
+        $this->assertEquals('foo', $comment);
+    }
+
+    /**
+     * Test method setComment()
+     *
+     * @return void
+     */
+    public function testSetCommentSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblFolders` SET `comment`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->setComment('foo'));
+    }
+
+    /**
+     * Test method getSequence() and setSequence()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetSequence()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        /* The root folder's sequence in the initial database is 0.0 */
+        $sequence = $folder->getSequence();
+        $this->assertEquals(0.0, $sequence);
+        $ret = $folder->setSequence(1.5);
+        $this->assertTrue($ret);
+        $sequence = $folder->getSequence();
+        $this->assertEquals(1.5, $sequence);
+    }
+
+    /**
+     * Test method setSequence()
+     *
+     * @return void
+     */
+    public function testSetSequenceSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblFolders` SET `sequence`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->setSequence(0.0));
+    }
+
+    /**
+     * Test method getDate() and setDate()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetDate()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $now = time();
+        /* Passing false as a time stamp will take current time stamp */
+        $ret = $folder->setDate(false);
+        $this->assertTrue($ret);
+        $date = $folder->getDate();
+        $this->assertEquals($now, $date);
+        /* Setting a time stamp */
+        $now -= 1000;
+        $ret = $folder->setDate($now);
+        $this->assertTrue($ret);
+        $date = $folder->getDate();
+        $this->assertEquals($now, $date);
+        /* Setting a none numeric value will fail */
+        $ret = $folder->setDate('foo');
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method setDate()
+     *
+     * @return void
+     */
+    public function testSetDateSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblFolders` SET `date`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->setDate(time()));
+    }
+
+    /**
+     * Test method getParent()
+     *
+     * Get parent of root folder which is always null.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetParentRootFolder()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $parent = $folder->getParent();
+        $this->assertNull($parent);
+    }
+
+    /**
+     * Test method getParent()
+     *
+     * Create a new subfolder below root folder and check if parent
+     * of the folder is the root folder.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetParent()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $adminuser, 0);
+        $parent = $subfolder->getParent();
+        $this->assertIsObject($parent);
+        $this->assertInstanceOf(SeedDMS_Core_Folder::class, $parent);
+        $this->assertEquals(1, $parent->getId());
+    }
+
+    /**
+     * Test method setParent() on root folder
+     *
+     * Moving the root folder will always fail
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetParentRootFolder()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $ret = $folder->setParent(1);
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method getOwner()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetOwner()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $owner = $folder->getOwner();
+        $this->assertIsObject($owner);
+        $this->assertInstanceOf(SeedDMS_Core_User::class, $owner);
+        $this->assertEquals(1, $owner->getId());
+    }
+
+    /**
+     * Test method setOwner()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetOwner()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->addUser('user1', 'user1', 'User One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $adminuser, 0);
+        $res = $subfolder->setOwner($user);
+        $this->assertTrue($res);
+        $owner = $subfolder->getOwner();
+        $this->assertIsObject($owner);
+        $this->assertInstanceOf(SeedDMS_Core_User::class, $owner);
+        $this->assertEquals($user->getId(), $owner->getId());
+    }
+
+    /**
+     * Test method setOwner()
+     *
+     * @return void
+     */
+    public function testSetOwnerSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $user = new SeedDMS_Core_User(1, 'admin', 'pass', 'Joe Foo', 'baz@foo.de', 'en_GB', 'bootstrap', 'My comment', SeedDMS_Core_User::role_admin);
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblFolders` SET `owner`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->setOwner($user));
+    }
+
+    /**
+     * Test method getDefaultAccess()
+     *
+     * The default access is always M_READ unless it was set differently
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDefaultAccess()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $accessmode = $rootfolder->getDefaultAccess();
+        $this->assertEquals(M_READ, $accessmode);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $adminuser, 0);
+        $accessmode = $subfolder->getDefaultAccess();
+        $this->assertEquals(M_READ, $accessmode);
+    }
+
+    /**
+     * Test method setDefaultAccess()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetDefaultAccess()
+    {
+        $adminuser = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $adminuser, 0);
+        /* Setting the default access to something != M_READ will not have
+         * any effect as long as inheritage of access rights is turned on.
+         */
+        $subfolder->setDefaultAccess(M_READWRITE, true);
+        $accessmode = $subfolder->getDefaultAccess();
+        $this->assertEquals(M_READ, $accessmode);
+        /* Turning inheritage off will use the default access */
+        $subfolder->setInheritAccess(false, true);
+        $accessmode = $subfolder->getDefaultAccess();
+        $this->assertEquals(M_READWRITE, $accessmode);
+    }
+
+    /**
+     * Test method setDefaultAccess()
+     *
+     * @return void
+     */
+    public function testSetDefaultAccessSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblFolders` SET `defaultAccess`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->setDefaultAccess(M_NONE));
+    }
+
+    /**
+     * Test method setInheritAccess()
+     *
+     * @return void
+     */
+    public function testSetInheritAccessSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblFolders` SET `inheritAccess`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->setInheritAccess(true));
+    }
+
+    /**
+     * Test method hasSubFolders() on root folder and after adding
+     * new subfolders.
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testHasSubFolders()
+    {
+        $user = self::$dms->getUser(1);
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $ret = $rootfolder->hasSubFolders();
+        $this->assertIsInt($ret);
+        $this->assertEquals(0, $ret);
+        $subfolder1 = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subfolder2 = $rootfolder->addSubFolder('Subfolder 2', '', $user, 1.0);
+        $ret = $rootfolder->hasSubFolders();
+        $this->assertIsInt($ret);
+        $this->assertEquals(2, $ret);
+        /* hasSubFolderByName() just returns true or false */
+        $ret = $rootfolder->hasSubFolderByName('Subfolder 1');
+        $this->assertTrue($ret);
+        $ret = $rootfolder->hasSubFolderByName('Subfolder 3');
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method hasSubFolders with sql fail()
+     *
+     * @return void
+     */
+    public function testHasSubFoldersSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT count(*) as c FROM `tblFolders`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->hasSubFolders());
+    }
+
+    /**
+     * Test method hasSubFolderByName with sql fail()
+     *
+     * @return void
+     */
+    public function testHasSubFolderByNameSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT count(*) as c FROM `tblFolders`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->hasSubFolderByName('foo'));
+    }
+
+    /**
+     * Test method getSubFolders() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetSubFoldersRootOnly()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $folders = $folder->getSubFolders();
+        $this->assertIsArray($folders);
+        $this->assertCount(0, $folders);
+    }
+
+    /**
+     * Test method getSubFolders() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetSubFolders()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $subfolder1 = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subfolder2 = $rootfolder->addSubFolder('Subfolder 2', '', $user, 1.0);
+        $folders = $rootfolder->getSubFolders();
+        $this->assertIsArray($folders);
+        $this->assertCount(2, $folders);
+
+        /* Get sub folders order by name descending */
+        $rootfolder->clearCache(); // Force retrieving sub folders from database
+        $folders = $rootfolder->getSubFolders('n', 'desc', 1, 0);
+        $this->assertIsArray($folders);
+        $this->assertCount(1, $folders);
+        $this->assertEquals('Subfolder 2', $folders[0]->getName());
+
+        /* Get sub folders order by name descending with an offset of 1 */
+        $rootfolder->clearCache(); // Force retrieving sub folders from database
+        $folders = $rootfolder->getSubFolders('n', 'desc', 1, 1);
+        $this->assertIsArray($folders);
+        $this->assertCount(1, $folders);
+        $this->assertEquals('Subfolder 1', $folders[0]->getName());
+
+        /* Get sub folders order by sequence ascending */
+        $rootfolder->clearCache(); // Force retrieving sub folders from database
+        $folders = $rootfolder->getSubFolders('s', 'asc', 1, 0);
+        $this->assertIsArray($folders);
+        $this->assertCount(1, $folders);
+        $this->assertEquals('Subfolder 2', $folders[0]->getName());
+
+        /* Get sub folders order by sequence ascending with a bogus offset */
+        $rootfolder->clearCache(); // Force retrieving sub folders from database
+        $folders = $rootfolder->getSubFolders('s', 'asc', 0, 4);
+        $this->assertIsArray($folders);
+        $this->assertCount(2, $folders);
+        $this->assertEquals('Subfolder 2', $folders[0]->getName());
+    }
+
+    /**
+     * Test method getSubFolders()
+     *
+     * @return void
+     */
+    public function testGetSubFoldersSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblFolders`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->getSubFolders());
+    }
+
+    /**
+     * Test method isDescendant()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testIsDescendant()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subsubfolder = $subfolder->addSubFolder('Subsubfolder 1', '', $user, 1.0);
+        /* subsubfolder is a descendant of root folder */
+        $this->assertTrue($subsubfolder->isDescendant($rootfolder));
+        /* subfolder is not a descendant of subsubfolder */
+        $this->assertFalse($subfolder->isDescendant($subsubfolder));
+    }
+
+    /**
+     * Test method isSubFolder()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testIsSubFolder()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subsubfolder = $subfolder->addSubFolder('Subsubfolder 1', '', $user, 1.0);
+        $this->assertTrue($rootfolder->isSubFolder($subsubfolder));
+        $this->assertFalse($subsubfolder->isSubFolder($subfolder));
+    }
+
+    /**
+     * Test method setParent()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetParent()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subsubfolder = $subfolder->addSubFolder('Subsubfolder 1', '', $user, 1.0);
+        /* Add a new document for folderList checking afterwards */
+        $document = self::createDocument($subsubfolder, $user, 'Document 1');
+        $folderlist = $subsubfolder->getFolderList();
+        $this->assertEquals(':1:2:', $folderlist);
+        $folderlist = $document->getFolderList();
+        $this->assertEquals(':1:2:3:', $folderlist);
+        /* Making $subsubfolder parent of $subfolder will fail, because
+         * $subfolder is a parent of $subsubfolder
+         */
+        $this->assertFalse($subfolder->setParent($subsubfolder));
+        /* Moving $subsubfolder into rool folder is possible */
+        $this->assertTrue($subsubfolder->setParent($rootfolder));
+        /* Root folder has now two children */
+        $children = $rootfolder->getSubFolders();
+        $this->assertIsArray($children);
+        $this->assertCount(2, $children);
+        /* Move the folder will have changed the folder list. Check it */
+        $errors = self::$dms->checkFolders();
+        $this->assertIsArray($errors);
+        $this->assertCount(0, $errors);
+        $errors = self::$dms->checkDocuments();
+        $this->assertIsArray($errors);
+        $this->assertCount(0, $errors);
+    }
+
+    /**
+     * Test method getPath() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetPathRootOnly()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $path = $folder->getPath();
+        $this->assertIsArray($path);
+        $this->assertCount(1, $path);
+        /* The only folder in the path is the root folder itself */
+        $this->assertEquals(1, $path[0]->getId());
+    }
+
+    /**
+     * Test method getPath() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetPath()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subsubfolder = $subfolder->addSubFolder('Subsubfolder 1', '', $user, 1.0);
+        $path = $subsubfolder->getPath();
+        $this->assertIsArray($path);
+        $this->assertCount(3, $path);
+    }
+
+    /**
+     * Test method getFolderPathPlain() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetFolderPathPlain()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $path = $folder->getFolderPathPlain();
+        $this->assertIsString($path);
+        $this->assertEquals('/ DMS', $path);
+    }
+
+    /**
+     * Test method hasDocuments() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testHasDocuments()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $documents = $folder->hasDocuments();
+        $this->assertIsInt($documents);
+        $this->assertEquals(0, $documents);
+        /* Add a new document for calling hasDocuments() afterwards */
+        $document = self::createDocument($folder, $user, 'Document 1');
+        $documents = $folder->hasDocuments();
+        $this->assertIsInt($documents);
+        $this->assertEquals(1, $documents);
+    }
+
+    /**
+     * Test method hasDocuments()
+     *
+     * @return void
+     */
+    public function testHasDokumentsSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT count(*) as c FROM `tblDocuments`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->hasDocuments());
+    }
+
+    /**
+     * Test method hasDocumentByName() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testHasDocumentByName()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $res = $folder->hasDocumentByName('foo');
+        $this->assertFalse($res);
+        /* Add a new document for calling hasDocumentByName() afterwards */
+        $document = self::createDocument($folder, $user, 'Document 1');
+        $res = $folder->hasDocumentByName('Document 1');
+        $this->assertTrue($res);
+    }
+
+    /**
+     * Test method hasDocumentByName()
+     *
+     * @return void
+     */
+    public function testHasDokumentByNameSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT count(*) as c FROM `tblDocuments`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->hasDocumentByName('foo'));
+    }
+
+    /**
+     * Test method getDocuments() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocuments()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $documents = $folder->getDocuments();
+        $this->assertIsArray($documents);
+        $this->assertCount(0, $documents);
+        /* Add a new document for calling getDocuments() afterwards */
+        $folder->clearCache();
+        $document = self::createDocument($folder, $user, 'Document 1');
+        $document = self::createDocument($folder, $user, 'Document 2');
+        $documents = $folder->getDocuments();
+        $this->assertIsArray($documents);
+        $this->assertCount(2, $documents);
+        $folder->clearCache();
+        /* sort by name asc, limit 1, offset 0 */
+        $documents = $folder->getDocuments('n', 'asc', 1);
+        $this->assertIsArray($documents);
+        $this->assertCount(1, $documents);
+        $this->assertEquals('Document 1', $documents[0]->getName());
+        $folder->clearCache();
+        /* sort by name desc, limit 1, offset 0 */
+        $documents = $folder->getDocuments('n', 'desc', 1);
+        $this->assertIsArray($documents);
+        $this->assertCount(1, $documents);
+        $this->assertEquals('Document 2', $documents[0]->getName());
+        $folder->clearCache();
+        /* sort by name asc, limit 1, offset 1 */
+        $documents = $folder->getDocuments('n', 'asc', 1, 1);
+        $this->assertIsArray($documents);
+        $this->assertCount(1, $documents);
+        $this->assertEquals('Document 2', $documents[0]->getName());
+    }
+
+    /**
+     * Test method getDocuments()
+     *
+     * @return void
+     */
+    public function testGetDokumentsSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lock` FROM `tblDocuments`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->getDocuments());
+    }
+
+    /**
+     * Test method countChildren() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testCountChildren()
+    {
+        $folder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $count = $folder->countChildren($user, 0);
+        $this->assertIsArray($count);
+        $this->assertCount(4, $count);
+        $this->assertEquals(0, $count['folder_count']);
+        $this->assertEquals(0, $count['document_count']);
+        /* Add some folders and documents */
+        $this->createSimpleFolderStructure();
+        $document = self::createDocument($folder, $user, 'Document 1');
+        $count = $folder->countChildren($user, 6);
+        $this->assertIsArray($count);
+        $this->assertCount(4, $count);
+        $this->assertEquals(5, $count['folder_count']);
+        $this->assertEquals(1, $count['document_count']);
+    }
+
+    /**
+     * Test method emptyFolder() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testEmptyFolder()
+    {
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        /* Add some folders and documents */
+        $this->createSimpleFolderStructure();
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $res = $rootfolder->emptyFolder();
+        $this->assertTrue($res);
+    }
+
+    /**
+     * Test method emptyFolder() on root folder
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testEmptyFolderWithCallback()
+    {
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        /* Add some folders and documents */
+        $this->createSimpleFolderStructure();
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+
+        /* Add the 'onPostAddUser' callback */
+        $msgs = [];
+        $callback = function ($param, $object) use (&$msgs) {
+            $msgs[] = $param." ".$object->getName(). " (".$object->getId().")"; 
+        };
+        self::$dms->addCallback('onPreRemoveFolder', $callback, 'onPreRemoveFolder');
+        self::$dms->addCallback('onPostRemoveFolder', $callback, 'onPostRemoveFolder');
+        self::$dms->addCallback('onPreRemoveDocument', $callback, 'onPreRemoveDocument');
+        self::$dms->addCallback('onPostRemoveDocument', $callback, 'onPostRemoveDocument');
+        self::$dms->addCallback('onPreEmptyFolder', $callback, 'onPreEmptyFolder');
+        self::$dms->addCallback('onPostEmptyFolder', $callback, 'onPostEmptyFolder');
+
+        $res = $rootfolder->emptyFolder();
+        $this->assertTrue($res);
+        $this->assertIsArray($msgs);
+        $this->assertCount(14, $msgs); // 5 folders x 2 callbacks + 1 document x 2 callbacks + 2 emptyFolder callbacks
+    }
+
+    /**
+     * Test method getAccessList()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAccessList()
+    {
+        /* Add some folders and documents */
+        $this->createSimpleFolderStructure();
+        $this->createGroupsAndUsers();
+
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $user = self::$dms->getUser(1);
+        $this->assertIsObject($user);
+        $group = self::$dms->getGroup(1);
+        $this->assertIsObject($group);
+        $subfolder = self::$dms->getFolderByName('Subfolder 1');
+        $this->assertIsObject($subfolder);
+        $subsubfolder = self::$dms->getFolderByName('Subsubfolder 1');
+        $this->assertIsObject($subsubfolder);
+
+        /* Adding an access rule will have no effect until the inheritance
+         * is turned off.
+         */
+        $subfolder->addAccess(M_NONE, $user->getId(), true);
+        $subfolder->addAccess(M_READWRITE, $group->getId(), false);
+        $accesslist = $subfolder->getAccessList();
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['users']);
+        $this->assertCount(0, $accesslist['groups']);
+        /* Turn inheritance off */
+        $res = $subfolder->setInheritAccess(false);
+        $this->assertTrue($res);
+        /* Now the access rules on $subfolder take effect */
+        $accesslist = $subfolder->getAccessList();
+        $this->assertIsArray($accesslist);
+        $this->assertCount(1, $accesslist['users']);
+        $this->assertCount(1, $accesslist['groups']);
+        /* get list of users/groups which no access */
+        $accesslist = $subfolder->getAccessList(M_NONE, O_EQ);
+        $this->assertIsArray($accesslist);
+        $this->assertCount(1, $accesslist['users']);
+        $this->assertCount(0, $accesslist['groups']);
+        /* get list of users/groups which read+write access */
+        $accesslist = $subfolder->getAccessList(M_READWRITE, O_EQ);
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['users']);
+        $this->assertCount(1, $accesslist['groups']);
+        /* get list of users/groups which have at least read access */
+        $accesslist = $subfolder->getAccessList(M_READ, O_GTEQ);
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['users']);
+        $this->assertCount(1, $accesslist['groups']);
+        /* get list of users/groups which have at least unlimited access */
+        $accesslist = $subfolder->getAccessList(M_ALL, O_GTEQ);
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['users']);
+        $this->assertCount(0, $accesslist['groups']);
+        /* Subsubfolder 1 inherits from Subfolder 1 */
+        $accesslist = $subsubfolder->getAccessList();
+        $this->assertIsArray($accesslist);
+        $this->assertCount(1, $accesslist['users']);
+        $this->assertCount(1, $accesslist['groups']);
+        /* clear the access list */
+        $res = $subfolder->clearAccessList();
+        $this->assertTrue($res);
+        $accesslist = $subfolder->getAccessList();
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['users']);
+        $this->assertCount(0, $accesslist['groups']);
+        /* calling getAccessList() on the $subsubfolder will still return
+         * the user and group, because the getParent() call in getAccessList()
+         * will not return the same instance like $subfolder. Hence calling
+         * $subfolder->clearAccessList() won't clear the accesslist of $subsubfolder's
+         * parent. You would have to explicitly
+         * clear acceslist of $subsubfolder's parent.
+        $res = $subsubfolder->getParent()->clearAccessList();
+        $this->assertTrue($res);
+        $accesslist = $subsubfolder->getAccessList();
+        $this->assertIsArray($accesslist);
+        $this->assertCount(0, $accesslist['users']);
+        $this->assertCount(0, $accesslist['groups']);
+         */
+    }
+
+    /**
+     * Test method addAccess()
+     *
+     * @return void
+     */
+    public function testAddAccessWrongMode()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->addAccess(M_ANY, 1, true));
+    }
+
+    /**
+     * Test method addAccess()
+     *
+     * @return void
+     */
+    public function testAddAccessSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("INSERT INTO `tblACLs`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->addAccess(M_NONE, 1, true));
+    }
+
+    /**
+     * Test method getAccessMode()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAccessMode()
+    {
+        /* Add some folders and documents */
+        $this->createSimpleFolderStructureWithDocuments();
+        $this->createGroupsAndUsers();
+
+        $rootfolder = SeedDMS_Core_Folder::getInstance(1, self::$dms);
+        $admin = self::$dms->getUser(1);
+        $this->assertIsObject($admin);
+        $this->assertTrue($admin->isAdmin());
+        $guest = self::$dms->getUser(2);
+        $this->assertTrue($guest->isGuest());
+        $user = self::$dms->getUser(3);
+        $this->assertIsObject($user);
+        if(self::$dms->version[0] == '5')
+            $this->assertTrue($user->getRole() == SeedDMS_Core_User::role_user);
+        else
+            $this->assertTrue($user->getRole()->getRole() == SeedDMS_Core_Role::role_user);
+        $joe = self::$dms->getUser(4);
+        $this->assertIsObject($joe);
+        if(self::$dms->version[0] == '5')
+            $this->assertTrue($joe->getRole() == SeedDMS_Core_User::role_user);
+        else
+            $this->assertTrue($joe->getRole()->getRole() == SeedDMS_Core_Role::role_user);
+        $sally = self::$dms->getUser(6);
+        $this->assertIsObject($sally);
+        if(self::$dms->version[0] == '5')
+            $this->assertTrue($sally->getRole() == SeedDMS_Core_User::role_user);
+        else
+            $this->assertTrue($sally->getRole()->getRole() == SeedDMS_Core_Role::role_user);
+        $group = self::$dms->getGroup(1);
+        $this->assertIsObject($group);
+        /* add guest and joe to group */
+        if(!$group->isMember($guest)) {
+            $res = $guest->joinGroup($group);
+            $this->assertTrue($res);
+        }
+        if(!$group->isMember($joe)) {
+            $res = $joe->joinGroup($group);
+            $this->assertTrue($res);
+        }
+
+        $subfolder1 = self::$dms->getFolderByName('Subfolder 1');
+        $this->assertIsObject($subfolder1);
+        $subsubfolder = self::$dms->getFolderByName('Subsubfolder 1');
+        $this->assertIsObject($subsubfolder);
+        $subfolder2 = self::$dms->getFolderByName('Subfolder 2');
+        $this->assertIsObject($subfolder2);
+        $subfolder3 = self::$dms->getFolderByName('Subfolder 3');
+        $this->assertIsObject($subfolder3);
+        $res = $subfolder3->setOwner($sally);
+        $this->assertTrue($res);
+
+        /* Setup Subfolder 1:
+         * no inheritance, user has read-write access, group has unlimited access,
+         * default is no access
+         */
+        $res = $subfolder1->setInheritAccess(false);
+        $this->assertTrue($res);
+        $res = $subfolder1->setDefaultAccess(M_NONE);
+        $this->assertTrue($res);
+        $res = $subfolder1->addAccess(M_READWRITE, $user->getId(), true);
+        $this->assertTrue($res);
+        $res = $subfolder1->addAccess(M_ALL, $group->getId(), false);
+        $this->assertTrue($res);
+
+        /* Admin has always access mode M_ALL */
+        $mode = $subfolder1->getAccessMode($admin);
+        $this->assertEquals(M_ALL, $mode);
+        /* Guest has max read access, though it's group has any access */
+        $mode = $subfolder1->getAccessMode($guest);
+        $this->assertEquals(M_READ, $mode);
+        /* Joe has any access, because it's group has any access */
+        $mode = $subfolder1->getAccessMode($joe);
+        $this->assertEquals(M_ALL, $mode);
+        /* Sally has no access, because it has no explicit access right and the
+         * default access is M_NONE.
+         */
+        $mode = $subfolder1->getAccessMode($sally);
+        $this->assertEquals(M_NONE, $mode);
+
+        /* Subfolder 3 inherits from the root folder, but sally is the owner */
+        $mode = $subfolder3->getAccessMode($sally);
+        $this->assertEquals(M_ALL, $mode);
+        /* joe has just read access which is the default inherited from root */
+        $mode = $subfolder3->getAccessMode($joe);
+        $this->assertEquals(M_READ, $mode);
+
+    }
+
+    /**
+     * Test method getFolderList()
+     *
+     * @return void
+     */
+    public function testGetFolderListSqlFail()
+    {
+        $rootfolder = $this->getMockedRootFolder();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT `folderList` FROM `tblFolders`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $rootfolder->setDMS($dms);
+        $this->assertFalse($rootfolder->getFolderList());
+    }
+
+}
diff --git a/SeedDMS_Core/tests/GroupTest.php b/SeedDMS_Core/tests/GroupTest.php
new file mode 100644
index 000000000..df14a13f5
--- /dev/null
+++ b/SeedDMS_Core/tests/GroupTest.php
@@ -0,0 +1,410 @@
+<?php
+/**
+ * Implementation of the group tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * Group test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class GroupTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+        self::$dbversion = self::$dms->getDBVersion();
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Create a mock group object
+     *
+     * @return SeedDMS_Core_Group
+     */
+    protected function getMockGroup()
+    {
+        $user = $this->getMockBuilder(SeedDMS_Core_Group::class)
+            ->onlyMethods([])
+            ->disableOriginalConstructor()->getMock();
+        return $user;
+    }
+
+    /**
+     * Create a mock group object
+     *
+     * @return SeedDMS_Core_Group
+     */
+    protected function getGroup()
+    {
+        $group = new SeedDMS_Core_Group(1, 'foogroup', 'My comment');
+        return $group;
+    }
+
+    /**
+     * Create a mock regular user object
+     *
+     * @return SeedDMS_Core_User
+     */
+    protected function getUser()
+    {
+        $user = new SeedDMS_Core_User(2, 'user', 'pass', 'Joe Baz', 'joe@foo.de', 'en_GB', 'bootstrap', 'My comment', SeedDMS_Core_User::role_user);
+        return $user;
+    }
+
+    /**
+     * Test method isType()
+     *
+     * @return void
+     */
+    public function testIsType()
+    {
+        $group = $this->getGroup();
+        $this->assertTrue($group->isType('group'));
+    }
+
+    /**
+     * Test method getName()
+     *
+     * @return void
+     */
+    public function testGetName()
+    {
+        $group = $this->getGroup();
+        $this->assertEquals('foogroup', $group->getName());
+    }
+
+    /**
+     * Test method getName() and setName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetName()
+    {
+        $group = self::$dms->addGroup('Group', '');
+        $ret = $group->setName('foo');
+        $this->assertTrue($ret);
+        $name = $group->getName();
+        $this->assertEquals('foo', $name);
+        /* Setting an empty name must fail */
+        $ret = $group->setName(' ');
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method setName()
+     *
+     * @return void
+     */
+    public function testSetNameSqlFail()
+    {
+        $group = $this->getGroup();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblGroups` SET `name`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $group->setDMS($dms);
+        $this->assertFalse($group->setName('my name'));
+    }
+
+    /**
+     * Test method getComment()
+     *
+     * @return void
+     */
+    public function testGetComment()
+    {
+        $group = $this->getGroup();
+        $this->assertEquals('My comment', $group->getComment());
+    }
+
+    /**
+     * Test method getComment() and setComment()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetComment()
+    {
+        $group = self::$dms->addGroup('Group', '');
+        $ret = $group->setComment('foo');
+        $this->assertTrue($ret);
+        $comment = $group->getComment();
+        $this->assertEquals('foo', $comment);
+    }
+
+    /**
+     * Test method setComment()
+     *
+     * @return void
+     */
+    public function testSetCommentSqlFail()
+    {
+        $group = $this->getGroup();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblGroups` SET `comment`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $group->setDMS($dms);
+        $this->assertFalse($group->setComment('my comment'));
+    }
+
+    /**
+     * Test method getUsers()
+     *
+     * @return void
+     */
+    public function testGetUsersSqlFail()
+    {
+        $group = $this->getGroup();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT `tblUsers`.* FROM `tblUsers`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $group->setDMS($dms);
+        $this->assertFalse($group->getUsers());
+    }
+
+    /**
+     * Test method addUser(), isMember(), and removeUser()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAddAndRemoveUser()
+    {
+        $group = self::$dms->addGroup('Group', '');
+        if(self::$dms->version[0] == '5')
+            $role = SeedDMS_Core_User::role_user;
+        else {
+            $role = SeedDMS_Core_Role::getInstance(3, self::$dms);
+            $this->assertIsObject($role);
+            $this->assertEquals($role->getRole(), SeedDMS_Core_Role::role_user);
+        }
+        $user1 = self::$dms->addUser('joe', 'pass', 'Joe Foo', 'joe@foo.de', 'en_GB', 'bootstrap', 'My comment', $role);
+        $user2 = self::$dms->addUser('sally', 'pass', 'Sally Foo', 'sally@foo.de', 'en_GB', 'bootstrap', 'My comment', $role);
+
+        /* Add user1 and user2. user2 is also a manager */
+        $ret = $group->addUser($user1);
+        $this->assertTrue($ret);
+        $ret = $group->addUser($user2, true);
+        $this->assertTrue($ret);
+
+        $users = $group->getUsers();
+        $this->assertIsArray($users);
+        $this->assertCount(2, $users);
+
+        $ret = $group->removeUser($user1);
+        $this->assertTrue($ret);
+        $users = $group->getUsers();
+        $this->assertIsArray($users);
+        $this->assertCount(1, $users);
+    }
+
+    /**
+     * Test method isMember(), toggleManager()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testIsMember()
+    {
+        $group = self::$dms->addGroup('Group', '');
+        $user1 = self::$dms->addUser('joe', 'pass', 'Joe Foo', 'joe@foo.de', 'en_GB', 'bootstrap', 'My comment');
+        $user2 = self::$dms->addUser('sally', 'pass', 'Sally Foo', 'sally@foo.de', 'en_GB', 'bootstrap', 'My comment');
+
+        /* Add user1 and user2. user2 is also a manager */
+        $ret = $group->addUser($user1);
+        $this->assertTrue($ret);
+        $ret = $group->addUser($user2, true);
+        $this->assertTrue($ret);
+
+        /* user1 is a member but not a manager */
+        $ret = $group->isMember($user1);
+        $this->assertTrue($ret);
+        $ret = $group->isMember($user1, true);
+        $this->assertFalse($ret);
+
+        /* user2 is a member and a manager */
+        $ret = $group->isMember($user2, true);
+        $this->assertTrue($ret);
+    }
+
+    /**
+     * Test method toggleManager()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testToggleManager()
+    {
+        $group = self::$dms->addGroup('Group', '');
+        $user1 = self::$dms->addUser('joe', 'pass', 'Joe Foo', 'joe@foo.de', 'en_GB', 'bootstrap', 'My comment');
+
+        /* Add user1 */
+        $ret = $group->addUser($user1);
+        $this->assertTrue($ret);
+
+        /* user1 is a member but not a manager */
+        $ret = $group->isMember($user1);
+        $this->assertTrue($ret);
+        $ret = $group->isMember($user1, true);
+        $this->assertFalse($ret);
+
+        /* Toggle manager mode of user 1 and check again */
+        $ret = $group->toggleManager($user1);
+        $ret = $group->isMember($user1, true);
+        $this->assertTrue($ret);
+    }
+
+    /**
+     * Test method getUsers()
+     *
+     * @return void
+     */
+    public function testGetUsers()
+    {
+        $group = $this->getGroup();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        if(self::$dbversion['major'] == 6) {
+            $db->expects($this->exactly(2))
+                ->method('getResultArray')
+                ->withConsecutive([$this->stringContains("`tblGroupMembers`.`groupID` = '".$group->getId()."'")], [$this->stringContains("SELECT * FROM `tblRoles` WHERE `id` =")])
+                ->willReturnOnConsecutiveCalls(array(array('id'=>2, 'login'=>'user', 'pwd'=>'pass', 'fullName'=>'Joe Baz', 'email'=>'joe@foo.de', 'language'=>'en_GB', 'theme'=>'bootstrap', 'comment'=>'', 'role'=>SeedDMS_Core_User::role_user, 'hidden'=>0, 'role'=>1)), array('id'=>1, 'name'=>'role', 'role'=>1, 'noaccess'=>''));
+        } else {
+            $db->expects($this->once())
+                ->method('getResultArray')
+                ->with($this->stringContains("`tblGroupMembers`.`groupID` = '".$group->getId()."'"))
+                ->willReturn(array(array('id'=>2, 'login'=>'user', 'pwd'=>'pass', 'fullName'=>'Joe Baz', 'email'=>'joe@foo.de', 'language'=>'en_GB', 'theme'=>'bootstrap', 'comment'=>'', 'role'=>SeedDMS_Core_User::role_user, 'hidden'=>0, 'role'=>1)));
+        }
+        $dms = new SeedDMS_Core_DMS($db, '');
+
+        $group->setDMS($dms);
+        $users = $group->getUsers();
+        $this->assertIsArray($users);
+        $this->assertCount(1, $users);
+    }
+
+    /**
+     * Test method getManagers()
+     *
+     * @return void
+     */
+    public function testGetManagers()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        if(self::$dbversion['major'] == 6) {
+            $db->expects($this->exactly(2))
+                ->method('getResultArray')
+                ->withConsecutive([$this->stringContains("`manager` = 1")], [$this->stringContains("SELECT * FROM `tblRoles` WHERE `id` =")])
+                ->willReturnOnConsecutiveCalls(array(array('id'=>2, 'login'=>'user', 'pwd'=>'pass', 'fullName'=>'Joe Baz', 'email'=>'joe@foo.de', 'language'=>'en_GB', 'theme'=>'bootstrap', 'comment'=>'', 'role'=>SeedDMS_Core_User::role_user, 'hidden'=>0, 'role'=>1)), array('id'=>1, 'name'=>'role', 'role'=>1, 'noaccess'=>''));
+        } else {
+            $db->expects($this->once())
+                ->method('getResultArray')
+                ->with($this->stringContains('`manager` = 1'))
+                ->willReturn(array(array('id'=>2, 'login'=>'user', 'pwd'=>'pass', 'fullName'=>'Joe Baz', 'email'=>'joe@foo.de', 'language'=>'en_GB', 'theme'=>'bootstrap', 'comment'=>'', 'role'=>SeedDMS_Core_User::role_user, 'hidden'=>0)));
+        }
+        $dms = new SeedDMS_Core_DMS($db, '');
+
+        $group = $this->getGroup();
+        $group->setDMS($dms);
+        $managers = $group->getManagers();
+        $this->assertIsArray($managers);
+        $this->assertCount(1, $managers);
+    }
+
+    /**
+     * Test method getNotifications()
+     *
+     * @return void
+     */
+    public function testGetNotifications()
+    {
+        $group = $this->getGroup();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("WHERE `tblNotify`.`groupID` = ".$group->getId()))
+            ->willReturn(array(array('target'=>2, 'targetType'=>'0', 'userID'=>0, 'groupID'=>$group->getId())));
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $group->setDMS($dms);
+        $notifications = $group->getNotifications();
+        $this->assertIsArray($notifications);
+        $this->assertCount(1, $notifications);
+        $this->assertInstanceOf(SeedDMS_Core_Notification::class, $notifications[0]);
+    }
+
+    /**
+     * Test method getNotifications() with target type
+     *
+     * @return void
+     */
+    public function testGetNotificationsWithTargetType()
+    {
+        $group = $this->getGroup();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("WHERE `tblNotify`.`groupID` = ".$group->getId()." AND `tblNotify`.`targetType` = 1"))
+            ->willReturn(array(array('target'=>2, 'targetType'=>'1', 'userID'=>0, 'groupID'=>$group->getId())));
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $group->setDMS($dms);
+        $notifications = $group->getNotifications(1);
+        $this->assertIsArray($notifications);
+        $this->assertCount(1, $notifications);
+        $this->assertInstanceOf(SeedDMS_Core_Notification::class, $notifications[0]);
+    }
+
+
+}
diff --git a/SeedDMS_Core/tests/KeywordCategoryTest.php b/SeedDMS_Core/tests/KeywordCategoryTest.php
new file mode 100644
index 000000000..e22d138ed
--- /dev/null
+++ b/SeedDMS_Core/tests/KeywordCategoryTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Implementation of the keyword tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * User test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class KeywordCategoryTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method getName() and setName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetName()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $cat = self::$dms->addKeywordCategory($user->getId(), 'Category 1');
+        $name = $cat->getName();
+        $ret = $cat->setName('foo');
+        $this->assertTrue($ret);
+        $name = $cat->getName();
+        $this->assertEquals('foo', $name);
+        $ret = $cat->setName(' ');
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method getOwner() and setOwner()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetOwner()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $guest = SeedDMS_Core_User::getInstance(2, self::$dms);
+        $cat = self::$dms->addKeywordCategory($user->getId(), 'Category 1');
+        $this->assertIsObject($cat);
+        $ret = $cat->setOwner($guest);
+        $this->assertTrue($ret);
+        $owner = $cat->getOwner();
+        $this->assertEquals(2, $owner->getId());
+        $ret = $cat->setOwner(null);
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method addKeywordList() and editKeywordList(), getKeywordLists(), removeKeywordList()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetSetEditAndRemoveKeywordList()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $cat = self::$dms->addKeywordCategory($user->getId(), 'Category 1');
+        $this->assertIsObject($cat);
+        $ret = $cat->addKeywordList('foo');
+        $this->assertTrue($ret);
+        $ret = $cat->addKeywordList('bar');
+        $this->assertTrue($ret);
+        $list = $cat->getKeywordLists();
+        $this->assertIsArray($list);
+        $this->assertCount(2, $list);
+        $ret = $cat->editKeywordList(1, 'baz');
+        $this->assertTrue($ret);
+
+        $ret = $cat->removeKeywordList(1);
+        $this->assertTrue($ret);
+        $list = $cat->getKeywordLists();
+        $this->assertIsArray($list);
+        $this->assertCount(1, $list);
+    }
+
+    /**
+     * Test method addKeywordCategory() and remove()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAndAndRemoveKeywordCategory()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $cat = self::$dms->addKeywordCategory($user->getId(), 'Category 1');
+        $this->assertIsObject($cat);
+        $ret = $cat->addKeywordList('foo');
+        $this->assertTrue($ret);
+        $ret = $cat->addKeywordList('bar');
+        $this->assertTrue($ret);
+        $ret = $cat->remove();
+        $this->assertTrue($ret);
+    }
+}
diff --git a/SeedDMS_Core/tests/ReviewApprovalTest.php b/SeedDMS_Core/tests/ReviewApprovalTest.php
new file mode 100644
index 000000000..aea040e39
--- /dev/null
+++ b/SeedDMS_Core/tests/ReviewApprovalTest.php
@@ -0,0 +1,477 @@
+<?php
+/**
+ * Implementation of the review and approval tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * Group test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class ReviewApprovalTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method addIndReviewer(), addGrpReviewer(), verifyStatus(),
+     * getReviewStatus(), removeReview(), delIndReviewer()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testReviewDocumentByUserAndGroup()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertIsObject($user);
+
+        /* Add a new user who will be the reviewer */
+        $reviewer = self::$dms->addUser('reviewer', 'reviewer', 'Reviewer One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($reviewer);
+
+        /* Add a new group which will be the reviewer */
+        $reviewergrp = self::$dms->addGroup('reviewer', '');
+        $this->assertIsObject($reviewergrp);
+
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $content = $document->getLatestContent();
+        $this->assertIsObject($content);
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_RELEASED, $status['status']);
+
+        /* A missing reviewer or user causes an error */
+        $ret = $content->addIndReviewer($reviewer, null);
+        $this->assertEquals(-1, $ret);
+
+        /* A missing reviewer or user causes an error */
+        $ret = $content->addIndReviewer(null, $user);
+        $this->assertEquals(-1, $ret);
+
+        /* Adding a group instead of a user causes an error */
+        $ret = $content->addIndReviewer($reviewergrp, $user);
+        $this->assertEquals(-1, $ret);
+
+        /* Finally add the reviewer */
+        $ret = $content->addIndReviewer($reviewer, $user);
+        $this->assertGreaterThan(0, $ret);
+
+        /* Adding the user again will yield in an error */
+        $ret = $content->addIndReviewer($reviewer, $user);
+        $this->assertEquals(-3, $ret);
+
+        /* Needs to call verifyStatus() in order to recalc the status */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_DRAFT_REV, $newstatus);
+
+        /* Get all reviews */
+        $reviewstatus = $content->getReviewStatus();
+        $this->assertIsArray($reviewstatus);
+        $this->assertCount(1, $reviewstatus);
+
+        /* Get list of individual und group reviewers */
+        $reviewers = $content->getReviewers();
+        $this->assertIsArray($reviewers);
+        $this->assertCount(2, $reviewers);
+        $this->assertCount(1, $reviewers['i']);
+        $this->assertCount(0, $reviewers['g']);
+/*
+        $db = self::$dms->getDB();
+        $db->createTemporaryTable("ttreviewid", true);
+        $queryStr = "SELECT * FROM ttreviewid";
+        $recs = $db->getResultArray($queryStr);
+        echo $db->getErrorMsg();
+        var_dump($recs);
+*/
+
+        /* A missing reviewer or user causes an error */
+        $ret = $content->addGrpReviewer($reviewergrp, null);
+        $this->assertEquals(-1, $ret);
+
+        /* A missing reviewer or user causes an error */
+        $ret = $content->addGrpReviewer(null, $user);
+        $this->assertEquals(-1, $ret);
+
+        /* Adding a user instead of a group causes an error */
+        $ret = $content->addGrpReviewer($reviewer, $user);
+        $this->assertEquals(-1, $ret);
+
+        /* Finally add the reviewer */
+        $ret = $content->addGrpReviewer($reviewergrp, $user);
+        $this->assertGreaterThan(0, $ret);
+        $groupstatus = $reviewergrp->getReviewStatus();
+
+        /* Adding the group again will yield in an error */
+        $ret = $content->addGrpReviewer($reviewergrp, $user);
+        $this->assertEquals(-3, $ret);
+
+        /* Get all reviews */
+        $reviewstatus = $content->getReviewStatus();
+        $this->assertIsArray($reviewstatus);
+        $this->assertCount(2, $reviewstatus);
+
+        /* Get list of individual und group reviewers */
+        $reviewers = $content->getReviewers();
+        $this->assertIsArray($reviewers);
+        $this->assertCount(2, $reviewers);
+        $this->assertCount(1, $reviewers['i']);
+        $this->assertCount(1, $reviewers['g']);
+
+        $userstatus = $reviewer->getReviewStatus();
+        $groupstatus = $reviewergrp->getReviewStatus();
+
+        /* There should be two log entries, one for each reviewer */
+        $reviewlog = $content->getReviewLog(5);
+        $this->assertIsArray($reviewlog);
+        $this->assertCount(2, $reviewlog);
+
+        /* Adding a review without a user of reviewer causes an error */
+        $ret = $content->setReviewByInd($reviewer, null, S_LOG_ACCEPTED, 'Comment of individual reviewer');
+        $this->assertEquals(-1, $ret);
+        $ret = $content->setReviewByInd(null, $user, S_LOG_ACCEPTED, 'Comment of individual reviewer');
+        $this->assertEquals(-1, $ret);
+
+        /* Adding a review as an individual but passing a group causes an error */
+        $ret = $content->setReviewByInd($reviewergrp, $user, S_LOG_ACCEPTED, 'Comment of individual reviewer');
+        $this->assertEquals(-1, $ret);
+
+        /* Individual reviewer reviews document */
+        $ret = $content->setReviewByInd($reviewer, $user, S_LOG_ACCEPTED, 'Comment of individual reviewer');
+        $this->assertIsInt(0, $ret);
+        $this->assertGreaterThan(0, $ret);
+
+        /* Get the last 5 review log entries (actually there are just 3 now) */
+        $reviewlog = $content->getReviewLog(5);
+        $this->assertIsArray($reviewlog);
+        $this->assertCount(3, $reviewlog);
+        $this->assertEquals('Comment of individual reviewer', $reviewlog[0]['comment']);
+        $this->assertEquals(1, $reviewlog[0]['status']);
+
+        /* Needs to call verifyStatus() in order to recalc the status.
+         * It must not be changed because the group reviewer has not done the
+         * review.
+         */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_DRAFT_REV, $newstatus);
+
+        /* Adding a review without a user of reviewer causes an error */
+        $ret = $content->setReviewByGrp($reviewergrp, null, S_LOG_ACCEPTED, 'Comment of group reviewer');
+        $this->assertEquals(-1, $ret);
+        $ret = $content->setReviewByGrp(null, $user, S_LOG_ACCEPTED, 'Comment of group reviewer');
+        $this->assertEquals(-1, $ret);
+
+        /* Adding a review as an group but passing a user causes an error */
+        $ret = $content->setReviewByGrp($reviewer, $user, S_LOG_ACCEPTED, 'Comment of group reviewer');
+        $this->assertEquals(-1, $ret);
+
+        /* Group reviewer reviews document */
+        $ret = $content->setReviewByGrp($reviewergrp, $user, S_LOG_ACCEPTED, 'Comment of group reviewer');
+        $this->assertIsInt(0, $ret);
+        $this->assertGreaterThan(0, $ret);
+
+        /* Get the last 5 review log entries (actually there are just 4 now) */
+        $reviewlog = $content->getReviewLog(5);
+        $this->assertIsArray($reviewlog);
+        $this->assertCount(4, $reviewlog);
+        $this->assertEquals('Comment of group reviewer', $reviewlog[0]['comment']);
+        $this->assertEquals(1, $reviewlog[0]['status']);
+
+        /* Now the document has received all reviews */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_RELEASED, $newstatus);
+
+        /* Remove the last review of the user */
+        $userstatus = $reviewer->getReviewStatus($document->getId(), $content->getVersion());
+        $this->assertIsArray($userstatus);
+        $this->assertCount(2, $userstatus);
+        $this->assertCount(1, $userstatus['indstatus']);
+        $ret = $content->removeReview($userstatus['indstatus'][$document->getId()]['reviewID'], $user, 'Undo review');
+        $this->assertTrue($ret);
+
+        /* Get the last 8 review log entries (actually there are just 5 now) */
+        $reviewlog = $content->getReviewLog(8);
+        $this->assertIsArray($reviewlog);
+        $this->assertCount(5, $reviewlog);
+        $this->assertEquals('Undo review', $reviewlog[0]['comment']);
+        $this->assertEquals(0, $reviewlog[0]['status']);
+
+        /* Now the document must be back in draft mode */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_DRAFT_REV, $newstatus);
+
+        /* Removing the user as a reviewer completly will release the
+         * document again, because the group reviewer became the only
+         * reviewer and has done the review already.
+         */
+        $ret = $content->delIndReviewer($reviewer, $user, 'Reviewer removed');
+        $this->assertIsInt($ret);
+        $this->assertEquals(0, $ret);
+
+        /* Get the last 8 review log entries (actually there are just 6 now) */
+        $reviewlog = $content->getReviewLog(8);
+        $this->assertIsArray($reviewlog);
+        $this->assertCount(6, $reviewlog);
+        $this->assertEquals('Reviewer removed', $reviewlog[0]['comment']);
+        $this->assertEquals(-2, $reviewlog[0]['status']);
+
+        /* Now the document will be released again */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_RELEASED, $newstatus);
+    }
+
+    /**
+     * Test method addIndApprover(), addGrpApprover(), verifyStatus(),
+     * getApprovalStatus(), removeApproval(), delIndApprover()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testApproveDocumentByUserAndGroup()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertIsObject($user);
+
+        /* Add a new user who will be the approver */
+        $approver = self::$dms->addUser('approver', 'approver', 'Approver One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($approver);
+
+        /* Add a new group which will be the approver */
+        $approvergrp = self::$dms->addGroup('approver', '');
+        $this->assertIsObject($approvergrp);
+
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $content = $document->getLatestContent();
+        $this->assertIsObject($content);
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_RELEASED, $status['status']);
+
+        /* A missing approver or user causes an error */
+        $ret = $content->addIndApprover($approver, null);
+        $this->assertEquals(-1, $ret);
+
+        /* A missing approver or user causes an error */
+        $ret = $content->addIndApprover(null, $user);
+        $this->assertEquals(-1, $ret);
+
+        /* Adding a group instead of a user causes an error */
+        $ret = $content->addIndApprover($approvergrp, $user);
+        $this->assertEquals(-1, $ret);
+
+        /* Finally add the reviewer */
+        $ret = $content->addIndApprover($approver, $user);
+        $this->assertGreaterThan(0, $ret);
+
+        /* Adding the user again will yield in an error */
+        $ret = $content->addIndApprover($approver, $user);
+        $this->assertEquals(-3, $ret);
+
+        /* Needs to call verifyStatus() in order to recalc the status */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_DRAFT_APP, $newstatus);
+
+        /* Get all approvals */
+        $approvalstatus = $content->getApprovalStatus();
+        $this->assertIsArray($approvalstatus);
+        $this->assertCount(1, $approvalstatus);
+
+        /* Get list of individual und group approvers */
+        $approvers = $content->getApprovers();
+        $this->assertIsArray($approvers);
+        $this->assertCount(2, $approvers);
+        $this->assertCount(1, $approvers['i']);
+        $this->assertCount(0, $approvers['g']);
+
+        /* A missing approver or user causes an error */
+        $ret = $content->addGrpApprover($approvergrp, null);
+        $this->assertEquals(-1, $ret);
+
+        /* A missing approver or user causes an error */
+        $ret = $content->addGrpApprover(null, $user);
+        $this->assertEquals(-1, $ret);
+
+        /* Adding a user instead of a group causes an error */
+        $ret = $content->addGrpApprover($approver, $user);
+        $this->assertEquals(-1, $ret);
+
+        /* Finally add the reviewer */
+        $ret = $content->addGrpApprover($approvergrp, $user);
+        $this->assertGreaterThan(0, $ret);
+        $groupstatus = $approvergrp->getApprovalStatus();
+
+        /* Adding the group again will yield in an error */
+        $ret = $content->addGrpApprover($approvergrp, $user);
+        $this->assertEquals(-3, $ret);
+
+        /* Get all approvals */
+        $approvalstatus = $content->getApprovalStatus();
+        $this->assertIsArray($approvalstatus);
+        $this->assertCount(2, $approvalstatus);
+
+        /* Get list of individual und group approvers */
+        $approvers = $content->getApprovers();
+        $this->assertIsArray($approvers);
+        $this->assertCount(2, $approvers);
+        $this->assertCount(1, $approvers['i']);
+        $this->assertCount(1, $approvers['g']);
+
+        $userstatus = $approver->getApprovalStatus();
+        $groupstatus = $approvergrp->getApprovalStatus();
+
+        /* There should be two log entries, one for each approver */
+        $approvallog = $content->getApproveLog(5);
+        $this->assertIsArray($approvallog);
+        $this->assertCount(2, $approvallog);
+
+        /* Adding a approval without a user of approver causes an error */
+        $ret = $content->setApprovalByInd($approver, null, S_LOG_ACCEPTED, 'Comment of individual approver');
+        $this->assertEquals(-1, $ret);
+        $ret = $content->setApprovalByInd(null, $user, S_LOG_ACCEPTED, 'Comment of individual approver');
+        $this->assertEquals(-1, $ret);
+
+        /* Adding a approval as an individual but passing a group causes an error */
+        $ret = $content->setApprovalByInd($approvergrp, $user, S_LOG_ACCEPTED, 'Comment of individual approver');
+        $this->assertEquals(-1, $ret);
+
+        /* Individual approver approvals document */
+        $ret = $content->setApprovalByInd($approver, $user, S_LOG_ACCEPTED, 'Comment of individual approver');
+        $this->assertIsInt(0, $ret);
+        $this->assertGreaterThan(0, $ret);
+
+        /* Get the last 5 approval log entries (actually there are just 3 now) */
+        $approvallog = $content->getApproveLog(5);
+        $this->assertIsArray($approvallog);
+        $this->assertCount(3, $approvallog);
+        $this->assertEquals('Comment of individual approver', $approvallog[0]['comment']);
+        $this->assertEquals(1, $approvallog[0]['status']);
+
+        /* Needs to call verifyStatus() in order to recalc the status.
+         * It must not be changed because the group approver has not done the
+         * approval.
+         */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_DRAFT_APP, $newstatus);
+
+        /* Adding a approval without a user of approver causes an error */
+        $ret = $content->setApprovalByGrp($approvergrp, null, S_LOG_ACCEPTED, 'Comment of group approver');
+        $this->assertEquals(-1, $ret);
+        $ret = $content->setApprovalByGrp(null, $user, S_LOG_ACCEPTED, 'Comment of group approver');
+        $this->assertEquals(-1, $ret);
+
+        /* Adding a approval as an group but passing a user causes an error */
+        $ret = $content->setApprovalByGrp($approver, $user, S_LOG_ACCEPTED, 'Comment of group approver');
+        $this->assertEquals(-1, $ret);
+
+        /* Group approver approvals document */
+        $ret = $content->setApprovalByGrp($approvergrp, $user, S_LOG_ACCEPTED, 'Comment of group approver');
+        $this->assertIsInt(0, $ret);
+        $this->assertGreaterThan(0, $ret);
+
+        /* Get the last 5 approval log entries (actually there are just 4 now) */
+        $approvallog = $content->getApproveLog(5);
+        $this->assertIsArray($approvallog);
+        $this->assertCount(4, $approvallog);
+        $this->assertEquals('Comment of group approver', $approvallog[0]['comment']);
+        $this->assertEquals(1, $approvallog[0]['status']);
+
+        /* Now the document has received all approvals */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_RELEASED, $newstatus);
+
+        /* Remove the last approval of the user */
+        $userstatus = $approver->getApprovalStatus($document->getId(), $content->getVersion());
+        $this->assertIsArray($userstatus);
+        $this->assertCount(2, $userstatus);
+        $this->assertCount(1, $userstatus['indstatus']);
+        $ret = $content->removeApproval($userstatus['indstatus'][$document->getId()]['approveID'], $user, 'Undo approval');
+        $this->assertTrue($ret);
+
+        /* Get the last 8 approval log entries (actually there are just 5 now) */
+        $approvallog = $content->getApproveLog(8);
+        $this->assertIsArray($approvallog);
+        $this->assertCount(5, $approvallog);
+        $this->assertEquals('Undo approval', $approvallog[0]['comment']);
+        $this->assertEquals(0, $approvallog[0]['status']);
+
+        /* Now the document must be back in draft mode */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_DRAFT_APP, $newstatus);
+
+        /* Removing the user as a approver completly will release the
+         * document again, because the group approver became the only
+         * approver and has done the approval already.
+         */
+        $ret = $content->delIndApprover($approver, $user, 'Approver removed');
+        $this->assertIsInt($ret);
+        $this->assertEquals(0, $ret);
+
+        /* Get the last 8 approval log entries (actually there are just 6 now) */
+        $approvallog = $content->getApproveLog(8);
+        $this->assertIsArray($approvallog);
+        $this->assertCount(6, $approvallog);
+        $this->assertEquals('Approver removed', $approvallog[0]['comment']);
+        $this->assertEquals(-2, $approvallog[0]['status']);
+
+        /* Now the document will be released again */
+        $newstatus = $content->verifyStatus(false, $user);
+        $this->assertIsInt($newstatus);
+        $this->assertEquals(S_RELEASED, $newstatus);
+    }
+}
diff --git a/SeedDMS_Core/tests/SeedDmsBase.php b/SeedDMS_Core/tests/SeedDmsBase.php
new file mode 100644
index 000000000..dc8f7e920
--- /dev/null
+++ b/SeedDMS_Core/tests/SeedDmsBase.php
@@ -0,0 +1,365 @@
+<?php declare(strict_types=1);
+/**
+ * Implementation of the database tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+namespace PHPUnit\Framework;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Database test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class SeedDmsTest extends TestCase
+{
+
+    public static $dbh;
+
+    public static $dms;
+
+    public static $contentdir;
+
+    public static $dbversion;
+
+    /**
+     * Create a sqlite database in memory
+     *
+     * @return void
+     */
+    public static function createInMemoryDatabase(): object
+    {
+        $dbh = new \SeedDMS_Core_DatabaseAccess('sqlite', '', '', '', ':memory:');
+        $dbh->connect();
+        $queries = file_get_contents(getenv("SEEDDMS_CORE_SQL"));
+        // generate SQL query
+        $queries = explode(";", $queries);
+
+        // execute queries
+        $errorMsg = '';
+        foreach ($queries as $query) {
+            //echo $query;
+            $query = trim($query);
+            if (!empty($query)) {
+                $dbh->getResult($query);
+
+                if ($dbh->getErrorNo() != 0) {
+                    //echo $dbh->getErrorMsg()."\n";
+                    $errorMsg .= $dbh->getErrorMsg()."\n";
+                }
+            }
+        }
+        return $dbh;
+    }
+
+    /**
+     * Create a mocked root folder object
+     *
+     * @return \SeedDMS_Core_Folder
+     */
+    protected function getMockedRootFolder($id=1, $name='DMS')
+    {
+        $folder = new \SeedDMS_Core_Folder($id, $name, 0, 'DMS root', time(), 1, 0, 0, 0.0);
+        return $folder;
+    }
+
+    /**
+     * Create a mocked document object
+     *
+     * @return \SeedDMS_Core_Document
+     */
+    protected function getMockedDocument($id=1, $name='Document')
+    {
+        $document = new \SeedDMS_Core_Document($id, $name, '', time(), null, 1, 1, 1, M_READ, 0, '', 1.0);
+        return $document;
+    }
+
+    /**
+     * Create a mocked user object
+     *
+     * @return \SeedDMS_Core_User
+     */
+    protected function getMockedUser()
+    {
+        $user = new \SeedDMS_Core_User(1, 'login', '', 'New User', 'email@seeddms.org', 'de_DE', 'bootstrap', '', null);
+        return $user;
+    }
+
+    /**
+     * Create a temporary file with random content and the given length.
+     *
+     * @param integer $length length of file
+     *
+     * @return string name of temporary file
+     */
+    protected static function createTempFile($length=200, $dir='')
+    {
+        if($tmpfname = @tempnam($dir ? $dir : sys_get_temp_dir(), 'foo')) {
+            file_put_contents($tmpfname, substr(str_shuffle(str_repeat($x='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', (int) ceil($length/strlen($x)) )),1,$length));
+            return $tmpfname;
+        } else
+            return false;
+    }
+
+    /**
+     * Create a temporary directory with random name in systems temp dir.
+     *
+     * @param integer $mode access mode of new directory
+     *
+     * @return string name of temporary directory
+     */
+    protected static function createTempDir(string $dir = null, int $mode = 0700): string {
+        /* Use the system temp dir by default. */
+        if (is_null($dir)) {
+            $dir = sys_get_temp_dir();
+        }
+
+        do { $tmp = $dir . '/' . mt_rand(); }
+        while (!@mkdir($tmp, $mode));
+        return $tmp;
+    }
+
+    /**
+     * Create a simple document.
+     *
+     * @param \SeedDMS_Core_Folder $parent parent folder
+     * @param \SeedDMS_Core_User $owner owner of document
+     * @param string $name name of document
+     * @param integer $length length of file
+     *
+     * @return string name of temporary file
+     */
+    protected static function createDocument($parent, $owner, $name, $length=200)
+    {
+        $filename = self::createTempFile($length);
+        list($document, $res) = $parent->addDocument(
+            $name, // name
+            '', // comment
+            null, // no expiration
+            $owner, // owner
+            '', // keywords
+            [], // categories
+            $filename, // name of file
+            'file1.txt', // original file name
+            '.txt', // file type
+            'text/plain', // mime type
+            1.0 // sequence
+        );
+        unlink($filename);
+        return $document;
+    }
+
+    /**
+     * Create a simple folder structure without documents
+     *
+     * DMS root -+- Subfolder 1 -+- Subsubfolder 1 -+- Subsubsubfolder 1
+     *           |
+     *           +- Subfolder 2
+     *           |
+     *           +- Subfolder 3
+     *
+     * The sequence field of Subfolder x is:
+     * Subfolder 1: 2.0
+     * Subfolder 2: 1.0
+     * Subfolder 1: 0.5
+     *
+     * @return void
+     */
+    protected static function createSimpleFolderStructure()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        /* Set up a folder structure */
+        $subfolder = $rootfolder->addSubFolder('Subfolder 1', '', $user, 2.0);
+        $subsubfolder = $subfolder->addSubFolder('Subsubfolder 1', '', $user, 1.0);
+        $subsubsubfolder = $subsubfolder->addSubFolder('Subsubsubfolder 1', '', $user, 1.0);
+        $rootfolder->addSubFolder('Subfolder 2', '', $user, 1.0);
+        $rootfolder->addSubFolder('Subfolder 3', '', $user, 0.5);
+    }
+
+    /**
+     * Create a simple folder structure with documents
+     *
+     * Creates the same folder structure like createSimpleFolderStructure()
+     * but adds 30 documents to 'Subfolder 1'. They are named 'Document 1'
+     * to 'Document 30'.
+     *
+     * @return void
+     */
+    protected static function createSimpleFolderStructureWithDocuments()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        self::createSimpleFolderStructure();
+        /* Add documents to 'Subfolder 1' */
+        $subfolder = self::$dms->getFolderByName('Subfolder 1');
+        for ($i=1; $i<=15; $i++) {
+            $filename = self::createTempFile(200);
+            list($document, $res) = $subfolder->addDocument(
+                'Document 1-'.$i, // name
+                '', // comment
+                null,
+                $user, // owner
+                '', // keywords
+                [], // categories
+                $filename, // name of file
+                'file-1-'.$i.'.txt', // original file name
+                '.txt', // file type
+                'text/plain', // mime type
+                1.0+$i // sequence
+            );
+            unlink($filename);
+        }
+        /* Add documents to 'Subfolder 2' */
+        $subfolder = self::$dms->getFolderByName('Subfolder 2');
+        for ($i=1; $i<=15; $i++) {
+            $filename = self::createTempFile(200);
+            list($document, $res) = $subfolder->addDocument(
+                'Document 2-'.$i, // name
+                '', // comment
+                null,
+                $user, // owner
+                '', // keywords
+                [], // categories
+                $filename, // name of file
+                'file-2-'.$i.'.txt', // original file name
+                '.txt', // file type
+                'text/plain', // mime type
+                1.0+$i // sequence
+            );
+            unlink($filename);
+        }
+    }
+
+    /**
+     * Create two groups with 3 users each
+     * The groups are named 'Group 1' and 'Group 2'. The users in Group 1
+     * are named 'User-1-1', 'User-1-2', 'User-1-3'. The users in Group 2
+     * are named 'User-2-1', 'User-2-2', 'User-2-3'.
+     * The login name is the lower case of the name.
+     *
+     * @return void
+     */
+    protected static function createGroupsAndUsers()
+    {
+        for($i=1; $i<=2; $i++) {
+            $group = self::$dms->addGroup('Group '.$i, '');
+            for($j=1; $j<=3; $j++) {
+                $user = self::$dms->addUser('user-'.$i.'-'.$j, '', 'User '.$j.' in group '.$i, 'user@seeddms.org', 'en_GB', 'bootstrap', '');
+                $user->joinGroup($group);
+            }
+        }
+    }
+
+    /**
+     * Creates a workflow with two transitions identical to the traditional
+     * workflow
+     *
+     * NR --- review --> NA -+- approve --> RL
+     *     +- reject --> RJ  |
+     *                       +- reject ---> RJ
+     *
+     * States:
+     * NR = needs review
+     * NA = needs approval
+     * RL = released
+     * RJ = rejected
+     *
+     * Actions:
+     * review
+     * approve
+     * reject
+     *
+     * Transitions:
+     * NR -- review -> NA   maybe done by reviewer
+     * NR -- reject -> RJ   maybe done by reviewer
+     * NA -- approve -> RL  maybe done by approver
+     * NA -- reject -> RJ   maybe done by approver
+     */
+    protected function createWorkflow(\SeedDMS_Core_User $reviewer, \SeedDMS_Core_User $approver): \SeedDMS_Core_Workflow
+    {
+        /* Create workflow states */
+        $ws_nr = self::$dms->addWorkflowState('needs review', S_IN_WORKFLOW);
+        $ws_na = self::$dms->addWorkflowState('needs approval', S_IN_WORKFLOW);
+        $ws_rl = self::$dms->addWorkflowState('released', S_RELEASED);
+        $ws_rj = self::$dms->addWorkflowState('rejected', S_REJECTED);
+
+        /* Create workflow actions */
+        $wa_rv = self::$dms->addWorkflowAction('review', S_IN_WORKFLOW);
+        $wa_rj = self::$dms->addWorkflowAction('reject', S_REJECTED);
+        $wa_ap = self::$dms->addWorkflowAction('approve', S_RELEASED);
+
+        /* Create a workflow which starts in state 'needs review' */
+        $workflow = self::$dms->addWorkflow('traditional workflow', $ws_nr);
+        /* Add transition NR -- review -> NA  */
+        $wt_nr_na = $workflow->addTransition($ws_nr, $wa_rv, $ws_na, [$reviewer], []);
+        /* Add transition NR -- review -> RJ  */
+        $wt_nr_rj = $workflow->addTransition($ws_nr, $wa_rj, $ws_rj, [$reviewer], []);
+        /* Add transition NA -- approve -> RL  */
+        $wt_na_rl = $workflow->addTransition($ws_na, $wa_ap, $ws_rl, [$approver], []);
+        /* Add transition NA -- reject -> RJ  */
+        $wt_na_rj = $workflow->addTransition($ws_na, $wa_rj, $ws_rj, [$approver], []);
+
+        return $workflow;
+    }
+
+    /**
+     * Creates a workflow with one transitions for approving a document
+     *
+     * NA -+- approve --> RL
+     *     |
+     *     +- reject ---> RJ
+     *
+     * States:
+     * NA = needs approval
+     * RL = released
+     * RJ = rejected
+     *
+     * Actions:
+     * approve
+     * reject
+     *
+     * Transitions:
+     * NA -- approve -> RL  maybe done by approver
+     * NA -- reject -> RJ   maybe done by approver
+     */
+    protected function createSimpleWorkflow(\SeedDMS_Core_User $approver): \SeedDMS_Core_Workflow
+    {
+        /* Create workflow states */
+        $ws_na = self::$dms->addWorkflowState('simple needs approval', S_IN_WORKFLOW);
+        $ws_rl = self::$dms->addWorkflowState('simple released', S_RELEASED);
+        $ws_rj = self::$dms->addWorkflowState('simple rejected', S_REJECTED);
+
+        /* Create workflow actions */
+        $wa_rj = self::$dms->addWorkflowAction('simple reject', S_REJECTED);
+        $wa_ap = self::$dms->addWorkflowAction('simple approve', S_RELEASED);
+
+        /* Create a workflow which starts in state 'needs approval' */
+        $workflow = self::$dms->addWorkflow('simple workflow', $ws_na);
+        /* Add transition NA -- approve -> RL  */
+        $wt_na_rl = $workflow->addTransition($ws_na, $wa_ap, $ws_rl, [$approver], []);
+        /* Add transition NA -- reject -> RJ  */
+        $wt_na_rj = $workflow->addTransition($ws_na, $wa_rj, $ws_rj, [$approver], []);
+
+        return $workflow;
+    }
+
+}
+
diff --git a/SeedDMS_Core/tests/UserTest.php b/SeedDMS_Core/tests/UserTest.php
new file mode 100644
index 000000000..6d2e6f208
--- /dev/null
+++ b/SeedDMS_Core/tests/UserTest.php
@@ -0,0 +1,1679 @@
+<?php
+/**
+ * Implementation of the user tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * User test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class UserTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+        self::$dbversion = self::$dms->getDBVersion();
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Create a mock admin user object
+     *
+     * @return SeedDMS_Core_User
+     */
+    protected function getAdminUser()
+    {
+        $user = new SeedDMS_Core_User(1, 'admin', 'pass', 'Joe Foo', 'baz@foo.de', 'en_GB', 'bootstrap', 'My comment', SeedDMS_Core_User::role_admin);
+        return $user;
+    }
+
+    /**
+     * Create a mock admin role object (only used for SeedDMS 6)
+     *
+     * @return SeedDMS_Core_User
+     */
+    protected function getAdminRole()
+    {
+        $role = new SeedDMS_Core_Role(1, 'admin', SeedDMS_Core_Role::role_admin);
+        return $role;
+    }
+
+    /**
+     * Create a mock regular user object
+     *
+     * @return SeedDMS_Core_User
+     */
+    protected function getUser()
+    {
+        $user = new SeedDMS_Core_User(2, 'user', 'pass', 'Joe Baz', 'joe@foo.de', 'en_GB', 'bootstrap', 'My comment', SeedDMS_Core_User::role_user);
+        return $user;
+    }
+
+    /**
+     * Test method setDMS() and getDMS()
+     *
+     * @return void
+     */
+    public function testSetAndGetDMS()
+    {
+        $user = $this->getAdminUser();
+        $user->setDMS(self::$dms);
+        $this->assertInstanceOf(SeedDMS_Core_DMS::class, $user->getDMS());
+    }
+
+    /**
+     * Test method isType()
+     *
+     * @return void
+     */
+    public function testIsType()
+    {
+        $user = $this->getAdminUser();
+        $this->assertTrue($user->isType('user'));
+    }
+
+    /**
+     * Test method getPwd()
+     *
+     * @return void
+     */
+    public function testGetPwd()
+    {
+        $user = $this->getAdminUser();
+        $this->assertEquals('pass', $user->getPwd());
+    }
+
+    /**
+     * Test method getEmail()
+     *
+     * @return void
+     */
+    public function testGetEmail()
+    {
+        $user = $this->getAdminUser();
+        $this->assertEquals('baz@foo.de', $user->getEmail());
+    }
+
+    /**
+     * Test method getLanguage()
+     *
+     * @return void
+     */
+    public function testGetLanguage()
+    {
+        $user = $this->getAdminUser();
+        $this->assertEquals('en_GB', $user->getLanguage());
+    }
+
+    /**
+     * Test method getTheme()
+     *
+     * @return void
+     */
+    public function testGetTheme()
+    {
+        $user = $this->getAdminUser();
+        $this->assertEquals('bootstrap', $user->getTheme());
+    }
+
+    /**
+     * Test method getComment()
+     *
+     * @return void
+     */
+    public function testGetComment()
+    {
+        $user = $this->getAdminUser();
+        $this->assertEquals('My comment', $user->getComment());
+    }
+
+    /**
+     * Test method getRole()
+     *
+     * @return void
+     */
+    public function testGetRole()
+    {
+        $user = $this->getAdminUser();
+        $this->assertEquals(1, $user->getRole());
+    }
+
+    /**
+     * Test method isAdmin()
+     *
+     * @return void
+     */
+    public function testIsAdmin()
+    {
+        $user = $this->getAdminUser();
+        $this->assertTrue($user->isAdmin());
+        $this->assertFalse($user->isGuest());
+    }
+
+    /**
+     * Test method isGuest()
+     *
+     * @return void
+     */
+    public function testIsGuest()
+    {
+        $user = $this->getAdminUser();
+        $this->assertFalse($user->isGuest());
+    }
+
+    /**
+     * Test method isHidden()
+     *
+     * @return void
+     */
+    public function testIsHidden()
+    {
+        $user = $this->getAdminUser();
+        $this->assertFalse($user->isHidden());
+    }
+
+    /**
+     * Test method getQuota()
+     *
+     * @return void
+     */
+    public function testGetQuota()
+    {
+        $user = $this->getAdminUser();
+        $this->assertEquals(0, $user->getQuota());
+    }
+
+    /**
+     * Test method getSecret()
+     *
+     * @return void
+     */
+    public function testGetSecret()
+    {
+        if(self::$dbversion['major'] < 6) {
+            $this->markTestSkipped(
+                'This test is not applicable for SeedDMS 5.'
+            );
+        } else {
+            $user = $this->getAdminUser();
+            $this->assertEquals('', $user->getSecret());
+        }
+    }
+
+    /**
+     * Test method getInstance()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetInstance()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $this->assertIsObject($user);
+        $this->assertEquals('admin', $user->getLogin());
+        $user = SeedDMS_Core_User::getInstance('admin', self::$dms, 'name');
+        $this->assertIsObject($user);
+        $this->assertEquals('admin', $user->getLogin());
+        $user = SeedDMS_Core_User::getInstance('admin', self::$dms, 'name', 'info@seeddms.org');
+        $this->assertIsObject($user);
+        $this->assertEquals('admin', $user->getLogin());
+        /* get instance of none existing user */
+        $user = SeedDMS_Core_User::getInstance('foo', self::$dms, 'name');
+        $this->assertNull($user);
+    }
+
+    /**
+     * Test method getAllInstances()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAllInstancesSqlFail()
+    {
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->exactly(2))
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblUsers` ORDER BY"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        /* Order by login */
+        $users = SeedDMS_Core_User::getAllInstances('', $dms);
+        $this->assertFalse($users);
+        /* Order by fullname */
+        $users = SeedDMS_Core_User::getAllInstances('fullname', $dms);
+        $this->assertFalse($users);
+    }
+
+    /**
+     * Test method getLogin()
+     *
+     * @return void
+     */
+    public function testGetLogin()
+    {
+        $user = $this->getAdminUser();
+        $this->assertEquals('admin', $user->getLogin());
+    }
+
+    /**
+     * Test method setLogin()
+     *
+     * @return void
+     */
+    public function testSetLoginSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `login`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setLogin('foo'));
+    }
+
+    /**
+     * Test method getLogin() and setLogin()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetLogin()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $login = $user->getLogin();
+        $ret = $user->setLogin('foo');
+        $this->assertTrue($ret);
+        $login = $user->getLogin();
+        $this->assertEquals('foo', $login);
+        $ret = $user->setLogin(' ');
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method getFullName()
+     *
+     * @return void
+     */
+    public function testGetFullName()
+    {
+        $user = $this->getAdminUser();
+        $this->assertEquals('Joe Foo', $user->getFullName());
+    }
+
+    /**
+     * Test method setFullName()
+     *
+     * @return void
+     */
+    public function testSetFullNameSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `fullName`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setFullName('foo'));
+    }
+
+    /**
+     * Test method getFullName() and setFullName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetFullName()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $fullname = $user->getFullName();
+        $ret = $user->setFullName('foo');
+        $this->assertTrue($ret);
+        $fullname = $user->getFullName();
+        $this->assertEquals('foo', $fullname);
+    }
+
+    /**
+     * Test method getPwd() and setPwd()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetPwd()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $pwd = $user->getPwd();
+        $ret = $user->setPwd('foo');
+        $this->assertTrue($ret);
+        $pwd = $user->getPwd();
+        $this->assertEquals('foo', $pwd);
+    }
+
+    /**
+     * Test method setPwd()
+     *
+     * @return void
+     */
+    public function testSetPwdSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `pwd`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setPwd('foo'));
+    }
+
+    /**
+     * Test method getPwdExpiration() and setPwdExpiration()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetPwdExpiration()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $pwdexp = $user->getPwdExpiration();
+        /* Set password expiration to 'never' */
+        $ret = $user->setPwdExpiration('never');
+        $this->assertTrue($ret);
+        $pwdexp = $user->getPwdExpiration();
+        $this->assertNull($pwdexp);
+
+        /* Set password expiration to 'now' */
+        $now = date('Y-m-d H:i:s');
+        $ret = $user->setPwdExpiration('now');
+        $this->assertTrue($ret);
+        $pwdexp = $user->getPwdExpiration();
+        $this->assertEquals($now, $pwdexp);
+    }
+
+    /**
+     * Test method setPwdExpiration()
+     *
+     * @return void
+     */
+    public function testSetPwdExpirationSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `pwdExpiration`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setPwdExpiration('foo'));
+    }
+
+    /**
+     * Test method getEmail() and setEmail()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetEmail()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $email = $user->getEmail();
+        $ret = $user->setEmail('new@seeddms.org');
+        $this->assertTrue($ret);
+        $email = $user->getEmail();
+        $this->assertEquals('new@seeddms.org', $email);
+    }
+
+    /**
+     * Test method setEmail()
+     *
+     * @return void
+     */
+    public function testSetEmailSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `email`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setEmail('foo'));
+    }
+
+    /**
+     * Test method getLanguage() and setLanguage()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetLanguage()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $language = $user->getLanguage();
+        $ret = $user->setLanguage('de_DE');
+        $this->assertTrue($ret);
+        $language = $user->getLanguage();
+        $this->assertEquals('de_DE', $language);
+    }
+
+    /**
+     * Test method setLanguage()
+     *
+     * @return void
+     */
+    public function testSetLanguageSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `language`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setLanguage('de_DE'));
+    }
+
+    /**
+     * Test method getTheme() and setTheme()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetTheme()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $theme = $user->getTheme();
+        $ret = $user->setTheme('bootstrap4');
+        $this->assertTrue($ret);
+        $theme = $user->getTheme();
+        $this->assertEquals('bootstrap4', $theme);
+    }
+
+    /**
+     * Test method setTheme()
+     *
+     * @return void
+     */
+    public function testSetThemeSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `theme`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setTheme('bootstrap'));
+    }
+
+    /**
+     * Test method getComment() and setComment()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetComment()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $comment = $user->getComment();
+        $ret = $user->setComment('my comment');
+        $this->assertTrue($ret);
+        $comment = $user->getComment();
+        $this->assertEquals('my comment', $comment);
+    }
+
+    /**
+     * Test method setComment()
+     *
+     * @return void
+     */
+    public function testSetCommentSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `comment`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setComment('my comment'));
+    }
+
+    /**
+     * Test method getRole() and setRole()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetRole()
+    {
+        if(self::$dbversion['major'] < 6) {
+            // SeedDMS 5 use integers for roles: 0=user, 1=admin, 2=guest
+            $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+            // User with id=1 is the admin user in the initial database
+            $role = $user->getRole();
+            $this->assertEquals(SeedDMS_Core_User::role_admin, $role);
+            $ret = $user->setRole(SeedDMS_Core_User::role_guest);
+            $this->assertTrue($ret);
+            $role = $user->getRole();
+            $this->assertEquals(SeedDMS_Core_User::role_guest, $role);
+            $ret = $user->setRole('');
+            $this->assertFalse($ret);
+        } else {
+            // Starting with SeedDMS 6 a role is an object
+            $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+            // User with id=1 is the admin user in the initial database
+            $role = $user->getRole();
+            $this->assertTrue($role->isAdmin());
+            // SeedDMS_Core_User has an isAdmin() method too, which internally
+            // uses SeedDMS_Core_Role::isAdmin()
+            $this->assertTrue($user->isAdmin());
+            // Get the guest role, which is supposed to have id=2 in the
+            // initial database
+            $guestrole = SeedDMS_Core_Role::getInstance(2, self::$dms);
+            $this->assertTrue($guestrole->isGuest());
+            // Assign guest role and check if the user is a guest
+            $ret = $user->setRole($guestrole);
+            $this->assertTrue($ret);
+            $this->assertTrue($user->isGuest());
+        }
+    }
+
+    /**
+     * Test method setRole()
+     *
+     * @return void
+     */
+    public function testSetRoleSqlFail()
+    {
+        if(self::$dbversion['major'] > 5) {
+            $role = $this->getAdminRole();
+        }
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `role`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        if(self::$dbversion['major'] > 5) {
+            $this->assertFalse($user->setRole($role));
+        } else {
+            $this->assertFalse($user->setRole(SeedDMS_Core_User::role_admin));
+        }
+    }
+
+    /**
+     * Test method setGuest()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetGuest()
+    {
+        if(self::$dbversion['major'] == '5') {
+            $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+            $role = $user->getRole();
+            $ret = $user->setGuest();
+            $this->assertTrue($ret);
+            $role = $user->getRole();
+            $this->assertEquals(SeedDMS_Core_User::role_guest, $role);
+        } else {
+            $this->markTestSkipped(
+                'This test is not applicable for SeedDMS 6.'
+            );
+        }
+    }
+
+    /**
+     * Test method setGuest()
+     *
+     * @return void
+     */
+    public function testSetGuestSqlFail()
+    {
+        $dms = new SeedDMS_Core_DMS(null, '');
+        if(self::$dbversion['major'] == '5') {
+            $user = $this->getAdminUser();
+            $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+            $db->expects($this->once())
+                ->method('getResult')
+                ->with($this->stringContains("UPDATE `tblUsers` SET `role`"))
+                ->willReturn(false);
+            $dms = new SeedDMS_Core_DMS($db, '');
+            $user->setDMS($dms);
+            $this->assertFalse($user->setGuest());
+        } else {
+            $this->markTestSkipped(
+                'This test is not applicable for SeedDMS 6.'
+            );
+        }
+    }
+
+    /**
+     * Test method setAdmin()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetAdmin()
+    {
+        if(self::$dbversion['major'] == '5') {
+            $user = SeedDMS_Core_User::getInstance(2, self::$dms);
+            $role = $user->getRole();
+            $ret = $user->setAdmin();
+            $this->assertTrue($ret);
+            $role = $user->getRole();
+            $this->assertEquals(SeedDMS_Core_User::role_admin, $role);
+        } else {
+            $this->markTestSkipped(
+                'This test is not applicable for SeedDMS 6.'
+            );
+        }
+    }
+
+    /**
+     * Test method setAdmin()
+     *
+     * @return void
+     */
+    public function testSetAdminSqlFail()
+    {
+        $dms = new SeedDMS_Core_DMS(null, '');
+        if(self::$dbversion['major'] == '5') {
+            $user = $this->getAdminUser();
+            $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+            $db->expects($this->once())
+                ->method('getResult')
+                ->with($this->stringContains("UPDATE `tblUsers` SET `role`"))
+                ->willReturn(false);
+            $dms = new SeedDMS_Core_DMS($db, '');
+            $user->setDMS($dms);
+            $this->assertFalse($user->setAdmin());
+        } else {
+            $this->markTestSkipped(
+                'This test is not applicable for SeedDMS 6.'
+            );
+        }
+    }
+
+    /**
+     * Test method getQuota() and setQuota()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetQuota()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $quota = $user->getQuota();
+        $ret = $user->setQuota(100000);
+        $this->assertTrue($ret);
+        $quota = $user->getQuota();
+        $this->assertEquals(100000, $quota);
+        /* Setting a non numeric or negative value will fail */
+        $ret = $user->setQuota('foo');
+        $this->assertFalse($ret);
+        $ret = $user->setQuota(-100);
+        $this->assertFalse($ret);
+    }
+
+    /**
+     * Test method setQuota()
+     *
+     * @return void
+     */
+    public function testSetQuotaSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `quota`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setQuota(10000));
+    }
+
+    /**
+     * Test method getSecret() and setSecret()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetSecret()
+    {
+        if(self::$dbversion['major'] < 6) {
+            $this->markTestSkipped(
+                'This test is not applicable for SeedDMS 5.'
+            );
+        } else {
+            $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+            $secret = $user->getSecret();
+            $ret = $user->setSecret('secret');
+            $this->assertTrue($ret);
+            $secret = $user->getSecret();
+            $this->assertEquals('secret', $secret);
+        }
+    }
+
+    /**
+     * Test method setSecret()
+     *
+     * @return void
+     */
+    public function testSetSecretSqlFail()
+    {
+        if(self::$dbversion['major'] < 6) {
+            $this->markTestSkipped(
+                'This test is not applicable for SeedDMS 5.'
+            );
+        } else {
+            $user = $this->getAdminUser();
+            $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+            $db->expects($this->once())
+                ->method('getResult')
+                ->with($this->stringContains("UPDATE `tblUsers` SET `secret`"))
+                ->willReturn(false);
+            $dms = new SeedDMS_Core_DMS($db, '');
+            $user->setDMS($dms);
+            $this->assertFalse($user->setSecret('secret'));
+        }
+    }
+
+    /**
+     * Test method isHidden() and setHidden()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testIsAndSetHidden()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $ishidden = $user->isHidden();
+        /* set hidden to true */
+        $ret = $user->setHidden(true);
+        $this->assertTrue($ret);
+        $ishidden = $user->isHidden();
+        $this->assertTrue($ishidden);
+        /* set hidden to false */
+        $ret = $user->setHidden(false);
+        $this->assertTrue($ret);
+        $ishidden = $user->isHidden();
+        $this->assertFalse($ishidden);
+    }
+
+    /**
+     * Test method setHidden()
+     *
+     * @return void
+     */
+    public function testSetHiddentSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `hidden`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setHidden(true));
+    }
+
+    /**
+     * Test method isDisabled() and setDisabled()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testIsAndSetDisabled()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $isdisabled = $user->isDisabled();
+        /* set disabled to true */
+        $ret = $user->setDisabled(true);
+        $this->assertTrue($ret);
+        $isdisabled = $user->isDisabled();
+        $this->assertTrue($isdisabled);
+        /* set disabled to false */
+        $ret = $user->setDisabled(false);
+        $this->assertTrue($ret);
+        $isdisabled = $user->isDisabled();
+        $this->assertFalse($isdisabled);
+    }
+
+    /**
+     * Test method setDisabled()
+     *
+     * @return void
+     */
+    public function testSetDisabledtSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `disabled`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setDisabled(true));
+    }
+
+    /**
+     * Test method addLoginFailure()
+     *
+     * @return void
+     */
+    public function testAddLoginFailure()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->exactly(2))
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `loginfailures`"))
+            ->willReturn(true);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertEquals(1, $user->addLoginFailure());
+        $this->assertEquals(2, $user->addLoginFailure());
+    }
+
+    /**
+     * Test method addLoginFailure()
+     *
+     * @return void
+     */
+    public function testAddLoginFailureSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `loginfailures`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->addLoginFailure());
+    }
+
+    /**
+     * Test method clearLoginFailure()
+     *
+     * @return void
+     */
+    public function testClearLoginFailure()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->exactly(2))
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `loginfailures`"))
+            ->willReturn(true);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertEquals(1, $user->addLoginFailure());
+        $this->assertEquals(true, $user->clearLoginFailures());
+    }
+
+    /**
+     * Test method clearLoginFailure()
+     *
+     * @return void
+     */
+    public function testClearLoginFailureSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `loginfailures`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->clearLoginFailures());
+    }
+
+    /**
+     * Test method setHomeFolder() and getHomeFolder()
+     *
+     * @return void
+     */
+    public function testSetAndGetHomeFolder()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `homefolder`"))
+            ->willReturn(true);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertTrue($user->setHomeFolder(1));
+        $this->assertEquals(1, $user->getHomeFolder());
+    }
+
+    /**
+     * Test method setHomeFolder()
+     *
+     * @return void
+     */
+    public function testSetHomeFolderSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResult')
+            ->with($this->stringContains("UPDATE `tblUsers` SET `homefolder`"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->setHomeFolder(1));
+    }
+
+    /**
+     * Test method getUsedDiskSpace()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetUsedDiskSpace()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $size = $user->getUsedDiskSpace();
+        $this->assertEquals(0, $size);
+    }
+
+    /**
+     * Test method getUsedDiskSpace()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetUsedDiskSpaceSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT SUM(`fileSize`) sum"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->getUsedDiskSpace());
+    }
+
+    /**
+     * Test method removeFromProcesses()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testRemoveFromProcesses()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $ret = $user->removeFromProcesses($user);
+        $this->assertTrue($ret);
+    }
+
+    /**
+     * Test method transferDocumentsFolders()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testTransferDocumentsFolders()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        self::createSimpleFolderStructureWithDocuments();
+        $newuser = self::$dms->addUser('newuser', '', 'New User', 'newuser@seeddms.org', 'en_GB', 'bootstrap', '');
+        /* Transfering documents and folders to the same user returns true */
+        $ret = $user->transferDocumentsFolders($user);
+        $this->assertTrue($ret);
+        /* A subfolder still belongs to $user */
+        $subfolder = self::$dms->getFolder(2);
+        $this->assertEquals($user->getId(), $subfolder->getOwner()->getId());
+        /* A document still belongs to $user */
+        $document = self::$dms->getDocument(1);
+        $this->assertEquals($user->getId(), $document->getOwner()->getId());
+        /* Transfer the documents and folders to $newuser */
+        $ret = $user->transferDocumentsFolders($newuser);
+        $this->assertTrue($ret);
+        /* Get the folder again, because the owner has changed */
+        $subfolder = self::$dms->getFolder(2);
+        $this->assertEquals($newuser->getId(), $subfolder->getOwner()->getId());
+        /* Get the document again, because the owner has changed */
+        $document = self::$dms->getDocument(1);
+        $this->assertEquals($newuser->getId(), $document->getOwner()->getId());
+    }
+
+    /**
+     * Test method remove()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testRemove()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        self::createSimpleFolderStructureWithDocuments();
+        $newuser = self::$dms->addUser('newuser', '', 'New User', 'newuser@seeddms.org', 'en_GB', 'bootstrap', '');
+        /* removing a user without passed a new user for docs and folders will fail */
+        $ret = $user->remove($newuser, null);
+        $this->assertFalse($ret);
+
+        $ret = $user->remove($newuser, $newuser);
+        $this->assertTrue($ret);
+
+        /* all documents and folders now belong to $newuser */
+        $document = self::$dms->getDocument(1);
+        $this->assertEquals($newuser->getId(), $document->getOwner()->getId());
+        $subfolder = self::$dms->getFolder(1);
+        $this->assertEquals($newuser->getId(), $subfolder->getOwner()->getId());
+    }
+
+    /**
+     * Test method getDocuments()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocuments()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $documents = $user->getDocuments();
+        $this->assertIsArray($documents);
+        $this->assertCount(0, $documents);
+    }
+
+    /**
+     * Test method getDocumentsLocked()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentsLocked()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $documents = $user->getDocumentsLocked();
+        $this->assertIsArray($documents);
+        $this->assertCount(0, $documents);
+    }
+
+    /**
+     * Test method getDocumentLinks()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentLinks()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $links = $user->getDocumentLinks();
+        $this->assertIsArray($links);
+        $this->assertCount(0, $links);
+    }
+
+    /**
+     * Test method getDocumentFiles()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentFiles()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $files = $user->getDocumentFiles();
+        $this->assertIsArray($files);
+        $this->assertCount(0, $files);
+    }
+
+    /**
+     * Test method getDocumentContents()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetDocumentContents()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $contents = $user->getDocumentContents();
+        $this->assertIsArray($contents);
+        $this->assertCount(0, $contents);
+    }
+
+    /**
+     * Test method getFolders()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetFolders()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $folders = $user->getFolders();
+        $this->assertIsArray($folders);
+        $this->assertCount(1, $folders);
+    }
+
+    /**
+     * Test method getReviewStatus()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetReviewStatus()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $status = $user->getReviewStatus();
+        $this->assertIsArray($status);
+        $this->assertCount(2, $status);
+        $this->assertCount(0, $status['indstatus']);
+        $this->assertCount(0, $status['grpstatus']);
+    }
+
+    /**
+     * Test method getApprovalStatus()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetApprovalStatus()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $status = $user->getApprovalStatus();
+        $this->assertIsArray($status);
+        $this->assertCount(2, $status);
+        $this->assertCount(0, $status['indstatus']);
+        $this->assertCount(0, $status['grpstatus']);
+    }
+
+    /**
+     * Test method getWorkflowStatus()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetWorkflowStatus()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $status = $user->getWorkflowStatus();
+        $this->assertIsArray($status);
+        $this->assertCount(2, $status);
+        $this->assertCount(0, $status['u']);
+        $this->assertCount(0, $status['g']);
+    }
+
+    /**
+     * Test method getWorkflowsInvolved()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetWorkflowsInvolved()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $workflows = $user->getWorkflowsInvolved();
+        $this->assertIsArray($workflows);
+        $this->assertCount(0, $workflows);
+    }
+
+    /**
+     * Test method getMandatoryReviewers()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetMandatoryReviewers()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $reviewers = $user->getMandatoryReviewers();
+        $this->assertIsArray($reviewers);
+        $this->assertCount(0, $reviewers);
+    }
+
+    /**
+     * Test method setMandatoryReviewer()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetMandatoryReviewer()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $newuser = self::$dms->addUser('newuser', '', 'New User', 'newuser@seeddms.org', 'en_GB', 'bootstrap', '');
+        $ret = $user->setMandatoryReviewer($newuser->getId(), false);
+        $this->assertTrue($ret);
+        $reviewers = $user->getMandatoryReviewers();
+        $this->assertIsArray($reviewers);
+        $this->assertCount(1, $reviewers);
+        /* $newuser is now a mandatory user of $user */
+        $mandatoryreviewers = $newuser->isMandatoryReviewerOf();
+        $this->assertIsArray($mandatoryreviewers);
+        $this->assertCount(1, $mandatoryreviewers);
+        $this->assertEquals($user->getId(), $mandatoryreviewers[0]->getId());
+
+        $group = self::$dms->addGroup('Group', '');
+        $ret = $user->setMandatoryReviewer($group->getId(), true);
+        $this->assertTrue($ret);
+        $reviewers = $user->getMandatoryReviewers();
+        $this->assertIsArray($reviewers);
+        $this->assertCount(2, $reviewers);
+        /* FIXME: there is not isMandatoryReviewerOf() for groups */
+    }
+
+    /**
+     * Test method getMandatoryApprovers()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetMandatoryApprovers()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $approvers = $user->getMandatoryApprovers();
+        $this->assertIsArray($approvers);
+        $this->assertCount(0, $approvers);
+    }
+
+    /**
+     * Test method setMandatoryApprover()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetMandatoryApprover()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $newuser = self::$dms->addUser('newuser', '', 'New User', 'newuser@seeddms.org', 'en_GB', 'bootstrap', '');
+        $ret = $user->setMandatoryApprover($newuser->getId(), false);
+        $this->assertTrue($ret);
+        $approvers = $user->getMandatoryApprovers();
+        $this->assertIsArray($approvers);
+        $this->assertCount(1, $approvers);
+        /* $newuser is now a mandatory user of $user */
+        $mandatoryapprovers = $newuser->isMandatoryApproverOf();
+        $this->assertIsArray($mandatoryapprovers);
+        $this->assertCount(1, $mandatoryapprovers);
+        $this->assertEquals($user->getId(), $mandatoryapprovers[0]->getId());
+
+        $group = self::$dms->addGroup('Group', '');
+        $ret = $user->setMandatoryApprover($group->getId(), true);
+        $this->assertTrue($ret);
+        $approvers = $user->getMandatoryApprovers();
+        $this->assertIsArray($approvers);
+        $this->assertCount(2, $approvers);
+        /* FIXME: there is not isMandatoryApproverOf() for groups */
+    }
+
+    /**
+     * Test method setMandatoryWorkflow()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetMandatoryWorkflow()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $approver = self::$dms->addUser('approver', '', 'Approver', 'newuser@seeddms.org', 'en_GB', 'bootstrap', '');
+        $reviewer = self::$dms->addUser('reviewer', '', 'Reviewer', 'newuser@seeddms.org', 'en_GB', 'bootstrap', '');
+        $simpleworkflow = self::createSimpleWorkflow($approver);
+        $traditionalworkflow = self::createWorkflow($reviewer, $approver);
+        $newuser = self::$dms->addUser('newuser', '', 'New User', 'newuser@seeddms.org', 'en_GB', 'bootstrap', '');
+        /* Set a single mandatory workflow */
+        $ret = $newuser->setMandatoryWorkflow($simpleworkflow);
+        $this->assertTrue($ret);
+        $workflows = $newuser->getMandatoryWorkflows();
+        $this->assertIsArray($workflows);
+        $this->assertCount(1, $workflows);
+
+        /* Set a single mandatory workflow will add it to the list of workflows */
+        $ret = $newuser->setMandatoryWorkflow($traditionalworkflow);
+        $this->assertTrue($ret);
+        $workflows = $newuser->getMandatoryWorkflows();
+        $this->assertIsArray($workflows);
+        $this->assertCount(2, $workflows);
+
+        /* Set a single mandatory workflow with setMandatoryWorkflows() will delete
+         * all existing workflows and set a new list of workflows
+         */
+        $ret = $newuser->setMandatoryWorkflows([$simpleworkflow]);
+        $this->assertTrue($ret);
+        $workflows = $newuser->getMandatoryWorkflows();
+        $this->assertIsArray($workflows);
+        $this->assertCount(1, $workflows);
+
+        /* Set several mandatory workflows will delete all existing workflows
+         * and set new workflows.
+         */
+        $ret = $newuser->setMandatoryWorkflows([$simpleworkflow, $traditionalworkflow]);
+        $this->assertTrue($ret);
+        $workflows = $newuser->getMandatoryWorkflows();
+        $this->assertIsArray($workflows);
+        $this->assertCount(2, $workflows);
+
+        /* Setting an empty list will delete all mandatory workflows */
+        $ret = $newuser->setMandatoryWorkflows([]);
+        $this->assertTrue($ret);
+        $workflows = $newuser->getMandatoryWorkflows();
+        $this->assertNull($workflows);
+    }
+
+    /**
+     * Test method getMandatoryWorkflow()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetMandatoryWorkflow()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $workflow = $user->getMandatoryWorkflow();
+        $this->assertNull($workflow);
+    }
+
+    /**
+     * Test method getMandatoryWorkflows()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetMandatoryWorkflows()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $workflow = $user->getMandatoryWorkflows();
+        $this->assertNull($workflow);
+    }
+
+    /**
+     * Test method getGroups()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetGroups()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $groups = $user->getGroups();
+        $this->assertIsArray($groups);
+        $this->assertCount(0, $groups);
+        $group = self::$dms->addGroup('Group', '');
+        $ret = $user->joinGroup($group);
+        $this->assertTrue($ret);
+        /* Adding the user a twice to a group will fail */
+        $ret = $user->joinGroup($group);
+        $this->assertFalse($ret);
+        /* user now belongs to two groups */
+        $groups = $user->getGroups();
+        $this->assertIsArray($groups);
+        $this->assertCount(1, $groups);
+        /* Leave the group */
+        $ret = $user->leaveGroup($group);
+        $this->assertTrue($ret);
+        /* Leave the group again will fail */
+        $ret = $user->leaveGroup($group);
+        $this->assertFalse($ret);
+        /* the user is no longer in any group */
+        $groups = $user->getGroups();
+        $this->assertIsArray($groups);
+        $this->assertCount(0, $groups);
+    }
+
+    /**
+     * Test method hasImage()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testHasImage()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $image = $user->hasImage();
+        $this->assertFalse($image);
+    }
+
+    /**
+     * Test method hasImage()
+     *
+     * @return void
+     */
+    public function testHasImageSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT COUNT(*) AS num FROM `tblUserImages` WHERE"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->hasImage());
+    }
+
+    /**
+     * Test method getImage()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetImage()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $image = $user->getImage();
+        $this->assertNull($image);
+    }
+
+    /**
+     * Test method getImage()
+     *
+     * @return void
+     */
+    public function testGetImageSqlFail()
+    {
+        $user = $this->getAdminUser();
+        $db = $this->createMock(SeedDMS_Core_DatabaseAccess::class);
+        $db->expects($this->once())
+            ->method('getResultArray')
+            ->with($this->stringContains("SELECT * FROM `tblUserImages` WHERE"))
+            ->willReturn(false);
+        $dms = new SeedDMS_Core_DMS($db, '');
+        $user->setDMS($dms);
+        $this->assertFalse($user->getImage());
+    }
+
+    /**
+     * Test method setImage()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testSetImage()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $file = self::createTempFile(200);
+        $ret = $user->setImage($file, 'text/plain');
+        $this->assertTrue(SeedDMS_Core_File::removeFile($file));
+        $this->assertTrue($ret);
+        $ret = $user->hasImage();
+        $this->assertTrue($ret);
+        $image = $user->getImage();
+        $this->assertIsArray($image);
+        $this->assertEquals('text/plain', $image['mimeType']);
+    }
+
+    /**
+     * Test method delMandatoryReviewers()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testDelMandatoryReviewers()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $ret = $user->delMandatoryReviewers();
+        $this->assertTrue($ret);
+    }
+
+    /**
+     * Test method delMandatoryApprovers()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testDelMandatoryApprovers()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $ret = $user->delMandatoryApprovers();
+        $this->assertTrue($ret);
+    }
+
+    /**
+     * Test method delMandatoryWorkflow()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testDelMandatoryWorkflow()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $ret = $user->delMandatoryWorkflow();
+        $this->assertTrue($ret);
+    }
+
+    /**
+     * Test method getNotifications()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetNotifications()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $notifications = $user->getNotifications();
+        $this->assertIsArray($notifications);
+        $this->assertCount(0, $notifications);
+        $notifications = $user->getNotifications(0);
+        $this->assertIsArray($notifications);
+        $this->assertCount(0, $notifications);
+        $notifications = $user->getNotifications(1);
+        $this->assertIsArray($notifications);
+        $this->assertCount(0, $notifications);
+    }
+
+    /**
+     * Test method getKeywordCategories()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetKeywordCategories()
+    {
+        $user = SeedDMS_Core_User::getInstance(1, self::$dms);
+        $cats = $user->getKeywordCategories();
+        $this->assertIsArray($cats);
+        $this->assertCount(0, $cats);
+    }
+}
+
diff --git a/SeedDMS_Core/tests/WorkflowTest.php b/SeedDMS_Core/tests/WorkflowTest.php
new file mode 100644
index 000000000..3abe1c26d
--- /dev/null
+++ b/SeedDMS_Core/tests/WorkflowTest.php
@@ -0,0 +1,638 @@
+<?php
+/**
+ * Implementation of the workflow tests
+ *
+ * PHP version 7
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   @package_version@
+ * @link      https://www.seeddms.org
+ */
+
+use PHPUnit\Framework\SeedDmsTest;
+
+/**
+ * Group test class
+ *
+ * @category  SeedDMS
+ * @package   Tests
+ * @author    Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright 2021 Uwe Steinmann
+ * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @version   Release: @package_version@
+ * @link      https://www.seeddms.org
+ */
+class WorkflowTest extends SeedDmsTest
+{
+
+    /**
+     * Create a real sqlite database in memory
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        self::$dbh = self::createInMemoryDatabase();
+        self::$contentdir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'phpunit-'.time();
+        mkdir(self::$contentdir);
+        //      echo "Creating temp content dir: ".self::$contentdir."\n";
+        self::$dms = new \SeedDMS_Core_DMS(self::$dbh, self::$contentdir);
+        self::$dbversion = self::$dms->getDBVersion();
+    }
+
+    /**
+     * Clean up at tear down
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        self::$dbh = null;
+        //      echo "\nRemoving temp. content dir: ".self::$contentdir."\n";
+        exec('rm -rf '.self::$contentdir);
+    }
+
+    /**
+     * Test method getInitState() and setInitState()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetInitState()
+    {
+        $ws_nr = self::$dms->addWorkflowState('needs review', S_IN_WORKFLOW);
+        $ws_na = self::$dms->addWorkflowState('needs approval', S_IN_WORKFLOW);
+        $workflow = self::$dms->addWorkflow('traditional workflow', $ws_nr);
+        $initstate = $workflow->getInitState();
+        $this->assertEquals($ws_nr->getName(), $initstate->getName());
+        $ret = $workflow->setInitState($ws_na);
+        $this->assertTrue($ret);
+        $initstate = $workflow->getInitState();
+        $this->assertEquals($ws_na->getName(), $initstate->getName());
+    }
+
+    /**
+     * Test method getName() and setName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetStateName()
+    {
+        $state = self::$dms->addWorkflowState('needs review', S_IN_WORKFLOW);
+        $name = $state->getName();
+        $this->assertEquals('needs review', $name);
+        $ret = $state->setName('foobar');
+        $this->assertTrue($ret);
+        $name = $state->getName();
+        $this->assertEquals('foobar', $name);
+    }
+
+    /**
+     * Test method getName() and setName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetActionName()
+    {
+        $action = self::$dms->addWorkflowAction('action');
+        $name = $action->getName();
+        $this->assertEquals('action', $name);
+        $ret = $action->setName('foobar');
+        $this->assertTrue($ret);
+        $name = $action->getName();
+        $this->assertEquals('foobar', $name);
+    }
+
+    /**
+     * Test method getName() and setName()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetWorkflowName()
+    {
+        $ws_nr = self::$dms->addWorkflowState('needs review', S_IN_WORKFLOW);
+        $workflow = self::$dms->addWorkflow('traditional workflow', $ws_nr);
+        $name = $workflow->getName();
+        $this->assertEquals('traditional workflow', $name);
+        $ret = $workflow->setName('foo');
+        $this->assertTrue($ret);
+        $name = $workflow->getName();
+        $this->assertEquals('foo', $name);
+    }
+
+    /**
+     * Test method getDocumentStatus() and setDocumentStatus()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testGetAndSetDocumentStatus()
+    {
+        $state = self::$dms->addWorkflowState('some name', S_RELEASED);
+        $docstatus = $state->getDocumentStatus();
+        $this->assertEquals(S_RELEASED, $docstatus);
+        $ret = $state->setDocumentStatus(S_REJECTED);
+        $this->assertTrue($ret);
+        $docstatus = $state->getDocumentStatus();
+        $this->assertEquals(S_REJECTED, $docstatus);
+    }
+
+    /**
+     * Test method workflow->remove()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testCreateAndRemoveWorkflow()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertIsObject($user);
+
+        /* Add a new user who will be the reviewer */
+        $reviewer = self::$dms->addUser('reviewer', 'reviewer', 'Reviewer One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($reviewer);
+
+        /* Add a new user who will be the approver */
+        $approver = self::$dms->addUser('approver', 'approver', 'Approver One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($approver);
+
+        $workflow = self::createWorkflow($reviewer, $approver);
+        $this->assertIsObject($workflow);
+
+        $ret = $workflow->remove();
+        $this->assertTrue($ret);
+
+        $states = self::$dms->getAllWorkflowStates();
+        $this->assertIsArray($states);
+        $this->assertCount(4, $states);
+        foreach($states as $state)
+          $this->assertFalse($state->isUsed());
+
+        $actions = self::$dms->getAllWorkflowActions();
+        $this->assertIsArray($actions);
+        $this->assertCount(3, $actions);
+        foreach($actions as $action)
+          $this->assertFalse($action->isUsed());
+
+    }
+
+    /**
+     * Test method remove()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testCreateAndRemoveAction()
+    {
+        $action = self::$dms->addWorkflowAction('action');
+        $this->assertIsObject($action);
+        $actions = self::$dms->getAllWorkflowActions();
+        $this->assertIsArray($actions);
+        $this->assertCount(1, $actions);
+        $ret = $action->remove();
+        $this->assertTrue($ret);
+        $actions = self::$dms->getAllWorkflowActions();
+        $this->assertIsArray($actions);
+        $this->assertCount(0, $actions);
+    }
+
+    /**
+     * Test method remove()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testCreateAndRemoveState()
+    {
+        $state = self::$dms->addWorkflowState('needs review', S_IN_WORKFLOW);
+        $this->assertIsObject($state);
+        $states = self::$dms->getAllWorkflowStates();
+        $this->assertIsArray($states);
+        $this->assertCount(1, $states);
+        $ret = $state->remove();
+        $this->assertTrue($ret);
+        $states = self::$dms->getAllWorkflowStates();
+        $this->assertIsArray($states);
+        $this->assertCount(0, $states);
+    }
+
+    /**
+     * Test method setWorkflow(), getWorkflow(), getWorkflowState()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testAssignWorkflow()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertIsObject($user);
+
+        /* Add a new user who will be the reviewer */
+        $reviewer = self::$dms->addUser('reviewer', 'reviewer', 'Reviewer One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($reviewer);
+
+        /* Add a new user who will be the approver */
+        $approver = self::$dms->addUser('approver', 'approver', 'Approver One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($approver);
+
+        $workflow = self::createWorkflow($reviewer, $approver);
+        $this->assertIsObject($workflow);
+
+        /* Check for cycles */
+        $cycles = $workflow->checkForCycles();
+        $this->assertFalse($cycles);
+
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $content = $document->getLatestContent();
+        $this->assertIsObject($content);
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_RELEASED, $status['status']);
+
+        /* Assign the workflow */
+        $ret = $content->setWorkflow($workflow, $user);
+        $this->assertTrue($ret);
+
+        /* Assign a workflow again causes an error */
+        $ret = $content->setWorkflow($workflow, $user);
+        $this->assertFalse($ret);
+
+        /* Get a fresh copy of the content from the database and get the workflow */
+        $again = self::$dms->getDocumentContent($content->getId());
+        $this->assertIsObject($again);
+        $w = $again->getWorkflow();
+        $this->assertEquals($workflow->getId(), $w->getId());
+
+        /* Status of content should be S_IN_WORKFLOW now */
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_IN_WORKFLOW, $status['status']);
+
+        /* Get current workflow state */
+        $state = $content->getWorkflowState();
+        $this->assertEquals('needs review', $state->getName());
+
+        $workflowlog = $content->getWorkflowLog();
+        $this->assertIsArray($workflowlog);
+        $this->assertCount(0, $workflowlog);
+
+        /* The workflow has altogether 4 states */
+        $states = $workflow->getStates();
+        $this->assertIsArray($states);
+        $this->assertCount(4, $states);
+
+        /* Check the initial state */
+        $initstate = $workflow->getInitState();
+        $this->assertEquals('needs review', $initstate->getName());
+
+        /* init state is definitely used */
+        $ret = $initstate->isUsed();
+        $this->assertTrue($ret);
+
+        /* init state has two transistions linked to it */
+        $transitions = $initstate->getTransitions();
+        $this->assertIsArray($transitions);
+        $this->assertCount(2, $transitions);
+
+        /* Check if workflow is used by any document */
+        $isused = $workflow->isUsed();
+        $this->assertTrue($isused);
+
+    }
+
+    /**
+     * Test method setWorkflow(), getWorkflow(), getWorkflowState()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testStepThroughWorkflow()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertIsObject($user);
+
+        /* Add a new user who will be the reviewer */
+        $reviewer = self::$dms->addUser('reviewer', 'reviewer', 'Reviewer One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($reviewer);
+
+        /* Add a new user who will be the approver */
+        $approver = self::$dms->addUser('approver', 'approver', 'Approver One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($approver);
+
+        $workflow = self::createWorkflow($reviewer, $approver);
+
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $content = $document->getLatestContent();
+        $this->assertIsObject($content);
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_RELEASED, $status['status']);
+
+        /* Assign the workflow */
+        $ret = $content->setWorkflow($workflow, $user);
+        $this->assertTrue($ret);
+
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_IN_WORKFLOW, $status['status']);
+
+        /* Remove the workflow */
+        $ret = $content->removeWorkflow($user);
+        $this->assertTrue($ret);
+
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_RELEASED, $status['status']);
+
+        /* Remove the workflow again is just fine */
+        $ret = $content->removeWorkflow($user);
+        $this->assertTrue($ret);
+
+        /* Assign the workflow again */
+        $ret = $content->setWorkflow($workflow, $user);
+        $this->assertTrue($ret);
+
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_IN_WORKFLOW, $status['status']);
+
+
+        /* Check if workflow needs action by the reviewer/approver */
+        $ret = $content->needsWorkflowAction($reviewer);
+        $this->assertTrue($ret);
+        $ret = $content->needsWorkflowAction($approver);
+        $this->assertFalse($ret);
+
+        /* Get current workflow state*/
+        $state = $content->getWorkflowState();
+        $this->assertEquals('needs review', $state->getName());
+
+        /* There should be two possible transitions now
+         * NR -- review -> NA
+         * NR -- reject -> RJ
+         */
+        $nexttransitions = $workflow->getNextTransitions($state);
+        $this->assertIsArray($nexttransitions);
+        $this->assertCount(2, $nexttransitions);
+
+        /* But of course, there were no previous transitions */
+        $prevtransitions = $workflow->getPreviousTransitions($state);
+        $this->assertIsArray($prevtransitions);
+        $this->assertCount(0, $prevtransitions);
+
+        /* Check if reviewer is allowed to trigger the transition.
+         * As we are still in the intitial state, the possible transitions
+         * may both be triggered by the reviewer but not by the approver.
+         */
+        foreach($nexttransitions as $nexttransition) {
+            if($nexttransition->getNextState()->getDocumentStatus() == S_REJECTED)
+                $rejecttransition = $nexttransition;
+            elseif($nexttransition->getNextState()->getDocumentStatus() == S_IN_WORKFLOW)
+                $reviewtransition = $nexttransition;
+            $ret = $content->triggerWorkflowTransitionIsAllowed($reviewer, $nexttransition);
+            $this->assertTrue($ret);
+            $ret = $content->triggerWorkflowTransitionIsAllowed($approver, $nexttransition);
+            $this->assertFalse($ret);
+        }
+
+        /* Trigger the successful review transition.
+         * As there is only one reviewer the transition will fire and the workflow
+         * moves forward into the next state. triggerWorkflowTransition() returns the
+         * next state.
+         */
+        $nextstate = $content->triggerWorkflowTransition($reviewer, $reviewtransition, 'Review succeeded');
+        $this->assertIsObject($nextstate);
+        $this->assertEquals('needs approval', $nextstate->getName());
+
+        $state = $content->getWorkflowState();
+        $this->assertEquals($nextstate->getId(), $state->getId());
+        $this->assertEquals('needs approval', $state->getName());
+
+        /* The workflow log has one entry now */
+        $workflowlog = $content->getLastWorkflowLog();
+        $this->assertIsObject($workflowlog);
+        $this->assertEquals('Review succeeded', $workflowlog->getComment());
+
+        /* There should be two possible transitions now
+         * NA -- approve -> RL
+         * NA -- reject -> RJ
+         */
+        $nexttransitions = $workflow->getNextTransitions($state);
+        $this->assertIsArray($nexttransitions);
+        $this->assertCount(2, $nexttransitions);
+
+        /* But of course, there is one previous transitions, the one that led to
+         * the current state of the workflow.
+         */
+        $prevtransitions = $workflow->getPreviousTransitions($state);
+        $this->assertIsArray($prevtransitions);
+        $this->assertCount(1, $prevtransitions);
+        $this->assertEquals($reviewtransition->getId(), $prevtransitions[0]->getId());
+
+        /* Check if approver is allowed to trigger the transition.
+         * As we are now in 'needs approval' state, the possible transitions
+         * may both be triggered by the approver but not by the reviewer.
+         */
+        foreach($nexttransitions as $nexttransition) {
+            if($nexttransition->getNextState()->getDocumentStatus() == S_REJECTED)
+                $rejecttransition = $nexttransition;
+            elseif($nexttransition->getNextState()->getDocumentStatus() == S_RELEASED)
+                $releasetransition = $nexttransition;
+            $ret = $content->triggerWorkflowTransitionIsAllowed($approver, $nexttransition);
+            $this->assertTrue($ret);
+            $ret = $content->triggerWorkflowTransitionIsAllowed($reviewer, $nexttransition);
+            $this->assertFalse($ret);
+        }
+
+        /* Trigger the successful approve transition.
+         * As there is only one approver the transition will fire and the workflow
+         * moves forward into the next state. triggerWorkflowTransition() returns the
+         * next state.
+         */
+        $nextstate = $content->triggerWorkflowTransition($approver, $releasetransition, 'Approval succeeded');
+        $this->assertIsObject($nextstate);
+        $this->assertEquals('released', $nextstate->getName());
+
+        /* The workflow log has two entries now */
+        $workflowlog = $content->getLastWorkflowLog();
+        $this->assertIsObject($workflowlog);
+        $this->assertEquals('Approval succeeded', $workflowlog->getComment());
+
+        /* Because the workflow has reached a final state, the workflow will no
+         * longer be attached to the document.
+         */
+        $workflow = $content->getWorkflow();
+        $this->assertFalse($workflow);
+
+        /* There is also no way to get the state anymore */
+        $state = $content->getWorkflowState();
+        $this->assertFalse($state);
+
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_RELEASED, $status['status']);
+
+        /* Even after the workflow has been finished the log can still be retrieved */
+        $workflowlog = $content->getLastWorkflowLog();
+        $this->assertIsObject($workflowlog);
+        $this->assertEquals('Approval succeeded', $workflowlog->getComment());
+    }
+
+    /**
+     * Test method rewindWorkflow()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testRewindWorkflow()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertIsObject($user);
+
+        /* Add a new user who will be the reviewer */
+        $reviewer = self::$dms->addUser('reviewer', 'reviewer', 'Reviewer One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($reviewer);
+
+        /* Add a new user who will be the approver */
+        $approver = self::$dms->addUser('approver', 'approver', 'Approver One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($approver);
+
+        $workflow = self::createWorkflow($reviewer, $approver);
+
+        /* Add a new document */
+        $document = self::createDocument($rootfolder, $user, 'Document 1');
+        $content = $document->getLatestContent();
+        $this->assertIsObject($content);
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_RELEASED, $status['status']);
+
+        /* Assign the workflow */
+        $ret = $content->setWorkflow($workflow, $user);
+        $this->assertTrue($ret);
+
+        $status = $content->getStatus();
+        $this->assertIsArray($status);
+        $this->assertEquals(S_IN_WORKFLOW, $status['status']);
+
+        /* Check if workflow needs action by the reviewer */
+        $ret = $content->needsWorkflowAction($reviewer);
+        $this->assertTrue($ret);
+
+        /* Get current workflow state*/
+        $state = $content->getWorkflowState();
+        $this->assertEquals('needs review', $state->getName());
+
+        /* There should be two possible transitions now
+         * NR -- review -> NA
+         * NR -- reject -> RJ
+         */
+        $nexttransitions = $workflow->getNextTransitions($state);
+        $this->assertIsArray($nexttransitions);
+        $this->assertCount(2, $nexttransitions);
+
+        /* Check if reviewer is allowed to trigger the transition.
+         * As we are still in the intitial state, the possible transitions
+         * may both be triggered by the reviewer but not by the approver.
+         */
+        foreach($nexttransitions as $nexttransition) {
+            if($nexttransition->getNextState()->getDocumentStatus() == S_IN_WORKFLOW)
+                $reviewtransition = $nexttransition;
+        }
+
+        /* Trigger the successful review transition.
+         * As there is only one reviewer the transition will fire and the workflow
+         * moves forward into the next state. triggerWorkflowTransition() returns the
+         * next state.
+         */
+        $nextstate = $content->triggerWorkflowTransition($reviewer, $reviewtransition, 'Review succeeded');
+        $this->assertIsObject($nextstate);
+        $this->assertEquals('needs approval', $nextstate->getName());
+
+        /* Get current workflow state*/
+        $state = $content->getWorkflowState();
+        $this->assertEquals('needs approval', $state->getName());
+
+        /* The workflow log has one entry now */
+        $workflowlogs = $content->getWorkflowLog();
+        $this->assertIsArray($workflowlogs);
+        $this->assertCount(1, $workflowlogs);
+        if(self::$dbversion['major'] > 5)
+            $this->assertEquals('Review succeeded', $workflowlogs[1][0]->getComment());
+        else
+            $this->assertEquals('Review succeeded', $workflowlogs[0]->getComment());
+
+        $ret = $content->rewindWorkflow();
+        $this->assertTrue($ret);
+
+        /* After rewinding the workflow the initial state is set ... */
+        $state = $content->getWorkflowState();
+        $this->assertEquals('needs review', $state->getName());
+
+        /* and the workflow log has been cleared */
+        $workflowlogs = $content->getWorkflowLog();
+        $this->assertIsArray($workflowlogs);
+        $this->assertCount(0, $workflowlogs);
+    }
+
+    /**
+     * Test method getTransitionsByStates()
+     *
+     * This method uses a real in memory sqlite3 database.
+     *
+     * @return void
+     */
+    public function testTransitionsByStateWorkflow()
+    {
+        $rootfolder = self::$dms->getRootFolder();
+        $user = self::$dms->getUser(1);
+        $this->assertIsObject($user);
+
+        /* Add a new user who will be the reviewer */
+        $reviewer = self::$dms->addUser('reviewer', 'reviewer', 'Reviewer One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($reviewer);
+
+        /* Add a new user who will be the approver */
+        $approver = self::$dms->addUser('approver', 'approver', 'Approver One', 'user1@seeddms.org', 'en_GB', 'bootstrap', '');
+        $this->assertIsObject($approver);
+
+        $workflow = self::createWorkflow($reviewer, $approver);
+
+        /* Check the initial state */
+        $initstate = $workflow->getInitState();
+        $this->assertEquals('needs review', $initstate->getName());
+
+        /* init state has two transistions linked to it */
+        $transitions = $initstate->getTransitions();
+        $this->assertIsArray($transitions);
+        $this->assertCount(2, $transitions);
+
+        $t = $workflow->getTransitionsByStates($initstate, $transitions[1]->getNextState());
+        $this->assertEquals($transitions[1]->getId(), $t[0]->getId());
+    }
+
+}

From 4c39fb065adf81e4b3fc1fb29f4807cc086ec5a4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 12:28:56 +0100
Subject: [PATCH 1784/2006] add composer file

---
 SeedDMS_Core/composer.json | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 SeedDMS_Core/composer.json

diff --git a/SeedDMS_Core/composer.json b/SeedDMS_Core/composer.json
new file mode 100644
index 000000000..ab2186a95
--- /dev/null
+++ b/SeedDMS_Core/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "seeddms/core",
+    "description": "Core classes to access a SeedDMS database",
+    "type": "library",
+    "license": "GPL-2.0-or-later",
+    "minimum-stability": "dev",
+    "autoload": {
+        "psr-4": {
+            "Seeddms\\Core\\": "Core/"
+        },
+        "classmap": ["Core/"]
+    },
+    "authors": [
+        {
+            "name": "Uwe Steinmann",
+            "email": "info@seeddms.org"
+        }
+    ],
+    "require-dev": {
+        "phpunit/phpunit": "^9"
+    }
+
+}

From cb1d55e413d9c0776087e34460afb7c348a08277 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 12:32:13 +0100
Subject: [PATCH 1785/2006] add all changes from 6.0.x

---
 SeedDMS_Core/CHANGELOG.md | 143 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 142 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/CHANGELOG.md b/SeedDMS_Core/CHANGELOG.md
index 8ac741064..4ac0e57c0 100644
--- a/SeedDMS_Core/CHANGELOG.md
+++ b/SeedDMS_Core/CHANGELOG.md
@@ -1,3 +1,145 @@
+6.0.22 (2022-12-10)
+---------------------
+- all changes from 5.1.29 merged
+
+6.0.21 (2022-11-18)
+---------------------
+- all changes from 5.1.28 merged
+   
+
+6.0.20 (2022-09-18)
+---------------------
+- all changes from 5.1.27 merged
+- SeedDMЅ_Core_DMS::getDocumentsInRevision() returns status from revision log
+
+6.0.19 (2022-05-20)
+---------------------
+- all changes from 5.1.26
+- removeFromProcesses() will not touch documents for which the new user does not have at least read access
+
+6.0.18 (2022-04-22)
+---------------------
+- all changes from 5.1.25
+- fix searching for document content with a custom attribute having a value set
+- SeedDMS_Core_DocumentContent::getWorkflow() has optional parameter to return data from table tblWorkflowDocumentContent
+
+6.0.17 (2021-12-11)
+---------------------
+- all changes from 5.1.24
+
+6.0.16 (2021-05-07)
+---------------------
+
+6.0.15 (2021-04-13)
+---------------------
+- add searching for revision date
+- expired documents can be skipped from counting in countTasks()
+- SeedDMS_Core_DMS::getDocumentList() uses ambiguous column name when sorting by status
+- add list type SleepingReviseByMe to SeedDMS_Core_DMS::getDocumentList()
+- parameter 2 of SeedDMS_Core_DMS::getDocumentList() is treated as number of
+  days for list DueRevisions
+
+6.0.14 (2021-01-04)
+---------------------
+better error checking in SeedDMS_Core_Document::cancelCheckOut()
+
+6.0.13 (2020-09-29)
+---------------------
+- SeedDMS_Folder_DMS::getAccessList() and getDefaultAccess() do not return fals anymore if the parent does not exists. They just stop inheritance.
+
+6.0.12 (2020-06-05)
+---------------------
+
+6.0.11 (2020-06-05)
+---------------------
+SeedDMS_Core_DMS::filterAccess() properly checks for documents
+
+6.0.10 (2020-05-22)
+---------------------
+SeedDMS_Core_DocumentContent::delRevisor() returns -4 if user has already made a revision
+
+6.0.9 (2020-05-14)
+---------------------
+- no changes, just keep same version as seeddms application
+
+6.0.8 (2020-03-02)
+---------------------
+- no changes, just keep same version as seeddms application
+
+6.0.7 (2020-02-17)
+---------------------
+SeedDMS_Core_Document::getTimeline() returns revision only for latest content
+add callback onSetStatus in SeedDMS_Core_DocumentContent::setStatus()
+add new list type 'DueRevision' in SeedDMS_Core_DMS::getDocumentList()
+a revision can also be started if some revisors have already reviewed the document
+remove a user from all its process can also be used to set a new user
+
+6.0.6 (2018-11-13)
+---------------------
+SeedDMS_Core_Folder::addContent() uses currently logged in user as uploader instead of owner
+SeedDMS_Core_DocumentContent::verifyStatus() will not set status to S_RELEASED
+if currently in S_DRAFT status und no workflow, review, approval, or revision
+is pending.
+
+6.0.5 (2018-02-27)
+---------------------
+add list 'NeedsCorrectionOwner' to SeedDMS_Core_DMS::getDocumentList()
+
+6.0.4 (2018-02-14)
+---------------------
+add lists of drafts and obsolete docs in SeedDMS_Core_DMS::getDocumentList()
+add fast sql statement to SeedDMS_Core_Document::getReceiptStatus() if limit=1
+add callback onCheckAccessDocument to SeedDMS_Core_Document::getAccessMode()
+add new document status 'needs correction' (S_NEEDS_CORRECTION)
+do not use views as a replacement for temp. tables anymore, because they are much
+slower.
+add SeedDMS_Core_DocumentContent::getInstance()
+
+6.0.3 (2018-01-23)
+---------------------
+pass 0 as default to getObjects()
+SeedDMS_Core_AttributeDefinition::getStatistics() returns propper values for each item in a value set
+SeedDMS_Core_DMS::getDocumentList() returns list of documents without a receiver
+
+6.0.2 (2017-12-19)
+---------------------
+- speed up getting list of locked documents
+- setting _logfile in inc.DBAccessPDO.php will log execution times in file
+- fix sql statement to create temp table ttrevisionid and ttreceiptid
+- SeedDMS_Core_DMS::noReadForStatus no longer needed
+- SeedDMS_Core_Document::checkForDueRevisionWorkflow() also checks if there
+are any waiting or pending revisions at all
+- SeedDMS_Core_User::getReverseSubstitutes() works with new roles
+- fix field name in getDocumentList() to make it work for pgsql
+- views instead of temp. tables can be used
+- ReceiveOwner list does not contain old versions anymore
+- all changes up to 5.1.5 merged
+- getTimeline() also returns data for documents with a scheduled revision
+
+6.0.1 (2017-05-28)
+---------------------
+- speed up getting list of locked documents
+- setting _logfile in inc.DBAccessPDO.php will log execution times in file
+
+6.0.0 (2017-02-28)
+---------------------
+- all changes from 5.0.14 merged
+- SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus()
+only return entries of the latest document version if not specific document and
+version is passed
+- temp. table for revisions can be created
+- new methods SeedDMS_Core_DMS::getDocumentsInReception() and
+SeedDMS_Core_DMS::getDocumentsInRevision()
+- limit hits of sql statement in SeedDMЅ_Core_DMS::getDuplicateDocumentContent() to 1000
+- finishRevsion() puts all revisors into state waiting, so a new revision can be started
+- fix SeedDMS_Core_Group::getRevisionStatus(), which did not always return the last
+log entry first
+- add roles
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+- add virtual access mode for document links and attachments plus callbacks to
+  check access mode in a hook
+- add new method SeedDMS_Core_DMS::getDocumentsExpired()
+
 5.1.29 (2022-11-21)
 ---------------------
 - SeedDMS_Core_Folder::addDocument() does rollback transaction propperly when setting document categories fail
@@ -16,7 +158,6 @@
 - add SeedDMS_Core_File::mimetype(), fix SeedDMS_Core_File::moveDir()
 - all file operations use methods of SeedDMS_Core_File
 - change namespace of iterators from SeedDMS to SeedDMS\Core
-   
 
 5.1.27 (2022-08-31)
 ---------------------

From 496bc9214dbe7ae6511639885452008736fbd0c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 16:57:34 +0100
Subject: [PATCH 1786/2006] backport some changes from 6.0.x

---
 SeedDMS_Preview/Preview/Base.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/Base.php b/SeedDMS_Preview/Preview/Base.php
index d07897b6c..9fb401ada 100644
--- a/SeedDMS_Preview/Preview/Base.php
+++ b/SeedDMS_Preview/Preview/Base.php
@@ -73,6 +73,7 @@ class SeedDMS_Preview_Base {
 			$this->previewDir = $previewDir;
 		}
 		$this->timeout = intval($timeout);
+		$this->converters = array();
 		$this->xsendfile = $xsendfile;
 		$this->conversionmgr = null;
 	} /* }}} */
@@ -154,7 +155,10 @@ class SeedDMS_Preview_Base {
 	 * and the value is the command to be called for creating the preview
 	 */
 	function setConverters($arr) { /* {{{ */
-		$this->converters = $arr;
+		if(is_array($arr))
+			$this->converters = $arr;
+		else
+			$this->converters = array();
 	} /* }}} */
 
 	/**

From 3426fa1032343b6bfd99eb87f3388b07fc141b81 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 17:01:19 +0100
Subject: [PATCH 1787/2006] fix formating of notes in preparation for creating
 a changelog.md

---
 SeedDMS_Preview/package.xml | 74 ++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index cddd83d25..d6dd7bc59 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -73,7 +73,7 @@
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
- initial version
+- initial version
    </notes>
   </release>
   <release>
@@ -89,7 +89,7 @@
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-preview image can also be created from a document file (SeedDMS_Core_DocumentFile)
+- preview image can also be created from a document file (SeedDMS_Core_DocumentFile)
    </notes>
   </release>
   <release>
@@ -105,7 +105,7 @@ preview image can also be created from a document file (SeedDMS_Core_DocumentFil
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add converters for .tar.gz, .ps, .txt
+- add converters for .tar.gz, .ps, .txt
    </notes>
   </release>
   <release>
@@ -121,7 +121,7 @@ add converters for .tar.gz, .ps, .txt
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-create fixed width image with proportional height
+- create fixed width image with proportional height
    </notes>
   </release>
   <release>
@@ -137,7 +137,7 @@ create fixed width image with proportional height
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-preview images will also be recreated if the object this image belongs is of newer date than the image itself. This happens if versions are being deleted and than a new version is uploaded. Because the new version will get the version number of the old version, it will also take over the old preview image.Comparing the creation date of the image with the object detects this case.
+- preview images will also be recreated if the object this image belongs is of newer date than the image itself. This happens if versions are being deleted and than a new version is uploaded. Because the new version will get the version number of the old version, it will also take over the old preview image.Comparing the creation date of the image with the object detects this case.
    </notes>
   </release>
   <release>
@@ -153,7 +153,7 @@ preview images will also be recreated if the object this image belongs is of new
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-command for creating the preview will be called with a given timeout
+- command for creating the preview will be called with a given timeout
    </notes>
   </release>
   <release>
@@ -169,8 +169,8 @@ command for creating the preview will be called with a given timeout
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add method getFilesize()
-timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
+- add method getFilesize()
+- timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
    </notes>
   </release>
   <release>
@@ -186,7 +186,7 @@ timeout for external commands can be passed to contructor of SeedDMS_Preview_Pre
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-check if object passed to createPreview(), hasPreview() is not null
+- check if object passed to createPreview(), hasPreview() is not null
    </notes>
   </release>
   <release>
@@ -202,7 +202,7 @@ check if object passed to createPreview(), hasPreview() is not null
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+- set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
    </notes>
   </release>
   <release>
@@ -218,7 +218,7 @@ set last parameter of stream_select() to 200000 micro sec. in case the timeout i
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-pass variables to stream_select (required by php7)
+- pass variables to stream_select (required by php7)
    </notes>
   </release>
   <release>
@@ -234,11 +234,11 @@ pass variables to stream_select (required by php7)
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add more documentation
-finish deletePreview()
-add new method deleteDocumentPreviews()
-fix calculation of timeout (Bug #269)
-check if cache dir exists before deleting it in deleteDocumentPreviews()
+- add more documentation
+- finish deletePreview()
+- add new method deleteDocumentPreviews()
+- fix calculation of timeout (Bug #269)
+- check if cache dir exists before deleting it in deleteDocumentPreviews()
    </notes>
   </release>
   <release>
@@ -254,7 +254,7 @@ check if cache dir exists before deleting it in deleteDocumentPreviews()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add new previewer which converts document to pdf instead of png
+- add new previewer which converts document to pdf instead of png
    </notes>
   </release>
   <release>
@@ -270,7 +270,7 @@ add new previewer which converts document to pdf instead of png
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-setConverters() overrides exiting converters
+- setConverters() overrides exiting converters
    </notes>
   </release>
   <release>
@@ -286,8 +286,8 @@ setConverters() overrides exiting converters
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-commands can be set for mimetypes 'xxxx/*' and '*'
-pass mimetype as parameter '%m' to converter
+- commands can be set for mimetypes 'xxxx/*' and '*'
+- pass mimetype as parameter '%m' to converter
    </notes>
   </release>
   <release>
@@ -303,7 +303,7 @@ pass mimetype as parameter '%m' to converter
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-createPreview() returns false if running the converter command fails
+- createPreview() returns false if running the converter command fails
    </notes>
   </release>
   <release>
@@ -319,7 +319,7 @@ createPreview() returns false if running the converter command fails
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-fix typo in converter for tar.gz files
+- fix typo in converter for tar.gz files
    </notes>
   </release>
   <release>
@@ -335,7 +335,7 @@ fix typo in converter for tar.gz files
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-SeedDMS_Preview_Base::hasConverter() returns only try if command is set
+- SeedDMS_Preview_Base::hasConverter() returns only try if command is set
    </notes>
   </release>
   <release>
@@ -351,8 +351,8 @@ SeedDMS_Preview_Base::hasConverter() returns only try if command is set
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-SeedDMS_Preview_Base::setConverters() overrides existing converters.
-New method SeedDMS_Preview_Base::addConverters() merges new converters with old ones.
+- SeedDMS_Preview_Base::setConverters() overrides existing converters.
+- New method SeedDMS_Preview_Base::addConverters() merges new converters with old ones.
    </notes>
   </release>
   <release>
@@ -368,9 +368,9 @@ New method SeedDMS_Preview_Base::addConverters() merges new converters with old
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add SeedDMS_Preview_Base::sendFile() as a replacement for readfile() which uses
-mod_xsendfile if available
-execWithTimeout() reads data from stderr and returns it together with stdout in array
+- add SeedDMS_Preview_Base::sendFile() as a replacement for readfile() which uses
+- mod_xsendfile if available
+- execWithTimeout() reads data from stderr and returns it together with stdout in array
    </notes>
   </release>
   <release>
@@ -386,7 +386,7 @@ execWithTimeout() reads data from stderr and returns it together with stdout in
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-preview is also created if SeedDMS_Core_DocumentContent has a child class
+- preview is also created if SeedDMS_Core_DocumentContent has a child class
    </notes>
   </release>
   <release>
@@ -402,8 +402,8 @@ preview is also created if SeedDMS_Core_DocumentContent has a child class
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-make sure list of converters is always an array
-usage of mod_sendfile can be configured
+- make sure list of converters is always an array
+- usage of mod_sendfile can be configured
    </notes>
   </release>
   <release>
@@ -419,8 +419,8 @@ usage of mod_sendfile can be configured
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
     <notes>
-new parameter for enabling/disabling xsendfile
-fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent
+- new parameter for enabling/disabling xsendfile
+- fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent
    </notes>
   </release>
   <release>
@@ -436,7 +436,7 @@ fix creation of pdf preview if document content class is not SeedDMS_Core_Docume
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add new methode getPreviewFile()
+- add new methode getPreviewFile()
    </notes>
   </release>
   <release>
@@ -452,7 +452,7 @@ add new methode getPreviewFile()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add parameter $target to SeedDMS_Preview_pdfPreviewer::hasRawPreview() and SeedDMS_Preview_pdfPreviewer::getRawPreview()
+- add parameter $target to SeedDMS_Preview_pdfPreviewer::hasRawPreview() and SeedDMS_Preview_pdfPreviewer::getRawPreview()
    </notes>
   </release>
   <release>
@@ -468,8 +468,8 @@ add parameter $target to SeedDMS_Preview_pdfPreviewer::hasRawPreview() and SeedD
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-set header Content-Length 
-update package description
+- set header Content-Length 
+- update package description
    </notes>
   </release>
   <release>

From 284d0707ccb4935efefb8cc5c43885a48c9d0a4e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 17:11:17 +0100
Subject: [PATCH 1788/2006] fix formating of notes in preparation of creating
 CHANGELOG.md

---
 SeedDMS_Lucene/package.xml    | 40 +++++++++++++++++------------------
 SeedDMS_SQLiteFTS/package.xml | 28 ++++++++++++------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index 3ccc53ec9..eeb33269a 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -59,6 +59,7 @@
  <phprelease />
  <changelog>
   <release>
+   <date>2009-04-27</date>
    <version>
     <release>0.0.1</release>
     <api>0.0.1</api>
@@ -67,7 +68,6 @@
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2009-04-27</date>
    <license uri="http://opensource.org/licenses/bsd-license">BSD License</license>
    <notes>
    </notes>
@@ -101,8 +101,8 @@
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-use a configurable list of mime type converters, fixed indexing and searching
-of special chars like german umlaute.
+- use a configurable list of mime type converters, fixed indexing and searching
+  of special chars like german umlaute.
    </notes>
   </release>
   <release>
@@ -118,7 +118,7 @@ of special chars like german umlaute.
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-catch exception if index is opened but not available
+- catch exception if index is opened but not available
    </notes>
   </release>
   <release>
@@ -134,7 +134,7 @@ catch exception if index is opened but not available
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-parse query term and catch errors before using it
+- parse query term and catch errors before using it
    </notes>
   </release>
   <release>
@@ -150,8 +150,8 @@ parse query term and catch errors before using it
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-explicitly set encoding to utf-8 when adding fields
-do not check if deleting document from index fails, update it in any case
+- explicitly set encoding to utf-8 when adding fields
+- do not check if deleting document from index fails, update it in any case
    </notes>
   </release>
   <release>
@@ -167,7 +167,7 @@ do not check if deleting document from index fails, update it in any case
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-class SeedDMS_Lucene_Search::search returns false if query is invalid instead of an empty result record
+- class SeedDMS_Lucene_Search::search returns false if query is invalid instead of an empty result record
    </notes>
   </release>
   <release>
@@ -183,8 +183,8 @@ class SeedDMS_Lucene_Search::search returns false if query is invalid instead of
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-field for original filename is treated as utf-8
-declare SeeDMS_Lucene_Indexer::open() static
+- field for original filename is treated as utf-8
+- declare SeeDMS_Lucene_Indexer::open() static
    </notes>
   </release>
   <release>
@@ -200,7 +200,7 @@ declare SeeDMS_Lucene_Indexer::open() static
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-run external commands with a timeout
+- run external commands with a timeout
    </notes>
   </release>
   <release>
@@ -216,7 +216,7 @@ run external commands with a timeout
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add command for indexing postѕcript files
+- add command for indexing postѕcript files
    </notes>
   </release>
   <release>
@@ -232,7 +232,7 @@ add command for indexing postѕcript files
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+- set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
    </notes>
   </release>
   <release>
@@ -248,8 +248,8 @@ set last parameter of stream_select() to 200000 micro sec. in case the timeout i
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-pass variables to stream_select() to fullfill strict standards.
-make all functions in Indexer.php static
+- pass variables to stream_select() to fullfill strict standards.
+- make all functions in Indexer.php static
    </notes>
   </release>
   <release>
@@ -265,7 +265,7 @@ make all functions in Indexer.php static
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-catch exception in execWithTimeout()
+- catch exception in execWithTimeout()
    </notes>
   </release>
   <release>
@@ -281,7 +281,7 @@ catch exception in execWithTimeout()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-allow conversion commands for mimetypes with wildcards
+- allow conversion commands for mimetypes with wildcards
    </notes>
   </release>
   <release>
@@ -297,7 +297,7 @@ allow conversion commands for mimetypes with wildcards
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-execWithTimeout() reads data from stderr and saves it into error msg
+- execWithTimeout() reads data from stderr and saves it into error msg
    </notes>
   </release>
   <release>
@@ -313,7 +313,7 @@ execWithTimeout() reads data from stderr and saves it into error msg
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-IndexedDocument() remembers cmd and mimetype
+- IndexedDocument() remembers cmd and mimetype
    </notes>
   </release>
   <release>
@@ -329,7 +329,7 @@ IndexedDocument() remembers cmd and mimetype
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-Index users with at least read access on the document
+- Index users with at least read access on the document
    </notes>
   </release>
   <release>
diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 3813a6252..2b7dfe0b5 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -88,7 +88,7 @@
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-initial release
+- initial release
    </notes>
   </release>
   <release>
@@ -104,7 +104,7 @@ initial release
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists
+- add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists
    </notes>
   </release>
   <release>
@@ -120,7 +120,7 @@ add __get() to SQLiteFTS_Document because class.IndexInfo.php access class varia
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-check if index exists before removing it when creating a new one
+- check if index exists before removing it when creating a new one
    </notes>
   </release>
   <release>
@@ -136,7 +136,7 @@ check if index exists before removing it when creating a new one
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add command for indexing postѕcript files
+- add command for indexing postѕcript files
    </notes>
   </release>
   <release>
@@ -152,7 +152,7 @@ add command for indexing postѕcript files
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-make it work with sqlite3 &lt; 3.8.0
+- make it work with sqlite3 &lt; 3.8.0
    </notes>
   </release>
   <release>
@@ -168,7 +168,7 @@ make it work with sqlite3 &lt; 3.8.0
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+- set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
    </notes>
   </release>
   <release>
@@ -184,7 +184,7 @@ set last parameter of stream_select() to 200000 micro sec. in case the timeout i
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-fix calculation of timeout (see bug #269)
+- fix calculation of timeout (see bug #269)
    </notes>
   </release>
   <release>
@@ -200,7 +200,7 @@ fix calculation of timeout (see bug #269)
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-catch exception in execWithTimeout()
+- catch exception in execWithTimeout()
    </notes>
   </release>
   <release>
@@ -216,7 +216,7 @@ catch exception in execWithTimeout()
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-allow conversion commands for mimetypes with wildcards
+- allow conversion commands for mimetypes with wildcards
    </notes>
   </release>
   <release>
@@ -232,7 +232,7 @@ allow conversion commands for mimetypes with wildcards
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-execWithTimeout() reads data from stderr and saves it into error msg
+- execWithTimeout() reads data from stderr and saves it into error msg
    </notes>
   </release>
   <release>
@@ -248,7 +248,7 @@ execWithTimeout() reads data from stderr and saves it into error msg
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-IndexedDocument() remembers cmd and mimetype
+- IndexedDocument() remembers cmd and mimetype
    </notes>
   </release>
   <release>
@@ -264,7 +264,7 @@ IndexedDocument() remembers cmd and mimetype
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-Set 'created' in index to creation date of indexed content (was set to current
+- Set 'created' in index to creation date of indexed content (was set to current
 timestamp)
    </notes>
   </release>
@@ -281,7 +281,7 @@ timestamp)
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-Index users with at least read access on a document
+- Index users with at least read access on a document
    </notes>
   </release>
   <release>
@@ -297,7 +297,7 @@ Index users with at least read access on a document
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
-add user to list of terms
+- add user to list of terms
    </notes>
   </release>
   <release>

From a7fd69a6b9342fd40a1b38066529d4999b7e7826 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 17:12:34 +0100
Subject: [PATCH 1789/2006] add new changelog files

---
 SeedDMS_Lucene/CHANGELOG.md    |  94 ++++++++++++++++++++++++
 SeedDMS_Preview/CHANGELOG.md   | 128 +++++++++++++++++++++++++++++++++
 SeedDMS_SQLiteFTS/CHANGELOG.md |  89 +++++++++++++++++++++++
 3 files changed, 311 insertions(+)
 create mode 100644 SeedDMS_Lucene/CHANGELOG.md
 create mode 100644 SeedDMS_Preview/CHANGELOG.md
 create mode 100644 SeedDMS_SQLiteFTS/CHANGELOG.md

diff --git a/SeedDMS_Lucene/CHANGELOG.md b/SeedDMS_Lucene/CHANGELOG.md
new file mode 100644
index 000000000..ce4685461
--- /dev/null
+++ b/SeedDMS_Lucene/CHANGELOG.md
@@ -0,0 +1,94 @@
+1.1.18 (2023-01-09)
+---------------------
+- IndexedDocument() accepts a callable for conversion to text
+- SeedDMS_Lucene_Search::open and create return itself but Zend_Search_Lucene
+
+1.1.17 (2021-05-10)
+---------------------
+- close pipes in execWithTimeout(), also return exit code of command
+   
+
+1.1.16 (2020-12-12)
+---------------------
+- add indexing of folders
+
+1.1.15 (2020-09-10)
+---------------------
+- add searching for document status
+- better error handling if opening index fails	
+- parameters for SeedDMS_Lucene_Search::search() has changed
+- SeedDMS_Lucene_Search::search() returns array of hits, count and facets
+- pass config array instead of index directory to SeedDMS_Lucene_Indexer::create()
+  and SeedDMS_Lucene_Indexer::open()
+
+1.1.14 (2020-09-02)
+---------------------
+- Index users with at least read access on the document
+
+1.1.13 (2018-04-11)
+---------------------
+- IndexedDocument() remembers cmd and mimetype
+
+1.1.12 (2018-01-30)
+---------------------
+- execWithTimeout() reads data from stderr and saves it into error msg
+
+1.1.11 (2017-12-04)
+---------------------
+- allow conversion commands for mimetypes with wildcards
+
+1.1.10 (2017-03-01)
+---------------------
+- catch exception in execWithTimeout()
+
+1.1.9 (2016-04-28)
+---------------------
+- pass variables to stream_select() to fullfill strict standards.
+- make all functions in Indexer.php static
+
+1.1.8 (2016-03-29)
+---------------------
+- set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+
+1.1.7 (2016-02-01)
+---------------------
+- add command for indexing postѕcript files
+
+1.1.6 (2015-08-05)
+---------------------
+- run external commands with a timeout
+
+1.1.5 (2014-07-30)
+---------------------
+- field for original filename is treated as utf-8
+- declare SeeDMS_Lucene_Indexer::open() static
+
+1.1.4 (2013-08-13)
+---------------------
+- class SeedDMS_Lucene_Search::search returns false if query is invalid instead of an empty result record
+
+1.1.3 (2013-06-27)
+---------------------
+- explicitly set encoding to utf-8 when adding fields
+- do not check if deleting document from index fails, update it in any case
+
+1.1.2 (2013-06-17)
+---------------------
+- parse query term and catch errors before using it
+
+1.1.1 (2012-12-03)
+---------------------
+- catch exception if index is opened but not available
+
+1.1.0 (2012-11-06)
+---------------------
+- use a configurable list of mime type converters, fixed indexing and searching
+  of special chars like german umlaute.
+
+1.0.1 (2011-11-06)
+---------------------
+- New Release
+
+0.0.1 (2009-04-27)
+---------------------
+
diff --git a/SeedDMS_Preview/CHANGELOG.md b/SeedDMS_Preview/CHANGELOG.md
new file mode 100644
index 000000000..76b1546c5
--- /dev/null
+++ b/SeedDMS_Preview/CHANGELOG.md
@@ -0,0 +1,128 @@
+1.5.0 (2023-01-09)
+---------------------
+- add previewer which creates txt
+
+1.4.0 (2021-10-16)
+---------------------
+- use new conversion service if available
+- createRawPreview() checks early if a converter exists
+   
+
+1.3.3 (2020-12-23)
+---------------------
+- close pipes in execWithTimeout(), also return exit code of command
+- createPreview() has optional parameter by referenz to return true if a
+  preview image was actually created
+
+1.3.2 (2020-12-23)
+---------------------
+- set header Content-Length 
+- update package description
+
+1.3.1 (2020-03-21)
+---------------------
+- add parameter $target to SeedDMS_Preview_pdfPreviewer::hasRawPreview() and SeedDMS_Preview_pdfPreviewer::getRawPreview()
+
+1.3.0 (2020-02-17)
+---------------------
+- add new methode getPreviewFile()
+
+1.2.10 (2019-02-11)
+---------------------
+- new parameter for enabling/disabling xsendfile
+- fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent
+
+1.2.9 (2018-07-13)
+---------------------
+- make sure list of converters is always an array
+- usage of mod_sendfile can be configured
+
+1.2.8 (2018-03-08)
+---------------------
+- preview is also created if SeedDMS_Core_DocumentContent has a child class
+
+1.2.7 (2018-01-18)
+---------------------
+- add SeedDMS_Preview_Base::sendFile() as a replacement for readfile() which uses
+- mod_xsendfile if available
+- execWithTimeout() reads data from stderr and returns it together with stdout in array
+
+1.2.6 (2017-12-04)
+---------------------
+- SeedDMS_Preview_Base::setConverters() overrides existing converters.
+- New method SeedDMS_Preview_Base::addConverters() merges new converters with old ones.
+
+1.2.5 (2017-10-11)
+---------------------
+- SeedDMS_Preview_Base::hasConverter() returns only try if command is set
+
+1.2.4 (2017-10-11)
+---------------------
+- fix typo in converter for tar.gz files
+
+1.2.3 (2017-09-18)
+---------------------
+- createPreview() returns false if running the converter command fails
+
+1.2.2 (2017-03-02)
+---------------------
+- commands can be set for mimetypes 'xxxx/*' and '*'
+- pass mimetype as parameter '%m' to converter
+
+1.2.1 (2016-11-15)
+---------------------
+- setConverters() overrides exiting converters
+
+1.2.0 (2016-11-07)
+---------------------
+- add new previewer which converts document to pdf instead of png
+
+1.1.9 (2016-04-26)
+---------------------
+- add more documentation
+- finish deletePreview()
+- add new method deleteDocumentPreviews()
+- fix calculation of timeout (Bug #269)
+- check if cache dir exists before deleting it in deleteDocumentPreviews()
+
+1.1.8 (2016-04-05)
+---------------------
+- pass variables to stream_select (required by php7)
+
+1.1.7 (2016-03-29)
+---------------------
+- set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+
+1.1.6 (2016-03-08)
+---------------------
+- check if object passed to createPreview(), hasPreview() is not null
+
+1.1.5 (2016-02-11)
+---------------------
+- add method getFilesize()
+- timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
+
+1.1.4 (2015-08-08)
+---------------------
+- command for creating the preview will be called with a given timeout
+
+1.1.3 (2015-02-13)
+---------------------
+- preview images will also be recreated if the object this image belongs is of newer date than the image itself. This happens if versions are being deleted and than a new version is uploaded. Because the new version will get the version number of the old version, it will also take over the old preview image.Comparing the creation date of the image with the object detects this case.
+
+1.1.2 (2014-04-10)
+---------------------
+- create fixed width image with proportional height
+
+1.1.1 (2014-03-18)
+---------------------
+- add converters for .tar.gz, .ps, .txt
+
+1.1.0 (2013-04-29)
+---------------------
+- preview image can also be created from a document file (SeedDMS_Core_DocumentFile)
+
+1.0.0 (2012-11-20)
+---------------------
+- initial version
+
diff --git a/SeedDMS_SQLiteFTS/CHANGELOG.md b/SeedDMS_SQLiteFTS/CHANGELOG.md
new file mode 100644
index 000000000..d75aace4c
--- /dev/null
+++ b/SeedDMS_SQLiteFTS/CHANGELOG.md
@@ -0,0 +1,89 @@
+1.0.18 (2023-01-09)
+---------------------
+- add optional parameter $order to SeedDMS_SQLiteFTS_Indexer::find()
+- add optional parameters $query and $col to SeedDMS_SQLiteFTS_Indexer::terms()
+- IndexedDocument() accepts a callable for conversion to text
+- remove stop words from content
+
+1.0.17 (2022-03-04)
+---------------------
+- throw exeption in find() instead of returning false
+- fix query if rootFolder or startFolder is set
+   
+
+1.0.16 (2021-05-10)
+---------------------
+- close pipes in execWithTimeout(), also return exit code of command
+- add support for fts5 (make it the default)
+- add class SeedDMS_SQLiteFTS_Field
+
+1.0.15 (2020-12-12)
+---------------------
+- add indexing folders
+
+1.0.14 (2020-09-11)
+---------------------
+- add searching for document status
+- search even if query is empty	(will find all documents)
+- parameters for SeedDMS_SQLiteFTS_Search::search() has changed
+- SeedDMS_Lucene_Search::search() returns array of hits, count and facets
+- pass config array instead of index directory to SeedDMS_Lucene_Indexer::create()
+  and SeedDMS_Lucene_Indexer::open()
+
+1.0.13 (2020-09-02)
+---------------------
+- add user to list of terms
+
+1.0.12 (2020-09-02)
+---------------------
+- Index users with at least read access on a document
+
+1.0.11 (2019-11-28)
+---------------------
+- Set 'created' in index to creation date of indexed content (was set to current
+timestamp)
+
+1.0.10 (2018-04-11)
+---------------------
+- IndexedDocument() remembers cmd and mimetype
+
+1.0.9 (2018-01-30)
+---------------------
+- execWithTimeout() reads data from stderr and saves it into error msg
+
+1.0.8 (2017-12-04)
+---------------------
+- allow conversion commands for mimetypes with wildcards
+
+1.0.7 (2017-03-01)
+---------------------
+- catch exception in execWithTimeout()
+
+1.0.6 (2016-03-29)
+---------------------
+- fix calculation of timeout (see bug #269)
+
+1.0.5 (2016-03-29)
+---------------------
+- set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+
+1.0.4 (2016-03-15)
+---------------------
+- make it work with sqlite3 &lt; 3.8.0
+
+1.0.3 (2016-02-01)
+---------------------
+- add command for indexing postѕcript files
+
+1.0.2 (2016-01-10)
+---------------------
+- check if index exists before removing it when creating a new one
+
+1.0.1 (2015-11-16)
+---------------------
+- add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists
+
+1.0.0 (2015-08-10)
+---------------------
+- initial release
+

From 875954e730c0ca7d323c26283023067f1ea5be9a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 20 Jan 2023 17:31:22 +0100
Subject: [PATCH 1790/2006] add composer.json

---
 SeedDMS_Lucene/composer.json    | 23 +++++++++++++++++++++++
 SeedDMS_Preview/composer.json   | 23 +++++++++++++++++++++++
 SeedDMS_SQLiteFTS/composer.json | 23 +++++++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 SeedDMS_Lucene/composer.json
 create mode 100644 SeedDMS_Preview/composer.json
 create mode 100644 SeedDMS_SQLiteFTS/composer.json

diff --git a/SeedDMS_Lucene/composer.json b/SeedDMS_Lucene/composer.json
new file mode 100644
index 000000000..68a37caaf
--- /dev/null
+++ b/SeedDMS_Lucene/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "seeddms/lucene",
+    "description": "Lucene based fulltext search for SeedDMS ",
+    "type": "library",
+    "license": "GPL-2.0-or-later",
+    "minimum-stability": "dev",
+    "autoload": {
+        "psr-4": {
+            "Seeddms\\Lucene\\": "Lucene/"
+        },
+        "classmap": ["Lucene/"]
+    },
+    "authors": [
+        {
+            "name": "Uwe Steinmann",
+            "email": "info@seeddms.org"
+        }
+    ],
+    "require-dev": {
+        "phpunit/phpunit": "^9"
+    }
+
+}
diff --git a/SeedDMS_Preview/composer.json b/SeedDMS_Preview/composer.json
new file mode 100644
index 000000000..9a4b5a11a
--- /dev/null
+++ b/SeedDMS_Preview/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "seeddms/preview",
+    "description": "Create Preview images, pdf and txt for for SeedDMS ",
+    "type": "library",
+    "license": "GPL-2.0-or-later",
+    "minimum-stability": "dev",
+    "autoload": {
+        "psr-4": {
+            "Seeddms\\Preview\\": "Preview/"
+        },
+        "classmap": ["Preview/"]
+    },
+    "authors": [
+        {
+            "name": "Uwe Steinmann",
+            "email": "info@seeddms.org"
+        }
+    ],
+    "require-dev": {
+        "phpunit/phpunit": "^9"
+    }
+
+}
diff --git a/SeedDMS_SQLiteFTS/composer.json b/SeedDMS_SQLiteFTS/composer.json
new file mode 100644
index 000000000..90a19cd7d
--- /dev/null
+++ b/SeedDMS_SQLiteFTS/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "seeddms/lucene",
+    "description": "SQLiteFTS based fulltext search for SeedDMS ",
+    "type": "library",
+    "license": "GPL-2.0-or-later",
+    "minimum-stability": "dev",
+    "autoload": {
+        "psr-4": {
+            "Seeddms\\SQLiteFTS\\": "SQLiteFTS/"
+        },
+        "classmap": ["SQLiteFTS/"]
+    },
+    "authors": [
+        {
+            "name": "Uwe Steinmann",
+            "email": "info@seeddms.org"
+        }
+    ],
+    "require-dev": {
+        "phpunit/phpunit": "^9"
+    }
+
+}

From 78f80e7190bd9e8d55c0e07af2ed2a680b48ac5c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Jan 2023 09:09:20 +0100
Subject: [PATCH 1791/2006] add new repositories for lucene, sqlitefts,
 preview, core

---
 composer-dist.json | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/composer-dist.json b/composer-dist.json
index 1c69d8361..e7f5a2665 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -18,7 +18,28 @@
     "repositories": [
         {
             "type": "path",
-            "url": "/home/cvs/seeddms/SeedDMS_Core",
+            "url": "/home/cvs/seeddms-ext/core",
+            "options": {
+                "symlink": false
+            }
+        },
+        {
+            "type": "path",
+            "url": "/home/cvs/seeddms-ext/lucene",
+            "options": {
+                "symlink": false
+            }
+        },
+        {
+            "type": "path",
+            "url": "/home/cvs/seeddms-ext/preview",
+            "options": {
+                "symlink": false
+            }
+        },
+        {
+            "type": "path",
+            "url": "/home/cvs/seeddms-ext/sqlitefts",
             "options": {
                 "symlink": false
             }

From 9b780bd883dd7e5631d7bbeed5efc3b77494818f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Jan 2023 09:09:57 +0100
Subject: [PATCH 1792/2006] include Lucene.php from vendor dir

---
 inc/inc.FulltextInit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index 87687d9bb..9ff303637 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -27,7 +27,7 @@ if($settings->_enableFullSearch) {
 		if(!empty($settings->_luceneClassDir))
 			require_once($settings->_luceneClassDir.'/Lucene.php');
 		else
-			require_once('SeedDMS/Lucene.php');
+			require_once('vendor/seeddms/lucene/Lucene.php');
 	} else {
 		$indexconf = null;
 		if(isset($GLOBALS['SEEDDMS_HOOKS']['initFulltext'])) {

From fc61b3d75965311b990e72e73a13fd7d7df4ac38 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Jan 2023 09:15:46 +0100
Subject: [PATCH 1793/2006] include SQLiteFTS.php from vendor/seeddms/sqlitefts

---
 inc/inc.FulltextInit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index 9ff303637..5433c8f83 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -14,7 +14,7 @@ if($settings->_enableFullSearch) {
 		);
 		$fulltextservice->addService('sqlitefts', $indexconf);
 
-		require_once('SeedDMS/SQLiteFTS.php');
+		require_once('vendor/seeddms/sqlitefts/SQLiteFTS.php');
 	} elseif($settings->_fullSearchEngine == 'lucene') {
 		$indexconf = array(
 			'Indexer' => 'SeedDMS_Lucene_Indexer',

From 2a265ecea6d95178084eaab142f23944d39c8339 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Jan 2023 09:16:50 +0100
Subject: [PATCH 1794/2006] minor improvements in cmd to create changelog

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8d94c6b56..ba8176ffa 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,8 @@ apidoc:
 # line break. Result is put back
 # into the original format by replacing all '|' by newline.
 #
+PKGFILE=SeedDMS_Core/package.xml
 changelog:
-	@sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' SeedDMS_Core/package.xml | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.preRC]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n'
+	@sgrep 'stag("DATE") .. etag("DATE") or ((stag("RELEASE") .. etag("RELEASE")) in (stag("VERSION") .. etag("VERSION"))) or inner(stag("NOTES") __ etag("NOTES"))' ${PKGFILE} | sed -e 's#^ *<date>\([-0-9]*\)</date><release>\([0-9.preRC]*\)</release>#\n\n\2 (\1)\n---------------------#' | awk -F'\n' -vRS='' -vOFS='|' '{$$1=$$1}1' | sort -V -r | sed 's/$$/\n/' | tr '|' '\n'
 
 .PHONY: doc webdav webapp repository changelog

From cca8416ef63c51ec691893244cc45b658f22e3c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Jan 2023 13:08:33 +0100
Subject: [PATCH 1795/2006] use composer packages for lucene, preview,
 sqlitefs, webdav server

---
 composer-dist.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/composer-dist.json b/composer-dist.json
index e7f5a2665..8cc97ee60 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -13,7 +13,11 @@
         "alecrabbit/php-console-colour": "*",
         "zf1/zend-search-lucene": "*",
         "symfony/http-foundation": "^5.4",
-        "seeddms/core": "dev-master"
+        "seeddms/core": "dev-master",
+        "seeddms/lucene": "dev-master",
+        "seeddms/preview": "dev-master",
+        "seeddms/sqlitefts": "dev-master",
+        "seeddms/http_webdav_server": "dev-master"
     },
     "repositories": [
         {
@@ -43,6 +47,13 @@
             "options": {
                 "symlink": false
             }
+        },
+        {
+            "type": "path",
+            "url": "/home/cvs/seeddms-ext/http_webdav_server",
+            "options": {
+                "symlink": false
+            }
         }
     ]
 

From 2913a9bc977bd570c3c2291d3afc3bfb82c81a44 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Jan 2023 13:31:25 +0100
Subject: [PATCH 1796/2006] include webdav server from vendor dir

---
 webdav/webdav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webdav/webdav.php b/webdav/webdav.php
index 891b0685c..c478e91bc 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "HTTP/WebDAV/Server.php";
+require_once "vendor/seeddms/http_webdav_server/HTTP/WebDAV/Server.php";
 
 /**
  * SeedDMS access using WebDAV

From f2fb5827f3ea09a9b898fccb512d7671f4ebf3f3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Jan 2023 13:31:44 +0100
Subject: [PATCH 1797/2006] do not include pear packages anymore

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 81caffe74..40a25acb3 100644
--- a/build.xml
+++ b/build.xml
@@ -151,7 +151,7 @@
 		<copy todir="${builddir}/export/${shortversion}/www/ext/example">
 			<fileset dir="${srcdir}/ext/example" defaultexcludes="false" />
 		</copy>
-		<copy todir="${builddir}/export/${shortversion}/pear/SeedDMS">
+		<!-- copy todir="${builddir}/export/${shortversion}/pear/SeedDMS">
       <fileset dir="SeedDMS_Core">
 				<include name="Core/**" />
 				<include name="Core.php" />
@@ -179,7 +179,7 @@
 			<fileset dir="../seeddms-ext/http_webdav_server">
 				<include name="Tools/**" />
 			</fileset>
-		</copy>
+		</copy -->
 		<copy tofile="${builddir}/export/${shortversion}/pear/composer.json" file="composer-dist.json">
 		</copy>
     <phingcall target="composer">

From 22802c4abd0119ade8fae216ed21c45a0e4da3e0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Jan 2023 13:47:28 +0100
Subject: [PATCH 1798/2006] remove phpexcel, raise some max version numbers

---
 composer-dist.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer-dist.json b/composer-dist.json
index 709d27444..929b06db9 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -7,7 +7,6 @@
         "erusev/parsedown": "*",
         "erusev/parsedown-extra": "*",
         "mibe/feedwriter": "^1.1",
-        "phpoffice/phpexcel": "^1.8",
         "phpoffice/phpspreadsheet": "*",
         "pear/log": "*",
         "pear/mail": "*",
@@ -16,7 +15,7 @@
         "pear/auth_sasl": "*",
         "pear/db": "*",
         "alecrabbit/php-console-colour": "*",
-        "dragonmantank/cron-expression": "^2.2",
+        "dragonmantank/cron-expression": "^3",
         "zf1/zend-search-lucene": "*",
         "symfony/http-foundation": "^5.4",
         "seeddms/core": "dev-master",

From 29cae0fb6557769cf5ddda506ba20cd008703168 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Jan 2023 13:55:27 +0100
Subject: [PATCH 1799/2006] keep SeedDMS/Preview until all extensions are
 updated

---
 build.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 40a25acb3..eca4d945c 100644
--- a/build.xml
+++ b/build.xml
@@ -151,25 +151,25 @@
 		<copy todir="${builddir}/export/${shortversion}/www/ext/example">
 			<fileset dir="${srcdir}/ext/example" defaultexcludes="false" />
 		</copy>
-		<!-- copy todir="${builddir}/export/${shortversion}/pear/SeedDMS">
-      <fileset dir="SeedDMS_Core">
+		<copy todir="${builddir}/export/${shortversion}/pear/SeedDMS">
+      <!-- fileset dir="SeedDMS_Core">
 				<include name="Core/**" />
 				<include name="Core.php" />
-			</fileset>
+			</fileset -->
       <fileset dir="SeedDMS_Preview">
 				<include name="Preview/**" />
 				<include name="Preview.php" />
 			</fileset>
-      <fileset dir="SeedDMS_Lucene">
+      <!-- fileset dir="SeedDMS_Lucene">
 				<include name="Lucene/**" />
 				<include name="Lucene.php" />
-			</fileset>
-      <fileset dir="SeedDMS_SQLiteFTS">
+			</fileset -->
+      <!-- fileset dir="SeedDMS_SQLiteFTS">
 				<include name="SQLiteFTS/**" />
 				<include name="SQLiteFTS.php" />
-			</fileset>
+			</fileset -->
 		</copy>
-		<copy todir="${builddir}/export/${shortversion}/pear">
+		<!-- copy todir="${builddir}/export/${shortversion}/pear">
 			<fileset dir="../seeddms-ext/http_webdav_server">
 				<include name="HTTP/WebDAV/Server/**" />
 				<include name="HTTP/WebDAV/Server.php" />

From 5c985f32b1bee55e5e903b73a396700c948d3f0d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 22 Jan 2023 19:15:11 +0100
Subject: [PATCH 1800/2006] do not include SeedDMS/Preview.php anymore because
 it is included in inc.FulltextInit.php already

---
 controllers/class.EmptyFolder.php                 | 1 -
 controllers/class.RemoveDocument.php              | 1 -
 controllers/class.RemoveFolder.php                | 1 -
 inc/inc.FulltextInit.php                          | 2 +-
 op/op.Ajax.php                                    | 1 -
 op/op.DropFolderPreview.php                       | 5 -----
 op/op.PdfPreview.php                              | 5 -----
 op/op.Preview.php                                 | 5 -----
 op/op.RemoveDocument.php                          | 1 -
 op/op.RemoveDocumentFile.php                      | 1 -
 op/op.RemoveFolder.php                            | 2 +-
 op/op.RemoveVersion.php                           | 1 -
 restapi/index.php                                 | 2 --
 views/bootstrap/class.ApprovalSummary.php         | 5 -----
 views/bootstrap/class.AttributeMgr.php            | 5 -----
 views/bootstrap/class.Calendar.php                | 5 -----
 views/bootstrap/class.Categories.php              | 5 -----
 views/bootstrap/class.Clipboard.php               | 5 -----
 views/bootstrap/class.DocumentVersionDetail.php   | 5 -----
 views/bootstrap/class.DropFolderChooser.php       | 5 -----
 views/bootstrap/class.ExpiredDocuments.php        | 5 -----
 views/bootstrap/class.GroupMgr.php                | 5 -----
 views/bootstrap/class.ManageNotify.php            | 5 -----
 views/bootstrap/class.MyDocuments.php             | 5 -----
 views/bootstrap/class.ObjectCheck.php             | 5 -----
 views/bootstrap/class.RemoveUserFromProcesses.php | 5 -----
 views/bootstrap/class.ReviewSummary.php           | 5 -----
 views/bootstrap/class.Search.php                  | 5 -----
 views/bootstrap/class.Tasks.php                   | 5 -----
 views/bootstrap/class.Timeline.php                | 5 -----
 views/bootstrap/class.ViewDocument.php            | 5 -----
 views/bootstrap/class.ViewFolder.php              | 5 -----
 views/bootstrap/class.WorkflowSummary.php         | 5 -----
 33 files changed, 2 insertions(+), 126 deletions(-)

diff --git a/controllers/class.EmptyFolder.php b/controllers/class.EmptyFolder.php
index eb1c5a629..4fdc7ef62 100644
--- a/controllers/class.EmptyFolder.php
+++ b/controllers/class.EmptyFolder.php
@@ -77,7 +77,6 @@ class SeedDMS_Controller_EmptyFolder extends SeedDMS_Controller_Common {
 			}
 
 			/* Register another callback which removes the preview images of the document */
-			require_once("SeedDMS/Preview.php");
 			$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 			$dms->addCallback('onPreRemoveDocument', 'SeedDMS_Controller_EmptyFolder::removePreviews', array($previewer));
 
diff --git a/controllers/class.RemoveDocument.php b/controllers/class.RemoveDocument.php
index 56e165e6a..96a5c1bb3 100644
--- a/controllers/class.RemoveDocument.php
+++ b/controllers/class.RemoveDocument.php
@@ -43,7 +43,6 @@ class SeedDMS_Controller_RemoveDocument extends SeedDMS_Controller_Common {
 
 		$result = $this->callHook('removeDocument', $document);
 		if($result === null) {
-			require_once("SeedDMS/Preview.php");
 			$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 			$previewer->deleteDocumentPreviews($document);
 			if (!$document->remove()) {
diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php
index ac64f246a..6b3a8fc73 100644
--- a/controllers/class.RemoveFolder.php
+++ b/controllers/class.RemoveFolder.php
@@ -77,7 +77,6 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 			}
 
 			/* Register another callback which removes the preview images of the document */
-			require_once("SeedDMS/Preview.php");
 			$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 			$dms->addCallback('onPreRemoveDocument', 'SeedDMS_Controller_RemoveFolder::removePreviews', array($previewer));
 
diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index 5433c8f83..450086571 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -48,7 +48,7 @@ if($settings->_enableFullSearch) {
 	$fulltextservice->setConversionMgr($conversionmgr);
 	$fulltextservice->setMaxSize($settings->_maxSizeForFullText);
 	$fulltextservice->setCmdTimeout($settings->_cmdTimeout);
-	require_once("SeedDMS/Preview.php");
+//	require_once("vendor/seeddms/preview/Preview.php");
 	$txtpreviewer = new SeedDMS_Preview_TxtPreviewer($settings->_cacheDir, $settings->_cmdTimeout, $settings->_enableXsendfile);
 	if($conversionmgr)
 		$txtpreviewer->setConversionMgr($conversionmgr);
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index f4c5ad884..9999186b8 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -510,7 +510,6 @@ switch($command) {
 							$previewer->deleteDocumentPreviews($document);
 							return null;
 						}
-						require_once("SeedDMS/Preview.php");
 						$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 						$dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer));
 
diff --git a/op/op.DropFolderPreview.php b/op/op.DropFolderPreview.php
index 96f2209d1..b70d01e6a 100644
--- a/op/op.DropFolderPreview.php
+++ b/op/op.DropFolderPreview.php
@@ -29,11 +29,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if (!isset($_GET["filename"])) {
 	exit;
 }
diff --git a/op/op.PdfPreview.php b/op/op.PdfPreview.php
index 4b963426f..178470706 100644
--- a/op/op.PdfPreview.php
+++ b/op/op.PdfPreview.php
@@ -30,11 +30,6 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
diff --git a/op/op.Preview.php b/op/op.Preview.php
index 3ded08099..9ceacf462 100644
--- a/op/op.Preview.php
+++ b/op/op.Preview.php
@@ -30,11 +30,6 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $controller = Controller::factory($tmp[1], array('dms'=>$dms, 'user'=>$user));
 
diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index e889dbf14..93ef70497 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -64,7 +64,6 @@ if($document->isLocked()) {
 $folder = $document->getFolder();
 
 /* Remove all preview images. */
-require_once("SeedDMS/Preview.php");
 $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 $previewer->deleteDocumentPreviews($document);
 
diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php
index 5d16b9b39..4a8df3033 100644
--- a/op/op.RemoveDocumentFile.php
+++ b/op/op.RemoveDocumentFile.php
@@ -60,7 +60,6 @@ if (($document->getAccessMode($user, 'removeDocumentFile') < M_ALL)&&($user->get
 }
 
 /* Remove preview image. */
-require_once("SeedDMS/Preview.php");
 $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 $previewer->deletePreview($file, $settings->_previewWidthDetail);
 
diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php
index 312945ea1..8f5f0c9e7 100644
--- a/op/op.RemoveFolder.php
+++ b/op/op.RemoveFolder.php
@@ -62,7 +62,7 @@ function removePreviews($arr, $document) {
 	$previewer->deleteDocumentPreviews($document);
 	return null;
 }
-require_once("SeedDMS/Preview.php");
+require_once("vendor/seeddms/preview/Preview.php");
 $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 $dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer));
  */
diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index 0d9045a24..8c224209a 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -62,7 +62,6 @@ if (!is_object($version)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
-require_once("SeedDMS/Preview.php");
 $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 $folder = $document->getFolder();
 /* Check if there is just one version. In that case remove the document */
diff --git a/restapi/index.php b/restapi/index.php
index 215674dc9..ae2021838 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1392,8 +1392,6 @@ class RestapiController { /* {{{ */
     } /* }}} */
 
     function getDocumentPreview($request, $response, $args) { /* {{{ */
-        require_once "SeedDMS/Preview.php";
-
         $dms = $this->container->dms;
         $userobj = $this->container->userobj;
         $settings = $this->container->config;
diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 21233bd98..02350de30 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for ApprovalSummary view
  *
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 9864705f6..f73a40589 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for AttributeMgr view
  *
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 5cae5f01e..504801f28 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for Calendar view
  *
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index 35f775cca..356ed03db 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for Categories view
  *
diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php
index cab5ce739..1f157e88d 100644
--- a/views/bootstrap/class.Clipboard.php
+++ b/views/bootstrap/class.Clipboard.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for clipboard view
  *
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 541621f86..9ea58444e 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for DocumentVersionDetail view
  *
diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index bae2b04da..8cc315669 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for DropFolderChooser view
  *
diff --git a/views/bootstrap/class.ExpiredDocuments.php b/views/bootstrap/class.ExpiredDocuments.php
index 4c3aacc61..d16cca9c4 100644
--- a/views/bootstrap/class.ExpiredDocuments.php
+++ b/views/bootstrap/class.ExpiredDocuments.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for ExpiredDocuments view
  *
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index 3330fe46c..fa53d78dd 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for GroupMgr view
  *
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index 533159659..72af7a5a2 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for ManageNotify view
  *
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 4e000f217..5509b4274 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for MyDocuments view
  *
diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index fba181150..b10565f5b 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for ObjectCheck view
  *
diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index 3dceb9835..7fbcbfff4 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -16,11 +16,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for RemoveUserFromProcesses view
  *
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index a3e62a25e..60d6ad838 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for ReviewSummary view
  *
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 9d947d802..72e70b053 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for Search result view
  *
diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index b30b5ad79..ee111f4a3 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for clipboard view
  *
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 93732e9dc..a23870530 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for Timeline view
  *
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 06614a509..a229be4a9 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for ViewDocument view
  *
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 9827acd10..75c2f8838 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for ViewFolder view
  *
diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php
index e4bf58631..b73f9eab3 100644
--- a/views/bootstrap/class.WorkflowSummary.php
+++ b/views/bootstrap/class.WorkflowSummary.php
@@ -18,11 +18,6 @@
  */
 //require_once("class.Bootstrap.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for WorkflowSummary view
  *

From 335c7bbf98afcd7cc6bff8326d65ff8eecc7b188 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 22 Jan 2023 19:16:38 +0100
Subject: [PATCH 1801/2006] do not include SeedDMS/Preview.php anymore because
 it is included in inc.FulltextInit.php already

---
 op/op.TimelineFeedPreview.php             |  5 -----
 out/out.TransmittalMgr.php                |  5 -----
 views/bootstrap/class.ReceiptSummary.php  | 10 ----------
 views/bootstrap/class.RevisionSummary.php | 10 ----------
 views/bootstrap/class.TimelineFeed.php    |  5 -----
 5 files changed, 35 deletions(-)

diff --git a/op/op.TimelineFeedPreview.php b/op/op.TimelineFeedPreview.php
index 183b3d4b7..83a457df5 100644
--- a/op/op.TimelineFeedPreview.php
+++ b/op/op.TimelineFeedPreview.php
@@ -30,11 +30,6 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
 //include("../inc/inc.BasicAuthentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if(empty($_GET['hash']))
 	exit;
 
diff --git a/out/out.TransmittalMgr.php b/out/out.TransmittalMgr.php
index 22aac353f..493d8f07a 100644
--- a/out/out.TransmittalMgr.php
+++ b/out/out.TransmittalMgr.php
@@ -32,11 +32,6 @@ require_once("inc/inc.Authentication.php");
 require_once("../views/".$theme."/trait.TransmittalUpdateButton.php");
 require_once("../views/".$theme."/trait.TransmittalDeleteButton.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $isajax = isset($_GET['action']) && ($_GET['action'] == 'items' || $_GET['action'] == 'form');
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
diff --git a/views/bootstrap/class.ReceiptSummary.php b/views/bootstrap/class.ReceiptSummary.php
index 657433a1f..acc2497fe 100644
--- a/views/bootstrap/class.ReceiptSummary.php
+++ b/views/bootstrap/class.ReceiptSummary.php
@@ -13,16 +13,6 @@
  * @version    Release: @package_version@
  */
 
-/**
- * Include parent class
- */
-//require_once("class.Bootstrap.php");
-
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for ReceiptSummary view
  *
diff --git a/views/bootstrap/class.RevisionSummary.php b/views/bootstrap/class.RevisionSummary.php
index 323ef6a6f..42df251b9 100644
--- a/views/bootstrap/class.RevisionSummary.php
+++ b/views/bootstrap/class.RevisionSummary.php
@@ -13,16 +13,6 @@
  * @version    Release: @package_version@
  */
 
-/**
- * Include parent class
- */
-//require_once("class.Bootstrap.php");
-
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for ReviewSummary view
  *
diff --git a/views/bootstrap/class.TimelineFeed.php b/views/bootstrap/class.TimelineFeed.php
index 050af1000..854744f91 100644
--- a/views/bootstrap/class.TimelineFeed.php
+++ b/views/bootstrap/class.TimelineFeed.php
@@ -20,11 +20,6 @@ require_once("vendor/autoload.php");
 
 use \FeedWriter\RSS2;
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 /**
  * Class which outputs the html page for UserList view
  *

From 95cf35c1e32b32e67d61305cbb5237cf889dbd9f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 24 Jan 2023 16:36:12 +0100
Subject: [PATCH 1802/2006] do not copy pear packages anymore

---
 build.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index eca4d945c..e2f6e0b81 100644
--- a/build.xml
+++ b/build.xml
@@ -151,24 +151,24 @@
 		<copy todir="${builddir}/export/${shortversion}/www/ext/example">
 			<fileset dir="${srcdir}/ext/example" defaultexcludes="false" />
 		</copy>
-		<copy todir="${builddir}/export/${shortversion}/pear/SeedDMS">
-      <!-- fileset dir="SeedDMS_Core">
+		<!-- copy todir="${builddir}/export/${shortversion}/pear/SeedDMS">
+      <fileset dir="SeedDMS_Core">
 				<include name="Core/**" />
 				<include name="Core.php" />
-			</fileset -->
+			</fileset>
       <fileset dir="SeedDMS_Preview">
 				<include name="Preview/**" />
 				<include name="Preview.php" />
 			</fileset>
-      <!-- fileset dir="SeedDMS_Lucene">
+      <fileset dir="SeedDMS_Lucene">
 				<include name="Lucene/**" />
 				<include name="Lucene.php" />
 			</fileset -->
       <!-- fileset dir="SeedDMS_SQLiteFTS">
 				<include name="SQLiteFTS/**" />
 				<include name="SQLiteFTS.php" />
-			</fileset -->
-		</copy>
+			</fileset>
+		</copy -->
 		<!-- copy todir="${builddir}/export/${shortversion}/pear">
 			<fileset dir="../seeddms-ext/http_webdav_server">
 				<include name="HTTP/WebDAV/Server/**" />

From e0b10526400e6824f8d94ad975bcbd234d238e15 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2023 09:52:23 +0100
Subject: [PATCH 1803/2006] add class 'add-clipboard-area' to clipboard menu
 item to make it drop aware

---
 views/bootstrap/class.Bootstrap.php   | 2 +-
 views/bootstrap4/class.Bootstrap4.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 7d52d926e..295715ef5 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -422,7 +422,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			/* clipboard {{{ */
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";
-				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
+				echo "     <div class=\"ajax add-clipboard-area\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
 				echo "   </div>";
 			}
 			/* }}} End of clipboard */
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 2c7a509f6..fc812ef38 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -397,7 +397,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			/* clipboard {{{ */
 			if($this->params['enableclipboard']) {
 				echo "   <div id=\"menu-clipboard\">";
-				echo "     <div class=\"ajax\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
+				echo "     <div class=\"ajax add-clipboard-area\" data-no-spinner=\"true\" data-view=\"Clipboard\" data-action=\"menuClipboard\" data-query=\"folderid=".($folder != null ? $folder->getID() : 0)."\"></div>";
 				echo "   </div>";
 			}
 			/* }}} End of clipboard */

From d6cca9291c6e30264614281eb840b8579c3e52f3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2023 09:53:08 +0100
Subject: [PATCH 1804/2006] clean up code, support drag&drop for items in
 clipboard

---
 views/bootstrap/class.Clipboard.php | 33 ++---------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php
index 1f157e88d..f1c97fa97 100644
--- a/views/bootstrap/class.Clipboard.php
+++ b/views/bootstrap/class.Clipboard.php
@@ -48,54 +48,25 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 
 		$menuitems = [];
 
-		$content = '';
-		$content .= "   <ul id=\"main-menu-clipboard\" class=\"nav pull-right\">\n";
-		$content .= "    <li class=\"dropdown add-clipboard-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-clipboard-area\">".getMLText('clipboard')." (".count($clipboard['folders'])."/".count($clipboard['docs']).") <i class=\"fa fa-caret-down\"></i></a>\n";
-		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($clipboard['folders'] as $folderid) {
 			if($folder = $this->params['dms']->getFolder($folderid)) {
-				$content .= "    <li><a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID()."\" class=\"table-row-folder droptarget\" data-droptarget=\"folder_".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" data-name=\"".htmlspecialchars($folder->getName(), ENT_QUOTES)."\" data-uploadformtoken=\"".createFormKey('')."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-folder-o\"></i> ".htmlspecialchars($folder->getName())."</a></li>\n";
-				$subitems[] = array('label'=>'<i class="fa fa-folder-o"></i> '.$folder->getName(), 'link'=>$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(), 'class'=>"table-row-folder droptarget", 'rel'=>"folder_".$folder->getID(), 'attributes'=>array(array('data-droptarget', "folder_".$folder->getID()), array('data-name', htmlspecialchars($folder->getName(), ENT_QUOTES))));
+				$subitems[] = array('label'=>'<i class="fa fa-folder-o"></i> '.$folder->getName(), 'link'=>$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID(), 'class'=>"table-row-folder droptarget", 'attributes'=>array(array('data-droptarget', "folder_".$folder->getID()), array('rel', "folder_".$folder->getID()), array('data-name', htmlspecialchars($folder->getName(), ENT_QUOTES))));
 			}
 		}
 		foreach($clipboard['docs'] as $docid) {
 			if($document = $this->params['dms']->getDocument($docid))
-				$content .= "    <li><a href=\"".$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."\" class=\"table-row-document droptarget\" data-droptarget=\"document_".$document->getID()."\" rel=\"document_".$document->getID()."\" data-name=\"".htmlspecialchars($document->getName(), ENT_QUOTES)."\" formtoken=\"".createFormKey('')."\"><i class=\"fa fa-file\"></i> ".htmlspecialchars($document->getName())."</a></li>\n";
-				$subitems[] = array('label'=>'<i class="fa fa-file"></i> '.$document->getName(), 'link'=>$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(), 'class'=>"table-row-document droptarget", 'rel'=>"document_".$document->getID(), 'attributes'=>array(array('data-droptarget', "document_".$document->getID()), array('data-name', htmlspecialchars($document->getName(), ENT_QUOTES))));
+				$subitems[] = array('label'=>'<i class="fa fa-file"></i> '.$document->getName(), 'link'=>$this->params['settings']->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(), 'class'=>"table-row-document droptarget", 'attributes'=>array(array('data-droptarget', "document_".$document->getID()), array('rel', "document_".$document->getID()), array('formtoken', createFormKey('')), array('data-name', htmlspecialchars($document->getName(), ENT_QUOTES))));
 		}
-		$content .= "    <li class=\"divider\"></li>\n";
 		$subitems[] = array('divider'=>true);
 		if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) {
-			$content .= "    <li><a href=\"".$this->params['settings']->_httpRoot."op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$this->params['folder']->getID())."\">".getMLText("move_clipboard")."</a></li>\n";
 			$subitems[] = array('label'=>getMLText("move_clipboard"), 'link'=>$this->params['settings']->_httpRoot."op/op.MoveClipboard.php?targetid=".$this->params['folder']->getID()."&refferer=".urlencode($this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$this->params['folder']->getID()));
 		}
-//		$content .= "    <li><a href=\"../op/op.ClearClipboard.php?refferer=".urlencode($this->params['refferer'])."\">".getMLText("clear_clipboard")."</a><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">kkk</a> </li>\n";
-//		$content .= "    <li><a class=\"ajax-click\" data-href=\"../op/op.Ajax.php\" data-param1=\"command=clearclipboard\">".getMLText("clear_clipboard")."</a></li>\n";
 		$subitems[] = array('label'=>getMLText('clear_clipboard'), 'class'=>'ajax-click', 'attributes'=>array(array('data-href', $this->params['settings']->_httpRoot.'op/op.Ajax.php'), array('data-param1', 'command=clearclipboard')));
 		if($this->hasHook('clipboardMenuItems'))
 			$subitems = $this->callHook('clipboardMenuItems', $clipboard, $subitems);
-		/*
-		foreach($menuitems as $menuitem) {
-			$content .= "<li>";
-			$content .= "<a";
-			if(!empty($menuitem['link']))
-				$content .= ' href="'.$menuitem['link'].'"';
-			if(!empty($menuitem['attributes']))
-				foreach($menuitem['attributes'] as $attr)
-					$content .= ' '.$attr[0].'="'.$attr[1].'"';
-			$content .= ">";
-			$content .= getMLText($menuitem['label']);
-			$content .= "</a></li>";
-		}
-		 */
-		$content .= "     </ul>\n";
-		$content .= "    </li>\n";
-		$content .= "   </ul>\n";
 		$menuitems['clipboard'] = array('label'=>getMLText('clipboard')." (".count($clipboard['folders'])."/". count($clipboard['docs']).")", 'children'=>$subitems);
 		self::showNavigationBar($menuitems, array('right'=>true));
-//		echo $content;
 	} /* }}} */
 
 	/**

From 345d34fbc84fcc4a0f240109d1a0a445ede67778 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2023 10:11:44 +0100
Subject: [PATCH 1805/2006] add changes for 5.1.29

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 8c795065d..98db08582 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,9 @@
 - various improvements of fulltext service
 - show number of documents per category in category manager
 - show number of keywords per category in keyword manager
+- improve drag&drop with clipboard
+- old pear packages for SeedDMS/Core, SeedDMS/Lucene, SeedDMS/Preview
+  are now based on composer and has moved into vendor dir
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.28

From 1aca53f63a209fe9f97dae40f9aa5e50199d77f2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 25 Jan 2023 12:00:47 +0100
Subject: [PATCH 1806/2006] div.ajax update shows message when set in
 data-update-msg

---
 views/bootstrap/styles/application.js  | 5 ++++-
 views/bootstrap4/styles/application.js | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/styles/application.js b/views/bootstrap/styles/application.js
index fef4a5614..2db927e99 100644
--- a/views/bootstrap/styles/application.js
+++ b/views/bootstrap/styles/application.js
@@ -503,6 +503,7 @@ $(document).ready( function() {
 		var action = element.data('action');
 		var query = element.data('query');
 		var afterload = $(this).data('afterload');
+		var updatemsg = element.data('update-msg');
 		if(view && action) {
 			url = seeddms_webroot+base+"out/out."+view+".php?action="+action;
 			if(query) {
@@ -525,7 +526,9 @@ $(document).ready( function() {
 		} else {
 			url += "&"+param1;
 		}
-		console.log(url);
+		//console.log(url);
+		if(typeof updatemsg != 'undefined')
+			element.html(updatemsg);
 		if(!element.data('no-spinner'))
 			element.prepend('<div style="position: absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: '+element.height()+'px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
 		$.get(url, function(data) {
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index 208a2f4c3..48fbe81e3 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -534,6 +534,7 @@ $(document).ready( function() {
 		var action = element.data('action');
 		var query = element.data('query');
 		var afterload = $(this).data('afterload');
+		var updatemsg = element.data('update-msg');
 		if(view && action) {
 			url = seeddms_webroot+base+"out/out."+view+".php?action="+action;
 			if(query) {
@@ -556,7 +557,9 @@ $(document).ready( function() {
 		} else {
 			url += "&"+param1;
 		}
-		console.log(url);
+		//console.log(url);
+		if(typeof updatemsg != 'undefined')
+			element.html(updatemsg);
 		if(!element.data('no-spinner'))
 			element.prepend('<div style="position: absolute; overflow: hidden; background: #f7f7f7; z-index: 1000; height: '+element.height()+'px; width: '+element.width()+'px; opacity: 0.7; display: table;"><div style="display: table-cell;text-align: center; vertical-align: middle; "><img src="../views/bootstrap/images/ajax-loader.gif"></div>');
 		$.get(url, function(data) {

From 845317e27d8213af834822432f67ded11a1b7927 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 13:16:18 +0100
Subject: [PATCH 1807/2006] better documentation

---
 inc/inc.Tasks.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 50418cbc6..8fe23ba1a 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -14,8 +14,7 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	/**
 	 * Run the task
 	 *
-	 * @param $task task to be executed
-	 * @param $dms dms
+	 * @param SeedDMS_SchedulerTask $task task to be executed
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
 	public function execute(SeedDMS_SchedulerTask $task) {
@@ -305,7 +304,7 @@ class SeedDMS_IndexingDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ *
 	/**
 	 * Run the task
 	 *
-	 * @param $task task to be executed
+	 * @param SeedDMS_SchedulerTask $task task to be executed
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
 	public function execute(SeedDMS_SchedulerTask $task) {
@@ -402,7 +401,7 @@ class SeedDMS_CheckSumTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	/**
 	 * Run the task
 	 *
-	 * @param $task task to be executed
+	 * @param SeedDMS_SchedulerTask $task task to be executed
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
 	public function execute(SeedDMS_SchedulerTask $task) {
@@ -489,7 +488,7 @@ class SeedDMS_PreviewTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	/**
 	 * Run the task
 	 *
-	 * @param $task task to be executed
+	 * @param SeedDMS_SchedulerTask $task task to be executed
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
 	public function execute(SeedDMS_SchedulerTask $task) {
@@ -541,7 +540,7 @@ class SeedDMS_CalendarTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	/**
 	 * Run the task
 	 *
-	 * @param $task task to be executed
+	 * @param SeedDMS_SchedulerTask $task task to be executed
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
 	public function execute(SeedDMS_SchedulerTask $task) {

From 1ab07d53f78992edcc08e178c4e7e4155e1fb7bc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 13:16:47 +0100
Subject: [PATCH 1808/2006] better and more verbose logging

---
 utils/schedulercli.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index e45e9432f..b0f8a2029 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -90,14 +90,16 @@ foreach($tasks as $task) {
 						 * to fast, but this is up to the admin of seeddms.
 						 */
 						$task->updateLastNextRun();
+						add_log_line("Running '".$task->getExtension()."::".$task->getTask()."::".$task->getName());
+						echo "Running '".$task->getExtension()."::".$task->getTask()."::".$task->getName()."\n";
 						if($taskobj->execute($task)) {
-							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
+							add_log_line("Execution of task '".$task->getExtension()."::".$task->getTask()."::".$task->getName()."' successful.");
 						} else {
-							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
+							add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()."::".$task->getName()." failed, task has been disabled.", PEAR_LOG_ERR);
 							$task->setDisabled(1);
 						}
 					} elseif($mode == 'dryrun') {
-						echo "Running ".$task->getExtension()."::".$task->getTask()." in dry mode\n";
+						echo "Running '".$task->getExtension()."::".$task->getTask()."::".$task->getName()."' in dry mode\n";
 					}
 				}
 			}
@@ -120,7 +122,7 @@ foreach($tasks as $task) {
 			} else {
 					echo "-";
 			}
-			echo " ".$task->getExtension()."::".$task->getTask()."";
+			echo " '".$task->getExtension()."::".$task->getTask()."::".$task->getName()."'";
 			echo " ".$task->getNextRun();
 			echo " ".$task->getFrequency();
 			echo "\n";

From 42a81b6b0e4c3114e28e7ec861ebf2b0020e146d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 13:17:34 +0100
Subject: [PATCH 1809/2006] eval parameter 'multiple'

---
 views/bootstrap/class.SchedulerTaskMgr.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 64ec3706b..68726fe27 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -401,7 +401,10 @@ $(document).ready( function() {
 					);
 					break;
 				case 'select':
-					$vals = $task->getParameter()[$param['name']];
+					if(!empty($param['multiple']))
+						$vals = $task->getParameter()[$param['name']];
+					else
+						$vals = [$task->getParameter()[$param['name']]];
 					foreach($param['options'] as &$opt) {
 						if(in_array($opt[0], $vals))
 							$opt[2] = true;
@@ -411,7 +414,7 @@ $(document).ready( function() {
 						array(
 							'element'=>'select',
 							'class'=>'chzn-select',
-							'name'=>'params['.$param['name'].'][]',
+							'name'=>'params['.$param['name'].']'.(!empty($param['multiple']) ? '[]' : ''),
 							'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
 							'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
 							'options'=>$param['options'],
@@ -429,7 +432,10 @@ $(document).ready( function() {
 					);
 					break;
 				case "users":
-					$userids = $task->getParameter()[$param['name']];
+					if(!empty($param['multiple']))
+						$userids = $task->getParameter()[$param['name']];
+					else
+						$userids = [$task->getParameter()[$param['name']]];
 					$users = $dms->getAllUsers();
 					foreach ($users as $currUser) {
 						if (!$currUser->isGuest())
@@ -440,7 +446,7 @@ $(document).ready( function() {
 						array(
 							'element'=>'select',
 							'class'=>'chzn-select',
-							'name'=>'params['.$param['name'].'][]',
+							'name'=>'params['.$param['name'].']'.(!empty($param['multiple']) ? '[]' : ''),
 							'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
 							'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
 							'options'=>$options

From e87d7546a36efe1bfca06fb6832ed8a8c1618045 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 13:18:40 +0100
Subject: [PATCH 1810/2006] handle proxy settings and _baseUrl in settings in
 getBaseUrl()

---
 inc/inc.Utils.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index dda92a894..25d3a0ecb 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -795,7 +795,21 @@ function sendFile($filename) { /* {{{ */
  * @return string
  */
 function getBaseUrl() { /* {{{ */
-	return "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'];
+	global $settings;
+
+	if(!empty($settings->_baseUrl))
+		return $settings->_baseUrl;
+
+	if(isset($_SERVER['X-Forwarded-Host']))
+		$host = $_SERVER['X-Forwarded-Host'];
+	else
+		$host = $_SERVER['HTTP_HOST'];
+	if(isset($_SERVER['X-Forwarded-Proto']))
+		$ssl = $_SERVER['X-Forwarded-Proto'] == 'https';
+	else
+		$ssl = (isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0));
+
+	return "http".($ssl ? "s" : "")."://".$host;
 } /* }}} */
 
 function getToken($length){ /* {{{ */

From 970622564cb001bab67b06df7e0934bd40c9f7c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 13:19:28 +0100
Subject: [PATCH 1811/2006] SeedDMSTask.add() returns taskid, task will be
 passed to function of task

---
 views/bootstrap/styles/application.js  | 4 ++--
 views/bootstrap4/styles/application.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/styles/application.js b/views/bootstrap/styles/application.js
index 2db927e99..23ef17802 100644
--- a/views/bootstrap/styles/application.js
+++ b/views/bootstrap/styles/application.js
@@ -1407,14 +1407,14 @@ $(document).ready(function() { /* {{{ */
 	);
 
 	SeedDMSTask.add = function(task) {
-		tasks.push(task);
+		return tasks.push(task);
 	}
 
 	SeedDMSTask.run = function() {
 		for(let task of tasks) {
 			if(counter % task.interval == 0) {
 //			console.log("Running task '" + task.name + "'");
-				task.func();
+				task.func(task);
 			}
 		}
 		//console.log(counter);
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index 48fbe81e3..a6a46ad5c 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -1463,14 +1463,14 @@ $(document).ready(function() { /* {{{ */
 	);
 
 	SeedDMSTask.add = function(task) {
-		tasks.push(task);
+		return tasks.push(task);
 	}
 
 	SeedDMSTask.run = function() {
 		for(let task of tasks) {
 			if(counter % task.interval == 0) {
 //			console.log("Running task '" + task.name + "'");
-				task.func();
+				task.func(task);
 			}
 		}
 		//console.log(counter);

From b495fd248b5fe5a6cda815c7e4ce67ec1b9af473 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 13:29:46 +0100
Subject: [PATCH 1812/2006] add baseUrl for those cases where seeddms cannot
 determine the host and protocol itself

---
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 1 +
 3 files changed, 6 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index e695242fc..002bb3312 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -95,6 +95,8 @@ class Settings { /* {{{ */
 	var $_coreDir = null;
 	// Path to SeedDMS_Lucene
 	var $_luceneClassDir = null;
+	// The base URL without _httpRoot
+	var $_baseUrl = "";
 	// The relative path in the URL, after the domain part.
 	var $_httpRoot = "/seeddms/";
 	// Where the uploaded files are stored (best to choose a directory that
@@ -565,6 +567,7 @@ class Settings { /* {{{ */
 		if($node) {
 			$tab = $node[0]->attributes();
 			$this->_rootDir = strval($tab["rootDir"]);
+			$this->_baseUrl = strval($tab["baseUrl"]);
 			$this->_httpRoot = strval($tab["httpRoot"]);
 			$this->_contentDir = strval($tab["contentDir"]);
 			if($this->_contentDir && substr($this->_contentDir, -1, 1) != DIRECTORY_SEPARATOR)
@@ -935,6 +938,7 @@ class Settings { /* {{{ */
     $this->getXMLNode($xml, '/configuration', 'system');
     $node = $this->getXMLNode($xml, '/configuration/system', 'server');
     $this->setXMLAttributValue($node, "rootDir", $this->_rootDir);
+    $this->setXMLAttributValue($node, "baseUrl", $this->_baseUrl);
     $this->setXMLAttributValue($node, "httpRoot", $this->_httpRoot);
     $this->setXMLAttributValue($node, "contentDir", $this->_contentDir);
     $this->setXMLAttributValue($node, "cacheDir", $this->_cacheDir);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index 33cbecbaa..dfd8206d4 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -167,6 +167,7 @@ if ($action == "saveSettings")
 
   // SETTINGS - SYSTEM - SERVER
 	setDirValue("rootDir");
+	setStrValue("baseUrl");
 	setStrValue("httpRoot");
   setDirValue("contentDir");
   setDirValue("cacheDir");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 761939b44..20cbc8142 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -407,6 +407,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
       -->
 <?php $this->showConfigHeadline('settings_Server'); ?>
 <?php $this->showConfigText('settings_rootDir', 'rootDir'); ?>
+<?php $this->showConfigText('settings_baseUrl', 'baseUrl'); ?>
 <?php $this->showConfigText('settings_httpRoot', 'httpRoot'); ?>
 <?php $this->showConfigText('settings_contentDir', 'contentDir'); ?>
 <?php $this->showConfigText('settings_backupDir', 'backupDir'); ?>

From bdcaf2b5f37341b157a41f741744c447d36a287f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 18:42:28 +0100
Subject: [PATCH 1813/2006] minor correction of log messages

---
 utils/schedulercli.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index b0f8a2029..1cb4f6557 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -90,8 +90,8 @@ foreach($tasks as $task) {
 						 * to fast, but this is up to the admin of seeddms.
 						 */
 						$task->updateLastNextRun();
-						add_log_line("Running '".$task->getExtension()."::".$task->getTask()."::".$task->getName());
-						echo "Running '".$task->getExtension()."::".$task->getTask()."::".$task->getName()."\n";
+						add_log_line("Running '".$task->getExtension()."::".$task->getTask()."::".$task->getName()."'");
+						echo "Running '".$task->getExtension()."::".$task->getTask()."::".$task->getName()."'\n";
 						if($taskobj->execute($task)) {
 							add_log_line("Execution of task '".$task->getExtension()."::".$task->getTask()."::".$task->getName()."' successful.");
 						} else {

From d30ba981be53acb3c38f06956094ff3dbb03cc8a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 20:55:42 +0100
Subject: [PATCH 1814/2006] add functions to return type of object type of
 attribute definitions

---
 inc/inc.Language.php | 60 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index bf9636993..9dbcc1819 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -262,6 +262,66 @@ function getOverallStatusText($status) { /* {{{ */
 	}
 } /* }}} */
 
+function getAttributeTypeText($attrdef) { /* {{{ */
+	switch($attrdef->getType()) {
+		case SeedDMS_Core_AttributeDefinition::type_int:
+			$t = getMLText("attrdef_type_int");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_float:
+			$t = getMLText("attrdef_type_float");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_string:
+			$t = getMLText("attrdef_type_string");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_boolean:
+			$t = getMLText("attrdef_type_boolean");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_date:
+			$t = getMLText("attrdef_type_date");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_email:
+			$t = getMLText("attrdef_type_email");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_url:
+			$t = getMLText("attrdef_type_url");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_boolean:
+			$t = getMLText("attrdef_type_boolean");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_folder:
+			$t = getMLText("attrdef_type_folder");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_document:
+			$t = getMLText("attrdef_type_document");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_user:
+			$t = getMLText("attrdef_type_user");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_group:
+			$t = getMLText("attrdef_type_group");
+			break;
+	}
+	return $t;
+} /* }}} */
+
+function getAttributeObjectTypeText($attrdef) { /* {{{ */
+	switch($attrdef->getObjType()) {
+		case SeedDMS_Core_AttributeDefinition::objtype_all:
+			$ot = getMLText("all");
+			break;
+		case SeedDMS_Core_AttributeDefinition::objtype_folder:
+			$ot = getMLText("folder");
+			break;
+		case SeedDMS_Core_AttributeDefinition::objtype_document:
+			$ot = getMLText("document");
+			break;
+		case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
+			$ot = getMLText("documentcontent");
+			break;
+	}
+	return $ot;
+} /* }}} */
+
 function getAttributeValidationText($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */
 	$arr = getAttributeValidationError($error, $attrname, $attrvalue, $regex);
 

From 12a9762c9600fe202548dc8f5f29382539ae2d2e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 20:57:59 +0100
Subject: [PATCH 1815/2006] use getAttributeTypeText() and
 getAttributeObjectTypeText()

---
 views/bootstrap/class.AttributeMgr.php | 54 +-------------------------
 1 file changed, 2 insertions(+), 52 deletions(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index f73a40589..dc9e09cd9 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -346,58 +346,8 @@ $(document).ready( function() {
 <?php
 		if($attrdefs) {
 			foreach ($attrdefs as $attrdef) {
-				switch($attrdef->getObjType()) {
-					case SeedDMS_Core_AttributeDefinition::objtype_all:
-						$ot = getMLText("all");
-						break;
-					case SeedDMS_Core_AttributeDefinition::objtype_folder:
-						$ot = getMLText("folder");
-						break;
-					case SeedDMS_Core_AttributeDefinition::objtype_document:
-						$ot = getMLText("document");
-						break;
-					case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
-						$ot = getMLText("documentcontent");
-						break;
-				}
-				switch($attrdef->getType()) {
-					case SeedDMS_Core_AttributeDefinition::type_int:
-						$t = getMLText("attrdef_type_int");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_float:
-						$t = getMLText("attrdef_type_float");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_string:
-						$t = getMLText("attrdef_type_string");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_boolean:
-						$t = getMLText("attrdef_type_boolean");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_date:
-						$t = getMLText("attrdef_type_date");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_email:
-						$t = getMLText("attrdef_type_email");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_url:
-						$t = getMLText("attrdef_type_url");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_boolean:
-						$t = getMLText("attrdef_type_boolean");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_folder:
-						$t = getMLText("attrdef_type_folder");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_document:
-						$t = getMLText("attrdef_type_document");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_user:
-						$t = getMLText("attrdef_type_user");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_group:
-						$t = getMLText("attrdef_type_group");
-						break;
-				}
+				$ot = getAttributeObjectTypeText($attrdef);
+				$t = getAttributeTypeText($attrdef);
 				print "<option value=\"".$attrdef->getID()."\" ".($selattrdef && $attrdef->getID()==$selattrdef->getID() ? 'selected' : '')." data-subtitle=\"".htmlspecialchars($ot.", ".$t)."\">" . htmlspecialchars($attrdef->getName()/* ." (".$ot.", ".$t.")"*/);
 			}
 		}

From 23bd194007842d79b88432e9a7491de9008cb46d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 20:58:47 +0100
Subject: [PATCH 1816/2006] use getAttributeTypeText() and
 getAttributeObjectTypeText()

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 20cbc8142..192233972 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -644,7 +644,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 												echo "<option value=\"".$rec->getID()."\"";
 												if(in_array($rec->getID(), $selections))
 													echo " selected";
-												echo ">".htmlspecialchars($rec->getName())."</option>";
+												echo " data-subtitle=\"".htmlspecialchars(getAttributeObjectTypeText($rec).", ".getAttributeTypeText($rec))."\">".htmlspecialchars($rec->getName())."</option>";
 											}
 											echo "</select>";
 										} else {

From 2ab8cd52156759f895994b533a4368b572a06a87 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Jan 2023 21:05:53 +0100
Subject: [PATCH 1817/2006] init $t and $ot

---
 inc/inc.Language.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index 9dbcc1819..47e32c6e9 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -263,6 +263,7 @@ function getOverallStatusText($status) { /* {{{ */
 } /* }}} */
 
 function getAttributeTypeText($attrdef) { /* {{{ */
+	$t = '';
 	switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_int:
 			$t = getMLText("attrdef_type_int");
@@ -305,6 +306,7 @@ function getAttributeTypeText($attrdef) { /* {{{ */
 } /* }}} */
 
 function getAttributeObjectTypeText($attrdef) { /* {{{ */
+	$ot = '';
 	switch($attrdef->getObjType()) {
 		case SeedDMS_Core_AttributeDefinition::objtype_all:
 			$ot = getMLText("all");

From 81ff5aef939697917b739b02d5ac372431bde87f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 Feb 2023 19:15:54 +0100
Subject: [PATCH 1818/2006] fix indenting of line

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 192233972..d7e3cec6a 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -39,7 +39,7 @@ class SeedDMS_View_Settings extends SeedDMS_Theme_Style {
 	} /* }}} */
 
 	protected function showEndPaneContent($name, $currenttab) { /* {{{ */
-    echo '</table>';
+		echo '</table>';
 		$this->contentContainerEnd();
 		parent::showEndPaneContent($name, $currenttab);
 	} /* }}} */

From ef9e685f5524d323fb2444515aa2a3da59f02df1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 4 Feb 2023 15:14:38 +0100
Subject: [PATCH 1819/2006] set libfolder to null if not accessible, but do no
 issue a error

---
 out/out.AddDocument.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php
index 84df7af84..9e7d3e331 100644
--- a/out/out.AddDocument.php
+++ b/out/out.AddDocument.php
@@ -59,13 +59,8 @@ if($settings->_quota > 0) {
 
 if($settings->_libraryFolder) {
 	$libfolder = $dms->getFolder($settings->_libraryFolder);
-	if (!is_object($libfolder)) {
-		UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
-	}
-
-	if ($libfolder->getAccessMode($user) < M_READ) {
+	if (!is_object($libfolder) || $libfolder->getAccessMode($user) < M_READ) {
 		$libfolder = null;
-//		UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($libfolder->getName()))), getMLText("access_denied"));
 	}
 } else {
 	$libfolder = null;

From 477c79d5a45a5d7b72aaed181ab00c1a8a66da7c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 7 Feb 2023 12:37:16 +0100
Subject: [PATCH 1820/2006] add warning that preview images are recreated

---
 CHANGELOG | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 98db08582..aa61edd6e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,12 +6,13 @@
 - update jquery to 3.6.1 (only bootstrap4 theme)
 - introduce authentication service
 - new hook in restapi to add middleware
-- previews for png, txt, pdf in different directories
+- previews for png, txt, pdf in different directories. This will
+  enforce a recreation of all cached preview images, pdf and text files!
 - various improvements of fulltext service
 - show number of documents per category in category manager
 - show number of keywords per category in keyword manager
 - improve drag&drop with clipboard
-- old pear packages for SeedDMS/Core, SeedDMS/Lucene, SeedDMS/Preview
+- old pear packages SeedDMS/Core, SeedDMS/Lucene, SeedDMS/Preview
   are now based on composer and has moved into vendor dir
 
 --------------------------------------------------------------------------------

From ff4ebb0c38951f75ad2a031335f81b45ee5d050c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 7 Feb 2023 12:40:24 +0100
Subject: [PATCH 1821/2006] various minor translation updates

---
 languages/ar_EG/lang.inc | 3 +++
 languages/bg_BG/lang.inc | 3 +++
 languages/ca_ES/lang.inc | 3 +++
 languages/cs_CZ/lang.inc | 3 +++
 languages/de_DE/lang.inc | 7 +++++--
 languages/el_GR/lang.inc | 3 +++
 languages/en_GB/lang.inc | 9 ++++++---
 languages/es_ES/lang.inc | 3 +++
 languages/fr_FR/lang.inc | 3 +++
 languages/hr_HR/lang.inc | 7 +++++--
 languages/hu_HU/lang.inc | 3 +++
 languages/id_ID/lang.inc | 3 +++
 languages/it_IT/lang.inc | 3 +++
 languages/ko_KR/lang.inc | 3 +++
 languages/lo_LA/lang.inc | 3 +++
 languages/nb_NO/lang.inc | 3 +++
 languages/nl_NL/lang.inc | 3 +++
 languages/pl_PL/lang.inc | 7 +++++--
 languages/pt_BR/lang.inc | 3 +++
 languages/ro_RO/lang.inc | 3 +++
 languages/ru_RU/lang.inc | 3 +++
 languages/sk_SK/lang.inc | 3 +++
 languages/sv_SE/lang.inc | 3 +++
 languages/tr_TR/lang.inc | 3 +++
 languages/uk_UA/lang.inc | 3 +++
 languages/zh_CN/lang.inc | 3 +++
 languages/zh_TW/lang.inc | 3 +++
 27 files changed, 90 insertions(+), 9 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index cd2d4efa8..53291a814 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -1400,6 +1400,8 @@ URL: [url]',
 'settings_available_languages_desc' => 'اللغات الموجودة',
 'settings_backupDir' => 'backupDir',
 'settings_backupDir_desc' => 'backupDir',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'cacheDir',
 'settings_cacheDir_desc' => 'cacheDir',
 'settings_Calendar' => 'اعدادات التقويم',
@@ -1852,6 +1854,7 @@ URL: [url]',
 'splash_invalid_searchterm' => 'بحث غير صالح',
 'splash_invalid_search_service' => '',
 'splash_link_document' => 'رابط المستند',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'انتقلت الحافظة',
 'splash_move_document' => 'نقل المستند',
 'splash_move_folder' => 'نقل الملف',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 638bee68a..b72bf52db 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -1263,6 +1263,8 @@ $text = array(
 'settings_available_languages_desc' => '',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Кеш папка',
 'settings_cacheDir_desc' => 'къде се съхраняват превю картинките (най-добре да се избере папка която не е достъпна през web-server-а)',
 'settings_Calendar' => 'Настройки календар',
@@ -1715,6 +1717,7 @@ $text = array(
 'splash_invalid_searchterm' => '',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 6dc899353..376c8c35b 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -1268,6 +1268,8 @@ URL: [url]',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
@@ -1720,6 +1722,7 @@ URL: [url]',
 'splash_invalid_searchterm' => '',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 5e1c17a38..ddbfe9d0a 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -1472,6 +1472,8 @@ Jméno: [username]
 'settings_available_languages_desc' => 'Zvolí se pouze vybrané jazyky, které se zobrazí v seznamu jazyků. Výchozí jazyk bude vždy načten.',
 'settings_backupDir' => 'Záložní adresář',
 'settings_backupDir_desc' => 'Adresář, kde zálohovací nástroj ukládá zálohy. Pokud tento adresář není nastaven nebo není k němu přístup, zálohy budou uloženy v adresáři obsahu.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Adresář mezipaměti',
 'settings_cacheDir_desc' => 'Kde jsou uloženy náhledy obrázků (nejlepší zvolit adresář, který není přístupný přes webový server)',
 'settings_Calendar' => 'Nastavení kalendáře',
@@ -1924,6 +1926,7 @@ Jméno: [username]
 'splash_invalid_searchterm' => 'Neplatný vyhledávací dotaz',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Schránka přenesena do aktuální složky',
 'splash_move_document' => 'Dokument přesunut',
 'splash_move_folder' => 'Složka přesunuta',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 5a6724d31..b05acb3b3 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3154), dgrutsch (22)
+//    Translators: Admin (3158), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1804,6 +1804,8 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'settings_available_languages_desc' => 'Nur die hier ausgewählten Sprachen werden geladen und erscheinen bei der Sprachauswahl. Die voreingestellte Sprache wird immer geladen.',
 'settings_backupDir' => 'Sicherungs-Verzeichnis',
 'settings_backupDir_desc' => 'Verzeichnis in dem das Backup-Tool die Sicherungen ablegt. Wenn hier kein Wert gesetzt wird oder auf das Verzeichnis nicht zugriffen werden kann, dann werden die Sicherungen im Content-Verzeichnis abgelegt.',
+'settings_baseUrl' => 'Basis URL',
+'settings_baseUrl_desc' => 'Dies ist die URL des Servers ohne das HTTP Wurzelverzeichnis. In der Regel kann SeedDMS dies selbst bestimmen. Hinter einem Proxy gelingt dies aber nicht zuverlässig. Für diesen Fall können Sie die Basis URL hier setzen.',
 'settings_cacheDir' => 'Cache Verzeichnis',
 'settings_cacheDir_desc' => 'Verzeichnis in dem Vorschaubilder abgelegt werden. Dies sollte ein Verzeichnis sein, auf das man über den Web-Browser keinen direkten Zugriff hat.',
 'settings_Calendar' => 'Kalender-Einstellungen',
@@ -2256,6 +2258,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'splash_invalid_searchterm' => 'Ungültiger Suchbegriff',
 'splash_invalid_search_service' => 'Ungültiger Suchdienst',
 'splash_link_document' => 'Link hinzugefügt',
+'splash_mimetype_changed' => 'Mime-Type erfolgreich gerändert',
 'splash_moved_clipboard' => 'Inhalt der Zwischenablage in aktuellen Ordner verschoben',
 'splash_move_document' => 'Dokument verschoben',
 'splash_move_folder' => 'Ordner verschoben',
@@ -2358,7 +2361,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'task_description' => 'Beschreibung',
 'task_disabled' => 'Deaktiviert',
 'task_frequency' => 'Häufigkeit',
-'task_frequency_placeholder' => 'm h d m dow',
+'task_frequency_placeholder' => 'm h d m dow, or @daily, @hourly',
 'task_last_run' => 'Letzte Ausführung',
 'task_name' => 'Name',
 'task_next_run' => 'Nächste Ausführung',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 6def8ae2b..6f4ba01f6 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -1274,6 +1274,8 @@ URL: [url]',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => '',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '',
@@ -1726,6 +1728,7 @@ URL: [url]',
 'splash_invalid_searchterm' => '',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index e9e6a6162..d71f837fd 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2248), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2253), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -251,7 +251,7 @@ URL: [url]</p>',
 'attribute_value_not_in_valueset' => 'Value not in value set',
 'attr_malformed_boolean' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid boolean.',
 'attr_malformed_date' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid date.',
-'attr_malformed_email' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid URL.',
+'attr_malformed_email' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid email.',
 'attr_malformed_float' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid float.',
 'attr_malformed_int' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid integer.',
 'attr_malformed_url' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid URL.',
@@ -1807,6 +1807,8 @@ If you did not receive a password, please use the password forgotten function on
 'settings_available_languages_desc' => 'Only the selected languages will be loaded and show up in the language selector. The default language will always be loaded.',
 'settings_backupDir' => 'Backup directory',
 'settings_backupDir_desc' => 'Directory where the backup tool saves backups. If this directory is not set or cannot be accessed, then the backups will be saved in the content directory.',
+'settings_baseUrl' => 'Base URL',
+'settings_baseUrl_desc' => 'This is the URL without the HTTP root dir. Usually, this is determined by SeedDMS. Behind a proxy this can fail and in this case set it manually.',
 'settings_cacheDir' => 'Cache directory',
 'settings_cacheDir_desc' => 'Where the preview images are stored (best to choose a directory that is not accessible through your web-server)',
 'settings_Calendar' => 'Calendar settings',
@@ -2259,6 +2261,7 @@ If you did not receive a password, please use the password forgotten function on
 'splash_invalid_searchterm' => 'Invalid search term',
 'splash_invalid_search_service' => 'Invalid search service',
 'splash_link_document' => 'Link added',
+'splash_mimetype_changed' => 'Mimetype changed successfully',
 'splash_moved_clipboard' => 'Clipboard moved into current folder',
 'splash_move_document' => 'Document moved',
 'splash_move_folder' => 'Folder moved',
@@ -2361,7 +2364,7 @@ If you did not receive a password, please use the password forgotten function on
 'task_description' => 'Description',
 'task_disabled' => 'Disabled',
 'task_frequency' => 'Frequency',
-'task_frequency_placeholder' => 'm h d m dow',
+'task_frequency_placeholder' => 'm h d m dow, or @daily, @hourly',
 'task_last_run' => 'Last run',
 'task_name' => 'Name',
 'task_next_run' => 'Next run',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index a982be52c..f4ef83a82 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -1427,6 +1427,8 @@ URL: [url]',
 'settings_available_languages_desc' => 'Unicamente los lenguages seleccionados seran cargados y mostrados en el selector de lenguages. El lenguage por defecto siempre sera cargado',
 'settings_backupDir' => 'Directorio de copia de seguridad',
 'settings_backupDir_desc' => 'Directorio donde la herramienta  de respaldos guarda los respaldos. Si este directorio no se crea o no puede ser accedido, entonces los respaldos serán guardados en el directorio de contenido.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Carpeta caché',
 'settings_cacheDir_desc' => 'Donde están archivadas las imágenes anteriores (mejor elegir una carpeta que no sea accesible a través de su servidor web)',
 'settings_Calendar' => 'Configuración de calendario',
@@ -1879,6 +1881,7 @@ URL: [url]',
 'splash_invalid_searchterm' => 'Término de búsqueda inválido',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Portapapeles movido a la carpeta actual',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index cac907550..0d92ba8fa 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1790,6 +1790,8 @@ Nom : [username]
 'settings_available_languages_desc' => 'Seules les langues sélectionnées seront chargées et proposées dans le sélecteur de langue. La langue par défaut est systématiquement chargée.',
 'settings_backupDir' => 'Répertoire de sauvegarde',
 'settings_backupDir_desc' => 'Répertoire dans lequel l’outil de sauvegarde stocke les sauvegardes. Si aucune valeur n’est définie ou si le répertoire n’est pas accessible, les sauvegardes seront stockées dans le répertoire de contenu.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Répertoire Cache',
 'settings_cacheDir_desc' => 'Lieu de stockage des images de prévisualisation (choisir de préférence un dossier non accessible à travers le web-server)',
 'settings_Calendar' => 'Paramètres de l\'agenda',
@@ -2242,6 +2244,7 @@ Nom : [username]
 'splash_invalid_searchterm' => 'Recherche invalide',
 'splash_invalid_search_service' => '',
 'splash_link_document' => 'Lien ajouté',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Contenu du presse-papier déplacé vers le dossier en cours',
 'splash_move_document' => 'Document déplacé',
 'splash_move_folder' => 'Dossier déplacé',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index c9fafeb28..8b4537ec4 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1250), marbanas (16)
+//    Translators: Admin (1251), marbanas (16)
 
 $text = array(
 '2_factor_auth' => '2-faktorska autentikacija',
@@ -212,7 +212,7 @@ Internet poveznica: [url]',
 'attribute_value_not_in_valueset' => '',
 'attr_malformed_boolean' => '',
 'attr_malformed_date' => '',
-'attr_malformed_email' => 'Vrijednost atributa \'[value]\' za atribut \'[attrname]\' nije važeći URL.',
+'attr_malformed_email' => 'Vrijednost atributa \'[value]\' za atribut \'[attrname]\' nije važeći email.',
 'attr_malformed_float' => '',
 'attr_malformed_int' => '',
 'attr_malformed_url' => 'Vrijednost atributa \'[value]\' za atribut \'[attrname]\' nije važeći URL.',
@@ -1436,6 +1436,8 @@ Internet poveznica: [url]',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => 'Mapa za sigurnosnu kopiju',
 'settings_backupDir_desc' => 'Mapa gdje alat za sigurnosne kopije sprema podatke. Ako ova mapa nije postavljena ili joj se ne može pristupiti, tada se sigurnosne kopije spremaju u mapu sadržaja.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Mapa predmemorije',
 'settings_cacheDir_desc' => 'Gdje se spremaju slike pregleda (najbolje da odaberete mapu koja nije dostupna kroz vaš web-server)',
 'settings_Calendar' => 'Postavke kalendara',
@@ -1888,6 +1890,7 @@ Internet poveznica: [url]',
 'splash_invalid_searchterm' => 'Nevažeći traženi pojam',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Međuspremnik je premješten u trenutnu mapu',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index d4f23f05b..33020bc6a 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -1414,6 +1414,8 @@ URL: [url]',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => 'Mentés könyvtára',
 'settings_backupDir_desc' => 'Könyvtár, ahol a biztonsági mentési eszköz mentéseket készít. Ha ez a könyvtár nincs beállítva vagy nem érhető el, akkor a biztonsági másolatot a tartalom könyvtárba menti.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Átmeneti állományok könyvtára',
 'settings_cacheDir_desc' => 'Ahol az előnézeti képek tárolódnak (legjobb olyan könyvtárat választani, amit a web-kiszolgálón keresztül nem lehet elérni)',
 'settings_Calendar' => 'Naptár beállítások',
@@ -1866,6 +1868,7 @@ URL: [url]',
 'splash_invalid_searchterm' => 'Érvénytelen keresési feltétel',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Vágólap tartalom áthelyezve az aktuális mappába',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index 0b1f69d52..e350f55ee 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -1488,6 +1488,8 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'settings_available_languages_desc' => 'Hanya bahasa yang dipilih yang akan dimuat dan muncul di pemilih bahasa. Bahasa default akan selalu dimuat.',
 'settings_backupDir' => 'Direktori cadangan',
 'settings_backupDir_desc' => 'Direktori tempat alat pencadangan menyimpan cadangan. Jika direktori ini tidak disetel atau tidak dapat diakses, maka cadangan akan disimpan di direktori konten.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Direktori cache',
 'settings_cacheDir_desc' => 'Di mana gambar pratinjau disimpan (paling baik memilih direktori yang tidak dapat diakses melalui server web Anda)',
 'settings_Calendar' => 'Pengaturan kalender',
@@ -1940,6 +1942,7 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'splash_invalid_searchterm' => '',
 'splash_invalid_search_service' => '',
 'splash_link_document' => 'Tautan ditambahkan',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => '',
 'splash_move_document' => 'Dokumen dipindahkan',
 'splash_move_folder' => 'Folder dipindahkan',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index b329f50c7..4ca0d5e17 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -1463,6 +1463,8 @@ Name: [username]
 'settings_available_languages_desc' => 'Solo le lingue selezionate verranno caricate e mostrate nel selettore. La lingua predefinita sarà sempre caricata.',
 'settings_backupDir' => 'Directory di backup',
 'settings_backupDir_desc' => 'Directory in cui lo strumento di backup salva i backup. Se questa directory non è impostato o non è possibile accedervi, quindi i backup vengono salvati nella directory dei contenuti.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Cartella di cache',
 'settings_cacheDir_desc' => 'Cartella in cui vengono conservate le immagini di anteprima, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.',
 'settings_Calendar' => 'Impostazioni calendario',
@@ -1915,6 +1917,7 @@ Name: [username]
 'splash_invalid_searchterm' => 'Termine di ricerca non valido',
 'splash_invalid_search_service' => '',
 'splash_link_document' => 'Collegamento aggiunto',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente',
 'splash_move_document' => 'Documento spostato',
 'splash_move_folder' => 'Cartella spostato',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 125527d64..854106a58 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -1430,6 +1430,8 @@ URL : [url]',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => '백업 디랙토리',
 'settings_backupDir_desc' => '백업 도구가 백업을 저장할 디렉토리. 이 디렉토리가 설정되어 있지 않거나 액세스 할 수 없는 경우 백업은 컨텐츠 디렉토리에 저장 됩니다.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => '캐시 디렉토리',
 'settings_cacheDir_desc' => '미리보기 이미지 에 저장된다.(웹 서버를 통해 액세스 할 수없는 디렉토리를 선택하는 것이 좋습니다)',
 'settings_Calendar' => '캘린더 설정',
@@ -1882,6 +1884,7 @@ URL : [url]',
 'splash_invalid_searchterm' => '잘못된 검색 범위',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => '클립 보드가 현재 폴더로 이동',
 'splash_move_document' => '문서 옮겨짐',
 'splash_move_folder' => '폴더 옮겨짐',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index d8edb5a13..d91d7c9ee 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -1456,6 +1456,8 @@ URL: [url]',
 'settings_available_languages_desc' => 'ລະບົບຈະໂຫລດສະເພາະພາສາທີ່ເລືອກແລະສະແດງໃນຕົວເລືອກ ພາສາເລີ້ມຕົ້ນຈະຖືກໂຫລດສະເໝີ',
 'settings_backupDir' => 'ໄດເລັກທໍລີສຳຮອງ',
 'settings_backupDir_desc' => 'ໄດເລິກທໍລີ້ເຄື່ອງມືສຳຮອງຈະບັນທຶກຂໍ້ມູນສຳຮອງ ຖ້າບບໍ່ມີການຕັ້ງຄ່າໄດ້ເລັກທໍລີ້ນີ້ຫຼືບໍ່ສາມາດເຂົ້າເຖິງໄດ້ການສຳຮອງຂໍ້ມູນຈະໄດ້ຮັບການບັນທຶກເນື້ອຫາໄວ້ໃນໄດເລັກທໍລີ້',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'ແຄຣໄດ້ເລັກທໍລີ້',
 'settings_cacheDir_desc' => 'ບ່ອນເກັບຮູບພາບຕົວຢ່າງໄວ້ ເລືອກໄດເລັກທໍລີທີບໍ່ສາມາດເຂົ້າເຖິງໄດ້ຈາກເວັບເຊີເວີຂອງເຈົ້າ',
 'settings_Calendar' => 'ການຕັ້ງຄ່າປະຕິທິນ',
@@ -1908,6 +1910,7 @@ URL: [url]',
 'splash_invalid_searchterm' => 'ຄຳຄົນຫາບໍ່ຖືກຕ້ອງ',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'ຍ້າຍຄິບບອດໄປທີ່ໂຟລເດີປັດຈຸບັນແລ້ວ',
 'splash_move_document' => 'ຍ້າຍເອກະສານແລ້ວ',
 'splash_move_folder' => 'ຍ້າຍໂຟລເດີແລ້ວ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 621c36a29..b233e49fa 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -1469,6 +1469,8 @@ Bruker: [username]
 'settings_available_languages_desc' => 'Bare de valgte språkene lastes inn og vises i språkvelgeren. Standardspråket lastes alltid.',
 'settings_backupDir' => 'Sikkerhetskopi mappe',
 'settings_backupDir_desc' => 'Mappe der sikkerhetskopieringsverktøyet lagrer sikkerhetskopier. Hvis denne mappen ikke er angitt eller ikke kan nås, vil sikkerhetskopiene lagres i innholdskatalogen.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Cache-mappe',
 'settings_cacheDir_desc' => 'Hvor forhåndsvisningsbildene er lagret (best å velge en mappe som ikke er tilgjengelig via webserveren)',
 'settings_Calendar' => 'Kalender innstillinger',
@@ -1921,6 +1923,7 @@ Bruker: [username]
 'splash_invalid_searchterm' => 'Ugyldig søkeord',
 'splash_invalid_search_service' => '',
 'splash_link_document' => 'Link lagt til',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Utklippstavlen flyttet inn i gjeldende mappe',
 'splash_move_document' => 'Dokumentet flyttet',
 'splash_move_folder' => 'Mappen flyttet',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index c5420ad25..0e6907585 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -1468,6 +1468,8 @@ Name: [username]
 'settings_available_languages_desc' => 'Alleen de geselecteerde vertalingen worden beschikbaar in het taal-selectie-menu. De default-taal (EN) wordt altijd geladen.',
 'settings_backupDir' => 'Instellingen backupmap',
 'settings_backupDir_desc' => 'Instellingen vd backupmap',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'cache directory',
 'settings_cacheDir_desc' => 'De map waar de voorbeeldafbeeldingen zijn opgeslagen (het is het beste om te kiezen voor een map die niet toegankelijk voor uw webserver)',
 'settings_Calendar' => 'Instellingen van de agenda',
@@ -1920,6 +1922,7 @@ Name: [username]
 'splash_invalid_searchterm' => 'Ongeldige zoekterm',
 'splash_invalid_search_service' => '',
 'splash_link_document' => 'Link toegevoegd',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map',
 'splash_move_document' => 'Document verplaatst',
 'splash_move_folder' => 'Map verplaatst',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 53770f872..2b63f19be 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1693), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (1694), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => 'Uwierzytelnianie dwuetapowe',
@@ -507,7 +507,7 @@ URL: [url]',
 'dropfolder_metadata' => '',
 'dropupload' => 'Szybki upload',
 'drop_files_here' => 'Przeciągnij tu pliki!',
-'drop_files_here_or_click' => '',
+'drop_files_here_or_click' => 'Upuść plik lub kliknij aby dodać',
 'dump_creation' => 'Utworzenie zrzutu bazy danych',
 'dump_creation_warning' => 'Ta operacja utworzy plik będący zrzutem zawartości bazy danych. Po utworzeniu plik zrzutu będzie się znajdował w folderze danych na serwerze.',
 'dump_list' => 'Istniejące pliki zrzutu',
@@ -1399,6 +1399,8 @@ Name: [username]
 'settings_available_languages_desc' => 'Tylko wybrane języki zostaną załadowane i będą widoczne w kontrolce wyboru języka. Domyślny język zawsze jest ładowany.',
 'settings_backupDir' => 'Lokalizacja kopii zapasowej',
 'settings_backupDir_desc' => 'Katalog, w którym narzędzie do tworzenia kopii zapasowych zapisuje kopie zapasowe. Jeśli ten katalog nie jest ustawiony lub nie można uzyskać do niego dostępu, kopie zapasowe zostaną zapisane w katalogu zawartości.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Folder bufora',
 'settings_cacheDir_desc' => 'Miejsce przechowywania obrazków podglądu (najlepiej wybrać katalog niedostępny bezpośrednio dla web-serwera).',
 'settings_Calendar' => 'Ustawienia kalendarza',
@@ -1851,6 +1853,7 @@ Name: [username]
 'splash_invalid_searchterm' => 'Nieprawidłowa wartość wyszukiwania',
 'splash_invalid_search_service' => '',
 'splash_link_document' => 'Dodano link',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Schowek został przeniesiony do bieżącego folderu',
 'splash_move_document' => 'Dokument został przeniesiony',
 'splash_move_folder' => 'Folder został przeniesiony',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 4d6f0ff28..387fe8297 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -1475,6 +1475,8 @@ Nome: [username]
 'settings_available_languages_desc' => 'Apenas os idiomas selecionados serão carregados e mostrados no seletor de idioma. O idioma padrão sempre será carregado.',
 'settings_backupDir' => 'Diretório de backup',
 'settings_backupDir_desc' => 'Diretório onde a ferramenta de backup salva backups. Se esse diretório não estiver definido ou não puder ser acessado, os backups serão salvos no diretório de conteúdo.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Diretório de cache',
 'settings_cacheDir_desc' => 'Onde as imagens de visualização são armazenadas (melhor escolher um diretório que não é acessível através de seu web-server)',
 'settings_Calendar' => 'Configurações do calendário',
@@ -1927,6 +1929,7 @@ Nome: [username]
 'splash_invalid_searchterm' => 'Termo de pesquisa inválido',
 'splash_invalid_search_service' => '',
 'splash_link_document' => 'documento de link inicial',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Área de transferência movida para a pasta corrente',
 'splash_move_document' => 'Documento movido',
 'splash_move_folder' => 'Pasta movida',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 95c207800..4801f802d 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -1437,6 +1437,8 @@ URL: [url]',
 'settings_available_languages_desc' => 'Numai limbile selectate vor fii incarcate la accesare. Limba default va fii mereu incarcata',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Director Cache',
 'settings_cacheDir_desc' => 'Unde sunt stocate imaginile de previzualizare (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_Calendar' => 'Setări calendar',
@@ -1889,6 +1891,7 @@ URL: [url]',
 'splash_invalid_searchterm' => 'Termen de căutare invalid',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Clipboard mutat în folderul curent',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 6f2929ddc..2db444d2c 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -1444,6 +1444,8 @@ URL: [url]',
 'settings_available_languages_desc' => 'Только выбранные языки будут загружены и доступны для выбора. Язык по умолчанию будет загружен всегда.',
 'settings_backupDir' => 'Каталог резервного копирования',
 'settings_backupDir_desc' => 'Каталог, в котором средство резервного копирования сохраняет резервные копии. Если этот каталог не установлен или в него отсутствует доступ, то резервные копии будут сохранены в каталоге содержимого.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Каталог кэша',
 'settings_cacheDir_desc' => 'Где хранятся эскизы изображений (лучше выбрать каталог недоступный веб-серверу).',
 'settings_Calendar' => 'Настройки календаря',
@@ -1896,6 +1898,7 @@ URL: [url]',
 'splash_invalid_searchterm' => 'Неверный поисковый запрос',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Буфер обмена перенесён в текущий каталог',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index a5915ef6f..4d3ec5b54 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -1477,6 +1477,8 @@ Meno: [username]
 'settings_available_languages_desc' => 'Only the selected languages will be loaded and show up in the language selector. The default language will always be loaded.',
 'settings_backupDir' => 'Zložka na zálohovanie',
 'settings_backupDir_desc' => 'Directory where the backup tool saves backups. If this directory is not set or cannot be accessed, then the backups will be saved in the content directory.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Zložka medzipamäte',
 'settings_cacheDir_desc' => 'Where the preview images are stored (best to choose a directory that is not accessible through your web-server)',
 'settings_Calendar' => 'Nastavenie kalendára',
@@ -1929,6 +1931,7 @@ Meno: [username]
 'splash_invalid_searchterm' => 'Invalid search term',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Schránka sa presunula do aktuálnej zložky',
 'splash_move_document' => 'Dokument bol presunutý',
 'splash_move_folder' => 'Zložka bola presunutá',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index aa1f8b68a..050785cd5 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -1450,6 +1450,8 @@ Kommentar: [comment]',
 'settings_available_languages_desc' => 'Bara de valda språken kommer att laddas och visas i språk väljaren. Det förvalda språket kommer alltid att laddas.',
 'settings_backupDir' => 'Sökväg till backuper',
 'settings_backupDir_desc' => 'Sökväg till katalogen dit backupverktyget skriver backuper. Om sökväg saknas eller åtkomst inte medges, skrivs backuper till dokumentkatalogen.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Cache-mapp',
 'settings_cacheDir_desc' => 'Här kommer bilder för förhandsvisning att sparas. (Det är bäst att använda en mapp som inte är tillgänglig från webbservern)',
 'settings_Calendar' => 'Kalenderinställningar',
@@ -1902,6 +1904,7 @@ Kommentar: [comment]',
 'splash_invalid_searchterm' => 'Ogiltigt sökord',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Urklipp flyttades till aktuell katalog',
 'splash_move_document' => 'Dokumentet flyttat',
 'splash_move_folder' => 'Katalogen flyttad',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 9bf9d1bb5..9217c1c7d 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -1416,6 +1416,8 @@ URL: [url]',
 'settings_available_languages_desc' => 'Sil seçim kutucuğunda yalnızca seçili diller yüklenecek ve görüntülenecektir.',
 'settings_backupDir' => '',
 'settings_backupDir_desc' => '',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Cache klasörü',
 'settings_cacheDir_desc' => 'Önizleme resimlerinin depolanacağı yer (web üzerinden erişilemeyen bir yer tercih etmeniz önerilir.)',
 'settings_Calendar' => 'Takvim ayarları',
@@ -1868,6 +1870,7 @@ URL: [url]',
 'splash_invalid_searchterm' => 'Hatalı arama terimi',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Pano mevcut klasöre taşındı',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 92ae8c0ca..1e80aaf1a 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -1437,6 +1437,8 @@ URL: [url]',
 'settings_available_languages_desc' => '',
 'settings_backupDir' => 'Каталог резервних копій',
 'settings_backupDir_desc' => 'Каталог, в якому інструмент резервного копіювання зберігає резервні копії. Якщо цей каталог не встановлений або до нього не має доступу, то резервні копії будуть збережені в каталозі вмісту.',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Каталог кешу',
 'settings_cacheDir_desc' => 'Де зберігаються ескізи зображень (краще вибрати каталог, недоступний веб-серверові).',
 'settings_Calendar' => 'Налаштування календаря',
@@ -1889,6 +1891,7 @@ URL: [url]',
 'splash_invalid_searchterm' => 'Невірний пошуковий запит',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => 'Буфер обміну перенесено в поточний каталог',
 'splash_move_document' => '',
 'splash_move_folder' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 7913315c8..7f8c948f2 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -1424,6 +1424,8 @@ URL: [url]',
 'settings_available_languages_desc' => '只有选中的语言会被显示在语言选>择框内。默认的语言始终可选。',
 'settings_backupDir' => '备份目录',
 'settings_backupDir_desc' => '备份保存的目录。如果该目录未设置或无法访问则备份将保存在内容目录中。',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => 'Cashe 缓存目录',
 'settings_cacheDir_desc' => '预览图像存储的位置(最好选择一个无法通过网络服务器访问的目录)',
 'settings_Calendar' => '日历设置',
@@ -1876,6 +1878,7 @@ URL: [url]',
 'splash_invalid_searchterm' => '无效的搜索项',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => '剪贴板移到当前文件夹',
 'splash_move_document' => '文档已迁移',
 'splash_move_folder' => '文件夹已迁移',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 51d638b7d..c37878e9d 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -1475,6 +1475,8 @@ URL: [url]',
 'settings_available_languages_desc' => '僅所選語言會被加載並顯示在語言選擇器中。默認語言將始終被加載。',
 'settings_backupDir' => '備份目錄',
 'settings_backupDir_desc' => '備份工具保存備份的目錄。如果未設置此目錄或無法訪問該目錄，則備份將保存在內容目錄中。',
+'settings_baseUrl' => '',
+'settings_baseUrl_desc' => '',
 'settings_cacheDir' => '緩存目錄',
 'settings_cacheDir_desc' => '預覽圖像的存儲位置（最好選擇無法通過Web服務器訪問的目錄）',
 'settings_Calendar' => '日曆設定',
@@ -1927,6 +1929,7 @@ URL: [url]',
 'splash_invalid_searchterm' => '搜尋字詞無效',
 'splash_invalid_search_service' => '',
 'splash_link_document' => '鏈接已添加',
+'splash_mimetype_changed' => '',
 'splash_moved_clipboard' => '剪貼簿已移至當前文件夾',
 'splash_move_document' => '文件已移走',
 'splash_move_folder' => '文件夾已移動',

From 27b19f5c3ae33221048ddc6f7e21bb89f96714d5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Feb 2023 06:50:15 +0100
Subject: [PATCH 1822/2006] start version 5.1.30

---
 CHANGELOG           | 4 ++++
 inc/inc.Version.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index aa61edd6e..7627a500a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.30
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.29
 --------------------------------------------------------------------------------
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 552f28df9..2003b0c1a 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version { /* {{{ */
 
-	const _number = "5.1.29";
+	const _number = "5.1.30";
 	const _string = "SeedDMS";
 
 	function __construct() {

From 6fd8d3e7f5f6676a4d32a0803d8612a0775975c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Feb 2023 07:16:50 +0100
Subject: [PATCH 1823/2006] log error when execution of command fails

---
 inc/inc.ClassConversionServiceExec.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassConversionServiceExec.php b/inc/inc.ClassConversionServiceExec.php
index 71e530732..b16ec08c3 100644
--- a/inc/inc.ClassConversionServiceExec.php
+++ b/inc/inc.ClassConversionServiceExec.php
@@ -49,6 +49,7 @@ class SeedDMS_ConversionServiceExec extends SeedDMS_ConversionServiceBase {
 		);
 		$pipes = array();
 
+		$orgtimeout = $timeout;
 		$timeout += time();
 		// Putting an 'exec' before the command will not fork the command
 		// and therefore not create any child process. proc_terminate will
@@ -84,7 +85,7 @@ class SeedDMS_ConversionServiceExec extends SeedDMS_ConversionServiceBase {
 		fclose($pipes[2]);
 		if ($timeleft <= 0) {
 			proc_terminate($process);
-			throw new Exception("command timeout on: " . $cmd);
+			throw new Exception("command timeout after ".$orgtimeout." secs on: " . $cmd);
 		} else {
 			$return_value = proc_close($process);
 			return array('stdout'=>$output, 'stderr'=>$error, 'return'=>$return_value);
@@ -169,6 +170,9 @@ class SeedDMS_ConversionServiceExec extends SeedDMS_ConversionServiceBase {
 			if($hastempfile)
 				unlink($tmpfile);
 			$this->success = false;
+			if($this->logger) {
+				$this->logger->log('Conversion from '.$this->from.' to '.$this->to.' with cmd "'.$this->cmd.'" failed: '.$e->getMessage(), PEAR_LOG_ERR);
+			}
 			return false;
 		}
 		$end = microtime(true);

From 6c6b754e526d8c81c7fbbf136bce0de6d2674873 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 10 Feb 2023 10:17:16 +0100
Subject: [PATCH 1824/2006] remove duplicate class 'alert-warning' in drag&drop
 box for attachments

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index a229be4a9..fd3c33fc6 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1548,7 +1548,7 @@ $(document).ready( function() {
 			if ($document->getAccessMode($user) >= M_READWRITE){
 				if($enableDropUpload){
 ?>
-			<div id="draganddrophandler" class="well alert alert-warning" data-droptarget="attachment_<?= $document->getID(); ?>" data-target="<?= $document->getID(); ?>" data-uploadformtoken="<?= createFormKey('addfile'); ?>"><?php echo $this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'alert alert-warning'), getMLText('drop_files_here_or_click'), false, true); ?></div>
+			<div id="draganddrophandler" class="well alert alert-warning" data-droptarget="attachment_<?= $document->getID(); ?>" data-target="<?= $document->getID(); ?>" data-uploadformtoken="<?= createFormKey('addfile'); ?>"><?php echo $this->html_link('AddFile', array('documentid'=>$documentid), array(), getMLText('drop_files_here_or_click'), false, true); ?></div>
 <?php
 				} else {
 					print $this->html_link('AddFile', array('documentid'=>$documentid), array('class'=>'btn btn-primary'), getMLText("add"), false, true)."\n";

From d07219a213c01bcdb647f25b074dd6aae16c3934 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 12 Feb 2023 14:33:51 +0100
Subject: [PATCH 1825/2006] add list of conversion and notification services

---
 out/out.ConversionServices.php               | 47 ++++++++++++++
 out/out.NotificationServices.php             |  2 +-
 views/bootstrap/class.ConversionServices.php | 68 ++++++++++++++++++++
 3 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 out/out.ConversionServices.php
 create mode 100644 views/bootstrap/class.ConversionServices.php

diff --git a/out/out.ConversionServices.php b/out/out.ConversionServices.php
new file mode 100644
index 000000000..53af0f5d5
--- /dev/null
+++ b/out/out.ConversionServices.php
@@ -0,0 +1,47 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.Authentication.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+if (!$settings->_enableDebugMode) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+if (!$accessop->check_view_access($view, $_GET)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+if($view) {
+	$view->setParam('settings', $settings);
+	$view->setParam('accessobject', $accessop);
+	$view->setParam('conversionmgr', $conversionmgr);
+	$view($_GET);
+	exit;
+}
+
diff --git a/out/out.NotificationServices.php b/out/out.NotificationServices.php
index f985d37ed..0bfdd317a 100644
--- a/out/out.NotificationServices.php
+++ b/out/out.NotificationServices.php
@@ -29,7 +29,7 @@ require_once("inc/inc.Authentication.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
 if (!$settings->_enableDebugMode) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
diff --git a/views/bootstrap/class.ConversionServices.php b/views/bootstrap/class.ConversionServices.php
new file mode 100644
index 000000000..6f9635ed1
--- /dev/null
+++ b/views/bootstrap/class.ConversionServices.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Implementation of Conversion Services view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2023 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which outputs the html page for Conversion Services view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2016 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_ConversionServices extends SeedDMS_Theme_Style {
+
+	/**
+	 * List all registered conversion services
+	 *
+	 */
+	function list_conversion_services($conversionmgr) { /* {{{ */
+		if(!$conversionmgr)
+			return;
+
+		$allservices = $conversionmgr->getServices();
+
+		echo "<table class=\"table table-condensed table-sm\">\n";
+		echo "<thead>";
+		echo "<tr><th>".getMLText('service_list_from')."</th><th>".getMLText('service_list_to')."</th><th>".getMLText('class_name')."</th><th>".getMLText('service_list_info')."</th></tr>\n";
+		echo "</thead>";
+		echo "<tbody>";
+		foreach($allservices as $from=>$tos) {
+			foreach($tos as $to=>$services) {
+				foreach($services as $service) {
+					echo "<tr><td>".$from."</td><td>".$to."</td><td>".get_class($service)."</td><td>".$service->getInfo()."</td></tr>";
+				}
+			}
+		}
+		echo "</tbody>";
+		echo "</table>\n";
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$conversionmgr = $this->params['conversionmgr'];
+
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+		$this->contentHeading(getMLText("list_conversion_services"));
+
+		self::list_conversion_services($conversionmgr);
+
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+

From 73562364b057b3feefdab8b2fb29f12ddafdf7fd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 12 Feb 2023 14:34:31 +0100
Subject: [PATCH 1826/2006] add debug menu in admin tools

---
 views/bootstrap/class.Bootstrap.php   | 12 ++++++++++++
 views/bootstrap4/class.Bootstrap4.php | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 295715ef5..d42a25bc6 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -929,6 +929,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				$menuitems['misc']['children']['version_info'] = array('link'=>$this->params['settings']->_httpRoot."out/out.Info.php", 'label'=>getMLText('version_info'));
 		}
 
+		if ($settings->_enableDebugMode) {
+			if($accessobject->check_view_access(array('Hooks', 'NotificationServices'))) {
+				$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
+				if ($accessobject->check_view_access('Hooks'))
+					$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
+				if ($accessobject->check_view_access('NotificationServices'))
+					$menuitems['debug']['children']['notification_services'] = array('link'=>"../out/out.NotificationServices.php", 'label'=>getMLText('list_notification_services'));
+				if ($accessobject->check_view_access('ConversionServices'))
+					$menuitems['debug']['children']['conversion_services'] = array('link'=>"../out/out.ConversionServices.php", 'label'=>getMLText('list_conversion_services'));
+			}
+		}
+
 		/* Do not use $this->callHook() because $menuitems must be returned by the the
 		 * first hook and passed to next hook. $this->callHook() will just pass
 		 * the menuitems to each single hook. Hence, the last hook will win.
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index fc812ef38..dfe2eab70 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -917,6 +917,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				$menuitems['misc']['children']['version_info'] = array('link'=>$this->params['settings']->_httpRoot."out/out.Info.php", 'label'=>getMLText('version_info'));
 		}
 
+		if ($settings->_enableDebugMode) {
+			if($accessobject->check_view_access(array('Hooks', 'NotificationServices'))) {
+				$menuitems['debug'] = array('link'=>"#", 'label'=>getMLText('debug'));
+				if ($accessobject->check_view_access('Hooks'))
+					$menuitems['debug']['children']['hooks'] = array('link'=>"../out/out.Hooks.php", 'label'=>getMLText('list_hooks'));
+				if ($accessobject->check_view_access('NotificationServices'))
+					$menuitems['debug']['children']['notification_services'] = array('link'=>"../out/out.NotificationServices.php", 'label'=>getMLText('list_notification_services'));
+				if ($accessobject->check_view_access('ConversionServices'))
+					$menuitems['debug']['children']['conversion_services'] = array('link'=>"../out/out.ConversionServices.php", 'label'=>getMLText('list_conversion_services'));
+			}
+		}
+
 		/* Do not use $this->callHook() because $menuitems must be returned by the the
 		 * first hook and passed to next hook. $this->callHook() will just pass
 		 * the menuitems to each single hook. Hence, the last hook will win.

From d45f050e46c6c1483eb67b423de132e4afb84d6e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 15 Feb 2023 08:27:37 +0100
Subject: [PATCH 1827/2006] conversion from pdf to png replaces alpha channel
 with white

---
 CHANGELOG                                    | 1 +
 inc/inc.ClassConversionServicePdfToImage.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 7627a500a..d396fba11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30
 --------------------------------------------------------------------------------
+- conversion from pdf to png replaces alpha channel with white
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.29
diff --git a/inc/inc.ClassConversionServicePdfToImage.php b/inc/inc.ClassConversionServicePdfToImage.php
index 349565232..4a7f1ce2e 100644
--- a/inc/inc.ClassConversionServicePdfToImage.php
+++ b/inc/inc.ClassConversionServicePdfToImage.php
@@ -64,6 +64,10 @@ class SeedDMS_ConversionServicePdfToImage extends SeedDMS_ConversionServiceBase
 			if($imagick->readImage($infile.'['.$page.']')) {
 				if(!empty($params['width']))
 					$imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0);
+				/* Remove alpha channel and set to white */
+        $imagick->setImageBackgroundColor('white');
+        $imagick->setImageAlphaChannel(Imagick::ALPHACHANNEL_REMOVE);
+        $imagick->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
 				$imagick->setImageFormat('png');
 				$end = microtime(true);
 				if($this->logger) {

From 7c973d9f3755a989e151c57a98e92d6b47254377 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 16 Feb 2023 11:35:19 +0100
Subject: [PATCH 1828/2006] fix inclusion of php files

---
 op/op.AddTransmittal.php  | 2 +-
 op/op.ReceiptDocument.php | 3 +--
 op/op.ReviseDocument.php  | 3 +--
 op/op.SetRecipients.php   | 2 +-
 op/op.SetRevisors.php     | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/op/op.AddTransmittal.php b/op/op.AddTransmittal.php
index 9909fd9e4..2ffce61f7 100644
--- a/op/op.AddTransmittal.php
+++ b/op/op.AddTransmittal.php
@@ -19,8 +19,8 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
diff --git a/op/op.ReceiptDocument.php b/op/op.ReceiptDocument.php
index 5bdfb8a5c..e90181ce5 100644
--- a/op/op.ReceiptDocument.php
+++ b/op/op.ReceiptDocument.php
@@ -19,13 +19,12 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
diff --git a/op/op.ReviseDocument.php b/op/op.ReviseDocument.php
index 1a4254be5..6f2d0de22 100644
--- a/op/op.ReviseDocument.php
+++ b/op/op.ReviseDocument.php
@@ -19,13 +19,12 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
-include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassController.php");
diff --git a/op/op.SetRecipients.php b/op/op.SetRecipients.php
index 69d77fa45..ea8880224 100644
--- a/op/op.SetRecipients.php
+++ b/op/op.SetRecipients.php
@@ -20,8 +20,8 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
diff --git a/op/op.SetRevisors.php b/op/op.SetRevisors.php
index 4c6b9568b..294ba0619 100644
--- a/op/op.SetRevisors.php
+++ b/op/op.SetRevisors.php
@@ -20,8 +20,8 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.LogInit.php");
 include("../inc/inc.Utils.php");
+include("../inc/inc.LogInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");

From bcd09778039c11e3781eb1ad3d8507821a8d5a69 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 16 Feb 2023 11:36:07 +0100
Subject: [PATCH 1829/2006] fix inclusion of php files

---
 op/op.AddToClipboard.php | 2 +-
 op/op.ChangePassword.php | 1 -
 op/op.Logout.php         | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.AddToClipboard.php b/op/op.AddToClipboard.php
index 27d33d62d..a2c2fe4b3 100644
--- a/op/op.AddToClipboard.php
+++ b/op/op.AddToClipboard.php
@@ -22,10 +22,10 @@
 include("../inc/inc.Settings.php");
 include("../inc/inc.Utils.php");
 include("../inc/inc.LogInit.php");
-include("../inc/inc.DBInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
diff --git a/op/op.ChangePassword.php b/op/op.ChangePassword.php
index 1c92b28ca..9c386635e 100644
--- a/op/op.ChangePassword.php
+++ b/op/op.ChangePassword.php
@@ -27,7 +27,6 @@ include("../inc/inc.Extension.php");
 include("../inc/inc.ClassSession.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
-require_once("../inc/inc.ClassAccessOperation.php");
 
 function _printMessage($heading, $message) {
 
diff --git a/op/op.Logout.php b/op/op.Logout.php
index 06af4bcc9..70d089139 100644
--- a/op/op.Logout.php
+++ b/op/op.Logout.php
@@ -21,6 +21,7 @@
 include("../inc/inc.Settings.php");
 include("../inc/inc.Utils.php");
 include("../inc/inc.LogInit.php");
+include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.ClassSession.php");

From 0b7d3cad2d08df739d3fe9992b9f4302841e39f2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 16 Feb 2023 17:28:37 +0100
Subject: [PATCH 1830/2006] add changes for 6.0.23

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 61c7db25e..8e4553e1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 6.0.22
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.28
+- fix setting recipients and revisors
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.21

From 513343c89a59eac7e8ee39036c0bca1584580e1f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 16 Feb 2023 17:29:29 +0100
Subject: [PATCH 1831/2006] add changes for 6.0.23

---
 CHANGELOG | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8e4553e1f..8201046a9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,12 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.23
+--------------------------------------------------------------------------------
+- fix setting recipients and revisors
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.22
 --------------------------------------------------------------------------------
 - merge changes up to 5.1.28
-- fix setting recipients and revisors
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.21

From 3e5497a7fdedb4c82f24459bd6e99e959923d236 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Feb 2023 06:57:42 +0100
Subject: [PATCH 1832/2006] add more error checking when including
 extensions.php

---
 inc/inc.ClassExtensionMgr.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php
index ae2e036c1..f409b6a51 100644
--- a/inc/inc.ClassExtensionMgr.php
+++ b/inc/inc.ClassExtensionMgr.php
@@ -122,9 +122,10 @@ class SeedDMS_Extension_Mgr {
 			if(!file_exists($this->getExtensionsConfFile())) {
 				$this->createExtensionConf();
 			}
-			include($this->getExtensionsConfFile());
-			if(!empty($EXT_CONF)) {
-				$this->extconf = $EXT_CONF;
+			if(@include($this->getExtensionsConfFile())) {
+				if(!empty($EXT_CONF)) {
+					$this->extconf = $EXT_CONF;
+				}
 			}
 		}
 	} /* }}} */

From bea6ab35a897ee98584dc53171fd0cce57507098 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Feb 2023 12:42:05 +0100
Subject: [PATCH 1833/2006] add changes in 5.1.30

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index d396fba11..732125b18 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 5.1.30
 --------------------------------------------------------------------------------
 - conversion from pdf to png replaces alpha channel with white
+- add list of conversion services in debug menu of admin tool
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.29

From 4e08744631471a26ea490cbc1e2025415a87ff19 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 Feb 2023 16:10:59 +0100
Subject: [PATCH 1834/2006] addDirSep() can check for arbitrary chars at end of
 string

---
 inc/inc.Utils.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 25d3a0ecb..ace755d68 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -663,16 +663,19 @@ function get_extension($mimetype) { /* {{{ */
 } /* }}} */
 
 /**
- * Adds a missing front slash to a string
+ * Adds a missing directory separator (or any other char) to a string
  *
  * This function is used for making sure a directory name has a
- * trailing directory separator
+ * trailing directory separator. It can also be used to add
+ * any other char at the end of a string, e.g. an URL which must
+ * end in '/' (DIRECTORY_SEPARATOR wouldn't be right in that case,
+ * because it is '\' on Windows)
  */
-function addDirSep($str) { /* {{{ */
+function addDirSep($str, $chr=DIRECTORY_SEPARATOR) { /* {{{ */
 	if(trim($str) == '')
 		return '';
-	if(substr(trim($str), -1, 1) != DIRECTORY_SEPARATOR)
-		return trim($str).DIRECTORY_SEPARATOR;
+	if(substr(trim($str), -1, 1) != $chr)
+		return trim($str).$chr;
 	else
 		return trim($str);
 } /* }}} */

From dc868bd83b5988350da90f7ccfc3e5205572e29b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 18 Feb 2023 15:49:04 +0100
Subject: [PATCH 1835/2006] getBaseUrl() checks for HTTP_X_FORWARDED_HOST and
 HTTP_X_FORWARDED_PROTO

---
 inc/inc.Utils.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index ace755d68..b33a24199 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -803,12 +803,12 @@ function getBaseUrl() { /* {{{ */
 	if(!empty($settings->_baseUrl))
 		return $settings->_baseUrl;
 
-	if(isset($_SERVER['X-Forwarded-Host']))
-		$host = $_SERVER['X-Forwarded-Host'];
+	if(isset($_SERVER['HTTP_X_FORWARDED_HOST']))
+		$host = $_SERVER['HTTP_X_FORWARDED_HOST'];
 	else
 		$host = $_SERVER['HTTP_HOST'];
-	if(isset($_SERVER['X-Forwarded-Proto']))
-		$ssl = $_SERVER['X-Forwarded-Proto'] == 'https';
+	if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']))
+		$ssl = $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
 	else
 		$ssl = (isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0));
 

From 535de29e7d890bc53fce9a99409cf50b80deaca6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 18 Feb 2023 15:49:55 +0100
Subject: [PATCH 1836/2006] check return value of postInitDMS

---
 inc/inc.DBInit.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index 9949c5e9f..2662bb2a0 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -61,7 +61,11 @@ $dms->setMaxDirID($settings->_maxDirID);
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
 		if (method_exists($hookObj, 'postInitDMS')) {
-			$hookObj->postInitDMS(array('dms'=>$dms, 'settings'=>$settings, 'logger'=>$logger));
+			$ret = $hookObj->postInitDMS(array('dms'=>$dms, 'settings'=>$settings, 'logger'=>$logger));
+			if($ret === false) {
+				echo "Fatal error in postInitDMS Hook. No way to recover.";
+				exit;
+			}
 		}
 	}
 }

From 2ffe130666a798c9494dcb634f3faba39e0d3f72 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Feb 2023 16:05:55 +0100
Subject: [PATCH 1837/2006] set theme to bootstrap4, fulltext engine to
 sqlitefts, turn on theme selector

---
 conf/settings.xml.template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/settings.xml.template b/conf/settings.xml.template
index 01704a1ce..84c4b9437 100644
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@@ -15,7 +15,7 @@
       footNote = "SeedDMS free document management system - www.seeddms.org"
       printDisclaimer = "true"
       language = "en_GB"
-      theme = "bootstrap"
+      theme = "bootstrap4"
       previewWidthList = "40"
       previewWidthDetail = "100"
       onePageMode="true"
@@ -60,8 +60,8 @@
       enableDropUpload = "false"
       enableRecursiveCount = "false"
       maxRecursiveCount = "0"
-      enableThemeSelector = "false"
-      fullSearchEngine = "lucene"
+      enableThemeSelector = "true"
+      fullSearchEngine = "sqlitefts"
       sortFoldersDefault = "u"
       defaultDocPosition = "end"
       defaultFolderPosition = "end"

From 44d043ef21afde8033d83d7bd90efd6cce028f6c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Feb 2023 16:06:43 +0100
Subject: [PATCH 1838/2006] add fold marks

---
 inc/inc.ClassFulltextService.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/inc.ClassFulltextService.php b/inc/inc.ClassFulltextService.php
index 23309cf6c..131a4f747 100644
--- a/inc/inc.ClassFulltextService.php
+++ b/inc/inc.ClassFulltextService.php
@@ -181,14 +181,14 @@ class SeedDMS_FulltextService {
 	 * document if its content is below the configured size.
 	 * @return object indexed Document ready for passing to the indexer
 	 */
-	public function IndexedDocument($object, $forceupdate=false) {
+	public function IndexedDocument($object, $forceupdate=false) { /* {{{ */
 		if($object->isType('document'))
 			$nocontent = $object->getLatestContent()->getFileSize() > $this->maxsize && $this->maxsize && !$forceupdate;
 		else
 			$nocontent = true;
 		$convcallback = $this->getConversionWithPreviewCallback();
 		return new $this->services[0]['IndexedDocument']($object->getDMS(), $object, $convcallback /*$this->conversionmgr ? $this->conversionmgr : $this->converters*/, $nocontent, $this->cmdtimeout);
-	}
+	} /* }}} */
 
 	/**
 	 * Returns an instance of the indexer
@@ -198,7 +198,7 @@ class SeedDMS_FulltextService {
 	 *
 	 * @return object instance of class specified in 'Indexer'
 	 */
-	public function Indexer($recreate=false) {
+	public function Indexer($recreate=false) { /* {{{ */
 		if($this->index)
 			return $this->index;
 
@@ -210,9 +210,9 @@ class SeedDMS_FulltextService {
 			return $this->index;
 		} else
 			return null;
-	}
+	} /* }}} */
 
-	public function Search() {
+	public function Search() { /* {{{ */
 		if($this->search)
 			return $this->search;
 		if($this->services[0]) {
@@ -221,7 +221,7 @@ class SeedDMS_FulltextService {
 		} else {
 			return null;
 		}
-	}
+	} /* }}} */
 }
 
 

From a7b00ae22add12e10641d8ae582db6c9777767be Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Feb 2023 16:07:22 +0100
Subject: [PATCH 1839/2006] add new key 'attrcallback' to configuration of
 fulltext engine

---
 inc/inc.FulltextInit.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index 450086571..53cfec9a5 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -1,5 +1,11 @@
 <?php
 
+function getAttributesCallback($dms) {
+	return function () use ($dms) {
+		return $dms->getAllAttributeDefinitions();
+	};
+}
+
 $fulltextservice = null;
 if($settings->_enableFullSearch) {
 	require_once("inc.ClassFulltextService.php");
@@ -10,7 +16,10 @@ if($settings->_enableFullSearch) {
 			'Indexer' => 'SeedDMS_SQLiteFTS_Indexer',
 			'Search' => 'SeedDMS_SQLiteFTS_Search',
 			'IndexedDocument' => 'SeedDMS_SQLiteFTS_IndexedDocument',
-			'Conf' => array('indexdir' => $settings->_luceneDir)
+			'Conf' => array(
+				'indexdir' => $settings->_luceneDir,
+				'attrcallback' => getAttributesCallback($dms)
+			)
 		);
 		$fulltextservice->addService('sqlitefts', $indexconf);
 

From e21e301ea3048e79d79e1645e2a188f371c44ccd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2023 08:30:34 +0100
Subject: [PATCH 1840/2006] use chosen select for custom attributes

---
 CHANGELOG                             | 1 +
 views/bootstrap4/class.Bootstrap4.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 732125b18..92d1cd25d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - conversion from pdf to png replaces alpha channel with white
 - add list of conversion services in debug menu of admin tool
+- use chosen select for custom attributes
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.29
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index dfe2eab70..58fb5b981 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1994,7 +1994,7 @@ $(document).ready(function() {
 		default:
 			if($valueset = $attrdef->getValueSetAsArray()) {
 				$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\"/>";
-				$content .= "<select class=\"form-control\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]";
+				$content .= "<select id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]";
 				if($attrdef->getMultipleValues() || $alwaysmultiple) {
 					$content .= "[]\" multiple";
 				} else {

From 9e6e13a041118983a2568bed3d9266283e092377 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2023 09:59:45 +0100
Subject: [PATCH 1841/2006] add method getContrastColor()

---
 inc/inc.ClassViewCommon.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 05021234f..04e31cd10 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -355,4 +355,12 @@ class SeedDMS_View_Common {
 		}
 		echo "};\n";
 	} /* }}} */
+
+	public static function getContrastColor($hexcolor) { /* {{{ */
+		$r = hexdec(substr($hexcolor, 1, 2));
+		$g = hexdec(substr($hexcolor, 3, 2));
+		$b = hexdec(substr($hexcolor, 5, 2));
+		$yiq = (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
+		return ($yiq >= 148) ? '000000' : 'ffffff';
+	} /* }}} */
 }

From 05c0f296fca7d3d0e0903edd4e2bfa351589b843 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2023 10:00:31 +0100
Subject: [PATCH 1842/2006] place button with color of category in front of
 title in select menu

---
 views/bootstrap/class.Categories.php   | 3 ++-
 views/bootstrap/styles/application.js  | 2 ++
 views/bootstrap4/styles/application.js | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index 356ed03db..53d4fa377 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -150,7 +150,8 @@ $(document).ready( function() {
 		$options[] = array("-1", getMLText("choose_category"));
 		$options[] = array("0", getMLText("new_document_category"));
 		foreach ($categories as $category) {
-			$options[] = array($category->getID(), htmlspecialchars($category->getName()), $selcat && $category->getID()==$selcat->getID(), array(array('data-subtitle', $category->countDocumentsByCategory().' '.getMLText('documents'))));
+			$color = substr(md5($category->getName()), 0, 6);
+			$options[] = array($category->getID(), htmlspecialchars($category->getName()), $selcat && $category->getID()==$selcat->getID(), array(array('data-before-title', "<i class='fa fa-circle' style='color: #".$color.";'></i> "), array('data-subtitle', $category->countDocumentsByCategory().' '.getMLText('documents'))));
 		}
 		$this->formField(
 			null, //getMLText("selection"),
diff --git a/views/bootstrap/styles/application.js b/views/bootstrap/styles/application.js
index 23ef17802..1eb3d2243 100644
--- a/views/bootstrap/styles/application.js
+++ b/views/bootstrap/styles/application.js
@@ -12,6 +12,8 @@ chzn_template_func =  function (state) {
 	if($(state.element).data('warning'))
 		warning = $(state.element).data('warning')+''; /* make sure it is a string */
 	var html = '<span>';
+	if($(state.element).data('before-title'))
+		html += $(state.element).data('before-title')+'';
 	if($(state.element).data('icon-before'))
 		html += '<i class="fa fa-'+$(state.element).data('icon-before')+'"></i> ';
 	html += state.text.replace(/</g, '&lt;')+'';
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index a6a46ad5c..419a92731 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -12,6 +12,8 @@ chzn_template_func =  function (state) {
 	if($(state.element).data('warning'))
 		warning = $(state.element).data('warning')+''; /* make sure it is a string */
 	var html = '<span>';
+	if($(state.element).data('before-title'))
+		html += $(state.element).data('before-title')+'';
 	if($(state.element).data('icon-before'))
 		html += '<i class="fa fa-'+$(state.element).data('icon-before')+'"></i> ';
 	html += state.text.replace(/</g, '&lt;')+'';

From ac3580aa1c9c4118554bf003c4b3ea452fee067c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2023 10:01:06 +0100
Subject: [PATCH 1843/2006] color category batch

---
 views/bootstrap/class.Bootstrap.php   | 6 ++++--
 views/bootstrap4/class.Bootstrap4.php | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index d42a25bc6..a5bd72e03 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -3166,8 +3166,10 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			}
 			if($categories = $document->getCategories()) {
 				$content .= "<br />";
-				foreach($categories as $category)
-					$content .= "<span class=\"badge bg-secondary\">".$category->getName()."</span> ";
+				foreach($categories as $category) {
+					$color = substr(md5($category->getName()), 0, 6);
+					$content .= "<span class=\"badge\" style=\"background-color: #".$color."; color: #".self::getContrastColor($color).";\">".$category->getName()."</span> ";
+				}
 			}
 			if(!empty($extracontent['bottom_title']))
 				$content .= $extracontent['bottom_title'];
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 58fb5b981..a4107fa80 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -3244,8 +3244,10 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			}
 			if($categories = $document->getCategories()) {
 				$content .= "<br />";
-				foreach($categories as $category)
-					$content .= "<span class=\"badge bg-secondary\">".$category->getName()."</span> ";
+				foreach($categories as $category) {
+					$color = substr(md5($category->getName()), 0, 6);
+					$content .= "<span class=\"badge\" style=\"background-color: #".$color."; color: #".self::getContrastColor($color).";\">".$category->getName()."</span> ";
+				}
 			}
 			if(!empty($extracontent['bottom_title']))
 				$content .= $extracontent['bottom_title'];

From 6301e9228e08e7034410fd1321edeae575edff8f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2023 10:02:31 +0100
Subject: [PATCH 1844/2006] add changes for 5.1.30

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 92d1cd25d..19def9fbf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - conversion from pdf to png replaces alpha channel with white
 - add list of conversion services in debug menu of admin tool
 - use chosen select for custom attributes
+- color category (use first 6 chars of md5(category name) as hex color)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.29

From 352446e9d8a7845b1ca5a4c51ee76904c3afab15 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2023 10:33:06 +0100
Subject: [PATCH 1845/2006] create missing preview images in category or
 attribute manager

---
 out/out.AttributeMgr.php               | 1 +
 out/out.Categories.php                 | 1 +
 views/bootstrap/class.AttributeMgr.php | 6 ++++--
 views/bootstrap/class.Categories.php   | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php
index f769f6900..fba8266df 100644
--- a/out/out.AttributeMgr.php
+++ b/out/out.AttributeMgr.php
@@ -47,6 +47,7 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) {
 }
 
 if($view) {
+	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
 	$view->setParam('attrdefs', $attrdefs);
diff --git a/out/out.Categories.php b/out/out.Categories.php
index ea5462135..e1ab501dd 100644
--- a/out/out.Categories.php
+++ b/out/out.Categories.php
@@ -46,6 +46,7 @@ if(isset($_GET['categoryid']) && $_GET['categoryid']) {
 }
 
 if($view) {
+	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('categories', $categories);
 	$view->setParam('selcategory', $selcat);
 	$view->setParam('accessobject', $accessop);
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index dc9e09cd9..097069356 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -67,6 +67,7 @@ $(document).ready( function() {
 	function info() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$attrdefs = $this->params['attrdefs'];
 		$selattrdef = $this->params['selattrdef'];
 		$cachedir = $this->params['cachedir'];
@@ -134,13 +135,15 @@ $(document).ready( function() {
 				}
 			}
 
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+			if($conversionmgr)
+				$previewer->setConversionMgr($conversionmgr);
 			if($res['folders'] || $res['docs']) {
 				print $this->folderListHeader();
 				print "<tbody>\n";
 				foreach($res['folders'] as $subFolder) {
 					echo $this->folderListRow($subFolder);
 				}
-				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 				foreach($res['docs'] as $document) {
 					echo $this->documentListRow($document, $previewer);
 				}
@@ -156,7 +159,6 @@ $(document).ready( function() {
 				print "<th>".getMLText("status")."</th>\n";
 				print "<th>".getMLText("action")."</th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
-				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 				foreach($res['contents'] as $content) {
 					$doc = $content->getDocument();
 					echo $this->documentListRow($doc, $previewer);
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index 53d4fa377..b623a3c10 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -51,6 +51,7 @@ $(document).ready( function() {
 	function info() { /* {{{ */
 		$dms = $this->params['dms'];
 		$selcat = $this->params['selcategory'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$timeout = $this->params['timeout'];
@@ -68,6 +69,8 @@ $(document).ready( function() {
 				print $this->folderListHeader();
 				print "<tbody>\n";
 				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+				if($conversionmgr)
+					$previewer->setConversionMgr($conversionmgr);
 				foreach($documents as $doc) {
 					echo $this->documentListRow($doc, $previewer);
 				}

From b5be1c849052ca2582689b490a64c24811edb372 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 22 Feb 2023 10:33:31 +0100
Subject: [PATCH 1846/2006] add changes for 5.1.30

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 19def9fbf..a399113f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - add list of conversion services in debug menu of admin tool
 - use chosen select for custom attributes
 - color category (use first 6 chars of md5(category name) as hex color)
+- create missing preview images in category or attribute manager
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.29

From d8f79b846ec004e48dff4ed1ac74fb6b3c359af9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Feb 2023 07:17:17 +0100
Subject: [PATCH 1847/2006] pass correct depth in callback of
 SeedDMS_FolderTree

---
 inc/inc.Utils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index b33a24199..35c9df96d 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -1129,7 +1129,7 @@ class SeedDMS_FolderTree { /* {{{ */
 		$iter = new \SeedDMS\Core\RecursiveFolderIterator($folder);
 		$iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::SELF_FIRST);
 		foreach($iter2 as $ff) {
-			call_user_func($callback, $ff, $iter2->getDepth());
+			call_user_func($callback, $ff, $iter2->getDepth()+1);
 //      echo $ff->getID().': '.$ff->getFolderPathPlain().'-'.$ff->getName()."<br />";
 		}
 	} /* }}} */

From e2d94d2e567f0302c0177a89648480ac9bc2aef7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Feb 2023 07:18:14 +0100
Subject: [PATCH 1848/2006] depth is now one less then before

---
 views/bootstrap/class.Indexer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Indexer.php b/views/bootstrap/class.Indexer.php
index 5549d0f44..ffd3fafad 100644
--- a/views/bootstrap/class.Indexer.php
+++ b/views/bootstrap/class.Indexer.php
@@ -37,7 +37,7 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
 
 	public function process($folder, $depth=0) { /* {{{ */
 		$lucenesearch = $this->fulltextservice->Search();
-		echo "<div class=\"folder\" style=\"margin-left: ".(($depth+1)*18)."px\"><i class=\"fa fa-folder\"></i> ".$folder->getId().":".htmlspecialchars($folder->getFolderPathPlain());
+		echo "<div class=\"folder\" style=\"margin-left: ".(($depth+0)*18)."px\"><i class=\"fa fa-folder\"></i> ".$folder->getId().":".htmlspecialchars($folder->getFolderPathPlain());
 		/* If the document wasn't indexed before then just add it */
 		if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
 			echo " <span id=\"status_F".$folder->getID()."\" class=\"indexme indexstatus\" data-docid=\"F".$folder->getID()."\">".getMLText('index_waiting')."</span>";

From 04210265c03e338187bd12364ee2c2aef81a79f4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Feb 2023 08:24:11 +0100
Subject: [PATCH 1849/2006] add translations for conversion services

---
 languages/ar_EG/lang.inc | 4 ++++
 languages/bg_BG/lang.inc | 4 ++++
 languages/ca_ES/lang.inc | 4 ++++
 languages/cs_CZ/lang.inc | 4 ++++
 languages/de_DE/lang.inc | 6 +++++-
 languages/el_GR/lang.inc | 4 ++++
 languages/en_GB/lang.inc | 6 +++++-
 languages/es_ES/lang.inc | 4 ++++
 languages/fr_FR/lang.inc | 4 ++++
 languages/hr_HR/lang.inc | 4 ++++
 languages/hu_HU/lang.inc | 4 ++++
 languages/id_ID/lang.inc | 4 ++++
 languages/it_IT/lang.inc | 4 ++++
 languages/ko_KR/lang.inc | 4 ++++
 languages/lo_LA/lang.inc | 4 ++++
 languages/nb_NO/lang.inc | 4 ++++
 languages/nl_NL/lang.inc | 4 ++++
 languages/pl_PL/lang.inc | 4 ++++
 languages/pt_BR/lang.inc | 4 ++++
 languages/ro_RO/lang.inc | 4 ++++
 languages/ru_RU/lang.inc | 4 ++++
 languages/sk_SK/lang.inc | 4 ++++
 languages/sv_SE/lang.inc | 4 ++++
 languages/tr_TR/lang.inc | 4 ++++
 languages/uk_UA/lang.inc | 4 ++++
 languages/zh_CN/lang.inc | 4 ++++
 languages/zh_TW/lang.inc | 4 ++++
 27 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 53291a814..d458b4f2a 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -845,6 +845,7 @@ URL: [url]',
 'link_to_version' => 'رابط الإصدار',
 'list_access_rights' => 'لائحة حقوق الدخول',
 'list_contains_no_access_docs' => 'هذه الائحة لا تحتوي على مستندات للدخول',
+'list_conversion_services' => '',
 'list_hooks' => 'لائحة الدمج',
 'list_notification_services' => '',
 'list_tasks' => 'لائحة المهمات',
@@ -1370,6 +1371,9 @@ URL: [url]',
 'seq_keep' => 'حافظ على المرتبة',
 'seq_start' => 'اول مرتبة',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'صفوف',
 'setDateFromFile' => 'وضع تاريخ من الملف',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index b72bf52db..4c8906d39 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -774,6 +774,7 @@ $text = array(
 'link_to_version' => '',
 'list_access_rights' => 'Списък на права',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => '',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1233,6 +1234,9 @@ $text = array(
 'seq_keep' => 'Съхрани позицията',
 'seq_start' => 'Първа позиция',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 376c8c35b..a4d0af160 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -779,6 +779,7 @@ URL: [url]',
 'link_to_version' => '',
 'list_access_rights' => 'Llista tots els tipus d\'accés...',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => '',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1238,6 +1239,9 @@ URL: [url]',
 'seq_keep' => 'Mantenir posició',
 'seq_start' => 'Primera posició',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index ddbfe9d0a..ec6645bb7 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -876,6 +876,7 @@ URL: [url]',
 'link_to_version' => 'Provázat k verzi',
 'list_access_rights' => 'Seznam všech přístupových práv ...',
 'list_contains_no_access_docs' => 'Seznam obsahuje více dokumentů, ke kterým nemáte přístup a které se nezobrazují.',
+'list_conversion_services' => '',
 'list_hooks' => 'Seznam hooks',
 'list_notification_services' => '',
 'list_tasks' => 'Seznam úkolů',
@@ -1442,6 +1443,9 @@ Jméno: [username]
 'seq_keep' => 'Ponechat pozici',
 'seq_start' => 'První pozice',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'seance',
 'setDateFromFile' => '',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index b05acb3b3..c1c58c46e 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3158), dgrutsch (22)
+//    Translators: Admin (3162), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1019,6 +1019,7 @@ URL: [url]</p>',
 'link_to_version' => 'An Version hängen',
 'list_access_rights' => 'Alle Zugriffsrechte auflisten ...',
 'list_contains_no_access_docs' => 'Die Liste enthält weitere Dokumente auf die Sie keinen Zugriff haben und deshalb nicht angezeigt werden.',
+'list_conversion_services' => 'Liste der Konvertierer',
 'list_hooks' => 'Liste der interne Aufrufe',
 'list_notification_services' => 'Liste der Benachrichtigungsdienste',
 'list_tasks' => 'Tasks auflisten',
@@ -1774,6 +1775,9 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'seq_keep' => 'Beibehalten',
 'seq_start' => 'An den Anfang',
 'service_has_filter' => 'Service hat Filter',
+'service_list_from' => 'Von',
+'service_list_info' => 'Information',
+'service_list_to' => 'Nach',
 'service_name' => 'Service-Name',
 'sessions' => 'Benutzer Online',
 'setDateFromFile' => 'Datum von importierter Datei übernehmen',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 6f4ba01f6..88d675215 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -774,6 +774,7 @@ $text = array(
 'link_to_version' => '',
 'list_access_rights' => 'Εμφάνισε όλα τα δικαιώματα πρόσβασης',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => '',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1244,6 +1245,9 @@ URL: [url]',
 'seq_keep' => 'Διατήρηση θέσης',
 'seq_start' => 'Τοποθέτηση στην αρχή',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index d71f837fd..90cf775dc 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2253), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2257), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1020,6 +1020,7 @@ URL: [url]</p>',
 'link_to_version' => 'Attach to version',
 'list_access_rights' => 'List all access rights ...',
 'list_contains_no_access_docs' => 'The list contains more documents you have no access to and are not displayed.',
+'list_conversion_services' => 'List of conversion services',
 'list_hooks' => 'List of hooks',
 'list_notification_services' => 'List of notification services',
 'list_tasks' => 'List tasks',
@@ -1777,6 +1778,9 @@ If you did not receive a password, please use the password forgotten function on
 'seq_keep' => 'Keep Position',
 'seq_start' => 'First position',
 'service_has_filter' => 'Service has filter',
+'service_list_from' => 'From',
+'service_list_info' => 'Information',
+'service_list_to' => 'To',
 'service_name' => 'Name of service',
 'sessions' => 'Users online',
 'setDateFromFile' => 'Take over date from imported file',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index f4ef83a82..0db0189ac 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -864,6 +864,7 @@ URL: [url]',
 'link_to_version' => '',
 'list_access_rights' => 'Listar los derechos de acceso',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => 'Mis bloques',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1397,6 +1398,9 @@ URL: [url]',
 'seq_keep' => 'Mantener posición',
 'seq_start' => 'Primera posición',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => 'Obtiene la fecha del archivo importado',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 0d92ba8fa..dfddd6c87 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1006,6 +1006,7 @@ URL : [url]</p>',
 'link_to_version' => 'Version',
 'list_access_rights' => 'Liste des droits d’accès…',
 'list_contains_no_access_docs' => 'La liste contient des documents auxquels vous n’avez pas accès et qui ne sont donc pas affichés.',
+'list_conversion_services' => '',
 'list_hooks' => 'Liste des appels internes',
 'list_notification_services' => '',
 'list_tasks' => 'Liste des tâches',
@@ -1760,6 +1761,9 @@ Nom : [username]
 'seq_keep' => 'Conserver la position',
 'seq_start' => 'Première position',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'Utilisateurs en ligne',
 'setDateFromFile' => 'Reprendre la date du fichier importé',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 8b4537ec4..4448d5beb 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -857,6 +857,7 @@ Internet poveznica: [url]',
 'link_to_version' => '',
 'list_access_rights' => 'Izlistaj sve dozvole pristupa',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => 'Kuke za popise',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1406,6 +1407,9 @@ Internet poveznica: [url]',
 'seq_keep' => 'Zadrži poziciju',
 'seq_start' => 'Na početak',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 33020bc6a..21128b2c3 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -852,6 +852,7 @@ URL: [url]',
 'link_to_version' => '',
 'list_access_rights' => 'Összes jogosultság felsorolása...',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => 'Hook lista',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1384,6 +1385,9 @@ URL: [url]',
 'seq_keep' => 'Pozci megtartßsa',
 'seq_start' => 'Elejé‰re',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index e350f55ee..2cd68e6c2 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -908,6 +908,7 @@ URL: [url]</p>',
 'link_to_version' => 'Lampirkan ke versi',
 'list_access_rights' => 'Daftar semua hak akses ...',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => 'Daftar hooks',
 'list_notification_services' => '',
 'list_tasks' => 'Daftar tasks',
@@ -1458,6 +1459,9 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'seq_keep' => 'Keep Position',
 'seq_start' => 'Posisi awal',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'Pengguna Online',
 'setDateFromFile' => 'Ambil alih tanggal dari file yang diimpor',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 4ca0d5e17..371d91ee9 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -862,6 +862,7 @@ URL: [url]',
 'link_to_version' => 'Collega alla versione',
 'list_access_rights' => 'Elenca tutti i diritti di accesso...',
 'list_contains_no_access_docs' => 'L\'elenco contiene più documenti ai quali non si ha accesso e non vengono visualizzati.',
+'list_conversion_services' => '',
 'list_hooks' => 'Elenco hooks',
 'list_notification_services' => '',
 'list_tasks' => 'Elenco attività',
@@ -1433,6 +1434,9 @@ Name: [username]
 'seq_keep' => 'Mantieni la posizione',
 'seq_start' => 'Prima posizione',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'Utenti online',
 'setDateFromFile' => 'Prende la data dal file importato',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 854106a58..250bf6186 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -858,6 +858,7 @@ URL: [url]',
 'link_to_version' => '',
 'list_access_rights' => '모든 접근 권한 나열',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => '',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1400,6 +1401,9 @@ URL : [url]',
 'seq_keep' => '위치 유지',
 'seq_start' => '첫 번째 위치',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index d91d7c9ee..f01c0a2bf 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -855,6 +855,7 @@ URL: [url]',
 'link_to_version' => 'ແນບໄປພ້ອມກັບເວີຊັນ',
 'list_access_rights' => 'ສະແດງສິດທິການເຂົ້າເຖິງທັງໝົດ ...',
 'list_contains_no_access_docs' => 'ລິດລາຍການປະກອບດ້ວຍເອກະສານເພີ່ມເຕີມທີ່ເຈົ້າບໍ່ສາມາດເຂົ້າເຖິງໄດ້ ແລະບໍ່ສະແດງ',
+'list_conversion_services' => '',
 'list_hooks' => 'ລາບການ hooks',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1426,6 +1427,9 @@ URL: [url]',
 'seq_keep' => 'ເກັບຕຳແໜ່ງໄວ້',
 'seq_start' => 'ອັນດັບທຳອິດ',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'ຜູ້ໄຊ້ອອນລາຍ',
 'setDateFromFile' => '',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index b233e49fa..3421abc6b 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -876,6 +876,7 @@ URL: [url]',
 'link_to_version' => 'Vedlegg til versjonen',
 'list_access_rights' => 'Liste over alle rettigheter...',
 'list_contains_no_access_docs' => 'Listen inneholder flere dokumenter du ikke har tilgang til og ikke vises.',
+'list_conversion_services' => '',
 'list_hooks' => 'Liste hooks',
 'list_notification_services' => '',
 'list_tasks' => 'Liste oppgaver',
@@ -1439,6 +1440,9 @@ Bruker: [username]
 'seq_keep' => 'Hold posisjon',
 'seq_start' => 'Første possisjon',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'Brukere innlogget',
 'setDateFromFile' => 'Overta dato fra importert fil',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 0e6907585..68073098b 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -869,6 +869,7 @@ URL: [url]',
 'link_to_version' => 'Bijlage(n) bij versie',
 'list_access_rights' => 'Toegangsrechten',
 'list_contains_no_access_docs' => 'Geen toegankelijke documenten',
+'list_conversion_services' => '',
 'list_hooks' => 'Hooks',
 'list_notification_services' => '',
 'list_tasks' => 'Taken',
@@ -1438,6 +1439,9 @@ Name: [username]
 'seq_keep' => 'Behoud Positie',
 'seq_start' => 'Eerste positie',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'sessies',
 'setDateFromFile' => 'Gebruik de datum van de geïmporteerde file',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 2b63f19be..dbcecf4ba 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -845,6 +845,7 @@ URL: [url]',
 'link_to_version' => 'Załącz do wersji',
 'list_access_rights' => 'Pokaż uprawnienia dostępu',
 'list_contains_no_access_docs' => 'Lista zawiera więcej dokumentów, do których nie masz dostępu i nie są wyświetlane.',
+'list_conversion_services' => '',
 'list_hooks' => 'Lista błędów',
 'list_notification_services' => '',
 'list_tasks' => 'Lista zadań',
@@ -1369,6 +1370,9 @@ Name: [username]
 'seq_keep' => 'Na tej samej pozycji',
 'seq_start' => 'Na początku',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'Sesja',
 'setDateFromFile' => 'Przejmij datę z importowanego pliku',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 387fe8297..2e6f43bb1 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -876,6 +876,7 @@ URL: [url]',
 'link_to_version' => 'Anexar à versão',
 'list_access_rights' => 'Listar todos os direitos de acesso...',
 'list_contains_no_access_docs' => 'A lista contém mais documentos aos quais você não tem acesso e não são exibidos.',
+'list_conversion_services' => '',
 'list_hooks' => 'Listar ganchos',
 'list_notification_services' => '',
 'list_tasks' => 'Listar tarefas',
@@ -1445,6 +1446,9 @@ Nome: [username]
 'seq_keep' => 'Manter posição',
 'seq_start' => 'Primeira posição',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'Online',
 'setDateFromFile' => 'Assumir a data do arquivo importado',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 4801f802d..a9b60a086 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -857,6 +857,7 @@ URL: [url]',
 'link_to_version' => '',
 'list_access_rights' => 'Listeaza toate drepturile de acces',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => '',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1407,6 +1408,9 @@ URL: [url]',
 'seq_keep' => 'Păstrați poziția',
 'seq_start' => 'Prima poziție',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 2db444d2c..e0eadabba 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -857,6 +857,7 @@ URL: [url]',
 'link_to_version' => '',
 'list_access_rights' => 'Показать все права доступа',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => 'Список хуков',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1414,6 +1415,9 @@ URL: [url]',
 'seq_keep' => 'Не изменять',
 'seq_start' => 'В начале',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 4d3ec5b54..d363354d7 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -876,6 +876,7 @@ URL: [url]',
 'link_to_version' => 'Pripojiť k verzii',
 'list_access_rights' => 'Zobraziť všetky prístupové práva',
 'list_contains_no_access_docs' => 'Zoznam obsahuje viac dokumentov, ku ktorým nemáte prístup a nie sú zobrazené.',
+'list_conversion_services' => '',
 'list_hooks' => 'List hooks',
 'list_notification_services' => '',
 'list_tasks' => 'List tasks',
@@ -1447,6 +1448,9 @@ Meno: [username]
 'seq_keep' => 'Ponechať pozíciu',
 'seq_start' => 'Prvá pozícia',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'Používatelia online',
 'setDateFromFile' => 'Prebrať dátumy z importovaných súborov',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 050785cd5..ba5ad1304 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -863,6 +863,7 @@ URL: [url]',
 'link_to_version' => 'Kopppla till version',
 'list_access_rights' => 'Lista alla rättigheter...',
 'list_contains_no_access_docs' => 'Listan innehåller fler dokument som inte visas då du saknar rättigheter till dessa.',
+'list_conversion_services' => '',
 'list_hooks' => 'Lista hooks',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1420,6 +1421,9 @@ Kommentar: [comment]',
 'seq_keep' => 'Behåll positionen',
 'seq_start' => 'Första positionen',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => 'Användare online',
 'setDateFromFile' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 9217c1c7d..68c534c53 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -851,6 +851,7 @@ URL: [url]',
 'link_to_version' => '',
 'list_access_rights' => 'Tüm erişim haklarini listele',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => '',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1386,6 +1387,9 @@ URL: [url]',
 'seq_keep' => 'Sırayı Koru',
 'seq_start' => 'İlk sıra',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 1e80aaf1a..611add06c 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -857,6 +857,7 @@ URL: [url]',
 'link_to_version' => '',
 'list_access_rights' => 'Повний список прав...',
 'list_contains_no_access_docs' => '',
+'list_conversion_services' => '',
 'list_hooks' => '',
 'list_notification_services' => '',
 'list_tasks' => '',
@@ -1407,6 +1408,9 @@ URL: [url]',
 'seq_keep' => 'Не змінювати',
 'seq_start' => 'На початку',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '',
 'setDateFromFile' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 7f8c948f2..d9d1d7fa0 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -859,6 +859,7 @@ URL: [url]',
 'link_to_version' => '附加到版本',
 'list_access_rights' => '列出所有的访问权限',
 'list_contains_no_access_docs' => '这个列表包含了更多你无法访问的文件也没有显示出来。',
+'list_conversion_services' => '',
 'list_hooks' => '钩子列表',
 'list_notification_services' => '',
 'list_tasks' => '任务列表',
@@ -1394,6 +1395,9 @@ URL: [url]',
 'seq_keep' => '当前',
 'seq_start' => '首位',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '在线用户',
 'setDateFromFile' => '导入文件接收日期',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index c37878e9d..0f65fc46e 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -876,6 +876,7 @@ URL: [url]',
 'link_to_version' => '附加到版本',
 'list_access_rights' => '列出權限',
 'list_contains_no_access_docs' => '該列表包含更多您無法訪問且不會顯示的文檔。',
+'list_conversion_services' => '',
 'list_hooks' => '掛勾列表',
 'list_notification_services' => '',
 'list_tasks' => '工作列表',
@@ -1445,6 +1446,9 @@ URL: [url]',
 'seq_keep' => '當前',
 'seq_start' => '首位',
 'service_has_filter' => '',
+'service_list_from' => '',
+'service_list_info' => '',
+'service_list_to' => '',
 'service_name' => '',
 'sessions' => '在線用戶',
 'setDateFromFile' => '從導入的文件接管日期',

From 4bfdc9cbf54a45135c064cc057cf9fcbe065a34e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Feb 2023 13:26:40 +0100
Subject: [PATCH 1850/2006] add selection of document in extension
 configuration

---
 views/bootstrap/class.Settings.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index d7e3cec6a..d931031a5 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -671,6 +671,9 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 									case "folders":
 										$this->formField(null, $this->getFolderChooserHtml("form".$extname.$confkey, M_READ, -1, $selections ? $dms->getFolder($selections[0]) : 0, 'extensions['.$extname."][".$confkey."]"));
 										break;
+									case "documents":
+										$this->formField(null, $this->getDocumentChooserHtml("form".$extname.$confkey, $selections ? $dms->getDocument($selections[0]) : 0, 'extensions['.$extname."][".$confkey."]"));
+										break;
 									}
 								}
 								break;

From df6a2e79bcc5d5855e2e5b7aa097b7840e0504bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Feb 2023 14:20:33 +0100
Subject: [PATCH 1851/2006] adjust call of getDocumentChooserHtml() for 6.0.x

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 42ead127f..0e9a39cc7 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -705,7 +705,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 										$this->formField(null, $this->getFolderChooserHtml("form".$extname.$confkey, M_READ, -1, $selections ? $dms->getFolder($selections[0]) : 0, 'extensions['.$extname."][".$confkey."]"));
 										break;
 									case "documents":
-										$this->formField(null, $this->getDocumentChooserHtml("form".$extname.$confkey, $selections ? $dms->getDocument($selections[0]) : 0, 'extensions['.$extname."][".$confkey."]"));
+										$this->formField(null, $this->getDocumentChooserHtml("form".$extname.$confkey, M_READ, -1, $selections ? $dms->getDocument($selections[0]) : 0, 'extensions['.$extname."][".$confkey."]"));
 										break;
 									}
 								}

From 245092bb100e297ece879b0594e07295e212a24c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Feb 2023 19:36:14 +0100
Subject: [PATCH 1852/2006] fix get smtp parameters

---
 utils/expireddocs.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/expireddocs.php b/utils/expireddocs.php
index 4c5dc2f3c..3f16aa1fd 100644
--- a/utils/expireddocs.php
+++ b/utils/expireddocs.php
@@ -277,10 +277,10 @@ foreach($users as $user) {
 				$mail_params = array();
 				if($settings->_smtpServer) {
 					$mail_params['host'] = $settings->_smtpServer;
-					if($settings->smtpPort) {
+					if($settings->_smtpPort) {
 						$mail_params['port'] = $settings->_smtpPort;
 					}
-					if($settings->smtpUser) {
+					if($settings->_smtpUser) {
 						$mail_params['auth'] = true;
 						$mail_params['username'] = $settings->_smtpUser;
 						$mail_params['password'] = $settings->_smtpPassword;

From 737e69876dd520797bf5be90df57f1e5367a3ef1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Feb 2023 10:44:25 +0100
Subject: [PATCH 1853/2006] fix nasty php error

---
 inc/inc.Utils.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index e26137cb4..f7d7f5026 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -380,7 +380,7 @@ function utf8_basename($path, $suffix='') { /* {{{ */
  * @return string valid file name
  */
 function getFilenameByDocname($content) { /* {{{ */
-	if(is_string) {
+	if(is_string($content)) {
 		$filename = $content;
 	} else {
 		$document = $content->getDocument();

From 13a0646698fff30359b7639f89c258585608362a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Feb 2023 11:31:31 +0100
Subject: [PATCH 1854/2006] formField() evals allow_empty

---
 views/bootstrap/class.Bootstrap.php   | 4 ++++
 views/bootstrap4/class.Bootstrap4.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index a5bd72e03..1f9489f0e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1138,17 +1138,21 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		} elseif(is_array($value)) {
 			switch($value['element']) {
 			case 'select':
+				$allowempty = empty($value['allow_empty']) ? false : $value['allow_empty'];
 				echo '<select'.
 					(!empty($value['id']) ? ' id="'.$value['id'].'"' : '').
 					(!empty($value['name']) ? ' name="'.$value['name'].'"' : '').
 					(!empty($value['class']) ? ' class="'.$value['class'].'"' : '').
 					(!empty($value['placeholder']) ? ' data-placeholder="'.$value['placeholder'].'"' : '').
+					($allowempty	? ' data-allow-clear="true"' : '').
 					(!empty($value['multiple']) ? ' multiple' : '');
 				if(!empty($value['attributes']) && is_array($value['attributes']))
 					foreach($value['attributes'] as $a)
 						echo ' '.$a[0].'="'.$a[1].'"';
 				echo ">";
 				if(isset($value['options']) && is_array($value['options'])) {
+					if($allowempty)
+						echo "<option value=\"\"></option>";
 					foreach($value['options'] as $val) {
 						if(is_string($val)) {
 							echo '<optgroup label="'.$val.'">';
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index a4107fa80..91f86b6a6 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1122,17 +1122,21 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		} elseif(is_array($value)) {
 			switch($value['element']) {
 			case 'select':
+				$allowempty = empty($value['allow_empty']) ? false : $value['allow_empty'];
 				echo '<select'.
 					(!empty($value['id']) ? ' id="'.$value['id'].'"' : '').
 					(!empty($value['name']) ? ' name="'.$value['name'].'"' : '').
 					(empty($value['class']) ? ' class="form-control"' : ' class="form-control '.$value['class'].'"').
 					(!empty($value['placeholder']) ? ' data-placeholder="'.$value['placeholder'].'"' : '').
+					($allowempty	? ' data-allow-clear="true"' : '').
 					(!empty($value['multiple']) ? ' multiple' : '');
 				if(!empty($value['attributes']) && is_array($value['attributes']))
 					foreach($value['attributes'] as $a)
 						echo ' '.$a[0].'="'.$a[1].'"';
 				echo ">";
 				if(isset($value['options']) && is_array($value['options'])) {
+					if($allowempty)
+						echo "<option value=\"\"></option>";
 					foreach($value['options'] as $val) {
 						if(is_string($val)) {
 							echo '<optgroup label="'.$val.'">';

From 258914e884d6589d158cb13b6448d4515e79a17d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Feb 2023 12:54:56 +0100
Subject: [PATCH 1855/2006] override action to 'show' when showing error msg

---
 inc/inc.ClassUI.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index e29b69523..d3d174460 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -186,6 +186,10 @@ class UI extends UI_Default {
 		global $theme, $dms, $user, $settings;
 		$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
 		$view = UI::factory($theme, 'ErrorDlg');
+		$request = $view->getParam('request');
+		if($request) {
+			$request->query->set('action', 'show');
+		}
 		$view->setParam('dms', $dms);
 		$view->setParam('user', $user);
 		$view->setParam('accessobject', $accessop);

From 3d170ad18ccfa7aaee97d6d50e2d8450b602e424 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Feb 2023 13:09:33 +0100
Subject: [PATCH 1856/2006] add converter to png for videos

---
 doc/README.Converters | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/README.Converters b/doc/README.Converters
index 730466e72..001b503d2 100644
--- a/doc/README.Converters
+++ b/doc/README.Converters
@@ -122,3 +122,7 @@ application/csv
 application/vnd.wordperfect
   unoconv -d document -e PageRange=1 -f pdf --stdout -v '%f' | gs -dBATCH -dNOPAUSE -sDEVICE=pngalpha -dPDFFitPage -r72x72 -sOutputFile=- -dFirstPage=1 -dLastPage=1 -q - | convert -resize %wx png:- 'png:%o'
 
+video/webm
+video/mp4
+  This will take 12th frame of a video and converts into a png
+  convert -resize %wx '%f[12]' 'png:%o'

From 05b95bd0ed915af68b1232f2b3aae6d84532ccd7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 28 Feb 2023 13:10:16 +0100
Subject: [PATCH 1857/2006] note about required ffmpeg

---
 doc/README.Converters | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/README.Converters b/doc/README.Converters
index 001b503d2..508bf46ae 100644
--- a/doc/README.Converters
+++ b/doc/README.Converters
@@ -124,5 +124,7 @@ application/vnd.wordperfect
 
 video/webm
 video/mp4
-  This will take 12th frame of a video and converts into a png
+  This will take 12th frame of a video and converts into a png. It requires
+  ffmpeg to be installed.
+
   convert -resize %wx '%f[12]' 'png:%o'

From 198dc8c73053e379e143a1e165c281b900b23420 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 1 Mar 2023 12:16:41 +0100
Subject: [PATCH 1858/2006] use propper language names

---
 develop/transcomp.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/develop/transcomp.php b/develop/transcomp.php
index e24d75fad..205530395 100644
--- a/develop/transcomp.php
+++ b/develop/transcomp.php
@@ -1,7 +1,7 @@
 <?php
 /* Determine all languages keys used in the php files */
 $output = array();
-if(exec('sgrep -o "%r\n" \'"tMLText(\"" __ "\""\' */*.php|sort|uniq -c', &$output)) {
+if(exec('sgrep -o "%r\n" \'"tMLText(\"" __ "\""\' */*.php|sort|uniq -c', $output)) {
 	$allkeys = array();
 	foreach($output as $line) {
 		$data = explode(' ', trim($line));
@@ -10,7 +10,7 @@ if(exec('sgrep -o "%r\n" \'"tMLText(\"" __ "\""\' */*.php|sort|uniq -c', &$outpu
 }
 
 /* Reading languages */
-foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
+foreach(array('en_GB', 'de_DE', 'it_IT', 'sk_SK', 'cs_CZ') as $lang) {
 	include('languages/'.$lang.'/lang.inc');
 	ksort($text);
 	$langarr[$lang] = $text;
@@ -20,7 +20,7 @@ foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
 echo "List of missing keys\n";
 echo "-----------------------------\n";
 foreach(array_keys($allkeys) as $key) {
-	foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
+	foreach(array('en_GB', 'de_DE', 'it_IT', 'sk_SK', 'cs_CZ') as $lang) {
 		if(!isset($langarr[$lang][$key])) {
 			echo "Missing key '".$key."' in language ".$lang."\n";
 		}
@@ -31,7 +31,7 @@ echo "\n";
 /* Check for phrases not used anymore */
 echo "List of superflous keys\n";
 echo "-----------------------------\n";
-foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
+foreach(array('en_GB', 'de_DE', 'it_IT', 'sk_SK', 'cs_CZ') as $lang) {
 	$n = 0;
 	foreach($langarr[$lang] as $key=>$value) {
 		if(!isset($allkeys[$key])) {
@@ -45,8 +45,8 @@ foreach(array('English', 'German', 'Italian', 'Slovak', 'Czech') as $lang) {
 exit;
 
 $fpout = fopen('php://stdout', 'w');
-foreach(array_keys($langarr['English']) as $key) {
-	$data = array($key, $langarr['English'][$key], $langarr['German'][$key]);
+foreach(array_keys($langarr['en_GB']) as $key) {
+	$data = array($key, $langarr['en_GB'][$key], $langarr['de_DE'][$key]);
 	fputcsv($fpout, $data);
 }
 ?>

From 97778d3e2bac8da23339d7c0565ecf22ace4983f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 Mar 2023 09:55:08 +0100
Subject: [PATCH 1859/2006] use two column layout (left for check in, right for
 cancel checkout)

---
 views/bootstrap/class.CheckInDocument.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 42df6c10f..154311499 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -79,7 +79,6 @@ $(document).ready(function() {
 		$this->globalNavigation($folder);
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
-		$this->contentHeading(getMLText("checkin_document"));
 
 		if ($document->isLocked()) {
 
@@ -120,7 +119,10 @@ $(document).ready(function() {
 		}
 		$checkoutinfo = $document->getCheckOutInfo();
 
+		$this->rowStart();
 		if($checkoutstatus == 0) {
+			$this->columnStart(6);
+			$this->contentHeading(getMLText("checkin_document"));
 
 		$latestContent = $document->getLatestContent();
 		$reviewStatus = $latestContent->getReviewStatus();
@@ -134,13 +136,13 @@ $(document).ready(function() {
 			}
 		}
 
-		$this->contentContainerStart();
 ?>
 
 <form class="form-horizontal" action="../op/op.CheckInDocument.php" method="post" id="form1" name="form1">
 	<?php echo createHiddenFieldWithKey('checkindocument'); ?>
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 <?php	
+		$this->contentContainerStart();
 		if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) {
 		$this->formField(
 			getMLText("comment"),
@@ -664,18 +666,21 @@ $(document).ready(function() {
 			);
 
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('checkin_document'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
+		$this->columnEnd();
+		$this->columnStart(6);
 		if(!empty($settings->_enableCancelCheckout)) {
-			$this->contentContainerStart();
+			$this->contentHeading(getMLText("cancel_checkout_document"));
 			$this->warningMsg(getMLText('cancel_checkout_warning'));
 ?>
 <form class="form-horizontal" action="../op/op.CancelCheckOut.php" method="post">
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 <?php
+			$this->contentContainerStart();
 			echo createHiddenFieldWithKey('cancelcheckout');
 			$this->formField(
 				getMLText("checkout_cancel_confirm"),
@@ -686,13 +691,15 @@ $(document).ready(function() {
 					'value'=>1
 				)
 			);
+			$this->contentContainerEnd();
 			$this->formSubmit(getMLText('cancel_checkout'), '', '', 'danger');
 ?>
 </form>
 <?php
-			$this->contentContainerEnd();
 		}
+		$this->columnEnd();
 		} else {
+			$this->columnStart(12);
 ?>
 <form action="../op/op.CancelCheckOut.php" method="post">
 	<?php echo createHiddenFieldWithKey('cancelcheckout'); ?>
@@ -701,7 +708,9 @@ $(document).ready(function() {
 	<?php $this->formSubmit(getMLText('cancel_checkout'),'','','danger');?>
 </form>
 <?php
+			$this->columnEnd();
 		}
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 39026ef4a8e1d37458b60d6db289fc7627df5837 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 3 Mar 2023 16:14:01 +0100
Subject: [PATCH 1860/2006] new algo for contrast color based on lightness

---
 inc/inc.ClassViewCommon.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 04e31cd10..63d9f276d 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -360,7 +360,12 @@ class SeedDMS_View_Common {
 		$r = hexdec(substr($hexcolor, 1, 2));
 		$g = hexdec(substr($hexcolor, 3, 2));
 		$b = hexdec(substr($hexcolor, 5, 2));
-		$yiq = (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
-		return ($yiq >= 148) ? '000000' : 'ffffff';
+		if(0) {
+			$yiq = (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
+			return ($yiq >= 148) ? '000000' : 'ffffff';
+		} else {
+			$l = (max($r, max($g, $b)) + min($r, min($g, $b)))/2;
+			return ($l > 128) ? '000000' : 'ffffff';
+		}
 	} /* }}} */
 }

From 9e36d82873421debc17e491b5fb1cd26aaa34324 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 4 Mar 2023 09:04:58 +0100
Subject: [PATCH 1861/2006] initial support for attributes in full text search

---
 out/out.Search.php               |  7 ++++-
 views/bootstrap/class.Search.php | 51 ++++++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 99cdb822d..73af0259c 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -161,6 +161,11 @@ if($fullsearch) {
 	else
 		$record_type = array();
 
+	if (isset($_GET["attributes"]))
+		$attributes = $_GET["attributes"];
+	else
+		$attributes = array();
+
 	// Check to see if the search has been restricted to a particular sub-tree in
 	// the folder hierarchy.
 	$startFolder = null;
@@ -193,7 +198,7 @@ if($fullsearch) {
 		if($index) {
 //			$terms = $index->terms($_GET['query']);
 			$lucenesearch = $fulltextservice->Search();
-			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));
+			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder, 'attributes'=>$attributes), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));
 			if($searchresult === false) {
 				$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
 				$dcount = 0;
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 72e70b053..d2da9d06d 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -877,6 +877,13 @@ function typeahead() { /* {{{ */
 									$option[] = true;
 								$options[] = $option;
 						}
+					} elseif(substr($facetname, 0, 5) == 'attr_') {
+						foreach($values as $v=>$c) {
+								$option = array($v, $v.' ('.$c.')');
+								if(isset($attributes[$facetname]) && in_array($v, $attributes[$facetname]))
+									$option[] = true;
+								$options[] = $option;
+						}
 					} else {
 						foreach($values as $v=>$c) {
 							$option = array($v, $v.' ('.$c.')');
@@ -885,18 +892,38 @@ function typeahead() { /* {{{ */
 							$options[] = $option;
 						}
 					}
-					$this->formField(
-						getMLText($facetname),
-						array(
-							'element'=>'select',
-							'id'=>$facetname,
-							'name'=>$facetname."[]",
-							'class'=>'chzn-select',
-							'attributes'=>array(array('data-placeholder', getMLText('select_'.$facetname)), array('data-allow-clear', 'true')),
-							'options'=>$options,
-							'multiple'=>$multiple
-						)
-					);
+					if(substr($facetname, 0, 5) == 'attr_') {
+						$tmp = explode('_', $facetname);
+						if($attrdef = $dms->getAttributeDefinition($tmp[1]))
+							$dispname = $attrdef->getName();
+						else
+							$dispname = getMLText($facetname);
+						$this->formField(
+							$dispname,
+							array(
+								'element'=>'select',
+								'id'=>$facetname,
+								'name'=>'attributes['.$facetname.'][]',
+								'class'=>'chzn-select',
+								'attributes'=>array(array('data-placeholder', $dispname), array('data-allow-clear', 'true')),
+								'options'=>$options,
+								'multiple'=>$multiple
+							)
+						);
+					} else {
+						$this->formField(
+							getMLText($facetname),
+							array(
+								'element'=>'select',
+								'id'=>$facetname,
+								'name'=>$facetname."[]",
+								'class'=>'chzn-select',
+								'attributes'=>array(array('data-placeholder', getMLText('select_'.$facetname)), array('data-allow-clear', 'true')),
+								'options'=>$options,
+								'multiple'=>$multiple
+							)
+						);
+					}
 				}
 			}
 			$this->contentContainerEnd();

From 0e712c1554558468fa5d13564b503aab58f4f436 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 4 Mar 2023 10:09:05 +0100
Subject: [PATCH 1862/2006] empty password in csv file will not override an
 existing password

---
 op/op.ImportUsers.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/op/op.ImportUsers.php b/op/op.ImportUsers.php
index af34d607c..515a2e28c 100644
--- a/op/op.ImportUsers.php
+++ b/op/op.ImportUsers.php
@@ -45,7 +45,8 @@ function renderBooleanData($colname, $objdata) { /* {{{ */
 } /* }}} */
 
 function getPasswordPlainData($colname, $coldata, $objdata) { /* {{{ */
-	$objdata['passenc'] = seed_pass_hash($coldata);
+	/* Setting 'passenc' to null will not update the password */
+	$objdata['passenc'] = $coldata ? seed_pass_hash($coldata) : null;
 	return $objdata;
 } /* }}} */
 
@@ -245,7 +246,7 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
 						if($makeupdate)
 							$eu->setEmail($u['email']);
 					}
-					if(isset($u['passenc']) && $u['passenc'] != $eu->getPwd()) {
+					if(isset($u['passenc']) && !is_null($u['passenc']) && $u['passenc'] != $eu->getPwd()) {
 						$log[$uhash][] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Encrypted password of user updated. '".$u['passenc']."' != '".$eu->getPwd()."'");
 						if($makeupdate)
 							$eu->setPwd($u['passenc']);

From 742929002b9dcc3d3bdf41ab4c96b9e25b646576 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 6 Mar 2023 10:03:28 +0100
Subject: [PATCH 1863/2006] show number of occurances in subtitle of options

---
 views/bootstrap/class.Search.php | 37 +++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index d2da9d06d..5fd7ded68 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -854,9 +854,12 @@ function typeahead() { /* {{{ */
 						foreach($values as $v=>$c) {
 							$uu = $dms->getUserByLogin($v);
 							if($uu) {
-								$option = array($uu->getId(), $v.' ('.$c.')');
+								$option = array($uu->getId(), $v/*.' ('.$c.')'*/);
 								if(isset(${$facetname}) && in_array($uu->getId(), ${$facetname}))
 									$option[] = true;
+								else
+									$option[] = false;
+								$option[] = array(array('data-subtitle', $c.' ×'));
 								$options[] = $option;
 							}
 						}
@@ -864,35 +867,48 @@ function typeahead() { /* {{{ */
 						foreach($values as $v=>$c) {
 							$cat = $dms->getDocumentCategoryByName($v);
 							if($cat) {
-								$option = array($cat->getId(), $v.' ('.$c.')');
+								$option = array($cat->getId(), $v/*.' ('.$c.')'*/);
 								if(isset(${$facetname}) && in_array($cat->getId(), ${$facetname}))
 									$option[] = true;
+								else
+									$option[] = false;
+								$option[] = array(array('data-subtitle', $c.' ×'));
 								$options[] = $option;
 							}
 						}
 					} elseif($facetname == 'status') {
 						foreach($values as $v=>$c) {
-								$option = array($v, getOverallStatusText($v).' ('.$c.')');
-								if(isset(${$facetname}) && in_array($v, ${$facetname}))
-									$option[] = true;
-								$options[] = $option;
+							$option = array($v, getOverallStatusText($v)/*.' ('.$c.')'*/);
+							if(isset(${$facetname}) && in_array($v, ${$facetname}))
+								$option[] = true;
+							else
+								$option[] = false;
+							$option[] = array(array('data-subtitle', $c.' ×'));
+							$options[] = $option;
 						}
 					} elseif(substr($facetname, 0, 5) == 'attr_') {
 						foreach($values as $v=>$c) {
-								$option = array($v, $v.' ('.$c.')');
-								if(isset($attributes[$facetname]) && in_array($v, $attributes[$facetname]))
-									$option[] = true;
-								$options[] = $option;
+							$option = array($v, $v/*.' ('.$c.')'*/);
+							if(isset($attributes[$facetname]) && in_array($v, $attributes[$facetname]))
+								$option[] = true;
+							else
+								$option[] = false;
+							$option[] = array(array('data-subtitle', $c.' ×'));
+							$options[] = $option;
 						}
 					} else {
 						foreach($values as $v=>$c) {
 							$option = array($v, $v.' ('.$c.')');
 							if(isset(${$facetname}) && in_array($v, ${$facetname}))
 								$option[] = true;
+							else
+								$option[] = false;
+							$option[] = array(array('data-subtitle', $c.' ×'));
 							$options[] = $option;
 						}
 					}
 					if(substr($facetname, 0, 5) == 'attr_') {
+						if($options) {
 						$tmp = explode('_', $facetname);
 						if($attrdef = $dms->getAttributeDefinition($tmp[1]))
 							$dispname = $attrdef->getName();
@@ -910,6 +926,7 @@ function typeahead() { /* {{{ */
 								'multiple'=>$multiple
 							)
 						);
+						}
 					} else {
 						$this->formField(
 							getMLText($facetname),

From 5d2ace6a14a3cd719af729661a180576e1f34ae0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Mar 2023 08:10:12 +0100
Subject: [PATCH 1864/2006] take over attribute validation from
 op.UpdateDocument.php

---
 op/op.CheckInDocument.php | 43 ++++++++-------------------------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 47853f199..b870fc2ee 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -192,42 +192,17 @@ else
 		foreach($attributes as $attrdefid=>$attribute) {
 			$attrdef = $dms->getAttributeDefinition($attrdefid);
 			if($attribute) {
-				if(!$attrdef->validate($attribute)) {
-					switch($attrdef->getValidationError()) {
-					case 5:
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_malformed_email", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
-						break;
-					case 4:
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_malformed_url", array("attrname"=>$attrdef->getName(), "value"=>$attribute)));
-						break;
-					case 3:
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_no_regex_match", array("attrname"=>$attrdef->getName(), "value"=>$attribute, "regex"=>$attrdef->getRegex())));
-						break;
-					case 2:
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
-						break;
-					case 1:
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
-						break;
-					default:
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-					}
+				switch($attrdef->getType()) {
+				case SeedDMS_Core_AttributeDefinition::type_date:
+					$attribute = date('Y-m-d', makeTsFromDate($attribute));
+					break;
 				}
-				/*
-				if($attrdef->getRegex()) {
-					if(!preg_match($attrdef->getRegex(), $attribute)) {
-						UI::exitError(getMLText("document_title", array("documentname" => $folder->getName())),getMLText("attr_no_regex_match"));
-					}
+				if(!$attrdef->validate($attribute, null, true)) {
+					$errmsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $errmsg);
 				}
-				if(is_array($attribute)) {
-					if($attrdef->getMinValues() > count($attribute)) {
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
-					}
-					if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
-						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
-					}
-				}
-				 */
+			} elseif($attrdef->getMinValues() > 0) {
+				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 			}
 		}
 	} else {

From 2c5f661108193b80a61586108d34c03ae0b6db74 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 10 Mar 2023 17:58:27 +0100
Subject: [PATCH 1865/2006] support README of extension in different languages

---
 views/bootstrap/class.ExtensionMgr.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index db44c3928..10fde5e5c 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -178,6 +178,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 	function readme() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$session = $this->params['session'];
 		$extdir = $this->params['extdir'];
 		$extmgr = $this->params['extmgr'];
 		$extname = $this->params['extname'];
@@ -185,9 +186,10 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 
 		if(isset($extconf[$extname])) {
 			$extconf = $extconf[$extname];
-			if(file_exists($extdir."/".$extname."/README.md")) {
-//				echo '<div style="white-space: pre-wrap; font-family: monospace; padding: 0px;">'.file_get_contents($extdir."/".$extname."/README.md")."</div>";
-				$Parsedown = new Parsedown();
+			$Parsedown = new Parsedown();
+			if(file_exists($extdir."/".$extname."/README.".$session->getLanguage().".md")) {
+				echo $Parsedown->text(file_get_contents($extdir."/".$extname."/README.".$session->getLanguage().".md"));
+			} elseif(file_exists($extdir."/".$extname."/README.md")) {
 				echo $Parsedown->text(file_get_contents($extdir."/".$extname."/README.md"));
 			}
 		}
@@ -197,6 +199,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
+		$session = $this->params['session'];
 		$httproot = $this->params['httproot'];
 		$extmgr = $this->params['extmgr'];
 		$extdir = $this->params['extdir'];
@@ -237,7 +240,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Theme_Style {
 			echo "</td>";
 			echo "<td nowrap>";
 			echo "<div class=\"list-action\">";
-			if(file_exists($extdir."/".$extname."/README.md")) {
+			if(file_exists($extdir."/".$extname."/README.".$session->getLanguage().".md") || file_exists($extdir."/".$extname."/README.md")) {
 				echo $this->getModalBoxLink(array('target'=>'extensionReadme', 'remote'=>'out.ExtensionMgr.php?action=readme&extensionname='.$extname, 'class'=>'', 'title'=>'<i class="fa fa-question"></i>', 'attributes'=>array('title'=>getMLText('show_extension_readme'))));
 			}
 			if(!empty($extconf['changelog']) && file_exists($extdir."/".$extname."/".$extconf['changelog'])) {

From 2e818d54266a87a548aaeca40651dd84cfaffaf9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 10 Mar 2023 17:59:32 +0100
Subject: [PATCH 1866/2006] add changes for 5.1.30

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index a399113f2..865472f70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 - use chosen select for custom attributes
 - color category (use first 6 chars of md5(category name) as hex color)
 - create missing preview images in category or attribute manager
+- support README of extension in different languages
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.29

From 63adb75fbcc4bdc11a1823080f1dc694ed8da8aa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 11 Mar 2023 18:57:17 +0100
Subject: [PATCH 1867/2006] fix regression when setting review by individual

---
 controllers/class.ReviewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/class.ReviewDocument.php b/controllers/class.ReviewDocument.php
index 8d8bea56f..685114306 100644
--- a/controllers/class.ReviewDocument.php
+++ b/controllers/class.ReviewDocument.php
@@ -45,7 +45,7 @@ class SeedDMS_Controller_ReviewDocument extends SeedDMS_Controller_Common {
 		if($result === null) {
 
 			if ($reviewtype == "ind") {
-				$reviewLogID > $content->setReviewByInd($user, $user, $reviewstatus, $comment, $file);
+				$reviewLogID = $content->setReviewByInd($user, $user, $reviewstatus, $comment, $file);
 				if($reviewLogID === false || 0 > $reviewLogID) {
 					$this->error = 1;
 					$this->errormsg = "review_update_failed";

From da992a7bdd16dc7886e011b8791c2c7dd8302d6f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 11 Mar 2023 18:59:02 +0100
Subject: [PATCH 1868/2006] create 8-bit png instead of 16-bit

---
 inc/inc.ClassConversionServicePdfToImage.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/inc/inc.ClassConversionServicePdfToImage.php b/inc/inc.ClassConversionServicePdfToImage.php
index 4a7f1ce2e..c7b178765 100644
--- a/inc/inc.ClassConversionServicePdfToImage.php
+++ b/inc/inc.ClassConversionServicePdfToImage.php
@@ -65,9 +65,14 @@ class SeedDMS_ConversionServicePdfToImage extends SeedDMS_ConversionServiceBase
 				if(!empty($params['width']))
 					$imagick->scaleImage(min((int) $params['width'], $imagick->getImageWidth()), 0);
 				/* Remove alpha channel and set to white */
-        $imagick->setImageBackgroundColor('white');
-        $imagick->setImageAlphaChannel(Imagick::ALPHACHANNEL_REMOVE);
-        $imagick->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
+				$imagick->setImageBackgroundColor('white');
+				/* Setting the color-type and bit-depth produces much smaller images
+				 * because the default depth appears to be 16 bit
+				 */
+				$imagick->setOption('png:color-type', 6);
+				$imagick->setOption('png:bit-depth', 8);
+				$imagick->setImageAlphaChannel(Imagick::ALPHACHANNEL_REMOVE);
+				$imagick->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
 				$imagick->setImageFormat('png');
 				$end = microtime(true);
 				if($this->logger) {

From 37f64d0a3e38b96e2cb307e23a26e3063dd018b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 11 Mar 2023 20:54:42 +0100
Subject: [PATCH 1869/2006] add menu item for adding folder/document to
 clipboard

---
 views/bootstrap/class.Bootstrap.php   | 10 +++++++++-
 views/bootstrap/class.Clipboard.php   |  2 +-
 views/bootstrap4/class.Bootstrap4.php |  8 ++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 1f9489f0e..daead2a8e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -651,6 +651,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	private function folderNavigationBar($folder) { /* {{{ */
 		$dms = $this->params['dms'];
+		$enableClipboard = $this->params['enableclipboard'];
 		$accessobject = $this->params['accessobject'];
 		if (!is_object($folder) || !$folder->isType('folder')) {
 			self::showNavigationBar(array());
@@ -689,7 +690,10 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if ($accessobject->check_view_access('FolderNotify'))
 				$menuitems['edit_existing_notify'] = array('link'=>$this->params['settings']->_httpRoot."out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>getMLText('edit_existing_notify'));
 		}
-		if ($this->params['user']->isAdmin() && $this->params['enablefullsearch']) {
+		if($enableClipboard) {
+			$menuitems['add_to_clipboard'] = array('class'=>'addtoclipboard', 'attributes'=>array(['rel', 'F'.$folder->getId()], ['msg', getMLText('splash_added_to_clipboard')], ['title', getMLText("add_to_clipboard")]), 'label'=>getMLText("add_to_clipboard"));
+		}
+		if ($accessobject->check_view_access('Indexer') && $this->params['enablefullsearch']) {
 			$menuitems['index_folder'] = array('link'=>$this->params['settings']->_httpRoot."out/out.Indexer.php?folderid=". $folderID."&showtree=".showtree(), 'label'=>getMLText('index_folder'));
 		}
 
@@ -711,6 +715,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	private function documentNavigationBar($document)	{ /* {{{ */
 		$accessobject = $this->params['accessobject'];
+		$enableClipboard = $this->params['enableclipboard'];
 		$accessMode = $document->getAccessMode($this->params['user']);
 		$docid=".php?documentid=" . $document->getID();
 		echo "<id=\"first\"><a href=\"".$this->params['settings']->_httpRoot."out/out.ViewDocument". $docid ."\" class=\"brand\">".getMLText("document")."</a>\n";
@@ -754,6 +759,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if ($accessobject->check_view_access('DocumentNotify'))
 				$menuitems['edit_existing_notify'] = array('link'=>$this->params['settings']->_httpRoot."out/out.DocumentNotify". $docid, 'label'=>getMLText('edit_existing_notify'));
 		}
+		if($enableClipboard) {
+			$menuitems['add_to_clipboard'] = array('class'=>'addtoclipboard', 'attributes'=>array(['rel', 'D'.$document->getId()], ['msg', getMLText('splash_added_to_clipboard')], ['title', getMLText("add_to_clipboard")]), 'label'=>getMLText("add_to_clipboard"));
+		}
 		if ($accessobject->check_view_access('TransferDocument')) {
 			$menuitems['transfer_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.TransferDocument". $docid, 'label'=>getMLText('transfer_document'));
 		}
diff --git a/views/bootstrap/class.Clipboard.php b/views/bootstrap/class.Clipboard.php
index f1c97fa97..0bbc0c7b0 100644
--- a/views/bootstrap/class.Clipboard.php
+++ b/views/bootstrap/class.Clipboard.php
@@ -42,7 +42,7 @@ class SeedDMS_View_Clipboard extends SeedDMS_Theme_Style {
 	 */
 	public function menuClipboard() { /* {{{ */
 		$clipboard = $this->params['session']->getClipboard();
-		if ($this->params['user']->isGuest() || (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
+		if (/*$this->params['user']->isGuest() ||*/ (count($clipboard['docs']) + count($clipboard['folders'])) == 0) {
 			return '';
 		}
 
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 91f86b6a6..3902711ea 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -656,6 +656,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	private function folderNavigationBar($folder) { /* {{{ */
 		$dms = $this->params['dms'];
+		$enableClipboard = $this->params['enableclipboard'];
 		$accessobject = $this->params['accessobject'];
 		if (!is_object($folder) || !$folder->isType('folder')) {
 			self::showNavigationBar(array());
@@ -692,6 +693,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if ($accessobject->check_view_access('FolderNotify'))
 				$menuitems['edit_existing_notify'] = array('link'=>$this->params['settings']->_httpRoot."out/out.FolderNotify.php?folderid=". $folderID ."&showtree=". showtree(), 'label'=>getMLText('edit_existing_notify'));
 		}
+		if($enableClipboard) {
+			$menuitems['add_to_clipboard'] = array('class'=>'addtoclipboard', 'attributes'=>array(['rel', 'F'.$folder->getId()], ['msg', getMLText('splash_added_to_clipboard')], ['title', getMLText("add_to_clipboard")]), 'label'=>getMLText("add_to_clipboard"));
+		}
 		if ($this->params['user']->isAdmin() && $this->params['enablefullsearch']) {
 			$menuitems['index_folder'] = array('link'=>$this->params['settings']->_httpRoot."out/out.Indexer.php?folderid=". $folderID."&showtree=".showtree(), 'label'=>getMLText('index_folder'));
 		}
@@ -712,6 +716,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	private function documentNavigationBar($document)	{ /* {{{ */
 		$accessobject = $this->params['accessobject'];
+		$enableClipboard = $this->params['enableclipboard'];
 		$accessMode = $document->getAccessMode($this->params['user']);
 		$docid=".php?documentid=" . $document->getID();
 		$menuitems = array();
@@ -753,6 +758,9 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			if ($accessobject->check_view_access('DocumentNotify'))
 				$menuitems['edit_existing_notify'] = array('link'=>$this->params['settings']->_httpRoot."out/out.DocumentNotify". $docid, 'label'=>getMLText('edit_existing_notify'));
 		}
+		if($enableClipboard) {
+			$menuitems['add_to_clipboard'] = array('class'=>'addtoclipboard', 'attributes'=>array(['rel', 'D'.$document->getId()], ['msg', getMLText('splash_added_to_clipboard')], ['title', getMLText("add_to_clipboard")]), 'label'=>getMLText("add_to_clipboard"));
+		}
 		if ($accessobject->check_view_access('TransferDocument')) {
 			$menuitems['transfer_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.TransferDocument". $docid, 'label'=>getMLText('transfer_document'));
 		}

From d127b137ba7c6a054be653ba831a6f50050a1b72 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 11 Mar 2023 22:49:41 +0100
Subject: [PATCH 1870/2006] create missing preview files

---
 out/out.ExpiredDocuments.php               | 1 +
 views/bootstrap/class.ExpiredDocuments.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/out/out.ExpiredDocuments.php b/out/out.ExpiredDocuments.php
index c35d8de0b..70355aff4 100644
--- a/out/out.ExpiredDocuments.php
+++ b/out/out.ExpiredDocuments.php
@@ -47,6 +47,7 @@ if (isset($_GET["orderdir"]) && strlen($_GET["orderdir"])==1 ) {
 }
 
 if($view) {
+	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('showtree', showtree());
 	$view->setParam('orderby', $orderby);
 	$view->setParam('orderdir', $orderdir);
diff --git a/views/bootstrap/class.ExpiredDocuments.php b/views/bootstrap/class.ExpiredDocuments.php
index d16cca9c4..915cc6473 100644
--- a/views/bootstrap/class.ExpiredDocuments.php
+++ b/views/bootstrap/class.ExpiredDocuments.php
@@ -47,6 +47,7 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
 		$user = $this->params['user'];
 		$orderby = $this->params['orderby'];
 		$orderdir = $this->params['orderdir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
 		$timeout = $this->params['timeout'];
@@ -55,6 +56,8 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
 
 		$db = $dms->getDB();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
 
 		$this->htmlStartPage(getMLText("expired_documents"));
 		$this->globalNavigation();
@@ -77,7 +80,6 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
 			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
-			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
 			foreach ($docs as $document) {
 				echo $this->documentListRow($document, $previewer);
 			}

From fe0fd309712338240f3e38b1e3bfa1f760d25af5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 12 Mar 2023 09:18:30 +0100
Subject: [PATCH 1871/2006] add fold marks

---
 inc/inc.Utils.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index f7d7f5026..3d10ee434 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -868,7 +868,7 @@ function seed_pass_verify($password, $hash) { /* {{{ */
 	return $hash == md5($password);
 } /* }}} */
 
-function resolveTask($task) {
+function resolveTask($task) { /* {{{ */
 	global $dms, $user, $settings, $logger, $fulltextservice, $notifier, $conversionmgr;
 
 	if(is_object($task))
@@ -879,7 +879,7 @@ function resolveTask($task) {
 		}
 	}
 	return $task;
-}
+} /* }}} */
 
 /**
  * Return nonce for CSP

From 7ae5749bcf18b5183a2fef3e3fce5f633e80378f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Mar 2023 10:18:14 +0100
Subject: [PATCH 1872/2006] add new method mayCheckIn()

---
 inc/inc.ClassAccessOperation.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php
index 0cb5662ae..b17f8d6e4 100644
--- a/inc/inc.ClassAccessOperation.php
+++ b/inc/inc.ClassAccessOperation.php
@@ -411,6 +411,24 @@ class SeedDMS_AccessOperation {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if document content may be checked in
+	 *
+	 *
+	 */
+	function mayCheckIn($document) { /* {{{ */
+		if($document->isType('document')) {
+			$checkoutinfo = $document->getCheckOutInfo();
+			if(!$checkoutinfo)
+				return false;
+			$info = $checkoutinfo[0];
+			if($this->user->getID() == $info['userID'] || $document->getAccessMode($this->user) == M_ALL) {
+				return true;
+			}
+		}
+		return false;
+	} /* }}} */
+
 	protected function check_view_legacy_access($view, $get=array()) { /* {{{ */
 		if($this->user->isAdmin())
 			return true;

From 00fe788571e387ba465c98374e01bc12bf4f8adf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Mar 2023 10:22:30 +0100
Subject: [PATCH 1873/2006] check if document may be checked in

---
 op/op.CheckInDocument.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index b870fc2ee..8a9c43757 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -26,6 +26,8 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
+
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('checkindocument')) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
@@ -62,6 +64,10 @@ if ($document->isLocked()) {
 	else $document->setLocked(false);
 }
 
+if(!$accessop->mayCheckIn($document)) {
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
+}
+
 if(isset($_POST["comment"]))
 	$comment  = $_POST["comment"];
 else

From 67d61910245166492f7deac681fb178a1a1cd8da Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Mar 2023 10:22:54 +0100
Subject: [PATCH 1874/2006] echo splash msg

---
 op/op.CheckInDocument.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 8a9c43757..6b2039e31 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -219,6 +219,8 @@ else
 	if (is_bool($contentResult) && !$contentResult) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} elseif (is_bool($contentResult) && $contentResult) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_no_checkin"));
+		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_error_checkin_ended')));
 	} else {
 		// Send notification to subscribers.
 		if ($notifier){
@@ -379,6 +381,7 @@ else
 				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 			}
 		}
+		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_checked_in')));
 	}
 
 add_log_line("?documentid=".$documentid);

From a7579f47aef8265b6d8fc6d2f6edf67191493f34 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Mar 2023 10:23:36 +0100
Subject: [PATCH 1875/2006] show message if document may not be checked in

---
 views/bootstrap/class.CheckInDocument.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 154311499..62c96d2a8 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -104,6 +104,21 @@ $(document).ready(function() {
 			print "</div>";
 		}
 
+		$checkoutinfo = $document->getCheckOutInfo();
+		if(!$checkoutinfo) {
+			$this->errorMsg(getMLText('error_occured'));
+			$this->contentEnd();
+			$this->htmlEndPage();
+			exit;
+		}
+		$info = $checkoutinfo[0];
+		if($user->getID() != $info['userID'] && $document->getAccessMode($user) < M_ALL) {
+			$this->errorMsg(getMLText('access_denied'));
+			$this->contentEnd();
+			$this->htmlEndPage();
+			exit;
+		}
+
 		if ($checkoutstatus = $document->checkOutStatus()) {
 			switch($checkoutstatus) {
 			case 1:
@@ -117,7 +132,6 @@ $(document).ready(function() {
 				break;
 			}
 		}
-		$checkoutinfo = $document->getCheckOutInfo();
 
 		$this->rowStart();
 		if($checkoutstatus == 0) {

From ab72673379f344ec7cd9637a96aa4a1a77a91ca3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Mar 2023 10:24:53 +0100
Subject: [PATCH 1876/2006] do not show menu item if document may not be
 checked in

---
 views/bootstrap/class.Bootstrap.php   | 8 +++++---
 views/bootstrap4/class.Bootstrap4.php | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c03548cac..66d3e07f6 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -812,9 +812,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$menuitems['update_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
 				if($accessobject->check_controller_access('LockDocument'))
 					$menuitems['lock_document'] = array('link'=>$this->params['settings']->_httpRoot."op/op.LockDocument".$docid."&formtoken=".createFormKey('lockdocument'), 'label'=>getMLText('lock_document'));
-				if($document->isCheckedOut())
-					$menuitems['checkin_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.CheckInDocument".$docid, 'label'=>getMLText('checkin_document'));
-				else {
+				if($document->isCheckedOut()) {
+					if($accessobject->mayCheckIn($document)) {
+						$menuitems['checkin_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.CheckInDocument".$docid, 'label'=>getMLText('checkin_document'));
+					}
+				} else {
 					if($this->params['checkoutdir']) {
 						$menuitems['checkout_document'] = array('link'=>$this->params['settings']->_httpRoot."op/op.CheckOutDocument".$docid, 'label'=>getMLText('checkout_document'));
 					}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index e2248acd3..6713ddf13 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -733,9 +733,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$menuitems['update_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.UpdateDocument".$docid, 'label'=>getMLText('update_document'));
 				if($accessobject->check_controller_access('LockDocument'))
 					$menuitems['lock_document'] = array('link'=>$this->params['settings']->_httpRoot."op/op.LockDocument".$docid."&formtoken=".createFormKey('lockdocument'), 'label'=>getMLText('lock_document'));
-				if($document->isCheckedOut())
-					$menuitems['checkin_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.CheckInDocument".$docid, 'label'=>getMLText('checkin_document'));
-				else {
+				if($document->isCheckedOut()) {
+					if($accessobject->mayCheckIn($document)) {
+						$menuitems['checkin_document'] = array('link'=>$this->params['settings']->_httpRoot."out/out.CheckInDocument".$docid, 'label'=>getMLText('checkin_document'));
+					}
+				} else {
 					if($this->params['checkoutdir']) {
 						$menuitems['checkout_document'] = array('link'=>$this->params['settings']->_httpRoot."op/op.CheckOutDocument".$docid, 'label'=>getMLText('checkout_document'));
 					}

From c099903f1263df0cf1b6592eb5f09e7e8e823b58 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Mar 2023 10:26:22 +0100
Subject: [PATCH 1877/2006] fix html error in menu item if attributes are
 passed

---
 views/bootstrap/class.Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index daead2a8e..794c61977 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -576,11 +576,11 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				if(!empty($submenuitem['divider'])) {
 					$content .= "      <li class=\"divider\"></li>\n";
 				} else {
-					$content .= "<li><a".(isset($menuitem['link']) ? " href=\"".$menuitem['link']."\"" : "").(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '').">";
+					$content .= "<li><a".(isset($menuitem['link']) ? " href=\"".$menuitem['link']."\"" : "").(isset($menuitem['target']) ? ' target="'.$menuitem['target'].'"' : '');
 					if(!empty($menuitem['attributes']))
 						foreach($menuitem['attributes'] as $attr)
 							$content .= ' '.$attr[0].'="'.$attr[1].'"';
-					$content .= $menuitem['label']."</a></li>";
+					$content .= ">".$menuitem['label']."</a></li>";
 				}
 			}
 		}

From 836a2b50a146ebc1e1dbf24ee4e8b8c4c839ace5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Mar 2023 13:00:39 +0100
Subject: [PATCH 1878/2006] confirm checkbox is required

---
 views/bootstrap/class.CheckInDocument.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php
index 62c96d2a8..f2c50b693 100644
--- a/views/bootstrap/class.CheckInDocument.php
+++ b/views/bootstrap/class.CheckInDocument.php
@@ -38,11 +38,15 @@ class SeedDMS_View_CheckInDocument extends SeedDMS_Theme_Style {
 $(document).ready(function() {
 	$("#form1").validate({
 		messages: {
-			name: "<?php printMLText("js_no_name");?>",
 			comment: "<?php printMLText("js_no_comment");?>",
 			keywords: "<?php printMLText("js_no_keywords");?>"
 		}
 	});
+	$("#form2").validate({
+		messages: {
+			confirm: "<?php printMLText("js_confirm_cancel_checkout");?>",
+		}
+	});
 	$('#presetexpdate').on('change', function(ev){
 		if($(this).val() == 'date')
 			$('#control_expdate').show();
@@ -691,7 +695,7 @@ $(document).ready(function() {
 			$this->contentHeading(getMLText("cancel_checkout_document"));
 			$this->warningMsg(getMLText('cancel_checkout_warning'));
 ?>
-<form class="form-horizontal" action="../op/op.CancelCheckOut.php" method="post">
+<form class="form-horizontal" action="../op/op.CancelCheckOut.php" method="post" id="form2" name="form2">
 	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 <?php
 			$this->contentContainerStart();
@@ -702,7 +706,8 @@ $(document).ready(function() {
 					'element'=>'input',
 					'type'=>'checkbox',
 					'name'=>'confirm',
-					'value'=>1
+					'value'=>1,
+					'required'=>true
 				)
 			);
 			$this->contentContainerEnd();

From 5ae461a157b397530514babb521bf4c6370fc609 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 13 Mar 2023 13:01:54 +0100
Subject: [PATCH 1879/2006] add changes for 6.0.23

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9b91d0bd4..d806844ca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
                      Changes in version 6.0.23
 --------------------------------------------------------------------------------
 - fix setting recipients and revisors
+- check in of a document is allowed for the user having done the check out
+  or those users with unlimited access rights on the document
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.22

From 1c5977fca586a5b5e7128889ea1af687498ec8a6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Mar 2023 12:09:01 +0100
Subject: [PATCH 1880/2006] add missing config types when showing the empty
 form

---
 views/bootstrap/class.SchedulerTaskMgr.php | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 68726fe27..f5a9c08dc 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -260,6 +260,31 @@ $(document).ready( function() {
 							)
 						);
 						break;
+					case "folder":
+						$this->formField(
+							getMLText('task_'.$extname."_".$taskname."_".$param['name']),
+							$this->getFolderChooserHtml("form".$extname.$taskname, M_READ, -1, 0, 'params['.$param['name']."]")
+						);
+						break;
+					case "users":
+						$users = $dms->getAllUsers();
+						$options = [];
+						foreach ($users as $currUser) {
+							if (!$currUser->isGuest())
+								$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin().' - '.$currUser->getFullName()), false, array(array('data-subtitle', htmlspecialchars($currUser->getEmail()))));
+						}
+						$this->formField(
+							getMLText('task_'.$extname."_".$taskname."_".$param['name']),
+							array(
+								'element'=>'select',
+								'class'=>'chzn-select',
+								'name'=>'params['.$param['name'].']'.(!empty($param['multiple']) ? '[]' : ''),
+								'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
+								'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
+								'options'=>$options
+							)
+						);
+						break;
 					default:
 						$this->formField(
 							getMLText('task_'.$extname."_".$taskname."_".$param['name']),

From 33fe05fc6e19174199cb338b2f7abd48a8d26ea7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Mar 2023 12:09:33 +0100
Subject: [PATCH 1881/2006] fix unique id of folder chooser

---
 views/bootstrap/class.SchedulerTaskMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index f5a9c08dc..1928c8c8b 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -453,7 +453,7 @@ $(document).ready( function() {
 					$folderid = $task->getParameter()[$param['name']];
 					$this->formField(
 						getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
-					 	$this->getFolderChooserHtml("form".$extname.$confkey, M_READ, -1, $folderid ? $dms->getFolder($folderid) : 0, 'params['.$param['name']."]")
+					 	$this->getFolderChooserHtml("form".$task->getExtension().$taskid, M_READ, -1, $folderid ? $dms->getFolder($folderid) : 0, 'params['.$param['name']."]")
 					);
 					break;
 				case "users":

From f1211f6c8096be4676fdc7b990ccb35be971cedb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 14 Mar 2023 12:09:45 +0100
Subject: [PATCH 1882/2006] init options to empty array for list of users

---
 views/bootstrap/class.SchedulerTaskMgr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 1928c8c8b..99e8137d0 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -462,6 +462,7 @@ $(document).ready( function() {
 					else
 						$userids = [$task->getParameter()[$param['name']]];
 					$users = $dms->getAllUsers();
+					$options = [];
 					foreach ($users as $currUser) {
 						if (!$currUser->isGuest())
 							$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin().' - '.$currUser->getFullName()), in_array($currUser->getID(), $userids), array(array('data-subtitle', htmlspecialchars($currUser->getEmail()))));

From 1bad1d2aa51d1e3ab4e6667fe24276e0ed4894c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 15 Mar 2023 11:08:51 +0100
Subject: [PATCH 1883/2006] use require_once instead of include("Log.php")

---
 inc/inc.LogInit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.LogInit.php b/inc/inc.LogInit.php
index 2cc586873..647ef9f04 100644
--- a/inc/inc.LogInit.php
+++ b/inc/inc.LogInit.php
@@ -18,7 +18,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("Log.php");
+require_once("Log.php");
 require_once("inc/inc.Utils.php");
 
 $logger = getLogger();

From 782e4c2044bd6043aaf72caffba483dda203c67b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 15 Mar 2023 11:13:14 +0100
Subject: [PATCH 1884/2006] include Log.php early and use require_once

---
 restapi/index.php | 2 +-
 webdav/index.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index ae2021838..541d9bfcf 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1,9 +1,9 @@
 <?php
 include("../inc/inc.Settings.php");
 
+require_once("Log.php");
 require_once("../inc/inc.Language.php");
 require_once("../inc/inc.Utils.php");
-require_once("Log.php");
 
 $logger = getLogger('restapi-', PEAR_LOG_DEBUG);
 
diff --git a/webdav/index.php b/webdav/index.php
index a33249766..e148a8029 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -1,7 +1,7 @@
 <?php
 include("../inc/inc.Settings.php");
 
-include("Log.php");
+require_once("Log.php");
 require_once("../inc/inc.Language.php");
 require_once("../inc/inc.Utils.php");
 

From ae0c641865c817af60ff51f1309768c205d6a6fb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 19 Mar 2023 09:16:49 +0100
Subject: [PATCH 1885/2006] add note for pdftotext

---
 doc/README.Converters | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/README.Converters b/doc/README.Converters
index 508bf46ae..034358ccf 100644
--- a/doc/README.Converters
+++ b/doc/README.Converters
@@ -9,6 +9,9 @@ application/csv
 application/pdf
   pdftotext -nopgbrk %s - | sed -e 's/ [a-zA-Z0-9.]\{1\} / /g' -e 's/[0-9.]//g'
 
+	If pdftotext takes too long on large document you may want to pass parameter
+	-l to specify the last page to be converted
+
   mutool draw -F txt -q -N -o - %s 
 
 application/vnd.openxmlformats-officedocument.wordprocessingml.document

From 197a6e8824a5d876f4d76c1da2137c6c5d57abb9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 19 Mar 2023 09:17:08 +0100
Subject: [PATCH 1886/2006] set various callbacks to reindex document when it
 has changed

---
 inc/inc.FulltextInit.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index 53cfec9a5..84b9d2930 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -6,6 +6,20 @@ function getAttributesCallback($dms) {
 	};
 }
 
+function reindexDocumentOrFolderCallback($fulltextservice, $object) {
+	if($fulltextservice && ($index = $fulltextservice->Indexer())) {
+		$lucenesearch = $fulltextservice->Search();
+		if($object->isType('document'))
+			$hit = $lucenesearch->getDocument($object->getId());
+		elseif($object->isType('folder'))
+			$hit = $lucenesearch->getFolder($object->getId());
+		if($hit) {
+			$index->reindexDocument($hit->id);
+			$index->commit();
+		}
+	}
+}
+
 $fulltextservice = null;
 if($settings->_enableFullSearch) {
 	require_once("inc.ClassFulltextService.php");
@@ -62,5 +76,13 @@ if($settings->_enableFullSearch) {
 	if($conversionmgr)
 		$txtpreviewer->setConversionMgr($conversionmgr);
 	$fulltextservice->setPreviewer($txtpreviewer);
+
+	$dms->addCallback('onPostSetFolder', 'reindexDocumentOrFolderCallback', $fulltextservice);
+	$dms->addCallback('onPostSetName', 'reindexDocumentOrFolderCallback', $fulltextservice);
+	$dms->addCallback('onPostSetComment', 'reindexDocumentOrFolderCallback', $fulltextservice);
+	$dms->addCallback('onPostSetKeywords', 'reindexDocumentOrFolderCallback', $fulltextservice);
+	$dms->addCallback('onPostSetKategories', 'reindexDocumentOrFolderCallback', $fulltextservice);
+	$dms->addCallback('onPostAddKategories', 'reindexDocumentOrFolderCallback', $fulltextservice);
+	$dms->addCallback('onPostRemoveKategories', 'reindexDocumentOrFolderCallback', $fulltextservice);
 }
 

From 882b87c8855b213a0ddc7132c5186d204c5f6794 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 21 Mar 2023 11:25:08 +0100
Subject: [PATCH 1887/2006] check if logger is set before using it

---
 inc/inc.ClassAuthenticationService.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassAuthenticationService.php b/inc/inc.ClassAuthenticationService.php
index 41119877a..f04ac304d 100644
--- a/inc/inc.ClassAuthenticationService.php
+++ b/inc/inc.ClassAuthenticationService.php
@@ -66,7 +66,8 @@ class SeedDMS_AuthenticationService {
 	public function authenticate($username, $password) { /* {{{ */
 		$user = null;
 		foreach($this->services as $name => $service) {
-			$this->logger->log('Authentication service \''.$name.'\'', PEAR_LOG_INFO);
+			if($this->logger)
+				$this->logger->log('Authentication service \''.$name.'\'', PEAR_LOG_INFO);
 			$user = $service->authenticate($username, $password);
 			if($user === false) {
 				$this->errors[$name] = false;

From 057abec09c24f0d9ac2ccc37b1c8619a71f4fb0c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Mar 2023 11:17:16 +0100
Subject: [PATCH 1888/2006] fix sending calendar events

---
 inc/inc.Tasks.php | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 8fe23ba1a..3d5db933a 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -549,10 +549,10 @@ class SeedDMS_CalendarTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		$logger = $this->logger;
 		$settings = $this->settings;
 		$taskparams = $task->getParameter();
-		$tableformat = " %-10s %5d %-60s";
-		$tableformathead = " %-10s %5s %-60s";
-		$tableformathtml = "<tr><td>%s</td><td>%d</td><td>%s</td></tr>";
-		$tableformatheadhtml = "<tr><th>%s</th><th>%s</th><th>%s</th></tr>";
+		$tableformat = " %-10s %-60s";
+		$tableformathead = " %-10s %-60s";
+		$tableformathtml = "<tr><td>%s</td><td>%s</td></tr>";
+		$tableformatheadhtml = "<tr><th>%s</th><th>%s</th></tr>";
 
 		require_once('inc/inc.ClassEmailNotify.php');
 		require_once('inc/inc.ClassCalendar.php');
@@ -565,16 +565,33 @@ class SeedDMS_CalendarTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 				$body = ''.$auser->getLogin()." <".$auser->getEmail().">\n\n";
 				$bodyhtml = '<p>'.$auser->getLogin()." &lt;".$auser->getEmail()."&gt;</p>";
 				$calendar->setUser($auser);
-				$start = mktime(0,0,0, date('m'), date('d'), date('Y'));
-				$events = $calendar->getEventsInInterval($start, $start+7*86400);
+				if(isset($taskparams['days']))
+					$days = intval($taskparams['days']);
+				else
+					$days = 7;
+				if($days < 0) {
+					$end = mktime(0,0,0, date('m'), date('d'), date('Y'))-1;
+					$start = $end+$days*86400+1;
+				} elseif($days > 0) {
+					$start = mktime(0,0,0, date('m'), date('d'), date('Y'));
+					$end = $start+$days*86400-1;
+				} else {
+					$start = mktime(0,0,0, date('m'), date('d'), date('Y'));
+					$end = $start+86400-1;
+				}
+				$events = $calendar->getEventsInInterval($start, $end);
 				if($events && count($events)>0) {
+					$body .= getMLText('startdate', [], null, $auser->getLanguage()).': '.getLongReadableDate($start)."\n";
+					$body .= getMLText('enddate', [], null, $auser->getLanguage()).': '.getLongReadableDate($end)."\n\n";
+					$bodyhtml .= '<p>'.getMLText('startdate', [], null, $auser->getLanguage()).': '.getLongReadableDate($start)."</p>";
+					$bodyhtml .= '<p>'.getMLText('enddate', [], null, $auser->getLanguage()).': '.getLongReadableDate($end)."</p>";
 					$bodyhtml .= "<table>".PHP_EOL;
-					$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("date", array(), ""), "ID", getMLText("name", array(), ""));
-					$body .= sprintf($tableformathead."\n", getMLText("expires", array(), ""), "ID", getMLText("name", array(), ""));
+					$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("date", array(), null, $auser->getLanguage()), getMLText("name", array(), null, $auser->getLanguage()));
+					$body .= sprintf($tableformathead."\n", getMLText("date", array(), null, $auser->getLanguage()), getMLText("name", array(), null, $auser->getLanguage()));
 					$body .= "---------------------------------------------------------------------------------\n";
 					foreach($events as $event) {
-						$body .= sprintf($tableformat."\n", getReadableDate($event['start']), 1, $event['name']);
-						$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($event['start']), 1, $event['name']);
+						$body .= sprintf($tableformat."\n", getReadableDate($event['start']), $event['name']);
+						$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($event['start']), $event['name']);
 					}
 					$bodyhtml .= "</table>".PHP_EOL;
 					$params = array();

From f4ee945ab1b3b10095d39059f60d8beb92879d0b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Mar 2023 11:17:32 +0100
Subject: [PATCH 1889/2006] add new task for sending statistics

---
 inc/inc.Tasks.php | 108 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 3d5db933a..53e8e5fee 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -615,6 +615,113 @@ class SeedDMS_CalendarTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 
 	public function getAdditionalParams() {
 		return array(
+			array(
+				'name'=>'days',
+				'type'=>'integer',
+				'description'=> 'Number of days to look ahead starting from today. Negative values will look into the past ending today. 0 will just check for events of the current day.',
+			),
+		);
+	}
+} /* }}} */
+
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  core
+ */
+class SeedDMS_StatisticTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
+
+	/**
+	 * Run the task
+	 *
+	 * @param SeedDMS_SchedulerTask $task task to be executed
+	 * @return boolean true if task was executed succesfully, otherwise false
+	 */
+	public function execute(SeedDMS_SchedulerTask $task) {
+		$dms = $this->dms;
+		$user = $this->user;
+		$logger = $this->logger;
+		$settings = $this->settings;
+		$taskparams = $task->getParameter();
+		$tableformat = " %-30s %5d";
+		$tableformathead = " %-30s %5s";
+		$tableformathtml = "<tr><td>%s</td><td>%d</td></tr>";
+		$tableformatheadhtml = "<tr><th>%s</th><th>%s</th></tr>";
+
+		require_once('inc/inc.ClassEmailNotify.php');
+		$email = new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+
+		$userstotal = $dms->getStatisticalData('userstotal');
+		$docstotal = $dms->getStatisticalData('docstotal');
+		$folderstotal = $dms->getStatisticalData('folderstotal');
+		$docsaccumulated = $dms->getStatisticalData('docsaccumulated');
+
+		$userids = $taskparams['users'];
+		foreach($userids as $userid) {
+			if(($auser = $dms->getUser((int) $userid)) && $auser->isAdmin() && !$auser->isDisabled() && $auser->getEmail()) {
+				/* Create individual mails, because the users may have different
+				 * languages.
+				 */
+				$body = ''.$auser->getLogin()." <".$auser->getEmail().">\n\n";
+				$bodyhtml = '<p>'.$auser->getLogin()." &lt;".$auser->getEmail()."&gt;</p>";
+				$bodyhtml .= "<table>".PHP_EOL;
+				$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("name", array(), null, $auser->getLanguage()), getMLText("number_count", array(), ""));
+				$body .= sprintf($tableformathead."\n", getMLText("name", array(), ""), getMLText("number_count", array(), null, $auser->getLanguage()));
+				$body .= "---------------------------------------------------------------------------------\n";
+
+				$bodyhtml .= sprintf($tableformathtml."\n", getMLText("users", array(), null, $auser->getLanguage()), $userstotal);
+				$body .= sprintf($tableformat."\n", getMLText("users", array(), null, $auser->getLanguage()), $userstotal);
+				$bodyhtml .= sprintf($tableformathtml."\n", getMLText("documents", array(), null, $auser->getLanguage()), $docstotal);
+				$body .= sprintf($tableformat."\n", getMLText("documents", array(), null, $auser->getLanguage()), $docstotal);
+				$bodyhtml .= sprintf($tableformathtml."\n", getMLText("folders", array(), null, $auser->getLanguage()), $folderstotal);
+				$body .= sprintf($tableformat."\n", getMLText("folders", array(), null, $auser->getLanguage()), $folderstotal);
+				$today = date('Y-m-d');
+				$yesterday = date('Y-m-d', time()-86400);
+				if(isset($docsaccumulated[$today])) {
+					$docstoday = $docsaccumulated[$today];
+				} else {
+					$docstoday = 0;
+				}
+				$bodyhtml .= sprintf($tableformathtml."\n", getMLText("new_documents_today", array(), null, $auser->getLanguage()), $docstoday);
+				$body .= sprintf($tableformat."\n", getMLText("new_documents_today", array(), null, $auser->getLanguage()), $docstoday);
+				if(isset($docsaccumulated[$yesterday])) {
+					$docsyesterday = $docsaccumulated[$yesterday];
+				} else {
+					$docsyesterday = 0;
+				}
+				$bodyhtml .= sprintf($tableformathtml."\n", getMLText("new_documents_yesterday", array(), null, $auser->getLanguage()), $docsyesterday);
+				$body .= sprintf($tableformat."\n", getMLText("new_documents_yesterday", array(), null, $auser->getLanguage()), $docsyesterday);
+
+				$bodyhtml .= "</table>".PHP_EOL;
+
+				echo $body;
+				$params = array();
+				$params['__body__'] = $body;
+				$params['__body_html__'] = $bodyhtml;
+				$params['sitename'] = $settings->_siteName;
+				//$email->toIndividual('', $auser, 'statistics_mail_subject', '', $params);
+
+				$logger->log('Task \'statistics\': Sending statistics \'statistics_mail_subject\' to user \''.$auser->getLogin().'\'', PEAR_LOG_INFO);
+			}
+		}
+
+		return true;
+	}
+
+	public function getDescription() {
+		return 'Send statistics by email';
+	}
+
+	public function getAdditionalParams() {
+		return array(
+			array(
+				'name'=>'users',
+				'type'=>'users',
+				'multiple'=>true,
+				'description'=> 'Send statistics report to this users',
+			)
 		);
 	}
 } /* }}} */
@@ -624,3 +731,4 @@ $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['indexingdocs'] = 'SeedDMS_Indexi
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['checksum'] = 'SeedDMS_CheckSumTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['preview'] = 'SeedDMS_PreviewTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['calendar'] = 'SeedDMS_CalendarTask';
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['statistic'] = 'SeedDMS_StatisticTask';

From 8628e5b02c2ca32a941795ab474a8820c9775504 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Mar 2023 11:18:59 +0100
Subject: [PATCH 1890/2006] add new phrases

---
 languages/ar_EG/lang.inc |  9 +++++++++
 languages/bg_BG/lang.inc |  9 +++++++++
 languages/ca_ES/lang.inc |  9 +++++++++
 languages/cs_CZ/lang.inc |  9 +++++++++
 languages/de_DE/lang.inc | 11 ++++++++++-
 languages/el_GR/lang.inc |  9 +++++++++
 languages/en_GB/lang.inc | 11 ++++++++++-
 languages/es_ES/lang.inc |  9 +++++++++
 languages/fr_FR/lang.inc |  9 +++++++++
 languages/hr_HR/lang.inc |  9 +++++++++
 languages/hu_HU/lang.inc |  9 +++++++++
 languages/id_ID/lang.inc |  9 +++++++++
 languages/it_IT/lang.inc |  9 +++++++++
 languages/ko_KR/lang.inc |  9 +++++++++
 languages/lo_LA/lang.inc |  9 +++++++++
 languages/nb_NO/lang.inc |  9 +++++++++
 languages/nl_NL/lang.inc |  9 +++++++++
 languages/pl_PL/lang.inc |  9 +++++++++
 languages/pt_BR/lang.inc |  9 +++++++++
 languages/ro_RO/lang.inc |  9 +++++++++
 languages/ru_RU/lang.inc |  9 +++++++++
 languages/sk_SK/lang.inc |  9 +++++++++
 languages/sv_SE/lang.inc |  9 +++++++++
 languages/tr_TR/lang.inc |  9 +++++++++
 languages/uk_UA/lang.inc |  9 +++++++++
 languages/zh_CN/lang.inc |  9 +++++++++
 languages/zh_TW/lang.inc |  9 +++++++++
 27 files changed, 245 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index d458b4f2a..6b33de47a 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -232,9 +232,11 @@ URL: [url]',
 'bg_BG' => 'بلغارية',
 'browse' => 'تصفح',
 'calendar' => 'التقويم',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'التقويم الأسبوعي',
 'cancel' => 'الغاء',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'لايمكن تعديل ملف مرفوض او مهمل',
 'cannot_change_final_states' => 'تحذير: لا يمكن تعديل حالة مستند مرفوض او منتهى صلاحيته او رهن المراجعة او الموافقة',
@@ -552,6 +554,7 @@ URL: [url]',
 'empty_list' => 'الائحة خالية',
 'empty_notify_list' => 'لايوجد مدخلات',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'الإنكليزية (GB)',
 'equal_transition_states' => 'حالة البداية والنهاية متشابهة',
 'error' => 'خطأ',
@@ -738,6 +741,7 @@ URL: [url]',
 'import_fs_warning' => 'تحذير النسخ من ملف النظام',
 'import_users' => 'ﺎﺴﺘﻳﺭﺍﺩ ﻢﺴﺘﺧﺪﻤﻴﻧ',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'إضافة المحتوى',
 'include_documents' => 'اشمل مستندات',
@@ -927,6 +931,8 @@ URL: [url]',
 'new_attrdef' => 'اضافة تعريف سمة',
 'new_default_keywords' => 'اضافة كلمات بحث',
 'new_default_keyword_category' => 'من فضلك اضف قسم',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'من فضلك اضف قسم',
 'new_document_email' => 'مستند جديد',
 'new_document_email_body' => 'مستند جديد
@@ -1020,6 +1026,7 @@ URL: [url]',
 'no_version_modification' => 'لا تعديل على الإصدار',
 'no_workflows' => '',
 'no_workflow_available' => 'لا يوجد سير عمل',
+'number_count' => '',
 'objectcheck' => 'التحقق من مستند/مجلد',
 'object_check_critical' => 'التحقق من الشيء في حالة حرجة',
 'object_check_warning' => 'تحذير في التحقق من شيء',
@@ -1160,6 +1167,7 @@ URL: [url]',
 'remove_marked_files' => 'ازالة الملفات المختارة',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'تم اصلاحه',
 'repairing_objects' => 'تحضير المستندات والمجلدات.',
 'replace_content_email_body' => '',
@@ -1896,6 +1904,7 @@ URL: [url]',
 'splash_transfer_document' => 'نقل المستند',
 'splash_transfer_objects' => 'نقل الأشياء',
 'splash_trigger_workflow' => 'تفعيل سير العمل',
+'startdate' => '',
 'state_and_next_state' => 'الحالة الحالية والحالة المقبلة',
 'statistic' => 'إحصائيات',
 'status' => 'الحالة',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 4c8906d39..6141a0b7d 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -215,9 +215,11 @@ $text = array(
 'bg_BG' => 'Български',
 'browse' => 'Преглеждане',
 'calendar' => 'Календар',
+'calendar_events_mail_subject' => '',
 'calendar_week' => '',
 'cancel' => 'Отмяна',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Невозможно е да се измени остарял или отклонен документ',
 'cannot_change_final_states' => 'Невозможно е да се изменя статусът на отклонен, просрочен или чакащ рецензия или утверждаване',
@@ -505,6 +507,7 @@ $text = array(
 'empty_list' => '',
 'empty_notify_list' => 'Няма записи',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Английски (Великобритания)',
 'equal_transition_states' => 'Началното и крайно състояние са еднакви',
 'error' => 'Грешка',
@@ -667,6 +670,7 @@ $text = array(
 'import_fs_warning' => '',
 'import_users' => '',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Включи документи',
@@ -856,6 +860,8 @@ $text = array(
 'new_attrdef' => 'Добави дефиниция атрибути',
 'new_default_keywords' => 'Добави ключови думи',
 'new_default_keyword_category' => 'Добави категория',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Добави категория документ',
 'new_document_email' => 'Нов документ',
 'new_document_email_body' => '',
@@ -925,6 +931,7 @@ $text = array(
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => '',
+'number_count' => '',
 'objectcheck' => 'Проверка на Папка/Документ',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -1050,6 +1057,7 @@ $text = array(
 'remove_marked_files' => '',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => '',
 'repairing_objects' => 'Поправка на папки и документи',
 'replace_content_email_body' => '',
@@ -1759,6 +1767,7 @@ $text = array(
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => '',
 'statistic' => '',
 'status' => 'Статус',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index a4d0af160..e1368165c 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -220,9 +220,11 @@ URL: [url]',
 'bg_BG' => 'Búlgar',
 'browse' => 'Navega',
 'calendar' => 'Calendari',
+'calendar_events_mail_subject' => '',
 'calendar_week' => '',
 'cancel' => 'Cancel.lar',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'No es poden assignar nous revisors a un document que no està pendent de revisió o d\'aprovació.',
 'cannot_change_final_states' => 'Atenció: No es pot canviar l\'estat de documents que han estat rebutjats, marcats com a obsolets o expirats.',
@@ -510,6 +512,7 @@ URL: [url]',
 'empty_list' => '',
 'empty_notify_list' => 'No hi ha entrades',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Anglès (Regne Unit)',
 'equal_transition_states' => '',
 'error' => '',
@@ -672,6 +675,7 @@ URL: [url]',
 'import_fs_warning' => 'Només funciona arrastrant carpetes.La operació importarà recursivament totes les carpetes i arxius.',
 'import_users' => 'Importar usuaris',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Incloure documents',
@@ -861,6 +865,8 @@ URL: [url]',
 'new_attrdef' => '',
 'new_default_keywords' => 'Afegir mots clau',
 'new_default_keyword_category' => 'Nova categoria',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Add category',
 'new_document_email' => 'Nou document',
 'new_document_email_body' => '',
@@ -930,6 +936,7 @@ URL: [url]',
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => '',
+'number_count' => '',
 'objectcheck' => 'Carpeta / Comprobació del document',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -1055,6 +1062,7 @@ URL: [url]',
 'remove_marked_files' => '',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => '',
 'repairing_objects' => '',
 'replace_content_email_body' => '',
@@ -1764,6 +1772,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => '',
 'statistic' => 'Estadístiques',
 'status' => 'Estat',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index ec6645bb7..225d28b3a 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -244,9 +244,11 @@ URL: [url]',
 'bg_BG' => 'Bulharština',
 'browse' => 'Prohlížet',
 'calendar' => 'Kalendář',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Kaledářní týden',
 'cancel' => 'Zrušit',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Není možné přidělit schvalovatele dokumentu, který nečeká na kontrolu nebo na schválení.',
 'cannot_change_final_states' => 'Upozornění: Nemůžete měnit stav dokumentu: zamítnutého, s vypršenou platností, posuzovaného nebo schvalovaného.',
@@ -576,6 +578,7 @@ URL: [url]',
 'empty_list' => 'Žádné záznamy',
 'empty_notify_list' => 'Žádné položky',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Angličtina (GB)',
 'equal_transition_states' => 'Počáteční a konečný stav transformace jsou stejné',
 'error' => 'Error',
@@ -769,6 +772,7 @@ URL: [url]',
 'import_fs_warning' => 'To bude fungovat pouze pro složky ve vhazovací složce. Operace rekurzivně importuje všechny složky a soubory. Soubory budou okamžitě uvolněny.',
 'import_users' => 'Import uživatelů',
 'import_users_addnew' => 'Přidat nové uživatele',
+'import_users_no_column_mapping' => '',
 'import_users_update' => 'Aktualizovat existující uživatele',
 'include_content' => 'Včetně obsahu',
 'include_documents' => 'Včetně dokumentů',
@@ -958,6 +962,8 @@ URL: [url]',
 'new_attrdef' => 'Přidat definici atributu',
 'new_default_keywords' => 'Přidat klíčová slova',
 'new_default_keyword_category' => 'Přidat kategorii',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Přidat kategorii dokumentů',
 'new_document_email' => 'Nový dokument',
 'new_document_email_body' => 'Nový dokument
@@ -1051,6 +1057,7 @@ URL: [url]',
 'no_version_modification' => 'Žádná změna verze',
 'no_workflows' => '',
 'no_workflow_available' => 'Není k dispozici žádné workflow',
+'number_count' => '',
 'objectcheck' => 'Kontrola složky/dokumentu',
 'object_check_critical' => 'Kritické chyby',
 'object_check_warning' => 'Varování',
@@ -1206,6 +1213,7 @@ URL: [url]',
 'remove_marked_files' => 'Odstranit označené soubory',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'opraveno',
 'repairing_objects' => 'Opravuji dokumenty a složky.',
 'replace_content_email_body' => '',
@@ -1968,6 +1976,7 @@ Jméno: [username]
 'splash_transfer_document' => 'Dokument přenesen',
 'splash_transfer_objects' => 'Objekt přenesen',
 'splash_trigger_workflow' => 'Spuštěn přechod workflow',
+'startdate' => '',
 'state_and_next_state' => 'Stav / Další stav',
 'statistic' => 'Statistika',
 'status' => 'Stav',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index c1c58c46e..4169f3b6a 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3162), dgrutsch (22)
+//    Translators: Admin (3171), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -283,9 +283,11 @@ URL: [url]</p>',
 'bg_BG' => 'Bulgarisch',
 'browse' => 'Durchsuchen',
 'calendar' => 'Kalender',
+'calendar_events_mail_subject' => 'Anstehende Ereignisse',
 'calendar_week' => 'Kalenderwoche',
 'cancel' => 'Abbrechen',
 'cancel_checkout' => 'Auschecken abbrechen',
+'cancel_checkout_document' => 'Bende Checkout ohne Speichern',
 'cancel_checkout_warning' => 'Das Auschecken kann beendet werden, auch wenn bereits Änderung am ausgecheckten Dokument vorgenommen worden sind. In dem Fall wird die Datei gelöscht und die Änderungen gehen verloren.',
 'cannot_assign_invalid_state' => 'Die Zuweisung eines neuen Prüfers zu einem Dokument, welches noch nachbearbeitet oder überprüft wird ist nicht möglich',
 'cannot_change_final_states' => 'Warnung: Der Dokumentstatus für Dokumente, die zurückgewiesen worden sind oder als abgelaufen bzw. veraltert markiert wurden, kann nicht geändert werden.',
@@ -677,6 +679,7 @@ URL: [url]</p>',
 'empty_list' => 'Keine Einträge',
 'empty_notify_list' => 'Keine Beobachter',
 'enable_extension' => 'Erweiterunge aktivieren',
+'enddate' => 'Enddatum',
 'en_GB' => 'Englisch (GB)',
 'equal_transition_states' => 'Start- und Endstatus ѕind gleich',
 'error' => 'Fehler',
@@ -912,6 +915,7 @@ URL: [url]</p>',
 'import_fs_warning' => 'Der Import kann nur für Ordner im Ablageordner erfolgen. Alle Ordner und Dateien werden rekursiv importiert. Dateien werden sofort freigegeben.',
 'import_users' => 'Importiere Benutzer',
 'import_users_addnew' => 'Neue Benutzer anlegen',
+'import_users_no_column_mapping' => 'Laden Sie eine Benutzerliste hoch',
 'import_users_update' => 'Aktualisiere bestehende Benutzer',
 'include_content' => 'Inhalte mit exportieren',
 'include_documents' => 'Dokumente miteinbeziehen',
@@ -1101,6 +1105,8 @@ URL: [url]</p>',
 'new_attrdef' => 'Neue Attributdefinition',
 'new_default_keywords' => 'Neue Vorlage',
 'new_default_keyword_category' => 'Neue Kategorie',
+'new_documents_today' => 'Neue Dokumente heute',
+'new_documents_yesterday' => 'Neue Dokumente gestern',
 'new_document_category' => 'Neue Kategorie',
 'new_document_email' => 'Neues Dokument',
 'new_document_email_body' => 'Neues Dokument
@@ -1223,6 +1229,7 @@ URL: [url]</p>',
 'no_version_modification' => 'Keine Modifikationen an einer Version',
 'no_workflows' => 'Sie haben bisher keinen Workflow erstellt',
 'no_workflow_available' => 'Kein Workflow verfügbar',
+'number_count' => 'Anzahl',
 'objectcheck' => 'Ordner- und Dokumentenprüfung',
 'object_check_critical' => 'Kritische Fehler',
 'object_check_warning' => 'Warnungen',
@@ -1442,6 +1449,7 @@ URL: [url]</p>',
 'remove_marked_files' => 'Markierte Dateien löschen',
 'remove_review_log' => 'Einzelne Prüfung entfernen',
 'remove_task' => 'Task entfernen',
+'reorder' => 'Neu ortnen',
 'repaired' => 'repariert',
 'repairing_objects' => 'Repariere Dokumente und Ordner.',
 'replace_content_email_body' => 'Die letzte Version des Dokuments wurde ersetzt.
@@ -2300,6 +2308,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'splash_transfer_document' => 'Dokument übertragen',
 'splash_transfer_objects' => 'Objekte übertragen',
 'splash_trigger_workflow' => '',
+'startdate' => 'Startdatum',
 'state_and_next_state' => 'Status/Nächster Status',
 'statistic' => 'Statistik',
 'status' => 'Status',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 88d675215..3b39fa69f 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -215,9 +215,11 @@ $text = array(
 'bg_BG' => 'Βουλγάρικα',
 'browse' => '',
 'calendar' => 'Ημερολόγιο',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Εβδομάδα',
 'cancel' => 'Ακύρωση',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => '',
 'cannot_change_final_states' => '',
@@ -505,6 +507,7 @@ $text = array(
 'empty_list' => '',
 'empty_notify_list' => '',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'English (GB)/Αγγλικά',
 'equal_transition_states' => '',
 'error' => 'Λάθος',
@@ -667,6 +670,7 @@ $text = array(
 'import_fs_warning' => '',
 'import_users' => 'Εισαγωγή χειριστών',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => '',
 'include_documents' => '',
@@ -856,6 +860,8 @@ $text = array(
 'new_attrdef' => '',
 'new_default_keywords' => '',
 'new_default_keyword_category' => 'Προσθήκη Κατηγορίας',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Προσθήκη κατηγορίας',
 'new_document_email' => 'Νέο Έγγραφο',
 'new_document_email_body' => 'Νέο έγγραφο
@@ -936,6 +942,7 @@ URL: [url]',
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => '',
+'number_count' => '',
 'objectcheck' => 'Αναζήτηση σε αρχεία και φακέλους',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -1061,6 +1068,7 @@ URL: [url]',
 'remove_marked_files' => '',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => '',
 'repairing_objects' => '',
 'replace_content_email_body' => '',
@@ -1770,6 +1778,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => '',
 'statistic' => '',
 'status' => 'κατάσταση',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 90cf775dc..7fc250ebc 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2257), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2266), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -283,9 +283,11 @@ URL: [url]</p>',
 'bg_BG' => 'Bulgarian',
 'browse' => 'Browse',
 'calendar' => 'Calendar',
+'calendar_events_mail_subject' => 'Upcomming events',
 'calendar_week' => 'Calendar week',
 'cancel' => 'Cancel',
 'cancel_checkout' => 'Cancel checkout',
+'cancel_checkout_document' => 'Cancel checkout',
 'cancel_checkout_warning' => 'The check out can canceled thought the checked out file has been changed. In that case the file will be deleted from the check out space and your modification will be lost.',
 'cannot_assign_invalid_state' => 'Cannot modify an obsolete or rejected document',
 'cannot_change_final_states' => 'Warning: You cannot alter status for document rejected, expired or with pending review or approval',
@@ -677,6 +679,7 @@ URL: [url]</p>',
 'empty_list' => 'No entries',
 'empty_notify_list' => 'No entries',
 'enable_extension' => 'Enable extension',
+'enddate' => 'End date',
 'en_GB' => 'English (GB)',
 'equal_transition_states' => 'Start and end state are equal',
 'error' => 'Error',
@@ -913,6 +916,7 @@ URL: [url]</p>',
 'import_fs_warning' => 'This will only work for folders in the drop folder. The operation recursively imports all folders and files. Files will be released immediately.',
 'import_users' => 'Import users',
 'import_users_addnew' => 'Add new users',
+'import_users_no_column_mapping' => 'Please upload a user list',
 'import_users_update' => 'Update existing users',
 'include_content' => 'Include content',
 'include_documents' => 'Include documents',
@@ -1102,6 +1106,8 @@ URL: [url]</p>',
 'new_attrdef' => 'Add attribute definition',
 'new_default_keywords' => 'Add keywords',
 'new_default_keyword_category' => 'Add category',
+'new_documents_today' => 'New documents today',
+'new_documents_yesterday' => 'New documents yesterday',
 'new_document_category' => 'Add category',
 'new_document_email' => 'New document',
 'new_document_email_body' => 'New document
@@ -1226,6 +1232,7 @@ URL: [url]</p>',
 'no_version_modification' => 'No version modification',
 'no_workflows' => 'You have not created a workflow yet',
 'no_workflow_available' => 'No workflow available',
+'number_count' => 'number',
 'objectcheck' => 'Folder/Document check',
 'object_check_critical' => 'Critical errors',
 'object_check_warning' => 'Warnings',
@@ -1445,6 +1452,7 @@ URL: [url]</p>',
 'remove_marked_files' => 'Remove marked files',
 'remove_review_log' => 'Remove review',
 'remove_task' => 'Remove task',
+'reorder' => 'Reorder',
 'repaired' => 'repaired',
 'repairing_objects' => 'Repairing documents and folders.',
 'replace_content_email_body' => 'The last version of the document has been replaced.
@@ -2303,6 +2311,7 @@ If you did not receive a password, please use the password forgotten function on
 'splash_transfer_document' => 'Document transfered',
 'splash_transfer_objects' => 'Objects transfered',
 'splash_trigger_workflow' => 'Triggered transition of workflow',
+'startdate' => 'Start date',
 'state_and_next_state' => 'State/Next state',
 'statistic' => 'Statistic',
 'status' => 'Status',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 0db0189ac..f15893be7 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -239,9 +239,11 @@ URL: [url]',
 'bg_BG' => 'Búlgaro',
 'browse' => 'Listar',
 'calendar' => 'Calendario',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Calendario semanal',
 'cancel' => 'Cancelar',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'No se puede modificar un documento obsoleto o rechazado',
 'cannot_change_final_states' => 'Cuidado: No se puede cambiar el estado de documentos que han sido rechazados, marcados como obsoletos o expirados.',
@@ -565,6 +567,7 @@ URL: [url]',
 'empty_list' => 'Sin registros',
 'empty_notify_list' => 'Sin entradas',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Ingless (GB)',
 'equal_transition_states' => 'Estado inicial y final son iguales',
 'error' => 'Error',
@@ -757,6 +760,7 @@ URL: [url]',
 'import_fs_warning' => 'Esto funciona únicamente con carpetas dentro de la carpeta destino. La operación importa recursivamente todos los archivos y carpetas. Los archivos serán liberados inmediatamente.',
 'import_users' => 'Importar usuarios',
 'import_users_addnew' => 'Agregar nuevos usuarios',
+'import_users_no_column_mapping' => '',
 'import_users_update' => 'Actualizar usuarios existentes',
 'include_content' => 'Incluir contenido',
 'include_documents' => 'Incluir documentos',
@@ -946,6 +950,8 @@ URL: [url]',
 'new_attrdef' => 'Nueva definición de atributo',
 'new_default_keywords' => 'Agregar palabras claves',
 'new_default_keyword_category' => 'Nueva categoría',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Añadir categoría',
 'new_document_email' => 'Nuevo documento',
 'new_document_email_body' => 'Nuevo documento
@@ -1039,6 +1045,7 @@ URL: [url]',
 'no_version_modification' => 'Ninguna Modificación de Versión',
 'no_workflows' => '',
 'no_workflow_available' => '',
+'number_count' => '',
 'objectcheck' => 'Chequeo de carpeta/documento',
 'object_check_critical' => 'Errores críticos',
 'object_check_warning' => 'Alertas',
@@ -1187,6 +1194,7 @@ nURL: [url]',
 'remove_marked_files' => 'Eliminar ficheros marcados',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'Reparado',
 'repairing_objects' => 'Reparando documentos y carpetas.',
 'replace_content_email_body' => '',
@@ -1923,6 +1931,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'Estado/Estado siguiente',
 'statistic' => 'Estadística',
 'status' => 'Estado',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index dfddd6c87..21d9ab80e 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -273,9 +273,11 @@ URL : [url]</p>',
 'bg_BG' => 'Bulgare',
 'browse' => 'Parcourir',
 'calendar' => 'Agenda',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Semaine',
 'cancel' => 'Annuler',
 'cancel_checkout' => 'Annuler la vérification',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => 'La vérification peut être annulée même si des modifications ont été apportées au fichier. Dans ce cas, le fichier sera supprimé de l\'espace de vérification et votre modification sera perdue.',
 'cannot_assign_invalid_state' => 'Impossible de modifier un document obsolète ou rejeté',
 'cannot_change_final_states' => 'Attention : Vous ne pouvez pas modifier l’état d\'un document rejeté, expiré ou en attente de vérification ou d’approbation.',
@@ -663,6 +665,7 @@ URL : [url]</p>',
 'empty_list' => 'Aucune entrée',
 'empty_notify_list' => 'Aucune entrée',
 'enable_extension' => 'Activer l’extension',
+'enddate' => '',
 'en_GB' => 'Anglais (RU)',
 'equal_transition_states' => 'États de début et de fin identiques',
 'error' => 'Erreur',
@@ -899,6 +902,7 @@ URL : [url]</p>',
 'import_fs_warning' => 'L’importation peut se faire à partir du dossier de dépôt personnel uniquement. Tous les sous-dossiers et fichiers seront importés. Les fichiers seront immédiatement publiés.',
 'import_users' => 'Importer des utilisateurs',
 'import_users_addnew' => 'Ajouter de nouveaux utilisateurs',
+'import_users_no_column_mapping' => '',
 'import_users_update' => 'Mettre à jour des utilisateurs existants',
 'include_content' => 'Inclure le contenu',
 'include_documents' => 'Inclure les documents',
@@ -1088,6 +1092,8 @@ URL : [url]</p>',
 'new_attrdef' => 'Ajouter une définition d\'attribut',
 'new_default_keywords' => 'Ajouter des mots-clés',
 'new_default_keyword_category' => 'Ajouter une catégorie',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Ajouter une catégorie',
 'new_document_email' => 'Nouveau document',
 'new_document_email_body' => 'Nouveau document
@@ -1213,6 +1219,7 @@ URL : [url]</p>',
 'no_version_modification' => 'Pas de modification de version',
 'no_workflows' => 'Vous n’avez pas encore créé de workflow',
 'no_workflow_available' => 'Aucun workflow disponible',
+'number_count' => '',
 'objectcheck' => 'Vérification des dossiers et documents',
 'object_check_critical' => 'Erreurs critiques',
 'object_check_warning' => 'Avertissements',
@@ -1430,6 +1437,7 @@ URL : [url]</p>',
 'remove_marked_files' => 'Supprimer les fichiers sélectionnés',
 'remove_review_log' => 'Vérification retirée',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'réparé',
 'repairing_objects' => 'Réparation des documents et des dossiers.',
 'replace_content_email_body' => 'La dernière version du document a été remplacée.
@@ -2286,6 +2294,7 @@ Nom : [username]
 'splash_transfer_document' => 'Document transféré',
 'splash_transfer_objects' => 'Objets transférés',
 'splash_trigger_workflow' => 'Transition de workflow déclenchée',
+'startdate' => '',
 'state_and_next_state' => 'État initial/suivant',
 'statistic' => 'Statistiques',
 'status' => 'Statut',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 4448d5beb..c734f6d4e 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -244,9 +244,11 @@ Internet poveznica: [url]',
 'bg_BG' => 'Bugarski',
 'browse' => 'Pretraži',
 'calendar' => 'Kalendar',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'kalendarski tjedan',
 'cancel' => 'Odustani',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Ne možete mijenjati zastarjeli ili odbijeni dokument',
 'cannot_change_final_states' => 'Upozorenje: Ne možete mijenjati status odbijenog, isteklog ili dokumenta koji čeka na ovjeru ili odobrenje',
@@ -564,6 +566,7 @@ Internet poveznica: [url]',
 'empty_list' => '',
 'empty_notify_list' => 'Nema zapisa',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Engleski (GB)',
 'equal_transition_states' => 'Početni i završni status su jednaki',
 'error' => 'Greška',
@@ -750,6 +753,7 @@ Internet poveznica: [url]',
 'import_fs_warning' => '',
 'import_users' => 'Uvezi korisnike',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'Uključi sadržaj',
 'include_documents' => 'Sadrži dokumente',
@@ -939,6 +943,8 @@ Internet poveznica: [url]',
 'new_attrdef' => 'Dodaj definiciju atributa',
 'new_default_keywords' => 'Dodaj ključne riječi',
 'new_default_keyword_category' => 'Dodaj kategoriju',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Dodaj kategoriju',
 'new_document_email' => 'Novi dokument',
 'new_document_email_body' => 'Novi dokument
@@ -1031,6 +1037,7 @@ Internet poveznica: [url]',
 'no_version_modification' => 'Nema modifikacije verzije',
 'no_workflows' => '',
 'no_workflow_available' => 'Nema dostupnog toka rada',
+'number_count' => '',
 'objectcheck' => 'Provjera mapa / dokumenata',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -1179,6 +1186,7 @@ Internet poveznica: [url]',
 'remove_marked_files' => 'Ukloni označene datoteke',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'popravljeno',
 'repairing_objects' => 'Popravljanje dokumenata ili mapa.',
 'replace_content_email_body' => '',
@@ -1932,6 +1940,7 @@ Internet poveznica: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'Status/Slijedeći status',
 'statistic' => 'Statistika',
 'status' => 'Status',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 21128b2c3..6a4ae00f4 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -239,9 +239,11 @@ URL: [url]',
 'bg_BG' => 'Bulgár',
 'browse' => 'Tallózás',
 'calendar' => 'Naptár',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Naptári hét',
 'cancel' => 'Mé‰gsem',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Nem lehet új felülvizsgálót hozzárendelni olyan dokumentumhoz, amely nincs felülvizsgálat vagy jóváhagyás alatt.',
 'cannot_change_final_states' => 'Figyelem: Nem lehet olyan dokumentum állapotát módosítani, amely visszautasított, elavultnak jelölt vagy lejárt.',
@@ -559,6 +561,7 @@ URL: [url]',
 'empty_list' => '',
 'empty_notify_list' => 'Nincsenek bejegyzések',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Angol (GB)',
 'equal_transition_states' => 'A kezdő- és végállapot megegyezik',
 'error' => 'Hiba',
@@ -745,6 +748,7 @@ URL: [url]',
 'import_fs_warning' => '',
 'import_users' => 'Felhasználók importálása',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Tartalmazó dokumentumok',
@@ -934,6 +938,8 @@ URL: [url]',
 'new_attrdef' => 'Jellemző meghatározás hozzáadása',
 'new_default_keywords' => 'Kulcsszó hozzáadása',
 'new_default_keyword_category' => 'Kategória hozzáadása',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Kategória hozzáadása',
 'new_document_email' => 'Új dokumentum',
 'new_document_email_body' => 'Új dokumentum
@@ -1027,6 +1033,7 @@ URL: [url]',
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => '',
+'number_count' => '',
 'objectcheck' => 'Mappa/Dokumentum ellenőrzés',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -1175,6 +1182,7 @@ URL: [url]',
 'remove_marked_files' => 'Megjelölt állományok eltávolítása',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'javított',
 'repairing_objects' => 'Dokumentumok és mappák helyreállítása',
 'replace_content_email_body' => '',
@@ -1910,6 +1918,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'Állapot/Következő állapot',
 'statistic' => 'Statisztika',
 'status' => 'Állapot',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index 2cd68e6c2..cfd218cb5 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -253,9 +253,11 @@ URL: [url]</p>',
 'bg_BG' => 'Bulgaria',
 'browse' => 'Jelajahi',
 'calendar' => 'Kalender',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Kalender Mingguan',
 'cancel' => 'Batal',
 'cancel_checkout' => 'Batalkan pembayaran',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => 'Check out dapat dibatalkan jika berkas check out telah diubah. Dalam hal ini berkas akan dihapus dari ruang check out dan modifikasi Anda akan hilang.',
 'cannot_assign_invalid_state' => '',
 'cannot_change_final_states' => 'Peringatan: Anda tidak dapat mengubah status untuk dokumen yang ditolak, kedaluwarsa, atau dengan tinjauan atau persetujuan yang tertunda',
@@ -603,6 +605,7 @@ URL: [url]</p>',
 'empty_list' => 'Tidak ada entri',
 'empty_notify_list' => 'Tidak ada entri',
 'enable_extension' => 'Aktifkan ekstensi',
+'enddate' => '',
 'en_GB' => '',
 'equal_transition_states' => 'Status awal dan akhir sama',
 'error' => 'Galat',
@@ -801,6 +804,7 @@ URL: [url]</p>',
 'import_fs_warning' => '',
 'import_users' => 'Impor pengguna',
 'import_users_addnew' => 'Tambah pengguna baru',
+'import_users_no_column_mapping' => '',
 'import_users_update' => 'Perbarui pengguna yang ada',
 'include_content' => '',
 'include_documents' => 'Sertakan dokumen',
@@ -990,6 +994,8 @@ URL: [url]</p>',
 'new_attrdef' => 'Tambah definisi label',
 'new_default_keywords' => 'Tambah kata kunci',
 'new_default_keyword_category' => 'Tambah kategori',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Tambah kategori',
 'new_document_email' => 'Tambah dokumen',
 'new_document_email_body' => 'Tambah dokumen
@@ -1097,6 +1103,7 @@ URL: [url]</p>',
 'no_version_modification' => 'Tidak ada versi yang dimodifikasi',
 'no_workflows' => 'Anda belum membuat alur kerja',
 'no_workflow_available' => 'Tidak ada alur kerja yang tersedia',
+'number_count' => '',
 'objectcheck' => 'Pemeriksaan Folder/Dokumen',
 'object_check_critical' => 'Kesalahan kritis',
 'object_check_warning' => 'Peringatan',
@@ -1268,6 +1275,7 @@ URL: [url]',
 'remove_marked_files' => 'Hapus file yang ditandai',
 'remove_review_log' => 'Hapus ulasan',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'diperbaiki',
 'repairing_objects' => 'Memperbaiki dokumen dan folder.',
 'replace_content_email_body' => '',
@@ -1984,6 +1992,7 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => '',
 'statistic' => 'Statistik',
 'status' => 'Status',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 371d91ee9..f855e4d1c 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -244,9 +244,11 @@ URL: [url]',
 'bg_BG' => 'Bulgaro',
 'browse' => 'Scegli file',
 'calendar' => 'Calendario',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Calendario settimanale',
 'cancel' => 'Annulla',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Non è possibile modificare le assegnazioni di un documento obsoleto o rifiutato',
 'cannot_change_final_states' => 'Attenzione: non si può modificare lo stato dei documenti rifiutati, scaduti o in attesa di revisione o approvazione',
@@ -569,6 +571,7 @@ URL: [url]',
 'empty_list' => 'Nessuna voce',
 'empty_notify_list' => 'Nessun record',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Inglese (GB)',
 'equal_transition_states' => 'Lo stato iniziale e quello finale sono identici',
 'error' => 'Errore',
@@ -755,6 +758,7 @@ URL: [url]',
 'import_fs_warning' => 'Questo funziona solo per le cartelle nella cartella per lasciare. L\'operazione importa in modo ricorsivo tutte le cartelle e file. I file saranno pubblicati immediatamente.',
 'import_users' => 'Importa utenti',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
@@ -944,6 +948,8 @@ URL: [url]',
 'new_attrdef' => 'Nuovo attributo',
 'new_default_keywords' => 'Aggiungi parole-chiave',
 'new_default_keyword_category' => 'Nuova categoria',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Nuova categoria',
 'new_document_email' => 'Nuovo documento',
 'new_document_email_body' => 'Nuovo documento
@@ -1037,6 +1043,7 @@ URL: [url]',
 'no_version_modification' => 'Nessuna modifica versione',
 'no_workflows' => '',
 'no_workflow_available' => 'Nessun flusso di lavoro disponibile',
+'number_count' => '',
 'objectcheck' => 'Controllo cartelle o documenti',
 'object_check_critical' => 'Errori critici',
 'object_check_warning' => 'Avvertenze',
@@ -1196,6 +1203,7 @@ URL: [url]',
 'remove_marked_files' => 'Rimuovi i files contrassegnati',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'riparato',
 'repairing_objects' => 'Riparazione documenti e cartelle in corso...',
 'replace_content_email_body' => '',
@@ -1959,6 +1967,7 @@ Name: [username]
 'splash_transfer_document' => 'Documento trasferito',
 'splash_transfer_objects' => 'Oggetti trasferito',
 'splash_trigger_workflow' => 'Attivata transizione del flusso di lavoro',
+'startdate' => '',
 'state_and_next_state' => 'Stato/Prossimo stato',
 'statistic' => 'Statistiche',
 'status' => 'Stato',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 250bf6186..15f2d7d9e 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -246,9 +246,11 @@ URL: [url]',
 'bg_BG' => '불가리아',
 'browse' => '검색',
 'calendar' => '달력',
+'calendar_events_mail_subject' => '',
 'calendar_week' => '주',
 'cancel' => '취소',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => '사용되지 않거나 거부된 문서는 수정 불가',
 'cannot_change_final_states' => '경고 : 거부, 만료 또는 검토나 승인보류 중인 문서의 상태는 변경할 수 없습니다.',
@@ -565,6 +567,7 @@ URL: [url]',
 'empty_list' => '',
 'empty_notify_list' => '항목을 입력하세요',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => '영어 (GB)',
 'equal_transition_states' => '시작 및 종료가 동일한 상태',
 'error' => '오류',
@@ -751,6 +754,7 @@ URL: [url]',
 'import_fs_warning' => '',
 'import_users' => '',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => '내용을 포함',
 'include_documents' => '문서 포함',
@@ -940,6 +944,8 @@ URL: [url]',
 'new_attrdef' => '속성 정의 추가',
 'new_default_keywords' => '키워드 추가',
 'new_default_keyword_category' => '카테고리 추가',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => '카테고리 추가',
 'new_document_email' => '새 문서',
 'new_document_email_body' => '새 문서 
@@ -1033,6 +1039,7 @@ URL : [url]',
 'no_version_modification' => '버전의 변동사항이 없습니다.',
 'no_workflows' => '',
 'no_workflow_available' => '사용 가능한 워크 플로우 없습니다.',
+'number_count' => '',
 'objectcheck' => '폴더 / 문서 확인',
 'object_check_critical' => '치명적 오류',
 'object_check_warning' => 'Warnings',
@@ -1173,6 +1180,7 @@ URL: [url]',
 'remove_marked_files' => '마크 파일을 제거',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => '복구',
 'repairing_objects' => '문서 및 폴더 복구',
 'replace_content_email_body' => '',
@@ -1926,6 +1934,7 @@ URL : [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => '상태 / 다음 상태',
 'statistic' => '통계',
 'status' => '상태',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index f01c0a2bf..12db8a598 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -242,9 +242,11 @@ URL: [url]',
 'bg_BG' => 'ບັດແກເຣີຍ',
 'browse' => 'ໝວດ',
 'calendar' => 'ປະຕຶທຶນ',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'ປະຕຶທຶນປະຈຳອາທຶດ',
 'cancel' => 'ຍົກເລີກ',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'ບໍ່ສາມາດແກ້ໄຂເອກະສານທີ່ລ້າສະໄຫມ ຫຼື ເອກະສານທີ່ຖືກປະຕິເສດໄດ້',
 'cannot_change_final_states' => 'ຄຳເຕືອນ: ເຈົ້າບໍ່ສາມາດປ່ຽນແປງສະຖານະຂອງເອກະສານທີ່ຖືກປະຕິເສດ, ໝົດອາຍຸ ຫຼື ລໍຖ້າການກວດຄືນ ຫຼື ອະນຸມັດ',
@@ -562,6 +564,7 @@ URL: [url]',
 'empty_list' => '',
 'empty_notify_list' => 'ບໍ່ມີລາຍການ',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'ອັງກິດ (GB)',
 'equal_transition_states' => 'ສະຖານະເລີມຕົ້ນແລະສິນສຸດມີຄ່າເທົ່າກັນ',
 'error' => 'ຂໍ້ຜິດພາດ',
@@ -748,6 +751,7 @@ URL: [url]',
 'import_fs_warning' => 'ຊື່ງຈະໄຊ້ໄດ້ສະເພາະກັບໂຟລເດີໃນໂຟລເດີແບບເລືອນລົງເທົ່ານັ້ນ ການດຳເນີນການນີ້ຈະນຳເຂົ້າໄຟລແລະໂຟລເດີທັງຫມົດໄຟລຈະໄດ້ຮັບການເຜີຍແຜ່ທັນທີ',
 'import_users' => '',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'ລວມເນື້ອຫາ',
 'include_documents' => 'ລວມເອກະສານ',
@@ -937,6 +941,8 @@ URL: [url]',
 'new_attrdef' => 'ເພີ່ມການຈຳກັດຄວາມຂອງແອັດທີບິວ',
 'new_default_keywords' => 'ເພີ່ມຄຳຫລັກ',
 'new_default_keyword_category' => 'ເພີ່ມຫມວດໝູ່',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'ເພີ່ມຫມວດໝູ່',
 'new_document_email' => 'ເອກະສານໄຫມ່',
 'new_document_email_body' => 'ເອກະສານໄຫມ່
@@ -1030,6 +1036,7 @@ URL: [url]',
 'no_version_modification' => 'ບໍ່ມີການປ່ຽນເວີຊັນ',
 'no_workflows' => '',
 'no_workflow_available' => 'ບໍ່ມີເວີກໂຟລທີ່ພ້ອມໄຊ້ງານ',
+'number_count' => '',
 'objectcheck' => 'ການກວດສອບໂຟລເດີ / ເອກະສານ',
 'object_check_critical' => 'ຂໍ້ຜິດພາດທີ່ສຳຄັນ',
 'object_check_warning' => 'ຄຳເຕືອນ',
@@ -1189,6 +1196,7 @@ URL: [url]',
 'remove_marked_files' => 'ລົບໄຟລທີມີເຄື່ອງໝາຍໄວ້',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'ການສ້ອມແປງ',
 'repairing_objects' => 'ການສ້ອມແປງເອກະສານແລະໂຟລເດີ',
 'replace_content_email_body' => '',
@@ -1952,6 +1960,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => 'ຖ່າຍໂອນວັດຖຸຮຽບຮ້ອຍແລ້ວ',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'ລັດ/ລັດຖັດໄປ',
 'statistic' => 'ສະຖິຕິ',
 'status' => 'ສະຖານະ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 3421abc6b..5a529d305 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -244,9 +244,11 @@ URL: [url]',
 'bg_BG' => 'Bulgaria',
 'browse' => 'Bla',
 'calendar' => 'Kalender',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Kalenderuke',
 'cancel' => 'Avbryt',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Kan ikke endre et foreldet eller avvist dokument',
 'cannot_change_final_states' => 'Advarsel: Du kan ikke endre status for dokument som er avvist, utløpt eller i påvente av gjennomgang eller godkjenning',
@@ -576,6 +578,7 @@ URL: [url]',
 'empty_list' => 'Ingen oppføringer',
 'empty_notify_list' => 'Ingen oppføringer',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Engelsk (GB)',
 'equal_transition_states' => 'Status for start og slutt er lik',
 'error' => 'Feil',
@@ -769,6 +772,7 @@ URL: [url]',
 'import_fs_warning' => 'Dette fungerer bare for mapper i slippmappen. Operasjonen importerer rekursivt alle mapper og filer. Filer vil bli gitt ut umiddelbart.',
 'import_users' => '',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'Inkludere innhold',
 'include_documents' => 'Inkludere dokument',
@@ -958,6 +962,8 @@ URL: [url]',
 'new_attrdef' => 'Legg til egenskapsdefinisjon',
 'new_default_keywords' => 'Legg til søkeord',
 'new_default_keyword_category' => 'Legg til kategori for søkeord',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Legg til kategori',
 'new_document_email' => 'Nytt dokument',
 'new_document_email_body' => 'Nytt dokument
@@ -1051,6 +1057,7 @@ URL: [url]',
 'no_version_modification' => 'Ingen versjonsendring',
 'no_workflows' => '',
 'no_workflow_available' => 'Ingen arbeidsflyt tilgjengelig',
+'number_count' => '',
 'objectcheck' => 'Mappe/dokument sjekk',
 'object_check_critical' => 'Kritisk feil!!',
 'object_check_warning' => 'Advarsel!',
@@ -1204,6 +1211,7 @@ URL: [url]',
 'remove_marked_files' => 'Fjern markerte filer',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'reparert',
 'repairing_objects' => 'Reparere dokumenter og mapper.',
 'replace_content_email_body' => '',
@@ -1965,6 +1973,7 @@ Bruker: [username]
 'splash_transfer_document' => 'Dokumentet er øverført',
 'splash_transfer_objects' => 'Objekt er øverført',
 'splash_trigger_workflow' => 'Utløst overgang av arbeidsflyt',
+'startdate' => '',
 'state_and_next_state' => 'Status/Neste status',
 'statistic' => 'Statistikk',
 'status' => 'Status',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 68073098b..92aded6d7 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -237,9 +237,11 @@ URL: [url]',
 'bg_BG' => 'Bulgaars',
 'browse' => 'Browse',
 'calendar' => 'Kalender',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Weekkalender',
 'cancel' => 'Annuleren',
 'cancel_checkout' => 'stop',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Kan het document niet aanpassen in deze status',
 'cannot_change_final_states' => 'Waarschuwing: U kunt de Status [afgewezen], [vervallen], [in afwachting van] (nog) niet wijzigen.',
@@ -569,6 +571,7 @@ URL: [url]',
 'empty_list' => 'Lijst is leeg',
 'empty_notify_list' => 'Geen gegevens',
 'enable_extension' => 'Activeer de extensie',
+'enddate' => '',
 'en_GB' => 'Engels (GB)',
 'equal_transition_states' => 'Begin- en eind-status zijn hetzelfde',
 'error' => 'Fout',
@@ -762,6 +765,7 @@ URL: [url]',
 'import_fs_warning' => 'Dit werkt alleen in de dropfolder. Mappen en bestanden worden recursief geïmporteerd. Bestanden worden direct ter beschikking gesteld.',
 'import_users' => 'Gebruikers importeren',
 'import_users_addnew' => 'Voeg nieuwe gebruikers toe',
+'import_users_no_column_mapping' => '',
 'import_users_update' => 'Werk gebruikers bij',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
@@ -951,6 +955,8 @@ URL: [url]',
 'new_attrdef' => 'Voeg een attribuutdefinitie toe',
 'new_default_keywords' => 'Sleutelwoorden toevoegen',
 'new_default_keyword_category' => 'Categorie Toevoegen',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Categorie toevoegen',
 'new_document_email' => 'Nieuw document',
 'new_document_email_body' => 'Nieuw Document
@@ -1043,6 +1049,7 @@ URL: [url]',
 'no_version_modification' => 'Geen versiewijziging',
 'no_workflows' => '',
 'no_workflow_available' => 'Geen workflow beschikbaar',
+'number_count' => '',
 'objectcheck' => 'Mappen en documenten controleren',
 'object_check_critical' => 'Ernstige fouten',
 'object_check_warning' => 'Waarschuwingen',
@@ -1202,6 +1209,7 @@ URL: [url]',
 'remove_marked_files' => 'Geselecteerde bestanden worden verwijderd',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'Gerepareerd',
 'repairing_objects' => 'Documenten en mappen repareren.',
 'replace_content_email_body' => '',
@@ -1964,6 +1972,7 @@ Name: [username]
 'splash_transfer_document' => 'Document verzonden',
 'splash_transfer_objects' => 'Objecten verzonden',
 'splash_trigger_workflow' => 'Triggered transition van de workflow',
+'startdate' => '',
 'state_and_next_state' => 'status/ volgende status',
 'statistic' => 'Statistieken',
 'status' => 'Status',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index dbcecf4ba..20f5e7365 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -232,9 +232,11 @@ URL: [url]',
 'bg_BG' => 'Bułgarski',
 'browse' => 'Przeglądaj',
 'calendar' => 'Kalendarz',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Kalendarz tygodniowy',
 'cancel' => 'Anuluj',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Nie można modyfikować zdezaktualizowanego lub odrzuconego dokumentu',
 'cannot_change_final_states' => 'Ostrzeżenie: Nie można zmienić statusu dla dokumentu odrzuconego, wygasłego, w trakcie recenzowania lub zatwierdzania.',
@@ -552,6 +554,7 @@ URL: [url]',
 'empty_list' => 'Brak wpisów',
 'empty_notify_list' => 'Brak dokumentów',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Angielski (GB)',
 'equal_transition_states' => 'Stan rozpoczęcia i ukończenia jest taki sam',
 'error' => 'Błąd',
@@ -738,6 +741,7 @@ URL: [url]',
 'import_fs_warning' => 'Będzie to działać tylko w przypadku folderów w folderze zrzutu. Operacja rekurencyjnie importuje wszystkie foldery i pliki. Pliki zostaną natychmiast zwolnione.',
 'import_users' => 'Import użytkowników',
 'import_users_addnew' => 'Dodaj nowych użytkowników',
+'import_users_no_column_mapping' => '',
 'import_users_update' => 'Aktualizuj istniejących użytkowników',
 'include_content' => 'Dołącz treść',
 'include_documents' => 'Uwzględnij dokumenty',
@@ -927,6 +931,8 @@ URL: [url]',
 'new_attrdef' => 'Dodaj definicję atrybutu',
 'new_default_keywords' => 'Dodaj słowa kluczowe',
 'new_default_keyword_category' => 'Dodaj kategorię',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Dodaj kategorię',
 'new_document_email' => 'Nowy dokument',
 'new_document_email_body' => 'Nowy dokument
@@ -1020,6 +1026,7 @@ URL: [url]',
 'no_version_modification' => 'Bez modyfikacji wersji',
 'no_workflows' => '',
 'no_workflow_available' => 'Brak przepływu pracy',
+'number_count' => '',
 'objectcheck' => 'Sprawdź Katalog/Dokument',
 'object_check_critical' => 'Błędy krytyczne',
 'object_check_warning' => 'Ostrzeżenia',
@@ -1168,6 +1175,7 @@ URL: [url]',
 'remove_marked_files' => 'Usuń zaznaczone pliki',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'naprawiony',
 'repairing_objects' => 'Naprawa dokumentów i katalogów.',
 'replace_content_email_body' => '',
@@ -1895,6 +1903,7 @@ Name: [username]
 'splash_transfer_document' => 'Dokument przesłany',
 'splash_transfer_objects' => 'Obiekty przekazane',
 'splash_trigger_workflow' => 'Wyzwalane przejście przepływu pracy',
+'startdate' => '',
 'state_and_next_state' => 'Status/Następny status',
 'statistic' => 'Statystyka',
 'status' => 'Status',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 2e6f43bb1..453e7b980 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -244,9 +244,11 @@ URL: [url]',
 'bg_BG' => 'Bulgaro',
 'browse' => 'Procurar',
 'calendar' => 'Calendário',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Calendário semanal',
 'cancel' => 'Cancelar',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Não é possível atribuir novos revisores a um documento que não está pendente de revisão ou aprovação pendente.',
 'cannot_change_final_states' => 'Aviso: Você não pode alterar o estado do documento rejeitado, expirado ou com revisão ou aprovação.',
@@ -576,6 +578,7 @@ URL: [url]',
 'empty_list' => 'Nenhuma entrada',
 'empty_notify_list' => 'Sem entradas',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Inglês (GB)',
 'equal_transition_states' => 'Estado de início e fim são iguais',
 'error' => 'Erro',
@@ -769,6 +772,7 @@ URL: [url]',
 'import_fs_warning' => 'Isso só funcionará para pastas na pasta-alvo. A operação importa recursivamente todas as pastas e arquivos. Os arquivos serão liberados imediatamente.',
 'import_users' => 'Importar utilizadores',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'Incluir conteúdo',
 'include_documents' => 'Include documents',
@@ -958,6 +962,8 @@ URL: [url]',
 'new_attrdef' => 'Adicionar definição de atributo',
 'new_default_keywords' => 'Adicionar palavras-chave',
 'new_default_keyword_category' => 'Adicionar categoria',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Adicionar categoria',
 'new_document_email' => 'Novo documento',
 'new_document_email_body' => 'Novo documento
@@ -1050,6 +1056,7 @@ URL: [url]',
 'no_version_modification' => 'Nenhuma modificação de versão',
 'no_workflows' => '',
 'no_workflow_available' => 'Nenhum fluxo de trabalho disponível',
+'number_count' => '',
 'objectcheck' => 'Verificação da Pasta/Documento',
 'object_check_critical' => 'Erros críticos',
 'object_check_warning' => 'Avisos',
@@ -1209,6 +1216,7 @@ URL: [url]',
 'remove_marked_files' => 'Remover arquivos marcados',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'reparado',
 'repairing_objects' => 'Reparando documentos e pastas',
 'replace_content_email_body' => '',
@@ -1971,6 +1979,7 @@ Nome: [username]
 'splash_transfer_document' => 'Documento transferido',
 'splash_transfer_objects' => 'Objetos transferidos',
 'splash_trigger_workflow' => 'Acionada transição do fluxo de trabalho',
+'startdate' => '',
 'state_and_next_state' => 'Estado/Próximo estado',
 'statistic' => 'Estatística',
 'status' => 'Status',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index a9b60a086..9e540e863 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -244,9 +244,11 @@ URL: [url]',
 'bg_BG' => 'Bulgară',
 'browse' => 'Browse',
 'calendar' => 'Calendar',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Săptămână calendar',
 'cancel' => 'Anulare',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Nu se poate modifica un document învechit(absolete) sau respins(rejected)',
 'cannot_change_final_states' => 'Atenție: Nu puteți modifica status-ul unui document respins, expirat sau in așteptarea revizuirii/aprobarii',
@@ -564,6 +566,7 @@ URL: [url]',
 'empty_list' => '',
 'empty_notify_list' => 'Nu există înregistrări',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Engleza (GB)',
 'equal_transition_states' => 'Starea de start și de stop sunt egale',
 'error' => 'Eroare',
@@ -750,6 +753,7 @@ URL: [url]',
 'import_fs_warning' => '',
 'import_users' => 'Importa utilizatori',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Include documente',
@@ -939,6 +943,8 @@ URL: [url]',
 'new_attrdef' => 'Adaugă definitie atribut',
 'new_default_keywords' => 'Adaugă cuvinte cheie',
 'new_default_keyword_category' => 'Adaugă categorie',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Adaugă categorie',
 'new_document_email' => 'Document nou',
 'new_document_email_body' => 'Document nou
@@ -1032,6 +1038,7 @@ URL: [url]',
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => 'Nici un workflow disponibil',
+'number_count' => '',
 'objectcheck' => 'Verificare folder/document',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -1180,6 +1187,7 @@ URL: [url]',
 'remove_marked_files' => 'Eliminați fișierele marcate',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'reparat',
 'repairing_objects' => 'Reparare documente și foldere.',
 'replace_content_email_body' => '',
@@ -1933,6 +1941,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'Stare/Stare urmatoare',
 'statistic' => 'Statistic',
 'status' => 'Status',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index e0eadabba..e25392d24 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -244,9 +244,11 @@ URL: [url]',
 'bg_BG' => 'Болгарский',
 'browse' => 'Выбрать',
 'calendar' => 'Календарь',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Неделя',
 'cancel' => 'Отмена',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Невозможно изменить устаревший или отклонённый документ',
 'cannot_change_final_states' => 'Нельзя изменять статус отклонённого, устаревшего или ожидающего рецензии или утверждения',
@@ -564,6 +566,7 @@ URL: [url]',
 'empty_list' => 'Записи отсутствуют',
 'empty_notify_list' => 'Нет записей',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'English (GB)',
 'equal_transition_states' => 'Одинаковые начальный и конечный статусы',
 'error' => 'Ошибка',
@@ -750,6 +753,7 @@ URL: [url]',
 'import_fs_warning' => 'Предупреждение импорта из ФС',
 'import_users' => 'Импорт пользователей',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'Включая содержимое',
 'include_documents' => 'Включая документы',
@@ -939,6 +943,8 @@ URL: [url]',
 'new_attrdef' => 'Добавить определение атрибута',
 'new_default_keywords' => 'Добавить метки',
 'new_default_keyword_category' => 'Добавить метку',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Добавить категорию',
 'new_document_email' => 'Новый документ',
 'new_document_email_body' => 'Новый документ
@@ -1031,6 +1037,7 @@ URL: [url]',
 'no_version_modification' => 'Отсутствует модификация версии',
 'no_workflows' => '',
 'no_workflow_available' => 'Отсутствует процесс',
+'number_count' => '',
 'objectcheck' => 'Проверка целостности',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -1182,6 +1189,7 @@ URL: [url]',
 'remove_marked_files' => 'Удалить выбранные файлы',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'исправлено',
 'repairing_objects' => 'Восстановление каталогов и документов',
 'replace_content_email_body' => '',
@@ -1940,6 +1948,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'Статус / следующий статус',
 'statistic' => 'Статистика',
 'status' => 'Статус',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index d363354d7..43963e85b 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -244,9 +244,11 @@ URL: [url]',
 'bg_BG' => 'Bulharsky',
 'browse' => 'Prehľadávať',
 'calendar' => 'Kalendár',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Kalendárny týždeň',
 'cancel' => 'Zrušiť',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Cannot modify an obsolete or rejected document',
 'cannot_change_final_states' => 'Warning: You cannot alter status for document rejected, expired or with pending review or approval',
@@ -576,6 +578,7 @@ URL: [url]',
 'empty_list' => 'Žiadne položky',
 'empty_notify_list' => 'Žiadne položky',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Angličtina (UK)',
 'equal_transition_states' => 'Začiatok a koniec sú rovnaké',
 'error' => 'Chyba',
@@ -769,6 +772,7 @@ URL: [url]',
 'import_fs_warning' => 'This will only work for folders in the drop folder. The operation recursively imports all folders and files. Files will be released immediately.',
 'import_users' => 'Importovať užívateľov',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'Zahrnúť obsah',
 'include_documents' => 'Vrátane súborov',
@@ -958,6 +962,8 @@ URL: [url]',
 'new_attrdef' => 'Pridať definíciu atribútu',
 'new_default_keywords' => 'Pridať kľúčové slová',
 'new_default_keyword_category' => 'Pridať kategóriu',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Pridať kategóriu',
 'new_document_email' => 'Nový dokument',
 'new_document_email_body' => 'Nový dokument
@@ -1051,6 +1057,7 @@ URL: [url]',
 'no_version_modification' => 'Žiadne zmeny',
 'no_workflows' => '',
 'no_workflow_available' => 'Nie je k dispozícii žiaden workflow',
+'number_count' => '',
 'objectcheck' => 'Kontrola Adresárov/Dokumentov',
 'object_check_critical' => 'Kritické chyby',
 'object_check_warning' => 'Varovanie',
@@ -1210,6 +1217,7 @@ URL: [url]',
 'remove_marked_files' => 'Odstrániť označené súbory',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'opravené',
 'repairing_objects' => 'Oprava dokumentov a zložiek.',
 'replace_content_email_body' => '',
@@ -1973,6 +1981,7 @@ Meno: [username]
 'splash_transfer_document' => 'Document transfered',
 'splash_transfer_objects' => 'Objects transfered',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'State/Next state',
 'statistic' => 'Štatistika',
 'status' => 'Stav',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index ba5ad1304..14dd293a6 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -245,9 +245,11 @@ URL: [url]',
 'bg_BG' => 'Bulgariska',
 'browse' => 'Bläddra',
 'calendar' => 'Kalender',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Kalendervecka',
 'cancel' => 'Avbryt',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Kan inte ändra ett dokument som har gått ut eller avvisats.',
 'cannot_change_final_states' => 'OBS: Du kan inte ändra status för ett dokument som har avvisats, gått ut eller som väntar på att bli godkänt.',
@@ -570,6 +572,7 @@ URL: [url]',
 'empty_list' => '',
 'empty_notify_list' => 'Inga meddelanden',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'Engelska (GB)',
 'equal_transition_states' => 'Status för start och slut är lika',
 'error' => 'Fel',
@@ -756,6 +759,7 @@ URL: [url]',
 'import_fs_warning' => 'Detta fungerar endast för kataloger i mellanlagringsmappen. Filer och mappar får godkänd status direkt efter importen.',
 'import_users' => 'Importera användare',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'Inkudera innehåll',
 'include_documents' => 'Inkludera dokument',
@@ -945,6 +949,8 @@ URL: [url]',
 'new_attrdef' => 'Lägg till attributdefinition',
 'new_default_keywords' => 'Lägg till nyckelord',
 'new_default_keyword_category' => 'Lägg till nyckelordskategori',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Lägg till kategori',
 'new_document_email' => 'Nytt dokument',
 'new_document_email_body' => 'Nytt dokument
@@ -1038,6 +1044,7 @@ URL: [url]',
 'no_version_modification' => 'Ingen versionsförändring',
 'no_workflows' => '',
 'no_workflow_available' => 'Arbetsflöde saknas',
+'number_count' => '',
 'objectcheck' => 'Kontroll av Katalog/Dokument',
 'object_check_critical' => 'Kritiska fel',
 'object_check_warning' => 'Varningar',
@@ -1183,6 +1190,7 @@ URL: [url]',
 'remove_marked_files' => 'Ta bort markerade filer',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'reparerat',
 'repairing_objects' => 'Reparerar dokument och kataloger.',
 'replace_content_email_body' => '',
@@ -1946,6 +1954,7 @@ Kommentar: [comment]',
 'splash_transfer_document' => 'Dokument överfört',
 'splash_transfer_objects' => 'Objekt överförda',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'Status/Nästa status',
 'statistic' => 'Statistik',
 'status' => 'Status',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 68c534c53..2805967ff 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -238,9 +238,11 @@ URL: [url]',
 'bg_BG' => 'Bulgarca',
 'browse' => 'Tara',
 'calendar' => 'Takvim',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Takvim haftası',
 'cancel' => 'İptal',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Geçersiz veya reddedilmiş doküman değiştirilemez.',
 'cannot_change_final_states' => 'Dikkat: Reddedilen, süresi dolan, kontrol veya onay bekleyen dokümanın durumununu değiştiremezsiniz.',
@@ -558,6 +560,7 @@ URL: [url]',
 'empty_list' => '',
 'empty_notify_list' => 'Giriş yok',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'İngilizce',
 'equal_transition_states' => 'Başlangıç ve bitiş durumları eşit',
 'error' => 'Hata',
@@ -744,6 +747,7 @@ URL: [url]',
 'import_fs_warning' => '',
 'import_users' => 'Kullanıcıları İçe Aktar',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => '',
 'include_documents' => 'Dokümanları kapsa',
@@ -933,6 +937,8 @@ URL: [url]',
 'new_attrdef' => 'Nitelik tanımı ekle',
 'new_default_keywords' => 'Anahtar kelime ekle',
 'new_default_keyword_category' => 'Kategori ekle',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Kategori ekle',
 'new_document_email' => 'Yeni doküman',
 'new_document_email_body' => 'Yeni doküman
@@ -1026,6 +1032,7 @@ URL: [url]',
 'no_version_modification' => 'Versiyon değişikliği yapılmamış',
 'no_workflows' => '',
 'no_workflow_available' => 'Uygun iş akışı yok',
+'number_count' => '',
 'objectcheck' => 'Klasör/Doküman kontrol',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -1176,6 +1183,7 @@ URL: [url]',
 'remove_marked_files' => 'İşaretli dosyaları sil',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'onarıldı',
 'repairing_objects' => 'Doküman ve klasörler onarılıyor.',
 'replace_content_email_body' => '',
@@ -1912,6 +1920,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'Durum/Sonraki durum',
 'statistic' => 'İstatistik',
 'status' => 'Durum',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 611add06c..63183621d 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -244,9 +244,11 @@ URL: [url]',
 'bg_BG' => 'Bulgarian',
 'browse' => 'Вибрати',
 'calendar' => 'Календар',
+'calendar_events_mail_subject' => '',
 'calendar_week' => 'Тиждень',
 'cancel' => 'Відміна',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => 'Неможливо змінити застарілий чи відхилений документ',
 'cannot_change_final_states' => 'Не можна змінювати статус відхиленого, застарілого документа або документа, що очікує на рецензію чи затвердження',
@@ -564,6 +566,7 @@ URL: [url]',
 'empty_list' => '',
 'empty_notify_list' => 'Немає записів',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => 'English (GB)',
 'equal_transition_states' => 'Однакові початковий і кінцевий статуси',
 'error' => 'Помилка',
@@ -750,6 +753,7 @@ URL: [url]',
 'import_fs_warning' => '',
 'import_users' => '',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => 'Включно з вмістом',
 'include_documents' => 'Включно з документами',
@@ -939,6 +943,8 @@ URL: [url]',
 'new_attrdef' => 'Додати визначення атрибуту',
 'new_default_keywords' => 'Додати ключові слова',
 'new_default_keyword_category' => 'Додати категорію ключових слів',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => 'Додати категорію',
 'new_document_email' => 'Новий документ',
 'new_document_email_body' => 'Новий документ
@@ -1031,6 +1037,7 @@ URL: [url]',
 'no_version_modification' => 'Відсутня модифікація версії',
 'no_workflows' => '',
 'no_workflow_available' => 'Немає доступних процесів',
+'number_count' => '',
 'objectcheck' => 'Перевірка каталогу чи документа',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -1182,6 +1189,7 @@ URL: [url]',
 'remove_marked_files' => 'Видалити обрані файли',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => 'виправлено',
 'repairing_objects' => 'Відновлення каталогів і документів',
 'replace_content_email_body' => '',
@@ -1933,6 +1941,7 @@ URL: [url]',
 'splash_transfer_document' => '',
 'splash_transfer_objects' => '',
 'splash_trigger_workflow' => '',
+'startdate' => '',
 'state_and_next_state' => 'Статус / наступний статус',
 'statistic' => 'Статистика',
 'status' => 'Статус',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index d9d1d7fa0..935894e1c 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -236,9 +236,11 @@ URL: [url]',
 'bg_BG' => '保加利亚语',
 'browse' => '浏览',
 'calendar' => '日历',
+'calendar_events_mail_subject' => '',
 'calendar_week' => '周历',
 'cancel' => '取消',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => '不能修改文档的最终状态',
 'cannot_change_final_states' => '警告:您不能更改文档的拒绝、过期、待校对、或是待审核等状态',
@@ -564,6 +566,7 @@ URL: [url]',
 'empty_list' => '没有条目',
 'empty_notify_list' => '没有条目',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => '英语',
 'equal_transition_states' => '开始状态和下一个状态相同！',
 'error' => '错误',
@@ -752,6 +755,7 @@ URL: [url]',
 'import_fs_warning' => '这将只适用于拖动文件夹。该操作将递归导入所有文件夹和文件。文件将立即释放。',
 'import_users' => '导入用户',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => '包括内容',
 'include_documents' => '包含文档',
@@ -941,6 +945,8 @@ URL: [url]',
 'new_attrdef' => '添加属性',
 'new_default_keywords' => '添加关键字',
 'new_default_keyword_category' => '添加类别',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => '增加分类',
 'new_document_email' => '添加新文档',
 'new_document_email_body' => '新建文档
@@ -1034,6 +1040,7 @@ URL: [url]',
 'no_version_modification' => '版本未修改',
 'no_workflows' => '',
 'no_workflow_available' => '工作流不可用',
+'number_count' => '',
 'objectcheck' => '文件夹/文件检查',
 'object_check_critical' => '重大错误',
 'object_check_warning' => '警告',
@@ -1187,6 +1194,7 @@ URL: [url]',
 'remove_marked_files' => '删除选中的文件',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => '已修复',
 'repairing_objects' => '修复文件和文件夹',
 'replace_content_email_body' => '',
@@ -1920,6 +1928,7 @@ URL: [url]',
 'splash_transfer_document' => '文档转移',
 'splash_transfer_objects' => '对象转移',
 'splash_trigger_workflow' => '触发工作流过渡',
+'startdate' => '',
 'state_and_next_state' => '状态/下一个状态',
 'statistic' => '统计',
 'status' => '状态',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 0f65fc46e..fd5132025 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -244,9 +244,11 @@ URL: [url]',
 'bg_BG' => '保加利亞語',
 'browse' => '瀏覽',
 'calendar' => '日曆',
+'calendar_events_mail_subject' => '',
 'calendar_week' => '日曆週',
 'cancel' => '取消',
 'cancel_checkout' => '',
+'cancel_checkout_document' => '',
 'cancel_checkout_warning' => '',
 'cannot_assign_invalid_state' => '不能修改文件的最終狀態',
 'cannot_change_final_states' => '警告:您不能更改文件的拒絕、過期、待校對、或是待審核等狀態',
@@ -576,6 +578,7 @@ URL: [url]',
 'empty_list' => '沒有條目',
 'empty_notify_list' => '沒有條目',
 'enable_extension' => '',
+'enddate' => '',
 'en_GB' => '英語',
 'equal_transition_states' => '起始狀態和結束狀態相等',
 'error' => '錯誤',
@@ -769,6 +772,7 @@ URL: [url]',
 'import_fs_warning' => '這僅適用於放置文件夾中的文件夾。該操作以遞歸方式導入所有文件夾和文件。文件將立即釋放。',
 'import_users' => '導入用戶',
 'import_users_addnew' => '',
+'import_users_no_column_mapping' => '',
 'import_users_update' => '',
 'include_content' => '包含內容',
 'include_documents' => '包含文件',
@@ -958,6 +962,8 @@ URL: [url]',
 'new_attrdef' => '新增屬性',
 'new_default_keywords' => '新增關鍵字',
 'new_default_keyword_category' => '新增類別',
+'new_documents_today' => '',
+'new_documents_yesterday' => '',
 'new_document_category' => '增加分類',
 'new_document_email' => '新增新文件',
 'new_document_email_body' => '新文件
@@ -1051,6 +1057,7 @@ URL: [url]',
 'no_version_modification' => '沒有版本修改',
 'no_workflows' => '',
 'no_workflow_available' => '沒有可用的工作流程',
+'number_count' => '',
 'objectcheck' => '資料夾/檔檢查',
 'object_check_critical' => '嚴重錯誤',
 'object_check_warning' => '警告',
@@ -1208,6 +1215,7 @@ URL: [url]',
 'remove_marked_files' => '刪除勾選的檔案',
 'remove_review_log' => '',
 'remove_task' => '',
+'reorder' => '',
 'repaired' => '修復',
 'repairing_objects' => '修復文檔和文件夾。',
 'replace_content_email_body' => '',
@@ -1971,6 +1979,7 @@ URL: [url]',
 'splash_transfer_document' => '文件已轉移',
 'splash_transfer_objects' => '轉移的物件',
 'splash_trigger_workflow' => '觸發工作流程過渡',
+'startdate' => '',
 'state_and_next_state' => '狀態/下一個狀態',
 'statistic' => '統計',
 'status' => '狀態',

From 668ee243b22e4bbd3b5e1e3fb3979adec66ea2e6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Mar 2023 15:37:29 +0100
Subject: [PATCH 1891/2006] actually send mail

---
 inc/inc.Tasks.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 53e8e5fee..ccf1dc05a 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -696,12 +696,11 @@ class SeedDMS_StatisticTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 
 				$bodyhtml .= "</table>".PHP_EOL;
 
-				echo $body;
 				$params = array();
 				$params['__body__'] = $body;
 				$params['__body_html__'] = $bodyhtml;
 				$params['sitename'] = $settings->_siteName;
-				//$email->toIndividual('', $auser, 'statistics_mail_subject', '', $params);
+				$email->toIndividual('', $auser, 'statistics_mail_subject', '', $params);
 
 				$logger->log('Task \'statistics\': Sending statistics \'statistics_mail_subject\' to user \''.$auser->getLogin().'\'', PEAR_LOG_INFO);
 			}

From ed27dbcf4b7a2128904ff79ecaa93d6f11414857 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 24 Mar 2023 16:33:17 +0100
Subject: [PATCH 1892/2006] add open office formats to get_extension

---
 inc/inc.Utils.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 35c9df96d..444cded70 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -651,6 +651,9 @@ function get_extension($mimetype) { /* {{{ */
 		case 'application/postscript': return '.ps';
 		case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document': return '.docx';
 		case 'application/vnd.openxmlformats-officedocument.presentationml.presentation': return '.pptx';
+		case 'application/vnd.oasis.opendocument.text': return '.odt';
+		case 'application/vnd.oasis.opendocument.spreadsheet': return '.ods';
+		case 'application/vnd.oasis.opendocument.presentation': return '.odp';
 		case 'text/plain': return '.txt';
 		case 'text/csv': return '.csv';
 		case 'text/rtf': return '.rtf';

From b25776eaad212d2f84d416dede3f15c5d86182ae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 27 Mar 2023 14:30:56 +0200
Subject: [PATCH 1893/2006] complete changes of 6.0.23

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index d806844ca..6f3bf292f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - fix setting recipients and revisors
 - check in of a document is allowed for the user having done the check out
   or those users with unlimited access rights on the document
+- merge changes up to 5.1.30
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.22

From a13e1121e38af155610ab8e3eadd8aeb8dd7844b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Mar 2023 09:03:58 +0200
Subject: [PATCH 1894/2006] no need to include vendor/autoload.php. It's done
 in inc.Settings.php

---
 index.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/index.php b/index.php
index af3d42456..ce750c740 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-include("inc/inc.Settings.php");
+require("inc/inc.Settings.php");
 
 if(true) {
 	require_once("inc/inc.Utils.php");
@@ -27,8 +27,6 @@ if(true) {
 	require_once("inc/inc.Extension.php");
 	require_once("inc/inc.DBInit.php");
 
-	require "vendor/autoload.php";
-
 	$c = new \Slim\Container(); //Create Your container
 	$c['notFoundHandler'] = function ($c) use ($settings, $dms) {
 		return function ($request, $response) use ($c, $settings, $dms) {

From 0280a8adc0e4e74f0a76d3bbacfcd8873cfc1770 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Mar 2023 20:38:48 +0200
Subject: [PATCH 1895/2006] show current password expiration

---
 views/bootstrap/class.UsrMgr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index a32e29263..7bed35a89 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -283,7 +283,7 @@ $(document).ready( function() {
 		if($passwordexpiration > 0 && (!$currUser || !$currUser->isAdmin())) {
 			$options = array();
 			if($currUser)
-				$options[] = array('', getMLText("keep"));
+				$options[] = array('', getMLText("keep").($currUser->getPwdExpiration() ? ' ('.getLongReadableDate($currUser->getPwdExpiration()).')' : ''));
 			$options[] = array('now', getMLText('now'));
 			$options[] = array(date('Y-m-d H:i:s', time()+$passwordexpiration*86400), getMLText("according_settings"));
 			$options[] = array('never', getMLText("never"));

From 382e78855da89606b9b2480a92b150c739a0a397 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Mar 2023 20:48:07 +0200
Subject: [PATCH 1896/2006] do not force password change if in substitute user
 mode

---
 CHANGELOG                  | 1 +
 inc/inc.Authentication.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 865472f70..abaab0767 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - color category (use first 6 chars of md5(category name) as hex color)
 - create missing preview images in category or attribute manager
 - support README of extension in different languages
+- do not force password change if in substitute user mode
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.29
diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index ade988137..6255b1dcc 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -103,11 +103,11 @@ if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $lang . "/la
 /* Check if password needs to be changed because it expired. If it needs
  * to be changed redirect to out/out.ForcePasswordChange.php. Do this
  * check only if password expiration is turned on, we are not on the
- * page to change the password or the page that changes the password, and
- * it is not admin */
+ * page to change the password or the page that changes the password,
+ * it is not admin, and there is currently no user substitution */
 
 if (!$user->isAdmin()) {
-	if($settings->_passwordExpiration > 0) {
+	if(!$resArr['su'] && $settings->_passwordExpiration > 0) {
 		if(basename($_SERVER['SCRIPT_NAME']) != 'out.ForcePasswordChange.php' && basename($_SERVER['SCRIPT_NAME']) != 'op.EditUserData.php' && basename($_SERVER['SCRIPT_NAME']) != 'op.Logout.php') {
 			$pwdexp = $user->getPwdExpiration();
 			if(substr($pwdexp, 0, 10) != '0000-00-00') {

From 476c726a45ecf236c2dbb442db01ed3f5ed767e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 29 Mar 2023 20:57:48 +0200
Subject: [PATCH 1897/2006] improve password expiration

---
 inc/inc.Authentication.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index 6255b1dcc..49f87a02a 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -103,14 +103,14 @@ if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $lang . "/la
 /* Check if password needs to be changed because it expired. If it needs
  * to be changed redirect to out/out.ForcePasswordChange.php. Do this
  * check only if password expiration is turned on, we are not on the
- * page to change the password or the page that changes the password,
- * it is not admin, and there is currently no user substitution */
+ * page to change the password or the page that changes the password, the
+ * current user is not admin, and no user substitution has occured. */
 
-if (!$user->isAdmin()) {
-	if(!$resArr['su'] && $settings->_passwordExpiration > 0) {
+if (!$user->isAdmin() && !$resArr['su']) {
+	if($settings->_passwordExpiration > 0) {
 		if(basename($_SERVER['SCRIPT_NAME']) != 'out.ForcePasswordChange.php' && basename($_SERVER['SCRIPT_NAME']) != 'op.EditUserData.php' && basename($_SERVER['SCRIPT_NAME']) != 'op.Logout.php') {
 			$pwdexp = $user->getPwdExpiration();
-			if(substr($pwdexp, 0, 10) != '0000-00-00') {
+			if($pwdexp && substr($pwdexp, 0, 10) != '0000-00-00') {
 				$pwdexpts = strtotime($pwdexp); // + $pwdexp*86400;
 				if($pwdexpts > 0 && $pwdexpts < time()) {
 					header("Location: ../out/out.ForcePasswordChange.php");

From 8609fdee74bcbf310f6cf840c3c72733059b0b37 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 30 Mar 2023 12:02:31 +0200
Subject: [PATCH 1898/2006] do not show warning that document is released if
 initial status is draft

---
 views/bootstrap/class.UpdateDocument.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 5b0815a47..c0a60af1b 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -338,7 +338,8 @@ console.log(element);
 					)
 				);
 			}
-			$this->warningMsg(getMLText("add_doc_workflow_warning"));
+			if($settings->_initialDocumentStatus == S_RELEASED)
+				$this->warningMsg(getMLText("add_doc_workflow_warning"));
 		} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			if($workflowmode == 'traditional') {
 				$this->contentSubHeading(getMLText("assign_reviewers"));

From 23a94f8ac84b3eb353e94e0ce69b96e40bac36d1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 30 Mar 2023 12:26:35 +0200
Subject: [PATCH 1899/2006] put reviewer and approver into own content
 container

---
 views/bootstrap/class.AddDocument.php    | 4 +++-
 views/bootstrap/class.UpdateDocument.php | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index cb1698c10..93f6d8945 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -446,7 +446,6 @@ console.log(params);
 			echo $arrs;
 		}
 
-		$this->contentContainerEnd();
 		if($workflowmode == 'advanced') {
 			$mandatoryworkflows = $user->getMandatoryWorkflows();
 			if($mandatoryworkflows) {
@@ -494,6 +493,7 @@ console.log(params);
 			$this->warningMsg(getMLText("add_doc_workflow_warning"));
 		} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			if($workflowmode == 'traditional') {
+				$this->contentContainerEnd();
 				$this->contentSubHeading(getMLText("assign_reviewers"));
 				$this->contentContainerStart();
 
@@ -699,6 +699,8 @@ console.log(params);
 				}
 			$this->contentContainerEnd();
 			$this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
+		} else {
+			$this->contentContainerEnd();
 		}
 		$this->columnEnd();
 		$this->rowEnd();
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 45a93e522..b12e3fe66 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -329,10 +329,13 @@ console.log(element);
 					)
 				);
 			}
+			$this->contentContainerEnd();
 			$this->warningMsg(getMLText("add_doc_workflow_warning"));
 		} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 			if($workflowmode == 'traditional') {
+				$this->contentContainerEnd();
 				$this->contentSubHeading(getMLText("assign_reviewers"));
+				$this->contentContainerStart();
 				$res=$user->getMandatoryReviewers();
 				$options = array();
 				foreach ($docAccess["users"] as $usr) {
@@ -480,9 +483,11 @@ console.log(element);
 						}
 					}
 				}
+				$this->contentContainerEnd();
 			}
 
 			$this->contentSubHeading(getMLText("assign_approvers"));
+			$this->contentContainerStart();
 			$options = array();
 			$res=$user->getMandatoryApprovers();
 			foreach ($docAccess["users"] as $usr) {
@@ -631,9 +636,11 @@ console.log(element);
 						}
 					}
 				}
+			$this->contentContainerEnd();
 			$this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
+		} else {
+			$this->contentContainerEnd();
 		}
-		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('update_document'));
 ?>
 </form>

From 3fb9d140fa2fdc4efaedb81a2d75c001ccc1b826 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 30 Mar 2023 12:33:46 +0200
Subject: [PATCH 1900/2006] fix translations for recipients

---
 views/bootstrap/class.UpdateDocument.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index fbae17527..0d59ab82c 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -687,6 +687,8 @@ console.log(element);
 			$this->contentContainerEnd();
 		}
 		if($enablereceiptworkflow) {
+			$this->contentSubHeading(getMLText("assign_recipients"));
+			$this->contentContainerStart();
 			$options = array();
 			foreach ($docAccess["users"] as $usr) {
 				if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue; 
@@ -703,7 +705,7 @@ console.log(element);
 				$fieldwrap = array('', $this->getSelectPresetButtonHtml("IndRecipient", $tmp));
 			}
 			$this->formField(
-				getMLText("assign_recipients"),
+				getMLText("individuals"),
 				array(
 					'element'=>'select',
 					'name'=>'indRecipients[]',
@@ -748,7 +750,7 @@ console.log(element);
 				$fieldwrap = array('', $this->getSelectPresetButtonHtml("GrpRecipient", $tmp));
 			}
 			$this->formField(
-				getMLText("assign_recipients"),
+				getMLText("groups"),
 				array(
 					'element'=>'select',
 					'name'=>'grpRecipients[]',
@@ -761,8 +763,8 @@ console.log(element);
 				array('field_wrap'=>$fieldwrap)
 			);
 
+			$this->contentContainerEnd();
 		}
-		$this->contentContainerEnd();
 		$this->formSubmit(getMLText('update_document'));
 ?>
 </form>

From 7790f483f0f7f040364a396f64830ba9ca0d9164 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 31 Mar 2023 12:00:56 +0200
Subject: [PATCH 1901/2006] no need to create notification service a second
 time

---
 op/op.Ajax.php    | 22 +---------------------
 restapi/index.php | 22 ----------------------
 webdav/index.php  | 22 ----------------------
 3 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 9999186b8..d9dad164e 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -27,6 +27,7 @@ require_once("../inc/inc.ClassNotificationService.php");
 require_once("../inc/inc.ClassEmailNotify.php");
 require_once("../inc/inc.ClassUI.php");
 require_once("../inc/inc.ClassController.php");
+require_once("../inc/inc.Notification.php");
 
 require_once("../inc/inc.ClassSession.php");
 require_once("../inc/inc.ClassPasswordStrength.php");
@@ -63,27 +64,6 @@ if (isset($_COOKIE["mydms_session"])) {
 		$dms->setRootFolderID($user->getHomeFolder());
 	}
 
-	global $logger;
-	$notifier = new SeedDMS_NotificationService($logger, $settings);
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
-			if(method_exists($notificationObj, 'preAddService')) {
-				$notificationObj->preAddService($dms, $notifier);
-			}
-		}
-	}
-
-	if($settings->_enableEmail) {
-		$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword), 'email');
-	}
-
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
-			if(method_exists($notificationObj, 'postAddService')) {
-				$notificationObj->postAddService($dms, $notifier);
-			}
-		}
-	}
 	include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
 } else {
 	$user = null;
diff --git a/restapi/index.php b/restapi/index.php
index 541d9bfcf..4ae5efece 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -15,28 +15,6 @@ require_once("../inc/inc.ClassEmailNotify.php");
 require_once("../inc/inc.Notification.php");
 require_once("../inc/inc.ClassController.php");
 
-$notifier = new SeedDMS_NotificationService($logger, $settings);
-
-if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
-    foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
-        if(method_exists($notificationObj, 'preAddService')) {
-            $notificationObj->preAddService($dms, $notifier);
-        }
-    }
-}
-
-if($settings->_enableEmail) {
-    $notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword));
-}
-
-if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
-    foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
-        if(method_exists($notificationObj, 'postAddService')) {
-            $notificationObj->postAddService($dms, $notifier);
-        }
-    }
-}
-
 require "vendor/autoload.php";
 
 use Psr\Container\ContainerInterface;
diff --git a/webdav/index.php b/webdav/index.php
index e148a8029..a70b701d4 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -15,28 +15,6 @@ require_once("../inc/inc.ClassEmailNotify.php");
 require_once("../inc/inc.Notification.php");
 require_once("../inc/inc.ClassController.php");
 
-$notifier = new SeedDMS_NotificationService($logger, $settings);
-
-if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
-	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
-		if(method_exists($notificationObj, 'preAddService')) {
-			$notificationObj->preAddService($dms, $notifier);
-		}
-	}
-}
-
-if($settings->_enableEmail) {
-	$notifier->addService(new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword));
-}
-
-if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
-	foreach($GLOBALS['SEEDDMS_HOOKS']['notification'] as $notificationObj) {
-		if(method_exists($notificationObj, 'postAddService')) {
-			$notificationObj->postAddService($dms, $notifier);
-		}
-	}
-}
-
 include("webdav.php");
 $server = new HTTP_WebDAV_Server_SeedDMS();
 $server->ServeRequest($dms, $settings, $logger, $notifier, $authenticator);

From 3a8b897d61ff4a374877022f620af4250fcbacb6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 3 Apr 2023 12:02:21 +0200
Subject: [PATCH 1902/2006] more consice layout, add test for directories on
 disc

---
 views/bootstrap/class.Info.php | 65 +++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/views/bootstrap/class.Info.php b/views/bootstrap/class.Info.php
index 78350783a..71b9a030b 100644
--- a/views/bootstrap/class.Info.php
+++ b/views/bootstrap/class.Info.php
@@ -102,57 +102,56 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
 
 			$this->contentHeading(getMLText("installed_php_extensions"));
 			$phpextensions = get_loaded_extensions(false);
-			echo "<table class=\"table table-condensed table-sm\">\n";
-			echo "<thead>\n<tr>\n";
-			echo "<th>".getMLText("name");
-			echo "</th>\n";
-			echo "</tr>\n</thead>\n<tbody>\n";
-			foreach($phpextensions as $extname)
-				echo "<tr><td>".$extname."</td><td>"."</td></tr>\n";
-			echo "</tbody>\n</table>\n";
+			echo implode(', ', $phpextensions);
 
 			$this->contentHeading(getMLText("missing_php_extensions"));
-			echo "<table class=\"table table-condensed table-sm\">\n";
-			echo "<thead>\n<tr>\n";
-			echo "<th>".getMLText("name");
-			echo "</th>\n";
-			echo "</tr>\n</thead>\n<tbody>\n";
 			$requiredext = array('zip', 'xml', 'xsl', 'json', 'intl', 'fileinfo', 'mbstring', 'curl', 'sqlite3', 'imagick');
-			foreach(array_diff($requiredext, $phpextensions) as $extname)
-				echo "<tr><td>".$extname."</td><td>"."</td></tr>\n";
-			echo "</tbody>\n</table>\n";
+			echo implode(', ', array_diff($requiredext, $phpextensions));
 
 			$this->contentHeading(getMLText("missing_php_functions_and_classes"));
-			echo "<table class=\"table table-condensed table-sm\">\n";
-			echo "<thead>\n<tr>\n";
-			echo "<th>".getMLText("name");
-			echo "<th>".getMLText("missing_func_class_note");
-			echo "</th>\n";
-			echo "</tr>\n</thead>\n<tbody>\n";
+			$missingfunc = [];
 			foreach(array('proc_open') as $funcname) {
 				if(!function_exists($funcname)) {
-					echo "<tr><td>".$funcname."</td><td>".getMLText('func_'.$funcname."_missing")."</td></tr>";
+					$missingfunc[] = $funcname; //getMLText('func_'.$funcname."_missing")
 				}
 			}
+			$missingclass = [];
 			foreach(array('finfo') as $classname) {
 				if(!class_exists($classname)) {
-					echo "<tr><td>".$classname."</td><td>".getMLText('class_'.$classname."_missing")."</td></tr>";
+					$missingclass[] = $classname; //getMLText('func_'.$classname."_missing")
 				}
 			}
-			echo "</tbody>\n</table>\n";
+			echo '<p>'.implode(', ', $missingfunc).'</p>';
+			echo '<p>'.implode(', ', $missingclass).'</p>';
 
 			if(function_exists('apache_get_modules')) {
 				$this->contentHeading(getMLText("installed_apache_extensions"));
 				$apacheextensions = apache_get_modules();
-				echo "<table class=\"table table-condensed table-sm\">\n";
-				echo "<thead>\n<tr>\n";
-				echo "<th>".getMLText("name");
-				echo "</th>\n";
-				echo "</tr>\n</thead>\n<tbody>\n";
-				foreach($apacheextensions as $extname)
-					echo "<tr><td>".$extname."</td><td>"."</td></tr>\n";
-				echo "</tbody>\n</table>\n";
+				echo implode(', ', $apacheextensions);
 			}
+
+			function check_result($name, $res) {
+				echo "<tr ".($res ? 'class="table-success success"' : 'class="table-danger error"')."><td>".getMLText($name)."</td><td>".getMLText($res ? 'check_passed' : 'check_failed')."</td></tr>\n";
+			}
+			$this->contentHeading(getMLText("check_directory_layout"));
+			echo "<table class=\"table table-condensed table-sm\">\n";
+			echo "<thead>\n<tr>\n";
+			echo "<th>".getMLText("directory_check")."</th>\n";
+			echo "<th>".getMLText("directory_check_result")."</th>\n";
+			echo "</tr>\n</thead>\n<tbody>\n";
+			check_result('directory_check_ext_exists', is_dir($settings->_rootDir."/ext"));
+			check_result('directory_check_ext_writable', is_writable($settings->_rootDir."/ext"));
+			check_result('directory_check_data_exists', is_dir($settings->_contentDir));
+			check_result('directory_check_data_writable', is_writable($settings->_contentDir));
+			check_result('directory_check_cache_exists', is_dir($settings->_cacheDir));
+			check_result('directory_check_cache_writable', is_writable($settings->_cacheDir));
+			check_result('directory_check_index_exists', is_dir($settings->_luceneDir));
+			check_result('directory_check_index_writable', is_writable($settings->_luceneDir));
+			check_result('directory_check_conf_writable', is_writable($settings->_configFilePath));
+			$res = !str_starts_with($settings->_contentDir, $settings->_rootDir);
+			check_result('directory_check_data_below_root', $res);
+			echo "</tbody>\n</table>\n";
+
 		}
 		$this->columnEnd();
 		$this->rowEnd();

From 8b087325a3d2657921e558ee2c3f1e63e2e0895d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 3 Apr 2023 12:03:55 +0200
Subject: [PATCH 1903/2006] add phrases for directory check

---
 languages/ar_EG/lang.inc | 16 ++++++++++++++++
 languages/bg_BG/lang.inc | 16 ++++++++++++++++
 languages/ca_ES/lang.inc | 16 ++++++++++++++++
 languages/cs_CZ/lang.inc | 16 ++++++++++++++++
 languages/de_DE/lang.inc | 18 +++++++++++++++++-
 languages/el_GR/lang.inc | 16 ++++++++++++++++
 languages/en_GB/lang.inc | 18 +++++++++++++++++-
 languages/es_ES/lang.inc | 16 ++++++++++++++++
 languages/fr_FR/lang.inc | 16 ++++++++++++++++
 languages/hr_HR/lang.inc | 16 ++++++++++++++++
 languages/hu_HU/lang.inc | 16 ++++++++++++++++
 languages/id_ID/lang.inc | 16 ++++++++++++++++
 languages/it_IT/lang.inc | 16 ++++++++++++++++
 languages/ko_KR/lang.inc | 16 ++++++++++++++++
 languages/lo_LA/lang.inc | 16 ++++++++++++++++
 languages/nb_NO/lang.inc | 16 ++++++++++++++++
 languages/nl_NL/lang.inc | 16 ++++++++++++++++
 languages/pl_PL/lang.inc | 16 ++++++++++++++++
 languages/pt_BR/lang.inc | 16 ++++++++++++++++
 languages/ro_RO/lang.inc | 16 ++++++++++++++++
 languages/ru_RU/lang.inc | 16 ++++++++++++++++
 languages/sk_SK/lang.inc | 16 ++++++++++++++++
 languages/sv_SE/lang.inc | 16 ++++++++++++++++
 languages/tr_TR/lang.inc | 16 ++++++++++++++++
 languages/uk_UA/lang.inc | 16 ++++++++++++++++
 languages/zh_CN/lang.inc | 16 ++++++++++++++++
 languages/zh_TW/lang.inc | 16 ++++++++++++++++
 27 files changed, 434 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 6b33de47a..575cecbd7 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -282,6 +282,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'سحب الملف',
 'checkout_is_disabled' => 'السحب معطل',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'من فضلك اختر تعريف السمة',
 'choose_attrdefgroup' => 'من فضلك اختر تعريف سمة المجموعة',
 'choose_category' => 'من فضلك اختر القسم',
@@ -362,6 +365,18 @@ URL: [url]',
 'details' => 'تفاصيل',
 'details_version' => 'تفاصيل هذا الاصدار: [version]',
 'de_DE' => 'الألمانية',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'هذه المنطقة محظورة. الدخول فقط مسموح للموظفين المعتمدين. اي اختراق سيتم التعامل معه وفقا للقوانين المحلية والدولية.',
 'discspace' => 'مساحة القرص',
@@ -1907,6 +1922,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => 'الحالة الحالية والحالة المقبلة',
 'statistic' => 'إحصائيات',
+'statistics_mail_subject' => '',
 'status' => 'الحالة',
 'status_approval_rejected' => 'مسودة مرفوضة',
 'status_approved' => 'تمت الموافقة',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 6141a0b7d..82734c38f 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -265,6 +265,9 @@ $text = array(
 'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Изберете attribute definition',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Изберете',
@@ -345,6 +348,18 @@ $text = array(
 'details' => 'Детайли',
 'details_version' => 'Детайли за версия: [version]',
 'de_DE' => 'Немски',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Работим аккуратно и задълбочено. От това зависи бъдeщето на нашата страна и благополучието на народа.nПетилетката за три години!nДа не оставим неодрусана слива в наше село!',
 'discspace' => '',
@@ -1770,6 +1785,7 @@ $text = array(
 'startdate' => '',
 'state_and_next_state' => '',
 'statistic' => '',
+'statistics_mail_subject' => '',
 'status' => 'Статус',
 'status_approval_rejected' => 'Чернова отказана',
 'status_approved' => 'Утвърден',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index e1368165c..116b9f701 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -270,6 +270,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => '',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Elegir categoria',
@@ -350,6 +353,18 @@ URL: [url]',
 'details' => 'Detalls',
 'details_version' => 'Detalls de la versió: [version]',
 'de_DE' => 'Alemany',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Aquesta és una àrea restringida. Només es permet l\'accés a usuaris autoritzats. Qualsevol intrusió es perseguirà d\'acord amb les lleis internacionals.',
 'discspace' => '',
@@ -1775,6 +1790,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => '',
 'statistic' => 'Estadístiques',
+'statistics_mail_subject' => '',
 'status' => 'Estat',
 'status_approval_rejected' => 'Esborrany rebutjat',
 'status_approved' => 'Aprovat',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 225d28b3a..b34ebba2d 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -294,6 +294,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Zkontrolovat',
 'checkout_is_disabled' => 'Kontrola dokumentů je zakázána v konfiguraci.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Zvolte definici atributů',
 'choose_attrdefgroup' => 'Vybrat skupinu atributů',
 'choose_category' => 'Vyberte prosím',
@@ -374,6 +377,18 @@ URL: [url]',
 'details' => 'Podrobnosti',
 'details_version' => 'Podrobnosti verze: [version]',
 'de_DE' => 'Němčina',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Toto je neveřejná oblast. Přístup povolen pouze oprávněným uživatelům. Jakékoliv narušení bude stíháno podle platných právních norem.',
 'discspace' => 'Místo na disku',
@@ -1979,6 +1994,7 @@ Jméno: [username]
 'startdate' => '',
 'state_and_next_state' => 'Stav / Další stav',
 'statistic' => 'Statistika',
+'statistics_mail_subject' => '',
 'status' => 'Stav',
 'status_approval_rejected' => 'Návrh zamítnut',
 'status_approved' => 'Schválen',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 4169f3b6a..e6a9bd6b3 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3171), dgrutsch (22)
+//    Translators: Admin (3189), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -333,6 +333,9 @@ URL: [url]</p>',
 'checkout_cancel_confirm' => 'Beenden des Checkouts bestätigen',
 'checkout_document' => 'Auschecken',
 'checkout_is_disabled' => 'Auschecken von Dokumenten ist in der Konfiguration ausgeschaltet.',
+'check_directory_layout' => 'Prüfe Verzeichnise',
+'check_failed' => 'fehlgeschlagen',
+'check_passed' => 'erfolgreich',
 'choose_attrdef' => 'Attributdefinition wählen',
 'choose_attrdefgroup' => 'Attributgruppe wählen',
 'choose_category' => 'Kategorie wählen',
@@ -413,6 +416,18 @@ URL: [url]</p>',
 'details' => 'Details',
 'details_version' => 'Details für Version: [version]',
 'de_DE' => 'Deutsch',
+'directory_check' => 'Prüfung',
+'directory_check_cache_exists' => 'Prüfe, ob Verzeichnis für Cache existiert',
+'directory_check_cache_writable' => 'Prüfe, ob Verzeichnis für den Cache beschreibar ist',
+'directory_check_conf_writable' => 'Prüfe, ob Verzeichnis für die Konfiguration beschreibar ist',
+'directory_check_data_below_root' => 'Prüfe, ob Datenverzeichnis nicht unterhalb des Web-Verzeichnisses liegt',
+'directory_check_data_exists' => 'Prüfe, ob Verzeichnis für Daten existiert',
+'directory_check_data_writable' => 'Prüfe, ob Verzeichnis für die Daten beschreibar ist',
+'directory_check_ext_exists' => 'Prüfe, ob Verzeichnis für Erweiterungen existiert',
+'directory_check_ext_writable' => 'Prüfe, ob Verzeichnis für Erweiterungen beschreibar ist',
+'directory_check_index_exists' => 'Prüfe, ob Verzeichnis für den Volltextindex existiert',
+'directory_check_index_writable' => 'Prüfe, ob Verzeichnis für Volltextindex beschreibar ist',
+'directory_check_result' => 'Ergebnis',
 'disable_extension' => 'Erweiterung deaktivieren',
 'disclaimer' => 'Dies ist ein geschützter Bereich. Nur authorisiertes Personal hat Zugriff. Jegliche Verstöße werden nach geltendem Recht (Englisch und International) verfolgt.',
 'discspace' => 'Plattenplatz',
@@ -2311,6 +2326,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'startdate' => 'Startdatum',
 'state_and_next_state' => 'Status/Nächster Status',
 'statistic' => 'Statistik',
+'statistics_mail_subject' => 'Statistiken',
 'status' => 'Status',
 'status_approval_rejected' => 'abgelehnt',
 'status_approved' => 'freigegeben',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 3b39fa69f..5e72be9a8 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -265,6 +265,9 @@ $text = array(
 'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => '',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Επιλέξτε',
@@ -345,6 +348,18 @@ $text = array(
 'details' => 'Λεπτομέρειες',
 'details_version' => 'Λεπτομέρειες για την έκδοση: [version]',
 'de_DE' => 'German/Γερμανικά',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Διαβαθμισμένη περιοχή. Η πρόσβαση επιτρέπεται μόνο σε εξουσιοδοτημένο προσωπικό. Κάθε παράβαση διώκεται σύμφωνα με τους εθνικούς και διεθνής νόμους.',
 'discspace' => '',
@@ -1781,6 +1796,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => '',
 'statistic' => '',
+'statistics_mail_subject' => '',
 'status' => 'κατάσταση',
 'status_approval_rejected' => '',
 'status_approved' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 7fc250ebc..1b4e4b582 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2266), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2283), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -333,6 +333,9 @@ URL: [url]</p>',
 'checkout_cancel_confirm' => 'Confirm to cancel checkout',
 'checkout_document' => 'Check out',
 'checkout_is_disabled' => 'Check out of documents is disabled in the configuration.',
+'check_directory_layout' => 'Check directory layout',
+'check_failed' => 'failed',
+'check_passed' => 'passed',
 'choose_attrdef' => 'Please choose attribute definition',
 'choose_attrdefgroup' => 'Choose attribute group',
 'choose_category' => 'Please choose',
@@ -413,6 +416,18 @@ URL: [url]</p>',
 'details' => 'Details',
 'details_version' => 'Details for version: [version]',
 'de_DE' => 'German',
+'directory_check' => 'Check',
+'directory_check_cache_exists' => 'Check, if directory for cache exists',
+'directory_check_cache_writable' => 'Check, if directory for extensions is writable',
+'directory_check_conf_writable' => 'Check, if directory for configuration is writable',
+'directory_check_data_below_root' => 'Check, if data directory is not below web directory',
+'directory_check_data_exists' => 'Check, if directory for data exists',
+'directory_check_data_writable' => 'Check, if directory for data is writable',
+'directory_check_ext_exists' => 'Check, if directory for extensions exists',
+'directory_check_ext_writable' => 'Check, if directory for extensions is writable',
+'directory_check_index_exists' => 'Check, if directory for fulltext index exists',
+'directory_check_index_writable' => 'Check, if directory for fulltext index is writable',
+'directory_check_result' => 'Result',
 'disable_extension' => 'Disable extension',
 'disclaimer' => 'This is a classified area. Access is permitted only to authorized personnel. Any violation will be prosecuted according to the national and international laws.',
 'discspace' => 'Disc space',
@@ -2314,6 +2329,7 @@ If you did not receive a password, please use the password forgotten function on
 'startdate' => 'Start date',
 'state_and_next_state' => 'State/Next state',
 'statistic' => 'Statistic',
+'statistics_mail_subject' => 'Statistics',
 'status' => 'Status',
 'status_approval_rejected' => 'rejected',
 'status_approved' => 'Approved',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index f15893be7..b81d10a68 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -289,6 +289,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Por favor, seleccione definición de atributo',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Seleccione categoría',
@@ -369,6 +372,18 @@ URL: [url]',
 'details' => 'Detalles',
 'details_version' => 'Detalles de la versión: [version]',
 'de_DE' => 'Aleman',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Esta es un área restringida. Se permite el acceso únicamente a personal autorizado. Cualquier intrusión se perseguirá conforme a las leyes internacionales.',
 'discspace' => 'Espacio en disco',
@@ -1934,6 +1949,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => 'Estado/Estado siguiente',
 'statistic' => 'Estadística',
+'statistics_mail_subject' => '',
 'status' => 'Estado',
 'status_approval_rejected' => 'Borrador rechazado',
 'status_approved' => 'Aprobado',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 21d9ab80e..53bd01582 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -323,6 +323,9 @@ URL : [url]</p>',
 'checkout_cancel_confirm' => 'Veuillez confirmer l’annulation de la vérification.',
 'checkout_document' => 'Bloquer (check-out)',
 'checkout_is_disabled' => 'Le blocage (check-out) de documents est désactivé dans la configuration.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Choisissez une définition d\'attribut',
 'choose_attrdefgroup' => 'Choisir un groupe d’attributs',
 'choose_category' => 'Sélectionnez une catégorie',
@@ -403,6 +406,18 @@ URL : [url]</p>',
 'details' => 'Détails',
 'details_version' => 'Détails de la version: [version]',
 'de_DE' => 'Allemand',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => 'Désactiver l’extension',
 'disclaimer' => 'Cet espace est protégé. Son accès est strictement réservé aux utilisateurs autorisés.<br/>Tout accès non autorisé est punissable par les lois internationales.',
 'discspace' => 'Espace disque',
@@ -2297,6 +2312,7 @@ Nom : [username]
 'startdate' => '',
 'state_and_next_state' => 'État initial/suivant',
 'statistic' => 'Statistiques',
+'statistics_mail_subject' => '',
 'status' => 'Statut',
 'status_approval_rejected' => 'Ébauche rejetée',
 'status_approved' => 'Approuvé',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index c734f6d4e..ddfaf7e96 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -294,6 +294,9 @@ Internet poveznica: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Odjava',
 'checkout_is_disabled' => 'Odjava dokumenata je onemogućena u konfiguraciji.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Molim odaberite definiciju atributa',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Molim odaberite',
@@ -374,6 +377,18 @@ Internet poveznica: [url]',
 'details' => 'Detalji',
 'details_version' => 'Detalji za verziju: [version]',
 'de_DE' => 'Njemački',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Ovo je klasificirano područje. Pristup je omogućen samo ovlaštenim osobama. Sa svakim kršenjem bit će postupano sukladno nacionalnim i međunarodnim zakonima.',
 'discspace' => 'Prostor na disku',
@@ -1943,6 +1958,7 @@ Internet poveznica: [url]',
 'startdate' => '',
 'state_and_next_state' => 'Status/Slijedeći status',
 'statistic' => 'Statistika',
+'statistics_mail_subject' => '',
 'status' => 'Status',
 'status_approval_rejected' => 'Skica odbijena',
 'status_approved' => 'Odobreno',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 6a4ae00f4..e78e70581 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -289,6 +289,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Kérem válasszon jellemző meghatározást',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Kérjük válasszon',
@@ -369,6 +372,18 @@ URL: [url]',
 'details' => 'Részletek',
 'details_version' => 'Verzió részletek: [version]',
 'de_DE' => 'Német',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Ez egy bizalmas terület. Hozzáférés kizárólag a meghatalmazott személyek részére engedélyezett. Bárminemű megsértését a nemzeti, illetve a nemzetközi jog szerint fogják büntetni.',
 'discspace' => 'Lemezterület',
@@ -1921,6 +1936,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => 'Állapot/Következő állapot',
 'statistic' => 'Statisztika',
+'statistics_mail_subject' => '',
 'status' => 'Állapot',
 'status_approval_rejected' => 'Piszkozat elutasítva',
 'status_approved' => 'Jóváhagyott',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index cfd218cb5..81755dac7 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -303,6 +303,9 @@ URL: [url]</p>',
 'checkout_cancel_confirm' => 'Konfirmasi untuk membatalkan checkout',
 'checkout_document' => '',
 'checkout_is_disabled' => 'Check out dokumen dinonaktifkan dalam konfigurasi',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Harap memilih definisi label',
 'choose_attrdefgroup' => 'Pilih kelompok label',
 'choose_category' => 'Harap pilih',
@@ -383,6 +386,18 @@ URL: [url]</p>',
 'details' => 'Rincian',
 'details_version' => 'Rincian versi: [version]',
 'de_DE' => 'Jerman',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => 'Nonaktifkan ekstensi',
 'disclaimer' => 'Ini adalah area rahasia. Akses hanya diizinkan untuk personel yang berwenang. Setiap pelanggaran akan dituntut sesuai dengan hukum nasional dan internasional.',
 'discspace' => 'Ruang penyimpanan',
@@ -1995,6 +2010,7 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'startdate' => '',
 'state_and_next_state' => '',
 'statistic' => 'Statistik',
+'statistics_mail_subject' => '',
 'status' => 'Status',
 'status_approval_rejected' => 'ditolak',
 'status_approved' => 'Disetujui',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index f855e4d1c..a0e6a13bf 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -294,6 +294,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Approvato',
 'checkout_is_disabled' => 'Approvazione dei documenti disabilitata',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Seleziona l\'Attributo',
 'choose_attrdefgroup' => 'Scegli gruppo di attributi',
 'choose_category' => 'Seleziona',
@@ -374,6 +377,18 @@ URL: [url]',
 'details' => 'Dettagli',
 'details_version' => 'Dettagli versione: [version]',
 'de_DE' => 'Tedesco',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Questa è un\'area riservata. L\'accesso è consentito solo agli utenti autorizzati. Qualunque violazione sarà perseguita a norma delle leggi italiane ed internazionali.',
 'discspace' => 'Spazio su disco',
@@ -1970,6 +1985,7 @@ Name: [username]
 'startdate' => '',
 'state_and_next_state' => 'Stato/Prossimo stato',
 'statistic' => 'Statistiche',
+'statistics_mail_subject' => '',
 'status' => 'Stato',
 'status_approval_rejected' => 'Bozza rifiutata',
 'status_approved' => 'Approvato',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 15f2d7d9e..d3b657733 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -296,6 +296,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => '체크아웃',
 'checkout_is_disabled' => '체크아웃된 문서는 설정에서 비활성화됩니다.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => '속성의 정의를 선택하세요',
 'choose_attrdefgroup' => '',
 'choose_category' => '선택하세요',
@@ -377,6 +380,18 @@ URL: [url]',
 'details' => '세부사항',
 'details_version' => '버전에 대한 상세 사항 : [version]',
 'de_DE' => '독일어',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => '본 사이트는 접근이 허가된 자에게만 사용이 허용된 곳 입니다. 허가받지 않은 접근이나 불법행위는 국내 및 국제법에 따라 기소 될 것입니다.',
 'discspace' => '디스크 공간',
@@ -1937,6 +1952,7 @@ URL : [url]',
 'startdate' => '',
 'state_and_next_state' => '상태 / 다음 상태',
 'statistic' => '통계',
+'statistics_mail_subject' => '',
 'status' => '상태',
 'status_approval_rejected' => '거부된 초안',
 'status_approved' => '승인',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 12db8a598..6fab15352 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -292,6 +292,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'ເຊັກເອົາ',
 'checkout_is_disabled' => 'ໃນການກຳນົດຄ່າເຊັກເອົາເອກະສານໄດ້ຖືກປິດໄຊ້ງານ',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'ກະລຸນາເລືອກນິຍາມແອັດທິບິວ',
 'choose_attrdefgroup' => 'ເລືອກກຸ່ມແອັດທິບິວ',
 'choose_category' => 'ກະລຸນາເລືອກ',
@@ -372,6 +375,18 @@ URL: [url]',
 'details' => 'ລາຍລະອຽດ',
 'details_version' => 'ລາຍລະອຽດສຳລັບລຸ້ນ: [version]',
 'de_DE' => 'ເຢຍລະມັນ',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'ນີ້ແມ່ນພື້ນທີ່ທີ່ຈຳແນກ ອະນຸຍາດໃຫ້ເຂົ້າເຖິງສະເພາະຜູ້ທີໄດ້ຮັບອານຸຍາດເທົ່ານັ້ນ ຖ້າມີການລະເມີດໄດ້ໆ ຈະຖືກຟ້ອງຮ້ອງຕາມກົດໝາຍຂອງພາຍໃນ ແລະ ຕ່າງປະເທດ',
 'discspace' => 'ຟື້ນທີ່ວ່າງໃນດິສ',
@@ -1963,6 +1978,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => 'ລັດ/ລັດຖັດໄປ',
 'statistic' => 'ສະຖິຕິ',
+'statistics_mail_subject' => '',
 'status' => 'ສະຖານະ',
 'status_approval_rejected' => 'ຮ່າງຖືກປະຕິເສດ',
 'status_approved' => 'ໄດ້ຮັບການອະນຸມັດ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 5a529d305..8a4bd4350 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -294,6 +294,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Utsjekking',
 'checkout_is_disabled' => 'Sjekk ut av dokumentene er deaktivert i konfigurasjonen.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Velg egenskaps definition',
 'choose_attrdefgroup' => 'Velg egenskaps gruppe',
 'choose_category' => 'Venligst velg',
@@ -374,6 +377,18 @@ URL: [url]',
 'details' => 'Detaljer',
 'details_version' => 'Detaljer for versjon: [version]',
 'de_DE' => 'Tysk',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Dette er et klassifisert område. Tilgang er bare tillatt for autorisert personell. Ethvert brudd vil bli tiltalt i henhold til nasjonale og internasjonale lover.',
 'discspace' => 'Diskplass',
@@ -1976,6 +1991,7 @@ Bruker: [username]
 'startdate' => '',
 'state_and_next_state' => 'Status/Neste status',
 'statistic' => 'Statistikk',
+'statistics_mail_subject' => '',
 'status' => 'Status',
 'status_approval_rejected' => 'Utkast forkastet',
 'status_approved' => 'Godkjent',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 92aded6d7..5fc545804 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -287,6 +287,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Checkout-document',
 'checkout_is_disabled' => 'Checkout is niet mogelijk',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Kies een attribuutdefinitie',
 'choose_attrdefgroup' => 'Kies een attribuutdefinitie-groep',
 'choose_category' => 'Selecteer a.u.b.',
@@ -367,6 +370,18 @@ URL: [url]',
 'details' => 'Details',
 'details_version' => 'Details voor versie: [version]',
 'de_DE' => 'Duits',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => 'Schakel de extensie uit',
 'disclaimer' => 'Dit is een beveiligde omgeving. Gebruik is alleen toegestaan voor geautoriseerde leden. Ongeautoriseerde toegang kan worden bestraft overeenkomstig (inter)nationale wetgeving.',
 'discspace' => 'Schijfruimte',
@@ -1975,6 +1990,7 @@ Name: [username]
 'startdate' => '',
 'state_and_next_state' => 'status/ volgende status',
 'statistic' => 'Statistieken',
+'statistics_mail_subject' => '',
 'status' => 'Status',
 'status_approval_rejected' => 'Klad Goedkeuring [Afgewezen]',
 'status_approved' => 'Goedgekeurd',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 20f5e7365..1df84f033 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -282,6 +282,9 @@ URL: [url]',
 'checkout_cancel_confirm' => 'Potwierdź anulowanie wymeldowania',
 'checkout_document' => 'Wymelduj się',
 'checkout_is_disabled' => 'Wyewidencjonowywanie dokumentów jest wyłączone w konfiguracji.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Proszę wybrać definicję atrybutu',
 'choose_attrdefgroup' => 'Wybierz grupę atrybutów',
 'choose_category' => 'Proszę wybrać',
@@ -362,6 +365,18 @@ URL: [url]',
 'details' => 'Szczegóły',
 'details_version' => 'Szczegóły dla wersji: [version]',
 'de_DE' => 'Niemiecki',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'To jest zastrzeżona strefa. Dostęp do niej ma wyłącznie wyznaczony personel. Wszelkie naruszenia będą ścigane zgodnie z prawem krajowym i międzynarodowym.',
 'discspace' => 'Zajęta przestrzeń dyskowa',
@@ -1906,6 +1921,7 @@ Name: [username]
 'startdate' => '',
 'state_and_next_state' => 'Status/Następny status',
 'statistic' => 'Statystyka',
+'statistics_mail_subject' => '',
 'status' => 'Status',
 'status_approval_rejected' => 'Szkic odrzucony',
 'status_approved' => 'Zatwierdzone',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 453e7b980..6233df42f 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -294,6 +294,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Retirada',
 'checkout_is_disabled' => 'A retirada de documentos está desativada na configuração.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Por favor escolha a definição de atributo',
 'choose_attrdefgroup' => 'Escolher o grupo de atributos',
 'choose_category' => 'Por favor escolha',
@@ -374,6 +377,18 @@ URL: [url]',
 'details' => 'Detalhes',
 'details_version' => 'Detalhes para a versão: [version]',
 'de_DE' => 'Alemão',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Esta é uma área restrita, o acesso é permitido apenas ao pessoal autorizado. Qualquer violação será tratado de acordo com as normas internas e leis vigentes.',
 'discspace' => 'Espaço em Disco',
@@ -1982,6 +1997,7 @@ Nome: [username]
 'startdate' => '',
 'state_and_next_state' => 'Estado/Próximo estado',
 'statistic' => 'Estatística',
+'statistics_mail_subject' => '',
 'status' => 'Status',
 'status_approval_rejected' => 'Rascunho rejeitado',
 'status_approved' => 'Aprovado',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 9e540e863..e61151bf2 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -294,6 +294,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Verifica',
 'checkout_is_disabled' => 'Verificarea documentelor este dezactivata in configurari.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Vă rugăm să alegeți definiția atributului',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Vă rugăm să alegeți',
@@ -374,6 +377,18 @@ URL: [url]',
 'details' => 'Detalii',
 'details_version' => 'Detalii pentru versiunea: [version]',
 'de_DE' => 'Germana',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Aceasta este o zonă clasificată. Accesul este permis numai personalului autorizat. Orice încălcare va fi urmărită penal în conformitate cu legile naționale și internaționale.',
 'discspace' => 'Spațiu pe disc',
@@ -1944,6 +1959,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => 'Stare/Stare urmatoare',
 'statistic' => 'Statistic',
+'statistics_mail_subject' => '',
 'status' => 'Status',
 'status_approval_rejected' => 'Proiect respins',
 'status_approved' => 'Aprobat',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index e25392d24..81d844a22 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -294,6 +294,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Загрузка',
 'checkout_is_disabled' => 'Загрузка отключена.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Выберите атрибут',
 'choose_attrdefgroup' => 'Выберите группу атрибута',
 'choose_category' => 'Выберите категорию',
@@ -374,6 +377,18 @@ URL: [url]',
 'details' => 'Подробности',
 'details_version' => 'Подробная информация о версии: [version]',
 'de_DE' => 'German',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Работник, помни! От тебя зависит успех фирмы и всей страны!',
 'discspace' => 'Дисковое пространство',
@@ -1951,6 +1966,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => 'Статус / следующий статус',
 'statistic' => 'Статистика',
+'statistics_mail_subject' => '',
 'status' => 'Статус',
 'status_approval_rejected' => 'Черновик отклонён',
 'status_approved' => 'Утверждён',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 43963e85b..b96ae9129 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -294,6 +294,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Pozrieť sa na dokument',
 'checkout_is_disabled' => 'Kontrola dokumentov je zakázaná v konfigurácii.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Vyberte prosím definíciu atribútu',
 'choose_attrdefgroup' => 'Vyberte skupinu atribútov',
 'choose_category' => 'Vyberte prosím',
@@ -374,6 +377,18 @@ URL: [url]',
 'details' => 'Podrobnosti',
 'details_version' => 'Podrobnosti verzie: [version]',
 'de_DE' => 'Nemčina',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Toto je zabezpečená zóna. Prístup je povolený len autorizovaným osobám.',
 'discspace' => 'Priestor na disku',
@@ -1984,6 +1999,7 @@ Meno: [username]
 'startdate' => '',
 'state_and_next_state' => 'State/Next state',
 'statistic' => 'Štatistika',
+'statistics_mail_subject' => '',
 'status' => 'Stav',
 'status_approval_rejected' => 'Návrh zamietnutý',
 'status_approved' => 'Schválený',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 14dd293a6..411f7ac31 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -295,6 +295,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Utcheckning',
 'checkout_is_disabled' => 'Utcheckning av dokument är invaktiverad i systemets inställningar.',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Välj attributdefinition',
 'choose_attrdefgroup' => 'Välj gruppattribut',
 'choose_category' => 'Välj',
@@ -375,6 +378,18 @@ URL: [url]',
 'details' => 'Detaljer',
 'details_version' => 'Detaljer för version: [version]',
 'de_DE' => 'Tyska',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Detta är ett sekretessbelagt område. Bara auktoriserade personer äger tillträde. Vid överträdelse kommer åtal att väckas i enlighet med nationella och internationella lagar.',
 'discspace' => 'Diskutrymme',
@@ -1957,6 +1972,7 @@ Kommentar: [comment]',
 'startdate' => '',
 'state_and_next_state' => 'Status/Nästa status',
 'statistic' => 'Statistik',
+'statistics_mail_subject' => '',
 'status' => 'Status',
 'status_approval_rejected' => 'Utkast avvisat',
 'status_approved' => 'Godkänt',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 2805967ff..d9790fed2 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -288,6 +288,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => '',
 'checkout_is_disabled' => '',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Lütfen nitelik tanımını seçiniz',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Lütfen seçiniz',
@@ -368,6 +371,18 @@ URL: [url]',
 'details' => 'Detaylar',
 'details_version' => '[version] versiyonu detayları',
 'de_DE' => 'Almanca',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Bu sisteme sadece yetkilendirilmiş personel yetki seviyesine göre erişebilir. Herhangi bir ihlalde veya ihlal girişiminde, ulusal ve uluslararası yasalara göre takibat yapılacaktır.',
 'discspace' => 'Disk alanı',
@@ -1923,6 +1938,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => 'Durum/Sonraki durum',
 'statistic' => 'İstatistik',
+'statistics_mail_subject' => '',
 'status' => 'Durum',
 'status_approval_rejected' => 'Taslak reddedildi',
 'status_approved' => 'Onaylandı',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 63183621d..26f1f22ef 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -294,6 +294,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => 'Завантаження',
 'checkout_is_disabled' => 'Завантаження відключене',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => 'Оберіть атрибут',
 'choose_attrdefgroup' => '',
 'choose_category' => 'Оберіть категорію',
@@ -374,6 +377,18 @@ URL: [url]',
 'details' => 'Деталі',
 'details_version' => 'Детальна інформація про версію: [version]',
 'de_DE' => 'German',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => 'Авторизована зона. Несанкціонований доступ переслідується згідно національного законодавства.',
 'discspace' => 'Дисковий простір',
@@ -1944,6 +1959,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => 'Статус / наступний статус',
 'statistic' => 'Статистика',
+'statistics_mail_subject' => '',
 'status' => 'Статус',
 'status_approval_rejected' => 'Чернетку відхилено',
 'status_approved' => 'Затверджено',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 935894e1c..ca75a09c1 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -286,6 +286,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => '签出',
 'checkout_is_disabled' => '不允许签出',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => '请选择属性',
 'choose_attrdefgroup' => '选择属性组',
 'choose_category' => '请选择',
@@ -368,6 +371,18 @@ URL: [url]',
 'details' => '详细情况',
 'details_version' => '版本详情:[version]',
 'de_DE' => '德国语',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => '警告：这是机密区.只有授权用户才被允许访问.任何违反行为将受到法律制裁',
 'discspace' => '磁盘空间',
@@ -1931,6 +1946,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => '状态/下一个状态',
 'statistic' => '统计',
+'statistics_mail_subject' => '',
 'status' => '状态',
 'status_approval_rejected' => '拟拒绝',
 'status_approved' => '批准',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index fd5132025..6fddaf52e 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -294,6 +294,9 @@ URL: [url]',
 'checkout_cancel_confirm' => '',
 'checkout_document' => '簽出',
 'checkout_is_disabled' => '在配置中禁用了簽出文件功能。',
+'check_directory_layout' => '',
+'check_failed' => '',
+'check_passed' => '',
 'choose_attrdef' => '請選擇屬性',
 'choose_attrdefgroup' => '選擇屬性組',
 'choose_category' => '請選擇',
@@ -374,6 +377,18 @@ URL: [url]',
 'details' => '詳細情況',
 'details_version' => '版本詳情:[version]',
 'de_DE' => '德國語',
+'directory_check' => '',
+'directory_check_cache_exists' => '',
+'directory_check_cache_writable' => '',
+'directory_check_conf_writable' => '',
+'directory_check_data_below_root' => '',
+'directory_check_data_exists' => '',
+'directory_check_data_writable' => '',
+'directory_check_ext_exists' => '',
+'directory_check_ext_writable' => '',
+'directory_check_index_exists' => '',
+'directory_check_index_writable' => '',
+'directory_check_result' => '',
 'disable_extension' => '',
 'disclaimer' => '警告：這是機密區.只有授權使用者才被允許訪問.任何違反行為將受到法律制裁',
 'discspace' => '磁碟空間',
@@ -1982,6 +1997,7 @@ URL: [url]',
 'startdate' => '',
 'state_and_next_state' => '狀態/下一個狀態',
 'statistic' => '統計',
+'statistics_mail_subject' => '',
 'status' => '狀態',
 'status_approval_rejected' => '擬拒絕',
 'status_approved' => '批准',

From 8776173ec99bddb0df2ced4edb1a880b2acbfe59 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 3 Apr 2023 12:26:04 +0200
Subject: [PATCH 1904/2006] set propper html language

---
 views/bootstrap/class.Bootstrap.php   | 8 +++++++-
 views/bootstrap4/class.Bootstrap4.php | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 794c61977..c7878b6af 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -85,7 +85,13 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 		if($this->hasHook('startPage'))
 				$this->callHook('startPage');
 		echo "<!DOCTYPE html>\n";
-		echo "<html lang=\"en\">\n<head>\n";
+		echo "<html lang=\"";
+		if($this->params['session'] && ($slang = $this->params['session']->getLanguage())) {
+			echo str_replace('_', '-', $slang);
+		} else {
+			echo str_replace('_', '-', $settings->_language);
+		}
+		echo "\">\n<head>\n";
 		echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
 		echo '<meta name="viewport" content="width=device-width, initial-scale=1.0" />'."\n";
 		if($base)
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 3902711ea..3388e9151 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -87,7 +87,13 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 		if($this->hasHook('startPage'))
 				$this->callHook('startPage');
 		echo "<!DOCTYPE html>\n";
-		echo "<html lang=\"en\">\n<head>\n";
+		echo "<html lang=\"";
+		if($this->params['session'] && ($slang = $this->params['session']->getLanguage())) {
+			echo str_replace('_', '-', $slang);
+		} else {
+			echo str_replace('_', '-', $settings->_language);
+		}
+		echo "\">\n<head>\n";
 		echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
 		echo '<meta name="viewport" content="width=device-width, initial-scale=1.0" />'."\n";
 		if($base)

From d0c5905c0e7c73f5dc6bfe51b50b36e37fcbf3bb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 3 Apr 2023 15:50:40 +0200
Subject: [PATCH 1905/2006] check for access rights of documents

---
 views/bootstrap/class.Calendar.php | 36 +++++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 504801f28..70fc2d99f 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -192,14 +192,16 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 			if(mktime(23,59,59, $end[1], $end[2], $end[0]) > time()) {
 				$documents = $dms->getDocumentsExpired($this->params['end']);
 				foreach ($documents as $document){
-					$arr[] = array(
-						'start'=>date('Y-m-d', $document->getExpires()),
-						'allDay'=>true,
-						'color'=>'#ff4455',
-						'title'=>$document->getName()."\nexpires",
-						'documentid'=> $document->getID(),
-						'eventtype'=> $eventtype,
-					);
+					if($document->getAccessMode($user) >= M_READ) {
+						$arr[] = array(
+							'start'=>date('Y-m-d', $document->getExpires()),
+							'allDay'=>true,
+							'color'=>'#ff4455',
+							'title'=>$document->getName()."\nexpires",
+							'documentid'=> $document->getID(),
+							'eventtype'=> $eventtype,
+						);
+					}
 				}
 			}
 			break;
@@ -210,14 +212,16 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 					if($attrdef->getType() == \SeedDMS_Core_AttributeDefinition::type_date) {
 						$documents = $attrdef->getObjects($this->params['start'], 0, O_GTEQ);
 						foreach ($documents['docs'] as $document){
-							$arr[] = array(
-								'start'=>$document->getAttribute($attrdef)->getValue(),
-								'allDay'=>true,
-								'color'=>'#4455ff',
-								'title'=>$document->getName()."\n".$attrdef->getName(),
-								'documentid'=> $document->getID(),
-								'eventtype'=> $eventtype,
-							);
+							if($document->getAccessMode($user) >= M_READ) {
+								$arr[] = array(
+									'start'=>$document->getAttribute($attrdef)->getValue(),
+									'allDay'=>true,
+									'color'=>'#4455ff',
+									'title'=>$document->getName()."\n".$attrdef->getName(),
+									'documentid'=> $document->getID(),
+									'eventtype'=> $eventtype,
+								);
+							}
 						}
 					}
 				}

From 33249dea351454590774e02e4f63a0f2c791e8a4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 3 Apr 2023 16:28:39 +0200
Subject: [PATCH 1906/2006] set platform to php 7.4

---
 composer-dist.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/composer-dist.json b/composer-dist.json
index 8cc97ee60..af3de13f3 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -1,4 +1,10 @@
 {
+    "config": {
+        "platform": {
+            "php": "7.4"
+        }
+    },
+
     "require": {
         "sabre/dav": "^3.",
         "slim/slim": "^3.0",

From ac3c62355f5b1b68b4e328bd2a82901e50cb6357 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 Apr 2023 12:31:09 +0200
Subject: [PATCH 1907/2006] start new version 5.1.31

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index abaab0767..94b2c0554 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.31
+--------------------------------------------------------------------------------
+- rest api returns error msg and not just http status
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30
 --------------------------------------------------------------------------------

From 99fe2244fbfb72efc2573e2524990269f3327bae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 Apr 2023 12:31:20 +0200
Subject: [PATCH 1908/2006] return message and not just status

---
 restapi/index.php | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 4ae5efece..3eceae4f0 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -435,7 +435,7 @@ class RestapiController { /* {{{ */
                     return $response->withJson(array('success'=>false, 'message'=>'No access', 'data'=>''), 403);
                 }
             } else {
-                return $response->withStatus(404);
+                return $response->withJson(array('success'=>false, 'message'=>'No such folder', 'data'=>''), 404);
             }
         }
     } /* }}} */
@@ -2136,7 +2136,7 @@ class RestapiController { /* {{{ */
             }
             return $response->withJson(array('success'=>true, 'message'=>'', 'data'=>$data), 200);
         } else {
-            return $response->withStatus(404);
+            return $response->withJson(array('success'=>false, 'message'=>'No such group', 'data'=>''), 404);
         }
     } /* }}} */
 
@@ -2241,7 +2241,7 @@ class RestapiController { /* {{{ */
             $success = ($folder->inheritsAccess() == $inherit);
             return $response->withJson(array('success'=>$success, 'message'=>'', 'data'=>$data), 200);
         } else {
-            return $response->withStatus(404);
+            return $response->withJson(array('success'=>false, 'message'=>'No such folder', 'data'=>''), 404);
         }
     } /* }}} */
 
@@ -2275,7 +2275,7 @@ class RestapiController { /* {{{ */
             $folder = $dms->getfolderByName($args['id']);
         }
         if (!$folder) {
-            return $response->withStatus(404);
+            return $response->withJson(array('success'=>false, 'message'=>'No such folder', 'data'=>''), 404);
         }
 
         $params = $request->getParsedBody();
@@ -2550,7 +2550,7 @@ class RestapiController { /* {{{ */
             $folder = $dms->getFolderByName($args['id']);
         }
         if (!$folder) {
-            return $response->withStatus(404);
+            return $response->withJson(array('success'=>false, 'message'=>'No such folder', 'data'=>''), 404);
         }
         if (!$folder->clearAccessList()) {
             return $response->withJson(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>''), 500);
@@ -2645,17 +2645,17 @@ class RestapiAuth { /* {{{ */
             $logger->log("Received preflight options request", PEAR_LOG_DEBUG);
         } elseif(!in_array($request->getUri()->getPath(), array('login')) && substr($request->getUri()->getPath(), 0, 5) != 'echo/' && $request->getUri()->getPath() != 'version') {
             $userobj = null;
-            if(!empty($this->container->environment['HTTP_AUTHORIZATION']) && !empty($settings->_apiKey) && !empty($settings->_apiUserId)) {
-                $logger->log("Authorization key: ".$this->container->environment['HTTP_AUTHORIZATION'], PEAR_LOG_DEBUG);
-                if($settings->_apiKey == $this->container->environment['HTTP_AUTHORIZATION']) {
-                    if(!($userobj = $dms->getUser($settings->_apiUserId))) {
-                        return $response->withStatus(403);
-                    }
-                } else {
-                    return $response->withStatus(403);
-                }
-                $logger->log("Login with apikey as '".$userobj->getLogin()."' successful", PEAR_LOG_INFO);
-            } else {
+					if(!empty($this->container->environment['HTTP_AUTHORIZATION']) && !empty($settings->_apiKey) && !empty($settings->_apiUserId)) {
+							$logger->log("Authorization key: ".$this->container->environment['HTTP_AUTHORIZATION'], PEAR_LOG_DEBUG);
+							if($settings->_apiKey == $this->container->environment['HTTP_AUTHORIZATION']) {
+									if(!($userobj = $dms->getUser($settings->_apiUserId))) {
+											return $response->withJson(array('success'=>false, 'message'=>'Invalid user associated with api key', 'data'=>''), 403);
+									}
+							} else {
+									return $response->withJson(array('success'=>false, 'message'=>'Wrong api key', 'data'=>''), 403);
+							}
+							$logger->log("Login with apikey as '".$userobj->getLogin()."' successful", PEAR_LOG_INFO);
+					} else {
                 require_once("../inc/inc.ClassSession.php");
                 $session = new SeedDMS_Session($dms->getDb());
                 if (isset($_COOKIE["mydms_session"])) {
@@ -2665,7 +2665,7 @@ class RestapiAuth { /* {{{ */
                         /* Delete Cookie */
                         setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot);
                         $logger->log("Session for id '".$dms_session."' has gone", PEAR_LOG_ERR);
-                        return $response->withStatus(403);
+												return $response->withJson(array('success'=>false, 'message'=>'Session has gone', 'data'=>''), 403);
                     }
 
                     /* Load user data */
@@ -2675,20 +2675,20 @@ class RestapiAuth { /* {{{ */
                         setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot);
                         if($settings->_enableGuestLogin) {
                             if(!($userobj = $dms->getUser($settings->_guestID)))
-                                return $response->withStatus(403);
+																return $response->withJson(array('success'=>false, 'message'=>'Could not get guest login', 'data'=>''), 403);
                         } else
-                            return $response->withStatus(403);
+														return $response->withJson(array('success'=>false, 'message'=>'Login as guest disabled', 'data'=>''), 403);
                     }
                     if($userobj->isAdmin()) {
                         if($resArr["su"]) {
                             if(!($userobj = $dms->getUser($resArr["su"])))
-                                return $response->withStatus(403);
+																return $response->withJson(array('success'=>false, 'message'=>'Cannot substitute user', 'data'=>''), 403);
                         }
                     }
 //                    $logger->log("Login with user name '".$userobj->getLogin()."' successful", PEAR_LOG_INFO);
                     $dms->setUser($userobj);
                 } else {
-                    return $response->withStatus(403);
+										return $response->withJson(array('success'=>false, 'message'=>'Missing session cookie', 'data'=>''), 403);
                 }
             }
             $this->container['userobj'] = $userobj;

From d4fbae1a4c21cdc80260aab2d4f271539bdf5a71 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 Apr 2023 12:31:52 +0200
Subject: [PATCH 1909/2006] new version 5.1.31

---
 inc/inc.Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 2003b0c1a..a1876b726 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version { /* {{{ */
 
-	const _number = "5.1.30";
+	const _number = "5.1.31";
 	const _string = "SeedDMS";
 
 	function __construct() {

From 9092eeb0a3be63691c87f193e374a3905209b8a2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 4 Apr 2023 17:46:08 +0200
Subject: [PATCH 1910/2006] comment of document, documentcontent and folder can
 be rendered as markdown

---
 CHANGELOG                              |  2 ++
 inc/inc.ClassSettings.php              |  4 ++++
 op/op.Settings.php                     |  1 +
 views/bootstrap/class.Settings.php     |  1 +
 views/bootstrap/class.ViewDocument.php | 18 ++++++++++++++++--
 views/bootstrap/class.ViewFolder.php   |  9 ++++++++-
 6 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 94b2c0554..6143e8c93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
                      Changes in version 5.1.31
 --------------------------------------------------------------------------------
 - rest api returns error msg and not just http status
+- comment of document, documentcontent and folder can be rendered as
+  markdown
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 002bb3312..fdfd9c277 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -290,6 +290,8 @@ class Settings { /* {{{ */
 	var $_maxItemsPerPage = 0;
 	// number of documents/folders fetched when scrolling to bottom of ViewFolder page
 	var $_incItemsPerPage = 0;
+	// parse comments of folders and documents as markdown
+	var $_markdownComments = false;
 	// Show form to submit missing translations at end of page
 	var $_showMissingTranslations = false;
 	// Extra Path to additional software, will be added to include path
@@ -498,6 +500,7 @@ class Settings { /* {{{ */
 			$this->_maxItemsPerPage = intval($tab["maxItemsPerPage"]);
 		if(isset($tab["incItemsPerPage"]))
 			$this->_incItemsPerPage = intval($tab["incItemsPerPage"]);
+		$this->_markdownComments = Settings::boolVal($tab["markdownComments"]);
 
 		// XML Path: /configuration/site/edition
 		$node = $xml->xpath('/configuration/site/edition');
@@ -882,6 +885,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "convertToPdf", $this->_convertToPdf);
     $this->setXMLAttributValue($node, "maxItemsPerPage", $this->_maxItemsPerPage);
     $this->setXMLAttributValue($node, "incItemsPerPage", $this->_incItemsPerPage);
+    $this->setXMLAttributValue($node, "markdownComments", $this->_markdownComments);
 
     // XML Path: /configuration/site/edition
     $node = $this->getXMLNode($xml, '/configuration/site', 'edition');
diff --git a/op/op.Settings.php b/op/op.Settings.php
index dfd8206d4..cd9217325 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -115,6 +115,7 @@ if ($action == "saveSettings")
 	setBoolValue('convertToPdf');
 	setIntValue('maxItemsPerPage');
 	setIntValue('incItemsPerPage');
+	setBoolValue('markdownComments');
 
   // SETTINGS - SITE - EDITION
 	setBoolValue('strictFormCheck');
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index d931031a5..a67406f00 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -330,6 +330,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 <?php $this->showConfigCheckbox('settings_convertToPdf', 'convertToPdf'); ?>
 <?php $this->showConfigText('settings_maxItemsPerPage', 'maxItemsPerPage'); ?>
 <?php $this->showConfigText('settings_incItemsPerPage', 'incItemsPerPage'); ?>
+<?php $this->showConfigCheckbox('settings_markdownComments', 'markdownComments'); ?>
 
       <!--
         -- SETTINGS - SITE - EDITION
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index fd3c33fc6..708e25546 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -383,6 +383,7 @@ $(document).ready( function() {
 	function documentInfos() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$settings = $this->params['settings'];
 		$document = $this->params['document'];
 
 		$txt = $this->callHook('documentInfos', $document);
@@ -418,10 +419,16 @@ $(document).ready( function() {
 		</tr>
 <?php
 		if($document->getComment()) {
+			if($settings->_markdownComments) {
+				$Parsedown = new Parsedown();
+				$comment = $Parsedown->text($document->getComment());
+			} else {
+				$comment = htmlspecialchars($document->getComment());
+			}
 ?>
 		<tr>
 		<td><?php printMLText("comment");?>:</td>
-		<td><?php print htmlspecialchars($document->getComment());?></td>
+		<td><div class="document-comment"><?php print $comment;?></div></td>
 		</tr>
 <?php
 		}
@@ -764,7 +771,14 @@ $(document).ready( function() {
 			echo $txt;
 		} else {
 			if($latestContent->getComment())
-				print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
+				if($settings->_markdownComments) {
+					$Parsedown = new Parsedown();
+					$comment = $Parsedown->text($latestContent->getComment());
+					print "<div class=\"content-comment\">".$comment."</div>";
+				} else {
+					$comment = htmlspecialchars($latestContent->getComment());
+					print "<p style=\"font-style: italic;\">".$comment."</p>";
+				}
 		}
 		print "<ul class=\"actions unstyled\">\n";
 		$this->printVersionAttributes($folder, $latestContent);
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 75c2f8838..9cfc7ab47 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -248,6 +248,7 @@ $('body').on('click', '.order-btn', function(ev) {
 	function folderInfos() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$settings = $this->params['settings'];
 		$folder = $this->params['folder'];
 
 		$txt = $this->callHook('folderInfos', $folder);
@@ -275,9 +276,15 @@ $('body').on('click', '.order-btn', function(ev) {
 			echo "<td>".getLongReadableDate($folder->getDate())."</td>";
 			echo "</tr>";
 			if($folder->getComment()) {
+				if($settings->_markdownComments) {
+					$Parsedown = new Parsedown();
+					$comment = $Parsedown->text($folder->getComment());
+				} else {
+					$comment = htmlspecialchars($folder->getComment());
+				}
 				echo "<tr>";
 				echo "<td>".getMLText("comment").":</td>\n";
-				echo "<td>".htmlspecialchars($folder->getComment())."</td>\n";
+				echo "<td><div class=\"folder-comment\">".$content."</div></td>\n";
 				echo "</tr>";
 			}
 

From 15cfd20ed2305a84d6aa53bf15fe41577ff3a34a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Apr 2023 13:46:40 +0200
Subject: [PATCH 1911/2006] do not set sitename to 'SeedDMS' by default anymore

---
 views/bootstrap/class.Bootstrap.php   | 6 +++---
 views/bootstrap4/class.Bootstrap4.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c7878b6af..1b1ba936f 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -100,7 +100,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 			echo '<base href="'.$this->baseurl.'">'."\n";
 		$sitename = trim(strip_tags($this->params['sitename']));
 		if($this->params['session'])
-			echo '<link rel="search" type="application/opensearchdescription+xml" href="'.$this->params['settings']->_httpRoot.'out/out.OpensearchDesc.php" title="'.(strlen($sitename)>0 ? $sitename : "SeedDMS").'"/>'."\n";
+			echo '<link rel="search" type="application/opensearchdescription+xml" href="'.$this->params['settings']->_httpRoot.'out/out.OpensearchDesc.php" title="'.(strlen($sitename)>0 ? $sitename : "").'"/>'."\n";
 		echo '<link href="'.$this->params['settings']->_httpRoot.'styles/'.$this->theme.'/bootstrap/css/bootstrap.css" rel="stylesheet"/>'."\n";
 		echo '<link href="'.$this->params['settings']->_httpRoot.'styles/'.$this->theme.'/bootstrap/css/bootstrap-responsive.css" rel="stylesheet"/>'."\n";
 		echo '<link href="'.$this->params['settings']->_httpRoot.'views/'.$this->theme.'/vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>'."\n";
@@ -301,7 +301,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
 		echo "   <a href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'"/>' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap/images/seeddms-logo.svg"/>')."</a>";
-		echo "   <a class=\"brand\" href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
+		echo "   <a class=\"brand\" href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "")."</a>\n";
 		echo "  </div>\n";
 		echo " </div>\n";
 		echo "</div>\n";
@@ -320,7 +320,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "     <span class=\"fa fa-sign-out\"></span>\n";
 		echo "   </a>\n";
 		echo "   <a href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'">' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap/images/seeddms-logo.svg">')."</a>";
-		echo "   <a class=\"brand\" href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\"><span class=\"hidden-phone\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
+		echo "   <a class=\"brand\" href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\"><span class=\"hidden-phone\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "")."</span></a>\n";
 
 		/* user profile menu {{{ */
 		if(isset($this->params['session']) && isset($this->params['user']) && $this->params['user']) {
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 3388e9151..da399b0b1 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -102,7 +102,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 			echo '<base href="'.$this->baseurl.'">'."\n";
 		$sitename = trim(strip_tags($this->params['sitename']));
 		if($this->params['session'])
-			echo '<link rel="search" type="application/opensearchdescription+xml" href="'.$this->params['settings']->_httpRoot.'out/out.OpensearchDesc.php" title="'.(strlen($sitename)>0 ? $sitename : "SeedDMS").'"/>'."\n";
+			echo '<link rel="search" type="application/opensearchdescription+xml" href="'.$this->params['settings']->_httpRoot.'out/out.OpensearchDesc.php" title="'.(strlen($sitename)>0 ? $sitename : "").'"/>'."\n";
 		$parenttheme = 'bootstrap';
 		echo '<link href="'.$this->params['settings']->_httpRoot.'views/'.$this->theme.'/styles/seeddms.css" rel="stylesheet"/>'."\n";
 		echo '<link href="'.$this->params['settings']->_httpRoot.'views/'.$this->theme.'/vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>'."\n";
@@ -314,7 +314,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	function globalBanner() { /* {{{ */
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'"/>' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap4/images/seeddms-logo.svg"/>')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
+		echo " <a class=\"navbar-brand\" href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'"/>' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap4/images/seeddms-logo.svg"/>')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "")."</span></a>\n";
 		echo "</nav>\n";
 	} /* }}} */
 
@@ -322,7 +322,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$dms = $this->params['dms'];
 		$accessobject = $this->params['accessobject'];
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark border-bottom fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'">' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap4/images/seeddms-logo.svg">')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
+		echo " <a class=\"navbar-brand\" href=\"".(!empty($this->extraheader['logolink']) ? $this->extraheader['logolink'] : $this->params['settings']->_httpRoot."out/out.ViewFolder.php")."\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'">' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap4/images/seeddms-logo.svg">')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "")."</span></a>\n";
 
 		if(isset($this->params['user']) && $this->params['user']) {
 			/* search form {{{ */

From a557e989278a181362bcc6d2fe3ff70a9bbc912c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 5 Apr 2023 14:55:28 +0200
Subject: [PATCH 1912/2006] show access rights only if unlimited access

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 views/bootstrap/class.ViewFolder.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 708e25546..0d2191f49 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -432,7 +432,7 @@ $(document).ready( function() {
 		</tr>
 <?php
 		}
-		if($user->isAdmin() || $document->getAccessMode($user) > M_READ) {
+		if($document->getAccessMode($user) == M_ALL) {
 			echo "<tr>";
 			echo "<td>".getMLText('default_access').":</td>";
 			echo "<td>".$this->getAccessModeText($document->getDefaultAccess())."</td>";
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 9cfc7ab47..bc39917a5 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -288,7 +288,7 @@ $('body').on('click', '.order-btn', function(ev) {
 				echo "</tr>";
 			}
 
-			if($user->isAdmin() || $folder->getAccessMode($user) > M_READ) {
+			if($folder->getAccessMode($user) == M_ALL) {
 				echo "<tr>";
 				echo "<td>".getMLText('default_access').":</td>";
 				echo "<td>".$this->getAccessModeText($folder->getDefaultAccess())."</td>";

From 7c836e0d41f33009d39c74e1003e67eac8cfdbe1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 08:02:21 +0200
Subject: [PATCH 1913/2006] add Dashboard

---
 out/out.Dashboard.php               |  30 +++++
 views/bootstrap/class.Dashboard.php | 176 ++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+)
 create mode 100644 out/out.Dashboard.php
 create mode 100644 views/bootstrap/class.Dashboard.php

diff --git a/out/out.Dashboard.php b/out/out.Dashboard.php
new file mode 100644
index 000000000..879e94d55
--- /dev/null
+++ b/out/out.Dashboard.php
@@ -0,0 +1,30 @@
+<?php
+if(!isset($settings))
+	require_once("../inc/inc.Settings.php");
+require_once("inc/inc.Utils.php");
+require_once("inc/inc.LogInit.php");
+require_once("inc/inc.Language.php");
+require_once("inc/inc.Init.php");
+require_once("inc/inc.Extension.php");
+require_once("inc/inc.DBInit.php");
+require_once("inc/inc.Authentication.php");
+require_once("inc/inc.ClassUI.php");
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+
+if($view) {
+	$view->setParam('fulltextservice', $fulltextservice);
+	$view->setParam('conversionmgr', $conversionmgr);
+	$view->setParam('showtree', showtree());
+	$view->setParam('settings', $settings);
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view->setParam('accessobject', $accessop);
+	$view->setParam('xsendfile', $settings->_enableXsendfile);
+	$view($_GET);
+	exit;
+}
diff --git a/views/bootstrap/class.Dashboard.php b/views/bootstrap/class.Dashboard.php
new file mode 100644
index 000000000..ce1627ed5
--- /dev/null
+++ b/views/bootstrap/class.Dashboard.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Implementation of Dashboard view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2023 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which outputs the html page for Dashboard view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2023 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_Dashboard extends SeedDMS_Theme_Style {
+
+	protected function printList($documents, $previewer) { /* {{{ */
+			$txt = $this->callHook('folderListPreContent', null, [], $documents);
+			if(is_string($txt))
+				echo $txt;
+			$i = 0;
+			$txt = $this->callHook('folderListHeader', null, '', '');
+			if(is_string($txt)) {
+				echo $txt;
+			} elseif(is_array($txt)) {
+				print "<table id=\"viewfolder-table\" class=\"table table-condensed table-sm table-hover\">";
+				print "<thead>\n<tr>\n";
+				foreach($txt as $headcol)
+					echo "<th>".$headcol."</th>\n";
+				print "</tr>\n</thead>\n";
+			} else {
+				echo $this->folderListHeader();
+			}
+			print "<tbody>\n";
+
+			foreach($documents as $document) {
+				$document->verifyLastestContentExpriry();
+				$txt = $this->callHook('documentListItem', $document, $previewer, false, 'dashboard');
+				if(is_string($txt))
+					echo $txt;
+				else {
+					echo $this->documentListRow($document, $previewer);
+				}
+			}
+
+			$txt = $this->callHook('folderListFooter', null);
+			if(is_string($txt))
+				echo $txt;
+			else
+				echo "</tbody>\n</table>\n";
+	} /* }}} */
+
+	public function newdocuments() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$conversionmgr = $this->params['conversionmgr'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewConverters'];
+		$timeout = $this->params['timeout'];
+		$xsendfile = $this->params['xsendfile'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
+
+		echo $this->contentHeading(getMLText('new_documents'));
+		$documents = $dms->getLatestChanges('newdocuments', mktime(0, 0, 0)-7*86400, time());
+		if (count($documents) > 0) {
+			$this->printList($documents, $previewer);
+		}
+	} /* }}} */
+
+	public function updateddocuments() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$conversionmgr = $this->params['conversionmgr'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewConverters'];
+		$timeout = $this->params['timeout'];
+		$xsendfile = $this->params['xsendfile'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
+
+		echo $this->contentHeading(getMLText('updated_documents'));
+		$documents = $dms->getLatestChanges('updateddocuments', mktime(0, 0, 0)-7*86400, time());
+		if (count($documents) > 0) {
+			$this->printList($documents, $previewer);
+		}
+	} /* }}} */
+
+	public function status() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$conversionmgr = $this->params['conversionmgr'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewConverters'];
+		$timeout = $this->params['timeout'];
+		$xsendfile = $this->params['xsendfile'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
+
+		echo $this->contentHeading(getMLText('status_change'));
+		$documents = $dms->getLatestChanges('status', mktime(0, 0, 0)-7*86400, time());
+		if (count($documents) > 0) {
+			$this->printList($documents, $previewer);
+		}
+	} /* }}} */
+
+	function js() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+
+		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
+		$this->printDeleteDocumentButtonJs();
+		/* Add js for catching click on document in one page mode */
+		$this->printClickDocumentJs();
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+		$conversionmgr = $this->params['conversionmgr'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewConverters'];
+		$timeout = $this->params['timeout'];
+		$xsendfile = $this->params['xsendfile'];
+
+		$this->htmlStartPage(getMLText("calendar"));
+		$this->globalNavigation();
+		$this->contentStart();
+
+		$this->rowStart();
+		$this->columnStart(4);
+?>
+		<div class="ajax" data-view="Dashboard" data-action="newdocuments"></div>
+<?php
+		$this->columnEnd();
+		$this->columnStart(4);
+?>
+		<div class="ajax" data-view="Dashboard" data-action="updateddocuments"></div>
+<?php
+		$this->columnEnd();
+		$this->columnStart(4);
+?>
+		<div class="ajax" data-view="Dashboard" data-action="status"></div>
+<?php
+		$this->columnEnd();
+		$this->rowEnd();
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+
+}

From b71467b8c8dfecbb9b95e749eb12045f3c90bf57 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 12:13:36 +0200
Subject: [PATCH 1914/2006] add task to send list of recent changes by email

---
 inc/inc.Tasks.php | 110 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 104 insertions(+), 6 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index ccf1dc05a..ba43d1813 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -639,7 +639,7 @@ class SeedDMS_StatisticTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 	 * @param SeedDMS_SchedulerTask $task task to be executed
 	 * @return boolean true if task was executed succesfully, otherwise false
 	 */
-	public function execute(SeedDMS_SchedulerTask $task) {
+	public function execute(SeedDMS_SchedulerTask $task) { /* {{{ */
 		$dms = $this->dms;
 		$user = $this->user;
 		$logger = $this->logger;
@@ -707,13 +707,13 @@ class SeedDMS_StatisticTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		}
 
 		return true;
-	}
+	} /* }}} */
 
-	public function getDescription() {
+	public function getDescription() { /* {{{ */
 		return 'Send statistics by email';
-	}
+	} /* }}} */
 
-	public function getAdditionalParams() {
+	public function getAdditionalParams() { /* {{{ */
 		return array(
 			array(
 				'name'=>'users',
@@ -722,7 +722,104 @@ class SeedDMS_StatisticTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 				'description'=> 'Send statistics report to this users',
 			)
 		);
-	}
+	} /* }}} */
+} /* }}} */
+
+/**
+ * Class containing methods for running a scheduled task
+ *
+ * @author  Uwe Steinmann <uwe@steinmann.cx>
+ * @package SeedDMS
+ * @subpackage  core
+ */
+class SeedDMS_RecentChangesTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
+
+	/**
+	 * Run the task
+	 *
+	 * @param SeedDMS_SchedulerTask $task task to be executed
+	 * @return boolean true if task was executed succesfully, otherwise false
+	 */
+	public function execute(SeedDMS_SchedulerTask $task) { /* {{{ */
+		$dms = $this->dms;
+		$user = $this->user;
+		$settings = $this->settings;
+		$logger = $this->logger;
+		$taskparams = $task->getParameter();
+		$tableformat = " %-10s %5d %-60s";
+		$tableformathead = " %-10s %5s %-60s";
+		$tableformathtml = "<tr><td>%s</td><td>%d</td><td>%s</td></tr>";
+		$tableformatheadhtml = "<tr><th>%s</th><th>%s</th><th>%s</th></tr>";
+
+		require_once('inc/inc.ClassEmailNotify.php');
+		$email = new SeedDMS_EmailNotify($dms, $settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+
+		if(!empty($taskparams['users'])) {
+			$userids = $taskparams['users'];
+			$users = [];
+			foreach($userids as $userid)
+				if($u = $dms->getUser($userid))
+					$users[] = $u;
+		} else {
+			$users = $dms->getAllUsers();
+		}
+		$docs = [];
+		foreach(['newdocuments', 'updateddocuments', 'statuschange'] as $dt) {
+			$docs[$dt] = $dms->getLatestChanges($dt, mktime(0, 0, 0)-intval($taskparams['days'])*86400, time());
+		}
+		foreach($users as $u) {
+			if(!$u->isGuest() && !$u->isDisabled()) {
+				$body = '';
+				$bodyhtml = '';
+				foreach(['newdocuments', 'updateddocuments', 'statuschange'] as $dt) {
+					$params = array();
+					$bodyhtml .= "<h2>".getMLText('latest_'.$dt)."</h2>".PHP_EOL;
+					$ds = SeedDMS_Core_DMS::filterAccess($docs[$dt], $u, M_READ);
+					$params['count_'.$dt] = count($ds);
+					if (count($ds)>0) {
+						$bodyhtml .= "<table>".PHP_EOL;
+						$bodyhtml .= sprintf($tableformatheadhtml."\n", getMLText("date", array(), ""), "ID", getMLText("name", array(), ""));
+						$body .= sprintf($tableformathead."\n", getMLText("date", array(), ""), "ID", getMLText("name", array(), ""));
+						$body .= "---------------------------------------------------------------------------------\n";
+						foreach($ds as $doc) {
+							$body .= sprintf($tableformat."\n", getReadableDate($doc->getDate()), $doc->getId(), $doc->getName());
+							$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getDate()), $doc->getId(), $doc->getName());
+						}
+						$bodyhtml .= "</table>".PHP_EOL;
+						$body .= PHP_EOL;
+					}
+				}
+
+				$params['__body__'] = $body;
+				$params['__body_html__'] = $bodyhtml;
+				$params['sitename'] = $settings->_siteName;
+				$email->toIndividual('', $u, 'recentchanges_mail_subject', '', $params);
+
+				$logger->log('Task \'recentchanges\': Sending reminder \'recentchanges_mail_subject\' to user \''.$u->getLogin().'\'', PEAR_LOG_INFO);
+			}
+		}
+		return true;
+	} /* }}} */
+
+	public function getDescription() { /* {{{ */
+		return 'Report new and updated documents and those with a changed status';
+	} /* }}} */
+
+	public function getAdditionalParams() { /* {{{ */
+		return array(
+			array(
+				'name'=>'days',
+				'type'=>'integer',
+				'description'=> 'Number of days to check for. Negative values will look into the past. 0 will just check for documents expiring the current day. Keep in mind that the document is still valid on the expiration date.',
+			),
+			array(
+				'name'=>'users',
+				'type'=>'users',
+				'multiple'=>true,
+				'description'=> 'Send list of recently changed documents to this users',
+			)
+		);
+	} /* }}} */
 } /* }}} */
 
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['expireddocs'] = 'SeedDMS_ExpiredDocumentsTask';
@@ -731,3 +828,4 @@ $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['checksum'] = 'SeedDMS_CheckSumTa
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['preview'] = 'SeedDMS_PreviewTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['calendar'] = 'SeedDMS_CalendarTask';
 $GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['statistic'] = 'SeedDMS_StatisticTask';
+$GLOBALS['SEEDDMS_SCHEDULER']['tasks']['core']['recentchanges'] = 'SeedDMS_RecentChangesTask';

From c44aaae446d76c7d2a17dd5bbb545ce05e023b75 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 12:13:47 +0200
Subject: [PATCH 1915/2006] show parameters of task if they are an array

---
 utils/schedulercli.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/utils/schedulercli.php b/utils/schedulercli.php
index 1cb4f6557..1f723ce66 100644
--- a/utils/schedulercli.php
+++ b/utils/schedulercli.php
@@ -129,7 +129,18 @@ foreach($tasks as $task) {
 			if($params = $task->getParameter()) {
 				foreach($params as $key=>$value) {
 					$p = $taskobj->getAdditionalParamByName($key);
-					echo "    ".$key.": ".($p['type'] == 'password' ? '********' : $value)."\n";
+					echo "    ".$key.": ";
+					switch($p['type']) {
+					case 'password':
+						echo '********';
+						break;
+					default:
+						if(is_array($value))
+							echo implode(', ', $value);
+						else
+							echo $value;
+					}
+					echo PHP_EOL;
 				}
 			}
 			break;

From e88321c577f7d0753d8fc68046c6f56d4e758fe1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 12:14:13 +0200
Subject: [PATCH 1916/2006] add changes for 6.0.24

---
 CHANGELOG | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index d23a1ed91..74a697657 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,16 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.24
+--------------------------------------------------------------------------------
+- add task to send list of recent changes by email
+- merge changes up to 5.1.30
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.23
 --------------------------------------------------------------------------------
 - fix setting recipients and revisors
 - check in of a document is allowed for the user having done the check out
   or those users with unlimited access rights on the document
-- merge changes up to 5.1.30
+- merge changes up to 5.1.29
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.22

From e8fcf01ad46db1d2f2870d8bc057b3893b6fac08 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 12:18:10 +0200
Subject: [PATCH 1917/2006] parameter to getLatestChanges() has changed

---
 views/bootstrap/class.Dashboard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Dashboard.php b/views/bootstrap/class.Dashboard.php
index ce1627ed5..ca288b762 100644
--- a/views/bootstrap/class.Dashboard.php
+++ b/views/bootstrap/class.Dashboard.php
@@ -121,7 +121,7 @@ class SeedDMS_View_Dashboard extends SeedDMS_Theme_Style {
 			$previewer->setConverters($previewconverters);
 
 		echo $this->contentHeading(getMLText('status_change'));
-		$documents = $dms->getLatestChanges('status', mktime(0, 0, 0)-7*86400, time());
+		$documents = $dms->getLatestChanges('statuschange', mktime(0, 0, 0)-7*86400, time());
 		if (count($documents) > 0) {
 			$this->printList($documents, $previewer);
 		}

From 71701d324fd5591f3e0519d3f6b30f19460e0938 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 12:18:55 +0200
Subject: [PATCH 1918/2006] new translations

---
 languages/ar_EG/lang.inc |  9 +++++++++
 languages/bg_BG/lang.inc |  9 +++++++++
 languages/ca_ES/lang.inc |  9 +++++++++
 languages/cs_CZ/lang.inc |  9 +++++++++
 languages/de_DE/lang.inc | 11 ++++++++++-
 languages/el_GR/lang.inc |  9 +++++++++
 languages/en_GB/lang.inc | 11 ++++++++++-
 languages/es_ES/lang.inc |  9 +++++++++
 languages/fr_FR/lang.inc |  9 +++++++++
 languages/hr_HR/lang.inc |  9 +++++++++
 languages/hu_HU/lang.inc |  9 +++++++++
 languages/id_ID/lang.inc |  9 +++++++++
 languages/it_IT/lang.inc |  9 +++++++++
 languages/ko_KR/lang.inc |  9 +++++++++
 languages/lo_LA/lang.inc |  9 +++++++++
 languages/nb_NO/lang.inc |  9 +++++++++
 languages/nl_NL/lang.inc |  9 +++++++++
 languages/pl_PL/lang.inc |  9 +++++++++
 languages/pt_BR/lang.inc |  9 +++++++++
 languages/ro_RO/lang.inc |  9 +++++++++
 languages/ru_RU/lang.inc |  9 +++++++++
 languages/sk_SK/lang.inc |  9 +++++++++
 languages/sv_SE/lang.inc |  9 +++++++++
 languages/tr_TR/lang.inc |  9 +++++++++
 languages/uk_UA/lang.inc |  9 +++++++++
 languages/zh_CN/lang.inc |  9 +++++++++
 languages/zh_TW/lang.inc |  9 +++++++++
 27 files changed, 245 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 575cecbd7..f1269789b 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -852,6 +852,9 @@ URL: [url]',
 'language' => 'اللغة',
 'lastaccess' => 'آخر تسجيل دخول',
 'last_update' => 'اخر تحديث',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'الدليل',
 'librarydoc' => 'مستندات المكتبة',
 'linked_documents' => 'مستندات متعلقة',
@@ -946,6 +949,7 @@ URL: [url]',
 'new_attrdef' => 'اضافة تعريف سمة',
 'new_default_keywords' => 'اضافة كلمات بحث',
 'new_default_keyword_category' => 'من فضلك اضف قسم',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'من فضلك اضف قسم',
@@ -1145,6 +1149,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'ملخص الإيصال',
 'receipt_update_failed' => 'فشل في تحديث الإيصال',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'الإضافات الأخيرة',
 'reception' => 'إستقبال',
 'reception_acknowleged' => 'موافقة على الإستقبال',
@@ -1983,6 +1988,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'تفصيل المهام',
 'task_disabled' => 'تم توقيف المهمة',
 'task_frequency' => 'تردد المهمة',
@@ -2079,6 +2087,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'يمكنك تحديثه لانك من قمت بحمايته. سيتم ازالة الحماية تلقائية.',
 'unlock_document' => 'ازالة القفل',
 'update' => 'تحديث',
+'updated_documents' => '',
 'update_approvers' => 'تحديثة قائمة الموافقون',
 'update_document' => 'تحديث المستند',
 'update_fulltext_index' => 'تحديث فهرس النص الكامل',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 82734c38f..54afd2de3 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -781,6 +781,9 @@ $text = array(
 'language' => 'Език',
 'lastaccess' => '',
 'last_update' => 'Последно обновление',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'легенда',
 'librarydoc' => '',
 'linked_documents' => 'Свързани документи',
@@ -875,6 +878,7 @@ $text = array(
 'new_attrdef' => 'Добави дефиниция атрибути',
 'new_default_keywords' => 'Добави ключови думи',
 'new_default_keyword_category' => 'Добави категория',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Добави категория документ',
@@ -1044,6 +1048,7 @@ $text = array(
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Последно Качени',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -1846,6 +1851,9 @@ $text = array(
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -1933,6 +1941,7 @@ $text = array(
 'unlock_cause_locking_user' => 'Вие все още можете да го обновите, защото сте един от тези, които го е блокирал. Блокировката ще бъде снета автоматично.',
 'unlock_document' => 'Разблокирай',
 'update' => 'Обнови',
+'updated_documents' => '',
 'update_approvers' => 'Обнови списъка с утвърждаващи',
 'update_document' => 'Обнови документ',
 'update_fulltext_index' => 'Обнови пълнотекстовия индекс',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 116b9f701..e1f1176dc 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -786,6 +786,9 @@ URL: [url]',
 'language' => 'Llenguatge',
 'lastaccess' => '',
 'last_update' => 'Última modificació',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Llegenda',
 'librarydoc' => '',
 'linked_documents' => 'Documents relacionats',
@@ -880,6 +883,7 @@ URL: [url]',
 'new_attrdef' => '',
 'new_default_keywords' => 'Afegir mots clau',
 'new_default_keyword_category' => 'Nova categoria',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Add category',
@@ -1049,6 +1053,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Documents pujats recentment',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -1851,6 +1856,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -1938,6 +1946,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Pot actualitzar-lo perquè és qui el va bloquejar. El bloqueig s\'eliminarà automàticament.',
 'unlock_document' => 'Desbloquejar',
 'update' => 'Actualitzar',
+'updated_documents' => '',
 'update_approvers' => 'Actualitzar llista d\'aprovadors',
 'update_document' => 'Actualitzar',
 'update_fulltext_index' => 'Update fulltext index',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index b34ebba2d..44c3029d8 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -883,6 +883,9 @@ URL: [url]',
 'language' => 'Jazyk',
 'lastaccess' => 'Poslední přístup',
 'last_update' => 'Naposledy aktualizoval',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Popisek',
 'librarydoc' => 'Dokument z knihovny',
 'linked_documents' => 'Související dokumenty',
@@ -977,6 +980,7 @@ URL: [url]',
 'new_attrdef' => 'Přidat definici atributu',
 'new_default_keywords' => 'Přidat klíčová slova',
 'new_default_keyword_category' => 'Přidat kategorii',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Přidat kategorii dokumentů',
@@ -1191,6 +1195,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Souhrn přijetí',
 'receipt_update_failed' => 'Potvrzení že přijetí se nezdařilo',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Naposledy nahráno',
 'reception' => 'Přijetí',
 'reception_acknowleged' => 'Přijetí potvrzeno',
@@ -2055,6 +2060,9 @@ Jméno: [username]
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'Popis',
 'task_disabled' => 'Vypnuto',
 'task_frequency' => 'Frekvence',
@@ -2151,6 +2159,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Můžete ho pořád aktualizovat, protože jste ten, kdo ho zamknul. Zámek bude automaticky odstraněn.',
 'unlock_document' => 'Odemknout',
 'update' => 'Aktualizovat',
+'updated_documents' => '',
 'update_approvers' => 'Aktualizovat seznam schvalovatelů',
 'update_document' => 'Aktualizovat',
 'update_fulltext_index' => 'Aktualizovat fulltext index',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index e6a9bd6b3..328127b63 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3189), dgrutsch (22)
+//    Translators: Admin (3199), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1026,6 +1026,9 @@ URL: [url]</p>',
 'language' => 'Sprache',
 'lastaccess' => 'Letzter Zugriff',
 'last_update' => 'Letzte Aktualisierung',
+'latest_newdocuments' => 'Zuletzt angelegte Dokumente',
+'latest_statuschange' => 'Zuletzt geänderter Status',
+'latest_updatedocuments' => 'Zuletzt aktualisierte Dokumente',
 'legend' => 'Legende',
 'librarydoc' => 'Dokument aus Bibliothek',
 'linked_documents' => 'verknüpfte Dokumente',
@@ -1120,6 +1123,7 @@ URL: [url]</p>',
 'new_attrdef' => 'Neue Attributdefinition',
 'new_default_keywords' => 'Neue Vorlage',
 'new_default_keyword_category' => 'Neue Kategorie',
+'new_documents' => 'Neue Dokumente',
 'new_documents_today' => 'Neue Dokumente heute',
 'new_documents_yesterday' => 'Neue Dokumente gestern',
 'new_document_category' => 'Neue Kategorie',
@@ -1414,6 +1418,7 @@ URL: [url]</p>',
 'receipt_submit_email_subject' => '[sitename]: [name] - Empfang bestätigt',
 'receipt_summary' => 'Übersicht Bestätigungen',
 'receipt_update_failed' => 'Setzen der Empfangsbestätigung fehlgeschlagen',
+'recentchanges_mail_subject' => 'Kürzliche Änderungen',
 'recent_uploads' => 'Letzte Uploads',
 'reception' => 'Empfangsbestätigung',
 'reception_acknowleged' => 'Empfang bestätigt',
@@ -2387,6 +2392,9 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'task_core_expireddocs_email' => 'E-Mail',
 'task_core_expireddocs_peruser' => 'Pro Benutzer',
 'task_core_indexingdocs_recreate' => 'Index neu erzeugen',
+'task_core_recentchanges_days' => 'Tage',
+'task_core_recentchanges_users' => 'Benutzer',
+'task_core_statistic_users' => 'Benutzer',
 'task_description' => 'Beschreibung',
 'task_disabled' => 'Deaktiviert',
 'task_frequency' => 'Häufigkeit',
@@ -2494,6 +2502,7 @@ URL: [url]</p>',
 'unlock_cause_locking_user' => 'Sie sind im Moment mit demselben Benutzer angemeldet.<br>Daher wird die Sperrung beim Update automatisch aufgehoben',
 'unlock_document' => 'Sperrung aufheben',
 'update' => 'Aktualisieren',
+'updated_documents' => 'Aktualisierte Dokumente',
 'update_approvers' => 'Liste der Freigebenden aktualisieren',
 'update_document' => 'Aktualisieren',
 'update_fulltext_index' => 'Aktualisiere Volltext-Index',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 5e72be9a8..693ac8e8f 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -781,6 +781,9 @@ $text = array(
 'language' => 'Γλώσσα',
 'lastaccess' => '',
 'last_update' => 'Τελευταία Αναναίωση',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Ιστορικό',
 'librarydoc' => '',
 'linked_documents' => 'Σχετικά Έγγραφα',
@@ -875,6 +878,7 @@ $text = array(
 'new_attrdef' => '',
 'new_default_keywords' => '',
 'new_default_keyword_category' => 'Προσθήκη Κατηγορίας',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Προσθήκη κατηγορίας',
@@ -1055,6 +1059,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Πρόσφατες μεταφορτώσεις',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -1857,6 +1862,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -1944,6 +1952,7 @@ URL: [url]',
 'unlock_cause_locking_user' => '',
 'unlock_document' => 'Ξεκλείδωμα',
 'update' => 'Ενημέρωση',
+'updated_documents' => '',
 'update_approvers' => '',
 'update_document' => 'Ενημέρωση εγγράφου',
 'update_fulltext_index' => 'Ενημέρωση της Αρίθμησης Κειμένων',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 1b4e4b582..7f35f4432 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2283), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2293), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1027,6 +1027,9 @@ URL: [url]</p>',
 'language' => 'Language',
 'lastaccess' => 'Last access',
 'last_update' => 'Last Update',
+'latest_newdocuments' => 'Latest added documents',
+'latest_statuschange' => 'Latest status change',
+'latest_updatedocuments' => 'Latest updated documents',
 'legend' => 'Legend',
 'librarydoc' => 'Document from library',
 'linked_documents' => 'Related Documents',
@@ -1121,6 +1124,7 @@ URL: [url]</p>',
 'new_attrdef' => 'Add attribute definition',
 'new_default_keywords' => 'Add keywords',
 'new_default_keyword_category' => 'Add category',
+'new_documents' => 'New documents',
 'new_documents_today' => 'New documents today',
 'new_documents_yesterday' => 'New documents yesterday',
 'new_document_category' => 'Add category',
@@ -1417,6 +1421,7 @@ URL: [url]</p>',
 'receipt_submit_email_subject' => '[sitename]: [name] - Submitted receipt',
 'receipt_summary' => 'Receipt summary',
 'receipt_update_failed' => 'Acknowledging reception failed',
+'recentchanges_mail_subject' => 'Recent changes',
 'recent_uploads' => 'Recent Uploads',
 'reception' => 'Reception',
 'reception_acknowleged' => 'Reception acknowledged',
@@ -2390,6 +2395,9 @@ If you did not receive a password, please use the password forgotten function on
 'task_core_expireddocs_email' => 'Email',
 'task_core_expireddocs_peruser' => 'Per user',
 'task_core_indexingdocs_recreate' => 'Recreate index',
+'task_core_recentchanges_days' => 'Days',
+'task_core_recentchanges_users' => 'Users',
+'task_core_statistic_users' => 'Users',
 'task_description' => 'Description',
 'task_disabled' => 'Disabled',
 'task_frequency' => 'Frequency',
@@ -2497,6 +2505,7 @@ URL: [url]</p>',
 'unlock_cause_locking_user' => 'You can still update it because you are also the one that locked it. Locking will automatically be removed.',
 'unlock_document' => 'Unlock',
 'update' => 'Update',
+'updated_documents' => 'Updated documents',
 'update_approvers' => 'Update List of Approvers',
 'update_document' => 'Update document',
 'update_fulltext_index' => 'Update fulltext index',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index b81d10a68..5a923d443 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -871,6 +871,9 @@ URL: [url]',
 'language' => 'Idioma',
 'lastaccess' => 'Último acceso',
 'last_update' => 'Última modificación',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Leyenda',
 'librarydoc' => '',
 'linked_documents' => 'Documentos relacionados',
@@ -965,6 +968,7 @@ URL: [url]',
 'new_attrdef' => 'Nueva definición de atributo',
 'new_default_keywords' => 'Agregar palabras claves',
 'new_default_keyword_category' => 'Nueva categoría',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Añadir categoría',
@@ -1172,6 +1176,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Resumen de recepción',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Subidas recientes',
 'reception' => 'Recepción',
 'reception_acknowleged' => 'Recepción aceptada',
@@ -2010,6 +2015,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2106,6 +2114,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Puede actualizarlo porque fue quién lo bloqueó. El bloqueo será automáticamente eliminado.',
 'unlock_document' => 'Desbloquear',
 'update' => 'Actualizar',
+'updated_documents' => '',
 'update_approvers' => 'Actualizar lista de aprobadores',
 'update_document' => 'Actualizar documento',
 'update_fulltext_index' => 'Actualizar índice de texto completo',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 53bd01582..8134c8564 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1013,6 +1013,9 @@ URL : [url]</p>',
 'language' => 'Langue',
 'lastaccess' => 'Dernière connexion',
 'last_update' => 'Dernière modification',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Légende',
 'librarydoc' => 'Document de la bibliothèque',
 'linked_documents' => 'Documents liés',
@@ -1107,6 +1110,7 @@ URL : [url]</p>',
 'new_attrdef' => 'Ajouter une définition d\'attribut',
 'new_default_keywords' => 'Ajouter des mots-clés',
 'new_default_keyword_category' => 'Ajouter une catégorie',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Ajouter une catégorie',
@@ -1402,6 +1406,7 @@ URL : [url]</p>',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Récapitulatif réception',
 'receipt_update_failed' => 'La confirmation de réception a échoué',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Téléchargements récents',
 'reception' => 'Réception',
 'reception_acknowleged' => 'Réception confirmée',
@@ -2373,6 +2378,9 @@ Nom : [username]
 'task_core_expireddocs_email' => 'E-mail',
 'task_core_expireddocs_peruser' => 'Par utilisateur',
 'task_core_indexingdocs_recreate' => 'Régénérer l’index',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'Description',
 'task_disabled' => 'Désactivée',
 'task_frequency' => 'Fréquence',
@@ -2480,6 +2488,7 @@ URL : [url]</p>',
 'unlock_cause_locking_user' => 'Vous pouvez encore le mettre à jour, car vous êtes le seul à l\'avoir verrouillé. Le verrouillage sera automatiquement annulé.',
 'unlock_document' => 'Déverrouiller',
 'update' => 'Mettre à jour',
+'updated_documents' => '',
 'update_approvers' => 'Mettre à jour la liste des approbateurs',
 'update_document' => 'Mettre à jour',
 'update_fulltext_index' => 'Mettre à jour l\'index de recherche plein texte',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index ddfaf7e96..41b77d362 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -864,6 +864,9 @@ Internet poveznica: [url]',
 'language' => 'Jezik',
 'lastaccess' => 'Zadnji pristup',
 'last_update' => 'Zadnje ažuriranje',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Kazalo',
 'librarydoc' => 'Dokument iz biblioteke',
 'linked_documents' => 'Vezani dokumenti',
@@ -958,6 +961,7 @@ Internet poveznica: [url]',
 'new_attrdef' => 'Dodaj definiciju atributa',
 'new_default_keywords' => 'Dodaj ključne riječi',
 'new_default_keyword_category' => 'Dodaj kategoriju',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Dodaj kategoriju',
@@ -1164,6 +1168,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Sažetak prijema',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Poslijedni Prenosi',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -2019,6 +2024,9 @@ Internet poveznica: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2115,6 +2123,7 @@ Internet poveznica: [url]',
 'unlock_cause_locking_user' => 'I dalje ga možete ažurirati jer ste ga vi zaključali. Zaključavanje će automatski biti ukinuto.',
 'unlock_document' => 'Otključaj',
 'update' => 'Ažuriraj',
+'updated_documents' => '',
 'update_approvers' => 'Ažuriraj popis validatora',
 'update_document' => 'Ažuriraj dokument',
 'update_fulltext_index' => 'Ažuriraj indeksiranje cijelog teksta',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index e78e70581..a61cbba7d 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -859,6 +859,9 @@ URL: [url]',
 'language' => 'Nyelv',
 'lastaccess' => 'Utolsó hozzáférés',
 'last_update' => 'Utolsó frissítés',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Jelmagyarázat',
 'librarydoc' => '',
 'linked_documents' => 'Kapcsolódó dokumentumok',
@@ -953,6 +956,7 @@ URL: [url]',
 'new_attrdef' => 'Jellemző meghatározás hozzáadása',
 'new_default_keywords' => 'Kulcsszó hozzáadása',
 'new_default_keyword_category' => 'Kategória hozzáadása',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Kategória hozzáadása',
@@ -1160,6 +1164,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Legutóbbi feltöltések',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -1997,6 +2002,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2093,6 +2101,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Ön még módosíthatja mivel egyike azoknak akik zárolták. A zárolás automatikusan el lesz távolítva.',
 'unlock_document' => 'Felszabadít',
 'update' => 'Frissítés',
+'updated_documents' => '',
 'update_approvers' => 'Jóváhagyók listájának frissítése',
 'update_document' => 'Dokumentum frissítése',
 'update_fulltext_index' => 'Teljes szöveg index frissítése',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index 81755dac7..311c7edff 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -915,6 +915,9 @@ URL: [url]</p>',
 'language' => 'Bahasa',
 'lastaccess' => 'Akses terakhir',
 'last_update' => 'Pembaharuan Terakhir',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Dokumen dari perpustakaan',
 'linked_documents' => 'Dokumen Terkait',
@@ -1009,6 +1012,7 @@ URL: [url]</p>',
 'new_attrdef' => 'Tambah definisi label',
 'new_default_keywords' => 'Tambah kata kunci',
 'new_default_keyword_category' => 'Tambah kategori',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Tambah kategori',
@@ -1258,6 +1262,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '[sitename]: [name] - Tanda terima yang dikirimkan',
 'receipt_summary' => 'Ringkasan tanda terima',
 'receipt_update_failed' => 'Mengakui penerimaan gagal',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Unggahan Terbaru',
 'reception' => 'Penerimaan',
 'reception_acknowleged' => 'Penerimaan diakui',
@@ -2071,6 +2076,9 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'Deskripsi',
 'task_disabled' => 'Nonaktif',
 'task_frequency' => 'Frekuensi',
@@ -2158,6 +2166,7 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'unlock_cause_locking_user' => '',
 'unlock_document' => 'Membuka kunci',
 'update' => 'Perbarui',
+'updated_documents' => '',
 'update_approvers' => 'Perbarui Daftar Penyetuju',
 'update_document' => 'Perbarui dokumen',
 'update_fulltext_index' => 'Perbarui indek fulltext',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index a0e6a13bf..8c398c084 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -869,6 +869,9 @@ URL: [url]',
 'language' => 'Lingua',
 'lastaccess' => 'Ultimo accesso',
 'last_update' => 'Ultima modifica',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Documento da cartella',
 'linked_documents' => 'Documenti collegati',
@@ -963,6 +966,7 @@ URL: [url]',
 'new_attrdef' => 'Nuovo attributo',
 'new_default_keywords' => 'Aggiungi parole-chiave',
 'new_default_keyword_category' => 'Nuova categoria',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Nuova categoria',
@@ -1181,6 +1185,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Sommario ricezione',
 'receipt_update_failed' => 'Conferma della ricezione non riuscita',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Caricamenti recenti',
 'reception' => 'Ricezione',
 'reception_acknowleged' => 'Ricezione confermata',
@@ -2046,6 +2051,9 @@ Name: [username]
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'Descrizione',
 'task_disabled' => 'Disabilitata',
 'task_frequency' => 'Frequenza',
@@ -2142,6 +2150,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Puoi ancora aggiornarlo, perchè sei l\'utente che ha eseguito il blocco. Il blocco sarà rimosso automaticamente.',
 'unlock_document' => 'Sblocca',
 'update' => 'Aggiorna',
+'updated_documents' => '',
 'update_approvers' => 'Aggiornamento lista approvatori',
 'update_document' => 'Aggiorna documento',
 'update_fulltext_index' => 'Aggiorna indice fulltext',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index d3b657733..30de6ff79 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -865,6 +865,9 @@ URL: [url]',
 'language' => '언어',
 'lastaccess' => '마지막 액세스',
 'last_update' => '마지막 업데이트',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => '전설',
 'librarydoc' => '라이브러리의 문서',
 'linked_documents' => '관련 문서',
@@ -959,6 +962,7 @@ URL: [url]',
 'new_attrdef' => '속성 정의 추가',
 'new_default_keywords' => '키워드 추가',
 'new_default_keyword_category' => '카테고리 추가',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => '카테고리 추가',
@@ -1158,6 +1162,7 @@ URL : [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '접수증 요약',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => '최근 업로드들',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -2013,6 +2018,9 @@ URL : [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2109,6 +2117,7 @@ URL : [url]',
 'unlock_cause_locking_user' => '당신은 여전히 업데이트 할 수 있습니다. 잠금이 자동으로 제거됩니다.',
 'unlock_document' => '잠금풀기',
 'update' => '업데이트',
+'updated_documents' => '',
 'update_approvers' => '승인자의 업데이트 목록',
 'update_document' => '문서 갱신하기',
 'update_fulltext_index' => '업데이트 전체 텍스트 색인',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 6fab15352..96f47577f 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -862,6 +862,9 @@ URL: [url]',
 'language' => 'ພາສາ',
 'lastaccess' => 'ເຂົາຄັ້ງລ້າສຸດ',
 'last_update' => 'ການອັບເດດຄັ້ງລ້າສຸດ',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'ຕຳນານ',
 'librarydoc' => 'ເອກະສານຈາກຫ້ອງສະໝຸດ',
 'linked_documents' => 'ເອກະສານທີ່ກ່ຽວຂອງ',
@@ -956,6 +959,7 @@ URL: [url]',
 'new_attrdef' => 'ເພີ່ມການຈຳກັດຄວາມຂອງແອັດທີບິວ',
 'new_default_keywords' => 'ເພີ່ມຄຳຫລັກ',
 'new_default_keyword_category' => 'ເພີ່ມຫມວດໝູ່',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'ເພີ່ມຫມວດໝູ່',
@@ -1174,6 +1178,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'ສະຫຼູບໃບບິນ',
 'receipt_update_failed' => 'ການຍອມຮັບສັນຍານບໍ່ສຳເລັດ',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => '',
 'reception' => 'ພະແນກຕ້ອນຮັບ',
 'reception_acknowleged' => 'ຄວາມຮັບຮູ້ກ່ຽວກັບການຕ້ອນຮັບ',
@@ -2039,6 +2044,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2135,6 +2143,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'ເຈົ້າຍັງສາມາດອັບເດດໄດ້ເນື່ອງຈາກເຈົ້າເປັນຄົນລັອກຂໍ້ມູນນັ້ນ ການລັອກຈະຖືກປົດອອກໂດຍອັດຕະໂນມັດ',
 'unlock_document' => 'ປົດລັອກ',
 'update' => 'ປັບປຸງ',
+'updated_documents' => '',
 'update_approvers' => 'ອັບເດດລາຍຊື່ຜູ້ອະນຸມັດ',
 'update_document' => 'ອັບເດດເອກະສານ',
 'update_fulltext_index' => 'ອັບເດດດັດຊະນີຂໍ້ຄວາມແບບເຕັມຮູບແບບ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 8a4bd4350..358a27671 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -883,6 +883,9 @@ URL: [url]',
 'language' => 'Språk',
 'lastaccess' => 'Siste tilgang',
 'last_update' => 'Siste oppdatering',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Innholdsfortegnelse',
 'librarydoc' => 'Dokumenter fra biblioteket',
 'linked_documents' => 'Relaterte dokumenter',
@@ -977,6 +980,7 @@ URL: [url]',
 'new_attrdef' => 'Legg til egenskapsdefinisjon',
 'new_default_keywords' => 'Legg til søkeord',
 'new_default_keyword_category' => 'Legg til kategori for søkeord',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Legg til kategori',
@@ -1189,6 +1193,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Kvitteringssammendrag',
 'receipt_update_failed' => 'Bekreftelse av mottak mislyktes',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Nylige opplastinger',
 'reception' => 'Mottak',
 'reception_acknowleged' => 'Mottaket erkjent',
@@ -2052,6 +2057,9 @@ Bruker: [username]
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'Beskrivelse',
 'task_disabled' => 'Deaktivert',
 'task_frequency' => 'Frekvens',
@@ -2148,6 +2156,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Du kan fortsatt oppdatere den fordi du også er den som låste den. Låsen fjernes automatisk.',
 'unlock_document' => 'Lås opp',
 'update' => 'Opptatere',
+'updated_documents' => '',
 'update_approvers' => 'Oppdater liste over godkjennere',
 'update_document' => 'Oppdater dokumentet',
 'update_fulltext_index' => 'Oppdater fulltekstindeksen',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 5fc545804..5bf85e6bc 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -876,6 +876,9 @@ URL: [url]',
 'language' => 'Talen',
 'lastaccess' => 'laatste toegang',
 'last_update' => 'Laatste Update',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Bibliotheek',
 'linked_documents' => 'Gerelateerde Documenten',
@@ -970,6 +973,7 @@ URL: [url]',
 'new_attrdef' => 'Voeg een attribuutdefinitie toe',
 'new_default_keywords' => 'Sleutelwoorden toevoegen',
 'new_default_keyword_category' => 'Categorie Toevoegen',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Categorie toevoegen',
@@ -1188,6 +1192,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Samenvatting',
 'receipt_update_failed' => 'Update ontvangst mislukt',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Recent Uploads',
 'reception' => 'bestemming',
 'reception_acknowleged' => 'bestemming OK',
@@ -2051,6 +2056,9 @@ Name: [username]
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'Omschrijving',
 'task_disabled' => 'Inactief',
 'task_frequency' => 'Frequentie',
@@ -2147,6 +2155,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'U kunt toch e.e.a. bijwerken omdat U degene bent die dit heeft geblokeerd. Blokkering wordt automatisch opgeheven.',
 'unlock_document' => 'De-blokkeer',
 'update' => 'Bijwerken',
+'updated_documents' => '',
 'update_approvers' => 'Bijwerken lijst van [Goedkeurders]',
 'update_document' => 'Bijwerken',
 'update_fulltext_index' => 'Index voor fulltext search bijwerken',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 1df84f033..2e6137c0f 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -852,6 +852,9 @@ URL: [url]',
 'language' => 'Język',
 'lastaccess' => 'Ostatni dostęp',
 'last_update' => 'Ostatnia aktualizacja',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Nie zmieniaj',
 'linked_documents' => 'Powiązane dokumenty',
@@ -946,6 +949,7 @@ URL: [url]',
 'new_attrdef' => 'Dodaj definicję atrybutu',
 'new_default_keywords' => 'Dodaj słowa kluczowe',
 'new_default_keyword_category' => 'Dodaj kategorię',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Dodaj kategorię',
@@ -1153,6 +1157,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Podsumowanie odbioru',
 'receipt_update_failed' => 'Potwierdzenie odbioru nie powiodło się',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Najnowsze dodania',
 'reception' => 'Przyjęcie',
 'reception_acknowleged' => 'Odbiór potwierdzony',
@@ -1982,6 +1987,9 @@ Name: [username]
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'Opis zadania',
 'task_disabled' => 'Zadanie wyłączone',
 'task_frequency' => 'Częstotliwość zadania',
@@ -2078,6 +2086,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Nadal możesz zaktualizować dokument ponieważ jesteś też osobą, która go zablokowała. Blokada będzie automatycznie zdjęta.',
 'unlock_document' => 'Odblokuj',
 'update' => 'Uaktualnij',
+'updated_documents' => '',
 'update_approvers' => 'Aktualizuj listę osób zatwierdzających',
 'update_document' => 'Aktualizuj dokument',
 'update_fulltext_index' => 'Aktualizuj indeks pełnotekstowy',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 6233df42f..a8ac5a971 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -883,6 +883,9 @@ URL: [url]',
 'language' => 'Idioma',
 'lastaccess' => 'Último acesso',
 'last_update' => 'Última versão',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Documento da biblioteca',
 'linked_documents' => 'Documentos relacionados',
@@ -977,6 +980,7 @@ URL: [url]',
 'new_attrdef' => 'Adicionar definição de atributo',
 'new_default_keywords' => 'Adicionar palavras-chave',
 'new_default_keyword_category' => 'Adicionar categoria',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Adicionar categoria',
@@ -1194,6 +1198,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Resumo da entrada',
 'receipt_update_failed' => 'Confirmação de entrada falhou',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Uploads recentes',
 'reception' => 'Entrada',
 'reception_acknowleged' => 'Entrada reconhecida',
@@ -2058,6 +2063,9 @@ Nome: [username]
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'Descrição',
 'task_disabled' => 'Desativado',
 'task_frequency' => 'Frequência',
@@ -2154,6 +2162,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Você pode pode atualizá-lo, porque você o travou também. A trava será automaticamente removida.',
 'unlock_document' => 'Remover trava',
 'update' => 'Atualizar',
+'updated_documents' => '',
 'update_approvers' => 'Atualizar lista de aprovadores',
 'update_document' => 'Atualizar',
 'update_fulltext_index' => 'Índice de atualização de texto completo',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index e61151bf2..8c73e8ffe 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -864,6 +864,9 @@ URL: [url]',
 'language' => 'Limbă',
 'lastaccess' => 'Ultima accesare',
 'last_update' => 'Ultima actualizare',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Legendă',
 'librarydoc' => '',
 'linked_documents' => 'Documente relationate',
@@ -958,6 +961,7 @@ URL: [url]',
 'new_attrdef' => 'Adaugă definitie atribut',
 'new_default_keywords' => 'Adaugă cuvinte cheie',
 'new_default_keyword_category' => 'Adaugă categorie',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Adaugă categorie',
@@ -1165,6 +1169,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Incarcari recente',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -2020,6 +2025,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2116,6 +2124,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Puteți încă să-l actualizați pentru că sunteți cel care l-a blocat. Blocarea va fi eliminată automat.',
 'unlock_document' => 'Deblocare',
 'update' => 'Actualizare',
+'updated_documents' => '',
 'update_approvers' => 'Actualizare Listă de aprobatori',
 'update_document' => 'Actualizare document',
 'update_fulltext_index' => 'Actualizare index pe tot textul (fulltext index)',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 81d844a22..7c337eec2 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -864,6 +864,9 @@ URL: [url]',
 'language' => 'Язык',
 'lastaccess' => 'Последнее обращение',
 'last_update' => 'Последнее обновление',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Обозначения',
 'librarydoc' => 'Документ из библиотеки',
 'linked_documents' => 'Связанные документы',
@@ -958,6 +961,7 @@ URL: [url]',
 'new_attrdef' => 'Добавить определение атрибута',
 'new_default_keywords' => 'Добавить метки',
 'new_default_keyword_category' => 'Добавить метку',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Добавить категорию',
@@ -1167,6 +1171,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Сводка по получению',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Последние загрузки',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -2027,6 +2032,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2123,6 +2131,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Вы все ещё можете его обновить, потому что вы один из тех кто его заблокировал. Блокировка будет снята автоматически.',
 'unlock_document' => 'Разблокировать',
 'update' => 'Обновить',
+'updated_documents' => '',
 'update_approvers' => 'Обновить список утверждающих',
 'update_document' => 'Обновить документ',
 'update_fulltext_index' => 'Обновить полнотекстовый индекс',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index b96ae9129..d36543e41 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -883,6 +883,9 @@ URL: [url]',
 'language' => 'Jazyk',
 'lastaccess' => 'Posledný prístup',
 'last_update' => 'Posledná aktualizácia',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Dokument z knižnice',
 'linked_documents' => 'Súvisiace dokumenty',
@@ -977,6 +980,7 @@ URL: [url]',
 'new_attrdef' => 'Pridať definíciu atribútu',
 'new_default_keywords' => 'Pridať kľúčové slová',
 'new_default_keyword_category' => 'Pridať kategóriu',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Pridať kategóriu',
@@ -1195,6 +1199,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Receipt summary',
 'receipt_update_failed' => 'Acknowledging reception failed',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Naposledy nahrané súbory',
 'reception' => 'Reception',
 'reception_acknowleged' => 'Reception acknowledged',
@@ -2060,6 +2065,9 @@ Meno: [username]
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => 'Description',
 'task_disabled' => 'Disabled',
 'task_frequency' => 'Frequency',
@@ -2156,6 +2164,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Môžete ho stále aktualizovať, pretože ste ten, kto ho aj zamkol. Zámok bude automaticky odstránený.',
 'unlock_document' => 'Odomknúť',
 'update' => 'Aktualizovať',
+'updated_documents' => '',
 'update_approvers' => 'Aktualizovať zoznam schvaľovateľov',
 'update_document' => 'Aktualizovať',
 'update_fulltext_index' => 'Aktualizovať fulltext index',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index 411f7ac31..d4d93b638 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -870,6 +870,9 @@ URL: [url]',
 'language' => 'Språk',
 'lastaccess' => 'Senast åtkomst',
 'last_update' => 'Senast uppdaterat',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Förteckning',
 'librarydoc' => 'Dokument från bibliotek',
 'linked_documents' => 'Relaterade dokument',
@@ -964,6 +967,7 @@ URL: [url]',
 'new_attrdef' => 'Lägg till attributdefinition',
 'new_default_keywords' => 'Lägg till nyckelord',
 'new_default_keyword_category' => 'Lägg till nyckelordskategori',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Lägg till kategori',
@@ -1168,6 +1172,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Senast uppladdat',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -2033,6 +2038,9 @@ Kommentar: [comment]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2129,6 +2137,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Du kan fortfarande uppdatera, eftersom du är samma person som låste dokumentet. Låsningen kommer automatiskt att tas bort.',
 'unlock_document' => 'Lås upp',
 'update' => 'Uppdatera',
+'updated_documents' => '',
 'update_approvers' => 'Uppdatera lista med personer som godkänner',
 'update_document' => 'Uppdatera dokument',
 'update_fulltext_index' => 'Uppdatera fulltext-index',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index d9790fed2..e7bd31cc4 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -858,6 +858,9 @@ URL: [url]',
 'language' => 'Dil',
 'lastaccess' => 'Son erişim',
 'last_update' => 'Son Güncelleme',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Lejand',
 'librarydoc' => '',
 'linked_documents' => 'İlgili Dokümanlar',
@@ -952,6 +955,7 @@ URL: [url]',
 'new_attrdef' => 'Nitelik tanımı ekle',
 'new_default_keywords' => 'Anahtar kelime ekle',
 'new_default_keyword_category' => 'Kategori ekle',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Kategori ekle',
@@ -1161,6 +1165,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'En son yüklenenler',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -1999,6 +2004,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2095,6 +2103,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Bunu halen güncelleyebilirsiniz çünkü kilitleyen sizsiniz. Kilit otomatik olarak açılacaktır.',
 'unlock_document' => 'Kilidi aç',
 'update' => 'Güncelle',
+'updated_documents' => '',
 'update_approvers' => 'Onaylayanlar listesini güncelle',
 'update_document' => 'Doküman güncelle',
 'update_fulltext_index' => 'Tam metin indeksini güncelle',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 26f1f22ef..f84ee2db5 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -864,6 +864,9 @@ URL: [url]',
 'language' => 'Мова',
 'lastaccess' => 'Останній доступ',
 'last_update' => 'Останнє оновлення',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => 'Позначення',
 'librarydoc' => 'Документ з бібліотеки',
 'linked_documents' => 'Пов\'язані документи',
@@ -958,6 +961,7 @@ URL: [url]',
 'new_attrdef' => 'Додати визначення атрибуту',
 'new_default_keywords' => 'Додати ключові слова',
 'new_default_keyword_category' => 'Додати категорію ключових слів',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => 'Додати категорію',
@@ -1167,6 +1171,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => 'Підсумки отримання',
 'receipt_update_failed' => '',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => 'Останні завантаження',
 'reception' => '',
 'reception_acknowleged' => '',
@@ -2020,6 +2025,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '',
 'task_disabled' => '',
 'task_frequency' => '',
@@ -2116,6 +2124,7 @@ URL: [url]',
 'unlock_cause_locking_user' => 'Ви все ще можете його оновлювати, тому що ви один з тих, хто його заблокував. Блокування буде автоматично зняте.',
 'unlock_document' => 'Розблокувати',
 'update' => 'Оновити',
+'updated_documents' => '',
 'update_approvers' => 'Оновити список затверджувачів',
 'update_document' => 'Оновити документ',
 'update_fulltext_index' => 'Оновити повнотекстовий пошук',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index ca75a09c1..a2d7ebe3b 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -866,6 +866,9 @@ URL: [url]',
 'language' => '语言',
 'lastaccess' => '最后登录',
 'last_update' => '上次更新',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => '图例',
 'librarydoc' => '库内文件',
 'linked_documents' => '相关文档',
@@ -960,6 +963,7 @@ URL: [url]',
 'new_attrdef' => '添加属性',
 'new_default_keywords' => '添加关键字',
 'new_default_keyword_category' => '添加类别',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => '增加分类',
@@ -1172,6 +1176,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '收据的汇总',
 'receipt_update_failed' => '接收失败了',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => '最近上传',
 'reception' => '接待',
 'reception_acknowleged' => '确认接收',
@@ -2007,6 +2012,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '描述',
 'task_disabled' => '禁用',
 'task_frequency' => '频率',
@@ -2094,6 +2102,7 @@ URL: [url]',
 'unlock_cause_locking_user' => '您仍然可以更新，因为是您锁定了该文件. 锁定状态被自动解除.',
 'unlock_document' => '解锁',
 'update' => '更新',
+'updated_documents' => '',
 'update_approvers' => '更新审核人名单',
 'update_document' => '更新',
 'update_fulltext_index' => '更新全文索引',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 6fddaf52e..073a4fdc4 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -883,6 +883,9 @@ URL: [url]',
 'language' => '語言',
 'lastaccess' => '最後訪問',
 'last_update' => '上次更新',
+'latest_newdocuments' => '',
+'latest_statuschange' => '',
+'latest_updatedocuments' => '',
 'legend' => '說明',
 'librarydoc' => '文件庫',
 'linked_documents' => '相關文件',
@@ -977,6 +980,7 @@ URL: [url]',
 'new_attrdef' => '新增屬性',
 'new_default_keywords' => '新增關鍵字',
 'new_default_keyword_category' => '新增類別',
+'new_documents' => '',
 'new_documents_today' => '',
 'new_documents_yesterday' => '',
 'new_document_category' => '增加分類',
@@ -1193,6 +1197,7 @@ URL: [url]',
 'receipt_submit_email_subject' => '',
 'receipt_summary' => '收據摘要',
 'receipt_update_failed' => '確認接收失敗',
+'recentchanges_mail_subject' => '',
 'recent_uploads' => '最近上傳',
 'reception' => '接待處',
 'reception_acknowleged' => '接待確認',
@@ -2058,6 +2063,9 @@ URL: [url]',
 'task_core_expireddocs_email' => '',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
+'task_core_recentchanges_days' => '',
+'task_core_recentchanges_users' => '',
+'task_core_statistic_users' => '',
 'task_description' => '描述',
 'task_disabled' => '不啟用',
 'task_frequency' => '頻率',
@@ -2154,6 +2162,7 @@ URL: [url]',
 'unlock_cause_locking_user' => '您仍然可以更新，因為是您鎖定了該檔. 鎖定狀態被自動解除.',
 'unlock_document' => '解鎖',
 'update' => '更新',
+'updated_documents' => '',
 'update_approvers' => '更新審核人名單',
 'update_document' => '更新',
 'update_fulltext_index' => '更新全文索引',

From 3bef98756a771af0dbc4496f42324997105536e9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 12:21:24 +0200
Subject: [PATCH 1919/2006] fix call of SeedDMS_AccessOperation()

---
 out/out.Dashboard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Dashboard.php b/out/out.Dashboard.php
index 879e94d55..73d272179 100644
--- a/out/out.Dashboard.php
+++ b/out/out.Dashboard.php
@@ -12,7 +12,7 @@ require_once("inc/inc.ClassUI.php");
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
-$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
+$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
 
 if($view) {
 	$view->setParam('fulltextservice', $fulltextservice);

From f63f7847f043d3239ab259b26e43a6339f22d993 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 14:30:20 +0200
Subject: [PATCH 1920/2006] lists of recent changes can be configured

---
 inc/inc.Tasks.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index ba43d1813..94ef93b37 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -763,15 +763,20 @@ class SeedDMS_RecentChangesTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 		} else {
 			$users = $dms->getAllUsers();
 		}
+		if(!empty($taskparams['lists'])) {
+			$lists = $taskparams['lists'];
+		} else {
+			$lists = ['newdocuments', 'updateddocuments', 'statuschange'];
+		}
 		$docs = [];
-		foreach(['newdocuments', 'updateddocuments', 'statuschange'] as $dt) {
+		foreach($lists as $dt) {
 			$docs[$dt] = $dms->getLatestChanges($dt, mktime(0, 0, 0)-intval($taskparams['days'])*86400, time());
 		}
 		foreach($users as $u) {
 			if(!$u->isGuest() && !$u->isDisabled()) {
 				$body = '';
 				$bodyhtml = '';
-				foreach(['newdocuments', 'updateddocuments', 'statuschange'] as $dt) {
+				foreach($lists as $dt) {
 					$params = array();
 					$bodyhtml .= "<h2>".getMLText('latest_'.$dt)."</h2>".PHP_EOL;
 					$ds = SeedDMS_Core_DMS::filterAccess($docs[$dt], $u, M_READ);
@@ -810,13 +815,20 @@ class SeedDMS_RecentChangesTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 			array(
 				'name'=>'days',
 				'type'=>'integer',
-				'description'=> 'Number of days to check for. Negative values will look into the past. 0 will just check for documents expiring the current day. Keep in mind that the document is still valid on the expiration date.',
+				'description'=> 'Number of days to look back.',
+			),
+			array(
+				'name'=>'lists',
+				'type'=>'select',
+				'description'=>'Number of days to look back.',
+				'multiple'=>true,
+				'options'=>[['newdocuments', getMLText('latest_newdocuments')], ['updateddocuments', getMLText('latest_updateddocuments')], ['statuschange', getMLText('latest_statuschange')]],
 			),
 			array(
 				'name'=>'users',
 				'type'=>'users',
 				'multiple'=>true,
-				'description'=> 'Send list of recently changed documents to this users',
+				'description'=> 'Send list of recently changed or added documents to this users',
 			)
 		);
 	} /* }}} */

From 00f7a0ee35b0dc96710eb78512384c9497fee685 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 14:30:46 +0200
Subject: [PATCH 1921/2006] some code cleanups

---
 views/bootstrap/class.SchedulerTaskMgr.php | 44 +++++++++++++---------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/views/bootstrap/class.SchedulerTaskMgr.php b/views/bootstrap/class.SchedulerTaskMgr.php
index 99e8137d0..1e046b536 100644
--- a/views/bootstrap/class.SchedulerTaskMgr.php
+++ b/views/bootstrap/class.SchedulerTaskMgr.php
@@ -250,8 +250,8 @@ $(document).ready( function() {
 							array(
 								'element'=>'select',
 								'class'=>'chzn-select',
-								'name'=>'params['.$param['name'].']',
-								'multiple'=>false,
+								'name'=>'params['.$param['name'].']'.(!empty($param['multiple']) ? '[]' : ''),
+								'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
 								'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
 								'options'=>$param['options'],
 							),
@@ -282,6 +282,9 @@ $(document).ready( function() {
 								'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
 								'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
 								'options'=>$options
+							),
+							array(
+								'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 							)
 						);
 						break;
@@ -327,7 +330,9 @@ $(document).ready( function() {
 			return;
 		}
 
-		$taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()];
+		$extname = $task->getExtension();
+		$taskname = $task->getTask();
+		$taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$extname][$taskname];
 		$taskobj = resolveTask($taskobj);
 		if(!is_object($taskobj)) {
 			$this->errorMsg(getMLText('task_class_not_callable'));
@@ -338,12 +343,12 @@ $(document).ready( function() {
 	<?=	createHiddenFieldWithKey('edittask') ?>
 	<input type="hidden" name="action" value="edittask">
 	<input type="hidden" name="taskid" value="<?= $taskid ?>">
-	<input type="hidden" name="extension" value="<?= $task->getExtension() ?>">
-	<input type="hidden" name="task" value="<?= $task->getTask() ?>">
+	<input type="hidden" name="extension" value="<?= $extname ?>">
+	<input type="hidden" name="task" value="<?= $taskname ?>">
 <?php
 		$this->formField(
 			getMLText('scheduler_class'),
-			$task->getExtension()
+			$extname
 		);
 		$this->formField(
 			getMLText('task_name'),
@@ -395,7 +400,7 @@ $(document).ready( function() {
 				switch($param['type']) {
 				case 'boolean':
 					$this->formField(
-						getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
+						getMLText("task_".$extname."_".$taskname."_".$param['name']),
 						array(
 							'element'=>'input',
 							'type'=>'checkbox',
@@ -405,13 +410,13 @@ $(document).ready( function() {
 							'checked'=>$task->getParameter($param['name']) == 1,
 						),
 						array(
-							'help'=>$param['description']
+							'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 						)
 					);
 					break;
 				case 'password':
 					$this->formField(
-						getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
+						getMLText("task_".$extname."_".$taskname."_".$param['name']),
 						array(
 							'element'=>'input',
 							'type'=>'password',
@@ -421,7 +426,7 @@ $(document).ready( function() {
 							'required'=>false
 						),
 						array(
-							'help'=>$param['description']
+							'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 						)
 					);
 					break;
@@ -431,11 +436,11 @@ $(document).ready( function() {
 					else
 						$vals = [$task->getParameter()[$param['name']]];
 					foreach($param['options'] as &$opt) {
-						if(in_array($opt[0], $vals))
+						if($opt[0] && in_array($opt[0], $vals))
 							$opt[2] = true;
 					}
 					$this->formField(
-						getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
+						getMLText('task_'.$extname."_".$taskname."_".$param['name']),
 						array(
 							'element'=>'select',
 							'class'=>'chzn-select',
@@ -445,15 +450,15 @@ $(document).ready( function() {
 							'options'=>$param['options'],
 						),
 						array(
-							'help'=>$param['description']
+							'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 						)
 					);
 					break;
 				case "folder":
 					$folderid = $task->getParameter()[$param['name']];
 					$this->formField(
-						getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
-					 	$this->getFolderChooserHtml("form".$task->getExtension().$taskid, M_READ, -1, $folderid ? $dms->getFolder($folderid) : 0, 'params['.$param['name']."]")
+						getMLText('task_'.$extname."_".$taskname."_".$param['name']),
+					 	$this->getFolderChooserHtml("form".$extname.$taskid, M_READ, -1, $folderid ? $dms->getFolder($folderid) : 0, 'params['.$param['name']."]")
 					);
 					break;
 				case "users":
@@ -468,7 +473,7 @@ $(document).ready( function() {
 							$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin().' - '.$currUser->getFullName()), in_array($currUser->getID(), $userids), array(array('data-subtitle', htmlspecialchars($currUser->getEmail()))));
 					}
 					$this->formField(
-						getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
+						getMLText('task_'.$extname."_".$taskname."_".$param['name']),
 						array(
 							'element'=>'select',
 							'class'=>'chzn-select',
@@ -476,12 +481,15 @@ $(document).ready( function() {
 							'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
 							'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
 							'options'=>$options
+						),
+						array(
+							'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 						)
 					);
 					break;
 				default:
 					$this->formField(
-						getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
+						getMLText("task_".$extname."_".$taskname."_".$param['name']),
 						array(
 							'element'=>'input',
 							'type'=>(($param['type'] == 'integer') ? 'number' : 'text'),
@@ -491,7 +499,7 @@ $(document).ready( function() {
 							'required'=>false
 						),
 						array(
-							'help'=>$param['description']
+							'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
 						)
 					);
 					break;

From ad1d723650b4fd7b90103e7a3c38d46b6be386fa Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 14:34:27 +0200
Subject: [PATCH 1922/2006] new translations

---
 languages/ar_EG/lang.inc | 3 ++-
 languages/bg_BG/lang.inc | 3 ++-
 languages/ca_ES/lang.inc | 3 ++-
 languages/cs_CZ/lang.inc | 3 ++-
 languages/de_DE/lang.inc | 5 +++--
 languages/el_GR/lang.inc | 3 ++-
 languages/en_GB/lang.inc | 5 +++--
 languages/es_ES/lang.inc | 3 ++-
 languages/fr_FR/lang.inc | 3 ++-
 languages/hr_HR/lang.inc | 3 ++-
 languages/hu_HU/lang.inc | 3 ++-
 languages/id_ID/lang.inc | 3 ++-
 languages/it_IT/lang.inc | 3 ++-
 languages/ko_KR/lang.inc | 3 ++-
 languages/lo_LA/lang.inc | 3 ++-
 languages/nb_NO/lang.inc | 3 ++-
 languages/nl_NL/lang.inc | 3 ++-
 languages/pl_PL/lang.inc | 3 ++-
 languages/pt_BR/lang.inc | 3 ++-
 languages/ro_RO/lang.inc | 3 ++-
 languages/ru_RU/lang.inc | 3 ++-
 languages/sk_SK/lang.inc | 3 ++-
 languages/sv_SE/lang.inc | 3 ++-
 languages/tr_TR/lang.inc | 3 ++-
 languages/uk_UA/lang.inc | 3 ++-
 languages/zh_CN/lang.inc | 3 ++-
 languages/zh_TW/lang.inc | 3 ++-
 27 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index f1269789b..6ece51e4e 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -854,7 +854,7 @@ URL: [url]',
 'last_update' => 'اخر تحديث',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'الدليل',
 'librarydoc' => 'مستندات المكتبة',
 'linked_documents' => 'مستندات متعلقة',
@@ -1989,6 +1989,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'تفصيل المهام',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 54afd2de3..2c2eef7ef 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -783,7 +783,7 @@ $text = array(
 'last_update' => 'Последно обновление',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'легенда',
 'librarydoc' => '',
 'linked_documents' => 'Свързани документи',
@@ -1852,6 +1852,7 @@ $text = array(
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index e1f1176dc..0b42d14e6 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -788,7 +788,7 @@ URL: [url]',
 'last_update' => 'Última modificació',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Llegenda',
 'librarydoc' => '',
 'linked_documents' => 'Documents relacionats',
@@ -1857,6 +1857,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 44c3029d8..ce128dc2b 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -885,7 +885,7 @@ URL: [url]',
 'last_update' => 'Naposledy aktualizoval',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Popisek',
 'librarydoc' => 'Dokument z knihovny',
 'linked_documents' => 'Související dokumenty',
@@ -2061,6 +2061,7 @@ Jméno: [username]
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'Popis',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 328127b63..1c0560ba8 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3199), dgrutsch (22)
+//    Translators: Admin (3200), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1028,7 +1028,7 @@ URL: [url]</p>',
 'last_update' => 'Letzte Aktualisierung',
 'latest_newdocuments' => 'Zuletzt angelegte Dokumente',
 'latest_statuschange' => 'Zuletzt geänderter Status',
-'latest_updatedocuments' => 'Zuletzt aktualisierte Dokumente',
+'latest_updateddocuments' => 'Zuletzt aktualisierte Dokumente',
 'legend' => 'Legende',
 'librarydoc' => 'Dokument aus Bibliothek',
 'linked_documents' => 'verknüpfte Dokumente',
@@ -2393,6 +2393,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'task_core_expireddocs_peruser' => 'Pro Benutzer',
 'task_core_indexingdocs_recreate' => 'Index neu erzeugen',
 'task_core_recentchanges_days' => 'Tage',
+'task_core_recentchanges_lists' => 'Listen',
 'task_core_recentchanges_users' => 'Benutzer',
 'task_core_statistic_users' => 'Benutzer',
 'task_description' => 'Beschreibung',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 693ac8e8f..faa0493f5 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -783,7 +783,7 @@ $text = array(
 'last_update' => 'Τελευταία Αναναίωση',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Ιστορικό',
 'librarydoc' => '',
 'linked_documents' => 'Σχετικά Έγγραφα',
@@ -1863,6 +1863,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 7f35f4432..e3bdc656c 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2293), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2294), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1029,7 +1029,7 @@ URL: [url]</p>',
 'last_update' => 'Last Update',
 'latest_newdocuments' => 'Latest added documents',
 'latest_statuschange' => 'Latest status change',
-'latest_updatedocuments' => 'Latest updated documents',
+'latest_updateddocuments' => 'Latest updated documents',
 'legend' => 'Legend',
 'librarydoc' => 'Document from library',
 'linked_documents' => 'Related Documents',
@@ -2396,6 +2396,7 @@ If you did not receive a password, please use the password forgotten function on
 'task_core_expireddocs_peruser' => 'Per user',
 'task_core_indexingdocs_recreate' => 'Recreate index',
 'task_core_recentchanges_days' => 'Days',
+'task_core_recentchanges_lists' => 'Lists',
 'task_core_recentchanges_users' => 'Users',
 'task_core_statistic_users' => 'Users',
 'task_description' => 'Description',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 5a923d443..3b514793f 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -873,7 +873,7 @@ URL: [url]',
 'last_update' => 'Última modificación',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Leyenda',
 'librarydoc' => '',
 'linked_documents' => 'Documentos relacionados',
@@ -2016,6 +2016,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 8134c8564..d51073b8c 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1015,7 +1015,7 @@ URL : [url]</p>',
 'last_update' => 'Dernière modification',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Légende',
 'librarydoc' => 'Document de la bibliothèque',
 'linked_documents' => 'Documents liés',
@@ -2379,6 +2379,7 @@ Nom : [username]
 'task_core_expireddocs_peruser' => 'Par utilisateur',
 'task_core_indexingdocs_recreate' => 'Régénérer l’index',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'Description',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 41b77d362..34e50da7b 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -866,7 +866,7 @@ Internet poveznica: [url]',
 'last_update' => 'Zadnje ažuriranje',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Kazalo',
 'librarydoc' => 'Dokument iz biblioteke',
 'linked_documents' => 'Vezani dokumenti',
@@ -2025,6 +2025,7 @@ Internet poveznica: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index a61cbba7d..77aeeee9e 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -861,7 +861,7 @@ URL: [url]',
 'last_update' => 'Utolsó frissítés',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Jelmagyarázat',
 'librarydoc' => '',
 'linked_documents' => 'Kapcsolódó dokumentumok',
@@ -2003,6 +2003,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index 311c7edff..08e08a449 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -917,7 +917,7 @@ URL: [url]</p>',
 'last_update' => 'Pembaharuan Terakhir',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Dokumen dari perpustakaan',
 'linked_documents' => 'Dokumen Terkait',
@@ -2077,6 +2077,7 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'Deskripsi',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 8c398c084..327a951ea 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -871,7 +871,7 @@ URL: [url]',
 'last_update' => 'Ultima modifica',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Documento da cartella',
 'linked_documents' => 'Documenti collegati',
@@ -2052,6 +2052,7 @@ Name: [username]
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'Descrizione',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 30de6ff79..9e0f6e0c3 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -867,7 +867,7 @@ URL: [url]',
 'last_update' => '마지막 업데이트',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => '전설',
 'librarydoc' => '라이브러리의 문서',
 'linked_documents' => '관련 문서',
@@ -2019,6 +2019,7 @@ URL : [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 96f47577f..1bb076632 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -864,7 +864,7 @@ URL: [url]',
 'last_update' => 'ການອັບເດດຄັ້ງລ້າສຸດ',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'ຕຳນານ',
 'librarydoc' => 'ເອກະສານຈາກຫ້ອງສະໝຸດ',
 'linked_documents' => 'ເອກະສານທີ່ກ່ຽວຂອງ',
@@ -2045,6 +2045,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 358a27671..82d304291 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -885,7 +885,7 @@ URL: [url]',
 'last_update' => 'Siste oppdatering',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Innholdsfortegnelse',
 'librarydoc' => 'Dokumenter fra biblioteket',
 'linked_documents' => 'Relaterte dokumenter',
@@ -2058,6 +2058,7 @@ Bruker: [username]
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'Beskrivelse',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 5bf85e6bc..b9c233718 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -878,7 +878,7 @@ URL: [url]',
 'last_update' => 'Laatste Update',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Bibliotheek',
 'linked_documents' => 'Gerelateerde Documenten',
@@ -2057,6 +2057,7 @@ Name: [username]
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'Omschrijving',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 2e6137c0f..604a82c3b 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -854,7 +854,7 @@ URL: [url]',
 'last_update' => 'Ostatnia aktualizacja',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Nie zmieniaj',
 'linked_documents' => 'Powiązane dokumenty',
@@ -1988,6 +1988,7 @@ Name: [username]
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'Opis zadania',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index a8ac5a971..3ec9716ef 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -885,7 +885,7 @@ URL: [url]',
 'last_update' => 'Última versão',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Documento da biblioteca',
 'linked_documents' => 'Documentos relacionados',
@@ -2064,6 +2064,7 @@ Nome: [username]
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'Descrição',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 8c73e8ffe..49c3ad916 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -866,7 +866,7 @@ URL: [url]',
 'last_update' => 'Ultima actualizare',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Legendă',
 'librarydoc' => '',
 'linked_documents' => 'Documente relationate',
@@ -2026,6 +2026,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 7c337eec2..f5d41a43d 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -866,7 +866,7 @@ URL: [url]',
 'last_update' => 'Последнее обновление',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Обозначения',
 'librarydoc' => 'Документ из библиотеки',
 'linked_documents' => 'Связанные документы',
@@ -2033,6 +2033,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index d36543e41..1cbc2d0de 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -885,7 +885,7 @@ URL: [url]',
 'last_update' => 'Posledná aktualizácia',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Legenda',
 'librarydoc' => 'Dokument z knižnice',
 'linked_documents' => 'Súvisiace dokumenty',
@@ -2066,6 +2066,7 @@ Meno: [username]
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => 'Description',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index d4d93b638..ebd12c759 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -872,7 +872,7 @@ URL: [url]',
 'last_update' => 'Senast uppdaterat',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Förteckning',
 'librarydoc' => 'Dokument från bibliotek',
 'linked_documents' => 'Relaterade dokument',
@@ -2039,6 +2039,7 @@ Kommentar: [comment]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index e7bd31cc4..7efddae74 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -860,7 +860,7 @@ URL: [url]',
 'last_update' => 'Son Güncelleme',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Lejand',
 'librarydoc' => '',
 'linked_documents' => 'İlgili Dokümanlar',
@@ -2005,6 +2005,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index f84ee2db5..74daa635d 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -866,7 +866,7 @@ URL: [url]',
 'last_update' => 'Останнє оновлення',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => 'Позначення',
 'librarydoc' => 'Документ з бібліотеки',
 'linked_documents' => 'Пов\'язані документи',
@@ -2026,6 +2026,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index a2d7ebe3b..0cf1617a5 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -868,7 +868,7 @@ URL: [url]',
 'last_update' => '上次更新',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => '图例',
 'librarydoc' => '库内文件',
 'linked_documents' => '相关文档',
@@ -2013,6 +2013,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '描述',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 073a4fdc4..d74b9c76a 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -885,7 +885,7 @@ URL: [url]',
 'last_update' => '上次更新',
 'latest_newdocuments' => '',
 'latest_statuschange' => '',
-'latest_updatedocuments' => '',
+'latest_updateddocuments' => '',
 'legend' => '說明',
 'librarydoc' => '文件庫',
 'linked_documents' => '相關文件',
@@ -2064,6 +2064,7 @@ URL: [url]',
 'task_core_expireddocs_peruser' => '',
 'task_core_indexingdocs_recreate' => '',
 'task_core_recentchanges_days' => '',
+'task_core_recentchanges_lists' => '',
 'task_core_recentchanges_users' => '',
 'task_core_statistic_users' => '',
 'task_description' => '描述',

From e3cc28916d59bddfafc6e4a3e1940ed991d7ab6c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 14:36:22 +0200
Subject: [PATCH 1923/2006] change description of parameter 'lists'

---
 inc/inc.Tasks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 94ef93b37..2ead6bf92 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -820,7 +820,7 @@ class SeedDMS_RecentChangesTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 			array(
 				'name'=>'lists',
 				'type'=>'select',
-				'description'=>'Number of days to look back.',
+				'description'=>'Document lists to be included.',
 				'multiple'=>true,
 				'options'=>[['newdocuments', getMLText('latest_newdocuments')], ['updateddocuments', getMLText('latest_updateddocuments')], ['statuschange', getMLText('latest_statuschange')]],
 			),

From 752653a2b3879fd97e68f25901903a3e066106c2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 6 Apr 2023 18:54:08 +0200
Subject: [PATCH 1924/2006] add link to document in recent changes and expired
 documents

---
 inc/inc.Tasks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/inc.Tasks.php b/inc/inc.Tasks.php
index 2ead6bf92..a13584e4d 100644
--- a/inc/inc.Tasks.php
+++ b/inc/inc.Tasks.php
@@ -45,7 +45,7 @@ class SeedDMS_ExpiredDocumentsTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 						$body .= "---------------------------------------------------------------------------------\n";
 						foreach($docs as $doc) {
 							$body .= sprintf($tableformat."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
-							$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), $doc->getName());
+							$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getExpires()), $doc->getId(), '<a href="'.getBaseUrl().'/out/out.ViewDocument.php? documentid='.$doc->getId().'">'.htmlspecialchars($doc->getName()).'</a>');
 						}
 						$bodyhtml .= "</table>".PHP_EOL;
 						$params = array();
@@ -788,7 +788,7 @@ class SeedDMS_RecentChangesTask extends SeedDMS_SchedulerTaskBase { /* {{{ */
 						$body .= "---------------------------------------------------------------------------------\n";
 						foreach($ds as $doc) {
 							$body .= sprintf($tableformat."\n", getReadableDate($doc->getDate()), $doc->getId(), $doc->getName());
-							$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getDate()), $doc->getId(), $doc->getName());
+							$bodyhtml .= sprintf($tableformathtml."\n", getReadableDate($doc->getDate()), $doc->getId(), '<a href="'.getBaseUrl().'/out/out.ViewDocument.php? documentid='.$doc->getId().'">'.htmlspecialchars($doc->getName()).'</a>');
 						}
 						$bodyhtml .= "</table>".PHP_EOL;
 						$body .= PHP_EOL;

From a25de1eea518336bd136bc62c213504e3fe66d31 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 11 Apr 2023 12:35:30 +0200
Subject: [PATCH 1925/2006] fix some old entries

---
 CHANGELOG | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 74a697657..e09109d2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@
                      Changes in version 6.0.24
 --------------------------------------------------------------------------------
 - add task to send list of recent changes by email
-- merge changes up to 5.1.30
+- merge changes up to 5.1.31
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.23
@@ -10,17 +10,17 @@
 - fix setting recipients and revisors
 - check in of a document is allowed for the user having done the check out
   or those users with unlimited access rights on the document
-- merge changes up to 5.1.29
+- merge changes up to 5.1.30
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.22
 --------------------------------------------------------------------------------
-- merge changes up to 5.1.28
+- merge changes up to 5.1.29
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.21
 --------------------------------------------------------------------------------
-- merge changes up to 5.1.27
+- merge changes up to 5.1.28
 - add new check for documents with identical sequence numbers in a folder
 
 --------------------------------------------------------------------------------

From 1bc2ff764e1957c54207fb3cce910923c4a11f32 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 11 Apr 2023 12:37:27 +0200
Subject: [PATCH 1926/2006] add missing shell script

---
 utils/seeddms-xmlimport | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100755 utils/seeddms-xmlimport

diff --git a/utils/seeddms-xmlimport b/utils/seeddms-xmlimport
new file mode 100755
index 000000000..a3ef53346
--- /dev/null
+++ b/utils/seeddms-xmlimport
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	parentdir=$(dirname "$0")
+	export SEEDDMS_HOME=$(dirname "$parentdir")
+fi
+
+exec php -f "${SEEDDMS_HOME}/utils/xmlimport.php" -- "${@}"

From 62d5328b480a75218f37a5dea685e811df10ffe3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 11 Apr 2023 19:26:54 +0200
Subject: [PATCH 1927/2006] use version 2.1.14 of composer

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index e2f6e0b81..4d4be7f17 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,7 @@
 	<propertyregex property="shortversion" subject="${version} kk" pattern="([56])\.([0-9]).*" replace="seeddms$1$2x" override="true"/>
 	<property name="majorversion" value="${version}" />
 	<propertyregex property="majorversion" subject="${version}" pattern="([56])\..*" replace="$1" override="true"/>
-  <property name="composer_version" value="2.1.6" />
+  <property name="composer_version" value="2.1.14" />
   <property name="composer_extra_params" value="" />
   <property name="composer_env" value="" />
 	<property name="mink_driver" value="chrome" />

From 762ccbb373b274c5038c62da0e36a5b80c0a962f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 12 Apr 2023 16:34:01 +0200
Subject: [PATCH 1928/2006] fix wrong variable name

---
 views/bootstrap/class.ViewFolder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index bc39917a5..3ce5ba6de 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -284,7 +284,7 @@ $('body').on('click', '.order-btn', function(ev) {
 				}
 				echo "<tr>";
 				echo "<td>".getMLText("comment").":</td>\n";
-				echo "<td><div class=\"folder-comment\">".$content."</div></td>\n";
+				echo "<td><div class=\"folder-comment\">".$comment."</div></td>\n";
 				echo "</tr>";
 			}
 

From a067cc9949a49bddb7be056823206c259c92af94 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Apr 2023 09:05:03 +0200
Subject: [PATCH 1929/2006] add method getFromWithTo()

---
 inc/inc.ClassConversionMgr.php | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/inc/inc.ClassConversionMgr.php b/inc/inc.ClassConversionMgr.php
index 557f796c8..b06430543 100644
--- a/inc/inc.ClassConversionMgr.php
+++ b/inc/inc.ClassConversionMgr.php
@@ -38,23 +38,39 @@ class SeedDMS_ConversionMgr {
 	 */
 	protected $success;
 
-	public function __construct() {
+	public function __construct() { /* {{{ */
 		$this->services = array();
 		$this->success = true;
-	}
+	} /* }}} */
 
-	public function addService($service) {
+	public function addService($service) { /* {{{ */
 		$service->setConversionMgr($this);
 		$this->services[$service->from][$service->to][] = $service;
 		return $service;
-	}
+	} /* }}} */
 
-	public function hasService($from, $to) {
+	public function hasService($from, $to) { /* {{{ */
 		if(!empty($this->services[$from][$to]))
 			return true;
 		else
 			return false;
-	}
+	} /* }}} */
+
+	/**
+	 * Return the list of mimetypes which can be converted
+	 * into the given mimetype
+	 *
+	 * @param string $askto mimetype to be converted into
+	 * @return array list of from mimetypes 
+	 */
+	public function getFromWithTo($askto) { /* {{{ */
+		$fromret = [];
+		foreach($this->services as $from=>$toservices)
+			foreach($toservices as $to=>$service)
+				if($to == $askto)
+					$fromret[] = $from;
+		return $fromret;
+	} /* }}} */
 
 	/**
 	 * Return the service that would be tried first for converting

From eb51882726062755599e0ba9e3e4ed45d1ac6054 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Apr 2023 10:01:18 +0200
Subject: [PATCH 1930/2006] add converters for image/svg+xml

---
 doc/README.Converters | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/README.Converters b/doc/README.Converters
index 034358ccf..71e701b6a 100644
--- a/doc/README.Converters
+++ b/doc/README.Converters
@@ -55,6 +55,9 @@ image/jpg
 image/jpeg
   convert -density 300 '%f' 'pdf:%o'
 
+image/svg+xml
+	cairosvg -f pdf -o '%o' '%f'
+
 application/vnd.ms-powerpoint
 application/vnd.openxmlformats-officedocument.presentationml.presentation
 application/vnd.oasis.opendocument.presentation
@@ -93,6 +96,9 @@ image/jpeg
 image/png
   convert -resize %wx '%f' 'png:%o'
 
+image/svg+xml
+	cairosvg -f png --output-width %w -o '%o' '%f'
+
 text/plain
   convert -density 100 -resize %wx 'text:%f[0]' 'png:%o'
 

From 53d7ab063d0d8ced9690b4dbcd06110a5df0ccdd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 13 Apr 2023 12:56:59 +0200
Subject: [PATCH 1931/2006] fix preview for files in dropfolder

---
 CHANGELOG                                   |  1 +
 op/op.DropFolderPreview.php                 | 19 ++++++++-----------
 out/out.DropFolderChooser.php               |  2 ++
 views/bootstrap/class.DropFolderChooser.php | 16 +++++++++++-----
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6143e8c93..bb4ba53f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - rest api returns error msg and not just http status
 - comment of document, documentcontent and folder can be rendered as
   markdown
+- fix preview for file in drop folder
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30
diff --git a/op/op.DropFolderPreview.php b/op/op.DropFolderPreview.php
index b70d01e6a..d6f88a71d 100644
--- a/op/op.DropFolderPreview.php
+++ b/op/op.DropFolderPreview.php
@@ -34,27 +34,24 @@ if (!isset($_GET["filename"])) {
 }
 $filename = $_GET["filename"];
 
-if(substr($settings->_dropFolderDir, -1, 1) == DIRECTORY_SEPARATOR)
-	$dropfolderdir = substr($settings->_dropFolderDir, 0, -1);
-else
-	$dropfolderdir = $settings->_dropFolderDir;
-$dir = $dropfolderdir.'/'.$user->getLogin();
+$dir = rtrim($settings->_dropFolderDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$user->getLogin();
 
-if(!file_exists($dir.'/'.$filename))
+if(!file_exists($dir.DIRECTORY_SEPARATOR.$filename))
 	exit;
 
 $finfo = finfo_open(FILEINFO_MIME_TYPE);
 $mimetype = finfo_file($finfo, $dir.'/'.$filename);
 
 if(!empty($_GET["width"]))
-	$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $_GET["width"]);
+	$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $_GET["width"], $settings->_cmdTimeout, $settings->_enableXsendfile);
 else
-	$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
-$previewer->setConverters($settings->_converters['preview']);
-$previewer->setXsendfile($settings->_enableXsendfile);
+	$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $settings->_previewWidthList, $settings->_cmdTimeout, $settings->_enableXsendfile);
+if($conversionmgr)
+	$previewer->setConversionMgr($conversionmgr);
+else
+	$previewer->setConverters($previewconverters);
 if(!$previewer->hasRawPreview($dir.'/'.$filename, 'dropfolder/'))
 	$previewer->createRawPreview($dir.'/'.$filename, 'dropfolder/', $mimetype);
 header('Content-Type: image/png');
 $previewer->getRawPreview($dir.'/'.$filename, 'dropfolder/');
 
-?>
diff --git a/out/out.DropFolderChooser.php b/out/out.DropFolderChooser.php
index 112892928..f7bbef11f 100644
--- a/out/out.DropFolderChooser.php
+++ b/out/out.DropFolderChooser.php
@@ -57,9 +57,11 @@ if($view) {
 	$view->setParam('dropfolderdir', $dropfolderdir);
 	$view->setParam('dropfolderfile', isset($_GET["dropfolderfile"]) ? $_GET["dropfolderfile"] : '');
 	$view->setParam('form', $form);
+	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthMenuList', $settings->_previewWidthMenuList);
 	$view->setParam('previewWidthList', $settings->_previewWidthDropFolderList);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
 	$view->setParam('showfolders', $showfolders);
diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index 8cc315669..0b0435be8 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -54,16 +54,22 @@ $('.folderselect').click(function(ev) {
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$showfolders = $this->params['showfolders'];
 		$cachedir = $this->params['cachedir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$previewwidth = $this->params['previewWidthMenuList'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 		$folder = $this->params['folder'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$c = 0; // count files
 		$menuitems['dropfolder'] = array('label'=>'', 'children'=>array());
-		$dir = rtrim($dropfolderdir, '/').'/'.$user->getLogin();
+		$dir = rtrim($dropfolderdir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$user->getLogin();
 		/* Check if we are still looking in the configured directory and
 		 * not somewhere else, e.g. if the login was '../test'
 		 */
@@ -74,15 +80,15 @@ $('.folderselect').click(function(ev) {
 				$finfo = finfo_open(FILEINFO_MIME_TYPE);
 				while (false !== ($entry = $d->read())) {
 					if($entry != '..' && $entry != '.') {
-						if($showfolders == 0 && !is_dir($dir.'/'.$entry) && is_readable($dir.'/'.$entry)) {
+						if($showfolders == 0 && !is_dir($dir.DIRECTORY_SEPARATOR.$entry) && is_readable($dir.DIRECTORY_SEPARATOR.$entry)) {
 							$c++;
 							$subitem = array('label'=>'', 'attributes'=>array(array('title', getMLText('menu_upload_from_dropfolder'))));
 							if($folder)
 								$subitem['link'] = $settings->_httpRoot.'out/out.AddDocument.php?folderid='.$folder->getId()."&dropfolderfileform1=".urldecode($entry);
-							$mimetype = finfo_file($finfo, $dir.'/'.$entry);
+							$mimetype = finfo_file($finfo, $dir.DIRECTORY_SEPARATOR.$entry);
 							if($previewwidth) {
-								$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
-								if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
+								$previewer->createRawPreview($dir.DIRECTORY_SEPARATOR.$entry, 'dropfolder'.DIRECTORY_SEPARATOR, $mimetype);
+								if($previewer->hasRawPreview($dir.DIRECTORY_SEPARATOR.$entry, 'dropfolder'.DIRECTORY_SEPARATOR)) {
 									$subitem['label'] .= "<div class=\"dropfolder-menu-img\" style=\"display: none; overflow:hidden; position: absolute; left:-".($previewwidth+10)."px; border: 1px solid #888;background: white;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"".$settings->_httpRoot."op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
 								}
 							}

From 140b6de1a674edaa2d741dd56f35c90a839d535a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 14 Apr 2023 12:47:57 +0200
Subject: [PATCH 1932/2006] turn cache in SeedDMS_Core_DMS on

---
 utils/indexer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/indexer.php b/utils/indexer.php
index d04fcf1f1..10a7a045f 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -200,6 +200,7 @@ $stats['document']['update'] = 0;
 $stats['document']['error'] = 0;
 $stats['time']['total'] = time();
 $numdocs = $fulltextservice->Indexer()->count();
+$dms->usecache = true;
 $folder = $dms->getFolder($settings->_rootFolderID);
 /* if numdocs is 0, then there is no need to check if a document/folder is already
  * indexed. That speeds up the indexing.

From 5a7f8655d81a9ee61f09b654d1819e61ce788834 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 15 Apr 2023 13:24:12 +0200
Subject: [PATCH 1933/2006] check if adding to document to index succeeded

---
 utils/indexer.php | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/utils/indexer.php b/utils/indexer.php
index 10a7a045f..848d682d9 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -85,9 +85,13 @@ function tree($dms, $fulltextservice, $folder, $indent='', $numdocs) { /* {{{ */
 					}
 				}
 			}
-			$index->addDocument($idoc);
-			echo $prefix.$themes->green(" (Folder added)").PHP_EOL;
-			$stats['folder']['add']++;
+			if($index->addDocument($idoc)) {
+				echo $prefix.$themes->green(" (Folder added)").PHP_EOL;
+				$stats['folder']['add']++;
+			} else {
+				$stats['folder']['error']++;
+				echo $prefix.$themes->error(" (Failed)").PHP_EOL;
+			}
 		} catch(Exception $e) {
 			$stats['folder']['error']++;
 			echo $prefix.$themes->error(" (Timeout)").PHP_EOL;
@@ -113,9 +117,13 @@ function tree($dms, $fulltextservice, $folder, $indent='', $numdocs) { /* {{{ */
 						}
 					}
 				}
-				$index->addDocument($idoc);
-				echo $prefix.$themes->green(" (Folder updated)").PHP_EOL;
-				$stats['folder']['update']++;
+				if($index->addDocument($idoc)) {
+					echo $prefix.$themes->green(" (Folder updated)").PHP_EOL;
+					$stats['folder']['update']++;
+				} else {
+					$stats['folder']['error']++;
+					echo $prefix.$themes->error(" (Failed)").PHP_EOL;
+				}
 			} catch(Exception $e) {
 				$stats['folder']['error']++;
 				echo $prefix.$themes->error(" (Timeout)").PHP_EOL;
@@ -141,9 +149,13 @@ function tree($dms, $fulltextservice, $folder, $indent='', $numdocs) { /* {{{ */
 						}
 					}
 				}
-				$index->addDocument($idoc);
-				echo $prefix.$themes->green(" (Document added)").PHP_EOL;
-				$stats['document']['add']++;
+				if($index->addDocument($idoc)) {
+					echo $prefix.$themes->green(" (Document added)").PHP_EOL;
+					$stats['document']['add']++;
+				} else {
+					$stats['document']['error']++;
+					echo $prefix.$themes->error(" (Failed)").PHP_EOL;
+				}
 			} catch(Exception $e) {
 				$stats['document']['error']++;
 				echo $prefix.$themes->error(" (Timeout)").PHP_EOL;
@@ -170,9 +182,13 @@ function tree($dms, $fulltextservice, $folder, $indent='', $numdocs) { /* {{{ */
 							}
 						}
 					}
-					$index->addDocument($idoc);
-					echo $prefix.$themes->green(" (Document updated)").PHP_EOL;
-					$stats['document']['update']++;
+					if($index->addDocument($idoc)) {
+						echo $prefix.$themes->green(" (Document updated)").PHP_EOL;
+						$stats['document']['update']++;
+					} else {
+						$stats['document']['error']++;
+						echo $prefix.$themes->error(" (Failed)").PHP_EOL;
+					}
 				} catch(Exception $e) {
 					$stats['document']['error']++;
 					echo $prefix.$themes->error(" (Timeout)").PHP_EOL;

From ec7b24c044583075f34a99e7c9db894d4aee66f3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 17 Apr 2023 22:10:18 +0200
Subject: [PATCH 1934/2006] fix setting html language

---
 views/bootstrap/class.Bootstrap.php   | 2 +-
 views/bootstrap4/class.Bootstrap4.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 1b1ba936f..c737c3c05 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -89,7 +89,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 		if($this->params['session'] && ($slang = $this->params['session']->getLanguage())) {
 			echo str_replace('_', '-', $slang);
 		} else {
-			echo str_replace('_', '-', $settings->_language);
+			echo str_replace('_', '-', $this->params['settings']->_language);
 		}
 		echo "\">\n<head>\n";
 		echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index da399b0b1..8c2696669 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -91,7 +91,7 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
 		if($this->params['session'] && ($slang = $this->params['session']->getLanguage())) {
 			echo str_replace('_', '-', $slang);
 		} else {
-			echo str_replace('_', '-', $settings->_language);
+			echo str_replace('_', '-', $this->params['settings']->_language);
 		}
 		echo "\">\n<head>\n";
 		echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";

From 55c7a32a05b2101b4b66e6f66956856bd5e61d5e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 09:40:50 +0200
Subject: [PATCH 1935/2006] fix some old php spreadsheet consts

---
 inc/inc.ClassDownloadMgr.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 1958e652e..1cde588a2 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -128,8 +128,8 @@ class SeedDMS_Download_Mgr {
 					}
 					$tcol = $col;
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, $reqName);
-					$sheet->setCellValueByColumnAndRow($tcol, $l, ($r['status']==1 || $r['status']==-1) ? PHPExcel_Shared_Date::PHPToExcel(new DateTime($r['date'])) : null);
-					$sheet->getStyleByColumnAndRow($tcol++, $l)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22);
+					$sheet->setCellValueByColumnAndRow($tcol, $l, ($r['status']==1 || $r['status']==-1) ? \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel(new DateTime($r['date'])) : null);
+					$sheet->getStyleByColumnAndRow($tcol++, $l)->getNumberFormat()->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME);
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, $r['comment']);
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, getReviewStatusText($r["status"]));
 					$l++;
@@ -159,8 +159,8 @@ class SeedDMS_Download_Mgr {
 					}
 					$tcol = $col;
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, $reqName);
-					$sheet->setCellValueByColumnAndRow($tcol, $k, ($r['status']==1 || $r['status']==-1) ?PHPExcel_Shared_Date::PHPToExcel(new DateTime($r['date'])) : null);
-					$sheet->getStyleByColumnAndRow($tcol++, $k)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22);
+					$sheet->setCellValueByColumnAndRow($tcol, $k, ($r['status']==1 || $r['status']==-1) ? \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel(new DateTime($r['date'])) : null);
+					$sheet->getStyleByColumnAndRow($tcol++, $k)->getNumberFormat()->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME);
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, $r['comment']);
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, getApprovalStatusText($r["status"]));
 					$k++;

From 048c56f3a347c019f5ea6cfea092bebe2434f671 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 09:41:38 +0200
Subject: [PATCH 1936/2006] add changes of 6.0.24

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index c8c60ea6b..1615d7668 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 --------------------------------------------------------------------------------
 - add task to send list of recent changes by email
 - merge changes up to 5.1.31
+- fix export of search result
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.23

From 4ffb8da5b2f2bbb43389db4b50fffb4657f99467 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 09:59:18 +0200
Subject: [PATCH 1937/2006] no php error anymore

---
 inc/inc.ClassDownloadMgr.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/inc/inc.ClassDownloadMgr.php b/inc/inc.ClassDownloadMgr.php
index 1958e652e..78d07d8cb 100644
--- a/inc/inc.ClassDownloadMgr.php
+++ b/inc/inc.ClassDownloadMgr.php
@@ -13,7 +13,6 @@
  * @version    Release: @package_version@
  */
 
-#require_once("PHPExcel.php");
 require_once("vendor/autoload.php");
 
 /**
@@ -128,8 +127,8 @@ class SeedDMS_Download_Mgr {
 					}
 					$tcol = $col;
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, $reqName);
-					$sheet->setCellValueByColumnAndRow($tcol, $l, ($r['status']==1 || $r['status']==-1) ? PHPExcel_Shared_Date::PHPToExcel(new DateTime($r['date'])) : null);
-					$sheet->getStyleByColumnAndRow($tcol++, $l)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22);
+					$sheet->setCellValueByColumnAndRow($tcol, $l, ($r['status']==1 || $r['status']==-1) ? \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel(new DateTime($r['date'])) : null);
+					$sheet->getStyleByColumnAndRow($tcol++, $l)->getNumberFormat()->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME);
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, $r['comment']);
 					$sheet->setCellValueByColumnAndRow($tcol++, $l, getReviewStatusText($r["status"]));
 					$l++;
@@ -159,8 +158,8 @@ class SeedDMS_Download_Mgr {
 					}
 					$tcol = $col;
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, $reqName);
-					$sheet->setCellValueByColumnAndRow($tcol, $k, ($r['status']==1 || $r['status']==-1) ?PHPExcel_Shared_Date::PHPToExcel(new DateTime($r['date'])) : null);
-					$sheet->getStyleByColumnAndRow($tcol++, $k)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22);
+					$sheet->setCellValueByColumnAndRow($tcol, $k, ($r['status']==1 || $r['status']==-1) ? \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel(new DateTime($r['date'])) : null);
+					$sheet->getStyleByColumnAndRow($tcol++, $k)->getNumberFormat()->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME);
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, $r['comment']);
 					$sheet->setCellValueByColumnAndRow($tcol++, $k, getApprovalStatusText($r["status"]));
 					$k++;

From 300bcb25142704d014c1b847e3b4489d56ca1205 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 10:00:00 +0200
Subject: [PATCH 1938/2006] remove change which was done in 5.1.31

---
 CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1615d7668..c8c60ea6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,6 @@
 --------------------------------------------------------------------------------
 - add task to send list of recent changes by email
 - merge changes up to 5.1.31
-- fix export of search result
 
 --------------------------------------------------------------------------------
                      Changes in version 6.0.23

From 9bde72fe20d2ef52b9cfad1b01dde60ddd7adcf7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 10:00:29 +0200
Subject: [PATCH 1939/2006] add change for 5.1.31

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index bb4ba53f9..66e196afa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - comment of document, documentcontent and folder can be rendered as
   markdown
 - fix preview for file in drop folder
+- fix export of search result
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30

From 7fcb8da8600a6010fb731344ab0bb96245d83fd7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 12:48:20 +0200
Subject: [PATCH 1940/2006] do not include inc/inc.ClassNotificationService.php
 and inc.ClassEmailNotify.php

---
 utils/adddoc.php | 137 +++++++++++++++++++++++------------------------
 1 file changed, 68 insertions(+), 69 deletions(-)

diff --git a/utils/adddoc.php b/utils/adddoc.php
index 9ff44051f..d6800970c 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -135,87 +135,86 @@ if($reqversion<1)
 	$reqversion=1;
 
 include($myincpath."/inc/inc.Settings.php");
+include($myincpath."/inc/inc.LogInit.php");
 include($myincpath."/inc/inc.Init.php");
 include($myincpath."/inc/inc.Extension.php");
 include($myincpath."/inc/inc.DBInit.php");
-include($myincpath."/inc/inc.ClassNotificationService.php");
-include($myincpath."/inc/inc.ClassEmailNotify.php");
 include($myincpath."/inc/inc.ClassController.php");
 
-/* Parse categories {{{ */
-$categories = array();
-if(isset($options['K'])) {
-	$categorynames = explode(',', $options['K']);
-	foreach($categorynames as $categoryname) {
-		$cat = $dms->getDocumentCategoryByName($categoryname);
-		if($cat) {
-			$categories[] = $cat;
+	/* Parse categories {{{ */
+	$categories = array();
+	if(isset($options['K'])) {
+		$categorynames = explode(',', $options['K']);
+		foreach($categorynames as $categoryname) {
+			$cat = $dms->getDocumentCategoryByName($categoryname);
+			if($cat) {
+				$categories[] = $cat;
+			} else {
+				echo "Category '".$categoryname."' not found".PHP_EOL;
+			}
+		}
+	} /* }}} */
+
+	/* Parse document attributes. {{{ */
+	$document_attributes = array();
+	if (isset($options['a'])) {
+		$docattr = array();
+		if (is_array($options['a'])) {
+			$docattr = $options['a'];
 		} else {
-			echo "Category '".$categoryname."' not found".PHP_EOL;
+			$docattr = array($options['a']);
 		}
-	}
-} /* }}} */
 
-/* Parse document attributes. {{{ */
-$document_attributes = array();
-if (isset($options['a'])) {
-	$docattr = array();
-	if (is_array($options['a'])) {
-		$docattr = $options['a'];
-	} else {
-		$docattr = array($options['a']);
-	}
-
-	foreach ($docattr as $thisAttribute) {
-		$attrKey = strstr($thisAttribute, '=', true);
-		$attrVal = substr(strstr($thisAttribute, '='), 1);
-		if (empty($attrKey) || empty($attrVal)) {
-			echo "Document attribute $thisAttribute not understood".PHP_EOL;
-			exit(1);
+		foreach ($docattr as $thisAttribute) {
+			$attrKey = strstr($thisAttribute, '=', true);
+			$attrVal = substr(strstr($thisAttribute, '='), 1);
+			if (empty($attrKey) || empty($attrVal)) {
+				echo "Document attribute $thisAttribute not understood".PHP_EOL;
+				exit(1);
+			}
+			$attrdef = $dms->getAttributeDefinitionByName($attrKey);
+			if (!$attrdef) {
+				echo "Document attribute $attrKey unknown".PHP_EOL;
+				exit(1);
+			}
+			$document_attributes[$attrdef->getID()] = $attrVal;
 		}
-		$attrdef = $dms->getAttributeDefinitionByName($attrKey);
-		if (!$attrdef) {
-			echo "Document attribute $attrKey unknown".PHP_EOL;
-			exit(1);
-		}
-		$document_attributes[$attrdef->getID()] = $attrVal;
-	}
-} /* }}} */
+	} /* }}} */
 
-/* Parse version attributes. {{{ */
-$version_attributes = array();
-if (isset($options['A'])) {
-	$verattr = array();
-	if (is_array($options['A'])) {
-		$verattr = $options['A'];
-	} else {
-		$verattr = array($options['A']);
-	}
-
-	foreach ($verattr as $thisAttribute) {
-		$attrKey = strstr($thisAttribute, '=', true);
-		$attrVal = substr(strstr($thisAttribute, '='), 1);
-		if (empty($attrKey) || empty($attrVal)) {
-			echo "Version attribute $thisAttribute not understood".PHP_EOL;
-			exit(1);
+	/* Parse version attributes. {{{ */
+	$version_attributes = array();
+	if (isset($options['A'])) {
+		$verattr = array();
+		if (is_array($options['A'])) {
+			$verattr = $options['A'];
+		} else {
+			$verattr = array($options['A']);
 		}
-		$attrdef = $dms->getAttributeDefinitionByName($attrKey);
-		if (!$attrdef) {
-			echo "Version attribute $attrKey unknown".PHP_EOL;
-			exit(1);
-		}
-		$version_attributes[$attrdef->getID()] = $attrVal;
-	}
-} /* }}} */
 
-/* Create a global user object {{{ */
-if($username) {
-	if(!($user = $dms->getUserByLogin($username))) {
-		echo "No such user '".$username."'.";
-		exit;
-	}
-} else
-	$user = $dms->getUser(1);
+		foreach ($verattr as $thisAttribute) {
+			$attrKey = strstr($thisAttribute, '=', true);
+			$attrVal = substr(strstr($thisAttribute, '='), 1);
+			if (empty($attrKey) || empty($attrVal)) {
+				echo "Version attribute $thisAttribute not understood".PHP_EOL;
+				exit(1);
+			}
+			$attrdef = $dms->getAttributeDefinitionByName($attrKey);
+			if (!$attrdef) {
+				echo "Version attribute $attrKey unknown".PHP_EOL;
+				exit(1);
+			}
+			$version_attributes[$attrdef->getID()] = $attrVal;
+		}
+	} /* }}} */
+
+	/* Create a global user object {{{ */
+	if($username) {
+		if(!($user = $dms->getUserByLogin($username))) {
+			echo "No such user '".$username."'.";
+			exit;
+		}
+	} else
+		$user = $dms->getUser(1);
 
 $dms->setUser($user);
 /* }}} */

From 2d9297c668e4860e23c1d24d5e15a3f940b0b3d2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 12:50:53 +0200
Subject: [PATCH 1941/2006] handle unknown objtype in
 getAttributeObjectTypeText()

---
 inc/inc.Language.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index 47e32c6e9..64489d93e 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -320,6 +320,8 @@ function getAttributeObjectTypeText($attrdef) { /* {{{ */
 		case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
 			$ot = getMLText("documentcontent");
 			break;
+		default:
+			$ot = getMLText('objtype_unknown');
 	}
 	return $ot;
 } /* }}} */

From 63ee505c0fbeab236282ee9343b46e187b7a6707 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 20:08:44 +0200
Subject: [PATCH 1942/2006] use openssl to create encryption key

---
 inc/inc.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index b19345afb..90b26ac24 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -31,7 +31,7 @@ if(!defined("SEEDDMS_INSTALL") && file_exists($settings->_configFileDir."/ENABLE
 
 /* Set an encryption key if is not set */
 if(!trim($settings->_encryptionKey)) {
-	$settings->_encryptionKey = md5(uniqid());
+	$settings->_encryptionKey = bin2hex(openssl_random_pseudo_bytes(16));
 	$settings->save();
 }
 

From a43a09a0e275c9c61352426971bb9418bf824c64 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 20:09:03 +0200
Subject: [PATCH 1943/2006] use openssl to encrypt and decrypt data with key

---
 inc/inc.Utils.php | 52 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 444cded70..8c4534a1e 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -582,11 +582,28 @@ function checkQuota($user) { /* {{{ */
  * @return string encrypted data
  */
 function encryptData($key, $value) { /* {{{ */
-  $text = $value;
-  $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-  $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-  $crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $text, MCRYPT_MODE_ECB, $iv);
-  return $crypttext;
+	if(function_exists('openssl_cipher_iv_length')) {
+		$nonceSize = openssl_cipher_iv_length('aes-256-ctr');
+		$nonce = openssl_random_pseudo_bytes($nonceSize);
+
+		$ciphertext = openssl_encrypt(
+			$value,
+			'aes-256-ctr',
+			$key,
+			OPENSSL_RAW_DATA,
+			$nonce
+		);
+
+		// Now let's pack the IV and the ciphertext together
+		// Naively, we can just concatenate
+		return $nonce.$ciphertext;
+	} else {	
+		$text = $value;
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+		$crypttext = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $text, MCRYPT_MODE_ECB, $iv);
+		return $crypttext;
+	}
 } /* }}} */
 
 /**
@@ -597,11 +614,26 @@ function encryptData($key, $value) { /* {{{ */
  * @return string plain text data
  */
 function decryptData($key, $value) { /* {{{ */
-  $crypttext = $value;
-  $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-  $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-  $decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $crypttext, MCRYPT_MODE_ECB, $iv);
-  return trim($decrypttext);
+	if(function_exists('openssl_cipher_iv_length')) {
+		$nonceSize = openssl_cipher_iv_length('aes-256-ctr');
+		$nonce = mb_substr($value, 0, $nonceSize, '8bit');
+		$ciphertext = mb_substr($value, $nonceSize, null, '8bit');
+		
+		$plaintext = openssl_decrypt(
+			$ciphertext,
+			'aes-256-ctr',
+			$key,
+			OPENSSL_RAW_DATA,
+			$nonce
+		);
+		return $plaintext;
+	} else {
+		$crypttext = $value;
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+		$decrypttext = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $crypttext, MCRYPT_MODE_ECB, $iv);
+		return trim($decrypttext);
+	}
 } /* }}} */
 
 /**

From ff78380f4bef9ecf2fcceb34e99959c556f15c10 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 18 Apr 2023 20:09:45 +0200
Subject: [PATCH 1944/2006] add changes for 5.1.31

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 66e196afa..3b0cfc5c2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
   markdown
 - fix preview for file in drop folder
 - fix export of search result
+- use openssl instead of mcrypt
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30

From 5ca2bf9fe06397a1e87c7c643fb4e60e1bce2897 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Apr 2023 06:41:52 +0200
Subject: [PATCH 1945/2006] check for openssl and openssl_cipher_iv_length

---
 views/bootstrap/class.Info.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Info.php b/views/bootstrap/class.Info.php
index 71b9a030b..4b4bb439f 100644
--- a/views/bootstrap/class.Info.php
+++ b/views/bootstrap/class.Info.php
@@ -105,12 +105,12 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
 			echo implode(', ', $phpextensions);
 
 			$this->contentHeading(getMLText("missing_php_extensions"));
-			$requiredext = array('zip', 'xml', 'xsl', 'json', 'intl', 'fileinfo', 'mbstring', 'curl', 'sqlite3', 'imagick');
+			$requiredext = array('zip', 'xml', 'xsl', 'json', 'intl', 'fileinfo', 'mbstring', 'curl', 'sqlite3', 'imagick', 'openssl');
 			echo implode(', ', array_diff($requiredext, $phpextensions));
 
 			$this->contentHeading(getMLText("missing_php_functions_and_classes"));
 			$missingfunc = [];
-			foreach(array('proc_open') as $funcname) {
+			foreach(array('proc_open', 'openssl_cipher_iv_length') as $funcname) {
 				if(!function_exists($funcname)) {
 					$missingfunc[] = $funcname; //getMLText('func_'.$funcname."_missing")
 				}

From 874aecb4bb670a1203957a1fb7a6cd6e32adddee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Apr 2023 13:59:01 +0200
Subject: [PATCH 1946/2006] search form shows 'from' and 'to' field for
 integers and floats

---
 CHANGELOG                             |  1 +
 views/bootstrap/class.Bootstrap.php   | 28 +++++++++++++------------
 views/bootstrap/class.Search.php      | 17 ++++++++++++---
 views/bootstrap4/class.Bootstrap4.php | 30 ++++++++++++++-------------
 4 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3b0cfc5c2..c19c333ca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 - fix preview for file in drop folder
 - fix export of search result
 - use openssl instead of mcrypt
+- search form shows 'from' and 'to' field for integers and floats
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c737c3c05..47ea6b006 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1878,28 +1878,30 @@ $(document).ready(function() {
 
 	function getAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false, $namepostfix='', $alwaysmultiple=false) { /* {{{ */
 		$dms = $this->params['dms'];
+		$attr_id = $fieldname.'_'.$attrdef->getId().($namepostfix ? '_'.$namepostfix : '');
+		$attr_name = $fieldname.'['.$attrdef->getId().']'.($namepostfix ? '['.$namepostfix.']' : '');
 		$content = '';
 		switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
-			$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
-			$content .= "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
+			$content .= "<input type=\"hidden\" name=\"".$attr_name."\" value=\"\" />";
+			$content .= "<input type=\"checkbox\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_date:
 			$objvalue = $attribute ? getReadableDate((is_object($attribute) ? $attribute->getValue() : $attribute)) : '';
 			$dateformat = getConvertDateFormat($this->params['settings']->_dateformat);
        $content .= '<span class="input-append date span12 datepicker" data-date="'.getReadableDate().'" data-date-format="'.$dateformat.'" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
-					<input id="'.$fieldname.'_'.$attrdef->getId().($namepostfix ? '_'.$namepostfix : '').'" class="span6" size="16" name="'.$fieldname.'['.$attrdef->getId().']'.($namepostfix ? '['.$namepostfix.']' : '').'" type="text" value="'.($objvalue ? getReadableDate($objvalue) : '').'">
+					<input id="'.$attr_id.'" class="span6" size="16" name="'.$attr_name.'" type="text" value="'.($objvalue ? getReadableDate($objvalue) : '').'">
           <span class="add-on"><i class="fa fa-calendar"></i></span>
 				</span>';
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_email:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
-			$content .= "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').' data-rule-email="true"'." />";
+			$content .= "<input type=\"text\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').' data-rule-email="true"'." />";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_float:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
-			$content .= "<input type=\"text\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>";
+			$content .= "<input type=\"text\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_folder:
 			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
@@ -1907,7 +1909,7 @@ $(document).ready(function() {
 				$target = $dms->getFolder($objvalue);
 			else
 				$target = null;
-			$content .= $this->getFolderChooserHtml("attr".$attrdef->getId(), M_READWRITE, -1, $target, $fieldname."[".$attrdef->getId()."]", false);
+			$content .= $this->getFolderChooserHtml("attr".$attrdef->getId(), M_READWRITE, -1, $target, $attr_name, false);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_document:
 			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
@@ -1915,7 +1917,7 @@ $(document).ready(function() {
 				$target = $dms->getDocument($objvalue);
 			else
 				$target = null;
-			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), $target, $fieldname."[".$attrdef->getId()."]");
+			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), $target, $attr_name);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_user:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : (is_string($attribute) ? [$attribute] : $attribute)) : array();
@@ -1923,7 +1925,7 @@ $(document).ready(function() {
 			if($users) {
 				$allowempty = $attrdef->getMinValues() == 0;
 				$allowmultiple = $attrdef->getMultipleValues() || $alwaysmultiple;
-				$content .= "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_user")."\">";
+				$content .= "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" id=\"".$attr_id."\" name=\"".$attr_name.($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_user")."\">";
 				if($allowempty)
 					$content .= "<option value=\"\"></option>";
 				foreach($users as $curuser) {
@@ -1943,7 +1945,7 @@ $(document).ready(function() {
 			if($groups) {
 				$allowempty = $attrdef->getMinValues() == 0;
 				$allowmultiple = $attrdef->getMultipleValues() || $alwaysmultiple;
-				$content .= "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_group")."\">";
+				$content .= "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" id=\"".$attr_id."\" name=\"".$attr_name.($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_group")."\">";
 				if($allowempty)
 					$content .= "<option value=\"\"></option>";
 				foreach($groups as $curgroup) {
@@ -1959,8 +1961,8 @@ $(document).ready(function() {
 			break;
 		default:
 			if($valueset = $attrdef->getValueSetAsArray()) {
-				$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\"/>";
-				$content .= "<select id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]";
+				$content .= "<input type=\"hidden\" name=\"".$attr_name."\" value=\"\"/>";
+				$content .= "<select id=\"".$attr_id."\" name=\"".$attr_name;
 				if($attrdef->getMultipleValues() || $alwaysmultiple) {
 					$content .= "[]\" multiple";
 				} else {
@@ -1985,9 +1987,9 @@ $(document).ready(function() {
 			} else {
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 				if(strlen($objvalue) > 80) {
-					$content .= "<textarea id=\"".$fieldname."_".$attrdef->getId()."\" class=\"input-xxlarge\" name=\"".$fieldname."[".$attrdef->getId()."]\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').">".htmlspecialchars($objvalue)."</textarea>";
+					$content .= "<textarea id=\"".$attr_id."\" class=\"input-xxlarge\" name=\"".$attr_name."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').">".htmlspecialchars($objvalue)."</textarea>";
 				} else {
-					$content .= "<input type=\"text\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
+					$content .= "<input type=\"text\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
 				}
 			}
 			break;
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 5fd7ded68..05b2223bc 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -577,7 +577,7 @@ function typeahead() { /* {{{ */
 					 * even if it is empty. FIXME should be also checked.
 					 */
 					$hasattrs = true;
-					if($attrdef->getType() != SeedDMS_Core_AttributeDefinition::type_date)
+					if(!in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_date, SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]))
 						if(!empty($attributes[$attrdef->getID()]))
 							$openfilterdlg = true;
 				}
@@ -591,6 +591,9 @@ function typeahead() { /* {{{ */
 						if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) {
 							$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['from'])) : '', 'attributes', true, 'from'));
 							$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['to'])) : '', 'attributes', true, 'to'));
+						} elseif(in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]) && !$attrdef->getValueSet()) {
+							$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? $attributes[$attrdef->getID()]['from'] : '', 'attributes', true, 'from'));
+							$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? $attributes[$attrdef->getID()]['to'] : '', 'attributes', true, 'to'));
 						} else
 							$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true));
 					}
@@ -612,7 +615,7 @@ function typeahead() { /* {{{ */
 					/* Do not check dates because they always have 'from' and 'to' element
 					 * even if it is empty. FIXME should be also checked.
 					 */
-					if($attrdef->getType() != SeedDMS_Core_AttributeDefinition::type_date)
+					if(!in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_date, SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]))
 						if(!empty($attributes[$attrdef->getID()]))
 							$openfilterdlg = true;
 				}
@@ -694,6 +697,10 @@ function typeahead() { /* {{{ */
 					if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) {
 						$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['from'])) : '', 'attributes', true, 'from'));
 						$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['to'])) : '', 'attributes', true, 'to'));
+					} elseif(in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]) && !$attrdef->getValueSet()) {
+						$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? $attributes[$attrdef->getID()]['from'] : '', 'attributes', true, 'from'));
+						$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? $attributes[$attrdef->getID()]['to'] : '', 'attributes', true, 'to'));
+
 					} else
 						$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true, '', true));
 				}
@@ -714,7 +721,7 @@ function typeahead() { /* {{{ */
 			foreach($attrdefs as $attrdef) {
 				if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) {
 					$hasattrs = true;
-					if($attrdef->getType() != SeedDMS_Core_AttributeDefinition::type_date)
+					if(!in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_date, SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]))
 						if(!empty($attributes[$attrdef->getID()]))
 							$openfilterdlg = true;
 				}
@@ -728,6 +735,10 @@ function typeahead() { /* {{{ */
 						if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) {
 							$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['from'])) : '', 'attributes', true, 'from'));
 							$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? getReadableDate(makeTsFromDate($attributes[$attrdef->getID()]['to'])) : '', 'attributes', true, 'to'));
+						} elseif(in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]) && !$attrdef->getValueSet()) {
+							$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('from').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['from']) ? $attributes[$attrdef->getID()]['from'] : '', 'attributes', true, 'from'));
+							$this->formField(htmlspecialchars($attrdef->getName().' ('.getMLText('to').')'), $this->getAttributeEditField($attrdef, !empty($attributes[$attrdef->getID()]['to']) ? $attributes[$attrdef->getID()]['to'] : '', 'attributes', true, 'to'));
+
 						} else
 							$this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, isset($attributes[$attrdef->getID()]) ? $attributes[$attrdef->getID()] : '', 'attributes', true, '', true));
 					}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 8c2696669..3e838522a 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1920,25 +1920,27 @@ $(document).ready(function() {
 
 	function getAttributeEditField($attrdef, $attribute, $fieldname='attributes', $norequire=false, $namepostfix='', $alwaysmultiple=false) { /* {{{ */
 		$dms = $this->params['dms'];
+		$attr_id = $fieldname.'_'.$attrdef->getId().($namepostfix ? '_'.$namepostfix : '');
+		$attr_name = $fieldname.'['.$attrdef->getId().']'.($namepostfix ? '['.$namepostfix.']' : '');
 		$content = '';
 		switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
-			$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
-			$content .= "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
+			$content .= "<input type=\"hidden\" name=\"".$attr_name."\" value=\"\" />";
+			$content .= "<input type=\"checkbox\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_date:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$dateformat = getConvertDateFormat($this->params['settings']->_dateformat);
 			/*
 				$content .= '<span class="input-append date datepicker" data-date="'.getReadableDate(').'" data-date-format="'.$dateformat.'" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
-					<input id="'.$fieldname.'_'.$attrdef->getId().'" class="span9" size="16" name="'.$fieldname.'['.$attrdef->getId().']" type="text" value="'.($objvalue ? $objvalue : '').'">
+					<input id="'.$attr_id.'" class="span9" size="16" name="'.$attr_name.'" type="text" value="'.($objvalue ? $objvalue : '').'">
           <span class="add-on"><i class="fa fa-calendar"></i></span>
 					</span>';
 			*/
 			$content = '
 <div class="input-group date">
-	<input type="text" class="form-control" id="'.$fieldname.'_'.$attrdef->getId().($namepostfix ? '_'.$namepostfix : '').'" name="'.$fieldname.'['.$attrdef->getId().']'.($namepostfix ? '['.$namepostfix.']' : '').'" value="'.($objvalue ? getReadableDate($objvalue) : '').'" data-date="'.getReadableDate().'" data-date-format="'.$dateformat.'" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'" data-date-autoclose="true" data-provide="datepicker">
+	<input type="text" class="form-control" id="'.$attr_id.'" name="'.$attr_name.'" value="'.($objvalue ? getReadableDate($objvalue) : '').'" data-date="'.getReadableDate().'" data-date-format="'.$dateformat.'" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'" data-date-autoclose="true" data-provide="datepicker">
 	<div class="input-group-append">
 		<span class="input-group-text"><i class="fa fa-calendar"></i></span>
 	</div>
@@ -1947,11 +1949,11 @@ $(document).ready(function() {
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_email:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
-			$content .= "<input type=\"text\" class=\"form-control\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').' data-rule-email="true"'." />";
+			$content .= "<input type=\"text\" class=\"form-control\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').' data-rule-email="true"'." />";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_float:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
-			$content .= "<input type=\"text\" class=\"form-control\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>";
+			$content .= "<input type=\"text\" class=\"form-control\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_folder:
 			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
@@ -1959,7 +1961,7 @@ $(document).ready(function() {
 				$target = $dms->getFolder($objvalue);
 			else
 				$target = null;
-			$content .= $this->getFolderChooserHtml("attr".$attrdef->getId(), M_READWRITE, -1, $target, $fieldname."[".$attrdef->getId()."]", false);
+			$content .= $this->getFolderChooserHtml("attr".$attrdef->getId(), M_READWRITE, -1, $target, $attr_name, false);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_document:
 			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
@@ -1967,7 +1969,7 @@ $(document).ready(function() {
 				$target = $dms->getDocument($objvalue);
 			else
 				$target = null;
-			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), $target, $fieldname."[".$attrdef->getId()."]");
+			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), $target, $attr_name);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_user:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : (is_string($attribute) ? [$attribute] : $attribute)) : array();
@@ -1975,7 +1977,7 @@ $(document).ready(function() {
 			if($users) {
 				$allowempty = $attrdef->getMinValues() == 0;
 				$allowmultiple = $attrdef->getMultipleValues() || $alwaysmultiple;
-				$content .= "<select class=\"form-control chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_user")."\">";
+				$content .= "<select class=\"form-control chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" id=\"".$attr_id."\" name=\"".$attr_name.($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_user")."\">";
 				if($allowempty)
 					$content .= "<option value=\"\"></option>";
 				foreach($users as $curuser) {
@@ -1995,7 +1997,7 @@ $(document).ready(function() {
 			if($groups) {
 				$allowempty = $attrdef->getMinValues() == 0;
 				$allowmultiple = $attrdef->getMultipleValues() || $alwaysmultiple;
-				$content .= "<select class=\"form-control chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"".$fieldname."[".$attrdef->getId()."]".($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_group")."\">";
+				$content .= "<select class=\"form-control chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" id=\"".$attr_id."\" name=\"".$attr_name.($allowmultiple ? '[]' : '')."\"".($allowmultiple ? " multiple" : "")." data-placeholder=\"".getMLText("select_group")."\">";
 				if($allowempty)
 					$content .= "<option value=\"\"></option>";
 				foreach($groups as $curgroup) {
@@ -2011,8 +2013,8 @@ $(document).ready(function() {
 			break;
 		default:
 			if($valueset = $attrdef->getValueSetAsArray()) {
-				$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\"/>";
-				$content .= "<select id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]";
+				$content .= "<input type=\"hidden\" name=\"".$attr_name."\" value=\"\"/>";
+				$content .= "<select id=\"".$attr_id."\" name=\"".$attr_name;
 				if($attrdef->getMultipleValues() || $alwaysmultiple) {
 					$content .= "[]\" multiple";
 				} else {
@@ -2037,9 +2039,9 @@ $(document).ready(function() {
 			} else {
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 				if(strlen($objvalue) > 80) {
-					$content .= "<textarea class=\"form-control\" id=\"".$fieldname."_".$attrdef->getId()."\" class=\"input-xxlarge\" name=\"".$fieldname."[".$attrdef->getId()."]\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').">".htmlspecialchars($objvalue)."</textarea>";
+					$content .= "<textarea class=\"form-control\" id=\"".$attr_id."\" class=\"input-xxlarge\" name=\"".$attr_name."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').">".htmlspecialchars($objvalue)."</textarea>";
 				} else {
-					$content .= "<input type=\"text\" class=\"form-control\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
+					$content .= "<input type=\"text\" class=\"form-control\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
 				}
 			}
 			break;

From 69cff4e9b4e3559d65144d4ff943e66cc68c7190 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Apr 2023 15:05:29 +0200
Subject: [PATCH 1947/2006] fix handling of floats in getAttributeEditField

---
 views/bootstrap/class.Bootstrap.php   | 6 +++---
 views/bootstrap4/class.Bootstrap4.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 47ea6b006..81dc2f34b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1899,10 +1899,10 @@ $(document).ready(function() {
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$content .= "<input type=\"text\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').' data-rule-email="true"'." />";
 			break;
-		case SeedDMS_Core_AttributeDefinition::type_float:
+		/* case SeedDMS_Core_AttributeDefinition::type_float:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$content .= "<input type=\"text\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>";
-			break;
+			break; */
 		case SeedDMS_Core_AttributeDefinition::type_folder:
 			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
 			if($objvalue)
@@ -1989,7 +1989,7 @@ $(document).ready(function() {
 				if(strlen($objvalue) > 80) {
 					$content .= "<textarea id=\"".$attr_id."\" class=\"input-xxlarge\" name=\"".$attr_name."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').">".htmlspecialchars($objvalue)."</textarea>";
 				} else {
-					$content .= "<input type=\"text\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
+					$content .= "<input type=\"text\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').(in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]) ? ' data-rule-digits="true"' : '')." />";
 				}
 			}
 			break;
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 3e838522a..aa31deaac 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1951,10 +1951,10 @@ $(document).ready(function() {
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$content .= "<input type=\"text\" class=\"form-control\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').' data-rule-email="true"'." />";
 			break;
-		case SeedDMS_Core_AttributeDefinition::type_float:
+		/* case SeedDMS_Core_AttributeDefinition::type_float:
 			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$content .= "<input type=\"text\" class=\"form-control\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>";
-			break;
+			break; */
 		case SeedDMS_Core_AttributeDefinition::type_folder:
 			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
 			if($objvalue)
@@ -2041,7 +2041,7 @@ $(document).ready(function() {
 				if(strlen($objvalue) > 80) {
 					$content .= "<textarea class=\"form-control\" id=\"".$attr_id."\" class=\"input-xxlarge\" name=\"".$attr_name."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').">".htmlspecialchars($objvalue)."</textarea>";
 				} else {
-					$content .= "<input type=\"text\" class=\"form-control\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />";
+					$content .= "<input type=\"text\" class=\"form-control\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '').(in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]) ? ' data-rule-digits="true"' : '')." />";
 				}
 			}
 			break;

From ff64e76213146491761745d61d9fa0bfe652414f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Apr 2023 13:28:03 +0200
Subject: [PATCH 1948/2006] add access checks for all tabs

---
 views/bootstrap/class.ViewDocument.php | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 54b9862d6..67a541700 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1017,7 +1017,7 @@ $(document).ready( function() {
 ?>
     <ul class="nav nav-pills" id="docinfotab" role="tablist">
 		  <li class="nav-item <?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>"><a class="nav-link <?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>" data-target="#docinfo" data-toggle="tab" role="button"><?php printMLText('current_version'); ?></a></li>
-			<?php if (count($versions)>1) { ?>
+			<?php if (count($versions)>1 && $accessobject->check_view_access($this, array('action'=>'previous'))) { ?>
 		  <li class="nav-item <?php if($currenttab == 'previous') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'previous') echo 'active'; ?>" data-target="#previous" data-toggle="tab" role="button"><?php printMLText('previous_versions'); ?></a></li>
 <?php
 			}
@@ -1035,20 +1035,26 @@ $(document).ready( function() {
 <?php
 				}
 			}
-			if(is_array($receiptStatus) && count($receiptStatus)>0) {
+			if(is_array($receiptStatus) && count($receiptStatus)>0 && $accessobject->check_view_access($this, array('action'=>'recipients'))) {
 ?>
 		  <li class="nav-item <?php if($currenttab == 'recipients') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'recipients') echo 'active'; ?>" data-target="#recipients" data-toggle="tab" role="button"><?php echo getMLText('recipients'); ?></a></li>
 <?php
 			}
-			if(is_array($revisionStatus) && count($revisionStatus)>0) {
+			if(is_array($revisionStatus) && count($revisionStatus)>0 && $accessobject->check_view_access($this, array('action'=>'revision'))) {
 ?>
 		  <li class="nav-item <?php if($currenttab == 'revision') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'revision') echo 'active'; ?>" data-target="#revision" data-toggle="tab" role="button"><?php echo getMLText('revise_document'); ?></a></li>
 <?php
 			}
+			if($accessobject->check_view_access($this, array('action'=>'attachments'))) {
 ?>
 			<li class="nav-item <?php if($currenttab == 'attachments') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'attachments') echo 'active'; ?>" data-target="#attachments" data-toggle="tab" role="button"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
+<?php
+			}
+			if($accessobject->check_view_access($this, array('action'=>'links'))) {
+?>
 			<li class="nav-item <?php if($currenttab == 'links') echo 'active'; ?>"><a class="nav-link <?php if($currenttab == 'links') echo 'active'; ?>" data-target="#links" data-toggle="tab" role="button"><?php printMLText('linked_documents'); echo (count($links) || count($reverselinks)) ? " (".count($links)."/".count($reverselinks).")" : ""; ?></a></li>
 <?php
+			}
 			$tabs = $this->callHook('extraTabs', $document);
 			if($tabs) {
 				foreach($tabs as $tabid=>$tab) {
@@ -1621,7 +1627,7 @@ $(document).ready( function() {
 <?php
 			}
 		}
-		if(is_array($receiptStatus) && count($receiptStatus)>0) {
+		if(is_array($receiptStatus) && count($receiptStatus)>0 && $accessobject->check_view_access($this, array('action'=>'recipients'))) {
 ?>
 		  <div class="tab-pane <?php if($currenttab == 'recipients') echo 'active'; ?>" id="recipients">
 <?php
@@ -1759,7 +1765,7 @@ $(document).ready( function() {
 		  </div>
 <?php
 		}
-		if(is_array($revisionStatus) && count($revisionStatus)>0) {
+		if(is_array($revisionStatus) && count($revisionStatus)>0 && $accessobject->check_view_access($this, array('action'=>'revision'))) {
 ?>
 			<div class="tab-pane <?php if($currenttab == 'revision') echo 'active'; ?>" id="revision">
 <?php
@@ -1876,7 +1882,7 @@ $(document).ready( function() {
 		</div>
 <?php
 		}
-		if (count($versions)>1) {
+		if (count($versions)>1 && $accessobject->check_view_access($this, array('action'=>'previous'))) {
 ?>
 		  <div class="tab-pane <?php if($currenttab == 'previous') echo 'active'; ?>" id="previous" role="tabpanel">
 <?php
@@ -1894,6 +1900,7 @@ $(document).ready( function() {
 		  </div>
 <?php
 		}
+		if($accessobject->check_view_access($this, array('action'=>'attachments'))) {
 ?>
 			<div class="tab-pane <?php if($currenttab == 'attachments') echo 'active'; ?>" id="attachments" role="tabpanel">
 <?php
@@ -1918,7 +1925,11 @@ $(document).ready( function() {
 		$this->columnEnd();
 		$this->rowEnd();
 ?>
-		  </div>
+			</div>
+<?php
+		}
+		if($accessobject->check_view_access($this, array('action'=>'links'))) {
+?>
 		  <div class="tab-pane <?php if($currenttab == 'links') echo 'active'; ?>" id="links" role="tabpanel">
 <?php
 		if (count($links) > 0) {
@@ -2026,6 +2037,7 @@ $(document).ready( function() {
 ?>
 			</div>
 <?php
+			}
 			if($tabs) {
 				foreach($tabs as $tabid=>$tab) {
 					echo '<div class="tab-pane '.($currenttab == $tabid ? 'active' : '').'" id="'.$tabid.'" role="tabpanel">';

From ec55cc3f2855e78309646fecf6093a90fd642d0d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 20 Apr 2023 13:28:57 +0200
Subject: [PATCH 1949/2006] do not add '*' to typeahead query anymore

---
 out/out.Search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 73af0259c..82b35359d 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -73,8 +73,8 @@ if($fullsearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
 		$query = $_GET["query"];
-		if(isset($_GET['action']) && ($_GET['action'] == 'typeahead'))
-			$query .= '*';
+//		if(isset($_GET['action']) && ($_GET['action'] == 'typeahead'))
+//			$query .= '*';
 	}
 	else {
 		$query = "";

From d778006170da0ef1a17171a83c9bab6336b92b05 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Apr 2023 13:00:05 +0200
Subject: [PATCH 1950/2006] use conversion mgr in show()

---
 views/bootstrap/class.DropFolderChooser.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index 0b0435be8..d45f1a87e 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -115,12 +115,18 @@ $('.folderselect').click(function(ev) {
 		$form = $this->params['form'];
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$cachedir = $this->params['cachedir'];
+		$conversionmgr = $this->params['conversionmgr'];
 		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
 		$showfolders = $this->params['showfolders'];
 
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$dir = $dropfolderdir.'/'.$user->getLogin();
 		/* Check if we are still looking in the configured directory and

From 3d4a63f3353d09dba944094077d490dbdbba70a5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Apr 2023 13:00:31 +0200
Subject: [PATCH 1951/2006] indent typeahead()

---
 views/bootstrap/class.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 05b2223bc..43e5b8fb0 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -352,7 +352,7 @@ $(document).ready(function() {
 		echo $content;
 	} /* }}} */
 
-function typeahead() { /* {{{ */
+	function typeahead() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$query = $this->params['query'];

From 66ecc57780587e13f36ba714cf30120917e1ee5f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Apr 2023 13:02:42 +0200
Subject: [PATCH 1952/2006] add new config var suggestTerms

---
 inc/inc.ClassSettings.php          | 5 +++++
 op/op.Settings.php                 | 1 +
 views/bootstrap/class.Settings.php | 1 +
 3 files changed, 7 insertions(+)

diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index fdfd9c277..6fad081d4 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -132,6 +132,8 @@ class Settings { /* {{{ */
 	var $_fullSearchEngine = 'lucene';
 	// default search method
 	var $_defaultSearchMethod = 'database'; // or 'fulltext'
+	// suggest search term
+	var $_suggestTerms = array(); // or 'all', 'title'
 	// jump straight to the document if it is the only hit of a search
 	var $_showSingleSearchHit = true;
 	// contentOffsetDirTo
@@ -532,6 +534,8 @@ class Settings { /* {{{ */
 		$this->_maxSizeForFullText = intval($tab["maxSizeForFullText"]);
 		$this->_fullSearchEngine = strval($tab["fullSearchEngine"]);
 		$this->_defaultSearchMethod = strval($tab["defaultSearchMethod"]);
+		if(trim(strval($tab["suggestTerms"])))
+			$this->_suggestTerms = explode(',',strval($tab["suggestTerms"]));
 		$this->_showSingleSearchHit = Settings::boolVal($tab["showSingleSearchHit"]);
 		$this->_stopWordsFile = strval($tab["stopWordsFile"]);
 		$this->_sortUsersInList = strval($tab["sortUsersInList"]);
@@ -914,6 +918,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "maxSizeForFullText", $this->_maxSizeForFullText);
     $this->setXMLAttributValue($node, "fullSearchEngine", $this->_fullSearchEngine);
     $this->setXMLAttributValue($node, "defaultSearchMethod", $this->_defaultSearchMethod);
+    $this->setXMLAttributValue($node, "suggestTerms", implode(',', $this->_suggestTerms));
     $this->setXMLAttributValue($node, "showSingleSearchHit", $this->_showSingleSearchHit);
     $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree);
     $this->setXMLAttributValue($node, "stopWordsFile", $this->_stopWordsFile);
diff --git a/op/op.Settings.php b/op/op.Settings.php
index cd9217325..b8e06520d 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -133,6 +133,7 @@ if ($action == "saveSettings")
 	setIntValue('maxSizeForFullText');
 	setStrValue('fullSearchEngine');
 	setStrValue('defaultSearchMethod');
+	setStrValue('suggestTerms');
   setBoolValue("showSingleSearchHit");
   setBoolValue("enableSessionList");
   setBoolValue("enableClipboard");
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index a67406f00..a6ee21dd8 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -358,6 +358,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 <?php $this->showConfigOption('settings_fullSearchEngine', 'fullSearchEngine', $fullsearchengines, false, true); ?>
 <?php $this->showConfigOption('settings_defaultSearchMethod', 'defaultSearchMethod', array('database'=>'settings_defaultSearchMethod_valdatabase', 'fulltext'=>'settings_defaultSearchMethod_valfulltext'), false, true); ?>
 <?php $this->showConfigCheckbox('settings_showSingleSearchHit', 'showSingleSearchHit'); ?>
+<?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords'), true, true); ?>
 <?php $this->showConfigText('settings_stopWordsFile', 'stopWordsFile'); ?>
 <?php $this->showConfigCheckbox('settings_enableClipboard', 'enableClipboard'); ?>
 <?php $this->showConfigCheckbox('settings_enableMenuTasks', 'enableMenuTasks'); ?>

From 89e930ba0094487894329418634bf5a4556289cb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Apr 2023 13:03:08 +0200
Subject: [PATCH 1953/2006] add search terms to typeahead if configured

---
 out/out.Search.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 82b35359d..b0a9ff7e1 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -196,7 +196,9 @@ if($fullsearch) {
 		$total = 0;
 		$index = $fulltextservice->Indexer();
 		if($index) {
-//			$terms = $index->terms($_GET['query']);
+			if(!empty($settings->_suggestTerms)) {
+				$terms = $index->terms($_GET['query'], $settings->_suggestTerms);
+			}
 			$lucenesearch = $fulltextservice->Search();
 			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder, 'attributes'=>$attributes), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));
 			if($searchresult === false) {

From 3cfcfaa558a91190f8e2661013bbb2f593dda7f4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Apr 2023 16:52:07 +0200
Subject: [PATCH 1954/2006] typeahead will also show the column where the
 search terms comes from

---
 views/bootstrap/class.Search.php       | 2 +-
 views/bootstrap/styles/application.js  | 2 +-
 views/bootstrap4/styles/application.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 43e5b8fb0..548bbe029 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -362,7 +362,7 @@ $(document).ready(function() {
 		$recs[] = array('type'=>'S', 'name'=>$query, 'occurences'=>'');
 		if($terms) {
 			foreach($terms as $term)
-				$recs[] = array('type'=>'S', 'name'=>$term->text, 'occurences'=>$term->_occurrence);
+				$recs[] = array('type'=>'S', 'name'=>$term->text, 'occurences'=>$term->_occurrence, 'column'=>$term->field);
 		}
 		if($entries) {
 			foreach ($entries as $entry) {
diff --git a/views/bootstrap/styles/application.js b/views/bootstrap/styles/application.js
index 1eb3d2243..cb261a983 100644
--- a/views/bootstrap/styles/application.js
+++ b/views/bootstrap/styles/application.js
@@ -150,7 +150,7 @@ function initMost() {
 			else if(item.type.charAt(0) == 'F')
 				return '<i class="fa fa-folder-o"></i> ' + item.name.replace(/</g, '&lt;') + '<br /><span class="path">' + item.path + '</span>';
 			else
-				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;') + (item.occurences > 0 ? ' (' + item.occurences + ')' : '');
+				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;') + (item.occurences > 0 ? ' (' + item.occurences + ')' : '') + (typeof(item.column) != 'undefined' ? '<br /><span class="path">' + item.column + '</span>' : '');
 		},
 		/* This only works with a modified version of bootstrap typeahead located
 		 * in boostrap-typeahead.js Search for 'render'
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index 419a92731..f72da452d 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -155,7 +155,7 @@ function initMost() {
 			else if(item.type.charAt(0) == 'F')
 				return '<i class="fa fa-folder-o"></i> ' + item.name.replace(/</g, '&lt;') + '<br /><span class="path">' + item.path + '</span>';
 			else
-				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;') + (item.occurences > 0 ? ' (' + item.occurences + ')' : '');
+				return '<i class="fa fa-search"></i> ' + item.name.replace(/</g, '&lt;') + (item.occurences > 0 ? ' (' + item.occurences + ')' : '') + (typeof(item.column) != 'undefined' ? '<br /><span class="path">' + item.column + '</span>' : '');
 		},
 		/* This only works with a modified version of bootstrap typeahead located
 		 * in boostrap-typeahead.js Search for 'render'

From 8ae0bc09c4d662545cead54c2d71af5257564293 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Apr 2023 17:55:56 +0200
Subject: [PATCH 1955/2006] search for creation date in fulltext

---
 out/out.Search.php               | 23 ++++++++++++++++++++++-
 views/bootstrap/class.Search.php |  8 ++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index b0a9ff7e1..4468804a3 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -149,6 +149,27 @@ if($fullsearch) {
 		}
 	}
 
+	/* Creation date {{{ */
+	$createstartts = null;
+	$createstartdate = null;
+	$createendts = null;
+	$createenddate = null;
+	if(!empty($_GET["createstart"])) {
+		$createstartts = makeTsFromDate($_GET["createstart"]);
+		$createstartdate = array('year'=>(int)date('Y', $createstartts), 'month'=>(int)date('m', $createstartts), 'day'=>(int)date('d', $createstartts), 'hour'=>0, 'minute'=>0, 'second'=>0);
+	}
+	if ($createstartdate && !checkdate($createstartdate['month'], $createstartdate['day'], $createstartdate['year'])) {
+		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
+	}
+	if(!empty($_GET["createend"])) {
+		$createendts = makeTsFromDate($_GET["createend"]);
+		$createenddate = array('year'=>(int)date('Y', $createendts), 'month'=>(int)date('m', $createendts), 'day'=>(int)date('d', $createendts), 'hour'=>23, 'minute'=>59, 'second'=>59);
+	}
+	if ($createenddate && !checkdate($createenddate['month'], $createenddate['day'], $createenddate['year'])) {
+		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
+	}
+	/* }}} */
+
 	// status
 	if(isset($_GET['status']))
 		$status = $_GET['status'];
@@ -200,7 +221,7 @@ if($fullsearch) {
 				$terms = $index->terms($_GET['query'], $settings->_suggestTerms);
 			}
 			$lucenesearch = $fulltextservice->Search();
-			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder, 'attributes'=>$attributes), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));
+			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder, 'created_start'=>$createstartts, 'created_end'=>$createendts, 'attributes'=>$attributes), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));
 			if($searchresult === false) {
 				$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
 				$dcount = 0;
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 548bbe029..aab5de664 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -774,6 +774,14 @@ $(document).ready(function() {
 				)
 			);
 			$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form1", M_READ, -1, $startfolder, 'folderfullsearchid'));
+			$this->formField(
+				getMLText("creation_date")." (".getMLText('from').")",
+				$this->getDateChooser($createstartdate, "createstart", $this->params['session']->getLanguage())
+			);
+			$this->formField(
+				getMLText("creation_date")." (".getMLText('to').")",
+				$this->getDateChooser($createenddate, "createend", $this->params['session']->getLanguage())
+			);
 			if(!isset($facets['owner'])) {
 				$options = array();
 				foreach ($allUsers as $currUser) {

From 5f0484c4cb937a8d50eb7680e5a843136785876e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Apr 2023 19:05:54 +0200
Subject: [PATCH 1956/2006] set convertToPdf for view

---
 out/out.Calendar.php          | 1 +
 out/out.Dashboard.php         | 1 +
 out/out.DropFolderChooser.php | 1 +
 out/out.MyDocuments.php       | 1 +
 out/out.ObjectCheck.php       | 1 +
 out/out.Search.php            | 1 +
 out/out.Timeline.php          | 1 +
 7 files changed, 7 insertions(+)

diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index b6c8f9ea4..0690c583e 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.php
@@ -89,6 +89,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
diff --git a/out/out.Dashboard.php b/out/out.Dashboard.php
index 879e94d55..b4a183519 100644
--- a/out/out.Dashboard.php
+++ b/out/out.Dashboard.php
@@ -22,6 +22,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.DropFolderChooser.php b/out/out.DropFolderChooser.php
index f7bbef11f..345d57390 100644
--- a/out/out.DropFolderChooser.php
+++ b/out/out.DropFolderChooser.php
@@ -61,6 +61,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthMenuList', $settings->_previewWidthMenuList);
 	$view->setParam('previewWidthList', $settings->_previewWidthDropFolderList);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 7cfa317fb..66b7fb24a 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -58,6 +58,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index e5ac6bedf..aeee0a6e5 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -95,6 +95,7 @@ if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.Search.php b/out/out.Search.php
index 4468804a3..6ab56973d 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -651,6 +651,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('workflowmode', $settings->_workflowMode);
 		$view->setParam('enablefullsearch', $settings->_enableFullSearch);
 		$view->setParam('previewWidthList', $settings->_previewWidthList);
+		$view->setParam('convertToPdf', $settings->_convertToPdf);
 		$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 		$view->setParam('conversionmgr', $conversionmgr);
 		$view->setParam('timeout', $settings->_cmdTimeout);
diff --git a/out/out.Timeline.php b/out/out.Timeline.php
index a7b6e05b2..3f1123251 100644
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@@ -66,6 +66,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);

From 5112b1614cc7cd0dcbc3d74b0957852ecb33bc4c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 21 Apr 2023 19:06:24 +0200
Subject: [PATCH 1957/2006] set more options for suggestTerms

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index a6ee21dd8..464d8fbba 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -358,7 +358,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 <?php $this->showConfigOption('settings_fullSearchEngine', 'fullSearchEngine', $fullsearchengines, false, true); ?>
 <?php $this->showConfigOption('settings_defaultSearchMethod', 'defaultSearchMethod', array('database'=>'settings_defaultSearchMethod_valdatabase', 'fulltext'=>'settings_defaultSearchMethod_valfulltext'), false, true); ?>
 <?php $this->showConfigCheckbox('settings_showSingleSearchHit', 'showSingleSearchHit'); ?>
-<?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords'), true, true); ?>
+<?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords', 'category', 'content'), true, true); ?>
 <?php $this->showConfigText('settings_stopWordsFile', 'stopWordsFile'); ?>
 <?php $this->showConfigCheckbox('settings_enableClipboard', 'enableClipboard'); ?>
 <?php $this->showConfigCheckbox('settings_enableMenuTasks', 'enableMenuTasks'); ?>

From d3ddc38c7ffb7f7f70ea321f7128c181dc111327 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 22 Apr 2023 19:40:41 +0200
Subject: [PATCH 1958/2006] take out 'category' from suggestTerms

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 464d8fbba..17abc51c4 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -358,7 +358,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 <?php $this->showConfigOption('settings_fullSearchEngine', 'fullSearchEngine', $fullsearchengines, false, true); ?>
 <?php $this->showConfigOption('settings_defaultSearchMethod', 'defaultSearchMethod', array('database'=>'settings_defaultSearchMethod_valdatabase', 'fulltext'=>'settings_defaultSearchMethod_valfulltext'), false, true); ?>
 <?php $this->showConfigCheckbox('settings_showSingleSearchHit', 'showSingleSearchHit'); ?>
-<?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords', 'category', 'content'), true, true); ?>
+<?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords', 'content'), true, true); ?>
 <?php $this->showConfigText('settings_stopWordsFile', 'stopWordsFile'); ?>
 <?php $this->showConfigCheckbox('settings_enableClipboard', 'enableClipboard'); ?>
 <?php $this->showConfigCheckbox('settings_enableMenuTasks', 'enableMenuTasks'); ?>

From 511492fb5c83e5d780d50f07db63c82b1c909b25 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 22 Apr 2023 19:41:15 +0200
Subject: [PATCH 1959/2006] do not suggest terms if query is empty

---
 out/out.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 6ab56973d..850965aa1 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -217,7 +217,7 @@ if($fullsearch) {
 		$total = 0;
 		$index = $fulltextservice->Indexer();
 		if($index) {
-			if(!empty($settings->_suggestTerms)) {
+			if(!empty($settings->_suggestTerms) && !empty($_GET['query'])) {
 				$terms = $index->terms($_GET['query'], $settings->_suggestTerms);
 			}
 			$lucenesearch = $fulltextservice->Search();

From 28174e3a33e2bfa63c46312217c56cb99de7de87 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 22 Apr 2023 19:41:41 +0200
Subject: [PATCH 1960/2006] run comment through htmlspecialchars() if markdown
 parsing is enabled

---
 views/bootstrap/class.ViewDocument.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 0d2191f49..2f5478b18 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -421,7 +421,7 @@ $(document).ready( function() {
 		if($document->getComment()) {
 			if($settings->_markdownComments) {
 				$Parsedown = new Parsedown();
-				$comment = $Parsedown->text($document->getComment());
+				$comment = $Parsedown->text(htmlspecialchars($document->getComment()));
 			} else {
 				$comment = htmlspecialchars($document->getComment());
 			}
@@ -773,7 +773,7 @@ $(document).ready( function() {
 			if($latestContent->getComment())
 				if($settings->_markdownComments) {
 					$Parsedown = new Parsedown();
-					$comment = $Parsedown->text($latestContent->getComment());
+					$comment = $Parsedown->text(htmlspecialchars($latestContent->getComment()));
 					print "<div class=\"content-comment\">".$comment."</div>";
 				} else {
 					$comment = htmlspecialchars($latestContent->getComment());

From 923e235b9a686a9d89c6d96f1aa08484cf92f07b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 23 Apr 2023 19:01:08 +0200
Subject: [PATCH 1961/2006] pass categories can be a list of strings

---
 out/out.Search.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 850965aa1..da2b54f62 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -88,9 +88,13 @@ if($fullsearch) {
 		$category = $_GET['category'];
 		foreach($_GET['category'] as $catid) {
 			if($catid) {
-				if($cat = $dms->getDocumentCategory($catid)) {
-					$categories[] = $cat;
-					$categorynames[] = $cat->getName();
+				if(is_numeric($catid)) {
+					if($cat = $dms->getDocumentCategory($catid)) {
+						$categories[] = $cat;
+						$categorynames[] = $cat->getName();
+					}
+				} else {
+					$categorynames[] = $catid;
 				}
 			}
 		}

From 0475bd57cb7bbaa9d87c3aeb27313e695e4da231 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 23 Apr 2023 19:01:43 +0200
Subject: [PATCH 1962/2006] passed owners can be a list of strings

---
 out/out.Search.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index da2b54f62..59f494821 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -124,17 +124,25 @@ if($fullsearch) {
 	// document owner.
 	$owner = [];
 	$ownernames = [];
-	if (isset($_GET["owner"])) {
+	if(!empty($_GET["owner"])) {
 		$owner = $_GET['owner'];
 		if (!is_array($_GET['owner'])) {
-			if(!empty($_GET['owner']) && $o = $dms->getUser($_GET['owner']))
-				$ownernames[] = $o->getLogin();
-			else
-				UI::exitError(getMLText("search"),getMLText("unknown_owner"));
+			if(is_numeric($_GET['owner'])) {
+				if($o = $dms->getUser($_GET['owner']))
+					$ownernames[] = $o->getLogin();
+			} else {
+				$ownernames[] = $_GET['owner'];
+			}
 		} else {
 			foreach($_GET["owner"] as $l) {
-				if($l && $o = $dms->getUser($l))
-					$ownernames[] = $o->getLogin();
+				if($l) {
+					if(is_numeric($l)) {
+						if($o = $dms->getUser($l))
+							$ownernames[] = $o->getLogin();
+					} else {
+						$ownernames[] = $l;
+					}
+				}
 			}
 		}
 	}

From c9b31d8de9bc71649b6f1ff7b84b3b8179088de0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 23 Apr 2023 19:02:42 +0200
Subject: [PATCH 1963/2006] only last token of query will be used for getting
 terms

---
 out/out.Search.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 59f494821..d4a0391e2 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -230,7 +230,9 @@ if($fullsearch) {
 		$index = $fulltextservice->Indexer();
 		if($index) {
 			if(!empty($settings->_suggestTerms) && !empty($_GET['query'])) {
-				$terms = $index->terms($_GET['query'], $settings->_suggestTerms);
+				$st = preg_split("/[\s,]+/", trim($_GET['query']));
+				if($lastterm = end($st))
+					$terms = $index->terms($lastterm, $settings->_suggestTerms);
 			}
 			$lucenesearch = $fulltextservice->Search();
 			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder, 'created_start'=>$createstartts, 'created_end'=>$createendts, 'attributes'=>$attributes), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));

From 36a51e960653917e1b7a2b9e3f7596b3472e0ca2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 23 Apr 2023 19:02:57 +0200
Subject: [PATCH 1964/2006] check if 'facetsearch' is set

---
 out/out.Search.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/out/out.Search.php b/out/out.Search.php
index d4a0391e2..6d77a7144 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -69,6 +69,7 @@ if (isset($_GET["removecategory"]) && is_numeric($_GET["removecategory"]) && $_G
 $terms = [];
 $limit = (isset($_GET["limit"]) && is_numeric($_GET["limit"])) ? (int) $_GET['limit'] : 20;
 $fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch;
+$facetsearch = !empty($_GET["facetsearch"]) && $settings->_enableFullSearch;
 if($fullsearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
@@ -634,6 +635,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
 		$view->setParam('fullsearch', $fullsearch);
+		$view->setParam('facetsearch', $facetsearch);
 		$view->setParam('mode', isset($mode) ? $mode : '');
 		$view->setParam('orderby', isset($orderby) ? $orderby : '');
 		$view->setParam('defaultsearchmethod', !empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod);

From 7172aad62bf4f3503b53d653e60f45eb0e9ce016 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 23 Apr 2023 19:03:51 +0200
Subject: [PATCH 1965/2006] add new search tag with facetted full text search

---
 views/bootstrap/class.Search.php | 223 +++++++++++++++++++++++++------
 1 file changed, 184 insertions(+), 39 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index aab5de664..769be8aeb 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -394,7 +394,9 @@ $(document).ready(function() {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$request = $this->params['request'];
 		$fullsearch = $this->params['fullsearch'];
+		$facetsearch = $this->params['facetsearch'];
 		$total = $this->params['total'];
 		$totaldocs = $this->params['totaldocs'];
 		$totalfolders = $this->params['totalfolders'];
@@ -405,6 +407,7 @@ $(document).ready(function() {
 		$resultmode = $this->params['resultmode'];
 		$workflowmode = $this->params['workflowmode'];
 		$enablefullsearch = $this->params['enablefullsearch'];
+		$enablefacetsearch = true;
 		$enableclipboard = $this->params['enableclipboard'];
 		$attributes = $this->params['attributes'];
 		$categories = $this->params['categories'];
@@ -457,7 +460,12 @@ $(document).ready(function() {
 <?php
 		if($enablefullsearch) {
 ?>
-	  <li class="nav-item <?php echo ($fullsearch == true) ? 'active' : ''; ?>"><a class="nav-link <?php echo ($fullsearch == true) ? 'active' : ''; ?>" data-target="#fulltext" data-toggle="tab" role="button"><?php printMLText('fullsearch'); ?></a></li>
+	  <li class="nav-item <?php echo ($fullsearch == true && $facetsearch == false) ? 'active' : ''; ?>"><a class="nav-link <?php echo ($fullsearch == true && $facetsearch == false) ? 'active' : ''; ?>" data-target="#fulltext" data-toggle="tab" role="button"><?php printMLText('fullsearch'); ?></a></li>
+<?php
+		}
+		if($enablefacetsearch) {
+?>
+	  <li class="nav-item <?php echo ($facetsearch == true && $facetsearch == true) ? 'active' : ''; ?>"><a class="nav-link <?php echo ($facetsearch == true && $facetsearch == true) ? 'active' : ''; ?>" data-target="#facetfulltext" data-toggle="tab" role="button"><?php printMLText('facetfullsearch'); ?></a></li>
 <?php
 		}
 ?>
@@ -758,7 +766,7 @@ $(document).ready(function() {
 
 		// Fulltext search Form {{{
 		if($enablefullsearch) {
-	  	echo "<div class=\"tab-pane ".(($fullsearch == true) ? 'active' : '')."\" id=\"fulltext\">\n";
+	  	echo "<div class=\"tab-pane ".(($fullsearch == true && $facetsearch == false) ? 'active' : '')."\" id=\"fulltext\">\n";
 ?>
 <form class="form-horizontal" action="<?= $this->params['settings']->_httpRoot ?>out/out.Search.php" name="form2" style="min-height: 330px;">
 <input type="hidden" name="fullsearch" value="1" />
@@ -773,7 +781,7 @@ $(document).ready(function() {
 					'value'=>htmlspecialchars($this->query)
 				)
 			);
-			$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form1", M_READ, -1, $startfolder, 'folderfullsearchid'));
+			$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form2", M_READ, -1, $startfolder, 'folderfullsearchid'));
 			$this->formField(
 				getMLText("creation_date")." (".getMLText('from').")",
 				$this->getDateChooser($createstartdate, "createstart", $this->params['session']->getLanguage())
@@ -866,14 +874,12 @@ $(document).ready(function() {
 			if($facets) {
 				foreach($facets as $facetname=>$values) {
 					$multiple = true;
-//					if(in_array($facetname, ['owner', 'status', 'mimetype']))
-//						$multiple = false;
 					$options = array();
 					if($facetname == 'owner') {
 						foreach($values as $v=>$c) {
 							$uu = $dms->getUserByLogin($v);
 							if($uu) {
-								$option = array($uu->getId(), $v/*.' ('.$c.')'*/);
+								$option = array($uu->getId(), $v);
 								if(isset(${$facetname}) && in_array($uu->getId(), ${$facetname}))
 									$option[] = true;
 								else
@@ -886,7 +892,7 @@ $(document).ready(function() {
 						foreach($values as $v=>$c) {
 							$cat = $dms->getDocumentCategoryByName($v);
 							if($cat) {
-								$option = array($cat->getId(), $v/*.' ('.$c.')'*/);
+								$option = array($cat->getId(), $v);
 								if(isset(${$facetname}) && in_array($cat->getId(), ${$facetname}))
 									$option[] = true;
 								else
@@ -895,6 +901,7 @@ $(document).ready(function() {
 								$options[] = $option;
 							}
 						}
+					} elseif(substr($facetname, 0, 5) == 'attr_') {
 					} elseif($facetname == 'status') {
 						foreach($values as $v=>$c) {
 							$option = array($v, getOverallStatusText($v)/*.' ('.$c.')'*/);
@@ -905,19 +912,9 @@ $(document).ready(function() {
 							$option[] = array(array('data-subtitle', $c.' ×'));
 							$options[] = $option;
 						}
-					} elseif(substr($facetname, 0, 5) == 'attr_') {
-						foreach($values as $v=>$c) {
-							$option = array($v, $v/*.' ('.$c.')'*/);
-							if(isset($attributes[$facetname]) && in_array($v, $attributes[$facetname]))
-								$option[] = true;
-							else
-								$option[] = false;
-							$option[] = array(array('data-subtitle', $c.' ×'));
-							$options[] = $option;
-						}
 					} else {
 						foreach($values as $v=>$c) {
-							$option = array($v, $v.' ('.$c.')');
+							$option = array($v, $v);
 							if(isset(${$facetname}) && in_array($v, ${$facetname}))
 								$option[] = true;
 							else
@@ -926,27 +923,7 @@ $(document).ready(function() {
 							$options[] = $option;
 						}
 					}
-					if(substr($facetname, 0, 5) == 'attr_') {
-						if($options) {
-						$tmp = explode('_', $facetname);
-						if($attrdef = $dms->getAttributeDefinition($tmp[1]))
-							$dispname = $attrdef->getName();
-						else
-							$dispname = getMLText($facetname);
-						$this->formField(
-							$dispname,
-							array(
-								'element'=>'select',
-								'id'=>$facetname,
-								'name'=>'attributes['.$facetname.'][]',
-								'class'=>'chzn-select',
-								'attributes'=>array(array('data-placeholder', $dispname), array('data-allow-clear', 'true')),
-								'options'=>$options,
-								'multiple'=>$multiple
-							)
-						);
-						}
-					} else {
+					if(substr($facetname, 0, 5) != 'attr_') {
 						$this->formField(
 							getMLText($facetname),
 							array(
@@ -961,11 +938,179 @@ $(document).ready(function() {
 						);
 					}
 				}
+				foreach($facets as $facetname=>$values) {
+					if(substr($facetname, 0, 5) == 'attr_') {
+						/* If the facet is empty, don't show the input field */
+						if($values) {
+						$tmp = explode('_', $facetname);
+						if($attrdef = $dms->getAttributeDefinition($tmp[1])) {
+							$dispname = $attrdef->getName();
+							switch($attrdef->getType()) {
+							case 556: //SeedDMS_Core_AttributeDefinition::type_int:
+								$this->formField(
+									$dispname.' ('.getMLText('from').')',
+									array(
+										'element'=>'input',
+										'type'=>'number',
+										'id'=>$facetname,
+										'name'=>'attributes['.$facetname.'][from]',
+										'placeholder'=>implode(' ', array_keys($values)),
+									)
+								);
+								$this->formField(
+									$dispname.' ('.getMLText('to').')',
+									array(
+										'element'=>'input',
+										'type'=>'number',
+										'id'=>$facetname,
+										'name'=>'attributes['.$facetname.'][to]',
+										'placeholder'=>implode(' ', array_keys($values)),
+									)
+								);
+								break;
+							default:
+								$options = [];
+								foreach($values as $v=>$c) {
+									$option = array($v, $v);
+									if(isset($attributes[$facetname]) && in_array($v, $attributes[$facetname]))
+										$option[] = true;
+									else
+										$option[] = false;
+									$option[] = array(array('data-subtitle', $c.' ×'));
+									$options[] = $option;
+								}
+
+								if($options) {
+									$this->formField(
+										$dispname,
+										array(
+											'element'=>'select',
+											'id'=>$facetname,
+											'name'=>'attributes['.$facetname.'][]',
+											'class'=>'chzn-select',
+											'attributes'=>array(array('data-placeholder', $dispname), array('data-allow-clear', 'true')),
+											'options'=>$options,
+											'multiple'=>$multiple
+										)
+									);
+								}
+							}
+						}
+						}
+					}
+				}
 			}
 			$this->contentContainerEnd();
 			$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
 ?>
 </form>
+<?php
+			echo "</div>\n";
+		}
+		// }}}
+
+		// Fulltext search with facets Form {{{
+		if($enablefacetsearch) {
+	  	echo "<div class=\"tab-pane ".(($fullsearch == true && $facetsearch == true) ? 'active' : '')."\" id=\"facetfulltext\">\n";
+?>
+<form class="form-horizontal" action="<?= $this->params['settings']->_httpRoot ?>out/out.Search.php" name="form2" style="min-height: 330px;">
+<input type="hidden" name="fullsearch" value="1" />
+<input type="hidden" name="facetsearch" value="1" />
+<?php
+			$this->contentContainerStart();
+			$this->formField(
+				getMLText("search_query"),
+				array(
+					'element'=>'input',
+					'type'=>'search',
+					'name'=>'query',
+					'value'=>htmlspecialchars($this->query),
+					'placeholder'=>'Search in title, comments, keywords, content',
+				)
+			);
+			$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form3", M_READ, -1, $startfolder, 'folderfullsearchid'));
+
+			$this->contentContainerEnd();
+			$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
+			echo "<p></p>";
+
+			if($facets) {
+				$menuitems = [];
+				foreach($facets as $facetname=>$values) {
+					if(substr($facetname, 0, 5) == 'attr_') {
+						$tmp = explode('_', $facetname);
+						if($attrdef = $dms->getAttributeDefinition($tmp[1])) {
+							$dispname = $attrdef->getName();
+							/* Create a link to remove the filter */
+							$allparams = $request->query->all();
+							if(isset($allparams['attributes'][$facetname])) {
+								$oldvalue = is_array($allparams['attributes'][$facetname]) ? implode(',', $allparams['attributes'][$facetname]) : $allparams['attributes'][$facetname];
+								unset($allparams['attributes'][$facetname]);
+								$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
+								$menuitems[] = array('label'=>$dispname.' = '.$oldvalue, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+							}
+						}
+					} else {
+						/* Create a link to remove the filter */
+						$allparams = $request->query->all();
+						if(isset($allparams[$facetname])) {
+							$oldvalue = is_array($allparams[$facetname]) ? implode(',', $allparams[$facetname]) : $allparams[$facetname];
+							unset($allparams[$facetname]);
+							$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
+							$menuitems[] = array('label'=>getMLText($facetname).' = '.$oldvalue, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+						}
+					}
+				}
+				if($menuitems) {
+					ob_start();
+					self::showNavigationListWithBadges($menuitems);
+					$content = ob_get_clean();
+					$this->printAccordion(getMLText('current_filter'), $content, true);
+				}
+
+				foreach($facets as $facetname=>$values) {
+					if(substr($facetname, 0, 5) == 'attr_') {
+						$tmp = explode('_', $facetname);
+						if($attrdef = $dms->getAttributeDefinition($tmp[1])) {
+							$dispname = $attrdef->getName();
+							/* See below on an explaination for the if statement */
+							if($values && (count($values) > 1 || reset($values) < $total)) {
+								$menuitems = array();
+								arsort($values);
+								foreach($values as $v=>$c) {
+									$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$request->getRequestUri().'&attributes['.$facetname.'][]='.urlencode($v), 'badge'=>$c, 'attributes'=>array(array('data-href', $request->getRequestUri().'&'.$facetname.'='.$v), array('data-action', "printOpenTasksList")));
+								}
+								ob_start();
+								self::showNavigationListWithBadges($menuitems);
+								$content = ob_get_clean();
+								$this->printAccordion($dispname, $content);
+							}
+						}
+					} else {
+						/* Further filter makes onle sense if the facet has mor than 1 value
+						 * or in case of 1 value that value has a count < $total. That second
+						 * case will reduce the result set on those objects which the field
+						 * actually set.
+						 */
+						if($values && (count($values) > 1 || reset($values) < $total)) {
+							$menuitems = array();
+							arsort($values);
+							foreach($values as $v=>$c) {
+								$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$request->getRequestUri().'&'.$facetname.'[]='.urlencode($v), 'badge'=>$c, 'attributes'=>array(array('data-href', "#initlist"), array('data-action', "printOpenTasksList")));
+							}
+							ob_start();
+							self::showNavigationListWithBadges($menuitems);
+							$content = ob_get_clean();
+							$this->printAccordion(getMLText($facetname), $content);
+						}
+					}
+				}
+			}
+//			echo "<pre>";
+//			print_r($facets);
+//			echo "</pre>";
+?>
+</form>
 <?php
 			echo "</div>\n";
 		}

From ebf4f5a829165e7bef85a5fc47a5938f5975de4e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 23 Apr 2023 19:06:54 +0200
Subject: [PATCH 1966/2006] showNavigationListWithBadges() skips badge if not
 set, fix creating link

---
 views/bootstrap/class.Bootstrap.php   | 5 +++--
 views/bootstrap4/class.Bootstrap4.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 81dc2f34b..b06ba26bf 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -600,13 +600,14 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		foreach($menuitems as $menuitem) {
 			$content .= "  <li class=\"".(!empty($menuitem['active']) ? ' active' : '')."\">\n";
 			$content .= '    <a';
-			$content .= !empty($menuitem['link']) ? 'href="'.$menuitem['link'].'"' : '';
+			$content .= !empty($menuitem['link']) ? ' href="'.$menuitem['link'].'"' : '';
 			if(!empty($menuitem['attributes']))
 				foreach($menuitem['attributes'] as $attr)
 					$content .= ' '.$attr[0].'="'.$attr[1].'"';
 			$content .= '>';
 			$content .= $menuitem['label'];
-			$content .= '<span class="badge badge-right">'.$menuitem['badge']."</span>";
+			if(!empty($menuitem['badge']))
+				$content .= '<span class="badge badge-right">'.$menuitem['badge']."</span>";
 			$content .= '    </a>'."\n";
 			$content .= "  </li>\n";
 		}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index aa31deaac..ac611ffef 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -605,14 +605,15 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		foreach($menuitems as $menuitem) {
 			$content .= "  <li class=\"list-group-item d-flex justify-content-between align-items-center".(!empty($menuitem['active']) ? ' active' : '')."\">\n";
 			$content .= '    <a';
-			$content .= !empty($menuitem['link']) ? 'href="'.$menuitem['link'].'"' : '';
+			$content .= !empty($menuitem['link']) ? ' href="'.$menuitem['link'].'"' : '';
 			if(!empty($menuitem['attributes']))
 				foreach($menuitem['attributes'] as $attr)
 					$content .= ' '.$attr[0].'="'.$attr[1].'"';
 			$content .= '>';
 			$content .= $menuitem['label'];
 			$content .= '    </a>'."\n";
-			$content .= '<span class="badge badge-primary badge-pill">'.$menuitem['badge']."</span>";
+			if(!empty($menuitem['badge']))
+				$content .= '<span class="badge badge-primary badge-pill">'.$menuitem['badge']."</span>";
 			$content .= "  </li>\n";
 		}
 

From 94ab8e9a21f1ed79b34b020400da204145e76d2e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 23 Apr 2023 19:14:15 +0200
Subject: [PATCH 1967/2006] use translated string

---
 views/bootstrap/class.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 769be8aeb..d63f3a70d 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1025,7 +1025,7 @@ $(document).ready(function() {
 					'type'=>'search',
 					'name'=>'query',
 					'value'=>htmlspecialchars($this->query),
-					'placeholder'=>'Search in title, comments, keywords, content',
+					'placeholder'=>getMLText('search_query_placeholder'),
 				)
 			);
 			$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form3", M_READ, -1, $startfolder, 'folderfullsearchid'));

From ce7cf33514ccd98e642f9ee2b5535a0dc42481ca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 23 Apr 2023 19:15:09 +0200
Subject: [PATCH 1968/2006] update translation

---
 languages/ar_EG/lang.inc |  8 ++++++++
 languages/bg_BG/lang.inc |  8 ++++++++
 languages/ca_ES/lang.inc |  8 ++++++++
 languages/cs_CZ/lang.inc |  8 ++++++++
 languages/de_DE/lang.inc | 12 ++++++++++--
 languages/el_GR/lang.inc |  8 ++++++++
 languages/en_GB/lang.inc | 10 +++++++++-
 languages/es_ES/lang.inc |  8 ++++++++
 languages/fr_FR/lang.inc |  8 ++++++++
 languages/hr_HR/lang.inc |  8 ++++++++
 languages/hu_HU/lang.inc |  8 ++++++++
 languages/id_ID/lang.inc |  8 ++++++++
 languages/it_IT/lang.inc |  8 ++++++++
 languages/ko_KR/lang.inc |  8 ++++++++
 languages/lo_LA/lang.inc |  8 ++++++++
 languages/nb_NO/lang.inc |  8 ++++++++
 languages/nl_NL/lang.inc |  8 ++++++++
 languages/pl_PL/lang.inc |  8 ++++++++
 languages/pt_BR/lang.inc |  8 ++++++++
 languages/ro_RO/lang.inc |  8 ++++++++
 languages/ru_RU/lang.inc |  8 ++++++++
 languages/sk_SK/lang.inc |  8 ++++++++
 languages/sv_SE/lang.inc |  8 ++++++++
 languages/tr_TR/lang.inc |  8 ++++++++
 languages/uk_UA/lang.inc |  8 ++++++++
 languages/zh_CN/lang.inc |  8 ++++++++
 languages/zh_TW/lang.inc |  8 ++++++++
 27 files changed, 219 insertions(+), 3 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 6ece51e4e..2fc07f597 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -642,6 +642,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'لائحة الإضافات حسب الإصدار',
+'facetfullsearch' => '',
 'february' => 'فبراير',
 'file' => 'ملف',
 'files' => 'ملفات',
@@ -1049,6 +1050,7 @@ URL: [url]',
 'objectcheck' => 'التحقق من مستند/مجلد',
 'object_check_critical' => 'التحقق من الشيء في حالة حرجة',
 'object_check_warning' => 'تحذير في التحقق من شيء',
+'objtype_unknown' => '',
 'obsolete' => 'مهمل',
 'october' => 'اكتوبر',
 'old' => 'قديم',
@@ -1118,6 +1120,7 @@ URL: [url]',
 'preview_markdown' => 'معاينة التخفيضات',
 'preview_pdf' => 'معاينة ملف pdf',
 'preview_plain' => 'معاينة سطحية',
+'preview_text' => '',
 'previous_state' => 'حالة سابقة',
 'previous_versions' => 'اصدارات سابقة',
 'process' => 'سير العمل',
@@ -1345,6 +1348,7 @@ URL: [url]',
 'search_mode_or' => 'على الاقل كلمة واحدة',
 'search_no_results' => 'لا يوجد مستند مطابق للبحث',
 'search_query' => 'بحث عن',
+'search_query_placeholder' => '',
 'search_report' => 'وجد [doccount] مستند و [foldercount] مجلد في [searchtime] ثانية.',
 'search_report_fulltext' => 'وجد [doccount] مستندات',
 'search_resultmode' => 'وضع نتائج البحث',
@@ -1659,6 +1663,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'luceneClassDir',
 'settings_luceneDir' => 'luceneDir',
 'settings_luceneDir_desc' => 'luceneDir',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'maxDirID',
 'settings_maxDirID_desc' => 'maxDirID',
 'settings_maxExecutionTime' => 'الحد الأقصى لوقت التنفيذ',
@@ -1778,6 +1784,8 @@ URL: [url]',
 'settings_strictFormCheck' => 'فحص نموذج صارم',
 'settings_strictFormCheck_desc' => 'فحص نموذج صارم',
 'settings_suggestionvalue' => 'قيمة الاقتراح',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'نظام',
 'settings_tasksInMenu' => 'قائمة المهام',
 'settings_tasksInMenu_approval' => 'موافقة قائمة المهام',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 2c2eef7ef..9b7d5ea26 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -591,6 +591,7 @@ $text = array(
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => '',
+'facetfullsearch' => '',
 'february' => 'Февруари',
 'file' => 'Файл',
 'files' => 'Файлове',
@@ -954,6 +955,7 @@ $text = array(
 'objectcheck' => 'Проверка на Папка/Документ',
 'object_check_critical' => '',
 'object_check_warning' => '',
+'objtype_unknown' => '',
 'obsolete' => 'Остарял',
 'october' => 'октомври',
 'old' => 'Стар',
@@ -1017,6 +1019,7 @@ $text = array(
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
+'preview_text' => '',
 'previous_state' => 'Предишно състояние',
 'previous_versions' => 'Предишни версии',
 'process' => '',
@@ -1208,6 +1211,7 @@ $text = array(
 'search_mode_or' => 'поне една дума',
 'search_no_results' => 'Няма документи, отговарящи на запитването',
 'search_query' => 'Търси!',
+'search_query_placeholder' => '',
 'search_report' => 'Намерени са [doccount] документа и [foldercount] папки',
 'search_report_fulltext' => 'Намерени са [doccount] документа',
 'search_resultmode' => '',
@@ -1522,6 +1526,8 @@ $text = array(
 'settings_luceneClassDir_desc' => 'Път към SeedDMS_Lucene (не е задължително)',
 'settings_luceneDir' => 'Каталог за пълнотекстовия индекс',
 'settings_luceneDir_desc' => 'Път, където Lucene ще пише своя индекс',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Максимален ID на папка',
 'settings_maxDirID_desc' => 'Максимум подпапки в родителската папка. По подразбиране: 0.',
 'settings_maxExecutionTime' => 'Максимално време за изпълнение (с)',
@@ -1641,6 +1647,8 @@ $text = array(
 'settings_strictFormCheck' => 'Пълная проверка на формата',
 'settings_strictFormCheck_desc' => 'Ако е включено, то всички полета на формата ще се проверяват за запъване. Ако е включено, то коментарите и ключовите думи ще станат опционални. Коментарите винаги са обезателни при рецензиране или изменение на статуса.',
 'settings_suggestionvalue' => 'Предлагаемо значение',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Система',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 0b42d14e6..89c32607b 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -596,6 +596,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => '',
+'facetfullsearch' => '',
 'february' => 'Febrer',
 'file' => 'Fitxer',
 'files' => 'Fitxers',
@@ -959,6 +960,7 @@ URL: [url]',
 'objectcheck' => 'Carpeta / Comprobació del document',
 'object_check_critical' => '',
 'object_check_warning' => '',
+'objtype_unknown' => '',
 'obsolete' => 'Obsolet',
 'october' => 'Octubre',
 'old' => 'Vell',
@@ -1022,6 +1024,7 @@ URL: [url]',
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
+'preview_text' => '',
 'previous_state' => '',
 'previous_versions' => 'Versions anteriors',
 'process' => '',
@@ -1213,6 +1216,7 @@ URL: [url]',
 'search_mode_or' => 'si més no, un mot',
 'search_no_results' => 'No hi ha documents que coincideixn amb la seva cerca',
 'search_query' => 'Cercar',
+'search_query_placeholder' => '',
 'search_report' => 'Trobats [count] documents',
 'search_report_fulltext' => '',
 'search_resultmode' => 'Resultats',
@@ -1527,6 +1531,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'Path to LetoDMS_Lucene (optional)',
 'settings_luceneDir' => '',
 'settings_luceneDir_desc' => 'Path to LetoDMS_Lucene (optional)',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => '',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
@@ -1646,6 +1652,8 @@ URL: [url]',
 'settings_strictFormCheck' => 'Strict Form Check',
 'settings_strictFormCheck_desc' => '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',
 'settings_suggestionvalue' => 'Suggestion value',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'System',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index ce128dc2b..7ed067e0f 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -666,6 +666,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Verze',
+'facetfullsearch' => '',
 'february' => 'Únor',
 'file' => 'Soubor',
 'files' => 'Soubory',
@@ -1080,6 +1081,7 @@ URL: [url]',
 'objectcheck' => 'Kontrola složky/dokumentu',
 'object_check_critical' => 'Kritické chyby',
 'object_check_warning' => 'Varování',
+'objtype_unknown' => '',
 'obsolete' => 'Zastaralé',
 'october' => 'Říjen',
 'old' => 'Starý',
@@ -1153,6 +1155,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'preview_markdown' => 'Náhled úpravy textu Markdown',
 'preview_pdf' => 'Náhled jako PDF',
 'preview_plain' => 'Náhled jako text',
+'preview_text' => '',
 'previous_state' => 'Předchozí stav',
 'previous_versions' => 'Předešlé verze',
 'process' => 'Proces',
@@ -1412,6 +1415,7 @@ URL: [url]',
 'search_mode_or' => 'alespoň jedno ze slov',
 'search_no_results' => 'Vašemu dotazu nevyhovují žádné dokumenty',
 'search_query' => 'Hledat',
+'search_query_placeholder' => '',
 'search_report' => 'Nalezených [count] dokumentů odpovídajících dotazu',
 'search_report_fulltext' => 'Found [doccount] documents',
 'search_resultmode' => 'Režim výsledků',
@@ -1731,6 +1735,8 @@ Jméno: [username]
 'settings_luceneClassDir_desc' => 'Cesta k SeedDMS_Lucene (volitelná)',
 'settings_luceneDir' => 'Adresář pro fulltextový index',
 'settings_luceneDir_desc' => 'Cesta k indexu Lucene',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Max Directory ID',
 'settings_maxDirID_desc' => 'Maximální počet podadresářů v jednom nadřazeném adresáři. Neměňte tuto hodnotu, pokud nevíte, co děláte! Výchozí hodnota: 0.',
 'settings_maxExecutionTime' => 'Max Doba provedení (s)',
@@ -1850,6 +1856,8 @@ Jméno: [username]
 'settings_strictFormCheck' => 'Strict Form Check',
 'settings_strictFormCheck_desc' => 'Přísná kontrola formuláře. Je-li nastavena na hodnotu true, všechny hodnoty ve formuláři budou zkontrolovány na hodnotu. Pokud je nastaveno na hodnotu false, pak (většina) komentářů a polí klíčových slov se stávají nepovinnými. Komentář je vždy vyžadován při odesílání recenze nebo převyšujícího stavu dokumentu',
 'settings_suggestionvalue' => 'Navrhovaná hodnota',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Vybrané úkoly',
 'settings_tasksInMenu_approval' => 'Schvalování',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 1c0560ba8..b2a00492f 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3200), dgrutsch (22)
+//    Translators: Admin (3209), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -773,6 +773,7 @@ URL: [url]</p>',
 'extension_readme' => 'Readme',
 'extension_toggle_error' => 'Konnte Erweiterung nicht aus/einschalten',
 'extension_version_list' => 'Versionen',
+'facetfullsearch' => 'Volltextsuche (Facetten)',
 'february' => 'Februar',
 'file' => 'Datei',
 'files' => 'Dateien',
@@ -1252,6 +1253,7 @@ URL: [url]</p>',
 'objectcheck' => 'Ordner- und Dokumentenprüfung',
 'object_check_critical' => 'Kritische Fehler',
 'object_check_warning' => 'Warnungen',
+'objtype_unknown' => 'unbekannt',
 'obsolete' => 'veraltet',
 'october' => 'Oktober',
 'old' => 'Alt',
@@ -1345,6 +1347,7 @@ Sollen Sie danach immer noch Probleme bei der Anmeldung haben, dann kontaktieren
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Vorschau als PDF',
 'preview_plain' => 'Text',
+'preview_text' => 'Vorschau als Text',
 'previous_state' => 'Voriger Status',
 'previous_versions' => 'Vorhergehende Versionen',
 'process' => 'Prozess',
@@ -1742,6 +1745,7 @@ URL: [url]</p>',
 'search_mode_or' => 'mind. ein Begriff',
 'search_no_results' => 'Die Suche lieferte leider keine Treffer.',
 'search_query' => 'Suchbegriffe',
+'search_query_placeholder' => 'Im Titel, Kommentar, Stichworten, Inhalt suchen',
 'search_report' => 'Die Suche lieferte [doccount] Dokumente und [foldercount] Ordner in [searchtime] Sek.',
 'search_report_fulltext' => 'Die Suche lieferte [doccount] Dokumente',
 'search_resultmode' => 'Ergebnis',
@@ -1779,7 +1783,7 @@ URL: [url]</p>',
 'select_one' => 'Bitte wählen',
 'select_owner' => 'Klicken zur Auswahl eines Besitzers',
 'select_record_type' => 'Typ auswählen',
-'select_status' => 'Klicken zur Auswaohl des Dokumentstatus',
+'select_status' => 'Klicken zur Auswahl des Dokumentstatus',
 'select_user' => 'Benutzer auswählen',
 'select_users' => 'Klicken zur Auswahl eines Benutzers',
 'select_value' => 'Wert auswählen',
@@ -2063,6 +2067,8 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'settings_luceneClassDir_desc' => 'Pfad zum PEAR-Paket SeedDMS_Lucene (optional). Lassen Sie diese Einstellung leer, wenn SeedDMS_Lucene ohnehin von PHP gefunden wird, weil es beispielweise im \'Extra PHP Include-Path\' installiert ist.',
 'settings_luceneDir' => 'Verzeichnis für Volltext-Index',
 'settings_luceneDir_desc' => 'Verzeichnis in dem der Lucene-Index abgelegt wird.',
+'settings_markdownComments' => 'Kommentare als Markdown interpretieren',
+'settings_markdownComments_desc' => 'Einschalten, um die Kommentare von Ordnern, Dokumenten und Versionen als Markdown zu interpretieren.',
 'settings_maxDirID' => 'Max. Anzahl Unterverzeichnisse',
 'settings_maxDirID_desc' => 'Maximale Anzahl der Unterverzeichnisse in einem Verzeichnis. Ändern Sie diesen Wert nur, wenn Sie genau wissen was Sie tun! Voreingestellt ist 0.',
 'settings_maxExecutionTime' => 'Max. Ausführungszeit (s)',
@@ -2182,6 +2188,8 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'settings_strictFormCheck' => 'Genauer Formular-Check',
 'settings_strictFormCheck_desc' => 'Genaue Formularprüfung. Wenn dies eingeschaltet wird, dann werden alle Felder einiger Formulare auf einen Wert überprüft, anderenfalls sind einige Eingabefelder optional. Ein Kommentar ist beim Prüfen oder Freigeben eines Dokuments oder einer Statusänderung immer notwendig.',
 'settings_suggestionvalue' => 'Vorgeschlagener Wert',
+'settings_suggestTerms' => 'Begriffe vorschlagen',
+'settings_suggestTerms_desc' => 'Das Suchfeld im Hauptmenu listet nicht nur Dokumente und Ordner, sondern schlägt auch Suchbegriffe vor.',
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Ausgewähtlte Aufgaben',
 'settings_tasksInMenu_approval' => 'Freigaben',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index faa0493f5..f68e75e7c 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -591,6 +591,7 @@ $text = array(
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => '',
+'facetfullsearch' => '',
 'february' => 'Φεβρουάριος',
 'file' => 'Αρχείο',
 'files' => 'Αρχεία',
@@ -965,6 +966,7 @@ URL: [url]',
 'objectcheck' => 'Αναζήτηση σε αρχεία και φακέλους',
 'object_check_critical' => '',
 'object_check_warning' => '',
+'objtype_unknown' => '',
 'obsolete' => '',
 'october' => 'Οκτώβριος',
 'old' => 'Παλιό',
@@ -1028,6 +1030,7 @@ URL: [url]',
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
+'preview_text' => '',
 'previous_state' => '',
 'previous_versions' => '',
 'process' => '',
@@ -1219,6 +1222,7 @@ URL: [url]',
 'search_mode_or' => '',
 'search_no_results' => '',
 'search_query' => '',
+'search_query_placeholder' => '',
 'search_report' => '',
 'search_report_fulltext' => '',
 'search_resultmode' => '',
@@ -1533,6 +1537,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => '',
 'settings_luceneDir' => '',
 'settings_luceneDir_desc' => '',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => '',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
@@ -1652,6 +1658,8 @@ URL: [url]',
 'settings_strictFormCheck' => '',
 'settings_strictFormCheck_desc' => '',
 'settings_suggestionvalue' => '',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => '',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index e3bdc656c..feb8da412 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2294), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2303), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -773,6 +773,7 @@ URL: [url]</p>',
 'extension_readme' => 'Readme',
 'extension_toggle_error' => 'Could not toggle extension',
 'extension_version_list' => 'Versions',
+'facetfullsearch' => 'Full text search (facetts)',
 'february' => 'February',
 'file' => 'File',
 'files' => 'Files',
@@ -1255,6 +1256,7 @@ URL: [url]</p>',
 'objectcheck' => 'Folder/Document check',
 'object_check_critical' => 'Critical errors',
 'object_check_warning' => 'Warnings',
+'objtype_unknown' => 'unknown',
 'obsolete' => 'Obsolete',
 'october' => 'October',
 'old' => 'Old',
@@ -1348,6 +1350,7 @@ If you still have problems to login, then please contact your administrator.',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Preview as PDF',
 'preview_plain' => 'Text',
+'preview_text' => 'Preview text',
 'previous_state' => 'Previous state',
 'previous_versions' => 'Previous versions',
 'process' => 'Process',
@@ -1745,6 +1748,7 @@ URL: [url]</p>',
 'search_mode_or' => 'at least one word',
 'search_no_results' => 'There are no documents that match your search',
 'search_query' => 'Search for',
+'search_query_placeholder' => 'Search in title, comments, keywords, content',
 'search_report' => 'Found [doccount] documents and [foldercount] folders in [searchtime] sec.',
 'search_report_fulltext' => 'Found [doccount] documents',
 'search_resultmode' => 'Search result',
@@ -2066,6 +2070,8 @@ If you did not receive a password, please use the password forgotten function on
 'settings_luceneClassDir_desc' => 'Path to SeedDMS_Lucene (optional). Leave this empty if you have installed SeedDMS_Lucene at a place where it can be found by PHP, e.g. Extra PHP Include-Path',
 'settings_luceneDir' => 'Directory for full text index',
 'settings_luceneDir_desc' => 'Path to Lucene index',
+'settings_markdownComments' => 'Parse comments as markdown',
+'settings_markdownComments_desc' => 'Enable this, if comments of folders, documents and versions are interpreted as markdown.',
 'settings_maxDirID' => 'Max Directory ID',
 'settings_maxDirID_desc' => 'Maximum number of sub-directories per parent directory. Do not change this value unless you know what you do! Default: 0.',
 'settings_maxExecutionTime' => 'Max Execution Time (s)',
@@ -2185,6 +2191,8 @@ If you did not receive a password, please use the password forgotten function on
 'settings_strictFormCheck' => 'Strict Form Check',
 'settings_strictFormCheck_desc' => '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',
 'settings_suggestionvalue' => 'Suggestion value',
+'settings_suggestTerms' => 'Suggest terms',
+'settings_suggestTerms_desc' => 'If enabled, the search field in the header will not just list documents and folders, but also possible search terms',
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Selected tasks',
 'settings_tasksInMenu_approval' => 'Approvals',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 3b514793f..aba9b2e16 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -655,6 +655,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Versiones',
+'facetfullsearch' => '',
 'february' => 'Febrero',
 'file' => 'Fichero',
 'files' => 'Ficheros',
@@ -1068,6 +1069,7 @@ URL: [url]',
 'objectcheck' => 'Chequeo de carpeta/documento',
 'object_check_critical' => 'Errores críticos',
 'object_check_warning' => 'Alertas',
+'objtype_unknown' => '',
 'obsolete' => 'Obsoleto',
 'october' => 'Octubre',
 'old' => 'Viejo',
@@ -1145,6 +1147,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
+'preview_text' => '',
 'previous_state' => 'Estado anterior',
 'previous_versions' => 'Versiones anteriores',
 'process' => 'Proceso',
@@ -1372,6 +1375,7 @@ URL: [url]',
 'search_mode_or' => 'al menos una palabra',
 'search_no_results' => 'No hay documentos que coincidan con su búsqueda',
 'search_query' => 'Buscar',
+'search_query_placeholder' => '',
 'search_report' => 'Encontrados [doccount] documentos y [foldercount] carpetas en [searchtime] s.',
 'search_report_fulltext' => 'Encontrados [doccount] documentos',
 'search_resultmode' => 'Resultado de la búsqueda',
@@ -1686,6 +1690,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'Ruta hacia SeedDMS_Lucene (opcional)',
 'settings_luceneDir' => 'Carpeta del índice de texto completo',
 'settings_luceneDir_desc' => 'Ruta hacia el índice Lucene',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'ID máximo de carpeta',
 'settings_maxDirID_desc' => 'Número máximo de subcarpetas por carpeta principal. Por defecto: 0.',
 'settings_maxExecutionTime' => 'Tiempo máximo de ejecución (s)',
@@ -1805,6 +1811,8 @@ URL: [url]',
 'settings_strictFormCheck' => 'Comprobación estricta de formulario',
 'settings_strictFormCheck_desc' => 'Comprobación estricta de formulario. Si se configura como cierto, entonces se comprobará el valor de todos los campos del formulario. Si se configura como false, entonces (la mayor parte) de los comentarios y campos de palabras clave se convertirán en opcionales. Los comentarios siempre son obligatorios al enviar una revisión o sobreescribir el estado de un documento',
 'settings_suggestionvalue' => 'Valor sugerido',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Sistema',
 'settings_tasksInMenu' => 'Tareas seleccionadas',
 'settings_tasksInMenu_approval' => 'Aprobaciones',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index d51073b8c..a761991ca 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -759,6 +759,7 @@ URL : [url]</p>',
 'extension_readme' => '',
 'extension_toggle_error' => 'Impossible d’activer/désactiver l’extension',
 'extension_version_list' => 'Versions',
+'facetfullsearch' => '',
 'february' => 'Février',
 'file' => 'Fichier',
 'files' => 'Fichiers',
@@ -1242,6 +1243,7 @@ URL : [url]</p>',
 'objectcheck' => 'Vérification des dossiers et documents',
 'object_check_critical' => 'Erreurs critiques',
 'object_check_warning' => 'Avertissements',
+'objtype_unknown' => '',
 'obsolete' => 'Obsolète',
 'october' => 'Octobre',
 'old' => 'Ancien',
@@ -1333,6 +1335,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'preview_markdown' => 'Prévisualisation',
 'preview_pdf' => 'Prévisualisation en PDF',
 'preview_plain' => 'Texte',
+'preview_text' => '',
 'previous_state' => 'État précédent',
 'previous_versions' => 'Versions précédentes',
 'process' => 'Processus',
@@ -1730,6 +1733,7 @@ URL : [url]</p>',
 'search_mode_or' => 'au moins un mot',
 'search_no_results' => 'Aucun document ne correspond à la recherche',
 'search_query' => 'Rechercher',
+'search_query_placeholder' => '',
 'search_report' => '[doccount] documents trouvé(s) et [foldercount] dossiers en [searchtime] sec.',
 'search_report_fulltext' => '[doccount] documents trouvé(s)',
 'search_resultmode' => 'Résultat de la recherche',
@@ -2049,6 +2053,8 @@ Nom : [username]
 'settings_luceneClassDir_desc' => 'Chemin vers SeedDMS_Lucene (optionnel)',
 'settings_luceneDir' => 'Répertoire index Lucene',
 'settings_luceneDir_desc' => 'Chemin vers index Lucene',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Nombre max. de sous-dossiers',
 'settings_maxDirID_desc' => 'Nombre maximum de sous-répertoires par le répertoire parent. Par défaut: 0.',
 'settings_maxExecutionTime' => 'Temps d\'exécution max (s)',
@@ -2168,6 +2174,8 @@ Nom : [username]
 'settings_strictFormCheck' => 'Formulaires stricts',
 'settings_strictFormCheck_desc' => 'Contrôle strict des formulaires. Si cette option est activée, tous les champs du formulaire doivent être saisis. Sinon, la plupart des champs (commentaires et mots-clés) sont facultatifs. Les commentaires sont toujours obligatoires lors de la soumission d\'une vérification ou du changement de statut ​​d’un document.',
 'settings_suggestionvalue' => 'Valeur suggérée',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Système',
 'settings_tasksInMenu' => 'Tâches sélectionnées',
 'settings_tasksInMenu_approval' => 'Approbations',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 34e50da7b..5fbc59237 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -654,6 +654,7 @@ Internet poveznica: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Inačice',
+'facetfullsearch' => '',
 'february' => 'Veljača',
 'file' => 'Datoteka',
 'files' => 'Datoteke',
@@ -1060,6 +1061,7 @@ Internet poveznica: [url]',
 'objectcheck' => 'Provjera mapa / dokumenata',
 'object_check_critical' => '',
 'object_check_warning' => '',
+'objtype_unknown' => '',
 'obsolete' => 'Zastarjelo',
 'october' => 'Listopad',
 'old' => 'Staro',
@@ -1137,6 +1139,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'preview_markdown' => 'Smanjenje',
 'preview_pdf' => '',
 'preview_plain' => 'Obični tekst',
+'preview_text' => '',
 'previous_state' => 'Prethodni status',
 'previous_versions' => 'Prethodne verzije',
 'process' => 'proces',
@@ -1381,6 +1384,7 @@ Internet poveznica: [url]',
 'search_mode_or' => 'najmanje jedna riječ',
 'search_no_results' => 'Nema dokumenata koji odgovaraju vašoj pretrazi',
 'search_query' => 'Traži',
+'search_query_placeholder' => '',
 'search_report' => 'Pronađeno [doccount] dokumenata i [foldercount] mapa za [searchtime] sek.',
 'search_report_fulltext' => 'Pronađeno [doccount] dokumenata',
 'search_resultmode' => 'Prikaz rezultata pretraživanja',
@@ -1695,6 +1699,8 @@ Internet poveznica: [url]',
 'settings_luceneClassDir_desc' => 'Putanja do ProsperaDMS_Lucene (opcija). Ostavite ovo prazno ako ste instalirali ProsperaDMS_Lucene na mjestu gdje se može pronaći PHP-om, npr. Extra PHP Include-Path',
 'settings_luceneDir' => 'Mapa za indeksiranje cijelog teksta',
 'settings_luceneDir_desc' => 'Putanja to Lucene indeksa',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Max Directory ID',
 'settings_maxDirID_desc' => 'Maksimalni broj podmapa po nadređenoj mapi. Zadano: 0.',
 'settings_maxExecutionTime' => 'Max. vrijeme izvršenja (s)',
@@ -1814,6 +1820,8 @@ Internet poveznica: [url]',
 'settings_strictFormCheck' => 'Provjera striktnog obrasca',
 'settings_strictFormCheck_desc' => 'Provjeravanje striktnog obrasca. Ako je postavljeno na "true", tada će svim poljima u obrascu biti provjerena vrijednost. Ako je postavljeno na "false", tada (uglavnom) će polja komentara i ključnih riječi postati izborna. Komentari se uvijek zahtjevaju kada se podnose pregledi ili obilaženje statusa dokumenta',
 'settings_suggestionvalue' => 'Predložena vrijednost',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Sustav',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 77aeeee9e..a7c995d39 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -649,6 +649,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Verziók',
+'facetfullsearch' => '',
 'february' => 'Február',
 'file' => 'Állomány',
 'files' => 'Állományok',
@@ -1056,6 +1057,7 @@ URL: [url]',
 'objectcheck' => 'Mappa/Dokumentum ellenőrzés',
 'object_check_critical' => '',
 'object_check_warning' => '',
+'objtype_unknown' => '',
 'obsolete' => 'Elavult',
 'october' => 'Október',
 'old' => 'Régi',
@@ -1133,6 +1135,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
+'preview_text' => '',
 'previous_state' => 'Előző állapot',
 'previous_versions' => 'Előző változatok',
 'process' => 'Folyamat',
@@ -1359,6 +1362,7 @@ URL: [url]',
 'search_mode_or' => 'egyezés legalább egy szóra',
 'search_no_results' => 'Nem található a keresett kifejezésnek megfelelő dokumentum',
 'search_query' => 'Keresés erre',
+'search_query_placeholder' => '',
 'search_report' => '[searchtime] másodperc alatt [doccount] dokumentumot és [foldercount] mappát találtunk.',
 'search_report_fulltext' => '[doccount] dokumentum található',
 'search_resultmode' => 'Keresés eredménye',
@@ -1673,6 +1677,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'Elérési útvonal a SeedDMS_Lucene programhoz (opcionális). Hagyja üresen, ha már telepített SeedDMS_Lucene alkalmazást olyan helyre, ahol azt megtalálja a PHP, pl.: Extra PHP Include-Path segítségével',
 'settings_luceneDir' => 'Teljes szöveg index könyvtára',
 'settings_luceneDir_desc' => 'Lucene index elérési útvonal',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Legnagyobb könyvtár azonosító',
 'settings_maxDirID_desc' => 'Szülő könyvtárban lévő alkönyvtárak maximális mennyisége, Alapérték: 0.',
 'settings_maxExecutionTime' => 'Maximális végrehajtási idő (s)',
@@ -1792,6 +1798,8 @@ URL: [url]',
 'settings_strictFormCheck' => 'Szigorú űrlap ellenőrzés',
 'settings_strictFormCheck_desc' => 'Szigorú űrlap ellenőrzés. Ha igazra állítja, minden űrlapmező ellenőrizve lesz egy értékkel. Ha hamisra állítja, akkor (a legtöbb) megjegyzés és kulcsszó mező opcionális. Megjegyzések mindig szükségesek amikor felülvizsgálat vagy dokumentum állapot felülírás történik',
 'settings_suggestionvalue' => 'Javasolt érték',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Rendszer',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index 08e08a449..19ae2e573 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -694,6 +694,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => 'Tidak dapat mengaktifkan ekstensi',
 'extension_version_list' => 'Versi',
+'facetfullsearch' => '',
 'february' => 'Februari',
 'file' => 'Berkas',
 'files' => '',
@@ -1126,6 +1127,7 @@ URL: [url]</p>',
 'objectcheck' => 'Pemeriksaan Folder/Dokumen',
 'object_check_critical' => 'Kesalahan kritis',
 'object_check_warning' => 'Peringatan',
+'objtype_unknown' => '',
 'obsolete' => 'Usang',
 'october' => 'Oktober',
 'old' => 'Lawas',
@@ -1218,6 +1220,7 @@ Jika Anda masih mengalami masalah untuk login, silakan hubungi administrator And
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Lihat sebagai PDF',
 'preview_plain' => 'Text',
+'preview_text' => '',
 'previous_state' => '',
 'previous_versions' => 'Versi sebelumnya',
 'process' => 'Proses',
@@ -1426,6 +1429,7 @@ URL: [url]',
 'search_mode_or' => 'setidaknya satu kata',
 'search_no_results' => '',
 'search_query' => 'Pencarian untuk',
+'search_query_placeholder' => '',
 'search_report' => 'Ditemukan [doccount] dokumen dan [foldercount] folder dalam [searchtime] detik.',
 'search_report_fulltext' => 'Ditemukan [doccount] dokumen',
 'search_resultmode' => 'Hasil pencarian',
@@ -1747,6 +1751,8 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'settings_luceneClassDir_desc' => '',
 'settings_luceneDir' => '',
 'settings_luceneDir_desc' => '',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => '',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
@@ -1866,6 +1872,8 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'settings_strictFormCheck' => '',
 'settings_strictFormCheck_desc' => '',
 'settings_suggestionvalue' => '',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Sistem',
 'settings_tasksInMenu' => 'Tugas yang dipilih',
 'settings_tasksInMenu_approval' => 'Persetujuan',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 327a951ea..60ecc8858 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -659,6 +659,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Versioni',
+'facetfullsearch' => '',
 'february' => 'Febbraio',
 'file' => 'File',
 'files' => 'Files',
@@ -1066,6 +1067,7 @@ URL: [url]',
 'objectcheck' => 'Controllo cartelle o documenti',
 'object_check_critical' => 'Errori critici',
 'object_check_warning' => 'Avvertenze',
+'objtype_unknown' => '',
 'obsolete' => 'Obsoleto',
 'october' => 'Ottobre',
 'old' => 'Vecchio',
@@ -1143,6 +1145,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'amministratore di
 'preview_markdown' => 'Riduzione ribasso',
 'preview_pdf' => 'Anteprima come PDF',
 'preview_plain' => 'Testo',
+'preview_text' => '',
 'previous_state' => 'Stato precedente',
 'previous_versions' => 'Versioni precedenti',
 'process' => 'Processi',
@@ -1403,6 +1406,7 @@ URL: [url]',
 'search_mode_or' => 'almeno una parola',
 'search_no_results' => 'Non ci sono documenti che soddisfino la vostra ricerca',
 'search_query' => 'Cerca per',
+'search_query_placeholder' => '',
 'search_report' => 'Trovati [doccount] documenti e [foldercount] cartelle in [searchtime] secondi.',
 'search_report_fulltext' => 'Trovati [doccount] documenti',
 'search_resultmode' => 'Risultato ricerca',
@@ -1722,6 +1726,8 @@ Name: [username]
 'settings_luceneClassDir_desc' => 'Cartella del pacchetto SeedDMS_Lucene (opzionale). Lasciare il campo vuoto se SeedDMS_Lucene è stato installato in una cartella localizzabile dal PHP, ad esempio quella indicata per gli include PHP addizionali.',
 'settings_luceneDir' => 'Cartella di indicizzazione fulltext',
 'settings_luceneDir_desc' => 'Cartella di memorizzazione dell\'indice utilizzato da Lucene',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Max numero di ID cartella',
 'settings_maxDirID_desc' => 'Numero massimo di sottocartelle contenibili in una cartella. Default: 0.',
 'settings_maxExecutionTime' => 'Tempo massimo di esecuzione (s)',
@@ -1841,6 +1847,8 @@ Name: [username]
 'settings_strictFormCheck' => 'Rigido controllo sulla form',
 'settings_strictFormCheck_desc' => 'Rigido controllo sulla form. Se abilitato verrà richiesto che tutti i campi della form abbiano un valore. Se disabilitato la maggior parte dei commenti e dei campi parola-chiave diventano opzionali. NOTA: i commenti sono sempre necessari quando si carica una revisione o si scavalca lo stato di un documento.',
 'settings_suggestionvalue' => 'Valore suggerito',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Sistema',
 'settings_tasksInMenu' => 'Attività selezionate',
 'settings_tasksInMenu_approval' => 'Approvazioni',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 9e0f6e0c3..59eeafa4a 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -655,6 +655,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => '',
+'facetfullsearch' => '',
 'february' => '2월',
 'file' => '파일',
 'files' => '파일',
@@ -1062,6 +1063,7 @@ URL : [url]',
 'objectcheck' => '폴더 / 문서 확인',
 'object_check_critical' => '치명적 오류',
 'object_check_warning' => 'Warnings',
+'objtype_unknown' => '',
 'obsolete' => '폐기',
 'october' => '10월',
 'old' => '이전',
@@ -1131,6 +1133,7 @@ URL : [url]',
 'preview_markdown' => '마크다운',
 'preview_pdf' => '',
 'preview_plain' => '텍스트',
+'preview_text' => '',
 'previous_state' => '이전 상태',
 'previous_versions' => '이전 버전',
 'process' => '',
@@ -1375,6 +1378,7 @@ URL : [url]',
 'search_mode_or' => '적어도 하나의 단어',
 'search_no_results' => '검색와 일치하는 문서가 없습니다',
 'search_query' => '검색',
+'search_query_placeholder' => '',
 'search_report' => '[doccount] 문서와 [foldercount]폴더를 [searchtime] 초에 검색 .',
 'search_report_fulltext' => '검색된 [doccount] 문서',
 'search_resultmode' => '검색 결과',
@@ -1689,6 +1693,8 @@ URL : [url]',
 'settings_luceneClassDir_desc' => 'SeedDMS_Lucene 경로 (선택 사항). 이이 PHP에 의해 발견 될 수있는 장소에 SeedDMS_Lucene를 설치된 경우 설정하지 않음',
 'settings_luceneDir' => '전체 텍스트 인덱스에 대한 디렉토리',
 'settings_luceneDir_desc' => 'Lucene 색인 경로',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => '최대 디렉토리 ID',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '최대 실행 시간 (들)',
@@ -1808,6 +1814,8 @@ URL : [url]',
 'settings_strictFormCheck' => '엄격한 양식 확인',
 'settings_strictFormCheck_desc' => '엄격한 형식 검사. true로 설정하면, 다음 폼의 모든 필드 값을 확인한다. false로 설정하면, (대부분의) 의견과 키워드 필드는 선택 사항이된다. 리뷰 또는 문서 상태를 제출할 때 코맨트은 항상 필요합니다.',
 'settings_suggestionvalue' => '제안 값',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => '시스템',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 1bb076632..541c3027d 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -652,6 +652,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => '',
+'facetfullsearch' => '',
 'february' => 'ເດືອນ ກຸມພາ',
 'file' => 'ໄຟລ',
 'files' => 'ໄຟລ',
@@ -1059,6 +1060,7 @@ URL: [url]',
 'objectcheck' => 'ການກວດສອບໂຟລເດີ / ເອກະສານ',
 'object_check_critical' => 'ຂໍ້ຜິດພາດທີ່ສຳຄັນ',
 'object_check_warning' => 'ຄຳເຕືອນ',
+'objtype_unknown' => '',
 'obsolete' => 'ລ້າສະໄຫມ',
 'october' => 'ເດືອນ ຕຸລາ',
 'old' => 'ເກົ່າ',
@@ -1136,6 +1138,7 @@ URL: [url]',
 'preview_markdown' => 'ເຮັດເຄື່ອງຫມາຍລົງ',
 'preview_pdf' => '',
 'preview_plain' => 'ຂໍ້ຄວາມ',
+'preview_text' => '',
 'previous_state' => 'ສະຖານະກ່ອນຫນ້າ',
 'previous_versions' => 'ເວີຊັນກ່ອນໜ້າ',
 'process' => 'ຂະບວນການ',
@@ -1396,6 +1399,7 @@ URL: [url]',
 'search_mode_or' => 'ໜ້ອຍສຸດໜື່ງຄຳ',
 'search_no_results' => 'ບໍ່ມີເອກະສານທີຕົງກັບການຄົ້ນຫາຂອງທ່ານ',
 'search_query' => 'ຄົ້ນຫາ',
+'search_query_placeholder' => '',
 'search_report' => 'ພົບເອກະສານ [doccount] ແລະໂຟລເດີ [foldercount] ໃນ [searchtime]',
 'search_report_fulltext' => 'ພົບເອກະສານ [doccount]',
 'search_resultmode' => 'ຜົນການຄົ້ນຫາ',
@@ -1715,6 +1719,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'เส้นทางไป SeedDMS_Lucene (ตัวเลือก) เว้นว่างไว้ถ้าคุณได้ติดตั้ง SeedDMS_Lucene ไว้ ณ ตำแหน่งที่ PHP สามารถพบได้เช่น PHP รวมเส้นทาง.',
 'settings_luceneDir' => 'การจัดการดัชนีข้อความเต็มรูปแบบ',
 'settings_luceneDir_desc' => 'เส้นทางไปยังดัชนี Lucene',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'ລະຫັດໄດເລັກທໍລີຂັນສູງ',
 'settings_maxDirID_desc' => 'ຈຳນວນໄດເລັກທໍລີຍ່ອຍສູງສຸດຈໍ່ໄດເລັກທໍລີຫຼັກ',
 'settings_maxExecutionTime' => 'ເວລາດຳເນີນງານຂັນສູງ',
@@ -1834,6 +1840,8 @@ URL: [url]',
 'settings_strictFormCheck' => 'ກວດສອບແບບຟອມແບບເຂັມງວດ',
 'settings_strictFormCheck_desc' => 'ການກວດສອບຮູບແບບທີ່ເຂັມງວດ ຖ້າຕັ້ງຄ່າເປັນຈິງໄຟລທັງໝົດໃນແບບຟອມຈະໄດ້ຮັບການກວດສອບຄ່າ ຫາກຕັ້ງຄ່າເປັນເທັກຟິສຄວາມຄິດເຫັນແລະຄຳຫຼັກ ສ່ວນໄຫ່ຍ ຈະກາຍເປັນຕົວເລືອກຕ້ອງມີຄວາມຄິດເຫັນສະເໝີເມືອມີການກວດສອບ ແລະສະຖານະຂອງເອກະສານ',
 'settings_suggestionvalue' => 'ສາລະບານຄຳແນະນຳ',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'ລະບົບ',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 82d304291..c6932a5ee 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -666,6 +666,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Versjon',
+'facetfullsearch' => '',
 'february' => 'Februar',
 'file' => 'Fil',
 'files' => 'Filer',
@@ -1080,6 +1081,7 @@ URL: [url]',
 'objectcheck' => 'Mappe/dokument sjekk',
 'object_check_critical' => 'Kritisk feil!!',
 'object_check_warning' => 'Advarsel!',
+'objtype_unknown' => '',
 'obsolete' => 'Utdatert',
 'october' => 'Oktober',
 'old' => 'Gammel',
@@ -1151,6 +1153,7 @@ Om du fortsatt har problemer med innloggingen, kontakt admin.',
 'preview_markdown' => 'Forminsking',
 'preview_pdf' => 'Forhåndsvis som PDF',
 'preview_plain' => 'Tekst',
+'preview_text' => '',
 'previous_state' => 'Tidligere status',
 'previous_versions' => 'Tidligere versjoner',
 'process' => 'Prosess',
@@ -1411,6 +1414,7 @@ URL: [url]',
 'search_mode_or' => 'minst ett ord',
 'search_no_results' => 'Det er ingen dokumenter som samsvarer med søket ditt',
 'search_query' => 'Søk etter',
+'search_query_placeholder' => '',
 'search_report' => 'Funnet [doccount] dokumenter og [foldercount] folders in [searchtime] sec.',
 'search_report_fulltext' => 'Funnet [doccount] dokumenter',
 'search_resultmode' => 'Søkeresultat',
@@ -1728,6 +1732,8 @@ Bruker: [username]
 'settings_luceneClassDir_desc' => 'Sti til SeedDMS_Lucene (valgfritt). La dette være tomt hvis du har installert SeedDMS_Lucene på et sted der det kan bli funnet av PHP, f.eks. Ekstra PHP inkluderer-bane.',
 'settings_luceneDir' => 'Mappe for fulltekstindeks',
 'settings_luceneDir_desc' => 'Sti til Lucene-indeksen',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Maks mappenavn',
 'settings_maxDirID_desc' => 'Maksimalt antall undermappeer per overordnet mappe. Ikke endre denne verdien med mindre du vet hva du gjør! Standard: 0.',
 'settings_maxExecutionTime' => 'Maks. utførelsestid (s)',
@@ -1847,6 +1853,8 @@ Bruker: [username]
 'settings_strictFormCheck' => 'Streng skjemakontroll',
 'settings_strictFormCheck_desc' => 'Streng skjemakontroll. Hvis satt til sann, vil alle felt i skjemaet bli sjekket for en verdi. Hvis den er satt til usann, blir (de fleste) kommentarer og søkeordfelt valgfrie. Kommentarer er alltid påkrevd når du sender inn en anmeldelse eller overstyrer dokumentstatus.',
 'settings_suggestionvalue' => 'Foreslått verdi',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Valgte oppgaver',
 'settings_tasksInMenu_approval' => 'Godkjenninger',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index b9c233718..6f770ed02 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -659,6 +659,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => 'Omschakelen mislukt',
 'extension_version_list' => 'Versies',
+'facetfullsearch' => '',
 'february' => 'februari',
 'file' => 'Bestand',
 'files' => 'Bestanden',
@@ -1072,6 +1073,7 @@ URL: [url]',
 'objectcheck' => 'Mappen en documenten controleren',
 'object_check_critical' => 'Ernstige fouten',
 'object_check_warning' => 'Waarschuwingen',
+'objtype_unknown' => '',
 'obsolete' => 'verouderd',
 'october' => 'oktober',
 'old' => 'Oude',
@@ -1150,6 +1152,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'preview_markdown' => 'Voorbeeld in Markdown',
 'preview_pdf' => 'Inhoud van het document',
 'preview_plain' => 'Voorbeeld in platte tekst',
+'preview_text' => '',
 'previous_state' => 'Vorige staat',
 'previous_versions' => 'Vorige versies',
 'process' => 'Proces',
@@ -1408,6 +1411,7 @@ URL: [url]',
 'search_mode_or' => 'tenminste 1 woord',
 'search_no_results' => 'Er zijn geen documenten gevonden die aan uw zoekvraag voldoen',
 'search_query' => 'Zoeken naar',
+'search_query_placeholder' => '',
 'search_report' => '[doccount] documenten en [foldercount] mappen gevonden in [searchtime] sec.',
 'search_report_fulltext' => '[doccount] documenten gevonden',
 'search_resultmode' => 'Zoek resultaat',
@@ -1727,6 +1731,8 @@ Name: [username]
 'settings_luceneClassDir_desc' => 'Pad naar SeedDMS_Lucene (optioneel)',
 'settings_luceneDir' => 'Map voor volledigetekst index',
 'settings_luceneDir_desc' => 'Pad naar Lucene index',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Max Map-ID',
 'settings_maxDirID_desc' => 'Maximaal toegestane aantal submappen per bovenliggende map. Standaard: 0.',
 'settings_maxExecutionTime' => 'Max Uitvoertijd (s)',
@@ -1846,6 +1852,8 @@ Name: [username]
 'settings_strictFormCheck' => 'Strikte formaatcontrole',
 'settings_strictFormCheck_desc' => 'Strikte controle op het juiste formaat. Indien ingeschakeld, worden alle velden in het formulier gecontroleer op een waarde. Indien uitgeschakeld, worden de meeste commentaar en invoervelden opgevat als optioneel. Commentaren zijn altijd nodig bij een review of modificatie van een documentstatus',
 'settings_suggestionvalue' => 'Voorgestelde waarde',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Systeem',
 'settings_tasksInMenu' => 'Taken',
 'settings_tasksInMenu_approval' => 'Goedgekeuring',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 604a82c3b..79688c9ff 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -642,6 +642,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Wersje',
+'facetfullsearch' => '',
 'february' => 'Luty',
 'file' => 'Plik',
 'files' => 'Pliki',
@@ -1049,6 +1050,7 @@ URL: [url]',
 'objectcheck' => 'Sprawdź Katalog/Dokument',
 'object_check_critical' => 'Błędy krytyczne',
 'object_check_warning' => 'Ostrzeżenia',
+'objtype_unknown' => '',
 'obsolete' => 'Nieaktualny',
 'october' => 'Październik',
 'old' => 'Stary',
@@ -1126,6 +1128,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'preview_markdown' => 'Oznacz w dół',
 'preview_pdf' => 'Podgląd PDF',
 'preview_plain' => 'Zwykły podgląd',
+'preview_text' => '',
 'previous_state' => 'Poprzedni stan',
 'previous_versions' => 'Poprzednie wersje',
 'process' => 'Proces',
@@ -1339,6 +1342,7 @@ URL: [url]',
 'search_mode_or' => 'Co najmnej jedno słowo',
 'search_no_results' => 'Nie znaleziono dokumentów spełniających kryteria wyszukiwania.',
 'search_query' => 'Wyszukaj',
+'search_query_placeholder' => '',
 'search_report' => 'Znaleziono [doccount] dokumentów i [foldercount] katalogów w [searchtime] sec.',
 'search_report_fulltext' => 'Znaleziono [doccount] dokumentów',
 'search_resultmode' => 'Wyniki wyszukiwania',
@@ -1658,6 +1662,8 @@ Name: [username]
 'settings_luceneClassDir_desc' => 'Ścieżka do Path to SeedDMS_Lucene (opcjonalnie)',
 'settings_luceneDir' => 'Katalog dla indeksu pełnotekstowego',
 'settings_luceneDir_desc' => 'Ścieżka do indeksu Lucene',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Maksymalny ID katalogu',
 'settings_maxDirID_desc' => 'Maksymalna liczba podkatalogów dla katalogu nadrzędnego. Domyślnie: 0.',
 'settings_maxExecutionTime' => 'Maksymalny czas wykonywania (s)',
@@ -1777,6 +1783,8 @@ Name: [username]
 'settings_strictFormCheck' => 'Sprawdzanie poprawności formularzy',
 'settings_strictFormCheck_desc' => 'Sprawdzanie poprawności formularzy. Jeśli ta opcja jest włączona, to wszystkie pola w formularzach będą obowiązkowe do wypełnienia. Jeśli nie włączysz tej opcji, to większość komentarzy i pól słów kluczowych będzie opcjonalna. Komentarze są zawsze wymagane przy zatwierdzaniu, opiniowaniu lub zmianie statusu dokumentu.',
 'settings_suggestionvalue' => 'Sugerowana wartość',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'System',
 'settings_tasksInMenu' => 'Wybrane zadania',
 'settings_tasksInMenu_approval' => 'Zatwierdzone',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 3ec9716ef..a888cb588 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -666,6 +666,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Versões',
+'facetfullsearch' => '',
 'february' => 'Fevereiro',
 'file' => 'Arquivo',
 'files' => 'Arquivos',
@@ -1079,6 +1080,7 @@ URL: [url]',
 'objectcheck' => 'Verificação da Pasta/Documento',
 'object_check_critical' => 'Erros críticos',
 'object_check_warning' => 'Avisos',
+'objtype_unknown' => '',
 'obsolete' => 'Obsoleto',
 'october' => 'Outubro',
 'old' => 'Antigo',
@@ -1156,6 +1158,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Visualizar como PDF',
 'preview_plain' => 'Texto',
+'preview_text' => '',
 'previous_state' => 'Estado anterior',
 'previous_versions' => 'Versões anteriores',
 'process' => 'Processos',
@@ -1415,6 +1418,7 @@ URL: [url]',
 'search_mode_or' => 'pelo menos uma palavra',
 'search_no_results' => 'não há documento que satisfaçam sua busca',
 'search_query' => 'Busca por',
+'search_query_placeholder' => '',
 'search_report' => 'Encontrados [count] documentos',
 'search_report_fulltext' => 'Encontrados [doccount] documentos',
 'search_resultmode' => 'Resultados da Busca',
@@ -1734,6 +1738,8 @@ Nome: [username]
 'settings_luceneClassDir_desc' => 'Caminho para Sistema GED_Lucene (opcional). Deixe em branco se você tiver instalado Sistema GED_Lucene em um lugar onde ele pode ser encontrado por PHP, por exemplo, PHP extras incluem-Path',
 'settings_luceneDir' => 'Diretório para o índice de texto completo',
 'settings_luceneDir_desc' => 'Caminho para o índice Lucene',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'ID máxima de diretório',
 'settings_maxDirID_desc' => 'O número máximo de sub-diretórios por diretório mãe. Padrão: 0.',
 'settings_maxExecutionTime' => 'Tempo máximo de execução (s)',
@@ -1853,6 +1859,8 @@ Nome: [username]
 'settings_strictFormCheck' => 'Formulário de Verificação Rigorosa',
 'settings_strictFormCheck_desc' => 'Verificação de forma rigorosa. Se definido como verdadeiro, então todos os campos do formulário serão verificados por um valor. Se for definido como falso, então (a maioria) comentários e campos de palavra-chave tornar facultativo. Comentários são sempre necessários quando enviar um comentário ou substituindo status do documento',
 'settings_suggestionvalue' => 'Valor da sugestão',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Sistema',
 'settings_tasksInMenu' => 'Tarefas selecionadas',
 'settings_tasksInMenu_approval' => 'Aprovações',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 49c3ad916..6e0f073fa 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -654,6 +654,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Versiuni',
+'facetfullsearch' => '',
 'february' => 'Februarie',
 'file' => 'Fișier',
 'files' => 'Fișiere',
@@ -1061,6 +1062,7 @@ URL: [url]',
 'objectcheck' => 'Verificare folder/document',
 'object_check_critical' => '',
 'object_check_warning' => '',
+'objtype_unknown' => '',
 'obsolete' => 'Învechit',
 'october' => 'Octombrie',
 'old' => 'Vechi',
@@ -1138,6 +1140,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
+'preview_text' => '',
 'previous_state' => 'Stare precedentă',
 'previous_versions' => 'Versiune precedentă',
 'process' => '',
@@ -1382,6 +1385,7 @@ URL: [url]',
 'search_mode_or' => 'cel putin un cuvant',
 'search_no_results' => 'Nu există documente care corespund căutarii dumneavoastră',
 'search_query' => 'Caută după',
+'search_query_placeholder' => '',
 'search_report' => 'S-au găsit [doccount] documente și [foldercount] foldere în [searchtime] sec.',
 'search_report_fulltext' => 'S-au găsit [doccount] documente',
 'search_resultmode' => '',
@@ -1696,6 +1700,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'Calea catre SeedDMS_Lucene (optional). Lăsați gol dacă ați instalat SeedDMS_Lucene într-un loc unde poate fi găsit de PHP (exemplu: Extra PHP Include-Path)',
 'settings_luceneDir' => 'Directorul pentru indexul de text integral(full text index)',
 'settings_luceneDir_desc' => 'Calea catre indexul Lucene',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'ID director Maxim',
 'settings_maxDirID_desc' => 'Numărul maxim de sub-directoare pe director părinte. Implicit: 0.',
 'settings_maxExecutionTime' => 'Timp Maxim de executie (s)',
@@ -1815,6 +1821,8 @@ URL: [url]',
 'settings_strictFormCheck' => 'Verificare strictă pentru form-uri',
 'settings_strictFormCheck_desc' => 'Verificare strictă a form-urilor. Dacă este activată, atunci toate câmpurile din formular vor fi obligatorii. Dacă nu este activată, atunci (cele mai multe) câmpuri de comentarii și cuvinte cheie devin optionale. Comentariile sunt întotdeauna obligatorii la realizarea unei revizuiri sau la suprascrierea unui status pentru un document',
 'settings_suggestionvalue' => 'Valoare sugerată',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Sistem',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index f5d41a43d..4a9ebe3df 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -654,6 +654,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Версии',
+'facetfullsearch' => '',
 'february' => 'Февраль',
 'file' => 'Файл',
 'files' => 'Файлы',
@@ -1060,6 +1061,7 @@ URL: [url]',
 'objectcheck' => 'Проверка целостности',
 'object_check_critical' => '',
 'object_check_warning' => '',
+'objtype_unknown' => '',
 'obsolete' => 'Устарел',
 'october' => 'Октябрь',
 'old' => 'Старый',
@@ -1135,6 +1137,7 @@ URL: [url]',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => '',
 'preview_plain' => 'Текст',
+'preview_text' => '',
 'previous_state' => 'Предыдущее состояние',
 'previous_versions' => 'Предыдущие версии',
 'process' => '',
@@ -1389,6 +1392,7 @@ URL: [url]',
 'search_mode_or' => 'Хотя бы одно слово',
 'search_no_results' => 'Нет документов, соответствующих запросу',
 'search_query' => 'Искать',
+'search_query_placeholder' => '',
 'search_report' => 'Найдено документов: [doccount] и каталогов: [foldercount]',
 'search_report_fulltext' => 'Найдено документов: [doccount]',
 'search_resultmode' => 'Результат поиска',
@@ -1703,6 +1707,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'Путь к SeedDMS_Lucene (не обязательно).',
 'settings_luceneDir' => 'Каталог полнотекстового индекса Lucene',
 'settings_luceneDir_desc' => 'Путь, куда Lucene будет записывать свой индекс.',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Максимальный ID каталога',
 'settings_maxDirID_desc' => 'Максимум каталогов в родительском каталоге. По умолчанию 0.',
 'settings_maxExecutionTime' => 'Максимальное время выполнения, с',
@@ -1822,6 +1828,8 @@ URL: [url]',
 'settings_strictFormCheck' => 'Полная проверка форм',
 'settings_strictFormCheck_desc' => 'Если включено, то все поля формы будут проверяться заполнены ли они. Если выключено, то комментарии и метки станут опциональными. Комментарий всегда обязателен при рецензировании или изменении статуса.',
 'settings_suggestionvalue' => 'Предлагаемое значение',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Система',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 1cbc2d0de..5ec529707 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -666,6 +666,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Versions',
+'facetfullsearch' => '',
 'february' => 'Február',
 'file' => 'Súbor',
 'files' => 'Súbory',
@@ -1080,6 +1081,7 @@ URL: [url]',
 'objectcheck' => 'Kontrola Adresárov/Dokumentov',
 'object_check_critical' => 'Kritické chyby',
 'object_check_warning' => 'Varovanie',
+'objtype_unknown' => '',
 'obsolete' => 'Zastaralé',
 'october' => 'Október',
 'old' => 'Staré',
@@ -1157,6 +1159,7 @@ If you have still problems to login, then please contact your administrator.',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => 'Preview as PDF',
 'preview_plain' => 'Text',
+'preview_text' => '',
 'previous_state' => 'Predchádzajúci stav',
 'previous_versions' => 'Predošlé verzie',
 'process' => 'Proces',
@@ -1417,6 +1420,7 @@ URL: [url]',
 'search_mode_or' => 'aspoň jedno zo slov',
 'search_no_results' => 'Vašej požiadavke nevyhovujú žiadne dokumenty',
 'search_query' => 'Hľadať',
+'search_query_placeholder' => '',
 'search_report' => 'Nájdených [count] dokumentov',
 'search_report_fulltext' => 'Nájdené [doccount] dokumenty',
 'search_resultmode' => 'Výsledok hľadania',
@@ -1736,6 +1740,8 @@ Meno: [username]
 'settings_luceneClassDir_desc' => 'Path to SeedDMS_Lucene (optional). Leave this empty if you have installed SeedDMS_Lucene at a place where it can be found by PHP, e.g. Extra PHP Include-Path',
 'settings_luceneDir' => 'Directory for full text index',
 'settings_luceneDir_desc' => 'Cesta do Lucene indexu',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Max Zložka ID',
 'settings_maxDirID_desc' => 'Maximum number of sub-directories per parent directory. Do not change this value unless you know what you do! Default: 0.',
 'settings_maxExecutionTime' => 'Max Execution Time (s)',
@@ -1855,6 +1861,8 @@ Meno: [username]
 'settings_strictFormCheck' => 'Strict Form Check',
 'settings_strictFormCheck_desc' => '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',
 'settings_suggestionvalue' => 'Suggestion value',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Systém',
 'settings_tasksInMenu' => 'Selected tasks',
 'settings_tasksInMenu_approval' => 'Approvals',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index ebd12c759..fe1a520d5 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -660,6 +660,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => '',
+'facetfullsearch' => '',
 'february' => 'februari',
 'file' => 'Fil',
 'files' => 'Filer',
@@ -1067,6 +1068,7 @@ URL: [url]',
 'objectcheck' => 'Kontroll av Katalog/Dokument',
 'object_check_critical' => 'Kritiska fel',
 'object_check_warning' => 'Varningar',
+'objtype_unknown' => '',
 'obsolete' => 'Föråldrat',
 'october' => 'Oktober',
 'old' => 'gammalt',
@@ -1141,6 +1143,7 @@ Om du fortfarande har problem med inloggningen, kontakta administratören.',
 'preview_markdown' => 'Förminskning',
 'preview_pdf' => 'Förhandsgranska som PDF',
 'preview_plain' => 'Text',
+'preview_text' => '',
 'previous_state' => 'Föregående status',
 'previous_versions' => 'Tidigare versioner',
 'process' => 'Process',
@@ -1390,6 +1393,7 @@ URL: [url]',
 'search_mode_or' => 'minst ett ord',
 'search_no_results' => 'Det finns inga dokument som matchar din sökning',
 'search_query' => 'Sök efter',
+'search_query_placeholder' => '',
 'search_report' => 'Hittat [doccount] dokument och [foldercount] kataloger',
 'search_report_fulltext' => 'Hittat [doccount] dokument',
 'search_resultmode' => 'Sökresultat',
@@ -1709,6 +1713,8 @@ Kommentar: [comment]',
 'settings_luceneClassDir_desc' => 'Sökväg till LetoDMS_Lucene (valfritt)',
 'settings_luceneDir' => 'Mapp för fulltext-index',
 'settings_luceneDir_desc' => 'Sökväg till Lucene-index',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Max. mapp-ID',
 'settings_maxDirID_desc' => 'Högsta antal undermappar per överordnade mapp. Standard: 0.',
 'settings_maxExecutionTime' => 'Max. exekveringstid (s)',
@@ -1828,6 +1834,8 @@ Kommentar: [comment]',
 'settings_strictFormCheck' => 'Noggrann format-kontroll',
 'settings_strictFormCheck_desc' => 'Noggrann format-kontroll. Om ja, kontrolleras alla fält i ett formulär på att de innehåller ett värde. Om nej, blir de flesta kommentar- och nyckelordsfält frivilliga. Kommentarer måste alltid anges när en granskning skickas eller när dokumentstatus skrivs över.',
 'settings_suggestionvalue' => 'Föreslå ett värde',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'System',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 7efddae74..7f974d169 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -648,6 +648,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => 'Veysionlar',
+'facetfullsearch' => '',
 'february' => 'Şubat',
 'file' => 'Dosya',
 'files' => 'Dosyalar',
@@ -1055,6 +1056,7 @@ URL: [url]',
 'objectcheck' => 'Klasör/Doküman kontrol',
 'object_check_critical' => '',
 'object_check_warning' => '',
+'objtype_unknown' => '',
 'obsolete' => 'Geçersiz',
 'october' => 'Ekim',
 'old' => 'Eski',
@@ -1134,6 +1136,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'preview_markdown' => '',
 'preview_pdf' => '',
 'preview_plain' => '',
+'preview_text' => '',
 'previous_state' => 'Önceki durum',
 'previous_versions' => 'Önceki versiyonlar',
 'process' => 'İşlem',
@@ -1361,6 +1364,7 @@ URL: [url]',
 'search_mode_or' => 'en az bir sözcük',
 'search_no_results' => 'Arama kriterinize uyan bir doküman bulunamadı',
 'search_query' => 'Arama sorgusu',
+'search_query_placeholder' => '',
 'search_report' => '[doccount] adet dosya ve [foldercount] adet klasör [searchtime] saniye içinde bulundu',
 'search_report_fulltext' => '[doccount] adet doküman bulundu',
 'search_resultmode' => 'Arama Sonuçları',
@@ -1675,6 +1679,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'SeedDMS_Lucene yolu (isteğe bağlı). SeedDMS_Lucene\'i PHP tarafından bulunabilecek bir yere kurduysanız bu alanı boş bırakabilirsiniz. Ör. Ekstra PHP Include-Path',
 'settings_luceneDir' => 'Tam metin dizini',
 'settings_luceneDir_desc' => 'Lucene indeks dizini yolu',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Maks Dizin ID',
 'settings_maxDirID_desc' => 'Klasör altında oluşturulabilecek maksimum alt klasör sayısı Varsayılan: 0.',
 'settings_maxExecutionTime' => 'Maksimum çalışma zamanı (s)',
@@ -1794,6 +1800,8 @@ URL: [url]',
 'settings_strictFormCheck' => 'Form Alanlarının Zorunluluk Kontrolü',
 'settings_strictFormCheck_desc' => 'Bu seçenek seçilirse tüm form alanları zorunlu olacaktır. Seçilmezse birçok açıklama ve anahtar kelime alanları isteğe bağlı olacaktır. Kontrol veya geçersiz kılma gibi durumlarda açıklama yazmak çoğu zaman mecburi olmalıdır.',
 'settings_suggestionvalue' => 'Önerilen değer',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Sistem',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 74daa635d..f29bde942 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -654,6 +654,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => '',
+'facetfullsearch' => '',
 'february' => 'Лютий',
 'file' => 'Файл',
 'files' => 'Файли',
@@ -1060,6 +1061,7 @@ URL: [url]',
 'objectcheck' => 'Перевірка каталогу чи документа',
 'object_check_critical' => '',
 'object_check_warning' => '',
+'objtype_unknown' => '',
 'obsolete' => 'Застарів',
 'october' => 'Жовтень',
 'old' => 'Старий',
@@ -1135,6 +1137,7 @@ URL: [url]',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => '',
 'preview_plain' => 'Текст',
+'preview_text' => '',
 'previous_state' => 'Попередній стан',
 'previous_versions' => 'Попередні версії',
 'process' => '',
@@ -1382,6 +1385,7 @@ URL: [url]',
 'search_mode_or' => 'Хоча б одне слово',
 'search_no_results' => 'Немає документів, що відповідають запитові',
 'search_query' => 'Шукати',
+'search_query_placeholder' => '',
 'search_report' => 'Знайдено документів: [doccount] і каталогів: [foldercount]',
 'search_report_fulltext' => 'Знайдено документів: [doccount]',
 'search_resultmode' => 'Результати пошуку',
@@ -1696,6 +1700,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'Шлях до SeedDMS_Lucene (не обов\'язково).',
 'settings_luceneDir' => 'Каталог повнотекстового індексу Lucene',
 'settings_luceneDir_desc' => 'Шлях, куди Lucene буде записувати свій індекс.',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => 'Максимальний ID каталогу',
 'settings_maxDirID_desc' => 'Максимум каталогів у батьківському каталозі. По замовчуванню 0.',
 'settings_maxExecutionTime' => 'Максимальний час виконання, с',
@@ -1815,6 +1821,8 @@ URL: [url]',
 'settings_strictFormCheck' => 'Повна перевірка форм',
 'settings_strictFormCheck_desc' => 'Якщо увімкнено, то всі поля форм будуть перевірятися чи вони заповнені. Якщо вимкнено, то коментарі і ключові слова стануть необов\'язковими. Коментар завжди обов\'язковий при рецензуванні і зміні статусу.',
 'settings_suggestionvalue' => 'Запропоноване значення',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => 'Система',
 'settings_tasksInMenu' => '',
 'settings_tasksInMenu_approval' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 0cf1617a5..155ec24dd 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -656,6 +656,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => '版本列表',
+'facetfullsearch' => '',
 'february' => '二 月',
 'file' => '文件',
 'files' => '文件',
@@ -1063,6 +1064,7 @@ URL: [url]',
 'objectcheck' => '文件夹/文件检查',
 'object_check_critical' => '重大错误',
 'object_check_warning' => '警告',
+'objtype_unknown' => '',
 'obsolete' => '过时的',
 'october' => '十 月',
 'old' => 'Old',
@@ -1140,6 +1142,7 @@ URL: [url]',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => '作为PDF预览',
 'preview_plain' => 'TEXT',
+'preview_text' => '',
 'previous_state' => 'Previous state',
 'previous_versions' => '先前版本',
 'process' => '进程',
@@ -1364,6 +1367,7 @@ URL: [url]',
 'search_mode_or' => '或模式',
 'search_no_results' => '没有找到与您搜索添加相匹配的文件',
 'search_query' => '搜索',
+'search_query_placeholder' => '',
 'search_report' => '找到 [count] 个文档',
 'search_report_fulltext' => '已找到 [doccount] 篇文档',
 'search_resultmode' => '搜索模式',
@@ -1683,6 +1687,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => '路径到DMS_Lucene(可选)。如果你已经在PHP可以找到的地方安装了DMS_Lucene请将此空例如Extra PHP Include-Path',
 'settings_luceneDir' => '全文索引目录',
 'settings_luceneDir_desc' => 'Lucene 索引路径',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => '最大目录编号',
 'settings_maxDirID_desc' => '每个父目录的子目录的最大数目。默认值：0。',
 'settings_maxExecutionTime' => '最大执行时间（秒）',
@@ -1802,6 +1808,8 @@ URL: [url]',
 'settings_strictFormCheck' => '严格表格检查',
 'settings_strictFormCheck_desc' => '严格表格检查。如果此项为是，将检查所有表格中字段的值。如果设置为否，内容和关键字段检查将成为可选项。同时提交评论或覆盖文件时，始终要求注释',
 'settings_suggestionvalue' => '推荐值',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => '系统设置',
 'settings_tasksInMenu' => '选择任务',
 'settings_tasksInMenu_approval' => '审批',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index d74b9c76a..fb01fad9d 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -666,6 +666,7 @@ URL: [url]',
 'extension_readme' => '',
 'extension_toggle_error' => '',
 'extension_version_list' => '版本',
+'facetfullsearch' => '',
 'february' => '二 月',
 'file' => '文件',
 'files' => '文件',
@@ -1080,6 +1081,7 @@ URL: [url]',
 'objectcheck' => '資料夾/檔檢查',
 'object_check_critical' => '嚴重錯誤',
 'object_check_warning' => '警告',
+'objtype_unknown' => '',
 'obsolete' => '過時的',
 'october' => '十 月',
 'old' => 'Old',
@@ -1155,6 +1157,7 @@ URL: [url]',
 'preview_markdown' => 'Markdown',
 'preview_pdf' => '預覽為PDF',
 'preview_plain' => '文本',
+'preview_text' => '',
 'previous_state' => '先前狀態',
 'previous_versions' => '先前版本',
 'process' => '處理',
@@ -1415,6 +1418,7 @@ URL: [url]',
 'search_mode_or' => '或模式',
 'search_no_results' => '沒有找到與您搜索新增相匹配的檔',
 'search_query' => '搜索',
+'search_query_placeholder' => '',
 'search_report' => '找到 [doccount] 個文件和 [foldercount] 個目錄。耗時: [searchtime] 秒。',
 'search_report_fulltext' => '找到 [doccount] 個文件',
 'search_resultmode' => '搜尋結果',
@@ -1734,6 +1738,8 @@ URL: [url]',
 'settings_luceneClassDir_desc' => 'SeedDMS_Lucene的路徑（可選）。如果您已在PHP可以找到SeedDMS_Lucene的位置安裝了該字段，請將該字段留空。額外的PHP包含路徑',
 'settings_luceneDir' => '全文索引目錄',
 'settings_luceneDir_desc' => 'Lucene索引的路徑',
+'settings_markdownComments' => '',
+'settings_markdownComments_desc' => '',
 'settings_maxDirID' => '最大目錄編號',
 'settings_maxDirID_desc' => '每個父目錄的子目錄的最大數目。預設值：0。',
 'settings_maxExecutionTime' => '最大執行時間（秒）',
@@ -1853,6 +1859,8 @@ URL: [url]',
 'settings_strictFormCheck' => '嚴格的表格檢查',
 'settings_strictFormCheck_desc' => '嚴格的表格檢查。如果設置為true，則將檢查表單中的所有字段的值。如果設置為false，則（大多數）註釋和關鍵字字段變為可選。提交評論或覆蓋文檔狀態時始終需要評論',
 'settings_suggestionvalue' => '建議值',
+'settings_suggestTerms' => '',
+'settings_suggestTerms_desc' => '',
 'settings_System' => '系統',
 'settings_tasksInMenu' => '選定的任務',
 'settings_tasksInMenu_approval' => '批准書',

From a9f88c7191596530a5bc8c09b1fa90c31a7fda50 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 24 Apr 2023 07:31:20 +0200
Subject: [PATCH 1969/2006] add search for integer ranges

---
 views/bootstrap/class.Search.php | 90 +++++++++++++++++++++++---------
 1 file changed, 65 insertions(+), 25 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index d63f3a70d..1bf66fc8e 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1031,8 +1031,6 @@ $(document).ready(function() {
 			$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form3", M_READ, -1, $startfolder, 'folderfullsearchid'));
 
 			$this->contentContainerEnd();
-			$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
-			echo "<p></p>";
 
 			if($facets) {
 				$menuitems = [];
@@ -1044,10 +1042,22 @@ $(document).ready(function() {
 							/* Create a link to remove the filter */
 							$allparams = $request->query->all();
 							if(isset($allparams['attributes'][$facetname])) {
-								$oldvalue = is_array($allparams['attributes'][$facetname]) ? implode(',', $allparams['attributes'][$facetname]) : $allparams['attributes'][$facetname];
-								unset($allparams['attributes'][$facetname]);
-								$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
-								$menuitems[] = array('label'=>$dispname.' = '.$oldvalue, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+								if(isset($allparams['attributes'][$facetname]['to']) && isset($allparams['attributes'][$facetname]['from'])) {
+									$oldvalue = $allparams['attributes'][$facetname];
+									if(!empty($oldvalue['from']) || !empty($oldvalue['to'])) {
+										unset($allparams['attributes'][$facetname]);
+										$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
+										$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.$dispname.' = '.$oldvalue['from'].' TO '.$oldvalue['to'], 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+										echo '<input type="hidden" name="attributes['.$facetname.'][from]" value="'.$oldvalue['from'].'" />';
+										echo '<input type="hidden" name="attributes['.$facetname.'][to]" value="'.$oldvalue['to'].'" />';
+									}
+								} else {
+									$oldvalue = is_array($allparams['attributes'][$facetname]) ? implode(',', $allparams['attributes'][$facetname]) : $allparams['attributes'][$facetname];
+									unset($allparams['attributes'][$facetname]);
+									$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
+									$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.$dispname.' = '.$oldvalue, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+									echo '<input type="hidden" name="attributes['.$facetname.'][]" value="'.$oldvalue.'" />';
+								}
 							}
 						}
 					} else {
@@ -1057,46 +1067,76 @@ $(document).ready(function() {
 							$oldvalue = is_array($allparams[$facetname]) ? implode(',', $allparams[$facetname]) : $allparams[$facetname];
 							unset($allparams[$facetname]);
 							$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
-							$menuitems[] = array('label'=>getMLText($facetname).' = '.$oldvalue, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+							$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText($facetname).' = '.$oldvalue, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+							echo '<input type="hidden" name="'.$facetname.'[]" value="'.$oldvalue.'" />';
 						}
 					}
 				}
 				if($menuitems) {
-					ob_start();
+//					ob_start();
 					self::showNavigationListWithBadges($menuitems);
-					$content = ob_get_clean();
-					$this->printAccordion(getMLText('current_filter'), $content, true);
+//					$content = ob_get_clean();
+//					$this->printAccordion(getMLText('current_filter'), $content, true);
 				}
-
+			}
+			echo "<p></p>";
+			$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
+			echo "<p></p>";
+			if($facets) {
+				$allparams = $request->query->all();
+				if(!isset($allparams['fullsearch']))
+					$allparams['fullsearch'] = 1;
+				if(!isset($allparams['facetsearch']))
+					$allparams['facetsearch'] = 1;
+				$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
 				foreach($facets as $facetname=>$values) {
 					if(substr($facetname, 0, 5) == 'attr_') {
 						$tmp = explode('_', $facetname);
 						if($attrdef = $dms->getAttributeDefinition($tmp[1])) {
 							$dispname = $attrdef->getName();
-							/* See below on an explaination for the if statement */
-							if($values && (count($values) > 1 || reset($values) < $total)) {
-								$menuitems = array();
-								arsort($values);
-								foreach($values as $v=>$c) {
-									$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$request->getRequestUri().'&attributes['.$facetname.'][]='.urlencode($v), 'badge'=>$c, 'attributes'=>array(array('data-href', $request->getRequestUri().'&'.$facetname.'='.$v), array('data-action', "printOpenTasksList")));
+							switch($attrdef->getType()) {
+							case SeedDMS_Core_AttributeDefinition::type_int:
+								/* See below on an explaination for the if statement */
+								if($values && (count($values) > 1 || reset($values) < $total)) {
+									if(empty($allparams['attributes'][$facetname]['from']) && empty($allparams['attributes'][$facetname]['to'])) {
+										$tt = array_keys($values);
+										$content = '<div class="input-group">';
+										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> from </span>';
+										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][from]" value="" placeholder="min is '.min($tt).'" />';
+										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
+										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][to]" value="" placeholder="max is '.max($tt).'" />';
+										$content .= '<button class="btn btn-outline-secondary" type="submit">Set</button>';
+										$content .= '</div>';
+										$this->printAccordion($dispname, $content);
+									}
+								}
+								break;
+							default:
+								/* See below on an explaination for the if statement */
+								if($values && (count($values) > 1 || reset($values) < $total)) {
+									$menuitems = array();
+									arsort($values);
+									foreach($values as $v=>$c) {
+										$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$newrequest->getRequestUri().'&attributes['.$facetname.'][]='.urlencode($v), 'badge'=>$c);
+									}
+									ob_start();
+									self::showNavigationListWithBadges($menuitems);
+									$content = ob_get_clean();
+									$this->printAccordion($dispname, $content);
 								}
-								ob_start();
-								self::showNavigationListWithBadges($menuitems);
-								$content = ob_get_clean();
-								$this->printAccordion($dispname, $content);
 							}
 						}
 					} else {
-						/* Further filter makes onle sense if the facet has mor than 1 value
-						 * or in case of 1 value that value has a count < $total. That second
-						 * case will reduce the result set on those objects which the field
+						/* Further filter makes only sense if the facet has more than 1 value
+						 * or in case of 1 value, if that value has a count < $total. That second
+						 * case will reduce the result set on those objects which have the field
 						 * actually set.
 						 */
 						if($values && (count($values) > 1 || reset($values) < $total)) {
 							$menuitems = array();
 							arsort($values);
 							foreach($values as $v=>$c) {
-								$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$request->getRequestUri().'&'.$facetname.'[]='.urlencode($v), 'badge'=>$c, 'attributes'=>array(array('data-href', "#initlist"), array('data-action', "printOpenTasksList")));
+								$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$newrequest->getRequestUri().'&'.$facetname.'[]='.urlencode($v), 'badge'=>$c);
 							}
 							ob_start();
 							self::showNavigationListWithBadges($menuitems);

From b7c9ecf16231d5820cbf768915c61905f1ee3fbe Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 24 Apr 2023 16:58:30 +0200
Subject: [PATCH 1970/2006] fix nesting of containers

---
 views/bootstrap/class.AddDocument.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 93f6d8945..0fce83ffd 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -492,8 +492,8 @@ console.log(params);
 			}
 			$this->warningMsg(getMLText("add_doc_workflow_warning"));
 		} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
+			$this->contentContainerEnd();
 			if($workflowmode == 'traditional') {
-				$this->contentContainerEnd();
 				$this->contentSubHeading(getMLText("assign_reviewers"));
 				$this->contentContainerStart();
 
@@ -697,11 +697,10 @@ console.log(params);
 						}
 					}
 				}
-			$this->contentContainerEnd();
 			$this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
 		} else {
-			$this->contentContainerEnd();
 		}
+		$this->contentContainerEnd();
 		$this->columnEnd();
 		$this->rowEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_document'));

From 798a52ed37a081abd26dd95f4dc18be971847880 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 24 Apr 2023 16:58:48 +0200
Subject: [PATCH 1971/2006] make set button for ranges 'primary'

---
 views/bootstrap/class.Search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 1bf66fc8e..87d39fc66 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1096,6 +1096,7 @@ $(document).ready(function() {
 							$dispname = $attrdef->getName();
 							switch($attrdef->getType()) {
 							case SeedDMS_Core_AttributeDefinition::type_int:
+							case SeedDMS_Core_AttributeDefinition::type_float:
 								/* See below on an explaination for the if statement */
 								if($values && (count($values) > 1 || reset($values) < $total)) {
 									if(empty($allparams['attributes'][$facetname]['from']) && empty($allparams['attributes'][$facetname]['to'])) {
@@ -1105,7 +1106,7 @@ $(document).ready(function() {
 										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][from]" value="" placeholder="min is '.min($tt).'" />';
 										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
 										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][to]" value="" placeholder="max is '.max($tt).'" />';
-										$content .= '<button class="btn btn-outline-secondary" type="submit">Set</button>';
+										$content .= '<button class="btn btn-primary" type="submit">Set</button>';
 										$content .= '</div>';
 										$this->printAccordion($dispname, $content);
 									}

From d69921c709d695232a4d43c08e05461e57079f1a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Apr 2023 12:27:27 +0200
Subject: [PATCH 1972/2006] echo error message in debug mode

---
 inc/inc.ClassEmailNotify.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php
index f0445082f..8983581e4 100644
--- a/inc/inc.ClassEmailNotify.php
+++ b/inc/inc.ClassEmailNotify.php
@@ -239,6 +239,8 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		}
 		$result = $mail->send($to, $hdrs, $message);
 		if (PEAR::isError($result)) {
+			if($this->debug)
+				echo "\n".$result->getMessage();
 			return false;
 		} else {
 			return true;

From e3ce931cbd91b07fc7c1a19e791d29674b26f352 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Apr 2023 12:28:05 +0200
Subject: [PATCH 1973/2006] turn attributes of type date into timestamps before
 searching

---
 out/out.Search.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/out/out.Search.php b/out/out.Search.php
index 6d77a7144..bb3b7f15d 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -200,6 +200,26 @@ if($fullsearch) {
 	else
 		$attributes = array();
 
+	foreach($attributes as $an=>&$av) {
+		if(substr($an, 0, 5) == 'attr_') {
+			$tmp = explode('_', $an);
+			if($attrdef = $dms->getAttributeDefinition($tmp[1])) {
+				switch($attrdef->getType()) {
+				/* Turn dates into timestamps */
+				case SeedDMS_Core_AttributeDefinition::type_date:
+					foreach(['from', 'to'] as $kk)
+						if(!empty($av[$kk])) {
+							if(!is_numeric($av[$kk])) {
+								$av[$kk] = makeTsFromDate($av[$kk]);
+							}
+						}
+					break;
+				}
+			}
+		}
+	}
+
+	//print_r($attributes);exit;
 	// Check to see if the search has been restricted to a particular sub-tree in
 	// the folder hierarchy.
 	$startFolder = null;

From 19144f3c73f23e6777cb6e0fdc50a2a134208d9e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Apr 2023 12:29:40 +0200
Subject: [PATCH 1974/2006] better handling of date attributes

---
 views/bootstrap/class.Search.php | 68 +++++++++++++++++++++++++++-----
 1 file changed, 58 insertions(+), 10 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 87d39fc66..f90450d76 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -971,7 +971,13 @@ $(document).ready(function() {
 							default:
 								$options = [];
 								foreach($values as $v=>$c) {
-									$option = array($v, $v);
+									switch($attrdef->getType()) {
+									case SeedDMS_Core_AttributeDefinition::type_date:
+										$option = array($v, getReadableDate($v));
+										break;
+									default:
+										$option = array($v, $v);
+									}
 									if(isset($attributes[$facetname]) && in_array($v, $attributes[$facetname]))
 										$option[] = true;
 									else
@@ -1052,7 +1058,16 @@ $(document).ready(function() {
 										echo '<input type="hidden" name="attributes['.$facetname.'][to]" value="'.$oldvalue['to'].'" />';
 									}
 								} else {
-									$oldvalue = is_array($allparams['attributes'][$facetname]) ? implode(',', $allparams['attributes'][$facetname]) : $allparams['attributes'][$facetname];
+									if(is_array($allparams['attributes'][$facetname])) {
+										switch($attrdef->getType()) {
+										case SeedDMS_Core_AttributeDefinition::type_date:
+											array_walk($allparams['attributes'][$facetname], function(&$v, $k){$v=getReadableDate($v);});
+											break;
+										}
+										$oldvalue = implode(',', $allparams['attributes'][$facetname]);
+									} else {
+										$oldvalue = $allparams['attributes'][$facetname];
+									}
 									unset($allparams['attributes'][$facetname]);
 									$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
 									$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.$dispname.' = '.$oldvalue, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
@@ -1065,18 +1080,22 @@ $(document).ready(function() {
 						$allparams = $request->query->all();
 						if(isset($allparams[$facetname])) {
 							$oldvalue = is_array($allparams[$facetname]) ? implode(',', $allparams[$facetname]) : $allparams[$facetname];
+							switch($facetname) {
+							case 'status':
+								$oldtransval = getOverallStatusText($oldvalue);
+								break;
+							default:
+								$oldtransval = $oldvalue;
+							}
 							unset($allparams[$facetname]);
 							$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
-							$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText($facetname).' = '.$oldvalue, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+							$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText($facetname).' = '.$oldtransval, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
 							echo '<input type="hidden" name="'.$facetname.'[]" value="'.$oldvalue.'" />';
 						}
 					}
 				}
 				if($menuitems) {
-//					ob_start();
 					self::showNavigationListWithBadges($menuitems);
-//					$content = ob_get_clean();
-//					$this->printAccordion(getMLText('current_filter'), $content, true);
 				}
 			}
 			echo "<p></p>";
@@ -1102,7 +1121,7 @@ $(document).ready(function() {
 									if(empty($allparams['attributes'][$facetname]['from']) && empty($allparams['attributes'][$facetname]['to'])) {
 										$tt = array_keys($values);
 										$content = '<div class="input-group">';
-										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> from </span>';
+										$content .= '<span class="input-group-text" style="border-right: 0;"> from </span>';
 										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][from]" value="" placeholder="min is '.min($tt).'" />';
 										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
 										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][to]" value="" placeholder="max is '.max($tt).'" />';
@@ -1112,13 +1131,34 @@ $(document).ready(function() {
 									}
 								}
 								break;
+							case SeedDMS_Core_AttributeDefinition::type_date:
+								if($values && (count($values) > 1 || reset($values) < $total)) {
+									if(empty($allparams['attributes'][$facetname]['from']) && empty($allparams['attributes'][$facetname]['to'])) {
+										$tt = array_keys($values);
+										$content = '<div class="input-group">';
+										$content .= '<span class="input-group-text" style="border-right: 0;"> from </span>';
+										$content .= $this->getDateChooser('', "attributes[".$facetname."][from]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)));
+										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
+										$content .= $this->getDateChooser('', "attributes[".$facetname."][to]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)));
+										$content .= '<button class="btn btn-primary" type="submit">Set</button>';
+										$content .= '</div>';
+										$this->printAccordion($dispname, $content);
+									}
+								}
+								break;
 							default:
 								/* See below on an explaination for the if statement */
 								if($values && (count($values) > 1 || reset($values) < $total)) {
 									$menuitems = array();
 									arsort($values);
 									foreach($values as $v=>$c) {
-										$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$newrequest->getRequestUri().'&attributes['.$facetname.'][]='.urlencode($v), 'badge'=>$c);
+										switch($attrdef->getType()) {
+										case SeedDMS_Core_AttributeDefinition::type_date:
+											$menuitems[] = array('label'=>getReadableDate($v), 'link'=>$newrequest->getRequestUri().'&attributes['.$facetname.'][]='.urlencode($v), 'badge'=>$c);
+											break;
+										default:
+											$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$newrequest->getRequestUri().'&attributes['.$facetname.'][]='.urlencode($v), 'badge'=>$c);
+										}
 									}
 									ob_start();
 									self::showNavigationListWithBadges($menuitems);
@@ -1136,8 +1176,16 @@ $(document).ready(function() {
 						if($values && (count($values) > 1 || reset($values) < $total)) {
 							$menuitems = array();
 							arsort($values);
-							foreach($values as $v=>$c) {
-								$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$newrequest->getRequestUri().'&'.$facetname.'[]='.urlencode($v), 'badge'=>$c);
+							switch($facetname) {
+							case 'status':
+								foreach($values as $v=>$c) {
+									$menuitems[] = array('label'=>getOverallStatusText($v), 'link'=>$newrequest->getRequestUri().'&'.$facetname.'[]='.urlencode($v), 'badge'=>$c);
+								}
+								break;
+							default:
+								foreach($values as $v=>$c) {
+									$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$newrequest->getRequestUri().'&'.$facetname.'[]='.urlencode($v), 'badge'=>$c);
+								}
 							}
 							ob_start();
 							self::showNavigationListWithBadges($menuitems);

From cef0c78ea389ef4422c91ff3b10303e0670b6c98 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Apr 2023 13:23:43 +0200
Subject: [PATCH 1975/2006] add parameter $nogroup to getDateChooser()

---
 views/bootstrap/class.Bootstrap.php   | 12 +++++++++---
 views/bootstrap4/class.Bootstrap4.php | 20 +++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index b06ba26bf..1d2cdf282 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1524,13 +1524,19 @@ $(document).ready(function() {
 		echo self::getDateChooser($defDate, $varName, $lang, $dateformat, $startdate, $enddate, $weekstart);
 	} /* }}} */
 
-	function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null) { /* {{{ */
+	function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null, $nogroup=false) { /* {{{ */
 		if(!$dateformat)
 			$dateformat = getConvertDateFormat();
+		$content = '';
 		$content = '
-			<span class="input-append date span12 datepicker" id="'.$varName.'date" '.($weekstart == null ? '' : 'data-date-week-start="'.intval($weekstart).'" ').'data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? ' data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').'>
-				<input class="span6" size="16" name="'.$varName.'" id="'.$varName.'" type="text" value="'.$defDate.'" autocomplete="off">
+			<span class="input-append date span4 datepicker" id="'.$varName.'date" '.($weekstart == null ? '' : 'data-date-week-start="'.intval($weekstart).'" ').'data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? ' data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').'>
+				<input class="span12" size="16" name="'.$varName.'" id="'.$varName.'" type="text" value="'.$defDate.'" autocomplete="off">
+';
+		if(!$nogroup)
+			$content .= '
 				<span class="add-on"><i class="fa fa-calendar"></i></span>
+';
+			$content .= '
 			</span>';
 		return $content;
 	} /* }}} */
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index ac611ffef..45a9fe0c7 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1554,17 +1554,19 @@ $(document).ready(function() {
 		echo self::getDateChooser($defDate, $varName, $lang, $dateformat, $startdate, $enddate, $weekstart);
 	} /* }}} */
 
-	function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null) { /* {{{ */
+	function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null, $nogroup=false) { /* {{{ */
 		if(!$dateformat)
 			$dateformat = getConvertDateFormat();
-		$content = '
-<div class="input-group date" id="'.$varName.'date">
-	<input type="text" class="form-control datepicker" name="'.$varName.'" id="'.$varName.'" value="'.$defDate. '" '.($weekstart == null ? '' : 'data-date-week-start="'.intval($weekstart).'" ').'data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? 'data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').' data-date-autoclose="true" data-provide="datepicker">
-	<div class="input-group-append">
-		<span class="input-group-text"><i class="fa fa-calendar"></i></span>
-	</div>
-</div>
-';
+		$content = '';
+		if(!$nogroup)
+			$content .= '<div class="input-group date" id="'.$varName.'date">';
+		$content .= '<input type="text" class="form-control datepicker" name="'.$varName.'" id="'.$varName.'" value="'.$defDate. '" '.($weekstart == null ? '' : 'data-date-week-start="'.intval($weekstart).'" ').'data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? 'data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').' data-date-autoclose="true" data-provide="datepicker">';
+		if(!$nogroup) {
+			$content .= '<div class="input-group-append">
+			<span class="input-group-text"><i class="fa fa-calendar"></i></span>
+		</div>';
+			$content .= '</div>';
+		}
 		return $content;
 	} /* }}} */
 

From e5b60df5037c1dd61e81a6a60f507373a2977598 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Apr 2023 13:24:16 +0200
Subject: [PATCH 1976/2006] output date chooser without surrounding group

---
 views/bootstrap/class.Search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index f90450d76..676e0624d 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1137,9 +1137,9 @@ $(document).ready(function() {
 										$tt = array_keys($values);
 										$content = '<div class="input-group">';
 										$content .= '<span class="input-group-text" style="border-right: 0;"> from </span>';
-										$content .= $this->getDateChooser('', "attributes[".$facetname."][from]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)));
+										$content .= $this->getDateChooser('', "attributes[".$facetname."][from]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)), null, true);
 										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
-										$content .= $this->getDateChooser('', "attributes[".$facetname."][to]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)));
+										$content .= $this->getDateChooser('', "attributes[".$facetname."][to]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)), null, true);
 										$content .= '<button class="btn btn-primary" type="submit">Set</button>';
 										$content .= '</div>';
 										$this->printAccordion($dispname, $content);

From 1a8a614359b25235637cff19feb606f73e875eb5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 25 Apr 2023 17:10:58 +0200
Subject: [PATCH 1977/2006] show preview of document next to form for
 attributes

---
 views/bootstrap/class.EditAttributes.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php
index 6a969236b..59121bcd2 100644
--- a/views/bootstrap/class.EditAttributes.php
+++ b/views/bootstrap/class.EditAttributes.php
@@ -44,6 +44,8 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Theme_Style {
 		$this->contentStart();
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
+		$this->rowStart();
+		$this->columnStart(6);
 		$this->contentHeading(getMLText("edit_attributes"));
 ?>
 <form class="form-horizontal" action="../op/op.EditAttributes.php" name="form1" method="POST">
@@ -79,6 +81,13 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Theme_Style {
 		} else {
 			$this->warningMsg(getMLText('no_attributes_defined'));
 		}
+		$this->columnEnd();
+		$this->columnStart(6);
+?>
+	<div class="ajax" data-view="ViewDocument" data-action="preview" <?php echo ($document ? "data-query=\"documentid=".$document->getID()."\"" : "") ?>></div>
+<?php
+		$this->columnEnd();
+		$this->rowEnd();
 ?>
 </form>
 <?php

From 03aa307fa3a22029503f4a39a9e09168b8253355 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Apr 2023 06:21:01 +0200
Subject: [PATCH 1978/2006] add changes of 5.1.31

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c19c333ca..1229f7584 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,9 @@
 - fix export of search result
 - use openssl instead of mcrypt
 - search form shows 'from' and 'to' field for integers and floats
+- show preview of document in EditAttributes page
+- major overhaul of fulltext search, add new search tab for a more
+  facetted based search
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30

From 6e1ce682f2b54164c24fe96de11320eb6f4e9907 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Apr 2023 06:44:59 +0200
Subject: [PATCH 1979/2006] do not show new search tab for lucene based search

---
 views/bootstrap/class.Search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 676e0624d..faaa528d5 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -394,6 +394,7 @@ $(document).ready(function() {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$settings = $this->params['settings'];
 		$request = $this->params['request'];
 		$fullsearch = $this->params['fullsearch'];
 		$facetsearch = $this->params['facetsearch'];
@@ -407,7 +408,7 @@ $(document).ready(function() {
 		$resultmode = $this->params['resultmode'];
 		$workflowmode = $this->params['workflowmode'];
 		$enablefullsearch = $this->params['enablefullsearch'];
-		$enablefacetsearch = true;
+		$enablefacetsearch = ($settings->_fullSearchEngine != 'lucene');
 		$enableclipboard = $this->params['enableclipboard'];
 		$attributes = $this->params['attributes'];
 		$categories = $this->params['categories'];

From 3f699ebe62ab74f69e3922c3cda752991d4e660e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Apr 2023 08:41:39 +0200
Subject: [PATCH 1980/2006] no border radius for date selector and select2

---
 views/bootstrap4/styles/application.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css
index 3a487f668..24124c923 100644
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@@ -272,6 +272,15 @@ a.accordion2-toggle:focus, a.accordion2-toggle:hover {
 	text-decoration: none;
 }
 
+.select2-container--bootstrap4 .select2-selection {
+	border-radius: 0px;
+}
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+	border-radius: 0px;
+}
+.datepicker {
+	border-radius: 0px;
+}
 span.datepicker {
 	padding: 0px;
 }

From 96a0091002da2388e581f4318c5c5f019579a22a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Apr 2023 08:42:50 +0200
Subject: [PATCH 1981/2006] allow to set creation date in full search with
 facets

---
 views/bootstrap/class.Search.php | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index faaa528d5..3d129fad2 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -902,7 +902,6 @@ $(document).ready(function() {
 								$options[] = $option;
 							}
 						}
-					} elseif(substr($facetname, 0, 5) == 'attr_') {
 					} elseif($facetname == 'status') {
 						foreach($values as $v=>$c) {
 							$option = array($v, getOverallStatusText($v)/*.' ('.$c.')'*/);
@@ -913,6 +912,8 @@ $(document).ready(function() {
 							$option[] = array(array('data-subtitle', $c.' ×'));
 							$options[] = $option;
 						}
+					} elseif(substr($facetname, 0, 5) == 'attr_' || $facetname == 'created') {
+						/* Do not even create a list of options, because it isn't used */
 					} else {
 						foreach($values as $v=>$c) {
 							$option = array($v, $v);
@@ -924,7 +925,7 @@ $(document).ready(function() {
 							$options[] = $option;
 						}
 					}
-					if(substr($facetname, 0, 5) != 'attr_') {
+					if(substr($facetname, 0, 5) != 'attr_' && $facetname != 'created') {
 						$this->formField(
 							getMLText($facetname),
 							array(
@@ -1080,12 +1081,18 @@ $(document).ready(function() {
 						/* Create a link to remove the filter */
 						$allparams = $request->query->all();
 						if(isset($allparams[$facetname])) {
-							$oldvalue = is_array($allparams[$facetname]) ? implode(',', $allparams[$facetname]) : $allparams[$facetname];
 							switch($facetname) {
 							case 'status':
+								$oldvalue = is_array($allparams[$facetname]) ? implode(',', $allparams[$facetname]) : $allparams[$facetname];
 								$oldtransval = getOverallStatusText($oldvalue);
 								break;
+							case 'created':
+								array_walk($allparams[$facetname], function(&$v, $k){$v=getReadableDate($v);});
+								$oldvalue = $allparams[$facetname];
+								$oldtransval = $oldvalue['from'].' TO '.$oldvalue['to'];
+								break;
 							default:
+								$oldvalue = is_array($allparams[$facetname]) ? implode(',', $allparams[$facetname]) : $allparams[$facetname];
 								$oldtransval = $oldvalue;
 							}
 							unset($allparams[$facetname]);
@@ -1168,6 +1175,18 @@ $(document).ready(function() {
 								}
 							}
 						}
+					} elseif($facetname == 'created') {
+						if(empty($allparams[$facetname]['from']) && empty($allparams[$facetname]['to'])) {
+							$tt = array_keys($values);
+							$content = '<div class="input-group">';
+							$content .= '<span class="input-group-text" style="border-right: 0;"> from </span>';
+							$content .= $this->getDateChooser('', $facetname."[from]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(time()), null, true);
+							$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
+							$content .= $this->getDateChooser('', $facetname."[to]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(time()), null, true);
+							$content .= '<button class="btn btn-primary" type="submit">Set</button>';
+							$content .= '</div>';
+							$this->printAccordion(getMLText('creation_date'), $content);
+						}
 					} else {
 						/* Further filter makes only sense if the facet has more than 1 value
 						 * or in case of 1 value, if that value has a count < $total. That second

From febccfc6046473c3a29d3e04065f91056242e0da Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 26 Apr 2023 17:35:59 +0200
Subject: [PATCH 1982/2006] switching between search tabs will no longer loose
 values

---
 out/out.Search.php               | 175 +++++++++++++++++--------------
 views/bootstrap/class.Search.php |  76 ++++++++++----
 2 files changed, 155 insertions(+), 96 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index bb3b7f15d..1d65c6ffb 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -66,22 +66,65 @@ if (isset($_GET["removecategory"]) && is_numeric($_GET["removecategory"]) && $_G
 	$removecategory = (int) $_GET['removecategory'];
 }
 
-$terms = [];
-$limit = (isset($_GET["limit"]) && is_numeric($_GET["limit"])) ? (int) $_GET['limit'] : 20;
-$fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch;
-$facetsearch = !empty($_GET["facetsearch"]) && $settings->_enableFullSearch;
-if($fullsearch) {
-// Search in Fulltext {{{
-	if (isset($_GET["query"]) && is_string($_GET["query"])) {
-		$query = $_GET["query"];
-//		if(isset($_GET['action']) && ($_GET['action'] == 'typeahead'))
-//			$query .= '*';
+/* Creation date {{{ */
+$createstartts = null;
+$createstartdate = null;
+$createendts = null;
+$createenddate = null;
+$created['from'] = null;
+$created['to'] = null;
+if(!empty($_GET["created"]["from"])) {
+	$createstartts = makeTsFromDate($_GET["created"]["from"]);
+	$createstartdate = array('year'=>(int)date('Y', $createstartts), 'month'=>(int)date('m', $createstartts), 'day'=>(int)date('d', $createstartts), 'hour'=>0, 'minute'=>0, 'second'=>0);
+	if (!checkdate($createstartdate['month'], $createstartdate['day'], $createstartdate['year'])) {
+		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
 	}
-	else {
-		$query = "";
+	$created['from'] = $createstartts;
+}
+if(!empty($_GET["created"]["to"])) {
+	$createendts = makeTsFromDate($_GET["created"]["to"]);
+	$createenddate = array('year'=>(int)date('Y', $createendts), 'month'=>(int)date('m', $createendts), 'day'=>(int)date('d', $createendts), 'hour'=>23, 'minute'=>59, 'second'=>59);
+	if (!checkdate($createenddate['month'], $createenddate['day'], $createenddate['year'])) {
+		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
 	}
+	$created['to'] = $createendts;
+}
+/* }}} */
 
-	// category
+// Check to see if the search has been restricted to a particular
+// document owner.
+// $_GET['owner'] can be a name of an array of names or ids {{{
+$owner = [];
+$ownernames = []; // Needed by fulltext search
+$ownerobjs = []; // Needed by database search
+if(!empty($_GET["owner"])) {
+	$owner = $_GET['owner'];
+	if (!is_array($_GET['owner'])) {
+		if(is_numeric($_GET['owner']))
+			$o = $dms->getUser($_GET['owner']);
+		else
+			$o = $dms->getUserByLogin($_GET['owner']);
+		if($o) {
+			$ownernames[] = $o->getLogin();
+			$ownerobjs[] = $o;
+		}
+	} else {
+		foreach($_GET["owner"] as $l) {
+			if($l) {
+				if(is_numeric($l))
+					$o = $dms->getUser($l);
+				else
+					$o = $dms->getUserByLogin($l);
+				if($o) {
+					$ownernames[] = $o->getLogin();
+					$ownerobjs[] = $o;
+				}
+			}
+		}
+	}
+} /* }}} */
+
+	// category {{{
 	$categories = array();
 	$categorynames = array();
 	$category = array();
@@ -99,6 +142,21 @@ if($fullsearch) {
 				}
 			}
 		}
+	} /* }}} */
+
+$terms = [];
+$limit = (isset($_GET["limit"]) && is_numeric($_GET["limit"])) ? (int) $_GET['limit'] : 20;
+$fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch;
+$facetsearch = !empty($_GET["facetsearch"]) && $settings->_enableFullSearch;
+if($fullsearch) {
+// Search in Fulltext {{{
+	if (isset($_GET["query"]) && is_string($_GET["query"])) {
+		$query = $_GET["query"];
+//		if(isset($_GET['action']) && ($_GET['action'] == 'typeahead'))
+//			$query .= '*';
+	}
+	else {
+		$query = "";
 	}
 
 	//
@@ -122,33 +180,7 @@ if($fullsearch) {
 	// --------------- Suche starten --------------------------------------------
 
 	// Check to see if the search has been restricted to a particular
-	// document owner.
-	$owner = [];
-	$ownernames = [];
-	if(!empty($_GET["owner"])) {
-		$owner = $_GET['owner'];
-		if (!is_array($_GET['owner'])) {
-			if(is_numeric($_GET['owner'])) {
-				if($o = $dms->getUser($_GET['owner']))
-					$ownernames[] = $o->getLogin();
-			} else {
-				$ownernames[] = $_GET['owner'];
-			}
-		} else {
-			foreach($_GET["owner"] as $l) {
-				if($l) {
-					if(is_numeric($l)) {
-						if($o = $dms->getUser($l))
-							$ownernames[] = $o->getLogin();
-					} else {
-						$ownernames[] = $l;
-					}
-				}
-			}
-		}
-	}
-	// Check to see if the search has been restricted to a particular
-	// mimetype.
+	// mimetype. {{{
 	$mimetype = [];
 	if (isset($_GET["mimetype"])) {
 		if (!is_array($_GET['mimetype'])) {
@@ -160,28 +192,31 @@ if($fullsearch) {
 					$mimetype[] = $l;
 			}
 		}
-	}
+	} /* }}} */
 
-	/* Creation date {{{ */
+	/* Creation date {{{ 
 	$createstartts = null;
 	$createstartdate = null;
 	$createendts = null;
 	$createenddate = null;
-	if(!empty($_GET["createstart"])) {
-		$createstartts = makeTsFromDate($_GET["createstart"]);
+	$created = [];
+	if(!empty($_GET["created"]["from"])) {
+		$createstartts = makeTsFromDate($_GET["created"]["from"]);
 		$createstartdate = array('year'=>(int)date('Y', $createstartts), 'month'=>(int)date('m', $createstartts), 'day'=>(int)date('d', $createstartts), 'hour'=>0, 'minute'=>0, 'second'=>0);
+		if (!checkdate($createstartdate['month'], $createstartdate['day'], $createstartdate['year'])) {
+			UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
+		}
+		$created['from'] = $createstartts;
 	}
-	if ($createstartdate && !checkdate($createstartdate['month'], $createstartdate['day'], $createstartdate['year'])) {
-		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
-	}
-	if(!empty($_GET["createend"])) {
-		$createendts = makeTsFromDate($_GET["createend"]);
+	if(!empty($_GET["created"]["to"])) {
+		$createendts = makeTsFromDate($_GET["created"]["to"]);
 		$createenddate = array('year'=>(int)date('Y', $createendts), 'month'=>(int)date('m', $createendts), 'day'=>(int)date('d', $createendts), 'hour'=>23, 'minute'=>59, 'second'=>59);
+		if (!checkdate($createenddate['month'], $createenddate['day'], $createenddate['year'])) {
+			UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
+		}
+		$created['to'] = $createendts;
 	}
-	if ($createenddate && !checkdate($createenddate['month'], $createenddate['day'], $createenddate['year'])) {
-		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
-	}
-	/* }}} */
+	 }}} */
 
 	// status
 	if(isset($_GET['status']))
@@ -381,7 +416,7 @@ if($fullsearch) {
 	}
 
 	// Check to see if the search has been restricted to a particular
-	// document owner.
+	/* document owner. {{{
 	$owner = array();
 	$ownerobjs = array();
 	if (isset($_GET["owner"])) {
@@ -398,9 +433,9 @@ if($fullsearch) {
 				}
 			}
 		}
-	}
+	}  }}} */
 
-	/* Creation date {{{ */
+	/* Creation date {{{ 
 	$createstartdate = array();
 	$createenddate = array();
 	if(!empty($_GET["createstart"])) {
@@ -417,7 +452,7 @@ if($fullsearch) {
 	if ($createenddate && !checkdate($createenddate['month'], $createenddate['day'], $createenddate['year'])) {
 		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
 	}
-	/* }}} */
+	}}} */
 
 	/* Status date {{{ */
 	$statusstartdate = array();
@@ -491,22 +526,6 @@ if($fullsearch) {
 	 * to folders.
 	 */
 //	if($status)
-//		$resultmode = 0x01;
-
-	// category
-	$categories = array();
-	$category = [];
-	if(isset($_GET['category']) && $_GET['category']) {
-		$category = $_GET['category'];
-		foreach($_GET['category'] as $catid) {
-			if($cat = $dms->getDocumentCategory($catid)) {
-				$categories[] = $cat;
-			}
-		}
-	}
-
-	/* Do not search for folders if result shall be filtered by categories. */
-//	if($categories)
 //		$resultmode = 0x01;
 
 	if (isset($_GET["attributes"]))
@@ -549,7 +568,6 @@ if($fullsearch) {
 		}
 	}
 
-
 	// ---------------- Start searching -----------------------------------------
 	$startTime = getTime();
 	$resArr = $dms->search(array(
@@ -561,8 +579,8 @@ if($fullsearch) {
 		'startFolder'=>$startFolder,
 		'owner'=>$ownerobjs,
 		'status'=>$status,
-		'creationstartdate'=>$createstartdate ? $createstartdate : array(),
-		'creationenddate'=>$createenddate ? $createenddate : array(),
+		'creationstartdate'=>$created['from'], //$createstartdate ? $createstartdate : array(),
+		'creationenddate'=>$created['to'], //$createenddate ? $createenddate : array(),
 		'modificationstartdate'=>array(),
 		'modificationenddate'=>array(),
 		'categories'=>$categories,
@@ -663,8 +681,9 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('searchin', isset($searchin) ? $searchin : array());
 		$view->setParam('startfolder', isset($startFolder) ? $startFolder : null);
 		$view->setParam('owner', $owner);
-		$view->setParam('createstartdate', !empty($createstartdate) ? getReadableDate($createstartts) : '');
-		$view->setParam('createenddate', !empty($createenddate) ? getReadableDate($createendts) : '');
+		$view->setParam('createstartdate', $createstartts);
+		$view->setParam('createenddate', $createendts);
+		$view->setParam('created', $created);
 		$view->setParam('expstartdate', !empty($expstartdate) ? getReadableDate($expstartts) : '');
 		$view->setParam('expenddate', !empty($expenddate) ? getReadableDate($expendts) : '');
 		$view->setParam('statusstartdate', !empty($statusstartdate) ? getReadableDate($statusstartts) : '');
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 3d129fad2..c26a4a579 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -418,6 +418,7 @@ $(document).ready(function() {
 		$startfolder = $this->params['startfolder'];
 		$createstartdate = $this->params['createstartdate'];
 		$createenddate = $this->params['createenddate'];
+		$created = $this->params['created'];
 		$expstartdate = $this->params['expstartdate'];
 		$expenddate = $this->params['expenddate'];
 		$statusstartdate = $this->params['statusstartdate'];
@@ -565,11 +566,11 @@ $(document).ready(function() {
 		$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form1", M_READ, -1, $startfolder));
 		$this->formField(
 			getMLText("creation_date")." (".getMLText('from').")",
-			$this->getDateChooser($createstartdate, "createstart", $this->params['session']->getLanguage())
+			$this->getDateChooser(!empty($createstartdate) ? getReadableDate($createstartdate) : null, "created[from]", $this->params['session']->getLanguage())
 		);
 		$this->formField(
 			getMLText("creation_date")." (".getMLText('to').")",
-			$this->getDateChooser($createenddate, "createend", $this->params['session']->getLanguage())
+			$this->getDateChooser(!empty($createenddate) ? getReadableDate($createenddate) : null, "created[to]", $this->params['session']->getLanguage())
 		);
 		$this->contentContainerEnd();
 
@@ -785,11 +786,11 @@ $(document).ready(function() {
 			$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form2", M_READ, -1, $startfolder, 'folderfullsearchid'));
 			$this->formField(
 				getMLText("creation_date")." (".getMLText('from').")",
-				$this->getDateChooser($createstartdate, "createstart", $this->params['session']->getLanguage())
+				$this->getDateChooser(!empty($created['from']) ? getReadableDate($created['from']) : null, "created[from]", $this->params['session']->getLanguage())
 			);
 			$this->formField(
 				getMLText("creation_date")." (".getMLText('to').")",
-				$this->getDateChooser($createenddate, "createend", $this->params['session']->getLanguage())
+				$this->getDateChooser(!empty($created['to']) ? getReadableDate($created['to']) : null, "created[to]", $this->params['session']->getLanguage())
 			);
 			if(!isset($facets['owner'])) {
 				$options = array();
@@ -1066,14 +1067,15 @@ $(document).ready(function() {
 											array_walk($allparams['attributes'][$facetname], function(&$v, $k){$v=getReadableDate($v);});
 											break;
 										}
-										$oldvalue = implode(',', $allparams['attributes'][$facetname]);
-									} else {
 										$oldvalue = $allparams['attributes'][$facetname];
+									} else {
+										$oldvalue = [$allparams['attributes'][$facetname]];
 									}
 									unset($allparams['attributes'][$facetname]);
 									$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
-									$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.$dispname.' = '.$oldvalue, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
-									echo '<input type="hidden" name="attributes['.$facetname.'][]" value="'.$oldvalue.'" />';
+									$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.$dispname.' = '.implode(', ', $oldvalue), 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+									foreach($oldvalue as $ov)
+										echo '<input type="hidden" name="attributes['.$facetname.'][]" value="'.$ov.'" />';
 								}
 							}
 						}
@@ -1082,23 +1084,55 @@ $(document).ready(function() {
 						$allparams = $request->query->all();
 						if(isset($allparams[$facetname])) {
 							switch($facetname) {
+							case 'category':
+								$oldvalue = is_array($allparams[$facetname]) ? $allparams[$facetname] : [$allparams[$facetname]];
+								$oldtransval = [];
+								foreach($oldvalue as $v) {
+									if(is_numeric($v))
+										$fu = $dms->getDocumentCategory($v);
+									else
+										$fu = $dms->getDocumentCategoryByName($v);
+									if($fu)
+										$oldtransval[] = $fu->getName();
+								}
+								break;
+							case 'owner':
+								$oldvalue = is_array($allparams[$facetname]) ? $allparams[$facetname] : [$allparams[$facetname]];
+								$oldtransval = [];
+								foreach($oldvalue as $v) {
+									if(is_numeric($v))
+										$fu = $dms->getUser($v);
+									else
+										$fu = $dms->getUserByLogin($v);
+									if($fu)
+										$oldtransval[] = $fu->getLogin();
+								}
+								break;
 							case 'status':
-								$oldvalue = is_array($allparams[$facetname]) ? implode(',', $allparams[$facetname]) : $allparams[$facetname];
-								$oldtransval = getOverallStatusText($oldvalue);
+								$oldvalue = is_array($allparams[$facetname]) ? $allparams[$facetname] : [$allparams[$facetname]];
+								$oldtransval = $oldvalue;
+								array_walk($oldtransval, function(&$v, $k){$v = getOverallStatusText($v);});
 								break;
 							case 'created':
-								array_walk($allparams[$facetname], function(&$v, $k){$v=getReadableDate($v);});
-								$oldvalue = $allparams[$facetname];
-								$oldtransval = $oldvalue['from'].' TO '.$oldvalue['to'];
+								if(!empty($allparams[$facetname]['from']) || !empty($allparams[$facetname]['to'])) {
+									array_walk($allparams[$facetname], function(&$v, $k){$v=getReadableDate($v);});
+									$oldvalue = $allparams[$facetname];
+									$oldtransval = $oldvalue; //$oldvalue['from'].' TO '.$oldvalue['to'];
+								} else {
+									$oldvalue = null;
+								}
 								break;
 							default:
-								$oldvalue = is_array($allparams[$facetname]) ? implode(',', $allparams[$facetname]) : $allparams[$facetname];
+								$oldvalue = is_array($allparams[$facetname]) ? $allparams[$facetname] : [$allparams[$facetname]];
 								$oldtransval = $oldvalue;
 							}
-							unset($allparams[$facetname]);
-							$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
-							$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText($facetname).' = '.$oldtransval, 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
-							echo '<input type="hidden" name="'.$facetname.'[]" value="'.$oldvalue.'" />';
+							if($oldvalue) {
+								unset($allparams[$facetname]);
+								$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
+								$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.getMLText($facetname).' = '.implode(', ', $oldtransval), 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+								foreach($oldvalue as $ok=>$ov)
+									echo '<input type="hidden" name="'.$facetname.'['.$ok.']" value="'.$ov.'" />';
+							}
 						}
 					}
 				}
@@ -1202,6 +1236,12 @@ $(document).ready(function() {
 									$menuitems[] = array('label'=>getOverallStatusText($v), 'link'=>$newrequest->getRequestUri().'&'.$facetname.'[]='.urlencode($v), 'badge'=>$c);
 								}
 								break;
+							case 'owner':
+								foreach($values as $v=>$c) {
+									if($fu = $dms->getUserByLogin($v))
+										$menuitems[] = array('label'=>$fu->getLogin(), 'link'=>$newrequest->getRequestUri().'&'.$facetname.'[]='.$fu->getId(), 'badge'=>$c);
+								}
+								break;
 							default:
 								foreach($values as $v=>$c) {
 									$menuitems[] = array('label'=>htmlspecialchars($v), 'link'=>$newrequest->getRequestUri().'&'.$facetname.'[]='.urlencode($v), 'badge'=>$c);

From 9c82ba9e3ae1a71a83267083e255f36ca31d626d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Apr 2023 11:20:24 +0200
Subject: [PATCH 1983/2006] placeholder can be passed to date chooser

---
 views/bootstrap/class.Bootstrap.php   | 4 ++--
 views/bootstrap4/class.Bootstrap4.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 1d2cdf282..fc149f9ab 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1524,13 +1524,13 @@ $(document).ready(function() {
 		echo self::getDateChooser($defDate, $varName, $lang, $dateformat, $startdate, $enddate, $weekstart);
 	} /* }}} */
 
-	function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null, $nogroup=false) { /* {{{ */
+	function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null, $placeholder='', $nogroup=false) { /* {{{ */
 		if(!$dateformat)
 			$dateformat = getConvertDateFormat();
 		$content = '';
 		$content = '
 			<span class="input-append date span4 datepicker" id="'.$varName.'date" '.($weekstart == null ? '' : 'data-date-week-start="'.intval($weekstart).'" ').'data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? ' data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').'>
-				<input class="span12" size="16" name="'.$varName.'" id="'.$varName.'" type="text" value="'.$defDate.'" autocomplete="off">
+				<input class="span12" size="16" name="'.$varName.'" id="'.$varName.'" type="text" placeholder="'.htmlspecialchars($placeholder).'" value="'.$defDate.'" autocomplete="off">
 ';
 		if(!$nogroup)
 			$content .= '
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 45a9fe0c7..ac0412356 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -1554,13 +1554,13 @@ $(document).ready(function() {
 		echo self::getDateChooser($defDate, $varName, $lang, $dateformat, $startdate, $enddate, $weekstart);
 	} /* }}} */
 
-	function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null, $nogroup=false) { /* {{{ */
+	function getDateChooser($defDate = '', $varName, $lang='', $dateformat='', $startdate='', $enddate='', $weekstart=null, $placeholder='', $nogroup=false) { /* {{{ */
 		if(!$dateformat)
 			$dateformat = getConvertDateFormat();
 		$content = '';
 		if(!$nogroup)
 			$content .= '<div class="input-group date" id="'.$varName.'date">';
-		$content .= '<input type="text" class="form-control datepicker" name="'.$varName.'" id="'.$varName.'" value="'.$defDate. '" '.($weekstart == null ? '' : 'data-date-week-start="'.intval($weekstart).'" ').'data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? 'data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').' data-date-autoclose="true" data-provide="datepicker">';
+		$content .= '<input type="text" class="form-control datepicker" placeholder="'.htmlspecialchars($placeholder).'" name="'.$varName.'" id="'.$varName.'" value="'.$defDate. '" '.($weekstart == null ? '' : 'data-date-week-start="'.intval($weekstart).'" ').'data-date="'.$defDate.'" data-selectmenu="presetexpdate" data-date-format="'.$dateformat.'"'.($lang ? 'data-date-language="'.str_replace('_', '-', $lang).'"' : '').($startdate ? ' data-date-start-date="'.$startdate.'"' : '').($enddate ? ' data-date-end-date="'.$enddate.'"' : '').' data-date-autoclose="true" data-provide="datepicker">';
 		if(!$nogroup) {
 			$content .= '<div class="input-group-append">
 			<span class="input-group-text"><i class="fa fa-calendar"></i></span>

From 78515e93b47b3a2bf3b4ea3684ce2b00a68c44ca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Apr 2023 11:21:59 +0200
Subject: [PATCH 1984/2006] pass new parameter to getDateChooser()

---
 views/bootstrap/class.Search.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index c26a4a579..3ffffbea5 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1179,9 +1179,9 @@ $(document).ready(function() {
 										$tt = array_keys($values);
 										$content = '<div class="input-group">';
 										$content .= '<span class="input-group-text" style="border-right: 0;"> from </span>';
-										$content .= $this->getDateChooser('', "attributes[".$facetname."][from]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)), null, true);
+										$content .= $this->getDateChooser('', "attributes[".$facetname."][from]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)), null, '', true);
 										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
-										$content .= $this->getDateChooser('', "attributes[".$facetname."][to]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)), null, true);
+										$content .= $this->getDateChooser('', "attributes[".$facetname."][to]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)), null, '', true);
 										$content .= '<button class="btn btn-primary" type="submit">Set</button>';
 										$content .= '</div>';
 										$this->printAccordion($dispname, $content);
@@ -1214,9 +1214,9 @@ $(document).ready(function() {
 							$tt = array_keys($values);
 							$content = '<div class="input-group">';
 							$content .= '<span class="input-group-text" style="border-right: 0;"> from </span>';
-							$content .= $this->getDateChooser('', $facetname."[from]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(time()), null, true);
+							$content .= $this->getDateChooser('', $facetname."[from]", $this->params['session']->getLanguage(), '', '' /*getReadableDate(min($tt))*/, getReadableDate(time()), null, '', true);
 							$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
-							$content .= $this->getDateChooser('', $facetname."[to]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(time()), null, true);
+							$content .= $this->getDateChooser('', $facetname."[to]", $this->params['session']->getLanguage(), '', '' /*getReadableDate(min($tt))*/, getReadableDate(time()), null, '', true);
 							$content .= '<button class="btn btn-primary" type="submit">Set</button>';
 							$content .= '</div>';
 							$this->printAccordion(getMLText('creation_date'), $content);

From 96423e138812be70fd9171b6cdc6214a101847b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Apr 2023 11:22:14 +0200
Subject: [PATCH 1985/2006] fix output of markdown, because accessing settings
 was wrong

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 2f5478b18..fba2ae490 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -771,7 +771,7 @@ $(document).ready( function() {
 			echo $txt;
 		} else {
 			if($latestContent->getComment())
-				if($settings->_markdownComments) {
+				if($this->params['settings']->_markdownComments) {
 					$Parsedown = new Parsedown();
 					$comment = $Parsedown->text(htmlspecialchars($latestContent->getComment()));
 					print "<div class=\"content-comment\">".$comment."</div>";

From 7610eacf1f872a9728d1fd4a26f441846f659ae4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Apr 2023 11:23:01 +0200
Subject: [PATCH 1986/2006] call hook checkConfig() which outputs messages in
 the right column

---
 views/bootstrap/class.Settings.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 17abc51c4..a68f7ff3c 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -730,6 +730,11 @@ if(is_writeable($settings->_configFilePath)) {
 		if($settings->_enableLargeFileUpload && $mus2 < $mus1) {
 			$this->warningMsg(getMLText("settings_partionsize_below_max_filesize"));
 		}
+
+		foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
+			if($this->hasHook('checkConfig'))
+				$this->callHook('checkConfig', $extname, $extconf);
+		}
 		$this->columnEnd(4);
 		$this->rowEnd(4);
 		$this->contentEnd();

From 693a68261b824b10f16f0c161e81a6b7b6bbecdc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Apr 2023 12:11:09 +0200
Subject: [PATCH 1987/2006] remove min-height of search form

---
 views/bootstrap/class.Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 3ffffbea5..ff95f44cc 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1022,7 +1022,7 @@ $(document).ready(function() {
 		if($enablefacetsearch) {
 	  	echo "<div class=\"tab-pane ".(($fullsearch == true && $facetsearch == true) ? 'active' : '')."\" id=\"facetfulltext\">\n";
 ?>
-<form class="form-horizontal" action="<?= $this->params['settings']->_httpRoot ?>out/out.Search.php" name="form2" style="min-height: 330px;">
+<form class="form-horizontal" action="<?= $this->params['settings']->_httpRoot ?>out/out.Search.php" name="form2">
 <input type="hidden" name="fullsearch" value="1" />
 <input type="hidden" name="facetsearch" value="1" />
 <?php

From b6e6b66125c1af3aeded3985462b9b174fa6a7bf Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Apr 2023 17:13:16 +0200
Subject: [PATCH 1988/2006] search for objects with an attribute not set

---
 views/bootstrap/class.Search.php | 34 +++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index ff95f44cc..a97322f58 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1041,9 +1041,10 @@ $(document).ready(function() {
 
 			$this->contentContainerEnd();
 
+			$menuitems = [];
 			if($facets) {
-				$menuitems = [];
 				foreach($facets as $facetname=>$values) {
+					if($values) {
 					if(substr($facetname, 0, 5) == 'attr_') {
 						$tmp = explode('_', $facetname);
 						if($attrdef = $dms->getAttributeDefinition($tmp[1])) {
@@ -1135,11 +1136,31 @@ $(document).ready(function() {
 							}
 						}
 					}
-				}
-				if($menuitems) {
-					self::showNavigationListWithBadges($menuitems);
+					}
 				}
 			}
+
+			/* Create remove links for query 'notset'. The don't have any facet
+			 * values and will not show up in the lists created above.
+			 * This currently just workѕ for attributes
+			 */
+			$allparams = $request->query->all();
+			foreach($allparams['attributes'] as $an=>$av) {
+				if(is_string($av) && $av == '__notset__') {
+					$tmp = explode('_', $an);
+					if($attrdef = $dms->getAttributeDefinition($tmp[1])) {
+						$dispname = $attrdef->getName();
+						unset($allparams['attributes'][$an]);
+						$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
+						$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.$dispname.' is not set', 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+					}
+				}
+			}
+
+			if($menuitems) {
+				self::showNavigationListWithBadges($menuitems);
+			}
+
 			echo "<p></p>";
 			$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
 			echo "<p></p>";
@@ -1162,7 +1183,9 @@ $(document).ready(function() {
 								if($values && (count($values) > 1 || reset($values) < $total)) {
 									if(empty($allparams['attributes'][$facetname]['from']) && empty($allparams['attributes'][$facetname]['to'])) {
 										$tt = array_keys($values);
-										$content = '<div class="input-group">';
+										$content = '';
+										$content = '<p><a href="'.$newrequest->getRequestUri().'&attributes['.$facetname.']=__notset__">Objects without this attribute</a></p>';
+										$content .= '<div class="input-group">';
 										$content .= '<span class="input-group-text" style="border-right: 0;"> from </span>';
 										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][from]" value="" placeholder="min is '.min($tt).'" />';
 										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
@@ -1192,6 +1215,7 @@ $(document).ready(function() {
 								/* See below on an explaination for the if statement */
 								if($values && (count($values) > 1 || reset($values) < $total)) {
 									$menuitems = array();
+									$menuitems[] = array('label'=>'not set', 'link'=>$newrequest->getRequestUri().'&attributes['.$facetname.']=__notset__');
 									arsort($values);
 									foreach($values as $v=>$c) {
 										switch($attrdef->getType()) {

From adfa9c442fd9e9e146923ccf724f0a3dff2f114b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Apr 2023 18:38:48 +0200
Subject: [PATCH 1989/2006] fix setting comment in notificatoin mail

---
 inc/inc.ClassNotificationService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php
index b8da5e99d..b118c7569 100644
--- a/inc/inc.ClassNotificationService.php
+++ b/inc/inc.ClassNotificationService.php
@@ -753,7 +753,7 @@ class SeedDMS_NotificationService {
 			$params['name'] = $folder->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['old_comment'] = $oldcomment;
-			$params['new_comment'] = $comment;
+			$params['new_comment'] = $folder->getComment();
 			$params['username'] = $user->getFullName();
 			$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 			$params['sitename'] = $this->settings->_siteName;

From 3dfcb8d58149dc36072d55fc95d2491f82f0793b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Apr 2023 18:39:20 +0200
Subject: [PATCH 1990/2006] do not reindex document imediately

---
 controllers/class.EditDocument.php | 5 +++++
 controllers/class.EditFolder.php   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/controllers/class.EditDocument.php b/controllers/class.EditDocument.php
index a67011a65..bfe0dac30 100644
--- a/controllers/class.EditDocument.php
+++ b/controllers/class.EditDocument.php
@@ -162,6 +162,10 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common {
 				}
 			}
 
+			/* There are various hooks in inc/inc.FulltextInit.php which will take
+			 * care of reindexing it. They just delete the indexing date which is
+			 * faster then indexing the folder completely
+			 *
 			if($fulltextservice && ($index = $fulltextservice->Indexer()) && $document) {
 				$idoc = $fulltextservice->IndexedDocument($document);
 				if(false !== $this->callHook('preIndexDocument', $document, $idoc)) {
@@ -173,6 +177,7 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common {
 					$index->commit();
 				}
 			}
+			 */
  
 		} elseif($result === false) {
 			if(empty($this->errormsg))
diff --git a/controllers/class.EditFolder.php b/controllers/class.EditFolder.php
index 818f146b2..94a1fa066 100644
--- a/controllers/class.EditFolder.php
+++ b/controllers/class.EditFolder.php
@@ -96,6 +96,10 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 				}
 			}
 
+			/* There are various hooks in inc/inc.FulltextInit.php which will take
+			 * care of reindexing it. They just delete the indexing date which is
+			 * faster then indexing the folder completely
+			 *
 			if($fulltextservice && ($index = $fulltextservice->Indexer()) && $folder) {
 				$idoc = $fulltextservice->IndexedDocument($folder);
 				if(false !== $this->callHook('preIndexFolder', $folder, $idoc)) {
@@ -107,6 +111,7 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 					$index->commit();
 				}
 			}
+			 */
  
 		} elseif($result === false) {
 			if(empty($this->errormsg))

From 921eab9e544e54c85866915a964830e29d0a39f1 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Apr 2023 18:39:53 +0200
Subject: [PATCH 1991/2006] add more hooks for reindexing documents/folders

---
 inc/inc.FulltextInit.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/inc/inc.FulltextInit.php b/inc/inc.FulltextInit.php
index 84b9d2930..f02ab7e8f 100644
--- a/inc/inc.FulltextInit.php
+++ b/inc/inc.FulltextInit.php
@@ -13,6 +13,8 @@ function reindexDocumentOrFolderCallback($fulltextservice, $object) {
 			$hit = $lucenesearch->getDocument($object->getId());
 		elseif($object->isType('folder'))
 			$hit = $lucenesearch->getFolder($object->getId());
+		elseif($object->isType('documentcontent'))
+			$hit = $lucenesearch->getDocument($object->getDocument()->getId());
 		if($hit) {
 			$index->reindexDocument($hit->id);
 			$index->commit();
@@ -84,5 +86,8 @@ if($settings->_enableFullSearch) {
 	$dms->addCallback('onPostSetKategories', 'reindexDocumentOrFolderCallback', $fulltextservice);
 	$dms->addCallback('onPostAddKategories', 'reindexDocumentOrFolderCallback', $fulltextservice);
 	$dms->addCallback('onPostRemoveKategories', 'reindexDocumentOrFolderCallback', $fulltextservice);
+	$dms->addCallback('onPostAddAttribute', 'reindexDocumentOrFolderCallback', $fulltextservice);
+	$dms->addCallback('onPostUpdateAttribute', 'reindexDocumentOrFolderCallback', $fulltextservice);
+	$dms->addCallback('onPostRemoveAttribute', 'reindexDocumentOrFolderCallback', $fulltextservice);
 }
 

From f1763c39306dfecf717906388c6ad8955584c09b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 29 Apr 2023 15:09:20 +0200
Subject: [PATCH 1992/2006] add hidden input field for 'not set' attribute
 value

---
 views/bootstrap/class.Search.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index a97322f58..5e42be998 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1153,6 +1153,7 @@ $(document).ready(function() {
 						unset($allparams['attributes'][$an]);
 						$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
 						$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.$dispname.' is not set', 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+						echo '<input type="hidden" name="attributes['.$an.']" value="__notset__" />';
 					}
 				}
 			}

From 8c4564bf23458519a036ee9da88a9b4597076bcc Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 29 Apr 2023 15:10:05 +0200
Subject: [PATCH 1993/2006] use translated strings

---
 views/bootstrap/class.Search.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 5e42be998..da08319bc 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1185,12 +1185,12 @@ $(document).ready(function() {
 									if(empty($allparams['attributes'][$facetname]['from']) && empty($allparams['attributes'][$facetname]['to'])) {
 										$tt = array_keys($values);
 										$content = '';
-										$content = '<p><a href="'.$newrequest->getRequestUri().'&attributes['.$facetname.']=__notset__">Objects without this attribute</a></p>';
+										$content .= '<p><a href="'.$newrequest->getRequestUri().'&attributes['.$facetname.']=__notset__">'.getMLText('objects_without_attribute').'</a></p>';
 										$content .= '<div class="input-group">';
 										$content .= '<span class="input-group-text" style="border-right: 0;"> from </span>';
-										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][from]" value="" placeholder="min is '.min($tt).'" />';
+										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][from]" value="" placeholder="'.min($tt).'" />';
 										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
-										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][to]" value="" placeholder="max is '.max($tt).'" />';
+										$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][to]" value="" placeholder="'.max($tt).'" />';
 										$content .= '<button class="btn btn-primary" type="submit">Set</button>';
 										$content .= '</div>';
 										$this->printAccordion($dispname, $content);
@@ -1216,7 +1216,7 @@ $(document).ready(function() {
 								/* See below on an explaination for the if statement */
 								if($values && (count($values) > 1 || reset($values) < $total)) {
 									$menuitems = array();
-									$menuitems[] = array('label'=>'not set', 'link'=>$newrequest->getRequestUri().'&attributes['.$facetname.']=__notset__');
+									$menuitems[] = array('label'=>getMLText('no_value_set'), 'link'=>$newrequest->getRequestUri().'&attributes['.$facetname.']=__notset__');
 									arsort($values);
 									foreach($values as $v=>$c) {
 										switch($attrdef->getType()) {

From 4b4b7c13306043bb95a997e459e4d12420f5e6ac Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 29 Apr 2023 15:10:28 +0200
Subject: [PATCH 1994/2006] allow to search for unset dates

---
 views/bootstrap/class.Search.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index da08319bc..5f8f5ac1a 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1201,7 +1201,9 @@ $(document).ready(function() {
 								if($values && (count($values) > 1 || reset($values) < $total)) {
 									if(empty($allparams['attributes'][$facetname]['from']) && empty($allparams['attributes'][$facetname]['to'])) {
 										$tt = array_keys($values);
-										$content = '<div class="input-group">';
+										$content = '';
+										$content .= '<p><a href="'.$newrequest->getRequestUri().'&attributes['.$facetname.']=__notset__">'.getMLText('objects_without_attribute').'</a></p>';
+										$content .= '<div class="input-group">';
 										$content .= '<span class="input-group-text" style="border-right: 0;"> from </span>';
 										$content .= $this->getDateChooser('', "attributes[".$facetname."][from]", $this->params['session']->getLanguage(), '', getReadableDate(min($tt)), getReadableDate(max($tt)), null, '', true);
 										$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';

From 362839365b69c54d6424b7e98beb35ca198acdec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 30 Apr 2023 07:17:04 +0200
Subject: [PATCH 1995/2006] add some new translations

---
 languages/ar_EG/lang.inc | 5 +++++
 languages/bg_BG/lang.inc | 5 +++++
 languages/ca_ES/lang.inc | 5 +++++
 languages/cs_CZ/lang.inc | 5 +++++
 languages/de_DE/lang.inc | 7 ++++++-
 languages/el_GR/lang.inc | 5 +++++
 languages/en_GB/lang.inc | 7 ++++++-
 languages/es_ES/lang.inc | 5 +++++
 languages/fr_FR/lang.inc | 5 +++++
 languages/hr_HR/lang.inc | 5 +++++
 languages/hu_HU/lang.inc | 5 +++++
 languages/id_ID/lang.inc | 5 +++++
 languages/it_IT/lang.inc | 5 +++++
 languages/ko_KR/lang.inc | 5 +++++
 languages/lo_LA/lang.inc | 5 +++++
 languages/nb_NO/lang.inc | 5 +++++
 languages/nl_NL/lang.inc | 5 +++++
 languages/pl_PL/lang.inc | 5 +++++
 languages/pt_BR/lang.inc | 5 +++++
 languages/ro_RO/lang.inc | 5 +++++
 languages/ru_RU/lang.inc | 5 +++++
 languages/sk_SK/lang.inc | 5 +++++
 languages/sv_SE/lang.inc | 5 +++++
 languages/tr_TR/lang.inc | 5 +++++
 languages/uk_UA/lang.inc | 5 +++++
 languages/zh_CN/lang.inc | 5 +++++
 languages/zh_TW/lang.inc | 5 +++++
 27 files changed, 137 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 2fc07f597..55aa09357 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -341,11 +341,13 @@ URL: [url]',
 'converter_new_cmd' => 'converter_new_cmd',
 'converter_new_mimetype' => 'نوع جديد من الوثائق',
 'copied_to_checkout_as' => 'نسخ الى السب مثل',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'انشاء فهرس للنص الكامل',
 'create_fulltext_index_warning' => 'انت على وشك اعادة انشاء فهرس النص الكامل.هذا سيتطلب وقت كافي وسيؤثر بشكل عام على كفاءة النظام. اذا كنت حقا تود اعادة انشاء الفهرس، من فضلك قم بتاكيد العملية.',
 'creation_date' => 'انشأ في تاريخ',
 'cs_CZ' => 'التشيكية',
+'current_filter' => '',
 'current_password' => 'كلمة السر الحالية',
 'current_quota' => 'كوتا الحالية',
 'current_state' => 'الحالة الحالية',
@@ -1042,12 +1044,14 @@ URL: [url]',
 'no_revision_planed' => 'لم يخطط لأي مراجعة',
 'no_update_cause_locked' => 'لايمكنك تعديل المستند. قم بمخاطبة المستخدم الذي قام بحمايته من التعديل',
 'no_user_image' => 'لا يوجد صورة متاحة',
+'no_value_set' => '',
 'no_version_check' => 'لم يتحقق من اي اصدار',
 'no_version_modification' => 'لا تعديل على الإصدار',
 'no_workflows' => '',
 'no_workflow_available' => 'لا يوجد سير عمل',
 'number_count' => '',
 'objectcheck' => 'التحقق من مستند/مجلد',
+'objects_without_attribute' => '',
 'object_check_critical' => 'التحقق من الشيء في حالة حرجة',
 'object_check_warning' => 'تحذير في التحقق من شيء',
 'objtype_unknown' => '',
@@ -2034,6 +2038,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => 'تخطي تغيير الحالة 4',
 'timeline_skip_status_change_5' => 'تخطي تغيير الحالة 5',
 'timeline_status_change' => 'تغير الحالة',
+'title' => '',
 'to' => 'الى',
 'toggle_manager' => 'رجح مدير',
 'toggle_qrcode' => 'toggle toggle',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 9b7d5ea26..8dd68641f 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -324,11 +324,13 @@ $text = array(
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Създай пълнотекстов индекс',
 'create_fulltext_index_warning' => 'Вие искате да пресъздадете пълнотекстов индекс. Това ще отнеме време и ще понижи производителността. Да продолжа ли?',
 'creation_date' => 'Създаден',
 'cs_CZ' => 'Чешки',
+'current_filter' => '',
 'current_password' => 'Текуща парола',
 'current_quota' => '',
 'current_state' => '',
@@ -947,12 +949,14 @@ $text = array(
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Вие не можете да обновите документа. Свържете се с блокирщия го потребител.',
 'no_user_image' => 'Изображение не е намерено',
+'no_value_set' => '',
 'no_version_check' => '',
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => '',
 'number_count' => '',
 'objectcheck' => 'Проверка на Папка/Документ',
+'objects_without_attribute' => '',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'objtype_unknown' => '',
@@ -1897,6 +1901,7 @@ $text = array(
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Версия [version]: [status]',
+'title' => '',
 'to' => 'към',
 'toggle_manager' => 'Превключи мениджър',
 'toggle_qrcode' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 89c32607b..bf34b56b3 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -329,11 +329,13 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Crea un índex full-text',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Creació',
 'cs_CZ' => 'Txec',
+'current_filter' => '',
 'current_password' => '',
 'current_quota' => '',
 'current_state' => '',
@@ -952,12 +954,14 @@ URL: [url]',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Aquest document no es pot actualitzar. Si us plau, contacteu amb l\'usuari que l\'ha bloquejat.',
 'no_user_image' => 'No es troba la imatge',
+'no_value_set' => '',
 'no_version_check' => '',
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => '',
 'number_count' => '',
 'objectcheck' => 'Carpeta / Comprobació del document',
+'objects_without_attribute' => '',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'objtype_unknown' => '',
@@ -1902,6 +1906,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versió [version]:[status]',
+'title' => '',
 'to' => 'Fins',
 'toggle_manager' => 'Intercanviar manager',
 'toggle_qrcode' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 7ed067e0f..b3e42f980 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -353,11 +353,13 @@ URL: [url]',
 'converter_new_cmd' => 'Příkaz',
 'converter_new_mimetype' => 'Nový mimetype',
 'copied_to_checkout_as' => 'Soubor zkopírován do kontrolního prostoru jako \'[filename]\' v [date]',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Vytvořit fulltext index',
 'create_fulltext_index_warning' => 'Hodláte znovu vytvořit fulltext index. Může to trvat dlouho a zpomalit běh systému. Pokud víte, co děláte, potvďte operaci.',
 'creation_date' => 'Vytvořeno',
 'cs_CZ' => 'Čeština',
+'current_filter' => '',
 'current_password' => 'Současné heslo',
 'current_quota' => 'Systém kvót je nastaven na [quota].',
 'current_state' => 'Současný stav',
@@ -1073,12 +1075,14 @@ URL: [url]',
 'no_revision_planed' => 'Není v plánu žádná revize dokumentu',
 'no_update_cause_locked' => 'Proto nemůžete aktualizovat tento dokument. Kontaktujte uživatele, který ho zamknul.',
 'no_user_image' => 'nebyl nalezen žádný obrázek',
+'no_value_set' => '',
 'no_version_check' => 'Chyba při kontrole nové verze SeedDMS. Může to být způsobeno nastavením allow_url_fopen na 0 ve vaší php konfiguraci.',
 'no_version_modification' => 'Žádná změna verze',
 'no_workflows' => '',
 'no_workflow_available' => 'Není k dispozici žádné workflow',
 'number_count' => '',
 'objectcheck' => 'Kontrola složky/dokumentu',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Kritické chyby',
 'object_check_warning' => 'Varování',
 'objtype_unknown' => '',
@@ -2106,6 +2110,7 @@ Jméno: [username]
 'timeline_skip_status_change_4' => 'v revizi',
 'timeline_skip_status_change_5' => 'návrh',
 'timeline_status_change' => 'Verze [version]: [status]',
+'title' => '',
 'to' => 'Do',
 'toggle_manager' => 'Přepnout správce',
 'toggle_qrcode' => 'Zobrazit / skrýt QR kód',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index b2a00492f..2fcfae696 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3209), dgrutsch (22)
+//    Translators: Admin (3214), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -392,11 +392,13 @@ URL: [url]</p>',
 'converter_new_cmd' => 'Kommando',
 'converter_new_mimetype' => 'Neuer Mime-Type',
 'copied_to_checkout_as' => 'Datei am [date] von [username] in den Checkout-Space als \'[filename]\' kopiert.',
+'created' => 'Erstellt am',
 'create_download_link' => '',
 'create_fulltext_index' => 'Erzeuge Volltext-Index',
 'create_fulltext_index_warning' => 'Sie möchten den Volltext-Index neu erzeugen. Dies kann beträchtlich Zeit in Anspruch nehmen und Gesamtleistung Ihres System beeinträchtigen. Bestätigen Sie bitte diese Operation.',
 'creation_date' => 'Erstellt am',
 'cs_CZ' => 'Tschechisch',
+'current_filter' => 'Angewandter Filter',
 'current_password' => 'Aktuelles Passwort',
 'current_quota' => 'Der zur Zeit systemweit eingestellte Wert ist [quota].',
 'current_state' => 'Aktueller Status',
@@ -1245,12 +1247,14 @@ URL: [url]</p>',
 'no_revision_planed' => 'Keine Wiederholungsprüfung des Dokuments eingeplant.',
 'no_update_cause_locked' => 'Sie können daher im Moment diese Datei nicht aktualisieren. Wenden Sie sich an den Benutzer, der die Sperrung eingerichtet hat',
 'no_user_image' => 'Kein Bild vorhanden',
+'no_value_set' => 'Kein Wert gesetzt',
 'no_version_check' => 'Ein Check auf neuere Versionen von SeedDMS ist fehlgeschlagen. Dies könnte daran liegen, dass allow_url_fopen in der PHP-Konfiguration auf 0 gesetzt ist.',
 'no_version_modification' => 'Keine Modifikationen an einer Version',
 'no_workflows' => 'Sie haben bisher keinen Workflow erstellt',
 'no_workflow_available' => 'Kein Workflow verfügbar',
 'number_count' => 'Anzahl',
 'objectcheck' => 'Ordner- und Dokumentenprüfung',
+'objects_without_attribute' => 'Objekte ohne dieses Attribut',
 'object_check_critical' => 'Kritische Fehler',
 'object_check_warning' => 'Warnungen',
 'objtype_unknown' => 'unbekannt',
@@ -2438,6 +2442,7 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'timeline_skip_status_change_4' => 'Wiederholungsprüfung erforderlich',
 'timeline_skip_status_change_5' => 'Entwurf',
 'timeline_status_change' => 'Version [version]: [status]',
+'title' => 'Titel',
 'to' => 'bis',
 'toggle_manager' => 'Managerstatus wechseln',
 'toggle_qrcode' => 'Zeige/verberge QR-Code',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index f68e75e7c..d3aed057c 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -324,11 +324,13 @@ $text = array(
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Δημιούργησε Αρίθμηση των Κειμένων',
 'create_fulltext_index_warning' => 'Είσαστε έτοιμοι για επαναδημιουργία των δεικτών πλήρους κειμένου. Αυτό θα χρειαστεί κάποιο χρόνο και θα μειώσει τη συνολική απόδοση του συστήματος. Αν πραγματικά θέλετε την επαναδημιουργία των δεικτών, παρακαλώ να επιβεβαιώσετε τη λειτουργία αυτή.',
 'creation_date' => 'Δημιουργήθηκε',
 'cs_CZ' => 'Τσέχικα',
+'current_filter' => '',
 'current_password' => '',
 'current_quota' => '',
 'current_state' => '',
@@ -958,12 +960,14 @@ URL: [url]',
 'no_revision_planed' => '',
 'no_update_cause_locked' => '',
 'no_user_image' => '',
+'no_value_set' => '',
 'no_version_check' => '',
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => '',
 'number_count' => '',
 'objectcheck' => 'Αναζήτηση σε αρχεία και φακέλους',
+'objects_without_attribute' => '',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'objtype_unknown' => '',
@@ -1908,6 +1912,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
 'timeline_status_change' => '',
+'title' => '',
 'to' => 'Προς',
 'toggle_manager' => '',
 'toggle_qrcode' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index feb8da412..a0761183b 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2303), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2308), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -392,11 +392,13 @@ URL: [url]</p>',
 'converter_new_cmd' => 'Command',
 'converter_new_mimetype' => 'New mimetype',
 'copied_to_checkout_as' => 'File copied by [username] to checkout space as \'[filename]\' on [date]',
+'created' => 'Created',
 'create_download_link' => '',
 'create_fulltext_index' => 'Create fulltext index',
 'create_fulltext_index_warning' => 'You are about to recreate the fulltext index. This can take a considerable amount of time and reduce your overall system performance. If you really want to recreate the index, please confirm your operation.',
 'creation_date' => 'Created',
 'cs_CZ' => 'Czech',
+'current_filter' => 'Applied filter',
 'current_password' => 'Current Password',
 'current_quota' => 'The current system wide quota is set [quota].',
 'current_state' => 'Current state',
@@ -1248,12 +1250,14 @@ URL: [url]</p>',
 'no_revision_planed' => 'No revision of document scheduled',
 'no_update_cause_locked' => 'You can therefore not update this document. Please contact the locking user.',
 'no_user_image' => 'No image found',
+'no_value_set' => 'No value set',
 'no_version_check' => 'Checking for a new version of SeedDMS has failed! This could be caused by allow_url_fopen being set to 0 in your php configuration.',
 'no_version_modification' => 'No version modification',
 'no_workflows' => 'You have not created a workflow yet',
 'no_workflow_available' => 'No workflow available',
 'number_count' => 'number',
 'objectcheck' => 'Folder/Document check',
+'objects_without_attribute' => 'Objects without this attribute',
 'object_check_critical' => 'Critical errors',
 'object_check_warning' => 'Warnings',
 'objtype_unknown' => 'unknown',
@@ -2441,6 +2445,7 @@ If you did not receive a password, please use the password forgotten function on
 'timeline_skip_status_change_4' => 'in revision',
 'timeline_skip_status_change_5' => 'draft',
 'timeline_status_change' => 'Version [version]: [status]',
+'title' => 'title',
 'to' => 'To',
 'toggle_manager' => 'Toggle manager',
 'toggle_qrcode' => 'Show/hide QR code',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index aba9b2e16..652671ae2 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -348,11 +348,13 @@ URL: [url]',
 'converter_new_cmd' => 'Comando',
 'converter_new_mimetype' => 'Nuevo mime type',
 'copied_to_checkout_as' => '',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Crear índice de texto completo',
 'create_fulltext_index_warning' => 'Usted va a regenerar el índice te texto completo. Esto puede tardar un tiempo considerable y consumir capacidad de su equipo. Si realmente quiere regenerar el índice, por favor confirme la operación.',
 'creation_date' => 'Creación',
 'cs_CZ' => 'Czech',
+'current_filter' => '',
 'current_password' => 'Contraseña actual',
 'current_quota' => 'La cuota actual del sistema está habilitada [quota].',
 'current_state' => 'Estado actual',
@@ -1061,12 +1063,14 @@ URL: [url]',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'No puede actualizar este documento. Contacte con el usuario que lo bloqueó.',
 'no_user_image' => 'No se encontró imagen',
+'no_value_set' => '',
 'no_version_check' => 'Ha fallado la comprobación de nuevas versiones. En su configuración de PHP, revise que allow_url_fopen no esté en 0',
 'no_version_modification' => 'Ninguna Modificación de Versión',
 'no_workflows' => '',
 'no_workflow_available' => '',
 'number_count' => '',
 'objectcheck' => 'Chequeo de carpeta/documento',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Errores críticos',
 'object_check_warning' => 'Alertas',
 'objtype_unknown' => '',
@@ -2061,6 +2065,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => 'en revisión',
 'timeline_skip_status_change_5' => 'borrador',
 'timeline_status_change' => 'Versión [version]: [estado]',
+'title' => '',
 'to' => 'Hasta',
 'toggle_manager' => 'Intercambiar mánager',
 'toggle_qrcode' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index a761991ca..33c2f5b45 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -382,11 +382,13 @@ URL : [url]</p>',
 'converter_new_cmd' => 'Commande',
 'converter_new_mimetype' => 'Nouveau type MIME',
 'copied_to_checkout_as' => 'Fichier copié dans l’espace de blocage en tant que « [filename] » ([date])',
+'created' => '',
 'create_download_link' => 'Créer un lien de téléchargement',
 'create_fulltext_index' => 'Créer un index de recherche plein texte',
 'create_fulltext_index_warning' => 'Vous allez recréer l\'index de recherche plein texte. Cela peut prendre un temps considérable et réduire les performances de votre système dans son ensemble. Si vous voulez vraiment recréer l\'index, merci de confirmer votre opération.',
 'creation_date' => 'Créé le',
 'cs_CZ' => 'Tchèque',
+'current_filter' => '',
 'current_password' => 'Mot de passe actuel',
 'current_quota' => 'Le quota global actuel est de [quota]',
 'current_state' => 'État actuel',
@@ -1235,12 +1237,14 @@ URL : [url]</p>',
 'no_revision_planed' => 'Aucune révision de document prévue',
 'no_update_cause_locked' => 'Vous ne pouvez actuellement pas mettre à jour ce document. Contactez l\'utilisateur qui l\'a verrouillé.',
 'no_user_image' => 'Aucune image trouvée',
+'no_value_set' => '',
 'no_version_check' => 'La vérification de l\'existence d\'une nouvelle version de SeedDMS a échoué ! Cela peut être causé par le paramètre allow_url_fopen défini à 0 dans votre configuration PHP.',
 'no_version_modification' => 'Pas de modification de version',
 'no_workflows' => 'Vous n’avez pas encore créé de workflow',
 'no_workflow_available' => 'Aucun workflow disponible',
 'number_count' => '',
 'objectcheck' => 'Vérification des dossiers et documents',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Erreurs critiques',
 'object_check_warning' => 'Avertissements',
 'objtype_unknown' => '',
@@ -2424,6 +2428,7 @@ Nom : [username]
 'timeline_skip_status_change_4' => 'en révision',
 'timeline_skip_status_change_5' => 'ébauches',
 'timeline_status_change' => 'Version [version] : [status]',
+'title' => '',
 'to' => 'Au',
 'toggle_manager' => 'Basculer \'Responsable\'',
 'toggle_qrcode' => 'Afficher/masquer le QR code',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 5fbc59237..2b30d4b90 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -353,11 +353,13 @@ Internet poveznica: [url]',
 'converter_new_cmd' => 'Komanda',
 'converter_new_mimetype' => 'Novi tip datoteke',
 'copied_to_checkout_as' => 'Datoteka je kopirana u prostor odjave kao \'[filename]\'',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Indeksiraj cijeli tekst',
 'create_fulltext_index_warning' => 'Želite ponovo indeksirati cijeli tekst. To može duže potrajati i smanjiti sveukupne performanse sustava. Ako zaista želite ponovno indeksirati, molimo potvrdite vašu radnju.',
 'creation_date' => 'Izrađeno',
 'cs_CZ' => 'Češki',
+'current_filter' => '',
 'current_password' => 'Trenutna lozinka',
 'current_quota' => 'Postavljena je kvota sadašnjeg sustava [quota].',
 'current_state' => 'Trenutni status',
@@ -1053,12 +1055,14 @@ Internet poveznica: [url]',
 'no_revision_planed' => 'Nema zakazane revizije dokumenta',
 'no_update_cause_locked' => 'Dakle, ne možete ažurirati ovaj dokument. Molim kontaktirajte korisnika koji zaključava.',
 'no_user_image' => 'Nema pronađene slike',
+'no_value_set' => '',
 'no_version_check' => 'Neuspješna provjera nove verzije ProsperaDMS-a! Uzrok može biti ako je parametar allow_url_fopen u vašoj php konfiguraciji postavljen na 0.',
 'no_version_modification' => 'Nema modifikacije verzije',
 'no_workflows' => '',
 'no_workflow_available' => 'Nema dostupnog toka rada',
 'number_count' => '',
 'objectcheck' => 'Provjera mapa / dokumenata',
+'objects_without_attribute' => '',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'objtype_unknown' => '',
@@ -2070,6 +2074,7 @@ Internet poveznica: [url]',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Verzija [version]: [status]',
+'title' => '',
 'to' => 'Do',
 'toggle_manager' => 'Zamjeni upravitelja',
 'toggle_qrcode' => '',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index a7c995d39..b036b8db4 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -348,11 +348,13 @@ URL: [url]',
 'converter_new_cmd' => 'Új parancs',
 'converter_new_mimetype' => 'Új mime típus',
 'copied_to_checkout_as' => '',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Teljes szöveg index létrehozása',
 'create_fulltext_index_warning' => 'Ön a teljes szöveg index újraépítését kezdeményezte. Ez a művelet hosszú ideig eltarthat és jelentősen csökkentheti az egész rendszer teljesítményét. Ha biztosan újra kívánja építeni az indexet, kérjük erősítse meg a műveletet.',
 'creation_date' => 'Létrehozva',
 'cs_CZ' => 'Cseh',
+'current_filter' => '',
 'current_password' => 'Aktuális jelszó',
 'current_quota' => 'Az aktuális rendszer szintű kvóta [quota].',
 'current_state' => 'Aktuális állapot',
@@ -1049,12 +1051,14 @@ URL: [url]',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Emiatt nem módosíthatja a dokumentumot. Kérjük lépjen kapcsolatba a zároló felhasználóval.',
 'no_user_image' => 'Kép nem található',
+'no_value_set' => '',
 'no_version_check' => 'A SeedDMS új verziójának ellenőrzése hibára futott! Ennek oka lehet, hogy az allow_url_fopen 0-ra van állítva a php konfigurációjában.',
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => '',
 'number_count' => '',
 'objectcheck' => 'Mappa/Dokumentum ellenőrzés',
+'objects_without_attribute' => '',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'objtype_unknown' => '',
@@ -2048,6 +2052,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
 'timeline_status_change' => '[version]: [status] Verzio',
+'title' => '',
 'to' => 'ig',
 'toggle_manager' => 'Kulcs kezelő',
 'toggle_qrcode' => '',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index 19ae2e573..70fa6493c 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -362,11 +362,13 @@ URL: [url]</p>',
 'converter_new_cmd' => 'Perintah',
 'converter_new_mimetype' => 'Mimetype baru',
 'copied_to_checkout_as' => '',
+'created' => '',
 'create_download_link' => 'Buat link unduhan',
 'create_fulltext_index' => 'Buat fulltext indek',
 'create_fulltext_index_warning' => 'Anda akan membuat ulang indeks fulltext. Ini dapat memakan banyak waktu dan mengurangi kinerja sistem Anda secara keseluruhan. Jika Anda benar-benar ingin membuat ulang indeks, harap konfirmasikan operasi Anda.',
 'creation_date' => 'Dibuat',
 'cs_CZ' => 'Ceko',
+'current_filter' => '',
 'current_password' => 'Kata sandi Sebelumnya',
 'current_quota' => '',
 'current_state' => 'State saat ini',
@@ -1119,12 +1121,14 @@ URL: [url]</p>',
 'no_revision_planed' => 'Tidak ada revisi dokumen yang dijadwalkan',
 'no_update_cause_locked' => 'Oleh karena itu, Anda tidak dapat memperbarui dokumen ini. Silakan hubungi pengguna yang menguncinya.',
 'no_user_image' => 'Tidak ada gambar yang ditemukan',
+'no_value_set' => '',
 'no_version_check' => 'Memeriksa versi baru SeedDMS telah gagal! Ini bisa disebabkan oleh allow_url_fopen disetel ke 0 dalam konfigurasi php anda.',
 'no_version_modification' => 'Tidak ada versi yang dimodifikasi',
 'no_workflows' => 'Anda belum membuat alur kerja',
 'no_workflow_available' => 'Tidak ada alur kerja yang tersedia',
 'number_count' => '',
 'objectcheck' => 'Pemeriksaan Folder/Dokumen',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Kesalahan kritis',
 'object_check_warning' => 'Peringatan',
 'objtype_unknown' => '',
@@ -2122,6 +2126,7 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'timeline_skip_status_change_4' => 'dalam revisi',
 'timeline_skip_status_change_5' => 'draf',
 'timeline_status_change' => '',
+'title' => '',
 'to' => 'Kepada',
 'toggle_manager' => '',
 'toggle_qrcode' => 'Tampilkan/sembunyikan kode QR',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 60ecc8858..186777586 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -353,11 +353,13 @@ URL: [url]',
 'converter_new_cmd' => 'Comando',
 'converter_new_mimetype' => 'Nuovo mimetype',
 'copied_to_checkout_as' => 'File copiato come \'[filename]\'',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Crea indice fulltext',
 'create_fulltext_index_warning' => 'Stai creando un indice fulltext. Questo può occupare un tempo considerevole e ridurre le prestazioni del sistema. Sei sicuro di voler ricreare l\'indice? Prego conferma l\'operazione.',
 'creation_date' => 'Data creazione',
 'cs_CZ' => 'Ceco',
+'current_filter' => '',
 'current_password' => 'Password corrente',
 'current_quota' => 'La quota di sistema attuale è impostata su [quota].',
 'current_state' => 'Stato corrente',
@@ -1059,12 +1061,14 @@ URL: [url]',
 'no_revision_planed' => 'Nessun riesame pianificato.',
 'no_update_cause_locked' => 'Non è quindi possible aggiornare il documento. Prego contattare l\'utente che l\'ha bloccato.',
 'no_user_image' => 'Nessuna immagine trovata',
+'no_value_set' => '',
 'no_version_check' => 'Il controllo per una nuova versione di SeedDMS è fallito! Questo può essere causato da allow_url_fopen settato a 0 nella tua configurazione php.',
 'no_version_modification' => 'Nessuna modifica versione',
 'no_workflows' => '',
 'no_workflow_available' => 'Nessun flusso di lavoro disponibile',
 'number_count' => '',
 'objectcheck' => 'Controllo cartelle o documenti',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Errori critici',
 'object_check_warning' => 'Avvertenze',
 'objtype_unknown' => '',
@@ -2097,6 +2101,7 @@ Name: [username]
 'timeline_skip_status_change_4' => 'in riesame',
 'timeline_skip_status_change_5' => 'bozza',
 'timeline_status_change' => 'Versione [version]: Stato',
+'title' => '',
 'to' => 'A',
 'toggle_manager' => 'Gestore',
 'toggle_qrcode' => 'Mostri/nascondi codice QR',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 59eeafa4a..60fee4911 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -356,11 +356,13 @@ URL: [url]',
 'converter_new_cmd' => '명령',
 'converter_new_mimetype' => '새 MIME 형태',
 'copied_to_checkout_as' => '체크아웃으로 파일(\'[filename]\')이 파일 복사됨',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => '전체 텍스트 인덱스 만들기',
 'create_fulltext_index_warning' => '전체 자료의 텍스트 인덱스를 다시 만들 수 있습니다. 이것은 상당한 시간을 요구하며 진행되는 동안 시스템 성능을 감소시킬 수 있습니다. 인덱스를 재 생성하려면, 확인하시기 바랍니다.',
 'creation_date' => '생성일',
 'cs_CZ' => '체코어',
+'current_filter' => '',
 'current_password' => '현재 암호',
 'current_quota' => '시스템 전체 할당량 [quota]을 설정합니다.',
 'current_state' => '현재 상태',
@@ -1055,12 +1057,14 @@ URL : [url]',
 'no_revision_planed' => '문서의 개정 예약이 없습니다.',
 'no_update_cause_locked' => '이 문서를 업데이트 할 수 없습니다. 문서를 잠근 사용자 문의하시기 바랍니다..',
 'no_user_image' => '이미지를 찾을 수 없습니다',
+'no_value_set' => '',
 'no_version_check' => 'SeedDMS의 새 버전 확인을 실패 했습니다! 이것은 PHP 설정에서 allow_url_fopen 값이 0으로 설정 되면 발생할 수 있습니다.',
 'no_version_modification' => '버전의 변동사항이 없습니다.',
 'no_workflows' => '',
 'no_workflow_available' => '사용 가능한 워크 플로우 없습니다.',
 'number_count' => '',
 'objectcheck' => '폴더 / 문서 확인',
+'objects_without_attribute' => '',
 'object_check_critical' => '치명적 오류',
 'object_check_warning' => 'Warnings',
 'objtype_unknown' => '',
@@ -2064,6 +2068,7 @@ URL : [url]',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '드래프트',
 'timeline_status_change' => '버전 [version]: [status]',
+'title' => '',
 'to' => '마감일',
 'toggle_manager' => '전환 매니저',
 'toggle_qrcode' => 'QR code 보이기/숨기기',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 541c3027d..291b08510 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -351,11 +351,13 @@ URL: [url]',
 'converter_new_cmd' => 'ຄຳສັ່ງ',
 'converter_new_mimetype' => 'ລະຄອນໃບຊະນິດຫນືື່ງ',
 'copied_to_checkout_as' => 'ກັອບປີໄຟລໄປຍັງພື້ນທີ່ເຊັກເອົາເປັນ  "[filename] "  ໃນ [date]',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'ສ້າງດັດສະນີແບບເຕັມຮູບແບບ',
 'create_fulltext_index_warning' => 'ເຈົ້າກຳລັງສ້າງດັດຊະນີຂໍ້ຄວາມເຕັມໄຫມ່ ອາດໄຊ້ເວລາເປັນຈຳນວນຫຼາຍແລະລົດປະສິດທິພາບໂດຍລວມຂອງລະບົບເຈົ້າ ຖ້າຫາກວ່າຕ້ອງການສ້າງດັດຊະນີໄຫມ່ກະລຸນາຢືນຢັນການດຳເນີນການຂອງເຈົ້າ',
 'creation_date' => 'ສ້າງໄວ້',
 'cs_CZ' => 'ສາທາລະນະລັດເຊັກ',
+'current_filter' => '',
 'current_password' => 'ລະຫັດຜ່ານປະຈຸບັນ',
 'current_quota' => 'ໂຄຕ້າລະບົບທີມີຢູ່ໃນປະຈຸບັນໄດ້ຖືກຕັ້ງຄ່າໄວ້ [quota]',
 'current_state' => 'ສະຖານະປັດຈຸບັນ',
@@ -1052,12 +1054,14 @@ URL: [url]',
 'no_revision_planed' => 'ບໍ່ມີການກຳນົດເອກະສານທີຕ້ອງແກ້ໄຂ',
 'no_update_cause_locked' => 'ເຈົ້າບໍ່ສາມາດອັບເດດເອກະສານນີ້ໄດ້, ກະລຸນາຕິດຕໍ່ຜູ້ໄຊ້ທີລັອກເອກະສານ',
 'no_user_image' => 'ບໍ່ມີຮູບພາບ',
+'no_value_set' => '',
 'no_version_check' => 'ການກວດສອບເວີຊັນໄຫມ່ທີກ່ຽວຂອງ DMSລົ້ມເຫຼວ! ເຊີ່ງອາດຈະເກີດຈາກການຕັ້ງຄ່າ-ຢູອາເອວ-ໂຟລເດີ ເປັນ0 ໃນການກຳນົດຄ່າ PHP ຂອງທ່ານ',
 'no_version_modification' => 'ບໍ່ມີການປ່ຽນເວີຊັນ',
 'no_workflows' => '',
 'no_workflow_available' => 'ບໍ່ມີເວີກໂຟລທີ່ພ້ອມໄຊ້ງານ',
 'number_count' => '',
 'objectcheck' => 'ການກວດສອບໂຟລເດີ / ເອກະສານ',
+'objects_without_attribute' => '',
 'object_check_critical' => 'ຂໍ້ຜິດພາດທີ່ສຳຄັນ',
 'object_check_warning' => 'ຄຳເຕືອນ',
 'objtype_unknown' => '',
@@ -2090,6 +2094,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => 'ໃນການແກ້ໄຂ',
 'timeline_skip_status_change_5' => 'ຮ່າງ',
 'timeline_status_change' => 'ເວີຊັນໄຫມ່ [version]:[status]',
+'title' => '',
 'to' => 'ໄປຍັງ',
 'toggle_manager' => 'ສຳລັບຜູ້ຈັດການ',
 'toggle_qrcode' => 'ສະແດງ/ ຊ້ອນລະຫັດ QR',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index c6932a5ee..59bed4a3f 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -353,11 +353,13 @@ URL: [url]',
 'converter_new_cmd' => 'Kommando',
 'converter_new_mimetype' => 'Ny MIME-type',
 'copied_to_checkout_as' => 'Filen er kopiert til utsjekkingsmappen som \'[filename]\' pr. [date]',
+'created' => '',
 'create_download_link' => 'Lag en link for nedlasting',
 'create_fulltext_index' => 'Lag fulltekst-søkindex',
 'create_fulltext_index_warning' => 'Du er i ferd med å gjenskape fulltekstindeksen. Dette kan ta betydelig tid og redusere den generelle systemytelsen. Hvis du virkelig vil gjenskape indeksen, må du bekrefte operasjonen.',
 'creation_date' => 'Opprettet',
 'cs_CZ' => 'Tjekkisk',
+'current_filter' => '',
 'current_password' => 'Nåværende passord',
 'current_quota' => 'Systemets verdi før kvote er angitt [quota].',
 'current_state' => 'Aktuell status',
@@ -1073,12 +1075,14 @@ URL: [url]',
 'no_revision_planed' => 'Ingen planlagte korrigering av dokumentet',
 'no_update_cause_locked' => 'Du kan derfor ikke oppdatere dette dokumentet. Kontakt brukeren som låste dette.',
 'no_user_image' => 'Ingen bilder funnet',
+'no_value_set' => '',
 'no_version_check' => 'Kontrollen av en ny versjon av SeedDMS mislyktes! Dette kan være forårsaket av at allow_url_fopen er satt til 0 i php-konfigurasjonen.',
 'no_version_modification' => 'Ingen versjonsendring',
 'no_workflows' => '',
 'no_workflow_available' => 'Ingen arbeidsflyt tilgjengelig',
 'number_count' => '',
 'objectcheck' => 'Mappe/dokument sjekk',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Kritisk feil!!',
 'object_check_warning' => 'Advarsel!',
 'objtype_unknown' => '',
@@ -2103,6 +2107,7 @@ Bruker: [username]
 'timeline_skip_status_change_4' => 'under revidering',
 'timeline_skip_status_change_5' => 'utkast',
 'timeline_status_change' => 'Versjon [version]: [status]',
+'title' => '',
 'to' => 'Til',
 'toggle_manager' => 'Bytt leder',
 'toggle_qrcode' => 'Vis/skjul QR-kode',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 6f770ed02..d89d9e856 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -346,11 +346,13 @@ URL: [url]',
 'converter_new_cmd' => 'Wijziging: nieuw commando',
 'converter_new_mimetype' => 'Wijziging: nieuw mimetype',
 'copied_to_checkout_as' => 'Gekopieerd naar checkout als:',
+'created' => '',
 'create_download_link' => 'Maak een download-link',
 'create_fulltext_index' => 'Creëer de index voor de fulltext search',
 'create_fulltext_index_warning' => 'U staat op het punt de volledige tekst opnieuw te indexeren. Dit kan behoorlijk veel tijd en snelheid vergen van het systeem. Als u echt opnieuw wilt indexeren, bevestig dan deze actie.',
 'creation_date' => 'Aangemaakt',
 'cs_CZ' => 'Tsjechisch',
+'current_filter' => '',
 'current_password' => 'Huidige wachtwoord',
 'current_quota' => 'Huidige quota',
 'current_state' => 'Huidige status',
@@ -1065,12 +1067,14 @@ URL: [url]',
 'no_revision_planed' => 'Geen herziening gepland',
 'no_update_cause_locked' => 'U kunt daarom dit document niet bijwerken. Neem contact op met de persoon die het document heeft geblokkeerd.',
 'no_user_image' => 'Geen afbeelding(en) gevonden',
+'no_value_set' => '',
 'no_version_check' => 'Controle op een nieuwe versie van SeedDMS is mislukt! Dit kan komen omdat allow_url_fopen is ingesteld op 0 in uw PHP configuratie.',
 'no_version_modification' => 'Geen versiewijziging',
 'no_workflows' => '',
 'no_workflow_available' => 'Geen workflow beschikbaar',
 'number_count' => '',
 'objectcheck' => 'Mappen en documenten controleren',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Ernstige fouten',
 'object_check_warning' => 'Waarschuwingen',
 'objtype_unknown' => '',
@@ -2102,6 +2106,7 @@ Name: [username]
 'timeline_skip_status_change_4' => 'in revisie',
 'timeline_skip_status_change_5' => 'concept',
 'timeline_status_change' => 'Versie [version]: [status]',
+'title' => '',
 'to' => 'aan',
 'toggle_manager' => 'Wijzig Beheerder',
 'toggle_qrcode' => 'Tonen/Verbergen QR-code',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 79688c9ff..935bcfb70 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -341,11 +341,13 @@ URL: [url]',
 'converter_new_cmd' => 'Komenda',
 'converter_new_mimetype' => 'Nowy typ MIME',
 'copied_to_checkout_as' => 'Plik skopiowany w celu wyewidencjonowania miejsca jako \'[filename]\' w dniu [date]',
+'created' => '',
 'create_download_link' => 'Utwórz link do pobrania',
 'create_fulltext_index' => 'Utwórz indeks pełnotekstowy',
 'create_fulltext_index_warning' => 'Zamierzasz ponownie utworzyć indeks pełnotekstowy. To może zająć sporo czasu i ograniczyć ogólną wydajność systemu. Jeśli faktycznie chcesz to zrobić, proszę potwierdź tę operację.',
 'creation_date' => 'Utworzony',
 'cs_CZ' => 'Czeski',
+'current_filter' => '',
 'current_password' => 'Aktualne hasło',
 'current_quota' => 'Obecny limit systemowy jest ustawiony [quota].',
 'current_state' => 'Bieżący stan',
@@ -1042,12 +1044,14 @@ URL: [url]',
 'no_revision_planed' => 'Brak dokumentów w wersji planowanej korekty',
 'no_update_cause_locked' => 'Nie możesz zaktualizować tego dokumentu. Proszę skontaktuj się z osobą która go blokuje.',
 'no_user_image' => 'Nie znaleziono obrazu',
+'no_value_set' => '',
 'no_version_check' => 'Poszukiwanie nowej wersji DeedDMS nie powiodło się! To może być spowodowane ustawieniem opcji \'allow_url_fopen = 0\' w twojej konfiguracji PHP.',
 'no_version_modification' => 'Bez modyfikacji wersji',
 'no_workflows' => '',
 'no_workflow_available' => 'Brak przepływu pracy',
 'number_count' => '',
 'objectcheck' => 'Sprawdź Katalog/Dokument',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Błędy krytyczne',
 'object_check_warning' => 'Ostrzeżenia',
 'objtype_unknown' => '',
@@ -2033,6 +2037,7 @@ Name: [username]
 'timeline_skip_status_change_4' => 'w wersji',
 'timeline_skip_status_change_5' => 'projekt',
 'timeline_status_change' => 'Wersja [wersja]: [status]',
+'title' => '',
 'to' => 'Do',
 'toggle_manager' => 'Przełączanie zarządcy',
 'toggle_qrcode' => 'Pokaż/ukryj kod QR',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index a888cb588..c3853fefc 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -353,11 +353,13 @@ URL: [url]',
 'converter_new_cmd' => 'Comando',
 'converter_new_mimetype' => 'Novo mimetype',
 'copied_to_checkout_as' => 'Arquivo copiado para o espaço de retirada como \'[nome do arquivo]\' em [date]',
+'created' => '',
 'create_download_link' => 'Criar link de download',
 'create_fulltext_index' => 'Criar índice de texto completo',
 'create_fulltext_index_warning' => 'Você está para recriar o índice de texto completo. Isso pode levar uma quantidade considerável de tempo e reduzir o desempenho geral do sistema. Se você realmente deseja recriar o índice, por favor confirme a operação.',
 'creation_date' => 'Criado',
 'cs_CZ' => 'Tcheco',
+'current_filter' => '',
 'current_password' => 'Senha atual',
 'current_quota' => 'O tamanho de quota do sistema atual é [quota].',
 'current_state' => 'Estado atual',
@@ -1072,12 +1074,14 @@ URL: [url]',
 'no_revision_planed' => 'Nenhuma revisão do documento agendada.',
 'no_update_cause_locked' => 'Por isso você não pode atualizar este documento. Por favor contacte usuário que poáui a trava.',
 'no_user_image' => 'não foi encontrado imagem de perfil',
+'no_value_set' => '',
 'no_version_check' => 'Verificação de uma nova versão do Sistema GED falhou! Isso pode ser causado por allow_url_fopen configurado para 0 na sua configuração do PHP.',
 'no_version_modification' => 'Nenhuma modificação de versão',
 'no_workflows' => '',
 'no_workflow_available' => 'Nenhum fluxo de trabalho disponível',
 'number_count' => '',
 'objectcheck' => 'Verificação da Pasta/Documento',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Erros críticos',
 'object_check_warning' => 'Avisos',
 'objtype_unknown' => '',
@@ -2109,6 +2113,7 @@ Nome: [username]
 'timeline_skip_status_change_4' => 'em revisão',
 'timeline_skip_status_change_5' => 'rascunho',
 'timeline_status_change' => 'Versão [version]: [status]',
+'title' => '',
 'to' => 'Para',
 'toggle_manager' => 'Alternar gerente',
 'toggle_qrcode' => 'Mostrar / ocultar o código QR',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 6e0f073fa..a0b43caa1 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -353,11 +353,13 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Creați indexul pentru tot textul',
 'create_fulltext_index_warning' => 'Sunteți pe cale sa recreați indexul pentru tot textul. Acest lucru poate dura o perioadă considerabilă de timp și poate reduce performanța sistemului în ansamblu. Dacă doriți cu adevărat să recreati indexul pentru tot textul, vă rugăm să confirmați operațiunea.',
 'creation_date' => 'Creat',
 'cs_CZ' => 'Cecha',
+'current_filter' => '',
 'current_password' => 'Parola actuală',
 'current_quota' => 'Spatiul alocat intregului sistem actual este [quota].',
 'current_state' => 'Stare curentă',
@@ -1054,12 +1056,14 @@ URL: [url]',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Deci, nu puteti sa actualizati acest document. Vă rugăm să contactați administratorul.',
 'no_user_image' => 'Nu au fost găsite imagini',
+'no_value_set' => '',
 'no_version_check' => 'Verificarea pentru o noua versiune SeedDMS a reușit! Acest lucru ar putea fi cauzat de setarea allow_url_fopen=0 în configurația php-ului dumneavoastră.',
 'no_version_modification' => '',
 'no_workflows' => '',
 'no_workflow_available' => 'Nici un workflow disponibil',
 'number_count' => '',
 'objectcheck' => 'Verificare folder/document',
+'objects_without_attribute' => '',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'objtype_unknown' => '',
@@ -2071,6 +2075,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versiune [versiune]: [stare]',
+'title' => '',
 'to' => 'La',
 'toggle_manager' => 'Comută Manager',
 'toggle_qrcode' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 4a9ebe3df..3ff5901bc 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -353,11 +353,13 @@ URL: [url]',
 'converter_new_cmd' => 'Команда',
 'converter_new_mimetype' => 'Новый mime тип',
 'copied_to_checkout_as' => 'Файл скопирован в среду загрузки как \'[filename]\' на [date]',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Создать полнотекстовый индекс',
 'create_fulltext_index_warning' => 'Вы хотите пересоздать полнотекстовый индекс. Это займёт какое-то время и снизит производительность. Продолжить?',
 'creation_date' => 'Создан',
 'cs_CZ' => 'Czech',
+'current_filter' => '',
 'current_password' => 'Текущий пароль',
 'current_quota' => 'Общая квота установлена системой [quota].',
 'current_state' => 'Текущее состояние',
@@ -1053,12 +1055,14 @@ URL: [url]',
 'no_revision_planed' => 'Ревизия документа не запланирован',
 'no_update_cause_locked' => 'Вы не можете обновить документ. Свяжитесь с заблокировавшим его пользователем.',
 'no_user_image' => 'Изображение не найдено',
+'no_value_set' => '',
 'no_version_check' => 'Проверка на наличие новой версии SeedDMS не удалось! Это может быть вызвано allow_url_fopen установленным в 0 в конфигурации PHP.',
 'no_version_modification' => 'Отсутствует модификация версии',
 'no_workflows' => '',
 'no_workflow_available' => 'Отсутствует процесс',
 'number_count' => '',
 'objectcheck' => 'Проверка целостности',
+'objects_without_attribute' => '',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'objtype_unknown' => '',
@@ -2078,6 +2082,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Версия [version]: [status]',
+'title' => '',
 'to' => 'До',
 'toggle_manager' => 'Изменить как менеджера',
 'toggle_qrcode' => '',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 5ec529707..a962462ad 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -353,11 +353,13 @@ URL: [url]',
 'converter_new_cmd' => 'Príkaz',
 'converter_new_mimetype' => 'Nový mime-type',
 'copied_to_checkout_as' => 'File copied to checkout space as \'[filename]\' on [date]',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Vytvoriť fulltext index',
 'create_fulltext_index_warning' => 'Chystáte sa obnoviť fulltext index, čo môže dlho trvať a môže znížiť výkon systému. Ak chcete pokračovať, potvrďte svoju voľbu.',
 'creation_date' => 'Vytvorené',
 'cs_CZ' => 'Čestina',
+'current_filter' => '',
 'current_password' => 'Aktuálne heslo',
 'current_quota' => 'Súčasná kvóta systému je nastavená na [quota].',
 'current_state' => 'Aktuálny stav',
@@ -1073,12 +1075,14 @@ URL: [url]',
 'no_revision_planed' => 'No revision of document scheduled',
 'no_update_cause_locked' => 'Preto nemôžete aktualizovať tento dokument. Kontaktujte používateľa, ktorý ho zamkol.',
 'no_user_image' => 'nebol nájdený žiadny obrázok',
+'no_value_set' => '',
 'no_version_check' => 'Checking for a new version of SeedDMS has failed! This could be caused by allow_url_fopen being set to 0 in your php configuration.',
 'no_version_modification' => 'Žiadne zmeny',
 'no_workflows' => '',
 'no_workflow_available' => 'Nie je k dispozícii žiaden workflow',
 'number_count' => '',
 'objectcheck' => 'Kontrola Adresárov/Dokumentov',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Kritické chyby',
 'object_check_warning' => 'Varovanie',
 'objtype_unknown' => '',
@@ -2111,6 +2115,7 @@ Meno: [username]
 'timeline_skip_status_change_4' => 'v revízii',
 'timeline_skip_status_change_5' => 'návrh',
 'timeline_status_change' => 'Verzia [version]: [status]',
+'title' => '',
 'to' => 'Do',
 'toggle_manager' => 'Prepnúť stav manager',
 'toggle_qrcode' => 'Ukázať/skryť QR kód',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index fe1a520d5..dd61d30bf 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -354,11 +354,13 @@ URL: [url]',
 'converter_new_cmd' => 'Kommando',
 'converter_new_mimetype' => 'Ny MIME-typ',
 'copied_to_checkout_as' => 'Filen har kopierats till utcheckningmappen som \'[filename]\' per [date]',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Skapa fulltext-sökindex',
 'create_fulltext_index_warning' => 'Du håller på att skapa fulltext-sökindex. Detta kan ta mycket lång tid och sakta ner den allmänna systemprestandan. Om du verkligen vill skapa indexet, bekräfta åtgärden.',
 'creation_date' => 'Skapat',
 'cs_CZ' => 'Tjeckiska',
+'current_filter' => '',
 'current_password' => 'Nuvarande lösenord',
 'current_quota' => 'Systemets värde för kvota har angivits [quota].',
 'current_state' => 'Aktuell status',
@@ -1060,12 +1062,14 @@ URL: [url]',
 'no_revision_planed' => 'Ingen planerad revidering av dokument',
 'no_update_cause_locked' => 'därför kan du inte uppdatera detta dokument. Ta kontakt med användaren som låst dokumentet.',
 'no_user_image' => 'Ingen bild hittades',
+'no_value_set' => '',
 'no_version_check' => 'Fel vid sökning efter ny version av SeedDMS! Orsaken kan vara att allow_url_fopen i din php konfiguration är satt till 0.',
 'no_version_modification' => 'Ingen versionsförändring',
 'no_workflows' => '',
 'no_workflow_available' => 'Arbetsflöde saknas',
 'number_count' => '',
 'objectcheck' => 'Kontroll av Katalog/Dokument',
+'objects_without_attribute' => '',
 'object_check_critical' => 'Kritiska fel',
 'object_check_warning' => 'Varningar',
 'objtype_unknown' => '',
@@ -2084,6 +2088,7 @@ Kommentar: [comment]',
 'timeline_skip_status_change_4' => 'under revidering',
 'timeline_skip_status_change_5' => 'utkast',
 'timeline_status_change' => 'Version [version]: [status]',
+'title' => '',
 'to' => 'till',
 'toggle_manager' => 'Byt manager',
 'toggle_qrcode' => 'Visa/göm QR-kod',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 7f974d169..b690fb237 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -347,11 +347,13 @@ URL: [url]',
 'converter_new_cmd' => 'Komut',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Tam metin indeksi oluştur',
 'create_fulltext_index_warning' => 'Tam metin indeksi yeniden oluşturmak üzeresiniz. Bu işlem bir hayli uzun sürebilir ve sistem performansını olumsuz etkileyebilir. Buna rağmen indeksi oluşturmak istiyorsanız lütfen bu işlemi onaylayın.',
 'creation_date' => 'Oluşturma tarihi',
 'cs_CZ' => 'Çekçe',
+'current_filter' => '',
 'current_password' => 'Mevcut Parola',
 'current_quota' => 'Mevcut sistem geneli kotası [quota] olarak ayarlandı.',
 'current_state' => 'Mevcut durum',
@@ -1048,12 +1050,14 @@ URL: [url]',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Bu doküman kilitli olduğundan güncellenemez. Lütfen kilitleyen kullanıcıyla görüşünüz.',
 'no_user_image' => 'Resim bulunamadı',
+'no_value_set' => '',
 'no_version_check' => 'SeedDMS yeni versiyon kontrolü başarısız oldu! Bunun sebebi php konfigürasyonunuzdaki allow_url_fopen parametresinin 0 olarak ayarlanması olabilir.',
 'no_version_modification' => 'Versiyon değişikliği yapılmamış',
 'no_workflows' => '',
 'no_workflow_available' => 'Uygun iş akışı yok',
 'number_count' => '',
 'objectcheck' => 'Klasör/Doküman kontrol',
+'objects_without_attribute' => '',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'objtype_unknown' => '',
@@ -2050,6 +2054,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Versiyon [version]: [status]',
+'title' => '',
 'to' => 'Kime',
 'toggle_manager' => 'Değişim yönetimi',
 'toggle_qrcode' => '',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index f29bde942..0d6554d48 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -353,11 +353,13 @@ URL: [url]',
 'converter_new_cmd' => 'Команда',
 'converter_new_mimetype' => 'Новий mime тип',
 'copied_to_checkout_as' => 'Файл скопійовано в середовище скачування як',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => 'Створити повнотекстовий індекс',
 'create_fulltext_index_warning' => 'Ви хочете перестворити повнотекстовий індекс. Це займе деякий час і знизить продуктивність. Продовжити?',
 'creation_date' => 'Створено',
 'cs_CZ' => 'Czech',
+'current_filter' => '',
 'current_password' => 'Поточний пароль',
 'current_quota' => 'Поточна квота',
 'current_state' => 'Поточний стан',
@@ -1053,12 +1055,14 @@ URL: [url]',
 'no_revision_planed' => 'Повторне опрацювання не заплановане',
 'no_update_cause_locked' => 'Ви не можете оновити документ. Зв\'яжіться з користувачем, який його заблокував.',
 'no_user_image' => 'Зображення не знайдено',
+'no_value_set' => '',
 'no_version_check' => 'Перевірка наявності нової версії SeedDMS не відбулася! Це може бути спричинено налаштуванням allow_url_fopen = 0 у конфігурації вашого php.',
 'no_version_modification' => 'Відсутня модифікація версії',
 'no_workflows' => '',
 'no_workflow_available' => 'Немає доступних процесів',
 'number_count' => '',
 'objectcheck' => 'Перевірка каталогу чи документа',
+'objects_without_attribute' => '',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'objtype_unknown' => '',
@@ -2071,6 +2075,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => '',
 'timeline_skip_status_change_5' => '',
 'timeline_status_change' => 'Версія [version]: [status]',
+'title' => '',
 'to' => 'До',
 'toggle_manager' => 'Змінити ознаку менеджера',
 'toggle_qrcode' => '',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 155ec24dd..470112b74 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -345,6 +345,7 @@ URL: [url]',
 'converter_new_cmd' => '命令',
 'converter_new_mimetype' => '新建 MIME 类型',
 'copied_to_checkout_as' => '"[username]"复制文件到签出空间\'[filename]\' 日期 [date]',
+'created' => '',
 'create_download_link' => '添加下载链接',
 'create_fulltext_index' => '创建全文索引',
 'create_fulltext_index_warning' => '你将重新创建全
@@ -352,6 +353,7 @@ URL: [url]',
 认你的操作',
 'creation_date' => '创建日期',
 'cs_CZ' => '捷克语',
+'current_filter' => '',
 'current_password' => '当前密码',
 'current_quota' => '当前系统配额设置为[quota]',
 'current_state' => '当前状态',
@@ -1056,12 +1058,14 @@ URL: [url]',
 'no_revision_planed' => '没有修订文件的计划',
 'no_update_cause_locked' => '您不能更新此文档，请联系该文档锁定人',
 'no_user_image' => '无图片',
+'no_value_set' => '',
 'no_version_check' => '检查SeedDMS的新版本失败！这可能是由于在您的php配置中allow_url_fopen设置为0引起的。',
 'no_version_modification' => '版本未修改',
 'no_workflows' => '',
 'no_workflow_available' => '工作流不可用',
 'number_count' => '',
 'objectcheck' => '文件夹/文件检查',
+'objects_without_attribute' => '',
 'object_check_critical' => '重大错误',
 'object_check_warning' => '警告',
 'objtype_unknown' => '',
@@ -2058,6 +2062,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => '修改中',
 'timeline_skip_status_change_5' => '起草中',
 'timeline_status_change' => '版本 [版本]: [状态]',
+'title' => '',
 'to' => '到',
 'toggle_manager' => '角色切换',
 'toggle_qrcode' => '显示/隐藏 QR 码',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index fb01fad9d..b04042d54 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -353,11 +353,13 @@ URL: [url]',
 'converter_new_cmd' => '指令',
 'converter_new_mimetype' => '新的 mimetype',
 'copied_to_checkout_as' => '在[date]以\'[filename] \'複製到簽出空間的文件',
+'created' => '',
 'create_download_link' => '',
 'create_fulltext_index' => '創建全文索引',
 'create_fulltext_index_warning' => '您將要重新創建全文索引。這會花費大量時間並降低整體系統性能。如果您確實要重新創建索引，請確認操作。',
 'creation_date' => '創建日期',
 'cs_CZ' => '捷克語',
+'current_filter' => '',
 'current_password' => '當前密碼',
 'current_quota' => '設置了當前系統範圍的配額[quota]。',
 'current_state' => '當前狀態',
@@ -1073,12 +1075,14 @@ URL: [url]',
 'no_revision_planed' => '未計劃修訂文件',
 'no_update_cause_locked' => '您不能更新此文件，請聯繫該文件鎖定人',
 'no_user_image' => '無圖片',
+'no_value_set' => '',
 'no_version_check' => '檢查新版本的SeedDMS失敗！這可能是由於在您的php配置中將allow_url_fopen設置為0',
 'no_version_modification' => '沒有版本修改',
 'no_workflows' => '',
 'no_workflow_available' => '沒有可用的工作流程',
 'number_count' => '',
 'objectcheck' => '資料夾/檔檢查',
+'objects_without_attribute' => '',
 'object_check_critical' => '嚴重錯誤',
 'object_check_warning' => '警告',
 'objtype_unknown' => '',
@@ -2109,6 +2113,7 @@ URL: [url]',
 'timeline_skip_status_change_4' => '修訂中',
 'timeline_skip_status_change_5' => '草案',
 'timeline_status_change' => '版本 [version]:[status]',
+'title' => '',
 'to' => '到',
 'toggle_manager' => '角色切換',
 'toggle_qrcode' => '秀/隱藏 QR code',

From 8b7eae47d398ee7917ae1625ed2a8144c317aace Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 May 2023 15:57:13 +0200
Subject: [PATCH 1996/2006] check if attributes in url are set

---
 views/bootstrap/class.Search.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 5f8f5ac1a..ecbd1e8e8 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -1145,15 +1145,17 @@ $(document).ready(function() {
 			 * This currently just workѕ for attributes
 			 */
 			$allparams = $request->query->all();
-			foreach($allparams['attributes'] as $an=>$av) {
-				if(is_string($av) && $av == '__notset__') {
-					$tmp = explode('_', $an);
-					if($attrdef = $dms->getAttributeDefinition($tmp[1])) {
-						$dispname = $attrdef->getName();
-						unset($allparams['attributes'][$an]);
-						$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
-						$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.$dispname.' is not set', 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
-						echo '<input type="hidden" name="attributes['.$an.']" value="__notset__" />';
+			if(isset($allparams['attributes'])) {
+				foreach($allparams['attributes'] as $an=>$av) {
+					if(is_string($av) && $av == '__notset__') {
+						$tmp = explode('_', $an);
+						if($attrdef = $dms->getAttributeDefinition($tmp[1])) {
+							$dispname = $attrdef->getName();
+							unset($allparams['attributes'][$an]);
+							$newrequest = Symfony\Component\HttpFoundation\Request::create($request->getBaseUrl(), 'GET', $allparams);
+							$menuitems[] = array('label'=>'<i class="fa fa-remove"></i> '.$dispname.' is not set', 'link'=>$newrequest->getRequestUri(), 'attributes'=>[['title', 'Click to remove']], '_badge'=>'x');
+							echo '<input type="hidden" name="attributes['.$an.']" value="__notset__" />';
+						}
 					}
 				}
 			}

From ed695a6e499579ddba036e65ea80d69dfc9ae890 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 May 2023 17:08:52 +0200
Subject: [PATCH 1997/2006] add Dashboard to menu

---
 views/bootstrap/class.Bootstrap.php   | 2 ++
 views/bootstrap4/class.Bootstrap4.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index fc149f9ab..a89fd3bee 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -347,6 +347,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 			if (!$this->params['user']->isGuest()) {
 				$menuitems = array();
+				if ($accessobject->check_view_access('Dashboard'))
+					$menuitems['dashboard'] = array('link'=>$this->params['settings']->_httpRoot."out/out.Dashboard.php", 'label'=>getMLText('dashboard'));
 				if ($accessobject->check_view_access('MyDocuments'))
 					$menuitems['my_documents'] = array('link'=>$this->params['settings']->_httpRoot."out/out.MyDocuments.php?inProcess=1", 'label'=>getMLText('my_documents'));
 				if ($accessobject->check_view_access('MyAccount'))
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index ac0412356..f97fff6df 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -415,6 +415,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			echo "    <div class=\"dropdown-menu dropdown-menu-right\" aria-labelledby=\"navbarMainUser\">\n";
 			if (!$this->params['user']->isGuest()) {
 				$menuitems = array();
+				if ($accessobject->check_view_access('Dashboard'))
+					$menuitems['dashboard'] = array('link'=>$this->params['settings']->_httpRoot."out/out.Dashboard.php", 'label'=>getMLText('dashboard'));
 				if ($accessobject->check_view_access('MyDocuments'))
 					$menuitems['my_documents'] = array('link'=>$this->params['settings']->_httpRoot."out/out.MyDocuments.php?inProcess=1", 'label'=>getMLText('my_documents'));
 				if ($accessobject->check_view_access('MyAccount'))

From 6ba018eabb1b3be8ac22bc24418cd6492346e56f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 2 May 2023 17:09:48 +0200
Subject: [PATCH 1998/2006] add missing phrases

---
 languages/ar_EG/lang.inc | 2 ++
 languages/bg_BG/lang.inc | 2 ++
 languages/ca_ES/lang.inc | 2 ++
 languages/cs_CZ/lang.inc | 2 ++
 languages/de_DE/lang.inc | 4 +++-
 languages/el_GR/lang.inc | 2 ++
 languages/en_GB/lang.inc | 4 +++-
 languages/es_ES/lang.inc | 2 ++
 languages/fr_FR/lang.inc | 2 ++
 languages/hr_HR/lang.inc | 2 ++
 languages/hu_HU/lang.inc | 2 ++
 languages/id_ID/lang.inc | 2 ++
 languages/it_IT/lang.inc | 2 ++
 languages/ko_KR/lang.inc | 2 ++
 languages/lo_LA/lang.inc | 2 ++
 languages/nb_NO/lang.inc | 2 ++
 languages/nl_NL/lang.inc | 2 ++
 languages/pl_PL/lang.inc | 2 ++
 languages/pt_BR/lang.inc | 2 ++
 languages/ro_RO/lang.inc | 2 ++
 languages/ru_RU/lang.inc | 2 ++
 languages/sk_SK/lang.inc | 2 ++
 languages/sv_SE/lang.inc | 2 ++
 languages/tr_TR/lang.inc | 2 ++
 languages/uk_UA/lang.inc | 2 ++
 languages/zh_CN/lang.inc | 2 ++
 languages/zh_TW/lang.inc | 2 ++
 27 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index 55aa09357..bec5f171a 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -353,6 +353,7 @@ URL: [url]',
 'current_state' => 'الحالة الحالية',
 'current_version' => 'الإصدار الحالي',
 'daily' => 'يومي',
+'dashboard' => '',
 'databasesearch' => 'بحث قاعدة البيانات',
 'database_schema_version' => '',
 'data_loading' => 'ﺎﻟﺮﺟﺍﺀ ﺍﻼﻨﺘﻇﺍﺭ, ﺖﺤﻤﻴﻟ ﺎﻠﻤﻌﻟﻮﻣﺎﺗ...',
@@ -1368,6 +1369,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'حدد معرف سمة المجموعة',
 'select_attribute_value' => 'اختيار سمة الرقم',
 'select_category' => 'اضغط لاختيار قسم',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'اختيار مجموعة',
 'select_groups' => 'اضغط لاختيار مجموعة',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 8dd68641f..826fca2ce 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -336,6 +336,7 @@ $text = array(
 'current_state' => '',
 'current_version' => 'Текуща версия',
 'daily' => 'Ежедневно',
+'dashboard' => '',
 'databasesearch' => 'Търсене по БД',
 'database_schema_version' => '',
 'data_loading' => 'Моля, изчакайте докато документа се зареди ...',
@@ -1231,6 +1232,7 @@ $text = array(
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Изберете категория',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => '',
 'select_groups' => 'Кликни да избереш групи',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index bf34b56b3..ae8534de1 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -341,6 +341,7 @@ URL: [url]',
 'current_state' => '',
 'current_version' => 'Versió actual',
 'daily' => 'Daily',
+'dashboard' => '',
 'databasesearch' => 'Database search',
 'database_schema_version' => '',
 'data_loading' => 'Carregant dades, espereu siusplau...',
@@ -1236,6 +1237,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Prem per seleccionar la categoria',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Seleccionar grup',
 'select_groups' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index b3e42f980..cc7d81b93 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -365,6 +365,7 @@ URL: [url]',
 'current_state' => 'Současný stav',
 'current_version' => 'Aktuální verze',
 'daily' => 'Denně',
+'dashboard' => '',
 'databasesearch' => 'Vyhledání v databázi',
 'database_schema_version' => '',
 'data_loading' => 'Prosím vyčkejte dokud se data nenahrají...',
@@ -1435,6 +1436,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'Vybrat, kdy chcete zobrazit',
 'select_attribute_value' => 'Vybrat hodnotu atributu',
 'select_category' => 'Kliknutím vybrat kategorii',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Vybrat skupinu',
 'select_groups' => 'Kliknutím vybrat skupiny',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 2fcfae696..3204de3dd 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3214), dgrutsch (22)
+//    Translators: Admin (3216), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -404,6 +404,7 @@ URL: [url]</p>',
 'current_state' => 'Aktueller Status',
 'current_version' => 'Aktuelle Version',
 'daily' => 'täglich',
+'dashboard' => 'Übersicht',
 'databasesearch' => 'Datenbanksuche',
 'database_schema_version' => 'Version des Datenbankschemas',
 'data_loading' => 'Bitte warten, bis die Daten geladen sind …',
@@ -1765,6 +1766,7 @@ URL: [url]</p>',
 'select_attrdefgrp_show' => 'Anzeigeort auswählen',
 'select_attribute_value' => 'Attributwert auswählen',
 'select_category' => 'Klicken zur Auswahl einer Kategorie',
+'select_created' => 'Klicken zur Auswahl des Erstellungsdatums',
 'select_documents_for_process' => 'Dokumente auswählen',
 'select_group' => 'Gruppe auswählen',
 'select_groups' => 'Klicken zur Auswahl einer Gruppe',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index d3aed057c..84ad75ba6 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -336,6 +336,7 @@ $text = array(
 'current_state' => '',
 'current_version' => 'Τρέχουσα έκδοση',
 'daily' => '',
+'dashboard' => '',
 'databasesearch' => '',
 'database_schema_version' => '',
 'data_loading' => 'Αναμονή φόρτωσης δεδομένων...',
@@ -1242,6 +1243,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Επιλογή κατηγορίας',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Επιλογή ομάδας',
 'select_groups' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index a0761183b..fdb88f07b 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2308), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2310), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -404,6 +404,7 @@ URL: [url]</p>',
 'current_state' => 'Current state',
 'current_version' => 'Current version',
 'daily' => 'Daily',
+'dashboard' => 'Dashboard',
 'databasesearch' => 'Database search',
 'database_schema_version' => 'Version of database schema',
 'data_loading' => 'Please wait, until the data is loaded …',
@@ -1768,6 +1769,7 @@ URL: [url]</p>',
 'select_attrdefgrp_show' => 'Choose when to show',
 'select_attribute_value' => 'Select attribute value',
 'select_category' => 'Click to select category',
+'select_created' => 'Click to select date of creation',
 'select_documents_for_process' => 'Select documents',
 'select_group' => 'Select group',
 'select_groups' => 'Click to select groups',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 652671ae2..7670c0514 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -360,6 +360,7 @@ URL: [url]',
 'current_state' => 'Estado actual',
 'current_version' => 'Versión actual',
 'daily' => 'Diaria',
+'dashboard' => '',
 'databasesearch' => 'Búsqueda en base de datos',
 'database_schema_version' => 'Versión del esquema de base de datos',
 'data_loading' => 'Por favor, espere hasta que los datos sean cargados ...',
@@ -1395,6 +1396,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => 'Seleccionar valores de atributos',
 'select_category' => 'Haga Click para seleccionar categoría',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Seleccionar Grupo',
 'select_groups' => 'Haga Click para seleccionar grupos',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 33c2f5b45..7488bbeac 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -394,6 +394,7 @@ URL : [url]</p>',
 'current_state' => 'État actuel',
 'current_version' => 'Version actuelle',
 'daily' => 'Journalier',
+'dashboard' => '',
 'databasesearch' => 'Recherche dans la base de données',
 'database_schema_version' => 'Version du schéma de base de données',
 'data_loading' => 'Veuillez patienter, jusqu\'à ce que les données soient chargées',
@@ -1753,6 +1754,7 @@ URL : [url]</p>',
 'select_attrdefgrp_show' => 'Sélectionner quand afficher',
 'select_attribute_value' => 'Sélectionner la valeur de l’attribut',
 'select_category' => 'Cliquer pour choisir une catégorie',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Sélectionner un groupe',
 'select_groups' => 'Cliquer pour choisir un groupe',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 2b30d4b90..635e0ef85 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -365,6 +365,7 @@ Internet poveznica: [url]',
 'current_state' => 'Trenutni status',
 'current_version' => 'Trenutna verzija',
 'daily' => 'Dnevno',
+'dashboard' => '',
 'databasesearch' => 'Pretraživanje baze podataka',
 'database_schema_version' => '',
 'data_loading' => 'Molim pričekati, dok se podaci učitavaju ...',
@@ -1404,6 +1405,7 @@ Internet poveznica: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => 'Izbari vrednost atributa',
 'select_category' => 'Kliknite za odabir kategorije',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Izaberi grupu',
 'select_groups' => 'Kliknite za odabir grupa',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index b036b8db4..3e6f18cd2 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -360,6 +360,7 @@ URL: [url]',
 'current_state' => 'Aktuális állapot',
 'current_version' => 'Aktuális verzió',
 'daily' => 'Napi',
+'dashboard' => '',
 'databasesearch' => 'Adatbázis keresés',
 'database_schema_version' => 'Adatbázis séma verziója',
 'data_loading' => 'Kérjük várjon, adatok betöltése folyamatban',
@@ -1382,6 +1383,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Kattintson a kategória kiválasztásához',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Csoport kiválasztása',
 'select_groups' => 'Kattintson a csoportok kijelöléséhez',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index 70fa6493c..1e15abdfc 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -374,6 +374,7 @@ URL: [url]</p>',
 'current_state' => 'State saat ini',
 'current_version' => 'Versi saat ini',
 'daily' => 'Harian',
+'dashboard' => '',
 'databasesearch' => 'Pencarian Basis data',
 'database_schema_version' => 'Versi skema basis data',
 'data_loading' => '',
@@ -1449,6 +1450,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'Pilih waktu untuk ditampilkan',
 'select_attribute_value' => 'Pilih label value',
 'select_category' => 'Klik untuk memilih kategori',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Pilih group',
 'select_groups' => 'Klik untuk memilih groups',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 186777586..97345edd6 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -365,6 +365,7 @@ URL: [url]',
 'current_state' => 'Stato corrente',
 'current_version' => 'Versione attuale',
 'daily' => 'Giornaliero',
+'dashboard' => '',
 'databasesearch' => 'Ricerca nel Database',
 'database_schema_version' => 'Versione dello schema del database',
 'data_loading' => 'Attendere il caricamento dei dati...',
@@ -1426,6 +1427,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'Scegli quando mostrare',
 'select_attribute_value' => 'Seleziona il valore dell\'attributo',
 'select_category' => 'Clicca per selezionare la categoria',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Seleziona gruppo',
 'select_groups' => 'Clicca per selezionare i gruppi',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 60fee4911..468e69a76 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -368,6 +368,7 @@ URL: [url]',
 'current_state' => '현재 상태',
 'current_version' => '현재 버전',
 'daily' => '매일',
+'dashboard' => '',
 'databasesearch' => '데이터베이스 검색',
 'database_schema_version' => '',
 'data_loading' => '',
@@ -1398,6 +1399,7 @@ URL : [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => '범주를 선택합니다',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => '',
 'select_groups' => '그룹을 선택합니다',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index 291b08510..ccf44a85a 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -363,6 +363,7 @@ URL: [url]',
 'current_state' => 'ສະຖານະປັດຈຸບັນ',
 'current_version' => 'ເວີຊັນປະຈຸບັນ',
 'daily' => 'ປະຈຳວັນ',
+'dashboard' => '',
 'databasesearch' => 'ຄົ້ນຫາຖານຂໍ້ມູນ',
 'database_schema_version' => '',
 'data_loading' => '',
@@ -1419,6 +1420,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'ເລືອກເວລາທີ່ຈະສະແດງ',
 'select_attribute_value' => '',
 'select_category' => 'ຄິກເພື່ອເລືອກປະເພດ',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => '',
 'select_groups' => 'ຄິກເລືອກກຸ່ມ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 59bed4a3f..3a6e0c545 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -365,6 +365,7 @@ URL: [url]',
 'current_state' => 'Aktuell status',
 'current_version' => 'Aktuell version',
 'daily' => 'Daglig',
+'dashboard' => '',
 'databasesearch' => 'Søk i database',
 'database_schema_version' => '',
 'data_loading' => 'Vennligst vent, til dataene er lastet ...',
@@ -1434,6 +1435,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'Velg visings alternativ',
 'select_attribute_value' => 'Velg egenskapsverdi',
 'select_category' => 'Klikk for å velge kategori',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Klikk for å velge gruppe',
 'select_groups' => 'Klikk for å velge grupper',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index d89d9e856..cd6df3549 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -358,6 +358,7 @@ URL: [url]',
 'current_state' => 'Huidige status',
 'current_version' => 'Huidige versie',
 'daily' => 'Dagelijks',
+'dashboard' => '',
 'databasesearch' => 'Zoek in Database',
 'database_schema_version' => 'Versie van het database-schema',
 'data_loading' => 'Even geduld tot de data geladen is',
@@ -1431,6 +1432,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'Toon attribuut-definities-groep',
 'select_attribute_value' => 'Kies een waarde voor het attribuut',
 'select_category' => 'klik om categorie te selecteren',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Selecteer groep',
 'select_groups' => 'Klik om groep te selecteren',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 935bcfb70..b9a932cf6 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -353,6 +353,7 @@ URL: [url]',
 'current_state' => 'Bieżący stan',
 'current_version' => 'Bieżąca wiersja',
 'daily' => 'Codziennie',
+'dashboard' => '',
 'databasesearch' => 'Przeszukiwanie bazy danych',
 'database_schema_version' => 'Wersja schematu bazy danych',
 'data_loading' => 'Proszę czekać, dane są pobierane...',
@@ -1362,6 +1363,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'Wybierz, kiedy pokazać',
 'select_attribute_value' => 'Wybierz wartość atrybutu',
 'select_category' => 'Kliknij by wybrać kategorię',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Wybierz grupę',
 'select_groups' => 'Kliknij by wybrać grupy',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index c3853fefc..4efd7a0cc 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -365,6 +365,7 @@ URL: [url]',
 'current_state' => 'Estado atual',
 'current_version' => 'Versão Atual',
 'daily' => 'Diariamente',
+'dashboard' => '',
 'databasesearch' => 'Pesquisar Base de dados',
 'database_schema_version' => '',
 'data_loading' => 'Aguarde o carregamento',
@@ -1438,6 +1439,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'Escolha quando mostrar',
 'select_attribute_value' => 'Selecione o valor do atributo',
 'select_category' => 'Clique para selecionar a categoria',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Selecione o grupo',
 'select_groups' => 'Clique para selecionar os grupos',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index a0b43caa1..bad574a86 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -365,6 +365,7 @@ URL: [url]',
 'current_state' => 'Stare curentă',
 'current_version' => 'Versiune curentă',
 'daily' => 'Zilnic',
+'dashboard' => '',
 'databasesearch' => 'Căutare baza de date',
 'database_schema_version' => '',
 'data_loading' => 'Așteaptă, datele se încarcă...',
@@ -1405,6 +1406,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Click pentru a selecta categoria',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Selecteaza grupul',
 'select_groups' => 'Click pentru a selecta grupuri',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 3ff5901bc..adbf7be46 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -365,6 +365,7 @@ URL: [url]',
 'current_state' => 'Текущее состояние',
 'current_version' => 'Текущая версия',
 'daily' => 'Ежедневно',
+'dashboard' => '',
 'databasesearch' => 'Поиск по БД',
 'database_schema_version' => 'Версия базы',
 'data_loading' => 'Пожалуйста подождите, данные загружаются...',
@@ -1412,6 +1413,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Выберите категорию',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Выберите группу',
 'select_groups' => 'Выберите группы',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index a962462ad..5b255f0da 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -365,6 +365,7 @@ URL: [url]',
 'current_state' => 'Aktuálny stav',
 'current_version' => 'Aktuálna verzia',
 'daily' => 'Denná',
+'dashboard' => '',
 'databasesearch' => 'Hľadať databázu',
 'database_schema_version' => '',
 'data_loading' => 'Prosím počkajte, kým sa nenahrajú dáta',
@@ -1440,6 +1441,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'Choose when to show',
 'select_attribute_value' => 'Vyberte hodnotu atribútu',
 'select_category' => 'Vyber kategóriu',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Vybrať skupinu',
 'select_groups' => 'Kliknutím vyberte skupiny',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index dd61d30bf..e206c7a68 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -366,6 +366,7 @@ URL: [url]',
 'current_state' => 'Aktuell status',
 'current_version' => 'Aktuell version',
 'daily' => 'Dagligen',
+'dashboard' => '',
 'databasesearch' => 'Sök databas',
 'database_schema_version' => '',
 'data_loading' => 'Vänta tills data har laddats ...',
@@ -1413,6 +1414,7 @@ URL: [url]',
 'select_attrdefgrp_show' => 'Välj visingsalternativ',
 'select_attribute_value' => '',
 'select_category' => 'Klicka för att välja en kategori',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Välj grupp',
 'select_groups' => 'Välj grupper',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index b690fb237..a8e55bc76 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -359,6 +359,7 @@ URL: [url]',
 'current_state' => 'Mevcut durum',
 'current_version' => 'Mevcut versiyon',
 'daily' => 'Günlük',
+'dashboard' => '',
 'databasesearch' => 'Veritabanı arama',
 'database_schema_version' => 'Veritabanı tasarım sürümü',
 'data_loading' => 'Lütfen veriler yüklenene kadar bekleyin…',
@@ -1384,6 +1385,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Kategori seçmek için tıklayın',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => 'Grup Seç',
 'select_groups' => 'Grup seçmek için tıklayın',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 0d6554d48..9d28a7931 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -365,6 +365,7 @@ URL: [url]',
 'current_state' => 'Поточний стан',
 'current_version' => 'Поточна версія',
 'daily' => 'Щоденно',
+'dashboard' => '',
 'databasesearch' => 'Пошук по БД',
 'database_schema_version' => '',
 'data_loading' => 'Зачекайте, дані завантажуються...',
@@ -1405,6 +1406,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '',
 'select_attribute_value' => '',
 'select_category' => 'Оберіть категорію',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => '',
 'select_groups' => 'Оберіть групи',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 470112b74..c42468d00 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -359,6 +359,7 @@ URL: [url]',
 'current_state' => '当前状态',
 'current_version' => '当前版本',
 'daily' => '天',
+'dashboard' => '',
 'databasesearch' => '数据库搜索',
 'database_schema_version' => '数据库数据版本',
 'data_loading' => '数据加载中，请稍后...',
@@ -1387,6 +1388,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '选择何时显示',
 'select_attribute_value' => '选择属性值',
 'select_category' => '选中分类',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => '选择用户组',
 'select_groups' => '点击选择组',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index b04042d54..7ace7fe65 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -365,6 +365,7 @@ URL: [url]',
 'current_state' => '當前狀態',
 'current_version' => '當前版本',
 'daily' => '每日',
+'dashboard' => '',
 'databasesearch' => '資料庫搜索',
 'database_schema_version' => '',
 'data_loading' => '請等到資料載入完畢',
@@ -1438,6 +1439,7 @@ URL: [url]',
 'select_attrdefgrp_show' => '選擇當展示時',
 'select_attribute_value' => '選擇屬性值',
 'select_category' => '選中分類',
+'select_created' => '',
 'select_documents_for_process' => '',
 'select_group' => '選擇群',
 'select_groups' => '點擊選擇組',

From 3739f9e658773fc463707d9e6a5d711e2b5656d4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 May 2023 16:21:57 +0200
Subject: [PATCH 1999/2006] pass modification date to search() functions

---
 out/out.Search.php | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 1d65c6ffb..504af3a41 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -91,6 +91,31 @@ if(!empty($_GET["created"]["to"])) {
 }
 /* }}} */
 
+/* Modification date {{{ */
+$modifystartts = null;
+$modifystartdate = null;
+$modifyendts = null;
+$modifyenddate = null;
+$modified['from'] = null;
+$modified['to'] = null;
+if(!empty($_GET["modified"]["from"])) {
+	$modifystartts = makeTsFromDate($_GET["modified"]["from"]);
+	$modifystartdate = array('year'=>(int)date('Y', $modifystartts), 'month'=>(int)date('m', $modifystartts), 'day'=>(int)date('d', $modifystartts), 'hour'=>0, 'minute'=>0, 'second'=>0);
+	if (!checkdate($modifystartdate['month'], $modifystartdate['day'], $modifystartdate['year'])) {
+		UI::exitError(getMLText("search"),getMLText("invalid_modification_date_end"));
+	}
+	$modified['from'] = $modifystartts;
+}
+if(!empty($_GET["modified"]["to"])) {
+	$modifyendts = makeTsFromDate($_GET["modified"]["to"]);
+	$modifyenddate = array('year'=>(int)date('Y', $modifyendts), 'month'=>(int)date('m', $modifyendts), 'day'=>(int)date('d', $modifyendts), 'hour'=>23, 'minute'=>59, 'second'=>59);
+	if (!checkdate($modifyenddate['month'], $modifyenddate['day'], $modifyenddate['year'])) {
+		UI::exitError(getMLText("search"),getMLText("invalid_modification_date_end"));
+	}
+	$modified['to'] = $modifyendts;
+}
+/* }}} */
+
 // Check to see if the search has been restricted to a particular
 // document owner.
 // $_GET['owner'] can be a name of an array of names or ids {{{
@@ -291,7 +316,7 @@ if($fullsearch) {
 					$terms = $index->terms($lastterm, $settings->_suggestTerms);
 			}
 			$lucenesearch = $fulltextservice->Search();
-			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder, 'created_start'=>$createstartts, 'created_end'=>$createendts, 'attributes'=>$attributes), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))));
+			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder, 'created_start'=>$createstartts, 'created_end'=>$createendts, 'modified_start'=>$modifystartts, 'modified_end'=>$modifyendts, 'attributes'=>$attributes), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))), ['by'=>'', 'dir'=>'desc']);
 			if($searchresult === false) {
 				$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
 				$dcount = 0;
@@ -581,8 +606,8 @@ if($fullsearch) {
 		'status'=>$status,
 		'creationstartdate'=>$created['from'], //$createstartdate ? $createstartdate : array(),
 		'creationenddate'=>$created['to'], //$createenddate ? $createenddate : array(),
-		'modificationstartdate'=>array(),
-		'modificationenddate'=>array(),
+		'modificationstartdate'=>$modified['from'],
+		'modificationenddate'=>$modified['to'],
 		'categories'=>$categories,
 		'attributes'=>$attributes,
 		'mode'=>$resultmode,

From 97a3da352ff197ab8fb5d7b229d8cabe4415054e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 May 2023 16:23:11 +0200
Subject: [PATCH 2000/2006] propperly handle modification date

---
 views/bootstrap/class.Search.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index ecbd1e8e8..51c6712d4 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -913,7 +913,7 @@ $(document).ready(function() {
 							$option[] = array(array('data-subtitle', $c.' ×'));
 							$options[] = $option;
 						}
-					} elseif(substr($facetname, 0, 5) == 'attr_' || $facetname == 'created') {
+					} elseif(substr($facetname, 0, 5) == 'attr_' || $facetname == 'created' || $facetname == 'modified') {
 						/* Do not even create a list of options, because it isn't used */
 					} else {
 						foreach($values as $v=>$c) {
@@ -926,7 +926,7 @@ $(document).ready(function() {
 							$options[] = $option;
 						}
 					}
-					if(substr($facetname, 0, 5) != 'attr_' && $facetname != 'created') {
+					if(substr($facetname, 0, 5) != 'attr_' && $facetname != 'created' && $facetname != 'modified') {
 						$this->formField(
 							getMLText($facetname),
 							array(
@@ -1115,6 +1115,7 @@ $(document).ready(function() {
 								array_walk($oldtransval, function(&$v, $k){$v = getOverallStatusText($v);});
 								break;
 							case 'created':
+							case 'modified':
 								if(!empty($allparams[$facetname]['from']) || !empty($allparams[$facetname]['to'])) {
 									array_walk($allparams[$facetname], function(&$v, $k){$v=getReadableDate($v);});
 									$oldvalue = $allparams[$facetname];
@@ -1238,7 +1239,7 @@ $(document).ready(function() {
 								}
 							}
 						}
-					} elseif($facetname == 'created') {
+					} elseif($facetname == 'created' || $facetname == 'modified') {
 						if(empty($allparams[$facetname]['from']) && empty($allparams[$facetname]['to'])) {
 							$tt = array_keys($values);
 							$content = '<div class="input-group">';
@@ -1248,7 +1249,11 @@ $(document).ready(function() {
 							$content .= $this->getDateChooser('', $facetname."[to]", $this->params['session']->getLanguage(), '', '' /*getReadableDate(min($tt))*/, getReadableDate(time()), null, '', true);
 							$content .= '<button class="btn btn-primary" type="submit">Set</button>';
 							$content .= '</div>';
-							$this->printAccordion(getMLText('creation_date'), $content);
+							if($facetname == 'created')
+								$this->printAccordion(getMLText('creation_date'), $content);
+							elseif($facetname == 'modified') {
+//								$this->printAccordion(getMLText('modification_date'), $content);
+							}
 						}
 					} else {
 						/* Further filter makes only sense if the facet has more than 1 value

From 14afb5f1b7be6a91be17a3da9e91c95c47ece9f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 May 2023 16:23:37 +0200
Subject: [PATCH 2001/2006] add more changes for 5.1.31

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1229f7584..ef20082a8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
 - show preview of document in EditAttributes page
 - major overhaul of fulltext search, add new search tab for a more
   facetted based search
+- add initial version of Dashboard
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30

From 244066d34d2a64f1c4f14172bf7994cc4ab3ba5c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 May 2023 16:24:33 +0200
Subject: [PATCH 2002/2006] default public status of attachments can be
 configured

---
 CHANGELOG                          | 1 +
 inc/inc.ClassSettings.php          | 4 ++++
 op/op.Ajax.php                     | 2 +-
 op/op.Settings.php                 | 1 +
 out/out.AddFile.php                | 1 +
 views/bootstrap/class.AddFile.php  | 3 ++-
 views/bootstrap/class.Settings.php | 1 +
 7 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ef20082a8..aaffebcc9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
 - major overhaul of fulltext search, add new search tab for a more
   facetted based search
 - add initial version of Dashboard
+- default public status of attachments can be configured
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.30
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 6fad081d4..7172bda3c 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -122,6 +122,8 @@ class Settings { /* {{{ */
 	var $_proxyPassword = null;
 	// enable removal of file from dropfolder after success import
 	var $_removeFromDropFolder = false;
+	// uploaded attachements are not public by default
+	var $_uploadedAttachmentIsPublic = false;
 	// Where the stop word file is located
 	var $_stopWordsFile = null;
 	// enable/disable lucene fulltext search
@@ -740,6 +742,7 @@ class Settings { /* {{{ */
 			$this->_enableDuplicateSubFolderNames = Settings::boolval($tab["enableDuplicateSubFolderNames"]);
 			$this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]);
 			$this->_removeFromDropFolder = Settings::boolval($tab["removeFromDropFolder"]);
+			$this->_uploadedAttachmentIsPublic = Settings::boolval($tab["uploadedAttachmentIsPublic"]);
 		}
 
 		// XML Path: /configuration/advanced/notification
@@ -1087,6 +1090,7 @@ class Settings { /* {{{ */
 		$this->setXMLAttributValue($node, "enableDuplicateSubFolderNames", $this->_enableDuplicateSubFolderNames);
 		$this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType);
 		$this->setXMLAttributValue($node, "removeFromDropFolder", $this->_removeFromDropFolder);
+		$this->setXMLAttributValue($node, "uploadedAttachmentIsPublic", $this->_uploadedAttachmentIsPublic);
 
 		// XML Path: /configuration/advanced/notification
 		$node = $this->getXMLNode($xml, '/configuration/advanced', 'notification');
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index d9dad164e..551749c14 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -927,7 +927,7 @@ switch($command) {
 					$name = utf8_basename($userfilename);
 				$comment = '';
 				$version = 0;
-				$public = false;
+				$public = $settings->_uploadedAttachmentIsPublic;
 				$res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
 					utf8_basename($userfilename),$fileType, $userfiletype, $version, $public);
 				if (is_bool($res) && !$res) {
diff --git a/op/op.Settings.php b/op/op.Settings.php
index b8e06520d..b2a6b23f7 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -253,6 +253,7 @@ if ($action == "saveSettings")
   setBoolValue("enableDuplicateSubFolderNames");
   setBoolValue("overrideMimeType");
   setBoolValue("removeFromDropFolder");
+  setBoolValue("uploadedAttachmentIsPublic");
 
   // SETTINGS - ADVANCED - NOTIFICATION
   setBoolValue("enableOwnerNotification");
diff --git a/out/out.AddFile.php b/out/out.AddFile.php
index 9b24a6a23..53ab2ec3d 100644
--- a/out/out.AddFile.php
+++ b/out/out.AddFile.php
@@ -55,6 +55,7 @@ if($view) {
 	$view->setParam('document', $document);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
 	$view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload);
+	$view->setParam('uploadedattachmentispublic', $settings->_uploadedAttachmentIsPublic);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index a415a2dfa..a7b375e55 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -111,6 +111,7 @@ $(document).ready( function() {
 		$document = $this->params['document'];
 		$strictformcheck = $this->params['strictformcheck'];
 		$enablelargefileupload = $this->params['enablelargefileupload'];
+		$uploadedattachmentispublic = $this->params['uploadedattachmentispublic'];
 		$maxuploadsize = $this->params['maxuploadsize'];
 
 		$this->htmlAddHeader('<script type="text/javascript" src="'.$this->params['settings']->_httpRoot.'views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
@@ -183,7 +184,7 @@ $(document).ready( function() {
 					'id'=>'public',
 					'name'=>'public',
 					'value'=>'true',
-					'checked'=>true,
+					'checked'=>$uploadedattachmentispublic,
 				)
 			);
 		}
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index a68f7ff3c..1b1354832 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -515,6 +515,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 <?php $this->showConfigCheckbox('settings_enableDuplicateSubFolderNames', 'enableDuplicateSubFolderNames'); ?>
 <?php $this->showConfigCheckbox('settings_overrideMimeType', 'overrideMimeType'); ?>
 <?php $this->showConfigCheckbox('settings_removeFromDropFolder', 'removeFromDropFolder'); ?>
+<?php $this->showConfigCheckbox('settings_uploadedAttachmentIsPublic', 'uploadedAttachmentIsPublic'); ?>
 
       <!--
         -- SETTINGS - ADVANCED - NOTIFICATION

From c8d6eafc71bc7e31451ed7bbaa942ca2b1ba7b97 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 May 2023 17:38:01 +0200
Subject: [PATCH 2003/2006] allow sorting of fulltext search

---
 out/out.Search.php               | 41 +++++++++++++++++++++++++-------
 views/bootstrap/class.Search.php | 35 +++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 504af3a41..216aeae5f 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -169,6 +169,13 @@ if(!empty($_GET["owner"])) {
 		}
 	} /* }}} */
 
+	if (isset($_GET["orderby"]) && is_string($_GET["orderby"])) {
+		$orderby = $_GET["orderby"];
+	}
+	else {
+		$orderby = "";
+	}
+
 $terms = [];
 $limit = (isset($_GET["limit"]) && is_numeric($_GET["limit"])) ? (int) $_GET['limit'] : 20;
 $fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch;
@@ -279,6 +286,31 @@ if($fullsearch) {
 		}
 	}
 
+	/* Create $order array for fulltext search */
+	$order = ['by'=>'', 'dir'=>''];
+	switch($orderby) {
+	case 'dd':
+		$order = ['by'=>'created', 'dir'=>'desc'];
+		break;
+	case 'd':
+		$order = ['by'=>'created', 'dir'=>'asc'];
+		break;
+	case 'nd':
+		$order = ['by'=>'title', 'dir'=>'desc'];
+		break;
+	case 'n':
+		$order = ['by'=>'title', 'dir'=>'asc'];
+		break;
+	case 'id':
+		$order = ['by'=>'id', 'dir'=>'desc'];
+		break;
+	case 'i':
+		$order = ['by'=>'id', 'dir'=>'asc'];
+		break;
+	default:
+		$order = ['by'=>'', 'dir'=>''];
+	}
+
 	//print_r($attributes);exit;
 	// Check to see if the search has been restricted to a particular sub-tree in
 	// the folder hierarchy.
@@ -316,7 +348,7 @@ if($fullsearch) {
 					$terms = $index->terms($lastterm, $settings->_suggestTerms);
 			}
 			$lucenesearch = $fulltextservice->Search();
-			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder, 'created_start'=>$createstartts, 'created_end'=>$createendts, 'modified_start'=>$modifystartts, 'modified_end'=>$modifyendts, 'attributes'=>$attributes), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))), ['by'=>'', 'dir'=>'desc']);
+			$searchresult = $lucenesearch->search($query, array('record_type'=>$record_type, 'owner'=>$ownernames, 'status'=>$status, 'category'=>$categorynames, 'user'=>$user->isAdmin() ? [] : [$user->getLogin()], 'mimetype'=>$mimetype, 'startFolder'=>$startFolder, 'rootFolder'=>$rootFolder, 'created_start'=>$createstartts, 'created_end'=>$createendts, 'modified_start'=>$modifystartts, 'modified_end'=>$modifyendts, 'attributes'=>$attributes), ($pageNumber == 'all' ? array() : array('limit'=>$limit, 'offset'=>$limit * ($pageNumber-1))), $order);
 			if($searchresult === false) {
 				$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('splash_invalid_searchterm')));
 				$dcount = 0;
@@ -387,13 +419,6 @@ if($fullsearch) {
 		$query = "";
 	}
 
-	if (isset($_GET["orderby"]) && is_string($_GET["orderby"])) {
-		$orderby = $_GET["orderby"];
-	}
-	else {
-		$orderby = "";
-	}
-
 	/* Select if only documents (0x01), only folders (0x02) or both (0x03)
 	 * are found
 	 */
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 51c6712d4..54e7a80e8 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -780,10 +780,28 @@ $(document).ready(function() {
 					'element'=>'input',
 					'type'=>'search',
 					'name'=>'query',
+					'placeholder'=>getMLText('search_query_placeholder'),
 					'value'=>htmlspecialchars($this->query)
 				)
 			);
 			$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form2", M_READ, -1, $startfolder, 'folderfullsearchid'));
+			$options = array();
+			$options[] = array('', getMLText('orderby_relevance'));
+			$options[] = array('dd', getMLText('orderby_date_desc'), 'dd'==$orderby);
+			$options[] = array('d', getMLText('orderby_date_asc'), 'd'==$orderby);
+			$options[] = array('nd', getMLText('orderby_name_desc'), 'nd'==$orderby);
+			$options[] = array('n', getMLText('orderby_name_asc'), 'n'==$orderby);
+			$this->formField(
+				getMLText("orderby"),
+				array(
+					'element'=>'select',
+					'name'=>'orderby',
+					'class'=>'chzn-select',
+					'multiple'=>false,
+					'options'=>$options
+				)
+			);
+
 			$this->formField(
 				getMLText("creation_date")." (".getMLText('from').")",
 				$this->getDateChooser(!empty($created['from']) ? getReadableDate($created['from']) : null, "created[from]", $this->params['session']->getLanguage())
@@ -1039,6 +1057,23 @@ $(document).ready(function() {
 			);
 			$this->formField(getMLText("under_folder"), $this->getFolderChooserHtml("form3", M_READ, -1, $startfolder, 'folderfullsearchid'));
 
+			$options = array();
+			$options[] = array('', getMLText('orderby_relevance'));
+			$options[] = array('dd', getMLText('orderby_date_desc'), 'dd'==$orderby);
+			$options[] = array('d', getMLText('orderby_date_asc'), 'd'==$orderby);
+			$options[] = array('nd', getMLText('orderby_name_desc'), 'nd'==$orderby);
+			$options[] = array('n', getMLText('orderby_name_asc'), 'n'==$orderby);
+			$this->formField(
+				getMLText("orderby"),
+				array(
+					'element'=>'select',
+					'name'=>'orderby',
+					'class'=>'chzn-select',
+					'multiple'=>false,
+					'options'=>$options
+				)
+			);
+
 			$this->contentContainerEnd();
 
 			$menuitems = [];

From 626a325df7c3b0050cfeff9331a9ca94fe0b4057 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 May 2023 18:24:09 +0200
Subject: [PATCH 2004/2006] add database search by modification date

---
 out/out.Search.php               |  6 +++---
 views/bootstrap/class.Search.php | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 216aeae5f..c56138c05 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -734,13 +734,13 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('createstartdate', $createstartts);
 		$view->setParam('createenddate', $createendts);
 		$view->setParam('created', $created);
+		$view->setParam('modifystartdate', $modifystartts);
+		$view->setParam('modifyenddate', $modifyendts);
+		$view->setParam('modified', $modified);
 		$view->setParam('expstartdate', !empty($expstartdate) ? getReadableDate($expstartts) : '');
 		$view->setParam('expenddate', !empty($expenddate) ? getReadableDate($expendts) : '');
 		$view->setParam('statusstartdate', !empty($statusstartdate) ? getReadableDate($statusstartts) : '');
 		$view->setParam('statusenddate', !empty($statusenddate) ? getReadableDate($statusendts) : '');
-		$view->setParam('creationdate', isset($creationdate) ? $creationdate : '');
-		$view->setParam('expirationdate', isset($expirationdate) ? $expirationdate: '');
-		$view->setParam('statusdate', isset($statusdate) ? $statusdate: '');
 		$view->setParam('status', $status);
 		$view->setParam('recordtype', isset($record_type) ? $record_type : null);
 		$view->setParam('categories', isset($categories) ? $categories : '');
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 54e7a80e8..d0f7b9b77 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -419,13 +419,13 @@ $(document).ready(function() {
 		$createstartdate = $this->params['createstartdate'];
 		$createenddate = $this->params['createenddate'];
 		$created = $this->params['created'];
+		$modifystartdate = $this->params['modifystartdate'];
+		$modifyenddate = $this->params['modifyenddate'];
+		$modified = $this->params['modified'];
 		$expstartdate = $this->params['expstartdate'];
 		$expenddate = $this->params['expenddate'];
 		$statusstartdate = $this->params['statusstartdate'];
 		$statusenddate = $this->params['statusenddate'];
-		$creationdate = $this->params['creationdate'];
-		$expirationdate = $this->params['expirationdate'];
-		$statusdate = $this->params['statusdate'];
 		$status = $this->params['status'];
 		$record_type = $this->params['recordtype'];
 		$this->query = $this->params['query'];
@@ -635,9 +635,11 @@ $(document).ready(function() {
 			$openfilterdlg = true;
 		if($status)
 			$openfilterdlg = true;
-		if($expirationdate)
+		if($modifyenddate || $modifystartdate)
 			$openfilterdlg = true;
-		if($statusdate)
+		if($expenddate || $expstartdate)
+			$openfilterdlg = true;
+		if($statusstartdate || $statusenddate)
 			$openfilterdlg = true;
 
 		/* Start of fields only applicable to documents */
@@ -685,6 +687,14 @@ $(document).ready(function() {
 				'options'=>$options
 			)
 		);
+		$this->formField(
+			getMLText("modified")." (".getMLText('from').")",
+			$this->getDateChooser(!empty($modifystartdate) ? getReadableDate($modifystartdate) : null, "modified[from]", $this->params['session']->getLanguage())
+		);
+		$this->formField(
+			getMLText("modified")." (".getMLText('to').")",
+			$this->getDateChooser(!empty($modifyenddate) ? getReadableDate($modifyenddate) : null, "modified[to]", $this->params['session']->getLanguage())
+		);
 		$this->formField(
 			getMLText("expires")." (".getMLText('from').")",
 			$this->getDateChooser($expstartdate, "expirationstart", $this->params['session']->getLanguage())

From f82191f20b21b4cc357b802c843699e77a2ba14b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 May 2023 18:25:59 +0200
Subject: [PATCH 2005/2006] add missing phrases

---
 languages/ar_EG/lang.inc | 6 ++++++
 languages/bg_BG/lang.inc | 6 ++++++
 languages/ca_ES/lang.inc | 6 ++++++
 languages/cs_CZ/lang.inc | 6 ++++++
 languages/de_DE/lang.inc | 8 +++++++-
 languages/el_GR/lang.inc | 6 ++++++
 languages/en_GB/lang.inc | 8 +++++++-
 languages/es_ES/lang.inc | 6 ++++++
 languages/fr_FR/lang.inc | 6 ++++++
 languages/hr_HR/lang.inc | 6 ++++++
 languages/hu_HU/lang.inc | 6 ++++++
 languages/id_ID/lang.inc | 6 ++++++
 languages/it_IT/lang.inc | 6 ++++++
 languages/ko_KR/lang.inc | 6 ++++++
 languages/lo_LA/lang.inc | 6 ++++++
 languages/nb_NO/lang.inc | 6 ++++++
 languages/nl_NL/lang.inc | 6 ++++++
 languages/pl_PL/lang.inc | 6 ++++++
 languages/pt_BR/lang.inc | 6 ++++++
 languages/ro_RO/lang.inc | 6 ++++++
 languages/ru_RU/lang.inc | 6 ++++++
 languages/sk_SK/lang.inc | 6 ++++++
 languages/sv_SE/lang.inc | 6 ++++++
 languages/tr_TR/lang.inc | 6 ++++++
 languages/uk_UA/lang.inc | 6 ++++++
 languages/zh_CN/lang.inc | 6 ++++++
 languages/zh_TW/lang.inc | 6 ++++++
 27 files changed, 164 insertions(+), 2 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index bec5f171a..fb8dabe6a 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -924,6 +924,8 @@ URL: [url]',
 'missing_reception' => 'الإستقبال غير موجود',
 'missing_request_object' => 'طلب شيء غير موجود',
 'missing_transition_user_group' => 'مستخدم/مجموعة مفقودة للتحول',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'الاثنين',
 'monday_abbr' => 'ن',
 'monthly' => 'شهريا',
@@ -1068,6 +1070,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'الترتيب بالتسلسل موقف',
 'original_filename' => 'اسم الملف الاصلي',
@@ -1389,6 +1392,7 @@ URL: [url]',
 'select_ind_reviewers' => 'اضغط لاختيار مراجع فردي',
 'select_ind_revisors' => 'اضغط لإختيار مراجعين فرديين',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'اختر واحد',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1813,6 +1817,8 @@ URL: [url]',
 'settings_updateNotifyTime' => 'تحديث وقت التنبيه',
 'settings_updateNotifyTime_desc' => 'تحديث وقت التنبيه',
 'settings_upgrade_php' => 'تطوير php',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'اسم ملف الاصدار',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 826fca2ce..3c21f32e7 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -853,6 +853,8 @@ $text = array(
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'липсва потребител или група за преход',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'понеделник',
 'monday_abbr' => '',
 'monthly' => 'Ежемесечно',
@@ -973,6 +975,7 @@ $text = array(
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Подреждането по последователност е изключено в настройките. Ако искате този параметър да има ефект, ще трябва да го включите отново.',
 'original_filename' => 'Оригинално име на файл',
@@ -1252,6 +1255,7 @@ $text = array(
 'select_ind_reviewers' => 'Кликни да избереш рецензент',
 'select_ind_revisors' => '',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Избери един',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1676,6 +1680,8 @@ $text = array(
 'settings_updateNotifyTime' => 'Интервал за уведомяване за изменения',
 'settings_updateNotifyTime_desc' => 'Потребителите се уведомяват за изменения в документите за последните \'Update Notify Time\' секунди',
 'settings_upgrade_php' => '',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Име на файла с версиите',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index ae8534de1..57788def5 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -858,6 +858,8 @@ URL: [url]',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => '',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Dilluns',
 'monday_abbr' => '',
 'monthly' => 'Monthly',
@@ -978,6 +980,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'L\'ordenació per seqüència és desactivada a la configuració. Si vol que aquest paràmetre sigui efectiu, haurà d\'activar-lo.',
 'original_filename' => '',
@@ -1257,6 +1260,7 @@ URL: [url]',
 'select_ind_reviewers' => '',
 'select_ind_revisors' => '',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Seleccionar un',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1681,6 +1685,8 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
 'settings_upgrade_php' => '',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Versioning filename',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index cc7d81b93..8c436eb8e 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -955,6 +955,8 @@ URL: [url]',
 'missing_reception' => 'Chybějící recepce',
 'missing_request_object' => 'Chybějící požadovaný objekt',
 'missing_transition_user_group' => 'Chybějící uživatel / skupina pro transformaci',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Pondělí',
 'monday_abbr' => 'Po',
 'monthly' => 'Měsíčně',
@@ -1099,6 +1101,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Pořadí podle řazení je v nastavení vypnuto. Chcete-li mít tento parametr vliv, musíte jej znovu zapnout.',
 'original_filename' => 'Originální název souboru',
@@ -1456,6 +1459,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Kliknutím vybrat jednotlivého recenzenta',
 'select_ind_revisors' => 'Kliknutím vybrat jednotlivého revizora',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Vybrat jeden',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1885,6 +1889,8 @@ Jméno: [username]
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Uživatelé jsou informováni o změnách dokumentů, ke kterým došlo v posledních sekundách \'Aktualizace upozornění\'',
 'settings_upgrade_php' => 'Aktualizujte PHP alespoň na verzi 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Verzování názvu souboru',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 3204de3dd..779e49313 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (3216), dgrutsch (22)
+//    Translators: Admin (3222), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -1098,6 +1098,8 @@ URL: [url]</p>',
 'missing_reception' => 'Fehlende Empfangsbestätigung',
 'missing_request_object' => 'Fehlendes Zugriffsobjekte',
 'missing_transition_user_group' => 'Fehlende/r Benutzer/Gruppe für Transition',
+'modification_date' => 'Verändert',
+'modified' => 'Verändert am',
 'monday' => 'Montag',
 'monday_abbr' => 'Mo',
 'monthly' => 'monatlich',
@@ -1271,6 +1273,7 @@ URL: [url]</p>',
 'orderby_id_desc' => 'Nach Id (absteigend)',
 'orderby_name_asc' => 'Nach Name (aufsteigend)',
 'orderby_name_desc' => 'Nach Name (absteigend)',
+'orderby_relevance' => 'Nach Relevanz',
 'orderby_unsorted' => 'Unsortiert',
 'order_by_sequence_off' => 'Die Sortierung nach Folge ist in den Einstellungen ausgeschaltet. Wenn dieser Parameter wirksam sein soll, muss sie wieder eingeschaltet werden.',
 'original_filename' => 'Original filename',
@@ -1786,6 +1789,7 @@ URL: [url]</p>',
 'select_ind_reviewers' => 'Klicken zur Auswahl eines Prüfers',
 'select_ind_revisors' => 'Klicken zur Auswahl eines Wiederholungsprüfers',
 'select_mimetype' => 'Klicken zur Auswahl eines Mimetypes',
+'select_modified' => 'Klicken zur Auswahl des Änderungsdatums',
 'select_one' => 'Bitte wählen',
 'select_owner' => 'Klicken zur Auswahl eines Besitzers',
 'select_record_type' => 'Typ auswählen',
@@ -2217,6 +2221,8 @@ Sollten Sie kein Passwort bekommen haben, dann nutzen Sie bitte die Passwort-Ver
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
 'settings_upgrade_php' => 'Aktualisiere PHP auf mindestens version 5.6.38',
+'settings_uploadedAttachmentIsPublic' => 'Neue Anhänge sind für alle sichtbar',
+'settings_uploadedAttachmentIsPublic_desc' => 'Neue Anhänge, die per Formular oder Drag&Drop hochgeladen werden, sind voreingestellt für alle sichtbar.',
 'settings_useHomeAsRootFolder' => 'Benutze Home-Ordner als Wurzelordner',
 'settings_useHomeAsRootFolder_desc' => 'Wenn dies eingeschaltet ist, wird der Home-Ordner eines Benutzer (kein Admin) als Wurzelordner verwendet (experimentell).',
 'settings_versioningFileName' => 'Versionsinfo-Datei',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 84ad75ba6..5bc6a7319 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -853,6 +853,8 @@ $text = array(
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => '',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Δευτέρα',
 'monday_abbr' => 'Δε',
 'monthly' => 'Μηνιαία',
@@ -984,6 +986,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => '',
 'original_filename' => '',
@@ -1263,6 +1266,7 @@ URL: [url]',
 'select_ind_reviewers' => '',
 'select_ind_revisors' => '',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Επιλογή',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1687,6 +1691,8 @@ URL: [url]',
 'settings_updateNotifyTime' => '',
 'settings_updateNotifyTime_desc' => '',
 'settings_upgrade_php' => '',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index fdb88f07b..b0d23f991 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2310), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2316), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -1099,6 +1099,8 @@ URL: [url]</p>',
 'missing_reception' => 'Missing reception',
 'missing_request_object' => 'Missing request object',
 'missing_transition_user_group' => 'Missing user/group for transition',
+'modification_date' => 'Modified',
+'modified' => 'Modified',
 'monday' => 'Monday',
 'monday_abbr' => 'Mo',
 'monthly' => 'Monthly',
@@ -1274,6 +1276,7 @@ URL: [url]</p>',
 'orderby_id_desc' => 'by id (descending)',
 'orderby_name_asc' => 'by name (ascending)',
 'orderby_name_desc' => 'by name (descending)',
+'orderby_relevance' => 'by relevance',
 'orderby_unsorted' => 'unsorted',
 'order_by_sequence_off' => 'Ordering by sequence is turned off in the settings. If you want this parameter to have effect, you will have to turn it back on.',
 'original_filename' => 'Original filename',
@@ -1789,6 +1792,7 @@ URL: [url]</p>',
 'select_ind_reviewers' => 'Click to select individual reviewer',
 'select_ind_revisors' => 'Click to select individual revisors',
 'select_mimetype' => 'Click to select mimetype',
+'select_modified' => 'Click to select date of modification',
 'select_one' => 'Select one',
 'select_owner' => 'Click to select owner',
 'select_record_type' => 'Choose type',
@@ -2220,6 +2224,8 @@ If you did not receive a password, please use the password forgotten function on
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
 'settings_upgrade_php' => 'Upgrade PHP to at least version 5.6.38',
+'settings_uploadedAttachmentIsPublic' => 'New attachments are public',
+'settings_uploadedAttachmentIsPublic_desc' => 'New attachments, which are either uploaded by form or drag&drop are by default public.',
 'settings_useHomeAsRootFolder' => 'Use home folder as root folder',
 'settings_useHomeAsRootFolder_desc' => 'Enable this if the user\'s home folder (no admin) shall be used as the root folder (experimental)',
 'settings_versioningFileName' => 'Versioning FileName',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 7670c0514..e91118ce7 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -943,6 +943,8 @@ URL: [url]',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Falta usuario/grupo para transición',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Lunes',
 'monday_abbr' => 'L',
 'monthly' => 'Mensual',
@@ -1087,6 +1089,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'El orden secuencial está desactivado en la configuración. Si quiere utilizar este parámetro, deberá activarlo.',
 'original_filename' => 'Nombre de fichero original',
@@ -1416,6 +1419,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Haga Click para seleccionar revisor individual',
 'select_ind_revisors' => 'Clic para seleccionar revisores individuales',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Seleccionar uno',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1840,6 +1844,8 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Tiempo de notificación de actualización',
 'settings_updateNotifyTime_desc' => 'Se notificará a los usuarios sobre los cambios en documentos que tengan lugar en los próximos segundos de «Tiempo de notificación de actualización»',
 'settings_upgrade_php' => 'Actualice PHP a una versión igual o mayor a 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => 'Habilite esto, si la carpeta inicial de usuario (no admin) debe utilizarse como carpeta raíz (experimental)',
 'settings_versioningFileName' => 'Archivo de versionado',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 7488bbeac..b164fdb0d 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -1085,6 +1085,8 @@ URL : [url]</p>',
 'missing_reception' => 'Réception manquante',
 'missing_request_object' => 'Demande d’objet manquante',
 'missing_transition_user_group' => 'Utilisateur/groupe manquant pour transition',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Lundi',
 'monday_abbr' => 'Lun.',
 'monthly' => 'Mensuel',
@@ -1261,6 +1263,7 @@ URL : [url]</p>',
 'orderby_id_desc' => 'Trier par ID décroissant',
 'orderby_name_asc' => 'Trier par nom croissant',
 'orderby_name_desc' => 'Trier par nom décroissant',
+'orderby_relevance' => '',
 'orderby_unsorted' => 'Non trié',
 'order_by_sequence_off' => 'Le tri par position est désactivé dans les préférences. Si vous souhaitez que ce paramètre prenne effet, vous devez l’activer.',
 'original_filename' => 'Nom de fichier original',
@@ -1774,6 +1777,7 @@ URL : [url]</p>',
 'select_ind_reviewers' => 'Cliquer pour choisir un examinateur individuel',
 'select_ind_revisors' => 'Cliquer pour choisir un réviseur individuel',
 'select_mimetype' => 'Sélectionner un type MIME',
+'select_modified' => '',
 'select_one' => 'Selectionner',
 'select_owner' => 'Sélectionner un propriétaire',
 'select_record_type' => '',
@@ -2203,6 +2207,8 @@ Nom : [username]
 'settings_updateNotifyTime' => 'Délai de notification des modifications',
 'settings_updateNotifyTime_desc' => 'Les utilisateurs sont informés des modifications apportées aux documents qui ont eu lieu durant le délai précisé (en secondes).',
 'settings_upgrade_php' => 'Mettez à jour PHP vers une version au moins égale à 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => 'Utiliser le dossier de départ comme dossier racine',
 'settings_useHomeAsRootFolder_desc' => 'Activer pour que le dossier de départ de l’utilisateur (non admin) soit utilisé comme dossier racine (expérimental).',
 'settings_versioningFileName' => 'Nom des fichiers de versionnage',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 635e0ef85..5a2c76594 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -936,6 +936,8 @@ Internet poveznica: [url]',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Nedostaje korisnik/grupa za promjenu',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Ponedjeljak',
 'monday_abbr' => 'Po',
 'monthly' => 'Mjesečno',
@@ -1079,6 +1081,7 @@ Internet poveznica: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Sortiranje po sekvencei ne isključeno u postavkama. Ako želite da ovaj parametar ima utjecaja, morat ćete ga ponovno uključiti.',
 'original_filename' => 'Izvorni naziv datoteke',
@@ -1425,6 +1428,7 @@ Internet poveznica: [url]',
 'select_ind_reviewers' => 'Kliknite za odabir pojedinačnog recezenta',
 'select_ind_revisors' => 'Kliknite za odabir pojedinačnog revizora',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Odaberite jednog',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1849,6 +1853,8 @@ Internet poveznica: [url]',
 'settings_updateNotifyTime' => 'Ažuriraj vrijeme obavijesti',
 'settings_updateNotifyTime_desc' => 'Korisnici se obavještavaju o promjenama dokumenta koje su se dogodile unutar zadnjih \'Update Notify Time\' sekundi',
 'settings_upgrade_php' => 'Ažuriraj PHP najmanje na verziju 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Naziv datoteke verzije dokumenta',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 3e6f18cd2..a371fb050 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -931,6 +931,8 @@ URL: [url]',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Hiányzó felhasználó/csoport az átvezetéshez',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Hétfő',
 'monday_abbr' => 'Hé',
 'monthly' => 'Havi',
@@ -1075,6 +1077,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => '',
 'original_filename' => 'Eredeti fájlnév',
@@ -1403,6 +1406,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Kattintson az önálló felülvizsgáló kijelöléséhez',
 'select_ind_revisors' => '',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Válasszon egyet',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1827,6 +1831,8 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Értesítési idő frissítése',
 'settings_updateNotifyTime_desc' => 'Felhasználók értesítést kapnak az \'Értesítés frissítési idő\' által meghatározott másodperc alatt történt dokumentum változásokról',
 'settings_upgrade_php' => 'Frissítse a PHP-t legalább 5.6.38 verzióra',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Változatkezelő állománynév',
diff --git a/languages/id_ID/lang.inc b/languages/id_ID/lang.inc
index 1e15abdfc..43cf4a2f4 100644
--- a/languages/id_ID/lang.inc
+++ b/languages/id_ID/lang.inc
@@ -987,6 +987,8 @@ URL: [url]</p>',
 'missing_reception' => 'Resepsi hilang',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Pengguna/kelompok tidak ada untuk transisi',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Senin',
 'monday_abbr' => 'Senin',
 'monthly' => 'Bulanan',
@@ -1145,6 +1147,7 @@ URL: [url]</p>',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Pengurutan berdasarkan urutan dimatikan dalam pengaturan. Jika Anda ingin parameter ini berpengaruh, Anda harus mengaktifkannya kembali.',
 'original_filename' => 'Nama berkas asli',
@@ -1470,6 +1473,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Klik untuk memilih individual reviewer',
 'select_ind_revisors' => 'Klik untuk memilih individual revisors',
 'select_mimetype' => 'Klik untuk memilih mimetype',
+'select_modified' => '',
 'select_one' => 'Pilih salah satu',
 'select_owner' => 'Klik untuk memilih pemilik',
 'select_record_type' => '',
@@ -1901,6 +1905,8 @@ Jika Anda tidak menerima kata sandi, silakan gunakan fitur lupa kata sandi di ha
 'settings_updateNotifyTime' => '',
 'settings_updateNotifyTime_desc' => '',
 'settings_upgrade_php' => '',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => 'Gunakan folder home sebagai folder root',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => '',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 97345edd6..5f3a8eca9 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -941,6 +941,8 @@ URL: [url]',
 'missing_reception' => 'Ricezione mancante',
 'missing_request_object' => 'Manca oggetto di richiesta',
 'missing_transition_user_group' => 'Utente/Gruppo per la transizione mancanti',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Lunedì',
 'monday_abbr' => 'Lun',
 'monthly' => 'Mensile',
@@ -1085,6 +1087,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Ordina in sequenza disabilitato',
 'original_filename' => 'Nome file originale',
@@ -1447,6 +1450,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Fare clic per selezionare un revisore individuale',
 'select_ind_revisors' => 'Fare clic per selezionare un riesaminatore individuale',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Seleziona uno',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1876,6 +1880,8 @@ Name: [username]
 'settings_updateNotifyTime' => 'Intervallo notifica di aggiornamento',
 'settings_updateNotifyTime_desc' => 'Intervallo di tempo in secondi durante il quale ogni modifica ad un documento verrà notificata agli utenti',
 'settings_upgrade_php' => 'Aggiornare PHP alla versione 5.6.38 o superiori',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Nome file di versione',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 468e69a76..f65c8fca7 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -937,6 +937,8 @@ URL: [url]',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => '변화에 대한 사용자 / 그룹을 누락',
+'modification_date' => '',
+'modified' => '',
 'monday' => '월요일',
 'monday_abbr' => '월',
 'monthly' => '월간',
@@ -1081,6 +1083,7 @@ URL : [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => '순서에 의한 정렬 설정이 켜져 있습니다. 이 매개 변수를 사용하고 싶은 경우 이것을 활성화 해야 합니다.',
 'original_filename' => '원래본 파일명',
@@ -1419,6 +1422,7 @@ URL : [url]',
 'select_ind_reviewers' => '클릭하여 개별 검토자를 고릅니다.',
 'select_ind_revisors' => '개별 감사를 선택합니다',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => '선택',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1843,6 +1847,8 @@ URL : [url]',
 'settings_updateNotifyTime' => '업데이트 시간 알림',
 'settings_updateNotifyTime_desc' => '사용자가 마지막으로 발생한 문서 변경에 대한 알림 \'Update Notify Time\' 초',
 'settings_upgrade_php' => '최소 버전 5.2.0 PHP 이상 요구',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => '버전 파일 이름',
diff --git a/languages/lo_LA/lang.inc b/languages/lo_LA/lang.inc
index ccf44a85a..88cab487c 100644
--- a/languages/lo_LA/lang.inc
+++ b/languages/lo_LA/lang.inc
@@ -934,6 +934,8 @@ URL: [url]',
 'missing_reception' => 'ຂາດການຕອນຮັບ',
 'missing_request_object' => 'ການສະເໜີຄຳຂໍໄດ້ຫາຍໄປ',
 'missing_transition_user_group' => 'ບໍ່ມີຜູ້ໄຊ້/ ກຸ່ມສຳລັບການປ່ຽນແປງ',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'ວັນຈັນ',
 'monday_abbr' => 'ວັນຈັນ',
 'monthly' => 'ລາຍເດືອນ',
@@ -1078,6 +1080,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'ການສັ່ງຊື້ຕາມລຳດັບຖືກປິດຢູ່ການຕັ້ງຄ່າ, ຖ້າເຈົ້າຕ້ອງການໃຫ້ພາລາມິດເຕີນີ້ໄດ້ຮັບຜົນ, ເຈົ້າຈະຕ້ອງເປີດໄຊ້ງານອີກຄັ້ງ',
 'original_filename' => 'ຊື່ໄຟລຕົ້ນສະບັບ',
@@ -1440,6 +1443,7 @@ URL: [url]',
 'select_ind_reviewers' => 'ຄິກເພື່ອເລືອກຜູ້ກວດສອບແຕ່ລະຄົນ',
 'select_ind_revisors' => 'ຄິກເພື່ອເລືອກການກວດສອບແຕ່ລະອັນ',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'ເລືອກໜື່ງອັນ',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1869,6 +1873,8 @@ URL: [url]',
 'settings_updateNotifyTime' => 'ອັບເດດເວລາການແຈ້ງເຕືອນ',
 'settings_updateNotifyTime_desc' => 'ຜູ້ໄຊ້ຈະໄດ້ຮັບການແຈ້ງກ່ຽວກັບການປ່ຽນແປງເອກະສານທີ່ເກີດຂື້ນພາຍໃນວິນາທີສຸດທ້າຍ  "ແຈ້ງເຕືອນເວລາ   "',
 'settings_upgrade_php' => 'ອັບເກດ PHP ຢ່າງນ້ອຍຕ້ອງເປັນເວີຊັ້ນ 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'ການກຳນົດຊື່ໄຟລ',
diff --git a/languages/nb_NO/lang.inc b/languages/nb_NO/lang.inc
index 3a6e0c545..b3d9e29e4 100644
--- a/languages/nb_NO/lang.inc
+++ b/languages/nb_NO/lang.inc
@@ -955,6 +955,8 @@ URL: [url]',
 'missing_reception' => 'Mangler mottager',
 'missing_request_object' => 'Mangler forespørsels-objekt',
 'missing_transition_user_group' => 'Mangler bruker / gruppe for overgang',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Mandag',
 'monday_abbr' => 'Ma',
 'monthly' => 'Månedlig',
@@ -1099,6 +1101,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Sortering etter sekvens er slått av i innstillingene. Hvis du vil at denne parameteren skal ha effekt, må du slå den på igjen.',
 'original_filename' => 'Orginalt filnavn',
@@ -1455,6 +1458,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Klikk for å velge individuell gjennomgå',
 'select_ind_revisors' => 'Klikk for å velge individuell kontrollører',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Velg en',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1882,6 +1886,8 @@ Bruker: [username]
 'settings_updateNotifyTime' => 'Oppdater varslingstid',
 'settings_updateNotifyTime_desc' => 'Brukere får beskjed om dokumentendringer som skjedde i løpet av de siste \'Update Notify Time\' sekunder',
 'settings_upgrade_php' => 'Oppgrader PHP til minst versjon 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Versjon av filnavn',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index cd6df3549..ef50483c7 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -948,6 +948,8 @@ URL: [url]',
 'missing_reception' => 'Ontvanger ontbreekt',
 'missing_request_object' => 'Gevraagd object ontbreekt',
 'missing_transition_user_group' => 'Gebruiker / groep ontbreekt voor de overdracht',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'maandag',
 'monday_abbr' => 'ma',
 'monthly' => 'Maandelijks',
@@ -1091,6 +1093,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Volgorde uit',
 'original_filename' => 'Originele bestandsnaam',
@@ -1452,6 +1455,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Klik om individuele beoordelaar te selecteren',
 'select_ind_revisors' => 'Klik voor individuele herziners',
 'select_mimetype' => 'Selecteer het mime-type',
+'select_modified' => '',
 'select_one' => 'Kies er een',
 'select_owner' => 'Kies de eigenaar',
 'select_record_type' => '',
@@ -1881,6 +1885,8 @@ Name: [username]
 'settings_updateNotifyTime' => 'Update Notificatie Tijd',
 'settings_updateNotifyTime_desc' => 'Gebruikers worden nietgenotificeerd over documentwijzigingen die plaats vinden binnen de laatste \'Update Notificatie Tijd\' seconden',
 'settings_upgrade_php' => 'Upgrade PHP minimaal naar versie 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Versie-informatie Bestandsnaam',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index b9a932cf6..df304f854 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -924,6 +924,8 @@ URL: [url]',
 'missing_reception' => 'Brakuje odbioru',
 'missing_request_object' => 'Brak obiektu żądania',
 'missing_transition_user_group' => 'Brak użytkownika / grupy dla przejścia',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Poniedziałek',
 'monday_abbr' => 'Pn.',
 'monthly' => 'Miesięcznie',
@@ -1068,6 +1070,7 @@ URL: [url]',
 'orderby_id_desc' => 'po id (malejąco)',
 'orderby_name_asc' => 'po nazwie (rosnąco)',
 'orderby_name_desc' => 'po nazwie (malejaco)',
+'orderby_relevance' => '',
 'orderby_unsorted' => 'niesortowane',
 'order_by_sequence_off' => 'Porządkowanie według sekwencji jest wyłączone w ustawieniach. Jeśli chcesz, aby ten parametr zadziałał, musisz go ponownie włączyć.',
 'original_filename' => 'Oryginalna nazwa pliku',
@@ -1383,6 +1386,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Kliknij by wybrać recenzenta',
 'select_ind_revisors' => 'Kliknij by wybrać audytora',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Wybierz',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1812,6 +1816,8 @@ Name: [username]
 'settings_updateNotifyTime' => 'Okres powiadamiania o zmianach',
 'settings_updateNotifyTime_desc' => 'Użytkownicy są powiadamiani o zmianach w dokumentach, które miały miejsce w ciągu ostatnich \'Update Notify Time\' sekund',
 'settings_upgrade_php' => 'Uaktualnij PHP do wersji przynajmniej 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => 'Użyj folderu domowego jako początkowego',
 'settings_useHomeAsRootFolder_desc' => 'Włącz tą opcję jeżeli folder domowy użytkownika (nie administratora) ma być folderem początkowym (eksperymentalne)',
 'settings_versioningFileName' => 'Nazwa pliku z wersjonowaniem',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 4efd7a0cc..3b796c171 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -955,6 +955,8 @@ URL: [url]',
 'missing_reception' => 'Falta o recebimento',
 'missing_request_object' => 'Objeto de solicitação ausente',
 'missing_transition_user_group' => 'Falta usuário/grupo para transição',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Segunda-feira',
 'monday_abbr' => 'Se',
 'monthly' => 'Mensal',
@@ -1098,6 +1100,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'O pedido por sequência é desativado nas configurações. Se você quiser que este parâmetro tenha efeito, você terá que ativá-lo novamente.',
 'original_filename' => 'Arquivo original',
@@ -1459,6 +1462,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Clique para selecionar revisor individual',
 'select_ind_revisors' => 'Clique para selecionar revisores individuais',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Selecione um',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1888,6 +1892,8 @@ Nome: [username]
 'settings_updateNotifyTime' => 'Atualizar Tempo de Notificação',
 'settings_updateNotifyTime_desc' => 'Usuários são notificados sobe mudanças em documentos que se realizaram nos últimos segundos \'Tempo de Atualização de Notificação\'',
 'settings_upgrade_php' => 'Atualize PHP para pelo menos a versão 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Versionando NomedoArquivo',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index bad574a86..c9e196431 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -936,6 +936,8 @@ URL: [url]',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Lipsește utilizatorul/grupul pentru tranziție',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Luni',
 'monday_abbr' => 'Lu',
 'monthly' => 'Lunar',
@@ -1080,6 +1082,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Ordonarea dupa secventa este dezactivata in setari. Daca doriti acest parametru sa aiba efect, va trebui sa-l reactivati.',
 'original_filename' => 'Nume de fișier original',
@@ -1426,6 +1429,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Click pentru a selecta un revizuitor individual',
 'select_ind_revisors' => 'Faceti click pentru a selecta retrimitori individuali',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Selectați unul',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1850,6 +1854,8 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Timpul de actualizare a notificarilor',
 'settings_updateNotifyTime_desc' => 'Utilizatorii sunt notificați cu privire la schimbările suferite de un documentul în ultima perioadă a \'Timpul de actualizare a notificarilor\' în secunde',
 'settings_upgrade_php' => 'Upgrade PHP cel puțin la versiunea 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Nume Fișier versionare',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index adbf7be46..a281d80ee 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -936,6 +936,8 @@ URL: [url]',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Отсутствует пользователь/группа для изменения.',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Понедельник',
 'monday_abbr' => 'Пн',
 'monthly' => 'Ежемесячно',
@@ -1079,6 +1081,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Сортировка последовательности выключена в настройках. Если вы хотите применить этот эффект, вам необходимо его включить',
 'original_filename' => 'Исходное имя файла',
@@ -1433,6 +1436,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Выберите индивидуального рецензента',
 'select_ind_revisors' => 'Выберите индивидуального ревизора',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Выберите',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1857,6 +1861,8 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Период уведомлений об изменениях',
 'settings_updateNotifyTime_desc' => 'Пользователи уведомляются об изменениях документов за указанные последние секунды.',
 'settings_upgrade_php' => 'Обновите PHP до версии не ниже 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Название файла версий',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 5b255f0da..934aec7d5 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -955,6 +955,8 @@ URL: [url]',
 'missing_reception' => 'Missing reception',
 'missing_request_object' => 'Chýba požadovaný objekt',
 'missing_transition_user_group' => 'Chýba používateľ/skupina pre prenos',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Pondelok',
 'monday_abbr' => 'Po',
 'monthly' => 'Mesačne',
@@ -1099,6 +1101,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Ordering by sequence is turned off in the settings. If you want this parameter to have effect, you will have to turn it back on.',
 'original_filename' => 'Pôvodný názov súboru',
@@ -1461,6 +1464,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Kliknutím vyberte individuálneho recenzenta',
 'select_ind_revisors' => 'Kliknutím vyberte individuálnych revízorov',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Vyberte',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1890,6 +1894,8 @@ Meno: [username]
 'settings_updateNotifyTime' => 'Aktualizovať čas notifikácie',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
 'settings_upgrade_php' => 'Upgrade PHP to at least version 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Versioning FileName',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index e206c7a68..305444945 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -942,6 +942,8 @@ URL: [url]',
 'missing_reception' => 'Mottagande saknas',
 'missing_request_object' => 'Begärt objekt saknas',
 'missing_transition_user_group' => 'Användare/grupp saknas för övergång',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Måndag',
 'monday_abbr' => 'Må',
 'monthly' => 'Månadsvis',
@@ -1086,6 +1088,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Sortering efter sekvens är inaktiverat i inställningarna.',
 'original_filename' => 'Ursprungligt filnamn',
@@ -1434,6 +1437,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Välj en person som ska granska',
 'select_ind_revisors' => 'Klicka för att välja individuell reviderare',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Välj',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1863,6 +1867,8 @@ Kommentar: [comment]',
 'settings_updateNotifyTime' => 'Tid för uppdateringsmeddelande',
 'settings_updateNotifyTime_desc' => 'Användare meddelas om att ändringar i dokumentet har genomförts inom de senaste \'Tid för uppdateringsmeddelande\' sekunder.',
 'settings_upgrade_php' => 'Uppdatera PHP till åtminstone version 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Versionsinfo-filnamn',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index a8e55bc76..e5eca613c 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -930,6 +930,8 @@ URL: [url]',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Geçiş için kullanıcı/grup bilgisi eksik',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Pazartesi',
 'monday_abbr' => 'Pzt',
 'monthly' => 'Aylık',
@@ -1074,6 +1076,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => '',
 'original_filename' => 'Orijinal dosya adı',
@@ -1405,6 +1408,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Biresysel kontrol edeni seçmek için tıklayın',
 'select_ind_revisors' => '',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Birini seçiniz',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1829,6 +1833,8 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Güncelleme Bildirim Zamanı',
 'settings_updateNotifyTime_desc' => 'Kullanıcılara doküman güncellemelerinin \'Update Notify Time\' saniyede gerçekleştiği bildirilir.',
 'settings_upgrade_php' => 'PHP versiyonu en az 5.6.38 olmalıdır',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Versiyonlama DosyaAdı',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 9d28a7931..c8ebe02c1 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -936,6 +936,8 @@ URL: [url]',
 'missing_reception' => '',
 'missing_request_object' => '',
 'missing_transition_user_group' => 'Відсутній користувач/група для зміни.',
+'modification_date' => '',
+'modified' => '',
 'monday' => 'Понеділок',
 'monday_abbr' => 'Пн',
 'monthly' => 'Щомісяця',
@@ -1079,6 +1081,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => 'Можливість ручного сортування відключена в налаштуваннях. Якщо ви хочете використовувати цю функцію, ви повинні знову її включити.',
 'original_filename' => 'Початкова назва файлу',
@@ -1426,6 +1429,7 @@ URL: [url]',
 'select_ind_reviewers' => 'Оберіть індивідуального рецензента',
 'select_ind_revisors' => 'Оберіть індивідуального ревізора',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => 'Оберіть',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1850,6 +1854,8 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Період сповіщень про зміни',
 'settings_updateNotifyTime_desc' => 'Користувачі отримують сповіщення за вказані останні секунди.',
 'settings_upgrade_php' => 'Оновіть PHP до версії не нижче 5.6.38',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => 'Назва файлу версій',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index c42468d00..1d2f6aba9 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -938,6 +938,8 @@ URL: [url]',
 'missing_reception' => '缺失的对象',
 'missing_request_object' => '缺失的请求对象',
 'missing_transition_user_group' => '需要转换的用户/组丢失',
+'modification_date' => '',
+'modified' => '',
 'monday' => '周 一',
 'monday_abbr' => '周一',
 'monthly' => '月',
@@ -1082,6 +1084,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => '按顺序排序功能设置已关闭。 如果你需要此参数设定有效，请在设置中打开它。',
 'original_filename' => '原始文件名',
@@ -1408,6 +1411,7 @@ URL: [url]',
 'select_ind_reviewers' => '点击选择审核人',
 'select_ind_revisors' => '点击选择其他审查用户',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => '选择一个',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1837,6 +1841,8 @@ URL: [url]',
 'settings_updateNotifyTime' => '更新时间通知',
 'settings_updateNotifyTime_desc' => '通知用户有关文档的变化，采取了最后的内地方“更新通知时间”秒',
 'settings_upgrade_php' => '将PHP至少升级到5.2.0版本',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => '文件名版本',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 7ace7fe65..cf6d9b09f 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -955,6 +955,8 @@ URL: [url]',
 'missing_reception' => '缺少接待處',
 'missing_request_object' => '缺少請求物件',
 'missing_transition_user_group' => '缺少傳送的使用者/群組',
+'modification_date' => '',
+'modified' => '',
 'monday' => '禮拜一',
 'monday_abbr' => 'Mo',
 'monthly' => '月',
@@ -1099,6 +1101,7 @@ URL: [url]',
 'orderby_id_desc' => '',
 'orderby_name_asc' => '',
 'orderby_name_desc' => '',
+'orderby_relevance' => '',
 'orderby_unsorted' => '',
 'order_by_sequence_off' => '在設置中關閉了按順序排序。如果希望此參數生效，則必須重新打開它。',
 'original_filename' => '原始檔名',
@@ -1459,6 +1462,7 @@ URL: [url]',
 'select_ind_reviewers' => '請點選單一的校對人',
 'select_ind_revisors' => '單擊以選中單個修訂者',
 'select_mimetype' => '',
+'select_modified' => '',
 'select_one' => '選擇一個',
 'select_owner' => '',
 'select_record_type' => '',
@@ -1888,6 +1892,8 @@ URL: [url]',
 'settings_updateNotifyTime' => '更新時間通知',
 'settings_updateNotifyTime_desc' => '通知使用者有關文件的變化，採取了最後的內地方“更新通知時間”秒',
 'settings_upgrade_php' => '將PHP升級到至少5.6.38版本',
+'settings_uploadedAttachmentIsPublic' => '',
+'settings_uploadedAttachmentIsPublic_desc' => '',
 'settings_useHomeAsRootFolder' => '',
 'settings_useHomeAsRootFolder_desc' => '',
 'settings_versioningFileName' => '檔案名版本',

From fbdbc4e1747a852770fe3b79ece10f54c65f70da Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 4 May 2023 08:56:50 +0200
Subject: [PATCH 2006/2006] complete fulltext search with filter for
 modification date

---
 views/bootstrap/class.Search.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index d0f7b9b77..b89187815 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -820,6 +820,14 @@ $(document).ready(function() {
 				getMLText("creation_date")." (".getMLText('to').")",
 				$this->getDateChooser(!empty($created['to']) ? getReadableDate($created['to']) : null, "created[to]", $this->params['session']->getLanguage())
 			);
+			$this->formField(
+				getMLText("modification_date")." (".getMLText('from').")",
+				$this->getDateChooser(!empty($modified['from']) ? getReadableDate($modified['from']) : null, "modified[from]", $this->params['session']->getLanguage())
+			);
+			$this->formField(
+				getMLText("modification_date")." (".getMLText('to').")",
+				$this->getDateChooser(!empty($modified['to']) ? getReadableDate($modified['to']) : null, "modified[to]", $this->params['session']->getLanguage())
+			);
 			if(!isset($facets['owner'])) {
 				$options = array();
 				foreach ($allUsers as $currUser) {
@@ -1297,7 +1305,7 @@ $(document).ready(function() {
 							if($facetname == 'created')
 								$this->printAccordion(getMLText('creation_date'), $content);
 							elseif($facetname == 'modified') {
-//								$this->printAccordion(getMLText('modification_date'), $content);
+								$this->printAccordion(getMLText('modification_date'), $content);
 							}
 						}
 					} else {